diff --git a/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/request/RpsListFormatter.java b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/request/RpsListFormatter.java
index 2f7a7338c3..0640c69652 100644
--- a/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/request/RpsListFormatter.java
+++ b/RadarServer/com.raytheon.rcm.lib/src/com/raytheon/rcm/request/RpsListFormatter.java
@@ -28,93 +28,106 @@ import com.raytheon.rcm.products.ProductInfo.Selector;
 import com.raytheon.rcm.products.RadarProduct;
 import com.raytheon.rcm.products.RadarProduct.Param;
 
-
+/**
+ * Used to format a {@link RpsList} before it is written.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * ?            ?          ?           Initial creation.
+ * Jan 20, 2016 5271       bkowal      Include time span / end hour for products
+ *                                     that use minutes for the time span.
+ * </pre>
+ * 
+ */
 public class RpsListFormatter {
-	/* See AWIPS-1 ProductRequestList::writeList()
-	 * 
-	 */
-	public static void formatAwips1RpsList(RpsList list, String fileName, PrintWriter s) {
-		RadarType radarType = list.getVcp() == 80 || list.getVcp() == 90 ?
-		        RadarType.TDWR : RadarType.WSR;		
-		Calendar cal = Calendar.getInstance();
-		s.format("RPS List %s %s... %d products\n", 
-	          fileName != null ? fileName : "",
-    		  String.format("%1$tY:%1$tm:%1$td:%1$tH:%1$tM:%1$tS", cal),
-			  list.getRequests().length);
-		s.print(" An RPS list contains the fields: Prod-Name, Mnemonic, Prod-Code\n" +
-				" Number of Data Levels, Resolution, Layer Code, Elevation, Contour Interval,\n" +
-				" Priority, Req Interval, Map, Lower Layer, Upper Layer, multCut, endHour, timeSpan\n" +
-				" The record format is: '%-39s  %-3s%4d%4d%6d %c%6d%7d%2d%2d%c%3d%3d %c%7d%7d'\n");
+    /*
+     * See AWIPS-1 ProductRequestList::writeList()
+     */
+    public static void formatAwips1RpsList(RpsList list, String fileName,
+            PrintWriter s) {
+        RadarType radarType = list.getVcp() == 80 || list.getVcp() == 90 ? RadarType.TDWR
+                : RadarType.WSR;
+        Calendar cal = Calendar.getInstance();
+        s.format("RPS List %s %s... %d products\n", fileName != null ? fileName
+                : "",
+                String.format("%1$tY:%1$tm:%1$td:%1$tH:%1$tM:%1$tS", cal), list
+                        .getRequests().length);
+        s.print(" An RPS list contains the fields: Prod-Name, Mnemonic, Prod-Code\n"
+                + " Number of Data Levels, Resolution, Layer Code, Elevation, Contour Interval,\n"
+                + " Priority, Req Interval, Map, Lower Layer, Upper Layer, multCut, endHour, timeSpan\n"
+                + " The record format is: '%-39s  %-3s%4d%4d%6d %c%6d%7d%2d%2d%c%3d%3d %c%7d%7d'\n");
 
-		for (Request r : list.getRequests()) {
-			s.println(formatAwips1Request(r, radarType));
-		}
-	}
-
-	private static final char[] layerCodes = {'L', 'M', 'H'};
-	
-	public static String formatAwips1Request(Request r, RadarType radarType) {
-	    RadarProduct rp = ProductInfo.getInstance().selectOne(
-	            new Selector(radarType, null, (int) r.productCode, null));
-		
-		/* Could probably guess how to format the important parts, but this
-		 * is what AWIPS-1 does anyway...
-		 */
-		if (rp == null)
-			throw new IllegalArgumentException("Cannot format unknown product type " + 
-					r.productCode + ".");
-		
-		/* Note there is no check for rp.contains(ELEVATION)  This
-		 * is fine for the current set of products that are available in
-		 * the RPS list editor...
-		 */
-		/* // Mimic:
-	    if (_multCuts == 'Y' && _elev > 16384)
-        {
-        _elev -= 16384;
+        for (Request r : list.getRequests()) {
+            s.println(formatAwips1Request(r, radarType));
         }
-        */
-		boolean multiCuts = false;
-		int elev = r.pdw22;
-		if (r.getElevationSelection() == Request.ALL_ELEVATIONS &&
-		        r.getElevationAngle() != 0) {
-		    elev = r.getElevationAngle();
-	        multiCuts = true;
-		}
-		 
-		char layerCode = '-';
-		if (rp.layer != null) {
-			try {
-				layerCode = layerCodes[rp.layer - 1];
-			} catch (ArrayIndexOutOfBoundsException e) {
-				// nothing
-			}
-		}
-		int lowerLayer = -1;
-		int upperLayer = -1;
-		if (rp.params.contains(Param.LAYER)) {
-			lowerLayer = r.getBottomAltitude();
-			upperLayer = r.getTopAltitude();
-		} else if (rp.params.contains(Param.MINI_VOLUME)) {
-		    lowerLayer = r.getMiniVolume();
-		}
-		int endHour = -1;
-		int timeSpan = -1;
-		if (rp.params.contains(Param.TIME_SPAN)) {
-			endHour = r.getEndHour();
-			timeSpan = r.getTimeSpan();
-		}
-    
-	    return String.format("%-39.39s  %-3.3s%4d%4d%6d %c%6d%7d%2d%2d%c%3d%3d %c%7d%7d",
-	    		rp.name, rp.mnemonic,
-	    		r.productCode, 
-	    		rp.levels != null ? rp.levels : 0,
-				rp.resolution != null ? (int)(rp.resolution * 100) : 0,
-				layerCode, elev, -1 /*contour interval*/,
-				r.highPriority ? 1 : 0, r.interval, 
-				r.mapRequested ? 'Y' : 'N',
-				lowerLayer, upperLayer,
-				multiCuts ? 'Y' : 'N',
-				endHour, timeSpan);
-	}
+    }
+
+    private static final char[] layerCodes = { 'L', 'M', 'H' };
+
+    public static String formatAwips1Request(Request r, RadarType radarType) {
+        RadarProduct rp = ProductInfo.getInstance().selectOne(
+                new Selector(radarType, null, (int) r.productCode, null));
+
+        /*
+         * Could probably guess how to format the important parts, but this is
+         * what AWIPS-1 does anyway...
+         */
+        if (rp == null) {
+            throw new IllegalArgumentException(
+                    "Cannot format unknown product type " + r.productCode + ".");
+        }
+
+        /*
+         * Note there is no check for rp.contains(ELEVATION) This is fine for
+         * the current set of products that are available in the RPS list
+         * editor...
+         */
+        /*
+         * // Mimic: if (_multCuts == 'Y' && _elev > 16384) { _elev -= 16384; }
+         */
+        boolean multiCuts = false;
+        int elev = r.pdw22;
+        if (r.getElevationSelection() == Request.ALL_ELEVATIONS
+                && r.getElevationAngle() != 0) {
+            elev = r.getElevationAngle();
+            multiCuts = true;
+        }
+
+        char layerCode = '-';
+        if (rp.layer != null) {
+            try {
+                layerCode = layerCodes[rp.layer - 1];
+            } catch (ArrayIndexOutOfBoundsException e) {
+                // nothing
+            }
+        }
+        int lowerLayer = -1;
+        int upperLayer = -1;
+        if (rp.params.contains(Param.LAYER)) {
+            lowerLayer = r.getBottomAltitude();
+            upperLayer = r.getTopAltitude();
+        } else if (rp.params.contains(Param.MINI_VOLUME)) {
+            lowerLayer = r.getMiniVolume();
+        }
+        int endHour = -1;
+        int timeSpan = -1;
+        if (rp.params.contains(Param.TIME_SPAN)
+                || rp.params.contains(Param.TIME_SPAN_MINUTES)) {
+            endHour = r.getEndHour();
+            timeSpan = r.getTimeSpan();
+        }
+
+        return String.format(
+                "%-39.39s  %-3.3s%4d%4d%6d %c%6d%7d%2d%2d%c%3d%3d %c%7d%7d",
+                rp.name, rp.mnemonic, r.productCode,
+                rp.levels != null ? rp.levels : 0,
+                rp.resolution != null ? (int) (rp.resolution * 100) : 0,
+                layerCode, elev, -1 /* contour interval */, r.highPriority ? 1
+                        : 0, r.interval, r.mapRequested ? 'Y' : 'N',
+                lowerLayer, upperLayer, multiCuts ? 'Y' : 'N', endHour,
+                timeSpan);
+    }
 }
diff --git a/RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/rpsmgr/RPSListManager.java b/RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/rpsmgr/RPSListManager.java
index aa453a4fb7..817e5461c2 100755
--- a/RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/rpsmgr/RPSListManager.java
+++ b/RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/rpsmgr/RPSListManager.java
@@ -61,9 +61,9 @@ import com.raytheon.rcm.server.StatusManager.RadarStatus;
 
 /**
  * Manages current RPS lists and requests for changes to RPS lists.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
@@ -73,8 +73,9 @@ import com.raytheon.rcm.server.StatusManager.RadarStatus;
  * 2014-02-03   DR 14762   D. Friedman Handle updated national RPS lists.
  * 2015-06-10   4498       nabowle     Rename Util->RcmUtil
  * 2015-09-08   DR 17944   D. Friedman Handle elevation list file updates.
+ * 2016-01-20   5271       bkowal      Fix resource leak.
  * </pre>
- *
+ * 
  */
 public class RPSListManager extends RadarEventAdapter {
 
@@ -181,11 +182,13 @@ public class RPSListManager extends RadarEventAdapter {
             return "Error getting radar status";
         }
 
-        int[] cuts = ElevationInfo.getInstance().getScanElevations(radarID, currentVCP);
+        int[] cuts = ElevationInfo.getInstance().getScanElevations(radarID,
+                currentVCP);
         if (cuts == null && RcmUtil.getRadarType(rc) == RadarType.WSR)
             cuts = gsmCuts;
 
-        if (list.getVcp() != RpsList.UNSPECIFIED_VCP && list.getVcp() != currentVCP) {
+        if (list.getVcp() != RpsList.UNSPECIFIED_VCP
+                && list.getVcp() != currentVCP) {
             if (store)
                 return null; // TODO: Should warn instead.
             else
@@ -240,13 +243,13 @@ public class RPSListManager extends RadarEventAdapter {
             rpsList = null;
 
         if (rpsList == null) {
-            int[] cuts = ElevationInfo.getInstance().
-                getScanElevations(rc.getRadarID(), gsm.vcp);
+            int[] cuts = ElevationInfo.getInstance().getScanElevations(
+                    rc.getRadarID(), gsm.vcp);
             if (cuts == null && RcmUtil.getRadarType(rc) == RadarType.WSR)
                 cuts = gsm.cuts;
 
-            rpsList = getMergedRpsListForRadar(rc, gsm.opMode, gsm.vcp,
-                    cuts, null);
+            rpsList = getMergedRpsListForRadar(rc, gsm.opMode, gsm.vcp, cuts,
+                    null);
 
             // TODO: Should persist this (wouldn't need clone code)
             if (rpsList != null)
@@ -259,7 +262,7 @@ public class RPSListManager extends RadarEventAdapter {
 
     /**
      * From AWIPS 1 ProductRequestList::addMiniVolumeProduct() (DCS 3411)
-     *
+     * 
      * For TDWR VCP80, 2 products might be generated in one volume (2 mini
      * volumes) for some products. Parameter lowerLayer is used to specify these
      * 2 products: 1 - generated at mid volume; 2 - generated at end volume
@@ -267,7 +270,7 @@ public class RPSListManager extends RadarEventAdapter {
      * implementation ---------------------------------------------------------
      * Searches list for mini volume products, add a new entry with lowerLayer 1
      * CZ(35-38),ET(41),VIL(57),STI(58),HI(59),TVS(61),MD(141),DMD(149)
-     *
+     * 
      */
     /*
      * This must be kept in sync with
@@ -279,8 +282,8 @@ public class RPSListManager extends RadarEventAdapter {
             return;
 
         /*
-         * We want to put these products at the end of the list so that they
-         * do not have priority over existing products.
+         * We want to put these products at the end of the list so that they do
+         * not have priority over existing products.
          */
         Selector sel = new Selector();
         sel.radarType = RadarType.TDWR;
@@ -290,8 +293,8 @@ public class RPSListManager extends RadarEventAdapter {
             Request r = reqs.get(i);
             sel.code = (int) r.productCode;
             RadarProduct prod = ProductInfo.getInstance().selectOne(sel);
-            if (prod != null && prod.params.contains(Param.MINI_VOLUME) &&
-                    r.getMiniVolume() != 1) {
+            if (prod != null && prod.params.contains(Param.MINI_VOLUME)
+                    && r.getMiniVolume() != 1) {
                 Request r2 = r.clone();
                 r2.setMiniVolume(1);
                 reqs.add(r2);
@@ -321,14 +324,14 @@ public class RPSListManager extends RadarEventAdapter {
             Log.warnf("Cannot determine maximum RPS list size for %s",
                     rc.getRadarID());
         if (requestCount < 0)
-            Log.warnf("Cannot number of requests in RPS list for %s", rc
-                    .getRadarID());
+            Log.warnf("Cannot number of requests in RPS list for %s",
+                    rc.getRadarID());
         if (maxSize >= 0 && requestCount >= 0 && requestCount > maxSize) {
             int truncCount = 0;
             int i;
             for (i = reqs.length - 1; i >= 0; --i) {
-                truncCount += RpsList.getRequestCount(reqs[i], rc.getRadarID(), rpsList.getVcp(),
-                        RcmUtil.getRadarType(rc));
+                truncCount += RpsList.getRequestCount(reqs[i], rc.getRadarID(),
+                        rpsList.getVcp(), RcmUtil.getRadarType(rc));
                 if (requestCount - truncCount <= maxSize)
                     break;
             }
@@ -337,8 +340,10 @@ public class RPSListManager extends RadarEventAdapter {
 
             int originalCount = requestCount;
             requestCount = requestCount - truncCount;
-            Log.warnf("Truncated list for %s from %d entries (%d requests) to %d entries (%d requests)",
-                    rc.getRadarID(), reqs.length, originalCount, i, requestCount);
+            Log.warnf(
+                    "Truncated list for %s from %d entries (%d requests) to %d entries (%d requests)",
+                    rc.getRadarID(), reqs.length, originalCount, i,
+                    requestCount);
             // TODO: Also need to send a message to Guardian
             reqs = Arrays.copyOf(reqs, i);
             rpsList = new RpsList(rpsList.getOpMode(), rpsList.getVcp(), reqs);
@@ -346,8 +351,8 @@ public class RPSListManager extends RadarEventAdapter {
             Log.warnf("Sending empty RPS list to %s", rc.getRadarID());
         }
 
-        Log.eventf("%s: Sending RPS list with %d entries (%d requests)", rc.getRadarID(),
-                rpsList.getRequests().length, requestCount);
+        Log.eventf("%s: Sending RPS list with %d entries (%d requests)",
+                rc.getRadarID(), rpsList.getRequests().length, requestCount);
         byte[] msg = ProductRequest.encode(rpsList.getRequests());
         radarServer.getConnectionManager().sendMessageToRadar(rc.getRadarID(),
                 msg);
@@ -396,8 +401,7 @@ public class RPSListManager extends RadarEventAdapter {
                 path = new File(dir, rc.getRadarID().toUpperCase()
                         + ".currentVCP");
                 fo = new FileOutputStream(path);
-                try {
-                    PrintWriter p = new PrintWriter(fo);
+                try (PrintWriter p = new PrintWriter(fo)) {
                     p.printf("VCP%d\n", rpsList.getVcp());
                     p.flush();
                 } finally {
@@ -431,7 +435,7 @@ public class RPSListManager extends RadarEventAdapter {
     /**
      * Constructs a an RPS list for the given parameters, merging national and
      * local lists as appropriate.
-     *
+     * 
      * @param rc
      * @param opMode
      * @param vcp
@@ -487,14 +491,12 @@ public class RPSListManager extends RadarEventAdapter {
         maybeAddSPGMiniVolumeProducts(rc, reqs, vcp);
 
         /*
-         * AWIPS 1 disabled duplicate merging for TDWRs because some requests
-         * in the national RPS list would disappear. This was due to incorrect
-         * handling of multi-elevation requests. AWIPS 2 handles
-         * multi-elevation request correctly. (See DCS 3472, DRs 19386, 20239,
-         * and 20244.)
-         *
-         * if (vcp == 80 || vcp == 90)
-         *     elevList = null;
+         * AWIPS 1 disabled duplicate merging for TDWRs because some requests in
+         * the national RPS list would disappear. This was due to incorrect
+         * handling of multi-elevation requests. AWIPS 2 handles multi-elevation
+         * request correctly. (See DCS 3472, DRs 19386, 20239, and 20244.)
+         * 
+         * if (vcp == 80 || vcp == 90) elevList = null;
          */
 
         RadarType radarType = RcmUtil.getRadarType(rc);
@@ -518,7 +520,7 @@ public class RPSListManager extends RadarEventAdapter {
                          * later multi-elevation request that subsumes it to be
                          * lost when the list is truncated to fix the maximum
                          * number of products.
-                         *
+                         * 
                          * On the other hand, this could cause products listed
                          * before index j to be lost because the RPG counts each
                          * elevation in a multi-elevation request as a separate
@@ -599,8 +601,8 @@ public class RPSListManager extends RadarEventAdapter {
 
     private void resetRpsListForRadar(RadarConfig rc) {
         String radarID = rc.getRadarID();
-        RadarStatus status = radarServer.getStatusManager()
-                .getRadarStatus(radarID);
+        RadarStatus status = radarServer.getStatusManager().getRadarStatus(
+                radarID);
         byte[] gsmData = null;
         if (status != null)
             gsmData = status.getCurrentGSM();
@@ -609,10 +611,8 @@ public class RPSListManager extends RadarEventAdapter {
         if (gsmData != null) {
             handleGSM(rc, gsmData);
         } else {
-            Log.debugf(
-                    "RPS-relevant configuration changed for %s, but "
-                            + "it is not connected.  Cannot send a list now.",
-                    radarID);
+            Log.debugf("RPS-relevant configuration changed for %s, but "
+                    + "it is not connected.  Cannot send a list now.", radarID);
         }
     }
 }
diff --git a/build/deploy.edex.awips2/esb/conf/spring/edex-db.xml b/build/deploy.edex.awips2/esb/conf/spring/edex-db.xml
index 33b93f5c92..880c824e96 100644
--- a/build/deploy.edex.awips2/esb/conf/spring/edex-db.xml
+++ b/build/deploy.edex.awips2/esb/conf/spring/edex-db.xml
@@ -1,63 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:util="http://www.springframework.org/schema/util" xmlns:tx="http://www.springframework.org/schema/tx"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util" xmlns:tx="http://www.springframework.org/schema/tx"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
   http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util-3.1.xsd
   http://www.springframework.org/schema/tx
   http://www.springframework.org/schema/tx/spring-tx.xsd">  
 
-	<tx:annotation-driven transaction-manager="metadataTxManager"
-		proxy-target-class="true" />
-	
-	<!-- The db class finder will search the plugin dir for classes with @Entity or @Embeddable -->
-	<bean id="dbClassFinder" class="com.raytheon.uf.edex.database.DatabaseClassAnnotationFinder" />
+    <tx:annotation-driven transaction-manager="metadataTxManager"
+        proxy-target-class="true" />
+    
+    <!-- The db class finder will search the plugin dir for classes with @Entity or @Embeddable -->
+    <bean id="dbClassFinder" class="com.raytheon.uf.edex.database.DatabaseClassAnnotationFinder" />
 
-	<bean id="metadataDbSessionConfig"
-		class="com.raytheon.uf.edex.database.DatabaseSessionConfiguration">
-		<property name="classFinder" ref="dbClassFinder" />
-		<property name="excludes">
-			<list>
-				<value>com.raytheon.uf.common.dataplugin.text</value>
-				<value>com.raytheon.uf.common.dataplugin.shef</value>
-				<value>com.raytheon.edex.plugin.shef</value>
-				<value>com.raytheon.uf.common.bmh</value>
-			</list>
-		</property>
-	</bean>
-	<bean id="metadataSessionFactory"
-		class="com.raytheon.uf.edex.database.DatabaseSessionFactoryBean">
-		<property name="configLocation">
-			<value>file:///${edex.home}/conf/db/hibernateConfig/metadata/hibernate.cfg.xml
-			</value>
-		</property>
-		<!-- >property name="dataSource"><ref bean="datasourceMetadata"/></property -->
-		<property name="databaseSessionConfiguration" ref="metadataDbSessionConfig" />
-	</bean>
+    <bean id="metadataDbSessionConfig"
+        class="com.raytheon.uf.edex.database.DatabaseSessionConfiguration">
+        <property name="classFinder" ref="dbClassFinder" />
+        <property name="excludes">
+            <list>
+                <value>com.raytheon.uf.common.dataplugin.text</value>
+                <value>com.raytheon.uf.common.dataplugin.text.subscription</value>
+                <value>com.raytheon.uf.common.dataplugin.shef</value>
+                <value>com.raytheon.edex.plugin.shef</value>
+                <value>com.raytheon.uf.common.bmh</value>
+            </list>
+        </property>
+    </bean>
+    <bean id="metadataSessionFactory"
+        class="com.raytheon.uf.edex.database.DatabaseSessionFactoryBean">
+        <property name="configLocation">
+            <value>file:///${edex.home}/conf/db/hibernateConfig/metadata/hibernate.cfg.xml
+            </value>
+        </property>
+        <!-- >property name="dataSource"><ref bean="datasourceMetadata"/></property -->
+        <property name="databaseSessionConfiguration" ref="metadataDbSessionConfig" />
+    </bean>
 
-	<bean id="metadataTxManager"
-		class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-		<property name="sessionFactory" ref="metadataSessionFactory" />
-	</bean>
-	
-	<bean id="metadataTxTemplate" class="org.springframework.transaction.support.TransactionTemplate">
-		<property name="transactionManager" ref="metadataTxManager"/>
-	</bean>
+    <bean id="metadataTxManager"
+        class="org.springframework.orm.hibernate4.HibernateTransactionManager">
+        <property name="sessionFactory" ref="metadataSessionFactory" />
+    </bean>
 
-	<bean id="mapsSessionFactory"
-		class="com.raytheon.uf.edex.database.DatabaseSessionFactoryBean">
-		<!-- no annotations to load, so no databaseSessionConfig -->
-		<property name="configLocation">
-			<value>file:///${edex.home}/conf/db/hibernateConfig/maps/hibernate.cfg.xml
-			</value>
-		</property>
-	</bean>
+    <bean id="metadataTxTemplate" class="org.springframework.transaction.support.TransactionTemplate">
+        <property name="transactionManager" ref="metadataTxManager"/>
+    </bean>
 
-	<bean id="mapsTxManager"
-		class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-		<property name="sessionFactory" ref="mapsSessionFactory" />
-	</bean>
+    <bean id="mapsSessionFactory"
+        class="com.raytheon.uf.edex.database.DatabaseSessionFactoryBean">
+        <!-- no annotations to load, so no databaseSessionConfig -->
+        <property name="configLocation">
+            <value>file:///${edex.home}/conf/db/hibernateConfig/maps/hibernate.cfg.xml
+            </value>
+        </property>
+    </bean>
+
+    <bean id="mapsTxManager"
+        class="org.springframework.orm.hibernate4.HibernateTransactionManager">
+        <property name="sessionFactory" ref="mapsSessionFactory" />
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git a/build/deploy.edex.awips2/esb/etc/registry.sh b/build/deploy.edex.awips2/esb/etc/registry.sh
index 387afed6e3..dc533f725a 100644
--- a/build/deploy.edex.awips2/esb/etc/registry.sh
+++ b/build/deploy.edex.awips2/esb/etc/registry.sh
@@ -30,6 +30,7 @@ export EDEX_DEBUG_PORT=5012
 export EDEX_JMX_PORT=1620
 export LOG_CONF=logback-registry.xml
 export MGMT_PORT=9605
+export HTTP_PORT=9588
 
 export METADATA_POOL_MAX=20
 export METADATA_POOL_TIMEOUT=60
diff --git a/build/deploy.edex.awips2/esb/etc/request.sh b/build/deploy.edex.awips2/esb/etc/request.sh
index adab74fc07..670a13ac07 100644
--- a/build/deploy.edex.awips2/esb/etc/request.sh
+++ b/build/deploy.edex.awips2/esb/etc/request.sh
@@ -33,3 +33,4 @@ export EDEX_DEBUG_PORT=5005
 export EDEX_JMX_PORT=1616
 export LOG_CONF=logback-request.xml
 export MGMT_PORT=9601
+export HTTP_PORT=9581
diff --git a/build/deploy.edex.awips2/esb/etc/ebxmlRegistry.sh b/build/deploy.edex.awips2/esb/etc/sbnSimulator.sh
similarity index 83%
rename from build/deploy.edex.awips2/esb/etc/ebxmlRegistry.sh
rename to build/deploy.edex.awips2/esb/etc/sbnSimulator.sh
index 2467b3a59f..eada11f76a 100644
--- a/build/deploy.edex.awips2/esb/etc/ebxmlRegistry.sh
+++ b/build/deploy.edex.awips2/esb/etc/sbnSimulator.sh
@@ -22,16 +22,15 @@
 export MAX_MEM=1536 # in Meg
 
 if [ $HIGH_MEM == "on" ]; then
-    export MAX_MEM=2048
+    export MAX_MEM=2560
 fi
 
 export MAX_PERM_SIZE=192m
-export EDEX_DEBUG_PORT=5012
-export EDEX_JMX_PORT=1620
-export LOG_CONF=logback-ebxmlRegistry.xml
-export MGMT_PORT=9605
+export EDEX_DEBUG_PORT=5013
+export LOG_CONF=logback-registry.xml
+export MGMT_PORT=9606
 
 export METADATA_POOL_MAX=20
 export METADATA_POOL_TIMEOUT=60
 
-export SOFT_REF_LRU_POLICY_MS_PER_MB=50
+export SOFT_REF_LRU_POLICY_MS_PER_MB=50
\ No newline at end of file
diff --git a/build/deploy.edex/DeployESB.groovy b/build/deploy.edex/DeployESB.groovy
index a227414174..a186d3b206 100644
--- a/build/deploy.edex/DeployESB.groovy
+++ b/build/deploy.edex/DeployESB.groovy
@@ -30,6 +30,7 @@ import groovy.util.logging.*
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 4, 2014  3836       bkowal      Initial Commit
+ * Dec 9, 2015  4216       dhladky     Fix multi WA deploys
  *
  * </pre>
  *
@@ -85,22 +86,7 @@ class DeployESB
          architecture = 
             (System.getProperty("os.arch") == "amd64") ? "x86_64" : "x86"
       }
-      String esbLibIllusionPath = esbDirectory + File.separator + "lib" + File.separator + 
-         "lib_illusion" + File.separator + architecture
-      if (new File(esbLibIllusionPath).exists() == false)
-      {
-         log.log(java.util.logging.Level.SEVERE,
-            "Unable to find the illusion lib associated with architecture - " + architecture)
-         System.exit(-1)
-      }
-
-      String libIllusionDestination = edexRootDirectory + File.separator + 
-         "lib" + File.separator + "lib_illusion"
-      new File(libIllusionDestination).mkdirs()
-      ant.copy( todir : libIllusionDestination, overwrite : true )
-      {
-         fileset( dir : esbLibIllusionPath )
-      }
+      
    }
 
    public static void deployEdexConfiguration(String edexRootDirectory, String esbDirectory)
diff --git a/build/deploy.edex/RunDeployInstall.groovy b/build/deploy.edex/RunDeployInstall.groovy
index 9919ce49ec..fbbdf9c871 100644
--- a/build/deploy.edex/RunDeployInstall.groovy
+++ b/build/deploy.edex/RunDeployInstall.groovy
@@ -44,6 +44,7 @@ import IPluginCustomDeployer
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 4, 2014  3836       bkowal      Initial Commit
+ * Dec 9, 2015  4216       dhladky     Fix multi WA deploy
  *
  * </pre>
  *
@@ -124,7 +125,7 @@ class DeployInstall
       // complete the esb deployment
 
       // we need to determine the location of the build.edex project
-      ProjectInformation projectInformation = this.projectInformationMap["build.edex"]
+      ProjectInformation projectInformation = this.projectInformationMap["deploy.edex.awips2"]
       if (projectInformation == null)
       {
          log.log(java.util.logging.Level.SEVERE,
diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index 1481823ac0..c11dc8e287 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -5,7 +5,7 @@
 	<property name="build.version" value="1.0.0" />
 	<property name="build.os" value="linux" />
 	<property name="build.ws" value="gtk" />
-	<property name="build.arch" value="x86" />
+	<property name="build.arch" value="x86_64" />
 	<property name="workspace.dir" value="${basedir}/../" />
 
 	<property name="pde.build.script" value="org.eclipse.pde.build_3.8.2.v20121114-140810/scripts/build.xml" />
diff --git a/cave/build/tools/capture.bat b/cave/build/tools/capture.bat
new file mode 100644
index 0000000000..8a9df8421f
--- /dev/null
+++ b/cave/build/tools/capture.bat
@@ -0,0 +1,129 @@
+@echo OFF
+
+REM This is a MSFT Windows version of the CAVE capture script. 
+REM This script will identify any running CAVE processes (cave.exe) 
+REM and use Java to generate jstacks and (optionally) heap dumps
+REM for the process(es). All of the files generated by this capture
+REM script and any associated CAVE logs will be placed in a directory
+REM in the user's 'My Documents' directory.
+REM Usage: capture.bat [-d][-h]
+
+REM Verify that the location of the Java JDK is known.
+IF "%JAVA_JDK%" == "" (
+   echo ERROR: Unable to determine the location of the Java JDK. Use the JAVA_JDK Env Variable to set the location.
+   GOTO EOF
+)
+
+SET heap_dump=0
+
+REM Process and validate any command line parameters, displaying usage
+REM information if necessary.
+IF "%1" == "" GOTO run
+REM Verify that there is only one argument.
+IF NOT "%2" == "" GOTO usage
+REM Check for the -d argument.
+IF "%1" == "-d" (
+   SET heap_dump=1
+   GOTO run
+)
+REM Either an invalid argument or the -h argument.
+GOTO usage
+
+:usage
+echo Usage: %0 [-d][-h]
+echo    -d:  Enables the heap dump capture
+echo    -h:  Displays the usage message
+GOTO EOF
+
+:run
+SET jstack_iterations=15
+SET PROCESS=cave.exe
+
+REM Prepare Environment
+SET Path=%JAVA_JDK%\bin;%Path%
+
+REM Build a date/time string to use in the name for the capture directory.
+SET RND=%random%
+SET RND_DATETIME_FILE=%TMP%\awips2dt_%RND%.tmp
+REM Python is used to retrieve the current date and time because the order
+REM of the Windows date/time fields is not necessarily guaranteed and the
+REM Windows date/time fields can only be extracted using substring operations
+REM instead of -formatter- strings like Linux allows.
+python -c "from datetime import datetime; print datetime.now().strftime('%%Y%%m%%d_%%H%%M%%S');" > %RND_DATETIME_FILE%
+SET /p CAPTURE_DATETIME= < %RND_DATETIME_FILE%
+DEL %RND_DATETIME_FILE%
+
+SET CAPTURE_DIRECTORY=%userprofile%\capture_%CAPTURE_DATETIME%
+SET CAVEDATA_LOGS_DIRECTORY=%userprofile%\%logdir%
+SET CAPTURE_LOG=%CAPTURE_DIRECTORY%\capture_info.log
+
+REM Get the PID of any currently running CAVE process.
+for /f "tokens=2 delims=," %%F in ('tasklist /nh /fi "imagename eq %PROCESS%" /fo csv') do call :process_pid %%~F
+GOTO prepare_exit
+
+:process_pid
+IF NOT EXIST "%CAPTURE_DIRECTORY%" (MKDIR "%CAPTURE_DIRECTORY%")
+
+SET process_pid=%1
+SET jstack_counter=0
+echo Found %PROCESS% with pid %process_pid% ...
+echo Found %PROCESS% with pid %process_pid% ... >> %CAPTURE_LOG%
+:while_jstack
+if %jstack_counter% lss %jstack_iterations% (
+   set /a jstack_counter+=1
+   echo Completing jstack iteration %jstack_counter% ...
+   echo Completing jstack iteration %jstack_counter% ... >> %CAPTURE_LOG%
+  
+   SET jstack_log=%CAPTURE_DIRECTORY%\pid_%process_pid%_jstack_%jstack_counter%.log
+   jstack -l %process_pid% >> "%jstack_log%"
+   echo Running command: jstack -l %process_pid% >> %CAPTURE_LOG%
+   IF ERRORLEVEL 1 (
+      echo jstack for pid %process_pid% failed to connect, rerunning with -F >> %CAPTURE_LOG%
+      echo jstack for pid %process_pid% failed to connect, rerunning with -F
+      echo Running command: jstack -l -F %process_pid% >> %CAPTURE_LOG%
+      jstack -l -F %process_pid% >> "%jstack_log%"
+   )
+
+   goto :while_jstack
+)
+
+REM Copy the CAVE logs for the pid to the capture directory.
+echo Running command: xcopy "%CAVEDATA_LOGS_DIRECTORY%\*pid_%process_pid%*.log" "%CAPTURE_DIRECTORY%" >> %CAPTURE_LOG%
+xcopy "%CAVEDATA_LOGS_DIRECTORY%\*pid_%process_pid%*.log" "%CAPTURE_DIRECTORY%" >> %CAPTURE_LOG%
+IF ERRORLEVEL 0 GOTO check_heap
+echo Failed to copy the CAVE logs files.
+echo Failed to copy the CAVE logs files. >> %CAPTURE_LOG%
+
+:check_heap
+REM Create a heap dump if the option has been enabled.
+IF %heap_dump% NEQ 1 (
+    echo Heap dumps have been disabled. >> %CAPTURE_LOG%
+    exit /b
+)
+
+SET heap_path=%CAPTURE_DIRECTORY%\pid_%process_pid%_heap.hprof
+SET dump_path=%CAPTURE_DIRECTORY%\pid_%process_pid%_dump.txt
+echo Running command: jmap -heap %process_pid% >> %CAPTURE_LOG%
+jmap -heap %process_pid% > %heap_path%
+
+echo Running command: jmap -dump:live,format=b,file=%dump_path% %process_pid% >> %CAPTURE_LOG%
+jmap -dump:live,format=b,file=%dump_path% %process_pid%
+IF ERRORLEVEL 1 (
+    echo jmap for pid %process_pid% failed to connect, rerunning with -F >> %CAPTURE_LOG%
+    echo jmap for pid %process_pid% failed to connect, rerunning with -F
+    echo Running command: jmap -dump:live,format=b,file=%dump_path% -F %process_pid% >> %CAPTURE_LOG%
+    jmap -dump:live,format=b,file=%dump_path% -F %process_pid%
+)
+
+REM end of process_pid sub-routine
+exit /b
+
+:prepare_exit
+
+IF NOT EXIST %CAPTURE_DIRECTORY% (GOTO EOF)
+echo Capture data is available in %CAPTURE_DIRECTORY% ...
+
+start "" "%CAPTURE_DIRECTORY%"
+PAUSE
+
+:EOF
diff --git a/cave/com.raytheon.uf.viz.acarssounding/src/com/raytheon/uf/viz/acarssounding/AcarsSndNSharpResourceData.java b/cave/com.raytheon.uf.viz.acarssounding/src/com/raytheon/uf/viz/acarssounding/AcarsSndNSharpResourceData.java
index 30c297da4b..7de7914170 100644
--- a/cave/com.raytheon.uf.viz.acarssounding/src/com/raytheon/uf/viz/acarssounding/AcarsSndNSharpResourceData.java
+++ b/cave/com.raytheon.uf.viz.acarssounding/src/com/raytheon/uf/viz/acarssounding/AcarsSndNSharpResourceData.java
@@ -63,6 +63,7 @@ import com.raytheon.uf.viz.d2d.nsharp.rsc.D2DNSharpResourceData;
  * ------------ ---------- ----------- --------------------------
  * Aug 15, 2013            bsteffen     Initial creation
  * Jul 23, 2014 3410       bclement     preparePointInfo() calls unpackResultLocation()
+ * Dec 17, 2015 5215       dgilling     Set point name to stationId.
  * 
  * </pre>
  * 
@@ -78,21 +79,27 @@ public class AcarsSndNSharpResourceData extends D2DNSharpResourceData {
 
     private static final String LATITUDE = "location.latitude";
 
+    private static final String STATION_ID = "location.stationId";
+
     public AcarsSndNSharpResourceData() {
         super("MDCRS");
     }
 
     @Override
     protected void preparePointInfo() throws VizException {
-        if (coordinate == null) {
+        if ((coordinate == null) || (pointName == null)) {
             DbQueryRequest request = new DbQueryRequest();
             request.setConstraints(getMetadataMap());
-            request.addFields(new String[] { LONGITUDE, LATITUDE });
+            request.addFields(new String[] { STATION_ID, LONGITUDE, LATITUDE });
             request.setDistinct(true);
             DbQueryResponse response = (DbQueryResponse) ThriftClient
                     .sendRequest(request);
 
             for (Map<String, Object> result : response.getResults()) {
+                if (pointName == null) {
+                    pointName = (String) result.get(STATION_ID);
+                }
+
                 if (coordinate == null) {
                     coordinate = unpackResultLocation(result, LONGITUDE,
                             LATITUDE);
@@ -111,7 +118,8 @@ public class AcarsSndNSharpResourceData extends D2DNSharpResourceData {
         request.addConstraint("dataTime", new RequestConstraint(new DataTime(
                 stnInfo.getReftime()).toString()));
         try {
-            DbQueryResponse response = (DbQueryResponse) ThriftClient.sendRequest(request);
+            DbQueryResponse response = (DbQueryResponse) ThriftClient
+                    .sendRequest(request);
             ACARSSoundingRecord[] records = response
                     .getEntityObjects(ACARSSoundingRecord.class);
             if (records.length > 0) {
@@ -127,7 +135,8 @@ public class AcarsSndNSharpResourceData extends D2DNSharpResourceData {
                         builder.addTemperature(layer.getTemp(), SI.KELVIN);
                     }
                     if (layer.getWindDirection() != null) {
-                        builder.addWindDirection(layer.getWindDirection(), NonSI.DEGREE_ANGLE);
+                        builder.addWindDirection(layer.getWindDirection(),
+                                NonSI.DEGREE_ANGLE);
                     }
                     if (layer.getWindSpeed() != null) {
                         builder.addWindSpeed(layer.getWindSpeed(),
@@ -153,7 +162,7 @@ public class AcarsSndNSharpResourceData extends D2DNSharpResourceData {
         } catch (VizException e) {
             statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
         }
-        
+
         return null;
     }
 }
diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertMessageDlg.java b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertMessageDlg.java
index 8c2e07a68e..fac331bfbe 100644
--- a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertMessageDlg.java
+++ b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertMessageDlg.java
@@ -42,7 +42,6 @@ import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -101,6 +100,10 @@ import com.raytheon.uf.viz.alertviz.ui.audio.IAudioAction;
  * 31 May 2011  8058       cjeanbap    Kill sound based on TextMsgBox id.
  * 26 Aug 2013  #2293      lvenable    Fixed color memory leaks.
  * 02 Jun 2015  4473       mschenke    Remember dialog position
+ * 28 Oct 2015  5054       randerso    Fix lots of multimonitor display issues.
+ * 14 Jan 2016  5054       randerso    Fix the Tips window to display on the correct monitor
+ *                                     Removed duplicate parent shell
+ * 25 Jan 2016  5054       randerso    Converted to stand alone window
  * 
  * </pre>
  * 
@@ -119,11 +122,6 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
     private static final ScopedPreferenceStore dialogPrefs = new ScopedPreferenceStore(
             InstanceScope.INSTANCE, Activator.PLUGIN_ID);
 
-    /**
-     * Parent shell.
-     */
-    private final Shell parentShell;
-
     /**
      * Local shell.
      */
@@ -150,9 +148,9 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
     private Label resizeLabel;
 
     /**
-     * Location of the dialog on the screen.
+     * Mouse down location
      */
-    private Point origin;
+    private Point mouseDownPt;
 
     /**
      * Show dialog flag.
@@ -169,26 +167,11 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
      */
     private boolean resizeDialog = false;
 
-    /**
-     * Dialog location.
-     */
-    private Point dialogLoc;
-
     /**
      * ArrayList of TextMsgControlComp objects.
      */
     private ArrayList<TextMsgControlComp> txtMsgCompArray;
 
-    /**
-     * Starting X position.
-     */
-    private int startXpos = -1;
-
-    /**
-     * Screen width.
-     */
-    private int screenWidth = 0;
-
     /**
      * Text composite.
      */
@@ -247,20 +230,21 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
     /**
      * Constructor.
      * 
-     * @param parentShell
-     *            Parent shell.
+     * @param display
+     *            Parent display.
      * @param audioCB
      *            Audio callback.
      * @param showDialog
      *            Show dialog flag.
      * @param configData
      *            Configuration data.
+     * @param alertAudioMgr
      */
-    public AlertMessageDlg(Shell parentShell, IAudioAction audioCB,
+    public AlertMessageDlg(Display display, IAudioAction audioCB,
             boolean showDialog, Configuration configData,
             AlertAudioMgr alertAudioMgr) {
+        this.display = display;
         this.showDialog = showDialog;
-        this.parentShell = parentShell;
 
         this.alertAudioMgr = alertAudioMgr;
         this.audioCB = audioCB;
@@ -273,17 +257,21 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
         }
     }
 
+    /**
+     * @return the shell
+     */
+    public Shell getShell() {
+        return shell;
+    }
+
     /**
      * Open method used to display the dialog.
      * 
      * @return True/False.
      */
     public Object open() {
-        display = parentShell.getDisplay();
-
-        Shell shell1 = new Shell(parentShell, SWT.NO_TRIM);
-        shell = new Shell(shell1, SWT.ON_TOP);
-        shell.setLocation(getDialogPosition());
+        shell = new Shell(display, SWT.ON_TOP | SWT.NO_TRIM);
+        shell.setBounds(restoreDialogPosition());
 
         shell.addDisposeListener(new DisposeListener() {
             @Override
@@ -306,6 +294,7 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
         shell.pack();
         shell.open();
 
+        // force bar location to be within the display.
         Point shellLoc = shell.getLocation();
         Point shellSize = shell.getSize();
         Display d = shell.getDisplay();
@@ -333,11 +322,18 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
         return returnValue;
     }
 
+    /**
+     * @return true if dialog is disposed
+     */
+    public boolean isDisposed() {
+        return (shell == null) || shell.isDisposed();
+    }
+
     /**
      * Dispose of all the message timers.
      */
     public void dispose() {
-        setDialogPosition(dialogLoc);
+        saveDialogPosition(shell.getBounds());
 
         // Stop all of the message timers.
         for (int i = 0; i < txtMsgCompArray.size(); i++) {
@@ -356,6 +352,10 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
             monitor.dispose();
         }
 
+        if (shell != null) {
+            shell.dispose();
+        }
+
         ConfigurationManager.getInstance().getCustomLocalization()
                 .removeFileUpdatedObserver(this);
 
@@ -374,8 +374,6 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
      * Initialize the components on the display.
      */
     private void initializeComponents() {
-        screenWidth = display.getPrimaryMonitor().getBounds().width;
-
         TrayConfiguration.TrayMode tm = configData.getGlobalConfiguration()
                 .getMode();
         boolean monitorOnly = (TrayConfiguration.TrayMode.MO.equals(tm) ? true
@@ -402,9 +400,6 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
         mainComp.setLayout(gl);
         mainComp.setLayoutData(gd);
 
-        dialogLoc = shell.getLocation();
-        origin = dialogLoc;
-
         moveLabel = new Label(mainComp, SWT.NONE);
         moveLabel.setImage(new Image(display, loadHandleImage()));
         moveLabel.setToolTipText("Move");
@@ -531,8 +526,8 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
     }
 
     public void setMaxLogSize(final int maxLogSize) {
-        if (txtMsgCompArray != null && txtMsgCompArray.size() > 0
-                && maxLogSize != txtMsgCompArray.get(0).getMaxLogSize()) {
+        if ((txtMsgCompArray != null) && (txtMsgCompArray.size() > 0)
+                && (maxLogSize != txtMsgCompArray.get(0).getMaxLogSize())) {
             for (TextMsgControlComp comp : txtMsgCompArray) {
                 comp.setMaxLogSize(maxLogSize);
             }
@@ -547,31 +542,24 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
      */
     @Override
     public void mouseMove(MouseEvent e) {
-        if ((Label) e.getSource() == moveLabel) {
-            if (origin != null && moveDialog == true) {
-                dialogLoc = display.map(shell, null, e.x, e.y);
-                shell.setLocation(dialogLoc.x - origin.x, dialogLoc.y
-                        - origin.y);
-            }
-        } else if ((Label) e.getSource() == resizeLabel) {
-            if (resizeDialog == true) {
-                int newWidth = e.x - startXpos + shell.getSize().x;
-
-                if (newWidth < 300) {
-                    return;
+        if (mouseDownPt != null) {
+            if ((Label) e.getSource() == moveLabel) {
+                if (moveDialog == true) {
+                    Point dialogLoc = shell.getLocation();
+                    dialogLoc.x = dialogLoc.x + (e.x - mouseDownPt.x);
+                    dialogLoc.y = dialogLoc.y + (e.y - mouseDownPt.y);
+                    shell.setLocation(dialogLoc);
                 }
+            } else if ((Label) e.getSource() == resizeLabel) {
+                if (resizeDialog == true) {
+                    int newWidth = shell.getSize().x + (e.x - mouseDownPt.x);
 
-                int shellLocationXCoord = shell.getLocation().x;
+                    if (newWidth < 300) {
+                        return;
+                    }
 
-                if (shellLocationXCoord > screenWidth) {
-                    shellLocationXCoord = shellLocationXCoord - screenWidth;
+                    shell.setSize(newWidth, shell.getSize().y);
                 }
-
-                if (newWidth >= (screenWidth - shellLocationXCoord)) {
-                    return;
-                }
-
-                shell.setSize(newWidth, shell.getSize().y);
             }
         }
     }
@@ -585,13 +573,12 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
     @Override
     public void mouseDown(MouseEvent e) {
         if (e.button != SWT.BUTTON3) {
-            origin = new Point(e.x, e.y);
+            mouseDownPt = new Point(e.x, e.y);
             if ((Label) e.getSource() == moveLabel) {
                 moveDialog = true;
 
             } else if ((Label) e.getSource() == resizeLabel) {
                 resizeDialog = true;
-                startXpos = e.x;
             }
         }
     }
@@ -605,14 +592,12 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
     @Override
     public void mouseUp(MouseEvent e) {
         if (e.button != SWT.BUTTON3) {
+            mouseDownPt = null;
             if ((Label) e.getSource() == moveLabel) {
                 moveDialog = false;
 
-                configData.getGlobalConfiguration().setPosition(
-                        shell.getBounds());
             } else if ((Label) e.getSource() == resizeLabel) {
                 resizeDialog = false;
-                startXpos = -1;
             }
         }
     }
@@ -637,10 +622,6 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
     public void showDialog(boolean showDialogFlag) {
         showDialog = showDialogFlag;
 
-        // if (showDialog == true) {
-        // shell.setLocation(dialogLoc.x - origin.x, dialogLoc.y - origin.y);
-        // }
-
         shell.setVisible(showDialog);
     }
 
@@ -661,7 +642,7 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
     }
 
     public void resetTabControl() {
-        boolean isOpen = tabControlDlg != null && !tabControlDlg.isDisposed()
+        boolean isOpen = (tabControlDlg != null) && !tabControlDlg.isDisposed()
                 && tabControlDlg.isOpened();
         reLayout();
         // TODO: Need to determine which tabs to open and populate them.
@@ -689,7 +670,7 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
             RGB[] prevForeground = new RGB[size];
             dispose();
             for (int i = 0; i < txtMsgCompArray.size(); i++) {
-                if (txtMsgCompArray.get(i) != null
+                if ((txtMsgCompArray.get(i) != null)
                         && !txtMsgCompArray.get(i).isDisposed()) {
                     prevMessageText[i] = txtMsgCompArray.get(i)
                             .getMessageText();
@@ -707,15 +688,16 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
             open();
             result = true;
             for (int i = 0; i < txtMsgCompArray.size(); i++) {
-                if (i < prevMessageText.length && prevMessageText[i] != null) {
+                if ((i < prevMessageText.length)
+                        && (prevMessageText[i] != null)) {
                     txtMsgCompArray.get(i).setMessageText(prevMessageText[i]);
-                    if (prevBackground[i] != null && prevForeground[i] != null) {
+                    if ((prevBackground[i] != null)
+                            && (prevForeground[i] != null)) {
                         txtMsgCompArray.get(i).setMessageTextBackAndForeground(
                                 prevBackground[i], prevForeground[i]);
                     }
                 }
             }
-            setDialogLocation();
             shell.update();
             alertAudioMgr = null;
             alertAudioMgr = new AlertAudioMgr(display,
@@ -982,13 +964,6 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
         this.configData = configData;
     }
 
-    /**
-     * Save the dialog location information.
-     */
-    public void saveDialogBounds() {
-        configData.getGlobalConfiguration().setPosition(shell.getBounds());
-    }
-
     /**
      * Is the message dlg enabled
      * 
@@ -1012,24 +987,23 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
             return;
         }
 
-        Shell shell = new Shell();
-        shell.addDisposeListener(new DisposeListener() {
+        infoTextShell = new Shell(this.shell.getDisplay());
+        infoTextShell.addDisposeListener(new DisposeListener() {
             @Override
             public void widgetDisposed(DisposeEvent e) {
                 infoTextShell = null;
             }
         });
 
-        infoTextShell = shell;
-
-        shell.setLayout(new FillLayout());
-        shell.setSize(800, 900);
-
-        shell.setText(" AlertViz Tips! ");
+        infoTextShell.setMinimumSize(300, 200);
+        infoTextShell.setLayout(new GridLayout());
+        infoTextShell.setText(" AlertViz Tips! ");
 
         // create the styled text widget
-        StyledText widget = new StyledText(shell, SWT.MULTI | SWT.WRAP
+        StyledText widget = new StyledText(infoTextShell, SWT.MULTI
                 | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+        GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
+        widget.setLayoutData(layoutData);
 
         widget.setText("----------------------------------------------\n"
                 + " Here are some basic tips on how to use the AlertViz Main GUI: \n\n"
@@ -1069,7 +1043,26 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
                 + "5 - Perhaps not even important enough for a notice of any kind.  Informational. \n\n"
                 + "------------------------------------------------------------\n\n");
 
-        shell.open();
+        infoTextShell.layout();
+        infoTextShell.pack();
+
+        Rectangle b = this.shell.getBounds();
+        Monitor m = this.shell.getMonitor();
+
+        // attempt to position tips window above or below alertviz bar
+
+        // if tips window would be partially off screen it will be forced on
+        // screen by eclipse/window manager
+        if (b.y < (m.getBounds().height - (b.y + b.height))) {
+            // space below alertviz bar > than space above so position below
+            infoTextShell.setLocation(b.x, b.y + b.height);
+        } else {
+            // space above alertviz bar > than space below so position above
+            infoTextShell.setLocation(b.x, b.y
+                    - infoTextShell.getBounds().height);
+        }
+
+        infoTextShell.open();
     }
 
     /**
@@ -1114,13 +1107,13 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
         errorBtnBgColor = new Color(display, 237, 233, 227);
         errorBtn.setBackground(errorBtnBgColor);
 
-        if (tabControlDlg == null || tabControlDlg.isDisposed()) {
+        if ((tabControlDlg == null) || tabControlDlg.isDisposed()) {
             tabControlDlg = TabControlDlg.getInstance(shell);
         }
         if (textMsgLog == null) {
             String[] categories = new String[] { "Causes", "Catch", "Error",
                     "Exception" };
-            textMsgLog = new TextMsgLog(parentShell, categories, 0, messageVec);
+            textMsgLog = new TextMsgLog(shell, categories, 0, messageVec);
             textMsgLog.setIndex(0);
         }
         if (opened) {
@@ -1146,7 +1139,7 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
         if (textMsgLog == null) {
             String[] categories = new String[] { "Causes", "Catch", "Error",
                     "Exception" };
-            textMsgLog = new TextMsgLog(parentShell, categories, 0, messageVec);
+            textMsgLog = new TextMsgLog(shell, categories, 0, messageVec);
             textMsgLog.setIndex(0);
         }
         textMsgLog.addMessage(statMsg);
@@ -1173,14 +1166,14 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
 
         for (Source source : sourceMap.values()) {
             String name = source.getName();
-            if (source.isMonitor() && name != null) {
+            if (source.isMonitor() && (name != null)) {
                 String imageFile = source.getConfigurationMonitor()
                         .getMonitorMetadata().getImageFile();
                 boolean omitMonitor = source.getConfigurationMonitor()
                         .getMonitorMetadata().getOmit();
                 AlertMonitor monitor = alertMonitors.get(name);
 
-                if (imageFile != null
+                if ((imageFile != null)
                         && (!imageFile.equals("null") && !imageFile.equals(""))) {
                     if (monitor != null) {
                         monitor.setImageName(imageFile);
@@ -1227,42 +1220,23 @@ public class AlertMessageDlg implements MouseMoveListener, MouseListener,
         return map;
     }
 
-    public Rectangle getCurrentLocation() {
-        Rectangle position = new Rectangle(dialogLoc.x, dialogLoc.y,
-                parentShell.getBounds().width, parentShell.getBounds().height);
-        return position;
-    }
-
-    private void setDialogLocation() {
-        // get any monitors height; should be in an utility class also used in
-        // TabControlDlg.
-        Monitor any = (display.getMonitors())[0];
-        Rectangle monSize = any.getBounds();
-        int monY = monSize.height;
-
-        Rectangle rect = shell.getBounds();
-
-        if (shell.getBounds().y < 0) {
-            shell.setLocation(rect.x, rect.y + 100);
-        }
-
-        if (shell.getBounds().y > (monY - 100)) {
-            shell.setLocation(rect.x, rect.y - 100);
-        }
-    }
-
     public AlertAudioMgr getAlertAudioManager() {
         return alertAudioMgr;
     }
 
-    public static Point getDialogPosition() {
-        return new Point(dialogPrefs.getInt(P_ALERT_MSG_DLG_POSITION + ".x"),
-                dialogPrefs.getInt(P_ALERT_MSG_DLG_POSITION + ".y"));
+    public static Rectangle restoreDialogPosition() {
+        return new Rectangle(
+                dialogPrefs.getInt(P_ALERT_MSG_DLG_POSITION + ".x"),
+                dialogPrefs.getInt(P_ALERT_MSG_DLG_POSITION + ".y"),
+                dialogPrefs.getInt(P_ALERT_MSG_DLG_POSITION + ".width"),
+                dialogPrefs.getInt(P_ALERT_MSG_DLG_POSITION + ".height"));
     }
 
-    public static void setDialogPosition(Point p) {
-        dialogPrefs.setValue(P_ALERT_MSG_DLG_POSITION + ".x", p.x);
-        dialogPrefs.setValue(P_ALERT_MSG_DLG_POSITION + ".y", p.y);
+    public static void saveDialogPosition(Rectangle r) {
+        dialogPrefs.setValue(P_ALERT_MSG_DLG_POSITION + ".x", r.x);
+        dialogPrefs.setValue(P_ALERT_MSG_DLG_POSITION + ".y", r.y);
+        dialogPrefs.setValue(P_ALERT_MSG_DLG_POSITION + ".width", r.width);
+        dialogPrefs.setValue(P_ALERT_MSG_DLG_POSITION + ".height", r.height);
         try {
             dialogPrefs.save();
         } catch (IOException e) {
diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertPopupMessageDlg.java b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertPopupMessageDlg.java
index edab9ff9b6..d3b93c1c2f 100644
--- a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertPopupMessageDlg.java
+++ b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertPopupMessageDlg.java
@@ -42,7 +42,6 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Dialog;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.List;
@@ -71,6 +70,8 @@ import com.raytheon.uf.viz.alertviz.config.AlertMetadata;
  *                                     acknowledgeLastMessage().
  * 20 Apr 2015  4311       lvenable    Fixed text field to accept really long text strings.
  * 29 Jun 2015  4311       randerso    Reworking AlertViz dialogs to be resizable.
+ * 25 Jan 2016  5054       randerso    Converted to stand alone window
+ * 08 Feb 2016  5312       randerso    Deleted isDisposed() added isOpen()
  * 
  * </pre>
  * 
@@ -78,8 +79,8 @@ import com.raytheon.uf.viz.alertviz.config.AlertMetadata;
  * @version 1.0
  * 
  */
-public class AlertPopupMessageDlg extends Dialog implements MouseMoveListener,
-        MouseListener, DisposeListener {
+public class AlertPopupMessageDlg implements MouseMoveListener, MouseListener,
+        DisposeListener {
     private static final int MAX_INITIAL_LINES = 5;
 
     private static final int WIDTH_IN_CHARS = 135;
@@ -282,8 +283,7 @@ public class AlertPopupMessageDlg extends Dialog implements MouseMoveListener,
     /**
      * Constructor.
      * 
-     * @param parent
-     *            Parent shell.
+     * @param display
      * @param statMsg
      *            Status message.
      * @param expanded
@@ -293,9 +293,9 @@ public class AlertPopupMessageDlg extends Dialog implements MouseMoveListener,
      * @param startUpRGB
      *            Color to be displayed at startup.
      */
-    public AlertPopupMessageDlg(Shell parent, StatusMessage statMsg,
+    public AlertPopupMessageDlg(Display display, StatusMessage statMsg,
             boolean expanded, Listener listener, RGB startUpRGB) {
-        super(parent, 0);
+        this.display = display;
         eventListener = listener;
         statMsgArray.add(statMsg);
         this.expanded = expanded;
@@ -308,10 +308,7 @@ public class AlertPopupMessageDlg extends Dialog implements MouseMoveListener,
      * Initialize the shell
      */
     private void initShell(RGB startUp) {
-        Shell parent = getParent();
-        display = parent.getDisplay();
-
-        shell = new Shell(parent, SWT.ON_TOP | SWT.RESIZE);
+        shell = new Shell(display, SWT.ON_TOP | SWT.RESIZE);
         shell.setText("Alert Visualization Popup Message Dialog");
 
         shell.addDisposeListener(this);
@@ -1066,12 +1063,12 @@ public class AlertPopupMessageDlg extends Dialog implements MouseMoveListener,
     }
 
     /**
-     * Returns if dialog is disposed.
+     * Returns true if dialog is open
      * 
-     * @return True if disposed, false if not.
+     * @return True if open, false if not.
      */
-    public boolean isDisposed() {
-        return shell.isDisposed();
+    public boolean isOpen() {
+        return (shell != null) && !shell.isDisposed() && shell.isVisible();
     }
 
 }
diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisConfigDlg.java b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisConfigDlg.java
index e08bee1378..343f44d840 100644
--- a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisConfigDlg.java
+++ b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisConfigDlg.java
@@ -38,7 +38,6 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Dialog;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
@@ -100,6 +99,8 @@ import com.raytheon.uf.viz.alertviz.ui.dialogs.ConfigurationFileDlg.Function;
  * 07 Feb 2013	 15490	   Xiaochuan   Past this object to LayoutControlsComp.
  * 26 Aug 2013   #2293     lvenable    Fixed color memory leak and cleaned up some code.
  * 23 Oct 2013   2303      bgonzale    Old patch to fix tool tip layout.
+ * 28 Oct 2005   5054      randerso    Removed bar position as it was written but never read
+ * 25 Jan 2016   5054      randerso    Converted to stand alone window
  * 
  * </pre>
  * 
@@ -107,8 +108,8 @@ import com.raytheon.uf.viz.alertviz.ui.dialogs.ConfigurationFileDlg.Function;
  * @version 1.0
  * 
  */
-public class AlertVisConfigDlg extends Dialog implements
-        IConfigurationChangedListener, INeedsSaveListener {
+public class AlertVisConfigDlg implements IConfigurationChangedListener,
+        INeedsSaveListener {
 
     private final String CONFIG_LABEL = "Current Config: ";
 
@@ -264,16 +265,16 @@ public class AlertVisConfigDlg extends Dialog implements
     /**
      * Constructor.
      * 
-     * @param parent
-     *            Parent shell.
+     * @param display
      * @param configData
      *            Configuration data.
      */
-    public AlertVisConfigDlg(Shell parent, final AlertMessageDlg alertMsgDlg,
-            Configuration configData, ConfigContext configContext,
+    public AlertVisConfigDlg(Display display,
+            final AlertMessageDlg alertMsgDlg, Configuration configData,
+            ConfigContext configContext,
             IConfigurationChangedListener configurationChangeListener,
             IRestartListener restartListener) {
-        super(parent, 0);
+        this.display = display;
         this.configData = configData;
         this.configContext = configContext;
         sourceMap = configData.getSources();
@@ -306,8 +307,6 @@ public class AlertVisConfigDlg extends Dialog implements
      * @return True/False.
      */
     public Object open() {
-        Shell parent = getParent();
-        display = parent.getDisplay();
         shell = new Shell(display, SWT.DIALOG_TRIM | SWT.MIN | SWT.RESIZE
                 | SWT.MAX);
         shell.setText("Alert Visualization Configuration");
@@ -396,6 +395,7 @@ public class AlertVisConfigDlg extends Dialog implements
         layoutControls = new LayoutControlsComp(layoutGroup, configData, this,
                 this);
         layoutGroup.addMouseTrackListener(new MouseTrackAdapter() {
+            @Override
             public void mouseHover(MouseEvent e) {
                 mttLayout.open();
             }
@@ -418,6 +418,7 @@ public class AlertVisConfigDlg extends Dialog implements
         mttCommonSetting = new MonitorToolTip(commonSettingsGroup, true);
 
         commonSettingsGroup.addMouseTrackListener(new MouseTrackAdapter() {
+            @Override
             public void mouseHover(MouseEvent e) {
                 mttCommonSetting.open();
             }
@@ -632,6 +633,7 @@ public class AlertVisConfigDlg extends Dialog implements
         mttSource = new MonitorToolTip(sourcesLbl, false);
 
         sourcesLbl.addMouseTrackListener(new MouseTrackAdapter() {
+            @Override
             public void mouseHover(MouseEvent e) {
                 mttSource.open();
             }
@@ -686,6 +688,7 @@ public class AlertVisConfigDlg extends Dialog implements
         sourcesList.setMenu(popupMenuSourceList);
 
         popupMenuSourceList.addListener(SWT.Show, new Listener() {
+            @Override
             public void handleEvent(Event event) {
                 MenuItem[] menuItems = popupMenuSourceList.getItems();
 
@@ -864,6 +867,7 @@ public class AlertVisConfigDlg extends Dialog implements
         mttPriorities = new MonitorToolTip(priorityLbl, false);
 
         priorityLbl.addMouseTrackListener(new MouseTrackAdapter() {
+            @Override
             public void mouseHover(MouseEvent e) {
                 mttPriorities.open();
             }
@@ -1134,7 +1138,7 @@ public class AlertVisConfigDlg extends Dialog implements
                     sourceMap.keySet());
             Boolean saveInfo = (Boolean) newSrcCatDlg.open();
 
-            if (saveInfo != null && saveInfo == true) {
+            if ((saveInfo != null) && (saveInfo == true)) {
                 String name = newSrcCatDlg.getTextKey();
                 String desc = newSrcCatDlg.getDescription();
 
@@ -1251,17 +1255,15 @@ public class AlertVisConfigDlg extends Dialog implements
         gConfig.setMode(layoutControls.getSelectedLayoutTrayMode()); // Mandatory
                                                                      // to be
                                                                      // HERE!
-        if (alertMsgDlg != null) {
-            gConfig.setPosition(alertMsgDlg.getCurrentLocation());
-        }
     }
 
     /**
      * Populate the priority controls.
      */
     private void populatePriorityControls() {
-        if (priorityControls == null)
+        if (priorityControls == null) {
             return;
+        }
 
         int index = sourcesList.getSelectionIndex();
 
diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java
index fe644671d8..0ff2c8bf47 100644
--- a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java
+++ b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java
@@ -22,12 +22,15 @@ package com.raytheon.uf.viz.alertviz.ui.dialogs;
 import java.io.File;
 
 import org.eclipse.equinox.app.IApplication;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MenuDetectEvent;
 import org.eclipse.swt.events.MenuDetectListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Display;
@@ -35,7 +38,6 @@ import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.ToolTip;
 import org.eclipse.swt.widgets.Tray;
@@ -96,6 +98,10 @@ import com.raytheon.uf.viz.core.VizApp;
  * 18 Mar 2015  4234       njensen     Remove reference to non-working python
  * 03 Jun 2015  4473       njensen     Updated for new AlertvizJob API
  * 29 Jun 2015  4311       randerso    Reworking AlertViz dialogs to be resizable.
+ * 28 Oct 2015  5054       randerso    Call AlertVisualization.dispose() on restart so all the
+ *                                     other dispose methods are called.
+ * 25 Jan 2016  5054       randerso    Removed dummy parent shell
+ * 08 Feb 2016  5312       randerso    Changed to build tray menu on demand
  * 
  * </pre>
  * 
@@ -106,11 +112,6 @@ import com.raytheon.uf.viz.core.VizApp;
 public class AlertVisualization implements ITimerAction, IAudioAction,
         IAlertArrivedCallback, Listener, IConfigurationChangedListener,
         IRestartListener {
-    /**
-     * Dialog shell.
-     */
-    protected Shell shell;
-
     /**
      * The display control.
      */
@@ -136,35 +137,10 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
      */
     private TrayItem trayItem;
 
-    /**
-     * A pop-up menu for the tray item.
-     */
-    protected Menu trayItemMenu;
-
-    /**
-     * Show alert visualization menu item.
-     */
-    private MenuItem showAlertDialogMI;
-
-    /**
-     * Do not disturb menu item.
-     */
-    private MenuItem doNotDisturbMI;
-
-    /**
-     * Show alert dialog popup menu item
-     */
-    private MenuItem showPopup;
-
-    /**
-     * Acknowledge all alerts menu item
-     */
-    private MenuItem ackAll;
-
     /**
      * Alert message dialog.
      */
-    private AlertMessageDlg alertMessageDlg;
+    protected AlertMessageDlg alertMessageDlg;
 
     /**
      * Text blink count variable.
@@ -211,6 +187,10 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
      */
     private boolean showAlertDlg = true;
 
+    private boolean ackAll = false;
+
+    private boolean showPopup = false;
+
     /**
      * Tool tip.
      */
@@ -221,8 +201,6 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
      */
     protected final boolean runningStandalone;
 
-    private Rectangle prevLocation = null;
-
     private ConfigContext configContext;
 
     private Configuration prevConfigFile;
@@ -245,15 +223,6 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
             showAlertDlg = Boolean.getBoolean("ShowAlertVizBar");
             doNotDisturb = true;
         }
-        initShell();
-    }
-
-    /**
-     * Initialize a main shell.
-     */
-    private void initShell() {
-        shell = new Shell(display);
-
         initializeComponents();
 
         AlertvizJob.getInstance().addAlertArrivedCallback(this);
@@ -295,10 +264,6 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
             alertMessageDlg.dispose();
         }
 
-        if (shell != null) {
-            shell.dispose();
-        }
-
         if (display != null) {
             display.dispose();
         }
@@ -322,9 +287,9 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
      * Initialize the alert message dialog.
      */
     private void initAlertMessageDialog() {
-        alertMessageDlg = new AlertMessageDlg(shell, this, showAlertDlg,
+        alertMessageDlg = new AlertMessageDlg(display, this, showAlertDlg,
                 configData, audioMgr);
-        display.asyncExec(new Runnable() {
+        display.syncExec(new Runnable() {
             @Override
             public void run() {
                 alertMessageDlg.open();
@@ -361,14 +326,13 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
         trayItem = new TrayItem(tray, SWT.NONE);
         updateToolTip();
 
-        trayItemMenu = new Menu(shell, SWT.POP_UP);
-
-        createTrayMenuItems();
-
         // Right click action
         trayItem.addMenuDetectListener(new MenuDetectListener() {
             @Override
             public void menuDetected(MenuDetectEvent de) {
+                Menu trayItemMenu = new Menu(alertMessageDlg.getShell(),
+                        SWT.POP_UP);
+                createTrayMenuItems(trayItemMenu);
                 trayItemMenu.setVisible(true);
             }
         });
@@ -389,10 +353,12 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
 
     /**
      * Create the tray menu items.
+     * 
+     * @param menu
      */
-    protected void createTrayMenuItems() {
+    protected void createTrayMenuItems(Menu menu) {
 
-        showAlertDialogMI = new MenuItem(trayItemMenu, SWT.CHECK);
+        MenuItem showAlertDialogMI = new MenuItem(menu, SWT.CHECK);
         showAlertDialogMI.setText("Show Alert Dialog");
         showAlertDialogMI.setSelection(showAlertDlg);
         showAlertDialogMI.addSelectionListener(new SelectionAdapter() {
@@ -411,20 +377,21 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
         });
 
         if (Boolean.getBoolean("SystemTray")) {
-            doNotDisturbMI = new MenuItem(trayItemMenu, SWT.CHECK);
+            MenuItem doNotDisturbMI = new MenuItem(menu, SWT.CHECK);
             doNotDisturbMI.setText("Do Not Disturb");
             doNotDisturbMI.setSelection(doNotDisturb);
             doNotDisturbMI.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent event) {
-                    doNotDisturb = doNotDisturbMI.getSelection();
+                    MenuItem item = (MenuItem) event.widget;
+                    doNotDisturb = item.getSelection();
                 }
             });
         }
 
-        new MenuItem(trayItemMenu, SWT.SEPARATOR);
+        new MenuItem(menu, SWT.SEPARATOR);
 
-        MenuItem configTrayMI = new MenuItem(trayItemMenu, SWT.NONE);
+        MenuItem configTrayMI = new MenuItem(menu, SWT.NONE);
         configTrayMI.setText("Configuration...");
         configTrayMI.addSelectionListener(new SelectionAdapter() {
             @Override
@@ -433,7 +400,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
             }
         });
 
-        MenuItem viewLogMI = new MenuItem(trayItemMenu, SWT.NONE);
+        MenuItem viewLogMI = new MenuItem(menu, SWT.NONE);
         viewLogMI.setText("System Log...");
         viewLogMI.addSelectionListener(new SelectionAdapter() {
             SimpleLogViewer slv = null;
@@ -441,7 +408,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
             @Override
             public void widgetSelected(SelectionEvent event) {
                 if ((slv == null) || slv.isDisposed()) {
-                    slv = new SimpleLogViewer(shell);
+                    slv = new SimpleLogViewer(display);
                     slv.open();
                 } else {
                     slv.bringToTop();
@@ -449,22 +416,23 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
             }
         });
 
-        new MenuItem(trayItemMenu, SWT.SEPARATOR);
+        new MenuItem(menu, SWT.SEPARATOR);
 
-        showPopup = new MenuItem(trayItemMenu, SWT.NONE);
-        showPopup.setText("Show Alert Popup Dialog...");
-        showPopup.setEnabled(false);
-        showPopup.addSelectionListener(new SelectionAdapter() {
+        MenuItem showPopupMI = new MenuItem(menu, SWT.NONE);
+        showPopupMI.setText("Show Alert Popup Dialog...");
+        showPopupMI.setEnabled(showPopup && (alertPopupDlg != null)
+                && !alertPopupDlg.isOpen());
+        showPopupMI.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
                 openAlertPopupDialog();
             }
         });
 
-        ackAll = new MenuItem(trayItemMenu, SWT.NONE);
-        ackAll.setText("Acknowledge All Messages");
-        ackAll.setEnabled(false);
-        ackAll.addSelectionListener(new SelectionAdapter() {
+        MenuItem ackAllMI = new MenuItem(menu, SWT.NONE);
+        ackAllMI.setText("Acknowledge All Messages");
+        ackAllMI.setEnabled(ackAll);
+        ackAllMI.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
                 if (alertPopupDlg != null) {
@@ -479,16 +447,31 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
         });
 
         if (this.runningStandalone) {
-            new MenuItem(trayItemMenu, SWT.SEPARATOR);
-            MenuItem restartMI = new MenuItem(trayItemMenu, SWT.NONE);
+            new MenuItem(menu, SWT.SEPARATOR);
+            MenuItem restartMI = new MenuItem(menu, SWT.NONE);
             restartMI.setText("Restart");
             restartMI.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent event) {
-                    MessageBox mb = new MessageBox(shell, SWT.ICON_QUESTION
-                            | SWT.YES | SWT.NO);
-                    mb.setMessage("Any unsaved changes will be lost. Restart anyway?");
-                    if (mb.open() == SWT.YES) {
+                    MessageDialog dialog = new MessageDialog(
+                            alertMessageDlg.getShell(),
+                            "Confirm Restart!",
+                            null,
+                            "Any unsaved changes will be lost. Restart anyway?",
+                            MessageDialog.QUESTION, new String[] {
+                                    IDialogConstants.YES_LABEL,
+                                    IDialogConstants.NO_LABEL }, 0);
+
+                    dialog.create();
+
+                    // center dialog on display
+                    Shell shell = dialog.getShell();
+                    Point size = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+                    Rectangle bounds = alertMessageDlg.getShell().getMonitor()
+                            .getBounds();
+                    shell.setLocation(bounds.x + ((bounds.width - size.x) / 2),
+                            bounds.y + ((bounds.height - size.y) / 2));
+                    if (dialog.open() == 0) {
                         restart();
                     }
                 }
@@ -586,7 +569,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
         if ((configDlg != null) && !configDlg.isDisposed()) {
             configDlg.close();
         }
-        configDlg = new AlertVisConfigDlg(shell, alertMessageDlg, configData,
+        configDlg = new AlertVisConfigDlg(display, alertMessageDlg, configData,
                 configContext, this, this);
         configDlg.open();
     }
@@ -608,7 +591,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
             final AlertMetadata amd, final Category cat,
             final TrayConfiguration gConfig) {
 
-        if (shell.isDisposed()) {
+        if ((alertMessageDlg == null) || alertMessageDlg.isDisposed()) {
             Container.logInternal(Priority.ERROR, statMsg.getMessage() + "\n"
                     + statMsg.getDetails());
             return;
@@ -690,10 +673,10 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
         // Pop-up message
         if (amd.isPopup() == true) {
             if (alertPopupDlg == null) {
-                alertPopupDlg = new AlertPopupMessageDlg(shell, statMsg,
+                alertPopupDlg = new AlertPopupMessageDlg(display, statMsg,
                         gConfig.isExpandedPopup(), this, amd.getBackground());
-                showPopup.setEnabled(true);
-                ackAll.setEnabled(true);
+                showPopup = true;
+                ackAll = true;
                 startBlinkTrayTimer();
             } else {
                 alertPopupDlg.addNewMessage(statMsg, amd);
@@ -761,7 +744,8 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
             toolTip.dispose();
         }
 
-        toolTip = new ToolTip(shell, SWT.BALLOON | SWT.ICON_WARNING);
+        toolTip = new ToolTip(alertMessageDlg.getShell(), SWT.BALLOON
+                | SWT.ICON_WARNING);
         toolTip.setText(cat.getCategoryName());
         toolTip.setMessage(statMsg.getMessage());
 
@@ -797,6 +781,9 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
         }
     }
 
+    /**
+     * @return the exit status
+     */
     public Integer getExitStatus() {
         return exitStatus;
     }
@@ -809,8 +796,8 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
     public void handleEvent(Event event) {
         switch (event.type) {
         case SWT.Hide:
-            ackAll.setEnabled(true);
-            showPopup.setEnabled(true);
+            ackAll = true;
+            showPopup = true;
             startBlinkTrayTimer();
             updateToolTip();
             break;
@@ -819,8 +806,9 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
             alertPopupDlg = null;
             cancelTimer();
             updateToolTip();
-            ackAll.setEnabled(false);
-            showPopup.setEnabled(false);
+
+            ackAll = false;
+            showPopup = false;
             break;
         default:
             Container.logInternal(Priority.WARN, "Unexpected event type: "
@@ -838,7 +826,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
             // such as Integer(1) the executable attempts to bring
             // up an error screen before exiting with the error code.
             exitStatus = IApplication.EXIT_RELAUNCH;
-            display.dispose();
+            this.dispose();
         }
     }
 
@@ -848,19 +836,16 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
         configData = ConfigurationManager.getInstance()
                 .getCurrentConfiguration();
         configContext = ConfigurationManager.getInstance().getCurrentContext();
-        if ((alertMessageDlg != null) && (showAlertDialogMI != null)) {
+        if (alertMessageDlg != null) {
             alertMessageDlg.setConfigData(configData);
             if (configData.isMonitorLayoutChanged(prevConfigFile)) {
                 if (alertMessageDlg.reLayout()) {
-                    showAlertDialogMI.setEnabled(true);
+                    showAlertDlg = true;
                 }
                 prevConfigFile = configData.clone();
             }
             audioMgr = alertMessageDlg.getAlertAudioManager();
         }
-        // if (configDlg != null && !configDlg.isDisposed()) {
-        // configDlg.restart(requestRestart);
-        // }
     }
 
     /**
diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/FileSelectDlg.java b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/FileSelectDlg.java
index d6ca0ce033..73de31a51b 100644
--- a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/FileSelectDlg.java
+++ b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/FileSelectDlg.java
@@ -34,7 +34,6 @@ import java.util.Vector;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -55,7 +54,6 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -73,6 +71,8 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * 07 Dec 2010  6531       cjeanbap    Refactored class to be an Abstract class.
  * 02 Mar 2011  5632       cjeanbap    Update Listbox title text
  * 06 May 2011  9101       cjeanbap    Changed Constructor method signature.
+ * 12 Nov 2015  4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * 
  * </pre>
  * 
  * @author lvenable
@@ -268,7 +268,7 @@ public class FileSelectDlg extends Dialog {
             fileList.add(locFile.getFile(false).getName());
         }
         fileList.select(getIndex());
-        fileList.addSelectionListener(new SelectionListener() {
+        fileList.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
                 selectedIndex = fileList.getSelectionIndex();
@@ -287,10 +287,6 @@ public class FileSelectDlg extends Dialog {
                     associatedTextBox.setText(name);
                 }
             }
-
-            @Override
-            public void widgetDefaultSelected(SelectionEvent e) {
-            }
         });
     }
 
@@ -313,6 +309,7 @@ public class FileSelectDlg extends Dialog {
         okBtn.setText("OK");
         okBtn.setLayoutData(gd);
         okBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 returnObj = true;
                 shell.dispose();
@@ -324,6 +321,7 @@ public class FileSelectDlg extends Dialog {
         cancelBtn.setText("Cancel");
         cancelBtn.setLayoutData(gd);
         cancelBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 if (isSelected()) {
                     returnObj = false;
@@ -339,6 +337,7 @@ public class FileSelectDlg extends Dialog {
         importNewBtn1.setText("Import");
         importNewBtn1.setLayoutData(gd);
         importNewBtn1.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 FileDialog newFileDlg = new FileDialog(shell, SWT.OPEN
                         | SWT.SINGLE);
@@ -368,10 +367,7 @@ public class FileSelectDlg extends Dialog {
                                 }
                                 setSelectedFile(newFile.getName());
                             }
-                        } catch (LocalizationOpFailedException e) {
-                            statusHandler.handle(Priority.PROBLEM,
-                                    e.getLocalizedMessage(), e);
-                        } catch (IOException e) {
+                        } catch (LocalizationException | IOException e) {
                             statusHandler.handle(Priority.PROBLEM,
                                     e.getLocalizedMessage(), e);
                         }
@@ -382,7 +378,7 @@ public class FileSelectDlg extends Dialog {
     }
 
     private boolean saveToLocalizationFile(File file, LocalizationFile locFile)
-            throws IOException, LocalizationOpFailedException {
+            throws IOException, LocalizationException {
         File newFile = locFile.getFile();
         InputStream in = new FileInputStream(file);
         OutputStream out = new FileOutputStream(newFile);
diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
index e050c65880..27eebc25e8 100644
--- a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
+++ b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
@@ -20,9 +20,14 @@
 package com.raytheon.uf.viz.alertviz.ui.dialogs;
 
 import java.io.File;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collection;
 
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.swt.SWT;
@@ -36,7 +41,6 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Dialog;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.FileDialog;
@@ -71,6 +75,8 @@ import com.raytheon.uf.viz.alertviz.config.TrayConfiguration;
  * Jun 02, 2015 4473       njensen     Cleaned up warnings
  * Jul 01, 2015 4473       njensen     Fix update of table on alert arrival
  * Jun 29, 2015 4311       randerso    Reworking AlertViz dialogs to be resizable.
+ * Jan 25, 2016 5054       randerso    Converted to stand alone window
+ * Feb 11, 2016 5314       dgilling    Fix System Log functionality.
  * 
  * </pre>
  * 
@@ -78,7 +84,7 @@ import com.raytheon.uf.viz.alertviz.config.TrayConfiguration;
  * @version 1.0
  */
 
-public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
+public class SimpleLogViewer implements IAlertArrivedCallback {
 
     private Display display;
 
@@ -88,8 +94,6 @@ public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
 
     private Button showLog;
 
-    int[] range;
-
     private Table table;
 
     private Color yellow;
@@ -104,13 +108,12 @@ public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
 
     /**
      * 
-     * @param parent
+     * @param display
      */
-    public SimpleLogViewer(Shell parent) {
-        super(parent, SWT.NONE);
+    public SimpleLogViewer(Display display) {
         first = true;
 
-        display = parent.getDisplay();
+        this.display = display;
 
         // Create a new shell object and set the text for the dialog.
         shell = new Shell(display, SWT.DIALOG_TRIM | SWT.MIN | SWT.TITLE
@@ -171,15 +174,10 @@ public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
         columns[3].setWidth(100);
         columns[4].setText("Message");
         columns[4].setWidth(100);
+
         int sz = 0;
         try {
-            range = SystemStatusHandler.getCurrentRange();
-            if ((range[0] == 0) && (range[1] == 0)) {
-                // database is empty
-                sz = 0;
-            } else {
-                sz = (range[1] - range[0]) + 1;
-            }
+            sz = SystemStatusHandler.getMessageCount();
         } catch (AlertvizException e2) {
             Container
                     .logInternal(
@@ -199,17 +197,27 @@ public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
         table.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
+                Integer pk = (Integer) e.item.getData();
                 int idx = table.getSelectionIndex();
+
                 StatusMessage sm = null;
                 try {
-
-                    sm = SystemStatusHandler.retrieveByPk(idx + range[0]);
+                    /*
+                     * This event is triggered during initialization before the
+                     * first TableItem has been assigned a PK in its data field.
+                     * So we fall back to item selection index just in case.
+                     */
+                    if (pk != null) {
+                        sm = SystemStatusHandler.retrieveByPk(pk.intValue());
+                    } else {
+                        sm = SystemStatusHandler.retrieveByRowOffset(idx);
+                    }
                 } catch (Exception e1) {
                     Container
                             .logInternal(
                                     Priority.ERROR,
                                     "SimpleLogViewer: exception retrieving StatusMessage by key from SystemStatusHandler: "
-                                            + (idx + range[0]), e1);
+                                            + (idx + 1), e1);
                 }
                 detailsComp.displayDetails(sm);
             }
@@ -227,12 +235,13 @@ public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
                 int index = table.indexOf(item);
                 try {
                     StatusMessage sm = SystemStatusHandler
-                            .retrieveByPk(range[0] + index);
+                            .retrieveByRowOffset(index);
                     item.setText(0, "" + sm.getEventTime().toString());
                     item.setText(1, "" + sm.getPriority().ordinal());
                     item.setText(2, sm.getSourceKey());
                     item.setText(3, sm.getCategory());
                     item.setText(4, sm.getMessage());
+                    item.setData(Integer.valueOf(sm.getPk()));
 
                     if (sm.getPriority() == Priority.CRITICAL) {
                         item.setForeground(red);
@@ -247,14 +256,15 @@ public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
                     }
 
                 } catch (AlertvizException e1) {
-                    Status s = new Status(IStatus.ERROR, Activator.PLUGIN_ID,
-                            "Error fetching the data", e1);
-                    ErrorDialog.openError(
-                            Display.getCurrent().getActiveShell(),
-                            "Error fetching data",
-                            "Error fetching the log data", s);
+                    Container
+                            .logInternal(
+                                    Priority.ERROR,
+                                    "SimpleLogViewer: exception retrieving StatusMessage by row offset from SystemStatusHandler: "
+                                            + index, e1);
+                    errorDialogWithStackTrace(Display.getCurrent()
+                            .getActiveShell(), "Error fetching data",
+                            "Error fetching the log data", e1);
                 }
-
             }
         });
 
@@ -281,10 +291,12 @@ public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
                         LogUtil.saveLogToFile(new File(fileName),
                                 new Timestamp(0), Order.AFTER);
                     } catch (AlertvizException e1) {
-                        final Status s = new Status(IStatus.ERROR,
-                                Activator.PLUGIN_ID, "Error saving log", e1);
-                        ErrorDialog.openError(shell, "Error saving log",
-                                "Error saving log", s);
+                        Container.logInternal(Priority.ERROR,
+                                "SimpleLogViewer: exception saving log file: "
+                                        + fileName, e1);
+                        errorDialogWithStackTrace(Display.getCurrent()
+                                .getActiveShell(), "Error saving log",
+                                "Error saving log", e1);
                     }
                 }
             }
@@ -356,8 +368,11 @@ public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
         AlertvizJob.getInstance().addAlertArrivedCallback(this);
 
         shell.open();
-        table.showItem(table.getItem(table.getItemCount() - 1));
-        table.select(table.getItemCount() - 1);
+
+        if (table.getItemCount() > 0) {
+            table.showItem(table.getItem(table.getItemCount() - 1));
+            table.select(table.getItemCount() - 1);
+        }
 
         // Wait until the shell is disposed.
         Display display = shell.getDisplay();
@@ -404,4 +419,26 @@ public class SimpleLogViewer extends Dialog implements IAlertArrivedCallback {
         size.y += delta;
         shell.setSize(size);
     }
+
+    private static void errorDialogWithStackTrace(Shell parentShell,
+            String dialogTitle, String msg, Throwable t) {
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        t.printStackTrace(pw);
+        String trace = sw.toString();
+
+        Collection<Status> childStatuses = new ArrayList<>();
+
+        String lineSep = System.getProperty("line.separator");
+        for (String line : trace.split(lineSep)) {
+            childStatuses.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+                    line));
+        }
+
+        MultiStatus ms = new MultiStatus(Activator.PLUGIN_ID, IStatus.ERROR,
+                childStatuses.toArray(new Status[0]), t.getLocalizedMessage(),
+                t);
+
+        ErrorDialog.openError(parentShell, dialogTitle, msg, ms);
+    }
 }
diff --git a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/TmpFileSelectDlg.java b/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/TmpFileSelectDlg.java
deleted file mode 100644
index 59cad56ce5..0000000000
--- a/cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/TmpFileSelectDlg.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package com.raytheon.uf.viz.alertviz.ui.dialogs;
-
-import java.io.File;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Dialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-
-import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.PathManagerFactory;
-
-public abstract class TmpFileSelectDlg extends Dialog {
-
-    /**
-     * Dialog shell.
-     */
-    private Shell shell;
-    
-    /**
-     * The display control.
-     */
-    private Display display;
-    
-    /**
-     * Control font.
-     */
-    private Font controlFont;
-
-    /**
-     * Sound file list control.
-     */
-    private List soundFileList;
-    
-    /**
-     * Return object when the shell is disposed.
-     */
-    private Boolean returnObj = null;
-    
-    /**
-     * Array of localization files.
-     */
-    private LocalizationFile[] locFiles;
-    
-    /**
-     * Current sound file.
-     */
-    public File currentFile;
-    
-    /**
-     * New sound file.
-     */
-    private File newFile;
-    
-    private String path;
-    
-    private String fileExtension;
-    
-    public TmpFileSelectDlg(Shell parent, int style) {
-        super(parent, style);
-    }
-    
-    /**
-     * Open method used to display the dialog.
-     * 
-     * @param audioFile 
-     *              The name of the audio file, if null default to index 0. 
-     * @return True/False.
-     */
-    public Object open(String title, String actionFile) {
-        Shell parent = getParent();
-        display = parent.getDisplay();
-        shell = new Shell(parent, SWT.TITLE);
-        //shell.setText("Action File Selection");
-
-        // Create the main layout for the shell.
-        GridLayout mainLayout = new GridLayout(1, false);
-        mainLayout.marginHeight = 2;
-        mainLayout.marginWidth = 2;
-        mainLayout.verticalSpacing = 2;
-        shell.setLayout(mainLayout);
-
-        // Initialize all of the controls and layouts
-        initializeComponents();
-        
-        if (actionFile != null) {
-            setSelectedAudioFile(actionFile);
-        }
-
-        shell.pack();
-        shell.open();
-
-        while (!shell.isDisposed()) {
-            if (!display.readAndDispatch()) {
-                display.sleep();
-            }
-        }
-
-        controlFont.dispose();
-
-        return returnObj;
-    }
-    
-    /**
-     * Initialize the controls on the display.
-     */
-    private void initializeComponents() {
-        controlFont = new Font(shell.getDisplay(), "Monospace", 10, SWT.NORMAL);
-
-        createListControl();
-        // Create the buttons at the bottom of the display.
-        createBottomButtons();
-
-        getAvailableFiles();
-    }
-    
-    /**
-     * Set the selected index of file list object based upon the 
-     * audio file. 
-     * 
-     * @param audioFile The name of the audio file.
-     */
-    private void setSelectedAudioFile(String audioFile) {
-        String[] audioFiles = soundFileList.getItems();
-        int index = 0;
-        for (int i = 0; i < audioFiles.length; i++) {
-            if (audioFile.endsWith(audioFiles[i])) {
-                index = i;
-                break;
-            }
-        }
-        soundFileList.select(index);
-    }
-    
-    /**
-     * Create the list control.
-     */
-    private void createListControl() {
-        GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
-        Composite listComp = new Composite(shell, SWT.NONE);
-        listComp.setLayout(new GridLayout(1, false));
-        listComp.setLayoutData(gd);
-
-        Label listLbl = new Label(listComp, SWT.NONE);
-        listLbl.setText("Available Sound Files:");
-
-        gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gd.widthHint = 400;
-        gd.heightHint = 400;
-        gd.horizontalSpan = 2;
-        soundFileList = new List(listComp, SWT.BORDER | SWT.SINGLE
-                | SWT.V_SCROLL | SWT.H_SCROLL);
-        soundFileList.setLayoutData(gd);
-        soundFileList.setFont(controlFont);
-    }
-
-    /**
-     * Create the buttons at the bottom of the dialog.
-     */
-    private void createBottomButtons() {
-        GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
-        Composite mainButtonComp = new Composite(shell, SWT.NONE);
-        mainButtonComp.setLayout(new GridLayout(1, false));
-        mainButtonComp.setLayoutData(gd);
-
-        gd = new GridData(SWT.CENTER, SWT.DEFAULT, false, false);
-        Composite buttonComp = new Composite(shell, SWT.NONE);
-        buttonComp.setLayout(new GridLayout(2, false));
-        buttonComp.setLayoutData(gd);
-
-        gd = new GridData(100, SWT.DEFAULT);
-        Button okBtn = new Button(buttonComp, SWT.PUSH);
-        okBtn.setText("OK");
-        okBtn.setLayoutData(gd);
-        okBtn.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                if (soundFileList.getSelectionIndex() != 0) {
-                    newFile = locFiles[soundFileList.getSelectionIndex()].getFile();
-                } else {
-                    newFile = locFiles[0].getFile();
-                }
-                returnObj = true;
-                shell.dispose();
-            }
-        });
-
-        gd = new GridData(100, SWT.DEFAULT);
-        Button cancelBtn = new Button(buttonComp, SWT.PUSH);
-        cancelBtn.setText("Cancel");
-        cancelBtn.setLayoutData(gd);
-        cancelBtn.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                returnObj = false;
-                shell.dispose();
-            }
-        });
-    }
-    
-    /**
-     * Get the list of available sound files.
-     */
-    private void getAvailableFiles() {
-        String[] extensions = new String[] { fileExtension };
-        locFiles = PathManagerFactory.getPathManager().listStaticFiles(
-                path, extensions, true, true);
-        
-        for (int i = 0; i < locFiles.length; i++) {
-            soundFileList.add(locFiles[i].getName());
-        }
-
-        if (currentFile != null) {
-            soundFileList.select(soundFileList.indexOf(currentFile
-                    .getName()));
-        }
-    }
-    
-    /**
-     * Get the selected sound file.
-     * 
-     * @return The sound file.
-     */
-    public File getSelectedFile() {
-        return newFile;
-    }
-    
-    public void setFileExtension(String fileExtension) {
-        this.fileExtension = fileExtension;
-    }
-    
-    public void setFile(String file) {
-        if (file != null) {
-            this.currentFile = new File(file);
-        }
-    }
-    
-    public void setFilesLocationPath(String path) {
-        this.path = path;
-    }
-}
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/ConfigurationManager.java b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/ConfigurationManager.java
index c342b796a5..d8bae169e6 100644
--- a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/ConfigurationManager.java
+++ b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/ConfigurationManager.java
@@ -19,11 +19,8 @@
  **/
 package com.raytheon.uf.viz.alertviz;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -34,13 +31,15 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -58,14 +57,18 @@ import com.raytheon.uf.viz.alertviz.config.Source;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 7, 2010            mschenke     Initial creation
+ * Apr 07, 2010            mschenke    Initial creation
  * Mar 16, 2011 6531       rferrel     Start up loads host dependent
  *                                     configuration file.
- * Aug 28 2012  13528     Xiaochuan    Using setNewConfiguration() to 
+ * Aug 28, 2012 13528      Xiaochuan   Using setNewConfiguration() to 
  *                                     re-set configuration data and
  *                                     run notifyListeners().
- * Apr 07 2015  4346       rferrel     Created {@link #retrieveBaseConfiguration()}.
+ * Apr 07, 2015 4346       rferrel     Created {@link #retrieveBaseConfiguration}.
  * May 20, 2015 4346       rjpeter     Updated to also load from common_static.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated ILocalizationFile methods
+ * Feb 12, 2016 4834       bsteffen    Fix multiple saves of the customConfiguration.
+ * 
  * </pre>
  * 
  * @author mschenke
@@ -166,7 +169,7 @@ public class ConfigurationManager {
         ConfigContext workstationContext = DEFAULT_WORKSTATION_CONFIG;
 
         try {
-            LocalizationFile file = getLocalizationFile(workstationContext);
+            ILocalizationFile file = getLocalizationFile(workstationContext);
 
             if (file == null || !file.exists()) {
                 ConfigContext sourceContext = DEFAULT_SITE_CONFIG;
@@ -262,7 +265,7 @@ public class ConfigurationManager {
     /**
      * Delete the configuration passed in
      * 
-     * @param name
+     * @param context
      */
     public void deleteConfiguration(ConfigContext context) {
         if (context.isBaseOrConfiguredLevel() || isDefaultConfig(context)) {
@@ -272,7 +275,7 @@ public class ConfigurationManager {
             if (current.equals(context)) {
                 loadAsCurrent(DEFAULT_WORKSTATION_CONFIG);
             }
-            LocalizationFile file = getLocalizationFile(context);
+            ILocalizationFile file = getLocalizationFile(context);
             try {
                 file.delete();
             } catch (Exception e) {
@@ -317,10 +320,10 @@ public class ConfigurationManager {
     private void loadFromLocalizationType(LocalizationType type) {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext[] contexts = pm.getLocalSearchHierarchy(type);
-        LocalizationFile[] files = pm.listFiles(contexts, CONFIG_DIR,
+        ILocalizationFile[] files = pm.listFiles(contexts, CONFIG_DIR,
                 EXTENSIONS, true, true); // Win32
 
-        for (LocalizationFile file : files) {
+        for (ILocalizationFile file : files) {
             LocalizationContext fileContext = file.getContext();
 
             /*
@@ -329,8 +332,8 @@ public class ConfigurationManager {
              */
             if ((fileContext.getLocalizationLevel() != LocalizationLevel.BASE)
                     || ((fileContext.getLocalizationLevel() == LocalizationLevel.BASE) && DEFAULT_BASE_CONFIG
-                            .getLocalizationFileName().equals(file.getName()))) {
-                String fileName = file.getName();
+                            .getLocalizationFileName().equals(file.getPath()))) {
+                String fileName = file.getPath();
                 LocalizationContext locContext = file.getContext();
                 String name = fileName.substring(
                         fileName.lastIndexOf(IPathManager.SEPARATOR) + 1, // win32
@@ -362,7 +365,7 @@ public class ConfigurationManager {
     }
 
     public Configuration retrieveConfiguration(ConfigContext configContext) {
-        LocalizationFile file = getLocalizationFile(configContext);
+        ILocalizationFile file = getLocalizationFile(configContext);
         if (DEFAULT_BASE_CONFIG.equals(configContext)) {
             if (baseConfiguration == null) {
                 baseConfiguration = retrieveBaseConfiguration();
@@ -379,7 +382,7 @@ public class ConfigurationManager {
      * @return configuration
      */
     private Configuration retrieveBaseConfiguration() {
-        LocalizationFile file = getLocalizationFile(DEFAULT_BASE_CONFIG);
+        ILocalizationFile file = getLocalizationFile(DEFAULT_BASE_CONFIG);
         Configuration configuration = retrieveConfiguration(file);
         configuration = mergeBaseConfigurations(LocalizationType.CAVE_STATIC,
                 configuration);
@@ -393,12 +396,12 @@ public class ConfigurationManager {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(type,
                 LocalizationLevel.BASE);
-        LocalizationFile[] files = pm.listFiles(context, CONFIG_DIR,
+        ILocalizationFile[] files = pm.listFiles(context, CONFIG_DIR,
                 EXTENSIONS, false, true);
-        for (LocalizationFile f : files) {
+        for (ILocalizationFile f : files) {
             // Merge other base files with the default.
             if (!DEFAULT_BASE_CONFIG.getLocalizationFileName().equals(
-                    f.getName())) {
+                    f.getPath())) {
                 Configuration fileConfig = retrieveConfiguration(f);
                 Configuration mergeConfig = configuration.mergeUnder(
                         fileConfig, true);
@@ -409,14 +412,11 @@ public class ConfigurationManager {
         return configuration;
     }
 
-    public Configuration retrieveConfiguration(LocalizationFile file) {
+    public Configuration retrieveConfiguration(ILocalizationFile file) {
         Configuration config = null;
-        if (file != null) {
+        if (file != null && file.exists()) {
             try {
-                File actualFile = file.getFile();
-                if (actualFile != null && actualFile.exists()) {
-                    config = (Configuration) deserializeFromFile(actualFile);
-                }
+                config = (Configuration) deserializeFromFile(file);
             } catch (SerializationException e) {
                 statusHandler.handle(Priority.CRITICAL,
                         "Error deserializing configuration xml", e);
@@ -427,18 +427,12 @@ public class ConfigurationManager {
 
     private boolean saveToFile(ConfigContext cContext, Configuration config) {
         boolean success = true;
-        LocalizationFile file = getLocalizationFile(cContext);
+        ILocalizationFile file = getLocalizationFile(cContext);
         try {
             // do not attempt to save to base
             if (file != null
                     && file.getContext().getLocalizationLevel() != LocalizationLevel.BASE) {
-                serializeToFile(config, file.getFile());
-                if (!file.save()) {
-                    // failed to save delete the local copy and switch to the
-                    // default config.
-                    file.delete();
-                    success = false;
-                }
+                serializeToFile(config, file);
             }
         } catch (SerializationException e) {
             statusHandler.handle(Priority.CRITICAL,
@@ -468,62 +462,27 @@ public class ConfigurationManager {
         }
     }
 
-    private void serializeToFile(Object obj, File file)
+    private void serializeToFile(Object obj, ILocalizationFile file)
             throws SerializationException {
-        FileWriter writer = null;
-        Marshaller msh = marshaller;
-        try {
-            File dir = file.getParentFile();
-            if (dir.isDirectory() == false) {
-                dir.delete();
-                dir.mkdirs();
-            }
-            msh.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, new Boolean(true));
-            writer = new FileWriter(file);
-            msh.marshal(obj, writer);
+        try (SaveableOutputStream os = file.openOutputStream()) {
+            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,
+                    new Boolean(true));
+            marshaller.marshal(obj, os);
+            os.save();
         } catch (Exception e) {
             throw new SerializationException(e);
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (IOException e) {
-                    // Log to internal Log4j log
-                    Container
-                            .logInternal(
-                                    Priority.ERROR,
-                                    "ConfigurationManager: exception closing file writer.",
-                                    e);
-                }
-            }
         }
     }
 
-    private Object deserializeFromFile(File file) throws SerializationException {
-        FileReader reader = null;
-        Unmarshaller msh = unmarshaller;
-        try {
-            reader = new FileReader(file);
-            Object obj = msh.unmarshal(reader);
-            return obj;
-        } catch (FileNotFoundException e) {
+    private Object deserializeFromFile(ILocalizationFile file)
+            throws SerializationException {
+        try (InputStream is = file.openInputStream()) {
+            return unmarshaller.unmarshal(is);
+        } catch (LocalizationException | IOException | JAXBException e) {
             Container.logInternal(Priority.ERROR,
-                    "AlertViz ConfigurationManager unable to find file: "
-                            + file.getAbsolutePath(), e);
+                    "ConfigurationManager: Exception unmarshalling from file: "
+                            + file.getPath(), e);
             throw new SerializationException(e);
-        } catch (JAXBException e) {
-            Container.logInternal(Priority.ERROR,
-                    "ConfigurationManager: JAXB exception unmarshalling from file: "
-                            + file.getAbsolutePath(), e);
-            throw new SerializationException(e);
-        } finally {
-            if (reader != null) {
-                try {
-                    reader.close();
-                } catch (IOException e) {
-                    // ignore
-                }
-            }
         }
     }
 
@@ -531,15 +490,12 @@ public class ConfigurationManager {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext ctx = pm.getContext(LocalizationType.CAVE_STATIC,
                 LocalizationLevel.SITE);
-        LocalizationFile file = pm.getLocalizationFile(ctx,
+        ILocalizationFile file = pm.getLocalizationFile(ctx,
                 ConfigContext.ALERTVIZ_DIR + IPathManager.SEPARATOR
                         + "AlertVizForced.xml");
-        File actualFile = file.getFile();
-        // Win32: JHB put in check for length
-        if (actualFile != null && actualFile.exists()
-                && actualFile.length() > 0) {
-            try {
-                return (ForcedConfiguration) unmarshaller.unmarshal(actualFile);
+        if (file != null && file.exists()) {
+            try (InputStream is = file.openInputStream()) {
+                return (ForcedConfiguration) unmarshaller.unmarshal(is);
             } catch (Exception e) {
                 statusHandler.handle(Priority.SIGNIFICANT,
                         "Error deserializing forced configuration", e);
@@ -569,10 +525,9 @@ public class ConfigurationManager {
     }
 
     private void updateCustom(boolean isRemove, Object obj) {
-        LocalizationFile locFile = getCustomLocalization();
-        File customFile = locFile.getFile();
+        ILocalizationFile locFile = getCustomLocalization();
         try {
-            customConfiguration = (Configuration) deserializeFromFile(customFile);
+            customConfiguration = (Configuration) deserializeFromFile(locFile);
             if (obj instanceof Category) {
                 Map<String, Category> categories = customConfiguration
                         .getCategories();
@@ -594,12 +549,11 @@ public class ConfigurationManager {
                 }
                 customConfiguration.setSources(sources);
             }
-            serializeToFile(customConfiguration, customFile);
-            locFile.save();
+            serializeToFile(customConfiguration, locFile);
+            /* Must reload fresh copy next time it is used. */
+            customLocalization = null;
         } catch (SerializationException e) {
             statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-        } catch (LocalizationOpFailedException e) {
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
         }
     }
 
diff --git a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/Container.java b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/Container.java
index 1055429a89..8e39311a64 100755
--- a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/Container.java
+++ b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/Container.java
@@ -28,7 +28,6 @@ import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.message.StatusMessage;
@@ -58,6 +57,7 @@ import com.raytheon.uf.viz.core.localization.LocalizationManager;
  * Jun 03, 2013 2026       randerso    Fixed typo
  * Jul 27, 2015 4654       skorolev    Added a localization level filtration
  * Sep 21, 2015 4654       njensen     Made filter logic strict instead of eager
+ * Jan 14, 2016 5054       randerso    Remove dummy shell
  * 
  * </pre>
  * 
@@ -315,7 +315,7 @@ public class Container implements IConfigurationChangedListener {
                 }
 
                 // Status status = null;
-                ErrorDialog.openError(new Shell(),
+                ErrorDialog.openError(null,
                         "Error saving to internal database",
                         "Serious internal error occurred", new Status(
                                 IStatus.ERROR, Activator.PLUGIN_ID,
diff --git a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/SystemStatusHandler.java b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/SystemStatusHandler.java
index 3dc084ca28..e6855f447e 100644
--- a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/SystemStatusHandler.java
+++ b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/SystemStatusHandler.java
@@ -43,6 +43,7 @@ import com.raytheon.uf.viz.alertviz.internal.LogMessageDAO;
  * Aug 26, 2013 2142       njensen     Changed to use SLF4J
  * Jul 02, 2014 3337       njensen     Disabled logback packaging data
  * May 22, 2015 4473       njensen     Refactored
+ * Feb 11, 2016 5314       dgilling    Add retrieveByRowOffset.
  * </pre>
  * 
  * @author chammack
@@ -122,16 +123,30 @@ public class SystemStatusHandler extends AbstractStatusHandler {
     }
 
     /**
-     * Get the current range of persisted StatusMessages
+     * Retrieve a status message by row offset
      * 
+     * @param index
+     *            The row offset, 0-based index.
+     * @return the status message
+     * @throws AlertvizException
+     *             If an error occurred querying the database for the status
+     *             message
+     */
+    public static StatusMessage retrieveByRowOffset(int index)
+            throws AlertvizException {
+        return LogMessageDAO.getInstance().loadByRowOffset(index);
+    }
+
+    /**
+     * Get the current number of persisted StatusMessages.
+     * <p>
      * NOTE: This only works when called from inside the alertviz container
      * 
-     * 
-     * @return the range [min, max] of values
+     * @return
      * @throws AlertvizException
      */
-    public static int[] getCurrentRange() throws AlertvizException {
-        return LogMessageDAO.getInstance().getLogRange();
+    public static int getMessageCount() throws AlertvizException {
+        return LogMessageDAO.getInstance().getMessageCount();
     }
 
     /**
@@ -148,5 +163,4 @@ public class SystemStatusHandler extends AbstractStatusHandler {
             int count) throws AlertvizException {
         return LogMessageDAO.getInstance().load(count, category);
     }
-
 }
diff --git a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/config/Configuration.java b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/config/Configuration.java
index 731121cff1..16eeadc243 100644
--- a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/config/Configuration.java
+++ b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/config/Configuration.java
@@ -31,7 +31,6 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.raytheon.uf.common.serialization.ISerializableObject;
 import com.raytheon.uf.viz.alertviz.config.TrayConfiguration.TrayMode;
 
 /**
@@ -49,6 +48,7 @@ import com.raytheon.uf.viz.alertviz.config.TrayConfiguration.TrayMode;
  * May 3, 2011  9067       cjeanbap    Add isMonitorLayoutChanged() method.
  * Apr 27 2012  13744	   Xiaochuan   Update isMonitorLayoutChanged() to compare
  * 									   source size in Previous and current.
+ * Oct 28, 2005 5054       randerso    removed bar position as it was written but never read
  * 
  * </pre>
  * 
@@ -57,7 +57,7 @@ import com.raytheon.uf.viz.alertviz.config.TrayConfiguration.TrayMode;
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlRootElement(name = "alertConfiguration")
-public class Configuration implements ISerializableObject {
+public class Configuration {
 
     @XmlAttribute
     private String name;
@@ -127,7 +127,7 @@ public class Configuration implements ISerializableObject {
      * Look up a source
      * 
      * @param componentName
-     * @return
+     * @return the source
      */
     public Source lookupSource(String componentName) {
         return this.sourceMap.get(componentName);
@@ -137,7 +137,7 @@ public class Configuration implements ISerializableObject {
      * Look up a category
      * 
      * @param componentName
-     * @return
+     * @return the category
      */
     public Category lookupCategory(String componentName) {
         return this.categoryMap.get(componentName);
@@ -148,7 +148,7 @@ public class Configuration implements ISerializableObject {
      * 
      * This is usually used by serialization, not end users.
      * 
-     * @param collection
+     * @param sources
      */
     @XmlElement(name = "source")
     public void setSourceCollection(Source[] sources) {
@@ -163,7 +163,7 @@ public class Configuration implements ISerializableObject {
      * 
      * This is usually used by serialization, not end users.
      * 
-     * @return
+     * @return the source collection
      */
     public Source[] getSourceCollection() {
         return sourceMap.values().toArray(new Source[sourceMap.size()]);
@@ -174,7 +174,7 @@ public class Configuration implements ISerializableObject {
      * 
      * This is usually used by serialization, not end users.
      * 
-     * @param collection
+     * @param categories
      */
     @XmlElement(name = "category")
     public void setCategoryCollection(Category[] categories) {
@@ -189,20 +189,27 @@ public class Configuration implements ISerializableObject {
      * 
      * This is usually used by serialization, not end users.
      * 
-     * @return
+     * @return the category collection
      */
     public Category[] getCategoryCollection() {
         return categoryMap.values().toArray(new Category[categoryMap.size()]);
     }
 
+    /**
+     * @return the name
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * @param name
+     */
     public void setName(String name) {
         this.name = name;
     }
 
+    @Override
     public Configuration clone() {
         Configuration newConfig = new Configuration();
         newConfig.name = name;
@@ -225,6 +232,7 @@ public class Configuration implements ISerializableObject {
         return newConfig;
     }
 
+    @Override
     public String toString() {
         String rval = getName() + ":\n";
         rval += "\tTrayConfig:\n";
@@ -232,8 +240,7 @@ public class Configuration implements ISerializableObject {
                 + globalConfiguration.getAudioDuration() + " blinkDuration="
                 + globalConfiguration.getBlinkDuration() + " logLength="
                 + globalConfiguration.getLogLength() + "\n";
-        rval += "\t\t" + "mode=" + globalConfiguration.getMode() + " position="
-                + globalConfiguration.getPosition() + "\n";
+        rval += "\t\t" + "mode=" + globalConfiguration.getMode() + "\n";
         rval += "\t\t" + "categoryShown="
                 + globalConfiguration.isCategoryShown() + " expandedPopup="
                 + globalConfiguration.isExpandedPopup() + " priorityShown="
@@ -404,78 +411,80 @@ public class Configuration implements ISerializableObject {
         }
         return result;
     }
-    
+
     /**
-     * Determine if a Monitor was added/omitted (enable/disabled) and/or if the Layout of the
-     * Alert Message Dialog was changed. 
+     * Determine if a Monitor was added/omitted (enable/disabled) and/or if the
+     * Layout of the Alert Message Dialog was changed.
      * 
-     * @param configData the current save Configuration Data.
-     * @return boolean, true if either Monitor and/or Layout was changed otherwise false.
+     * @param configData
+     *            the current save Configuration Data.
+     * @return boolean, true if either Monitor and/or Layout was changed
+     *         otherwise false.
      */
-	public boolean isMonitorLayoutChanged(Configuration configData) {
-		boolean modified = false;
+    public boolean isMonitorLayoutChanged(Configuration configData) {
+        boolean modified = false;
 
-		TrayMode prevLayoutMode = configData.getGlobalConfiguration().getMode();
-		if (!prevLayoutMode.equals(this.getGlobalConfiguration().getMode())) {
-			modified = true;
-		}
+        TrayMode prevLayoutMode = configData.getGlobalConfiguration().getMode();
+        if (!prevLayoutMode.equals(this.getGlobalConfiguration().getMode())) {
+            modified = true;
+        }
 
-		Map<String, Category> prevCategoryMap = configData.getCategories();
-		for (Iterator<String> categories = this.getCategories().keySet()
-				.iterator(); categories.hasNext() && !modified;) {
-			String categoryName = categories.next();
-			Category prevCategory = prevCategoryMap.get(categoryName);
-			Category newCategory = this.getCategories().get(categoryName);
-			if (prevCategory != null && newCategory == null) {
-				modified = true;
-			} else if (prevCategory == null && newCategory != null) {
-				modified = true;
-			} else if (prevCategory != null && newCategory != null) {
-				if (prevCategory.getTextBox() != newCategory.getTextBox()) {
-					modified = true;
-				}
-			}
-		}
+        Map<String, Category> prevCategoryMap = configData.getCategories();
+        for (Iterator<String> categories = this.getCategories().keySet()
+                .iterator(); categories.hasNext() && !modified;) {
+            String categoryName = categories.next();
+            Category prevCategory = prevCategoryMap.get(categoryName);
+            Category newCategory = this.getCategories().get(categoryName);
+            if (prevCategory != null && newCategory == null) {
+                modified = true;
+            } else if (prevCategory == null && newCategory != null) {
+                modified = true;
+            } else if (prevCategory != null && newCategory != null) {
+                if (prevCategory.getTextBox() != newCategory.getTextBox()) {
+                    modified = true;
+                }
+            }
+        }
 
-		Map<String, Source> prevSources = configData.getSources();
+        Map<String, Source> prevSources = configData.getSources();
 
-		if (prevSources.size() != this.getSources().size()) {
-			modified = true;
-		} else {
-			for (Iterator<String> sources = this.getSources().keySet()
-					.iterator(); sources.hasNext() && !modified;) {
-				String sourceName = sources.next();
-				Source prevSource = prevSources.get(sourceName);
-				Source newSource = this.getSources().get(sourceName);
-				if (prevSource == null) {
-					modified = true;
-				} else if (prevSource != null && newSource != null) {
-					MonitorMetadata newMonitorMetadata = newSource
-							.getConfigurationMonitor().getMonitorMetadata();
-					MonitorMetadata prevMonitorMetadata = prevSource
-							.getConfigurationMonitor().getMonitorMetadata();
+        if (prevSources.size() != this.getSources().size()) {
+            modified = true;
+        } else {
+            for (Iterator<String> sources = this.getSources().keySet()
+                    .iterator(); sources.hasNext() && !modified;) {
+                String sourceName = sources.next();
+                Source prevSource = prevSources.get(sourceName);
+                Source newSource = this.getSources().get(sourceName);
+                if (prevSource == null) {
+                    modified = true;
+                } else if (prevSource != null && newSource != null) {
+                    MonitorMetadata newMonitorMetadata = newSource
+                            .getConfigurationMonitor().getMonitorMetadata();
+                    MonitorMetadata prevMonitorMetadata = prevSource
+                            .getConfigurationMonitor().getMonitorMetadata();
 
-					if (newMonitorMetadata != null
-							&& prevMonitorMetadata == null) {
-						modified = true;
-					} else if ((newMonitorMetadata.getOmit())
-							&& (prevMonitorMetadata.getOmit() == false)) {
-						modified = true;
-					}
-					if ((newMonitorMetadata.getOmit() == false)
-							&& (prevMonitorMetadata.getOmit() == true)) {
-						modified = true;
-					} else if (newMonitorMetadata.getImageFile() != null
-							&& prevMonitorMetadata.getImageFile() == null) {
-						modified = true;
-					} else if (newMonitorMetadata.getImageFile() == null
-							&& prevMonitorMetadata.getImageFile() != null) {
-						modified = true;
-					}
-				}
-			}
-		}
+                    if (newMonitorMetadata != null
+                            && prevMonitorMetadata == null) {
+                        modified = true;
+                    } else if ((newMonitorMetadata.getOmit())
+                            && (prevMonitorMetadata.getOmit() == false)) {
+                        modified = true;
+                    }
+                    if ((newMonitorMetadata.getOmit() == false)
+                            && (prevMonitorMetadata.getOmit() == true)) {
+                        modified = true;
+                    } else if (newMonitorMetadata.getImageFile() != null
+                            && prevMonitorMetadata.getImageFile() == null) {
+                        modified = true;
+                    } else if (newMonitorMetadata.getImageFile() == null
+                            && prevMonitorMetadata.getImageFile() != null) {
+                        modified = true;
+                    }
+                }
+            }
+        }
 
-		return modified;
-	}
+        return modified;
+    }
 }
diff --git a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/config/TrayConfiguration.java b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/config/TrayConfiguration.java
index e5a2ecc622..4244fc7dc1 100644
--- a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/config/TrayConfiguration.java
+++ b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/config/TrayConfiguration.java
@@ -23,10 +23,6 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 
-import org.eclipse.swt.graphics.Rectangle;
-
-import com.raytheon.uf.common.serialization.ISerializableObject;
-
 /**
  * Global configuration items for alertviz
  * 
@@ -35,13 +31,14 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 18, 2008 1433       chammack    Initial creation
+ * Oct 28, 2005 5054       randerso    removed bar position as it was written but never read
  * </pre>
  * 
  * @author chammack
  * @version 1.0
  */
 @XmlAccessorType(XmlAccessType.NONE)
-public class TrayConfiguration implements ISerializableObject {
+public class TrayConfiguration {
 
     /**
      * The mode of the display:
@@ -109,21 +106,6 @@ public class TrayConfiguration implements ISerializableObject {
     @XmlAttribute
     private int logLength;
 
-    /**
-     * The position of the bar
-     */
-    @XmlAttribute
-    private int xPosition;
-
-    @XmlAttribute
-    private int yPosition;
-
-    @XmlAttribute
-    private int width;
-
-    @XmlAttribute
-    private int height;
-
     /**
      * @return the mode
      */
@@ -154,28 +136,6 @@ public class TrayConfiguration implements ISerializableObject {
         this.priorityShown = priorityShown;
     }
 
-    /**
-     * @return the position
-     */
-    public Rectangle getPosition() {
-        Rectangle position = null;
-        if (xPosition >= 0 && yPosition >= 0 && width >= 1 && height >= 1) {
-            position = new Rectangle(xPosition, yPosition, width, height);
-        }
-        return position;
-    }
-
-    /**
-     * @param position
-     *            the position to set
-     */
-    public void setPosition(Rectangle position) {
-        this.xPosition = position.x;
-        this.yPosition = position.y;
-        this.width = position.width;
-        this.height = position.height;
-    }
-
     /**
      * @return the sourceKeyShown
      */
@@ -259,59 +219,24 @@ public class TrayConfiguration implements ISerializableObject {
     }
 
     /**
-     * @param messageLogLength
+     * @param logLength
      *            the messageLogLength to set
      */
     public void setLogLength(int logLength) {
         this.logLength = logLength;
     }
 
-    public int getXPosition() {
-        return xPosition;
-    }
-
-    public void setXPosition(int position) {
-        xPosition = position;
-    }
-
-    public int getYPosition() {
-        return yPosition;
-    }
-
-    public void setYPosition(int position) {
-        yPosition = position;
-    }
-
-    public int getWidth() {
-        return width;
-    }
-
-    public void setWidth(int width) {
-        this.width = width;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public void setHeight(int height) {
-        this.height = height;
-    }
-
+    @Override
     public TrayConfiguration clone() {
         TrayConfiguration newConfig = new TrayConfiguration();
         newConfig.audioDuration = audioDuration;
         newConfig.blinkDuration = blinkDuration;
         newConfig.categoryShown = categoryShown;
         newConfig.expandedPopup = expandedPopup;
-        newConfig.height = height;
         newConfig.logLength = logLength;
         newConfig.mode = mode;
         newConfig.priorityShown = priorityShown;
         newConfig.sourceKeyShown = sourceKeyShown;
-        newConfig.width = width;
-        newConfig.xPosition = xPosition;
-        newConfig.yPosition = yPosition;
         return newConfig;
     }
 
diff --git a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/internal/LogMessageDAO.java b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/internal/LogMessageDAO.java
index e6edd3f40e..d6e08aa5fb 100644
--- a/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/internal/LogMessageDAO.java
+++ b/cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/internal/LogMessageDAO.java
@@ -50,6 +50,7 @@ import com.raytheon.uf.viz.core.localization.LocalizationManager;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 11, 2008 1433       chammack    Initial creation
+ * Feb 11, 2016 5314       dgilling    Add loadByRowOffset.
  * </pre>
  * 
  * @author chammack
@@ -64,11 +65,13 @@ public class LogMessageDAO {
 
     private static final String SELECT_ALL_QUERY_BY_PK = "SELECT event_time, category, priority, message, details, source, pk, acknowledgedBy, acknowledgedAt FROM log WHERE pk = ?";
 
+    private static final String SELECT_ALL_QUERY_BY_ROW_OFFSET = "SELECT event_time, category, priority, message, details, source, pk, acknowledgedBy, acknowledgedAt FROM log ORDER BY pk OFFSET ? ROWS FETCH NEXT ROW ONLY";
+
     private static final String PURGE_TIME_QUERY = "SELECT purge_time FROM dbMetadata";
 
     private static final String PURGE_TIME_UPDATE = "UPDATE dbMetadata SET purge_time = ?";
 
-    private static final String DATA_RANGE_QUERY = "SELECT MIN(pk), MAX(pk) FROM log";
+    private static final String MESSAGE_COUNT_QUERY = "SELECT COUNT(pk) FROM log";
 
     private static final String SELECT_ALL_BY_DATE_AND_SOURCE_AFTER = "SELECT event_time, category, priority, message, details, source, pk, acknowledgedBy, acknowledgedAt FROM log WHERE event_time > ?";
 
@@ -353,6 +356,45 @@ public class LogMessageDAO {
         }
     }
 
+    /**
+     * Retrieves the specified status message from the message store using the
+     * specified index as a row offset.
+     * 
+     * @param index
+     *            The index of the message to retrieve
+     * @return The status message
+     * @throws AlertvizException
+     *             If an error occurred retrieving the message from the message
+     *             store.
+     */
+    public StatusMessage loadByRowOffset(int index) throws AlertvizException {
+        ResultSet rs = null;
+        PreparedStatement statement = null;
+        boolean errorOccurred = false;
+        try {
+            Connection conn = getConnection();
+            statement = conn.prepareStatement(SELECT_ALL_QUERY_BY_ROW_OFFSET);
+            statement.setInt(1, index);
+
+            rs = statement.executeQuery();
+
+            conn.commit();
+            return reconstituteResults(rs)[0];
+        } catch (SQLException e) {
+            errorOccurred = true;
+            throw new AlertvizException("Error loading " + index, e);
+        } catch (RuntimeException e) {
+            errorOccurred = true;
+            throw new AlertvizException("Error loading " + index, e);
+        } finally {
+            closeResultSet(rs);
+            closeStatement(statement);
+            if (errorOccurred) {
+                closeConnection();
+            }
+        }
+    }
+
     public StatusMessage[] load(int count) throws AlertvizException {
         ResultSet rs = null;
         Statement statement = null;
@@ -383,15 +425,16 @@ public class LogMessageDAO {
         boolean errorOccurred = false;
         try {
             Connection conn = getConnection();
-            if (order == Order.BEFORE)
+            if (order == Order.BEFORE) {
                 statement = conn
                         .prepareStatement(SELECT_ALL_BY_DATE_AND_SOURCE_BEFORE);
-            else if (order == Order.AFTER)
+            } else if (order == Order.AFTER) {
                 statement = conn
                         .prepareStatement(SELECT_ALL_BY_DATE_AND_SOURCE_AFTER);
-            else
+            } else {
                 throw new IllegalArgumentException("Unsupported order : "
                         + order);
+            }
 
             statement.setMaxFieldSize(count);
             statement.setTimestamp(1, filter);
@@ -477,7 +520,12 @@ public class LogMessageDAO {
         }
     }
 
-    public int[] getLogRange() throws AlertvizException {
+    /**
+     * Retrieves the number of status messages in the message store.
+     * 
+     * @return Total number of messages.
+     */
+    public int getMessageCount() throws AlertvizException {
         ResultSet rs = null;
         Statement statement = null;
         boolean errorOccurred = false;
@@ -485,15 +533,12 @@ public class LogMessageDAO {
             Connection conn = getConnection();
             statement = conn.createStatement();
             statement.setMaxFieldSize(1);
-            rs = statement.executeQuery(DATA_RANGE_QUERY);
+            rs = statement.executeQuery(MESSAGE_COUNT_QUERY);
             if (rs.next()) {
-                int min = rs.getInt(1);
-                int max = rs.getInt(2);
-
-                return new int[] { min, max };
+                int count = rs.getInt(1);
+                return count;
             }
             conn.commit();
-            return null;
         } catch (SQLException e) {
             errorOccurred = true;
             throw new AlertvizException("Error getting time range ", e);
@@ -504,6 +549,8 @@ public class LogMessageDAO {
                 closeConnection();
             }
         }
+
+        return 0;
     }
 
     public Timestamp getLastPurgeTime() throws AlertvizException {
@@ -547,8 +594,9 @@ public class LogMessageDAO {
             sm.setAcknowledgedBy(rs.getString(8));
 
             Timestamp ts = rs.getTimestamp(9);
-            if (ts != null)
+            if (ts != null) {
                 sm.setAcknowledgedAt(new Date(ts.getTime()));
+            }
 
             retVal.add(sm);
         }
diff --git a/cave/com.raytheon.uf.viz.archive.feature/feature.xml b/cave/com.raytheon.uf.viz.archive.feature/feature.xml
index 19dc9c07a9..0632b8c694 100644
--- a/cave/com.raytheon.uf.viz.archive.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.archive.feature/feature.xml
@@ -40,6 +40,6 @@
          id="org.apache.commons.compress"
          download-size="0"
          install-size="0"
-         version="1.5.0"/>
+         version="1.10.0"/>
 
 </feature>
diff --git a/cave/com.raytheon.uf.viz.archive/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.archive/META-INF/MANIFEST.MF
index be6e378e31..b97e565602 100644
--- a/cave/com.raytheon.uf.viz.archive/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.archive/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Archive
 Bundle-SymbolicName: com.raytheon.uf.viz.archive;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.eclipse.ui;bundle-version="3.8.2",
  org.eclipse.core.runtime,
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  org.apache.commons.io;bundle-version="2.4.0",
  com.raytheon.viz.ui;bundle-version="1.12.1174",
  com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
diff --git a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
index 1b2c576996..a763217581 100644
--- a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
+++ b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
@@ -49,7 +49,7 @@ import com.raytheon.uf.common.archive.config.ArchiveConfigManager;
 import com.raytheon.uf.common.archive.config.ArchiveConstants;
 import com.raytheon.uf.common.archive.config.CategoryConfig;
 import com.raytheon.uf.common.archive.config.DisplayData;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.util.SizeUtil;
 import com.raytheon.uf.viz.archive.data.ArchiveInfo;
 import com.raytheon.uf.viz.archive.data.CategoryInfo;
@@ -83,6 +83,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Apr 10, 2014 3023       rferrel      Added setTotalSelectedSize method.
  * Apr 23, 2014 3045       rferrel      Changes to prevent race condition while getting labels.
  * Aug 26, 2014 3553       rferrel      Force redisplay of table after getting all display labels.
+ * Nov 12, 2015 4834       njensen      Changed LocalizationOpFailedException to LocalizationException
  * 
  * </pre>
  * 
@@ -473,7 +474,7 @@ public abstract class AbstractArchiveDlg extends CaveSWTDialog implements
         String fileName = ArchiveConstants.selectFileName(type, selectName);
         try {
             manager.deleteSelection(fileName);
-        } catch (LocalizationOpFailedException e) {
+        } catch (LocalizationException e) {
             MessageDialog.openError(shell, "Case Error",
                     "Unable to delete file: " + fileName);
         }
@@ -819,6 +820,7 @@ public abstract class AbstractArchiveDlg extends CaveSWTDialog implements
      * 
      * @param startTimeOffset
      */
+    @Override
     public void setRetentionTimes(long startTimeOffset) {
         // do nothing override by sub-classes
     }
@@ -858,6 +860,7 @@ public abstract class AbstractArchiveDlg extends CaveSWTDialog implements
     /**
      * Perform updates once all the display data is loaded.
      */
+    @Override
     public void loadedAllDisplayData() {
         VizApp.runAsync(new Runnable() {
 
diff --git a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
index 921cbcccd8..d67f4884a1 100644
--- a/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
+++ b/cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveTableComp.java
@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
diff --git a/cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java b/cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
index f80012899a..09d298e52f 100644
--- a/cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
+++ b/cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
@@ -80,6 +80,7 @@ import com.vividsolutions.jts.geom.Polygon;
  * Aug 14, 2014 3523      mapeters     Updated deprecated {@link DrawableString#textStyle} 
  *                                     assignments.
  * Jul 7, 2015  10352     byin         Added SymbolLoader to plot symbols
+ * Nov 05, 2015 5070      randerso     Adjust font sizes for dpi scaling
  * </pre>
  * 
  * @author bsteffen
@@ -194,7 +195,7 @@ public class AdvisoryResource extends
         if (font != null) {
             font.dispose();
         }
-        this.font = target.initializeFont("Monospace", 10, new Style[] {});
+        this.font = target.initializeFont("Monospace", 8, new Style[] {});
         this.symbolLoader = new SymbolLoader();
     }
 
diff --git a/cave/com.raytheon.uf.viz.bufrsigwx/src/com/raytheon/uf/viz/bufrsigwx/rsc/SigWxResource.java b/cave/com.raytheon.uf.viz.bufrsigwx/src/com/raytheon/uf/viz/bufrsigwx/rsc/SigWxResource.java
index 489cfbe8e9..ffe3aac79f 100644
--- a/cave/com.raytheon.uf.viz.bufrsigwx/src/com/raytheon/uf/viz/bufrsigwx/rsc/SigWxResource.java
+++ b/cave/com.raytheon.uf.viz.bufrsigwx/src/com/raytheon/uf/viz/bufrsigwx/rsc/SigWxResource.java
@@ -29,8 +29,6 @@ import org.eclipse.swt.graphics.Rectangle;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
-import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
-import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
 import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
 import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.pointdata.PointDataView;
@@ -56,6 +54,8 @@ import com.raytheon.viz.pointdata.PointDataRequest;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 28, 2009 3099       bsteffen     Initial creation
+ * Nov 05, 2015 5070       randerso     Adjust font sizes for dpi scaling
+ * Feb 04, 2015 5309       tgurney      Remove dependency on dataURI
  * 
  * </pre>
  * 
@@ -155,7 +155,7 @@ public abstract class SigWxResource extends
         if (font != null) {
             font.dispose();
         }
-        this.font = target.initializeFont("Monospace", 10,
+        this.font = target.initializeFont("Monospace", 8,
                 new Style[] { Style.BOLD });
     }
 
@@ -167,21 +167,11 @@ public abstract class SigWxResource extends
      * @throws VizException
      */
     protected void updateRecords(DataTime dataTime) throws VizException {
-
-        RequestConstraint constraint = new RequestConstraint();
-
-        constraint.setConstraintType(ConstraintType.IN);
-
-        for (SigWxData record : recordsToParse.get(dataTime)) {
-            constraint.addToConstraintValueList(record.getDataURI());
-        }
-        Map<String, RequestConstraint> constraints = new HashMap<String, RequestConstraint>();
-        constraints.put("dataURI", constraint);
         // Request the point data
         PointDataContainer pdc = PointDataRequest.requestPointDataAllLevels(
                 dataTime, resourceData.getMetadataMap().get("pluginName")
                         .getConstraintValue(), getParameters(), null,
-                constraints);
+                resourceData.getMetadataMap());
         if (recordsToDisplay.containsKey(dataTime)) {
             recordsToDisplay.get(dataTime).combine(pdc);
         } else {
diff --git a/cave/com.raytheon.uf.viz.common.core.feature/feature.xml b/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
index 820badf50c..45ca8825bd 100644
--- a/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.common.core.feature/feature.xml
@@ -100,6 +100,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.dataplugin.text.subscription"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.uf.edex.ndm"
          download-size="0"
diff --git a/cave/com.raytheon.uf.viz.cots.feature/feature.xml b/cave/com.raytheon.uf.viz.cots.feature/feature.xml
index 46d8c66477..059b7a019a 100644
--- a/cave/com.raytheon.uf.viz.cots.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.cots.feature/feature.xml
@@ -27,6 +27,18 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.w3c.xml.ext"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.apache.xmlgraphics"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
    <plugin
          id="org.apache.batik"
          download-size="0"
@@ -94,4 +106,10 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="org.apache.commons.ssl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/cave/com.raytheon.uf.viz.cwa/src/com/raytheon/uf/viz/cwa/rsc/CWAResource.java b/cave/com.raytheon.uf.viz.cwa/src/com/raytheon/uf/viz/cwa/rsc/CWAResource.java
index 5060b0b48a..a805bc9889 100644
--- a/cave/com.raytheon.uf.viz.cwa/src/com/raytheon/uf/viz/cwa/rsc/CWAResource.java
+++ b/cave/com.raytheon.uf.viz.cwa/src/com/raytheon/uf/viz/cwa/rsc/CWAResource.java
@@ -70,9 +70,9 @@ import com.vividsolutions.jts.geom.Polygon;
 
 /**
  * Resource for Center Weather Advisory
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
@@ -81,8 +81,10 @@ import com.vividsolutions.jts.geom.Polygon;
  *                                      compabilities.
  * May 11, 2015 4379       nabowle      Display all current CWAs for each frame.
  * Jun 15, 2015 4379       nabowle      Make last frame a live frame.
+ * Nov 05, 2015 5070       randerso     Adjust font sizes for dpi scaling
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
  * @version 1.0
  */
@@ -186,11 +188,11 @@ public class CWAResource extends
             constraints.put(END, constraint);
 
             // Request the point data
-            this.pdc = PointDataRequest
-                    .requestPointDataAllLevels((DataTime) null,
+            this.pdc = PointDataRequest.requestPointDataAllLevels(
+                    (DataTime) null,
                     resourceData.getMetadataMap().get("pluginName")
-                            .getConstraintValue(),
-                    getParameters(), null, constraints);
+                            .getConstraintValue(), getParameters(), null,
+                    constraints);
 
             if (wfs != null) {
                 wfs.dispose();
@@ -249,7 +251,7 @@ public class CWAResource extends
         /**
          * Get the list of PointDataViews. PointDataViews that share an event id
          * will be deduplicated to the most recent record for that event id.
-         *
+         * 
          * @return The list of PointDataViews.
          * @throws VizException
          */
@@ -332,7 +334,7 @@ public class CWAResource extends
 
     /**
      * Cancel the heart beat timer task
-     *
+     * 
      * @param resource
      */
     protected static void cancelRefreshTask(CWAResource resource) {
@@ -373,7 +375,7 @@ public class CWAResource extends
      * Get the current/simulated time to the minute. Seconds and Milliseconds
      * will be zero so a consistent time can be used each minute when retrieving
      * from the frame map.
-     *
+     * 
      * @return
      */
     public static DataTime now() {
@@ -424,7 +426,7 @@ public class CWAResource extends
 
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
-        this.font = target.initializeFont("Monospace", 11,
+        this.font = target.initializeFont("Monospace", 9,
                 new Style[] { Style.ITALIC });
         updateLiveFrame(now());
         scheduleRefreshTask(this);
@@ -516,7 +518,7 @@ public class CWAResource extends
 
     /**
      * Adds a new record to this resource
-     *
+     * 
      * @param obj
      */
     protected void addRecord(CWARecord obj) {
diff --git a/cave/com.raytheon.uf.viz.cwat/src/com/raytheon/uf/viz/cwat/CWATResource.java b/cave/com.raytheon.uf.viz.cwat/src/com/raytheon/uf/viz/cwat/CWATResource.java
index b0ed95e937..1b3ddb1d03 100644
--- a/cave/com.raytheon.uf.viz.cwat/src/com/raytheon/uf/viz/cwat/CWATResource.java
+++ b/cave/com.raytheon.uf.viz.cwat/src/com/raytheon/uf/viz/cwat/CWATResource.java
@@ -66,13 +66,13 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 
  * <pre>
  * 
- *    SOFTWARE HISTORY
- *   
- *    Date         Ticket#     Engineer    Description
- *    ------------ ----------  ----------- --------------------------
- *    16JUN2009    2037        dhladky    Initial Creation.
- *    Apr 17, 2013   1916      njensen    Overrode getDataTimes()
+ * SOFTWARE HISTORY
  * 
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * 16JUN2009    2037        dhladky     Initial Creation.
+ * Apr 17, 2013 1916        njensen     Overrode getDataTimes()
+ * Nov 05, 2015 5070       randerso     Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -180,7 +180,7 @@ public class CWATResource extends
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
         if (this.font == null) {
-            this.font = target.initializeFont("Dialog", 11, null);
+            this.font = target.initializeFont("Dialog", 9, null);
         }
         init = true;
     }
diff --git a/cave/com.raytheon.uf.viz.d2d.core/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.core/META-INF/MANIFEST.MF
index 536cda76d0..afd31b02b9 100644
--- a/cave/com.raytheon.uf.viz.d2d.core/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.d2d.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Plug-in
 Bundle-SymbolicName: com.raytheon.uf.viz.d2d.core;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  com.raytheon.uf.viz.core.rsc;bundle-version="1.0.0",
  com.raytheon.uf.viz.core.maps;bundle-version="1.12.1174",
  com.raytheon.viz.ui;bundle-version="1.12.1174",
- org.apache.commons.lang;bundle-version="2.3.0"
+ org.apache.commons.lang3;bundle-version="3.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.viz.d2d.core,
diff --git a/cave/com.raytheon.uf.viz.d2d.core/plugin.xml b/cave/com.raytheon.uf.viz.d2d.core/plugin.xml
index 9c1065bf9f..f33f3af832 100644
--- a/cave/com.raytheon.uf.viz.d2d.core/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.core/plugin.xml
@@ -35,13 +35,13 @@
         categoryId="com.raytheon.uf.viz.core.theme.d2d"
         id="com.raytheon.uf.viz.d2d.core.map.D2DColorBarResourceFont"
         label="D2D Colorbar Font"
-        value="Monospace-regular-11">
+        value="Monospace-regular-9">
         <description>
             Colorbar font for D2D
         </description>
     </fontDefinition>   
     <colorDefinition
-    	  categoryId="com.raytheon.uf.viz.core.theme.d2d"
+          categoryId="com.raytheon.uf.viz.core.theme.d2d"
           id="com.raytheon.uf.viz.d2d.core.map.D2DColorBarResourceColor"
           label="D2D Colorbar Font Color"
           value="255,255,255">
@@ -53,7 +53,7 @@
         categoryId="com.raytheon.uf.viz.core.theme.d2d"
         id="com.raytheon.uf.viz.d2d.core.legend.D2DLegendResource"
         label="D2D Legend Font"
-        value="Monospace-bold-14">
+        value="Monospace-bold-12">
         <description>
             Legend font for D2D
         </description>
@@ -62,7 +62,7 @@
         categoryId="com.raytheon.uf.viz.core.theme.d2d"
         id="com.raytheon.uf.viz.d2d.core.sampling.D2DSamplingResource"
         label="Sampling Font"
-        value="Monospaced-bold-12">
+        value="Monospace-bold-10">
         <description>
             The sampling font for D2D
         </description>
diff --git a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java
index 8420ef138b..7a8d9bd814 100644
--- a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java
+++ b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/legend/D2DLegendResource.java
@@ -74,6 +74,7 @@ import com.raytheon.viz.ui.actions.DummyAction;
  * Aug 2, 2013 DR 16427    Qinglu Lin   (David's approach) Changing InputPriority.SYSTEM_RESOURCE to 
  *                                      InputPriority.SYSTEM_RESOURCE_LOW in initInternal().
  * Jun 30, 2015 RM14663    kshresth     Font size increased for Contour labels.
+ * Nov 05, 2015 5070       randerso     Removed incorrect magnification limits
  * 
  * </pre>
  * 
@@ -508,7 +509,8 @@ public class D2DLegendResource extends
              * by being added later, runs before the changeModelHandler. See
              * InputManager.handeMouseXxx.
              */
-            rc.registerMouseHandler(changeModeHandler, InputPriority.SYSTEM_RESOURCE_LOW);
+            rc.registerMouseHandler(changeModeHandler,
+                    InputPriority.SYSTEM_RESOURCE_LOW);
             rc.registerMouseHandler(legendHandler,
                     InputPriority.SYSTEM_RESOURCE_LOW);
         }
@@ -572,8 +574,8 @@ public class D2DLegendResource extends
     private float getScaledMagnification() {
         float magnification = getCapability(MagnificationCapability.class)
                 .getMagnification().floatValue();
-        if (magnification < 0.9f) {
-            magnification = 1.0f;
+        if (magnification < 0.6f) {
+            magnification = 0.6f;
         } else if (magnification > 1.0f) {
             magnification = 1 + (magnification / 4.0f);
         }
diff --git a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DMapRenderableDisplay.java b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DMapRenderableDisplay.java
index 2c3ac0f916..bc1e507301 100644
--- a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DMapRenderableDisplay.java
+++ b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DMapRenderableDisplay.java
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.viz.core.AbstractTimeMatcher;
 import com.raytheon.uf.viz.core.IGraphicsTarget;
 import com.raytheon.uf.viz.core.VizConstants;
@@ -41,13 +40,10 @@ import com.raytheon.uf.viz.core.globals.VizGlobalsManager;
 import com.raytheon.uf.viz.core.map.IMapDescriptor;
 import com.raytheon.uf.viz.core.map.MapDescriptor;
 import com.raytheon.uf.viz.core.maps.scales.MapScaleRenderableDisplay;
-import com.raytheon.uf.viz.core.maps.scales.MapScalesManager;
-import com.raytheon.uf.viz.core.maps.scales.MapScalesManager.ManagedMapScale;
 import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
 import com.raytheon.uf.viz.core.rsc.IResourceGroup;
 import com.raytheon.uf.viz.core.rsc.ResourceList;
 import com.raytheon.uf.viz.core.rsc.ResourceList.AddListener;
-import com.raytheon.uf.viz.core.rsc.ResourceProperties;
 import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
 import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
 import com.raytheon.uf.viz.d2d.core.D2DProperties;
@@ -61,18 +57,21 @@ import com.raytheon.viz.core.imagery.ImageCombiner;
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Feb 09, 2009            njensen     Initial creation
- * Mar 21, 2013       1638 mschenke    Made map scales not tied to d2d
- * Mar 22, 2013       1638 mschenke    Moved map scale code to MapScaleRenderableDisplay
- * Apr 06, 2015 ASM #17215 D. Friedman Implement clear to avoid removing time match basis
- * Sep 03, 2015       4779 njensen     Removed DataScale references
+ * 
+ * Date          Ticket#  Engineer   Description
+ * ------------- -------- ---------- -------------------------------------------
+ * Feb 09, 2009  1960     njensen    Initial creation
+ * Mar 21, 2013  1638     mschenke   Made map scales not tied to d2d
+ * Mar 22, 2013  1638     mschenke   Moved map scale code to
+ *                                   MapScaleRenderableDisplay
+ * Apr 06, 2015  17215    dfriedman  Implement clear to avoid removing time
+ *                                   match basis
+ * Sep 03, 2015  4779     njensen    Removed DataScale references
+ * Dec 03, 2015  5147     bsteffen   Reset TimeMatcher on clear
  * 
  * </pre>
  * 
  * @author njensen
- * @version 1.0
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @XmlRootElement
@@ -313,65 +312,21 @@ public class D2DMapRenderableDisplay extends MapScaleRenderableDisplay
     }
 
     /**
-     * Like MapScaleRenderableDisplayer.clear, but avoids removing the time
-     * match basis until other resources are removed. This reduces time matching
-     * churn and reduces the chances of lockups.
-     * 
-     * @see com.raytheon.uf.viz.core.maps.scales.MapScaleRenderableDisplay#clear()
+     * Replace the time matcher with a copy before clearing. The existing time
+     * matcher is carefully tracking information for the resources(especially
+     * the time match basis), replacing the timeMatcher saves time updating or
+     * removing the saved information since the resources will all be removed
+     * anyway.
      */
     @Override
     public void clear() {
-        AbstractVizResource<?, ?> timeMatchBasis = null;
         AbstractTimeMatcher timeMatcher = descriptor.getTimeMatcher();
         if (timeMatcher instanceof D2DTimeMatcher) {
-            timeMatchBasis = ((D2DTimeMatcher) timeMatcher).getTimeMatchBasis();
-        }
-        ManagedMapScale scale = MapScalesManager.getInstance().getScaleByName(
-                getScaleName());
-        if (scale != null) {
-            ResourceList list = descriptor.getResourceList();
-            for (ResourcePair rp : list) {
-                if (rp.getProperties().isSystemResource() == false) {
-                    // Keep system resources
-                    if (rp.getResource() != timeMatchBasis) {
-                        list.remove(rp);
-                    }
-                }
-            }
-            if (timeMatchBasis != null) {
-                list.removeRsc(timeMatchBasis);
-            }
-            loadScale(scale);
-        } else {
-            // Map scale could not be found, default to remove all
-            // non-map/system layers and reset display
-            ResourceList list = descriptor.getResourceList();
-            for (ResourcePair rp : list) {
-                ResourceProperties props = rp.getProperties();
-                if (props.isMapLayer() == false
-                        && props.isSystemResource() == false) {
-                    if (rp.getResource() != timeMatchBasis) {
-                        list.remove(rp);
-                    }
-                } else {
-                    try {
-                        props.setVisible(true);
-                        rp.getResource().recycle();
-                    } catch (Throwable e) {
-                        props.setVisible(false);
-                        statusHandler.handle(Priority.PROBLEM, "Clear error: "
-                                + e.getMessage() + ":: The resource ["
-                                + rp.getResource().getSafeName()
-                                + "] has been disabled.", e);
-                    }
-                }
-            }
-            if (timeMatchBasis != null) {
-                list.removeRsc(timeMatchBasis);
-            }
-
-            scaleToClientArea(getBounds());
+            D2DTimeMatcher newTimeMatcher = new D2DTimeMatcher();
+            timeMatcher.copyFrom(newTimeMatcher);
+            descriptor.setTimeMatcher(newTimeMatcher);
         }
+        super.clear();
     }
 
 }
diff --git a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DSelectedPaneResource.java b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DSelectedPaneResource.java
index a78021336d..e3c331c7d5 100644
--- a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DSelectedPaneResource.java
+++ b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DSelectedPaneResource.java
@@ -52,6 +52,7 @@ import com.raytheon.viz.ui.editor.IMultiPaneEditor;
  * ------------ ---------- ----------- --------------------------
  * Dec 20, 2010            mschenke     Initial creation
  * Aug 04, 2014 3489       mapeters     Updated deprecated getStringBounds() calls.
+ * Nov 05, 2015 5070       randerso     Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -131,12 +132,10 @@ public class D2DSelectedPaneResource extends
                         / paintProps.getCanvasBounds().height;
 
                 stringL.basics.x = stringI.basics.x = plus.basics.x = paintProps
-                        .getView()
-                        .getExtent().getMinX()
+                        .getView().getExtent().getMinX()
                         + (LEFT_OFFSET * ratioX);
                 stringL.basics.y = stringI.basics.y = plus.basics.y = paintProps
-                        .getView()
-                        .getExtent().getMaxY()
+                        .getView().getExtent().getMaxY()
                         - (BOTTOM_OFFSET * ratioY);
 
                 if (editor.getNumberofPanes() > 1
@@ -178,7 +177,7 @@ public class D2DSelectedPaneResource extends
      */
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
-        font = target.initializeFont(Font.MONOSPACED, 24,
+        font = target.initializeFont(Font.MONOSPACED, 20,
                 new Style[] { Style.BOLD });
 
         stringL = new DrawableString("L", L_COLOR);
diff --git a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
index 3964711678..90fbdae60c 100644
--- a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
+++ b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
@@ -28,12 +28,15 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicReference;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -47,7 +50,6 @@ import com.raytheon.uf.viz.core.IDisplayPane;
 import com.raytheon.uf.viz.core.IDisplayPaneContainer;
 import com.raytheon.uf.viz.core.VizConstants;
 import com.raytheon.uf.viz.core.comm.PerspectiveSpecificLoadProperties;
-import com.raytheon.uf.viz.core.drawables.AbstractDescriptor;
 import com.raytheon.uf.viz.core.drawables.AbstractRenderableDisplay;
 import com.raytheon.uf.viz.core.drawables.IDescriptor;
 import com.raytheon.uf.viz.core.drawables.IDescriptor.FramesInfo;
@@ -71,28 +73,29 @@ import com.raytheon.uf.viz.d2d.core.D2DLoadProperties;
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Feb 10, 2009           chammack    Initial creation
- * Jul 03, 2013  2159     bsteffen    Synchronize TimeCache access.
- * Aug  9, 2013  16448    D. Friedman Validate time match basis in
- *                                    redoTimeMatching
- * May  5, 2014  17201    D. Friedman Make same-radar time matching work more
- *                                    like A1.
- * May  5, 2014  3265     bsteffen    Better handling of resources returning
- *                                    null dataTimes.
- * May 13, 2015  4461     bsteffen    Move the logic to change frames into the
- *                                    FrameCoordinator.
- * Jul 14, 2015  DR 13900 D. Friedman Validate descriptor of time match basis
- *                                    before time matching it.
- * Jul 30, 2015  17761    D. Friedman Allow resources to return data times based
- *                                    on base frame times.
- * Sep 10, 2015  4856     njensen     Removed unnecessary code
+ * 
+ * Date          Ticket#  Engineer   Description
+ * ------------- -------- ---------- -------------------------------------------
+ * Feb 10, 2009  1959     chammack   Initial creation
+ * Jul 03, 2013  2159     bsteffen   Synchronize TimeCache access.
+ * Aug 09, 2013  16448    dfriedman  Validate time match basis in
+ *                                   redoTimeMatching
+ * May 05, 2014  17201    dfriedman  Make same-radar time matching work more
+ *                                   like A1.
+ * May 05, 2014  3265     bsteffen   Better handling of resources returning null
+ *                                   dataTimes.
+ * May 13, 2015  4461     bsteffen   Move the logic to change frames into the
+ *                                   FrameCoordinator.
+ * Jul 14, 2015  13900    dfriedman  Validate descriptor of time match basis
+ *                                   before time matching it.
+ * Jul 30, 2015  17761    dfriedman  Allow resources to return data times based
+ *                                   on base frame times.
+ * Sep 10, 2015  4856     njensen    Removed unnecessary code
+ * Dec 03, 2015  5147     bsteffen   Make timeMatchBasis atomic.
  * 
  * </pre>
  * 
  * @author chammack
- * @version 1.0
  */
 @XmlAccessorType(XmlAccessType.NONE)
 public class D2DTimeMatcher extends AbstractTimeMatcher {
@@ -108,7 +111,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         /**
          * The last set of times that the resource with these properties was
          * matched against. As long as we are matching against these same times
-         * then lastFrameTimes is valid.
+         * then lastFrameTimes is valid. This will be null for the
+         * TimeMatchBasis.
          */
         private DataTime[] lastBaseTimes;
 
@@ -144,21 +148,21 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     }
 
     /**
-     * the rsc that determines the frame times to be displayed, i.e. other
+     * The resource that determines the frame times to be displayed, i.e. other
      * resources on the same descriptor will time match against the
-     * timeMatchBasis
+     * timeMatchBasis. This is an atomic reference to allow safe concurrent
+     * modification. It is never safe to assume that 2 calls to get will return
+     * the same value so complex operations(such as redoTimeMatching) will need
+     * to get a reference to the basis once at the beginning of the operation
+     * and use that reference throughout the operation.
      */
-    protected transient AbstractVizResource<?, ?> timeMatchBasis;
+    protected final AtomicReference<AbstractVizResource<?, ?>> timeMatchBasisRef = new AtomicReference<>();
 
     private final IDisposeListener timeMatchBasisDisposeListener = new IDisposeListener() {
 
         @Override
         public void disposed(AbstractVizResource<?, ?> resource) {
-            if ((resource == timeMatchBasis)) {
-                synchronized (D2DTimeMatcher.this) {
-                    timeMatchBasis = null;
-                }
-            }
+            timeMatchBasisRef.compareAndSet(resource, null);
         }
 
     };
@@ -187,9 +191,6 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
 
     private final Map<AbstractVizResource<?, ?>, TimeCache> timeCacheMap = new IdentityHashMap<AbstractVizResource<?, ?>, D2DTimeMatcher.TimeCache>();
 
-    /**
-     * Default Constructor.
-     */
     public D2DTimeMatcher() {
         super();
         try {
@@ -218,9 +219,6 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
      * Checks if a resource is contained in the {@link IResourceGroup}
      * recursively checking for {@link IResourceGroup}s in the group's list
      * 
-     * @param group
-     * @param resource
-     * @return
      */
     private boolean contained(IResourceGroup group,
             AbstractVizResource<?, ?> resource) {
@@ -241,52 +239,40 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     }
 
     @Override
-    public void redoTimeMatching(IDescriptor descriptor) throws VizException {
+    public void redoTimeMatching(IDescriptor descriptor) {
         synchronized (this) {
-            if ((timeMatchBasis != null)
-                    && (timeMatchBasis.getDescriptor() == descriptor)
-                    && !validateTimeMatchBasis(descriptor)) {
-                changeTimeMatchBasis(null);
-            }
-            if (timeMatchBasis != null) {
-                IDescriptor tmDescriptor = timeMatchBasis.getDescriptor();
-                if (tmDescriptor != null) {
-                    if (tmDescriptor != descriptor
-                            && tmDescriptor.getTimeMatcher() == this
-                            && hasContainer(descriptor)) {
-                        if (validateDescriptor(tmDescriptor)) {
-                            redoTimeMatching(tmDescriptor);
-                        } else {
-                            changeTimeMatchBasis(null);
-                        }
-                    } else if (contained(tmDescriptor, timeMatchBasis) == false) {
-                        // Checks to ensure the timeMatchBasis is not "orphaned"
-                        timeMatchBasis = null;
-                    }
-                }
-            }
-            // Find the times for the time match basis.
-            DataTime[] timeSteps = findBasisTimes(descriptor.getResourceList(),
-                    descriptor.getNumberOfFrames());
-            if (timeSteps == null) {
+            /* Find the times for the time match basis. */
+            Pair<AbstractVizResource<?, ?>, DataTime[]> basisInfo = findBasisTimes(descriptor);
+            if (basisInfo == null) {
                 descriptor.setFramesInfo(new FramesInfo(null, -1));
                 return;
             }
+            AbstractVizResource<?, ?> timeMatchBasis = basisInfo.getLeft();
+            DataTime[] timeSteps = basisInfo.getRight();
 
             Map<AbstractVizResource<?, ?>, DataTime[]> resourceTimeMap = new HashMap<AbstractVizResource<?, ?>, DataTime[]>();
             resourceTimeMap.put(timeMatchBasis, timeSteps);
 
-            // Find times for every other resource
+            /* Find the times for the time match basis. */
             Iterator<ResourcePair> pairIterator = descriptor.getResourceList()
                     .listIterator();
             while (pairIterator.hasNext()) {
                 AbstractVizResource<?, ?> rsc = pairIterator.next()
                         .getResource();
-                recursiveOverlay(descriptor, new FramesInfo(timeSteps, -1,
-                        resourceTimeMap), rsc, resourceTimeMap);
+                recursiveOverlay(descriptor, timeMatchBasis, new FramesInfo(
+                        timeSteps, -1, resourceTimeMap), rsc, resourceTimeMap);
             }
 
-            // Update the descriptor to the new times.
+            if (descriptor.getTimeMatcher() != this) {
+                /*
+                 * The descriptor has switched to a new time matcher so the
+                 * results of this operation are no longer relevant and are
+                 * discarded. This can happen when the display is cleared.
+                 */
+                return;
+            }
+
+            /* Update the descriptor to the new times. */
             if ((timeMatchBasis.getDescriptor() != null)
                     && (timeMatchBasis.getDescriptor() != descriptor)) {
                 int idx = timeMatchBasis.getDescriptor().getFramesInfo()
@@ -303,7 +289,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                         resourceTimeMap));
             }
 
-            // Add Remove data for all the resources.
+            /* Add Remove data for all the resources. */
             for (Entry<AbstractVizResource<?, ?>, DataTime[]> entry : resourceTimeMap
                     .entrySet()) {
                 if (entry.getKey().getDescriptor() == descriptor) {
@@ -319,17 +305,22 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
      * 
      * @param descriptor
      *            the descriptor that is being updated
+     * @param timeMatchBasis
+     *            the current timeMatchBasis, used to ensure that it is not time
+     *            matched again, even if it is located in a IResourceGroup
+     * @param framesInfo
+     *            the matched times for the rsc passed in will be added to the
+     *            map of this FramesInfo
      * @param rsc
      *            the resource being updated.
      * @param frameTimesSoure
      *            map of all previously time matched resources that may be used
      *            to determine the frame times
-     * @throws VizException
      */
     private void recursiveOverlay(IDescriptor descriptor,
-            FramesInfo framesInfo, AbstractVizResource<?, ?> rsc,
-            Map<AbstractVizResource<?, ?>, DataTime[]> frameTimesSoure)
-            throws VizException {
+            AbstractVizResource<?, ?> timeMatchBasis, FramesInfo framesInfo,
+            AbstractVizResource<?, ?> rsc,
+            Map<AbstractVizResource<?, ?>, DataTime[]> frameTimesSoure) {
         if (rsc == null) {
             return;
         }
@@ -338,7 +329,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                     frameTimesSoure);
             for (ResourcePair rp : ((IResourceGroup) rsc).getResourceList()) {
                 AbstractVizResource<?, ?> rsc1 = rp.getResource();
-                recursiveOverlay(descriptor, framesInfo, rsc1, completed);
+                recursiveOverlay(descriptor, timeMatchBasis, framesInfo, rsc1,
+                        completed);
             }
         }
 
@@ -347,8 +339,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                     .getLoadProperties());
             TimeCache timeCache = getTimeCache(rsc);
             synchronized (timeCache) {
-                DataTime[] timeSteps = getFrameTimes(descriptor, framesInfo,
-                        frameTimesSoure);
+                DataTime[] timeSteps = getFrameTimes(descriptor,
+                        timeMatchBasis, framesInfo, frameTimesSoure);
                 if (Arrays.equals(timeSteps, timeCache.getLastBaseTimes())) {
                     framesInfo.getTimeMap().put(rsc,
                             timeCache.getLastFrameTimes());
@@ -378,15 +370,10 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
 
     /**
      * Determine the times to match this resource against, for single panel this
-     * is the timeMatchBasisTimes, for four panel it is a bit more complex.
-     * 
-     * @param descriptor
-     * @param frameInfo
-     * @param frameTimesSoure
-     * @return
+     * is the timeMatchBasis times, for four panel it is a bit more complex.
      */
     private DataTime[] getFrameTimes(IDescriptor descriptor,
-            FramesInfo frameInfo,
+            AbstractVizResource<?, ?> timeMatchBasis, FramesInfo frameInfo,
             Map<AbstractVizResource<?, ?>, DataTime[]> frameTimesSource) {
         DataTime[] descTimes = frameInfo.getFrameTimes();
         if ((timeMatchBasis != null)
@@ -394,17 +381,19 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
             return descTimes;
         }
 
-        // If the time match basis is not in this descriptor we should instead
-        // fall back on the first resource in this descriptor which has times
-        // for this frame. This concept was adopted from Frame::dataTime() in
-        // the A1 source.
+        /*
+         * If the time match basis is not in this descriptor we should instead
+         * fall back on the first resource in this descriptor which has times
+         * for this frame. This concept was adopted from Frame::dataTime() in
+         * the A1 source.
+         */
         DataTime[] times = new DataTime[frameInfo.getFrameCount()];
 
         for (ResourcePair rp : descriptor.getResourceList()) {
             DataTime[] rscTimes = frameTimesSource.get(rp.getResource());
             if ((rscTimes == null) || (rscTimes.length != times.length)) {
                 if (rp.getResource() instanceof IResourceGroup) {
-                    // Descend into resource groups.
+                    /* Descend into resource groups. */
                     for (ResourcePair rp1 : ((IResourceGroup) rp.getResource())
                             .getResourceList()) {
                         rscTimes = frameTimesSource.get(rp1.getResource());
@@ -437,32 +426,85 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     /**
      * Attempts to find the frame times for a time match basis, if time match
      * basis is not defined attempts to find a new time match basis. Returns
-     * null if no Time Match basis can be found.
-     * 
-     * @param descriptor
-     * @param resourceList
-     * @return
-     * @throws VizException
+     * null if no Time Match basis can be found. This method will update the
+     * {@link #timeMatchBasisRef} if needed.
      */
-    private DataTime[] findBasisTimes(ResourceList resourceList,
-            int numberOfFrames) throws VizException {
-        if (timeMatchBasis != null) {
-            TimeCache timeCache = getTimeCache(timeMatchBasis);
-            DataTime[] times = null;
-            synchronized (timeCache) {
-                times = timeCache.getLastFrameTimes();
-                if ((times == null) || (timeCache.getLastBaseTimes() != null)
-                        || (timeCache.getLastFrameCount() != numberOfFrames)) {
-                    times = makeEmptyLoadList(numberOfFrames, timeMatchBasis);
-                    timeCache.setTimes(null, times, numberOfFrames);
+    private Pair<AbstractVizResource<?, ?>, DataTime[]> findBasisTimes(
+            IDescriptor descriptor) {
+        int numberOfFrames = descriptor.getNumberOfFrames();
+        AbstractVizResource<?, ?> timeMatchBasis = timeMatchBasisRef.get();
+        if (timeMatchBasis == null) {
+            Pair<AbstractVizResource<?, ?>, DataTime[]> pair = findNewBasis(
+                    descriptor.getResourceList(), numberOfFrames);
+            if (pair != null) {
+                AbstractVizResource<?, ?> rsc = pair.getLeft();
+                configureBasis(rsc);
+                if (!timeMatchBasisRef.compareAndSet(null, rsc)) {
+                    unconfigureBasis(rsc);
                 }
             }
-            if (times != null) {
-                return times;
-            } else {
-                timeMatchBasis = null;
+            return pair;
+        }
+
+        IDescriptor tmDescriptor = timeMatchBasis.getDescriptor();
+        if ((tmDescriptor == descriptor)
+                && !validateTimeMatchBasis(descriptor, timeMatchBasis)) {
+            changeTimeMatchBasis(null);
+            return findBasisTimes(descriptor);
+        }
+        if (tmDescriptor != null) {
+            if (tmDescriptor != descriptor
+                    && tmDescriptor.getTimeMatcher() == this
+                    && hasContainer(descriptor)) {
+                if (validateDescriptor(tmDescriptor)) {
+                    redoTimeMatching(tmDescriptor);
+                } else {
+                    changeTimeMatchBasis(null);
+                    return findBasisTimes(descriptor);
+                }
+            } else if (contained(tmDescriptor, timeMatchBasis) == false) {
+                /* Checks to ensure the timeMatchBasis is not "orphaned" */
+                timeMatchBasisRef.compareAndSet(timeMatchBasis, null);
+                return findBasisTimes(descriptor);
             }
         }
+        TimeCache timeCache = getTimeCache(timeMatchBasis);
+        DataTime[] times = null;
+        synchronized (timeCache) {
+            times = timeCache.getLastFrameTimes();
+            if ((times == null) || (timeCache.getLastBaseTimes() != null)
+                    || (timeCache.getLastFrameCount() != numberOfFrames)) {
+                times = makeEmptyLoadList(numberOfFrames, timeMatchBasis);
+                timeCache.setTimes(null, times, numberOfFrames);
+            }
+        }
+        if (times != null) {
+            return new ImmutablePair<AbstractVizResource<?, ?>, DataTime[]>(
+                    timeMatchBasis, times);
+        } else {
+            /*
+             * This might fail if another thread has assigned a basis while this
+             * method was looking for one. In this case the current operation
+             * will proceed with the wrong basis. Proceed anyway since the basis
+             * that was chosen would have been the correct basis when this
+             * method began. Whatever operation set the basis should have
+             * initiated redoTimeMatching which will run after this and assign
+             * times with the new basis.
+             */
+            timeMatchBasisRef.compareAndSet(timeMatchBasis, null);
+            return findBasisTimes(descriptor);
+        }
+    }
+
+    /**
+     * Recursive operation to search for a resource that is able to be the time
+     * match basis. Returns the resource and the matched times for that
+     * resource. If no resources is able to be the timeMatchBasis then null is
+     * returned. This method does not actually change {@link #timeMatchBasisRef}
+     * .
+     */
+    public Pair<AbstractVizResource<?, ?>, DataTime[]> findNewBasis(
+            ResourceList resourceList, int numberOfFrames) {
         Iterator<ResourcePair> pairIterator = resourceList.iterator();
         while (pairIterator.hasNext()) {
             ResourcePair pair = pairIterator.next();
@@ -476,13 +518,12 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
             }
 
             if (rsc.getResourceData() instanceof IResourceGroup) {
-                DataTime[] times = findBasisTimes(
-                        ((IResourceGroup) rsc.getResourceData())
-                                .getResourceList(),
-                        numberOfFrames);
+                IResourceGroup group = (IResourceGroup) rsc.getResourceData();
+                Pair<AbstractVizResource<?, ?>, DataTime[]> resultPair = findNewBasis(
+                        group.getResourceList(), numberOfFrames);
 
-                if (times != null) {
-                    return times;
+                if (resultPair != null) {
+                    return resultPair;
                 }
             } else {
                 DataTime[] times = makeEmptyLoadList(numberOfFrames, rsc);
@@ -491,7 +532,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                     synchronized (cache) {
                         cache.setTimes(null, times, numberOfFrames);
                     }
-                    return times;
+                    return new ImmutablePair<AbstractVizResource<?, ?>, DataTime[]>(
+                            rsc, times);
                 }
             }
         }
@@ -499,21 +541,11 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     }
 
     /**
-     * Make an empty load list for a resource, if this is successful the
-     * resource will be defined as the time match basis
-     * 
-     * @param descriptor
-     * @param rsc
-     * @return
-     * @throws VizException
+     * Make an empty load list for a resource. Only a time match basis should
+     * use this method for getting matched times.
      */
     private DataTime[] makeEmptyLoadList(int numberOfFrames,
-            AbstractVizResource<?, ?> rsc) throws VizException {
-        if ((timeMatchBasis != null) && (rsc != timeMatchBasis)) {
-            throw new IllegalArgumentException(
-                    "Cannot make Empty Load List for a resource which is not the Time Match Basis.");
-        }
-
+            AbstractVizResource<?, ?> rsc) {
         TimeMatchingConfiguration config = getConfiguration(
                 rsc.getLoadProperties()).clone();
         if ((config.getDataTimes() == null)
@@ -531,19 +563,14 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         if ((timeSteps == null) || (timeSteps.length == 0)) {
             return null;
         }
-        changeTimeMatchBasis(rsc);
         return timeSteps;
     }
 
     /**
      * Remove unused times from a resource and add in any new times.
-     * 
-     * @param rsc
-     * @param timeSteps
-     * @throws VizException
      */
     private void timeMatchUpdate(AbstractVizResource<?, ?> rsc,
-            DataTime[] timeSteps) throws VizException {
+            DataTime[] timeSteps) {
 
         if (rsc.getResourceData() instanceof IResourceGroup) {
             for (ResourcePair tmp : ((IResourceGroup) rsc.getResourceData())
@@ -562,9 +589,6 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     /**
      * Find the Time Matching Configuration for this resource. If one can't be
      * found, return an empty configuration.
-     * 
-     * @param properties
-     * @return
      */
     private TimeMatchingConfiguration getConfiguration(LoadProperties properties) {
         if (properties == null) {
@@ -582,6 +606,11 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         return new TimeMatchingConfiguration();
     }
 
+    /**
+     * Thread safe access to {@link #timeCacheMap}. If the map has no entry for
+     * this resource then a new {@link TimeCache} is created, added to the map,
+     * and returned.
+     */
     private TimeCache getTimeCache(AbstractVizResource<?, ?> resource) {
         synchronized (timeCacheMap) {
             TimeCache cache = timeCacheMap.get(resource);
@@ -596,8 +625,6 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     /**
      * Populates all unset fields of the configuration with defaults except
      * dataTimes, dataTimes should be set before calling this function.
-     * 
-     * @param config
      */
     private void populateConfiguration(TimeMatchingConfiguration config) {
         Arrays.sort(config.getDataTimes());
@@ -626,29 +653,33 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     }
 
     /**
-     * Retrieves the latest times from a time sequence resource
+     * Retrieves the latest times from a resource
      * 
-     * If the resource is also requestable, we check the catalog for the latest
-     * product times.
+     * If the resource data is an {@link AbstractRequestableResourceData} then
+     * this will query for the available times.
      * 
-     * @param rsc
-     * @param timeSteps
-     * @return
-     * @throws VizException
      */
     protected DataTime[] getLatestTimes(AbstractVizResource<?, ?> rsc,
-            DataTime[] timeSteps) throws VizException {
+            DataTime[] timeSteps) {
         DataTime[] availableTimes = null;
 
-        // If resource is handling requests itself, just return the datatimes
-        // listed in the resource
+        /*
+         * If resource is handling requests itself, just return the datatimes
+         * listed in the resource
+         */
         AbstractResourceData resourceData = rsc.getResourceData();
         if (resourceData instanceof AbstractRequestableResourceData) {
             AbstractRequestableResourceData req = (AbstractRequestableResourceData) resourceData;
             if (req.isRequeryNecessaryOnTimeMatch()
                     || (rsc.getDataTimes() == null)
                     || (rsc.getDataTimes().length == 0)) {
-                availableTimes = req.getAvailableTimes();
+                try {
+                    availableTimes = req.getAvailableTimes();
+                } catch (VizException e) {
+                    statusHandler
+                            .error("Unable to query times for "
+                                    + rsc.getSafeName(), e);
+                }
             }
         }
 
@@ -662,7 +693,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
 
     /**
      * Prunes data that is no longer used by calling
-     * AbstractVizResource.remove(DataTime).
+     * {@link AbstractVizResource#remove(DataTime)}
      * 
      * @param rsc
      *            the resource to prune
@@ -715,10 +746,9 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
      *            available dataTimes
      * @param resource
      *            the resource to update
-     * @throws VizException
      */
     private void updateResourceWithLatest(DataTime[] dataTimes,
-            AbstractVizResource<?, ?> resource) throws VizException {
+            AbstractVizResource<?, ?> resource) {
         Validate.notNull(resource, "Resource must not be null");
         if (resource.getResourceData() == null) {
             return;
@@ -735,10 +765,16 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
              * place to break things.
              */
             Arrays.sort(dt, new DataTimeComparator());
-            PluginDataObject[] pdo = arrd.getLatestPluginDataObjects(dataTimes,
-                    dt);
-            if (pdo.length > 0) {
-                resource.getResourceData().update(pdo);
+            try {
+                PluginDataObject[] pdo = arrd.getLatestPluginDataObjects(
+                        dataTimes, dt);
+                if (pdo.length > 0) {
+                    resource.getResourceData().update(pdo);
+                }
+            } catch (VizException e) {
+                statusHandler.error(
+                        "Unable to update data for " + resource.getSafeName(),
+                        e);
             }
         }
 
@@ -747,40 +783,40 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     @Override
     public void handleRemove(AbstractVizResource<?, ?> resource,
             IDescriptor descriptor) {
-        if ((resource == timeMatchBasis)
-                && (descriptor instanceof AbstractDescriptor)) {
-            synchronized (this) {
-                timeMatchBasis = null;
-            }
-        }
+        timeMatchBasisRef.compareAndSet(resource, null);
         synchronized (timeCacheMap) {
             timeCacheMap.remove(resource);
         }
     }
 
-    /**
-     * @return the loadMode
-     */
     public LoadMode getLoadMode() {
         return loadMode;
     }
 
-    /**
-     * @param loadMode
-     *            the loadMode to set
-     */
     public void setLoadMode(LoadMode loadMode) {
         this.loadMode = loadMode;
     }
 
+    /**
+     * Attempt to match the provided availableTimes against the current state of
+     * the time matcher. This can be used while loading a resource to determine
+     * if any matching times are possible and for preloading any data for those
+     * times.
+     * 
+     * This method is also responsible for using the
+     * AbstractTimeMatchingConfigurationFactory for this matcher to configure
+     * the time match settings. The final times the resource displays may change
+     * if other resources are being loaded concurrently. When a resource is done
+     * loading {@link #redoTimeMatching(IDescriptor)} must be used to properly
+     * add the resource to the {@link FramesInfo} of the {@link IDescriptor}.
+     */
     @Override
     public DataTime[] initialLoad(LoadProperties loadProps,
             DataTime[] availableTimes, IDescriptor descriptor)
             throws VizException {
-
         DataTime[] dataTimesToLoad = null;
-
         TimeMatchingConfiguration config = null;
+        AbstractVizResource<?, ?> timeMatchBasis = timeMatchBasisRef.get();
         if (timeMatchBasis == null) {
             config = configFactory.getConfiguration(loadProps, this,
                     availableTimes, descriptor);
@@ -810,8 +846,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
             }
             populateConfiguration(config);
             DataTime[] existingDataTimes = getFrameTimes(descriptor,
-                    descriptor.getFramesInfo(), descriptor.getFramesInfo()
-                            .getTimeMap());
+                    timeMatchBasis, descriptor.getFramesInfo(), descriptor
+                            .getFramesInfo().getTimeMap());
 
             TimeMatcher tm = new TimeMatcher();
             dataTimesToLoad = tm.makeOverlayList(config.getDataTimes(),
@@ -821,7 +857,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
 
             if ((timeMatchBasis.getDescriptor() != null)
                     && (timeMatchBasis.getDescriptor() != descriptor)) {
-                // Still use my times, but the index from the time match basis
+                /* Still use my times, but the index from the time match basis */
                 FramesInfo myFi = descriptor.getFramesInfo();
                 FramesInfo tmFi = timeMatchBasis.getDescriptor()
                         .getFramesInfo();
@@ -836,90 +872,77 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     /**
      * Changes the time match basis for the time matcher to be the specified
      * resource
-     * 
-     * @param resource
      */
     public void changeTimeMatchBasis(AbstractVizResource<?, ?> resource) {
-        if (timeMatchBasis != resource) {
-            if (timeMatchBasis != null) {
-                TimeMatchingConfiguration config = getConfiguration(timeMatchBasis
-                        .getLoadProperties());
-                config.setTimeMatchBasis(false);
-                TimeCache timeCache = getTimeCache(timeMatchBasis);
-                synchronized (timeCache) {
-                    timeCache.setTimes(null, null);
-                }
-                timeMatchBasis
-                        .unregisterListener(timeMatchBasisDisposeListener);
-            }
-
-            timeMatchBasis = resource;
-
-            if (timeMatchBasis != null) {
-                TimeMatchingConfiguration config = getConfiguration(timeMatchBasis
-                        .getLoadProperties());
-                config.setTimeMatchBasis(true);
-                TimeCache timeCache = getTimeCache(timeMatchBasis);
-                synchronized (timeCache) {
-                    timeCache.setTimes(null, null);
-                }
-                timeMatchBasis.registerListener(timeMatchBasisDisposeListener);
-            }
+        if (resource != null) {
+            configureBasis(resource);
+        }
+        AbstractVizResource<?, ?> prev = timeMatchBasisRef.getAndSet(resource);
+        if (prev != null) {
+            unconfigureBasis(prev);
         }
     }
 
     /**
-     * Returns the time match basis for the D2DTimeMatcher
-     * 
-     * @return
+     * Used to setup the {@link TimeMatchingConfiguration} and
+     * {@link #timeMatchBasisDisposeListener} for a new timeMatchBasis. This
+     * should be used before modifying the {@link TimeMatchBasisRef}.
      */
-    public AbstractVizResource<?, ?> getTimeMatchBasis() {
-        return timeMatchBasis;
-    }
-
-    public boolean hasTimeMatchBasis() {
-        return (timeMatchBasis != null);
+    private void configureBasis(AbstractVizResource<?, ?> newBasis) {
+        TimeMatchingConfiguration config = getConfiguration(newBasis
+                .getLoadProperties());
+        config.setTimeMatchBasis(true);
+        TimeCache timeCache = getTimeCache(newBasis);
+        synchronized (timeCache) {
+            timeCache.setTimes(null, null);
+        }
+        newBasis.registerListener(timeMatchBasisDisposeListener);
     }
 
     /**
-     * @return the clockFilter
+     * Used to revert the {@link TimeMatchingConfiguration} and
+     * {@link #timeMatchBasisDisposeListener} when a timeMatchBasis is removed.
+     * This should be used after modifying the {@link TimeMatchBasisRef}.
      */
+    private void unconfigureBasis(AbstractVizResource<?, ?> oldBasis) {
+        TimeMatchingConfiguration config = getConfiguration(oldBasis
+                .getLoadProperties());
+        config.setTimeMatchBasis(false);
+        TimeCache timeCache = getTimeCache(oldBasis);
+        synchronized (timeCache) {
+            timeCache.setTimes(null, null);
+        }
+        oldBasis.unregisterListener(timeMatchBasisDisposeListener);
+    }
+
+    public AbstractVizResource<?, ?> getTimeMatchBasis() {
+        return timeMatchBasisRef.get();
+    }
+
+    public boolean hasTimeMatchBasis() {
+        return (timeMatchBasisRef.get() != null);
+    }
+
     public Date getClockFilter() {
         return clockFilter;
     }
 
-    /**
-     * @return the forecastFilter
-     */
     public long getForecastFilter() {
         return forecastFilter;
     }
 
-    /**
-     * @return the deltaFilter
-     */
     public long getDeltaFilter() {
         return deltaFilter;
     }
 
-    /**
-     * @return the isTimeOptionsSelected
-     */
     public boolean isTimeOptionsSelected() {
         return isTimeOptionsSelected;
     }
 
-    /**
-     * @param isTimeOptionsSelected
-     *            the isTimeOptionsSelected to set
-     */
     public void setTimeOptionsSelected(boolean isTimeOptionsSelected) {
         this.isTimeOptionsSelected = isTimeOptionsSelected;
     }
 
-    /**
-     * @return the dataTimeDialogManager
-     */
     public AbstractTimeMatchingConfigurationFactory getTimeMatchingConfigurationFactory() {
         return configFactory;
     }
@@ -927,7 +950,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     @Override
     public List<AbstractRenderableDisplay> getDisplayLoadOrder(
             List<AbstractRenderableDisplay> displays) {
-        // if any of the displays have a set time match basis then load it first
+        /* if any of the displays have a set time match basis then load it first */
         AbstractRenderableDisplay basisDisplay = null;
         for (AbstractRenderableDisplay display : displays) {
             if (getBasisResourcePair(display.getDescriptor().getResourceList()) != null) {
@@ -947,8 +970,10 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
 
     @Override
     public List<ResourcePair> getResourceLoadOrder(List<ResourcePair> resources) {
-        // if any of the resources are set as the time match basis then load it
-        // first
+        /*
+         * if any of the resources are set as the time match basis then load it
+         * first
+         */
         ResourcePair basisPair = getBasisResourcePair(resources);
         if (basisPair != null) {
             List<ResourcePair> results = new ArrayList<ResourcePair>(resources);
@@ -979,7 +1004,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
     public void copyFrom(AbstractTimeMatcher timeMatcher) {
         if (timeMatcher instanceof D2DTimeMatcher) {
             D2DTimeMatcher d2d = (D2DTimeMatcher) timeMatcher;
-            if (timeMatchBasis == null) {
+            if (timeMatchBasisRef.get() == null) {
                 this.clockFilter = d2d.clockFilter;
                 this.forecastFilter = d2d.forecastFilter;
                 this.deltaFilter = d2d.deltaFilter;
@@ -994,7 +1019,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         configFactory.resetMultiload();
     }
 
-    private boolean validateTimeMatchBasis(IDescriptor descriptor) {
+    private static boolean validateTimeMatchBasis(IDescriptor descriptor,
+            AbstractVizResource<?, ?> timeMatchBasis) {
         /*
          * If a resource is shared by multiple panels (this can be the case with
          * tools, at least), then it is necessary to search all of them as
@@ -1010,18 +1036,21 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                 IDescriptor paneDescriptor = paneDisplay != null ? paneDisplay
                         .getDescriptor() : null;
                 if ((paneDescriptor != null)
-                        && validateTimeMatchBasis(paneDescriptor
-                                .getResourceList())) {
+                        && validateTimeMatchBasis(
+                                paneDescriptor.getResourceList(),
+                                timeMatchBasis)) {
                     return true;
                 }
             }
         } else {
-            return validateTimeMatchBasis(descriptor.getResourceList());
+            return validateTimeMatchBasis(descriptor.getResourceList(),
+                    timeMatchBasis);
         }
         return false;
     }
 
-    private boolean validateTimeMatchBasis(ResourceList list) {
+    private static boolean validateTimeMatchBasis(ResourceList list,
+            AbstractVizResource<?, ?> timeMatchBasis) {
         for (ResourcePair rp : list) {
             AbstractVizResource<?, ?> rsc = rp.getResource();
             if (rsc == timeMatchBasis) {
@@ -1031,8 +1060,9 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                 continue;
             } else if ((rsc != null)
                     && (rsc.getResourceData() instanceof IResourceGroup)) {
-                if (validateTimeMatchBasis(((IResourceGroup) rsc
-                        .getResourceData()).getResourceList())) {
+                IResourceGroup group = (IResourceGroup) rsc.getResourceData();
+                if (validateTimeMatchBasis(group.getResourceList(),
+                        timeMatchBasis)) {
                     return true;
                 }
             }
@@ -1045,7 +1075,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
         return display.getContainer() != null;
     }
 
-    private boolean validateDescriptor(IDescriptor descriptor) {
+    private static boolean validateDescriptor(IDescriptor descriptor) {
         IRenderableDisplay display = descriptor.getRenderableDisplay();
         IDisplayPaneContainer container = display != null ? display
                 .getContainer() : null;
@@ -1054,8 +1084,9 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
                 IRenderableDisplay paneDisplay = pane.getRenderableDisplay();
                 IDescriptor paneDescriptor = paneDisplay != null ? paneDisplay
                         .getDescriptor() : null;
-                if (paneDescriptor == descriptor)
+                if (paneDescriptor == descriptor) {
                     return true;
+                }
             }
         }
         return false;
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAlaska.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAlaska.xml
index 019d9de459..07b5cabc6e 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAlaska.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAlaska.xml
@@ -31,7 +31,7 @@
 	    </contribute>
 
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Bethel, AK (PABE)" id="raobRarotonga"
+	                menuText="Bethel, AK (PABE)" id="raobBethel_AK"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="70219"/>
 	    </contribute>
@@ -86,7 +86,7 @@
 	        <substitute key="stationId" value="70133"/>
 	    </contribute>
 	    	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="St. Paul Island, AK (PASN)" id="raobSTPaulIsland_AK"
+	                menuText="St. Paul Island, AK (PASN)" id="raobStPaulIsland_AK"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="70308"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAtlantic.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAtlantic.xml
index 92d6c70827..d948049008 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAtlantic.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAtlantic.xml
@@ -77,13 +77,13 @@
 	        <substitute key="stationId" value="78970"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Howard AFB, PM (MPHO)" id="raobHowardAFB_PM "
+	                menuText="Howard AFB, PM (MPHO)" id="raobHowardAFB_PM"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="78806"/>
 	    </contribute>
 
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Guantanamo Bay, CU (MUGM)" id="raobPortland_ME"
+	                menuText="Guantanamo Bay, CU (MUGM)" id="raobGuantanamoBay_CU"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="78367"/>
 	    </contribute>
@@ -108,12 +108,12 @@
 	        <substitute key="stationId" value="81405"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Le Ralset, Guadeloupe (TFFR)" id="LeRalset_Guadeloupe"
+	                menuText="Le Ralset, Guadeloupe (TFFR)" id="raobLeRalset_Guadeloupe"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="78897"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="San Juan, PR (TJSJ)" id="raobWashington_DC"
+	                menuText="San Juan, PR (TJSJ)" id="raobSanJuan_PR"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="78526"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAustralia.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAustralia.xml
index 410b2f3aee..df94e87ab6 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAustralia.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseAustralia.xml
@@ -20,7 +20,7 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Willis Island (94299)" id="raobWillis Island"
+	                menuText="Willis Island (94299)" id="raobWillisIsland"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="94299"/>
 	    </contribute>
@@ -155,7 +155,7 @@
 	        <substitute key="stationId" value="94750"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Sydney Arpt (YSSY)" id="raobSydney Arpt"
+	                menuText="Sydney Arpt (YSSY)" id="raobSydneyArpt"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="94767"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseCanadaEastern.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseCanadaEastern.xml
index 47048c0dec..4b8432767b 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseCanadaEastern.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseCanadaEastern.xml
@@ -70,7 +70,7 @@
 	        <substitute key="stationId" value="71907"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Yarmouth, NS (CYQI)" id="raobAtlanta_GA"
+	                menuText="Yarmouth, NS (CYQI)" id="raobYarmouth_NS"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="71603"/>
 	    </contribute>
@@ -95,7 +95,7 @@
 	        <substitute key="stationId" value="71801"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Toronto Int'l, ON (CYYZ)" id="raobTorontoIntl_ON "
+	                menuText="Toronto Int'l, ON (CYYZ)" id="raobTorontoIntl_ON"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="71624"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseJapan.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseJapan.xml
index 160001720f..e74356312f 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseJapan.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseJapan.xml
@@ -158,7 +158,7 @@
 	    </contribute>
 
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Ishigakijima (ROIG)" id="raobIshigakijima "
+	                menuText="Ishigakijima (ROIG)" id="raobIshigakijima"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="47918"/>
 	    </contribute>
@@ -168,7 +168,7 @@
 	        <substitute key="stationId" value="47945"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Clark AFB (RPMK)" id="raobClearkAFB"
+	                menuText="Clark AFB (RPMK)" id="raobClarkAFB"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="98327"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseMexico.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseMexico.xml
index 01b6a6b107..7f17296169 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseMexico.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseMexico.xml
@@ -30,12 +30,12 @@
 	        <substitute key="stationId" value="76840"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Ciudad Del Carmen, MX (MCME)" id="raobCiudadDelCarmen_MX "
+	                menuText="Ciudad Del Carmen, MX (MCME)" id="raobCiudadDelCarmen_MX"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="76749"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Ciudad Victoria, MX (MCVM)" id="raobCiudadVictoria_MX "
+	                menuText="Ciudad Victoria, MX (MCVM)" id="raobCiudadVictoria_MX"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="76225"/>
 	    </contribute>
@@ -45,7 +45,7 @@
 	        <substitute key="stationId" value="76649"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Isle of Guadalupe, MX (MILS)" id="raobIsleofGuadalupe_MX "
+	                menuText="Isle of Guadalupe, MX (MILS)" id="raobIsleofGuadalupe_MX"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="76151"/>
 	    </contribute>
@@ -70,12 +70,12 @@
 	        <substitute key="stationId" value="76361"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Chihuahua, MX (MMCU)" id="raobChihuahua_MX "
+	                menuText="Chihuahua, MX (MMCU)" id="raobChihuahua_MX"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="76225"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Mexico/Central, MX (MMDF)" id="raobCentral, MX"
+	                menuText="Mexico/Central, MX (MMDF)" id="raobCentral_MX"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="76679"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/basePacificEast.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/basePacificEast.xml
index 929c254b29..c171550d6f 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/basePacificEast.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/basePacificEast.xml
@@ -81,7 +81,7 @@
 	    </contribute>
 
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Midway Island (Navy) (PMDY)" id="raobPortland_ME"
+	                menuText="Midway Island (Navy) (PMDY)" id="raobMidwayIs"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="91066"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/basePacificWest.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/basePacificWest.xml
index 6e030771ab..84b79c272f 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/basePacificWest.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/basePacificWest.xml
@@ -25,7 +25,7 @@
 	        <substitute key="stationId" value="99027"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Honiara (AGGH)" id="raobHonlara"
+	                menuText="Honiara (AGGH)" id="raobHoniara"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="91517"/>
 	    </contribute>
@@ -72,12 +72,12 @@
 	        <substitute key="stationId" value="91592"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Guam/Taguac, GU (PGAC)" id="raobTaguac_GU "
+	                menuText="Guam/Taguac, GU (PGAC)" id="raobTaguac_GU"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="91217"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Guam/Anderson AFB, GU (PGUA)" id="raobAndersonAFB_GU "
+	                menuText="Guam/Anderson AFB, GU (PGUA)" id="raobAndersonAFB_GU"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="91218"/>
 	    </contribute>
@@ -122,7 +122,7 @@
 	        <substitute key="stationId" value="91413"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Wake Island (PWAK)" id="raobWake Island"
+	                menuText="Wake Island (PWAK)" id="raobWakeIsland"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="91245"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseRussia.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseRussia.xml
index 8b73228ba9..19a3506607 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseRussia.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseRussia.xml
@@ -20,7 +20,7 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Mys Uzlen (25399)" id="raobMys Uzlen"
+	                menuText="Mys Uzlen (25399)" id="raobMysUzlen"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="25399"/>
 	    </contribute>
@@ -135,12 +135,12 @@
 	        <substitute key="stationId" value="21824"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Anadyr' (UHMA)" id="raobnadyr'"
+	                menuText="Anadyr (UHMA)" id="raobAnadyr"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="25563"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Bukhta Provideniya (UHMD)" id="raobBukhta Provideniya"
+	                menuText="Bukhta Provideniya (UHMD)" id="raobBukhtaProvideniya"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="25594"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSCentral.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSCentral.xml
index f54605d3b6..bd7806397a 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSCentral.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSCentral.xml
@@ -65,7 +65,7 @@
 	        <substitute key="stationId" value="72364"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Fort Worth, TX (KFWD)" id="raobFortWorth_TX "
+	                menuText="Fort Worth, TX (KFWD)" id="raobFortWorth_TX"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="72249"/>
 	    </contribute>
@@ -100,7 +100,7 @@
 	        <substitute key="stationId" value="72340"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Midland, TX (KMAF)" id="raobSanNicholasIsland_CA"
+	                menuText="Midland, TX (KMAF)" id="raobMidland_TX"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="72265"/>
 	    </contribute>
@@ -115,7 +115,7 @@
 	        <substitute key="stationId" value="72558"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Oklahoma City, OK (KOUN)" id="raobOklahomaCity_OK "
+	                menuText="Oklahoma City, OK (KOUN)" id="raobOklahomaCity_OK"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="72357"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSEastern.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSEastern.xml
index c86d43ca8b..fcdb113247 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSEastern.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSEastern.xml
@@ -165,7 +165,7 @@
 	        <substitute key="stationId" value="72221"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Wallops Island, VA (KWAL)" id="raobWallopsIsland_VA "
+	                menuText="Wallops Island, VA (KWAL)" id="raobWallopsIsland_VA"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="72402"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSWestern.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSWestern.xml
index 6c2a17173d..48deeec1fd 100644
--- a/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSWestern.xml
+++ b/cave/com.raytheon.uf.viz.d2d.nsharp/localization/menus/upperair/baseUSWestern.xml
@@ -35,12 +35,12 @@
 	        <substitute key="stationId" value="74004"/>
 	    </contribute>
 	    	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Yuma PG Site 2, AZ (K1Y8)" id="raobYuma_AZ"
+	                menuText="Yuma PG Site 2, AZ (K1Y8)" id="raobYumaPgSite2_AZ"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="74005"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Yuma PG Site 3, AZ (K1Y9)" id="raobYuma_AZ"
+	                menuText="Yuma PG Site 3, AZ (K1Y9)" id="raobYumaPgSite3_AZ"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="74006"/>
 	    </contribute>
@@ -65,7 +65,7 @@
 	        <substitute key="stationId" value="72387"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Edwards AFB, CA (KEDW)" id="raobEdwardsAFB_CA "
+	                menuText="Edwards AFB, CA (KEDW)" id="raobEdwardsAFB_CA"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="72381"/>
 	    </contribute>
@@ -130,7 +130,7 @@
 	        <substitute key="stationId" value="74626"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirRaob.xml" 
-	                menuText="Reno, NV (KREV)" id="raobReno_NV "
+	                menuText="Reno, NV (KREV)" id="raobReno_NV"
 	                editorType="gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor">
 	        <substitute key="stationId" value="72489"/>
 	    </contribute>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/SvrWxPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/SvrWxPlot.xml
index 75e85c838a..8dbd836c72 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/SvrWxPlot.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/bundles/ncepHydro/SvrWxPlot.xml
@@ -45,6 +45,11 @@
 								<constraint constraintValue="A" constraintType="EQUALS" />
 							</mapping>
 						</metadataMap>
+                        <timeQueryMetadataMap>
+                            <mapping key="pluginName">
+                                <constraint constraintValue="svrwx" constraintType="EQUALS" />
+                            </mapping>
+                        </timeQueryMetadataMap>
 					</resourceData>
 				</resource>
 				<resource>
@@ -69,6 +74,11 @@
 								<constraint constraintValue="W" constraintType="EQUALS" />
 							</mapping>
 						</metadataMap>
+                        <timeQueryMetadataMap>
+                            <mapping key="pluginName">
+                                <constraint constraintValue="svrwx" constraintType="EQUALS" />
+                            </mapping>
+                        </timeQueryMetadataMap>
 					</resourceData>
 				</resource>
 				<resource>
@@ -93,6 +103,11 @@
 								<constraint constraintValue="T" constraintType="EQUALS" />
 							</mapping>
 						</metadataMap>
+                        <timeQueryMetadataMap>
+                            <mapping key="pluginName">
+                                <constraint constraintValue="svrwx" constraintType="EQUALS" />
+                            </mapping>
+                        </timeQueryMetadataMap>
 					</resourceData>
 				</resource>
 			</descriptor>
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml
index a1ffaef8e0..a5dfb1bbb6 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/tpc/hurricane.xml
@@ -28,12 +28,12 @@
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
 		menuText="E Pacific" id="easternPacificTrackSummary">
-		<substitute key="productType" value="TCMEP1,TCMEP2,TCMEP3,TCMEP4,TCMEP5" />
+		<substitute key="productType" value="TCMEP1,TCMEP2,TCMEP3,TCMEP4,TCMEP5,TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5" />
 		<substitute key="legend" value="E Pacific" />
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/TrackSummaryPlot.xml"
 		menuText="W Pacific" id="westernPacificTrackSummary">
-		<substitute key="productType" value="TCMWP1,TCMWP2,TCMWP3,TCMWP4,TCMWP5,TCP" />
+		<substitute key="productType" value="TCMCP1,TCMCP2,TCMCP3,TCMCP4,TCMCP5,TCMWP1,TCMWP2,TCMWP3,TCMWP4,TCMWP5,TCP" />
 		<substitute key="legend" value="W Pacific" />
 	</contribute>
 	<contribute xsi:type="subMenu" menuText="Hourly Forecasts">
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAddedFeatures.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAddedFeatures.xml
index 1070174a41..4d41a96981 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAddedFeatures.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseAddedFeatures.xml
@@ -19,12 +19,4 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<contribute xsi:type="subMenu" menuText="Added Features">
-		<contribute xsi:type="subMenu" menuText="Archive">
-			<contribute xsi:type="placeholder" menuText="                "/>
-		</contribute>
-		<contribute xsi:type="subMenu" menuText="Composite">
-			<contribute xsi:type="placeholder" menuText="                "/>
-		</contribute>
-	</contribute>
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml
index 6d0ea12fb6..beb3f22bfa 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseNPNPlot.xml
@@ -98,7 +98,6 @@
         	<substitute key="legend" value="Sfc Profiler"/>
 	    </contribute>
 	</contribute>
-	<contribute xsi:type="placeholder" 
-		menuText="NPN Perspective" id="npnPerspective"/>
+	<contribute xsi:type="separator" id="npnPerspective"/>
 	<contribute xsi:type="separator" id="MySeparatorId1"/>
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml
index 6d94615b29..a911376543 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/baseRadar.xml
@@ -168,6 +168,5 @@
 	    	<substitute key="label" value="925mb"/>
 		</contribute>
 	</contribute>
-	<contribute xsi:type="placeholder" menuText="VWP perspective"/>
 	<contribute xsi:type="separator" id="MySeparatorId2"/>
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index 91b3c6cb3d..cfa8627d00 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -268,14 +268,42 @@
                       definitionId="com.raytheon.uf.viz.d2d.ui.inD2DActionSet">
                 </reference>
              </visibleWhen>
-             <separator
-                   name="tools.start"
-                   visible="false">
-             </separator>
-             <separator
-                   name="D2D.Tools.Additions"
-                   visible="false">
-             </separator>
+             <separator name="tools.A" visible="false" />
+             <separator name="tools.B" visible="false" />
+             <separator name="tools.C" visible="false" />
+             <separator name="tools.Da" visible="false" />
+             <separator name="tools.Di" visible="false" />
+             <separator name="tools.E" visible="false" />
+             <separator name="tools.Fa" visible="false" />
+             <separator name="tools.Fe" visible="false" />
+             <separator name="tools.Fs" visible="false" />
+             <separator name="tools.G" visible="false" />
+             <separator name="tools.H" visible="false" />
+             <separator name="tools.I" visible="false" />
+             <separator name="tools.J" visible="false" />
+             <separator name="tools.K" visible="false" />
+             <separator name="tools.L" visible="false" />
+             <separator name="tools.M" visible="false" />
+             <separator name="tools.N" visible="false" />
+             <separator name="tools.O" visible="false" />
+             <separator name="tools.Pa" visible="false" />
+             <separator name="tools.Pg" visible="false" />
+             <separator name="tools.Po" visible="false" />
+             <separator name="tools.Pu" visible="false" />
+             <separator name="tools.Q" visible="false" />
+             <separator name="tools.Raa" visible="false" />
+             <separator name="tools.Rad" visible="false" />
+             <separator name="tools.Ran" visible="false" />
+             <separator name="tools.S" visible="false" />
+             <separator name="tools.Ta" visible="false" />
+             <separator name="tools.Te" visible="false" />
+             <separator name="tools.Ti" visible="false" />
+             <separator name="tools.U" visible="false" />
+             <separator name="tools.V" visible="false" />
+             <separator name="tools.W" visible="false" />
+             <separator name="tools.X" visible="false" />
+             <separator name="tools.Y" visible="false" />
+             <separator name="tools.Z" visible="false" />
           </menu>
           <menu
                 id="volume"
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DeleteAWIPSProcedure.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DeleteAWIPSProcedure.java
index 403923ecf8..3dfd3faa1f 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DeleteAWIPSProcedure.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DeleteAWIPSProcedure.java
@@ -24,9 +24,9 @@ import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.ui.handlers.HandlerUtil;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -36,22 +36,22 @@ import com.raytheon.viz.ui.dialogs.localization.VizLocalizationFileListDlg;
 import com.raytheon.viz.ui.dialogs.localization.VizLocalizationFileListDlg.Mode;
 
 /**
- * DeleteAWIPSProcedure
- * 
  * Delete an AWIPS procedure
  * 
  * <pre>
  * 
- *    SOFTWARE HISTORY
- *   
- *    Date         Ticket#     Engineer    Description
- *    ------------ ----------  ----------- --------------------------
- *    Sep 13, 2007             chammack    Initial Creation.
- *    Jul 8, 2008  #1183       chammack    Migrate to new localization
- *    Oct 16, 2012 #1229       rferrel     Changes for non-blocking VizLocalizationFileListDlg.
- *    Jun 02, 2015 #4401       bkowal      Updated to use {@link VizLocalizationFileListDlg}.
- *    Jun 30, 2015 #4401       bkowal      Specify the localization type when constructing a
- *                                         {@link VizLocalizationFileListDlg}.
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * Sep 13, 2007             chammack    Initial Creation.
+ * Jul 8, 2008  #1183       chammack    Migrate to new localization
+ * Oct 16, 2012 #1229       rferrel     Changes for non-blocking VizLocalizationFileListDlg.
+ * Jun 02, 2015 #4401       bkowal      Updated to use {@link VizLocalizationFileListDlg}.
+ * Jun 30, 2015 #4401       bkowal      Specify the localization type when constructing a
+ *                                      {@link VizLocalizationFileListDlg}.
+ * Nov 12, 2015 4834        njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Jan 11, 2016 5242        kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -64,13 +64,6 @@ public class DeleteAWIPSProcedure extends AbstractHandler {
 
     private VizLocalizationFileListDlg listDlg;
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands
-     * .ExecutionEvent)
-     */
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
         if (listDlg == null || listDlg.getShell() == null
@@ -83,15 +76,15 @@ public class DeleteAWIPSProcedure extends AbstractHandler {
 
                 @Override
                 public void dialogClosed(Object returnValue) {
-                    if (returnValue instanceof LocalizationFile) {
-                        LocalizationFile selectedFile = (LocalizationFile) returnValue;
+                    if (returnValue instanceof ILocalizationFile) {
+                        ILocalizationFile selectedFile = (ILocalizationFile) returnValue;
                         try {
                             selectedFile.delete();
-                        } catch (LocalizationOpFailedException e) {
+                        } catch (LocalizationException e) {
                             statusHandler.handle(
                                     Priority.PROBLEM,
                                     "Error deleting procedure: "
-                                            + selectedFile.getName());
+                                            + selectedFile.getPath());
                         }
                     }
                 }
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagButtonHandler.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagButtonHandler.java
index 7a14fa1fb2..59d492e024 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagButtonHandler.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagButtonHandler.java
@@ -39,7 +39,9 @@ import com.raytheon.viz.ui.actions.AbstractGlobalsButtonHandler;
  * Jul 23, 2007            randerso    Initial Creation.
  * Sep 4, 2012  15335      kshresth    Will now display lightning/wind 
  *                                     fields when magnification set to 0
- * &#064;author randerso
+ * Nov 05, 2015 5070       randerso    Removed override of 0.0 magnification
+ * 
+ * @author randerso
  * 
  */
 public class MagButtonHandler extends AbstractGlobalsButtonHandler implements
@@ -53,7 +55,6 @@ public class MagButtonHandler extends AbstractGlobalsButtonHandler implements
     protected void updateGlobalValue(IWorkbenchWindow changedWindow,
             UIElement element, Object value) {
         Double mag = (Double) value;
-        if (mag <= 0.1) mag=0.0;
         element.setText("Mag: " + mag);
     }
 }
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java
index 59e5f06137..2f91addcb0 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java
@@ -49,6 +49,7 @@ import com.raytheon.viz.ui.EditorUtil;
  * Jul 19, 2007            randerso    Initial Creation.
  * Sep 4, 2012  15335      kshresth    Will now display lightning/wind 
  *                                     fields when magnification set to 0
+ * Nov 05, 2015 5070      randerso     Removed override of 0.0 magnification
  * 
  * </pre>
  * 
@@ -73,8 +74,6 @@ public class MagHandler extends AbstractHandler implements IElementUpdater {
             double magnification = Double.parseDouble((arg0
                     .getParameter("magnification")));
             if (editor != null) {
-                if (magnification == 0.0f)
-                    magnification = 0.1;
                 IDisplayPane[] panes = editor.getDisplayPanes();
                 for (IDisplayPane pane : panes) {
                     IRenderableDisplay disp = pane.getRenderableDisplay();
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java
index 01a6fbf939..2389878b0f 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/OpenAWIPSProcedure.java
@@ -36,7 +36,6 @@ import com.raytheon.uf.viz.d2d.ui.dialogs.procedures.ProcedureDlg;
 import com.raytheon.viz.ui.VizWorkbenchManager;
 import com.raytheon.viz.ui.actions.LoadPerspectiveHandler;
 import com.raytheon.viz.ui.dialogs.ICloseCallback;
-import com.raytheon.viz.ui.dialogs.localization.VizLocalizationFileListDlg;
 import com.raytheon.viz.ui.dialogs.localization.VizOpenLocalizationFileListDlg;
 
 /**
@@ -56,6 +55,7 @@ import com.raytheon.viz.ui.dialogs.localization.VizOpenLocalizationFileListDlg;
  *    Jun 02, 2015 #4401       bkowal      Updated to use {@link VizOpenLocalizationFileListDlg}.
  *    Jun 30, 2015 #4401       bkowal      Specify the localization type when constructing a
  *                                         {@link VizOpenLocalizationFileListDlg}.
+ *    Jan 11, 2016 5242        kbisanz     Replaced calls to deprecated LocalizationFile methods
  * </pre>
  * 
  * @author chammack
@@ -68,13 +68,6 @@ public class OpenAWIPSProcedure extends AbstractHandler {
     private static final IUFStatusHandler log = UFStatus
             .getHandler(OpenAWIPSProcedure.class);
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands
-     * .ExecutionEvent)
-     */
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
         if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
@@ -95,7 +88,7 @@ public class OpenAWIPSProcedure extends AbstractHandler {
                             log.info("Loading display file: "
                                     + f.getAbsolutePath());
                             ProcedureDlg.displayDialog(LocalizationUtil
-                                    .extractName(selectedFile.getName()), p,
+                                    .extractName(selectedFile.getPath()), p,
                                     VizWorkbenchManager.getInstance()
                                             .getCurrentWindow().getShell());
                         }
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/ImageBlinkDialog.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/ImageBlinkDialog.java
index e0444aebf4..0c94a5eb91 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/ImageBlinkDialog.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/ImageBlinkDialog.java
@@ -34,9 +34,9 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
 
 import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
 import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
@@ -59,9 +59,10 @@ import com.raytheon.viz.ui.dialogs.colordialog.IColorBarAction;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Sep 13, 2010            mschenke     Initial creation
+ * Sep 13, 2010            mschenke    Initial creation
  * Oct 16, 2012 1229       rferrel     Updated to use bringToTop to
  *                                      activate existing dialog.
+ * Jan 15, 2015 5054       randerso    Remove unnecessary new Shell
  * 
  * </pre>
  * 
@@ -110,8 +111,10 @@ public class ImageBlinkDialog extends CaveSWTDialog implements
             D2DMapRenderableDisplay[] displays) {
         ImageBlinkDialog dlg = dialogMap.get(resource);
         if (dlg == null || dlg.getShell() == null || dlg.isDisposed()) {
-            dlg = new ImageBlinkDialog(new Shell(Display.getCurrent()), rates,
-                    currRate, resource, rscProps, displays);
+            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+                    .getShell();
+            dlg = new ImageBlinkDialog(shell, rates, currRate, resource,
+                    rscProps, displays);
             dialogMap.put(resource, dlg);
             dlg.open();
         } else {
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java
index 872e98d3d0..0886a23742 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java
@@ -27,8 +27,7 @@ import java.awt.image.ComponentColorModel;
 import java.awt.image.IndexColorModel;
 import java.awt.image.WritableRaster;
 import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -63,12 +62,13 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Spinner;
 import org.eclipse.swt.widgets.Text;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.viz.core.IDisplayPane;
@@ -85,7 +85,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 import com.raytheon.viz.ui.editor.AbstractEditor;
 
 /**
- * TODO Add Description
+ * Class representing a print dialog with various print settings.
  * 
  * <pre>
  * 
@@ -94,12 +94,12 @@ import com.raytheon.viz.ui.editor.AbstractEditor;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Feb 15, 2011            bkowal     Initial creation
- * ======================================
- * AWIPS2 DR Work
  * 08/15/2012         1053 jkorman     Added capability to save/restore user
  * print settings.
  * 10/12/2012         1229 rferrel    Made dialog non-blocking.
  * 12/09/2014   ASM #11982 D. Friedman Fix print-to-file
+ * 01/11/2016         5242 kbisanz     Replaced calls to deprecated LocalizationFile methods
+ * 
  * 
  * </pre>
  * 
@@ -651,8 +651,8 @@ public class PrintDialog extends CaveSWTDialog {
         } else if (this.fileRadioButton.getSelection()) {
             printerSettings.selectedPrinter = this.printToFileData;
             printerSettings.selectedPrinter.printToFile = true;
-            printerSettings.selectedPrinter.fileName =
-                    this.destinationFileText.getText();
+            printerSettings.selectedPrinter.fileName = this.destinationFileText
+                    .getText();
         }
         printerSettings.selectedPrinter.copyCount = this.copiesSpinner
                 .getSelection();
@@ -910,25 +910,15 @@ public class PrintDialog extends CaveSWTDialog {
         LocalizationContext ctx = initUserLocalization();
 
         // Get a list of localization files!
-        LocalizationFile f = PathManagerFactory.getPathManager()
+        ILocalizationFile f = PathManagerFactory.getPathManager()
                 .getLocalizationFile(ctx, SETTINGS_FILENAME);
-        OutputStream strm = null;
-        try {
-            strm = f.openOutputStream();
+
+        try (SaveableOutputStream strm = f.openOutputStream()) {
             JAXB.marshal(settings, strm);
             // Ensure that the file is saved on the server!
-            f.save();
+            strm.save();
         } catch (Exception e) {
             statusHandler.error("Could not save user print settings", e);
-        } finally {
-            if (f != null) {
-                try {
-                    strm.close();
-                } catch (IOException ioe) {
-                    statusHandler.error("Could not close user print settings",
-                            ioe);
-                }
-            }
         }
     }
 
@@ -940,15 +930,15 @@ public class PrintDialog extends CaveSWTDialog {
         LocalizationContext ctx = initUserLocalization();
 
         // Get a list of localization files!
-        LocalizationFile f = PathManagerFactory.getPathManager()
+        ILocalizationFile f = PathManagerFactory.getPathManager()
                 .getLocalizationFile(ctx, SETTINGS_FILENAME);
         // If its not there, no previous settings have been saved. Just exit.
         if (f.exists()) {
             UserPrintSettings settings = null;
-            try {
+            try (InputStream strm = f.openInputStream()) {
 
-                settings = (UserPrintSettings) JAXB.unmarshal(
-                        f.openInputStream(), UserPrintSettings.class);
+                settings = (UserPrintSettings) JAXB.unmarshal(strm,
+                        UserPrintSettings.class);
 
             } catch (Exception e) {
                 statusHandler.error(
@@ -1041,4 +1031,4 @@ public class PrintDialog extends CaveSWTDialog {
         return localization;
     }
 
-}
\ No newline at end of file
+}
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
index 517f4da18c..cdd7c4aba4 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
@@ -20,7 +20,6 @@
 
 package com.raytheon.uf.viz.d2d.ui.dialogs.procedures;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -56,17 +55,17 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPartReference;
 import org.eclipse.ui.PlatformUI;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.viz.core.DescriptorMap;
 import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.core.drawables.AbstractDescriptor;
@@ -118,6 +117,7 @@ import com.raytheon.viz.ui.views.PartAdapter2;
  * Mar 12, 2015 4204       njensen     Ensure renamed bundle goes into tab name on next load
  * Apr 08, 2015 4185       mapeters    Disable Copy In when not applicable for active editor
  * Jun 02, 2015 4401       bkowal      Updated to use {@link VizLocalizationFileListDlg}.
+ * Feb 12, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -358,14 +358,6 @@ public class ProcedureDlg extends CaveSWTDialog {
         ProcedureComm.getInstance().addCopyOutStateListener(changeListener);
         final ProcedureComm.ICopyOutListener copyOutListener = new ProcedureComm.ICopyOutListener() {
 
-            /*
-             * (non-Javadoc)
-             * 
-             * @see
-             * com.raytheon.viz.ui.dialogs.procedure.ProcedureComm.ICopyOutListener
-             * #copyOut(com.raytheon.viz.ui.dialogs.procedure.ProcedureComm.
-             * BundlePair, java.lang.Object)
-             */
             @Override
             public void copyOut(BundlePair b, Object src) {
                 if (src != thisDlg) {
@@ -438,14 +430,6 @@ public class ProcedureDlg extends CaveSWTDialog {
 
     private void saveProcedure(boolean closeAfterSave) {
         try {
-            IPathManager pm = PathManagerFactory.getPathManager();
-
-            LocalizationContext context = pm.getContext(
-                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-
-            LocalizationFile localizationFile = pm.getLocalizationFile(context,
-                    PROCEDURES_DIR + File.separator + fileName);
-
             Procedure procedure = new Procedure();
             BundlePair[] bp = bundles.toArray(new BundlePair[bundles.size()]);
             Bundle[] bundlesToSave = new Bundle[bp.length];
@@ -472,17 +456,26 @@ public class ProcedureDlg extends CaveSWTDialog {
             }
             procedure.setBundles(bundlesToSave);
 
+            IPathManager pm = PathManagerFactory.getPathManager();
+            LocalizationContext context = pm.getContext(
+                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
+            ILocalizationFile localizationFile = pm
+                    .getLocalizationFile(context, PROCEDURES_DIR
+                            + IPathManager.SEPARATOR + fileName);
             String procedureXML = procedure.toXML();
-            FileUtil.bytes2File(procedureXML.getBytes(),
-                    localizationFile.getFile());
-            localizationFile.save();
+            try (SaveableOutputStream outStream = localizationFile
+                    .openOutputStream()) {
+                outStream.write(procedureXML.getBytes());
+                outStream.save();
+            }
 
             shell.setText("Procedure - " + fileName);
             saved = true;
             saveBtn.setEnabled(false);
 
-            if (closeAfterSave)
+            if (closeAfterSave) {
                 close();
+            }
         } catch (Exception e) {
             final String errMsg = "Error occurred during procedure save.";
             statusHandler.handle(Priority.PROBLEM, errMsg, e);
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java
index 6e43a2510a..2afaf3d633 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/SideView.java
@@ -72,30 +72,31 @@ import com.raytheon.viz.ui.panes.PaneManager;
 import com.vividsolutions.jts.geom.Coordinate;
 
 /**
- * The side view for "docking" maps
+ * The side view for "docking" displays.
  * 
  * <pre>
  * 
- *      SOFTWARE HISTORY
+ * SOFTWARE HISTORY
  *     
- *      Date       	    Ticket#		Engineer	Description
- *      ------------	----------	-----------	--------------------------
- *      7/1/06                      chammack    Initial Creation.
- *      Dec 19, 2007                njensen     Support for different tab types.
- *      Jul  8, 2009    #830        bgonzale    use pane manager instead of managing own panes.
- *      Oct  22, 2009   #3348       bsteffen    limit number of frames in sidepane rather than reseting
- *      Jul 1, 2010     #6146       bkowal      Updates the legend mode so that smaller panes will 
- *                                              now include a legend
- *      Nov 20, 2012   DR 15524    M.Porricelli Changed so interactive screens still editable when
- *                                              swapped to side panel
- *      Mar 21, 2013       1638     mschenke    Changed map scales not tied to d2d
- *      Aug  9, 2013   DR 16427     D. Friedman Swap additional input handlers.
- *      Oct 10, 2013    #2104       mschenke    Switched to use MapScalesManager
- *      Jul 15, 2014     2954       njensen     Updated init() for MapScalesManager change
- *      Aug 25, 2014     3467       mapeters    Removed changing of editability from swapPanes().
- *      Mar 02, 2015     4204       njensen     Support for swapping part names
- *      Apr 02, 2015     4204       njensen     Fix 4-panel swap of renamed parts
- *      Sep 18, 2015   DR 17996     D. Friedman Clear editor pane's IRenderableDisplay before swap
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * Jul 01, 2006             chammack    Initial Creation.
+ * Dec 19, 2007             njensen     Support for different tab types.
+ * Jul 08, 2009    830      bgonzale    use pane manager instead of managing own panes.
+ * Oct 22, 2009    334      bsteffen    limit number of frames in sidepane rather than reseting
+ * Jul 01, 2010    6146     bkowal      Updates the legend mode so that smaller panes will 
+ *                                       now include a legend
+ * Nov 20, 2012 DR 15524    M.Porricelli Changed so interactive screens still editable when
+ *                                        swapped to side panel
+ * Mar 21, 2013    1638     mschenke    Changed map scales not tied to d2d
+ * Aug 09, 2013 DR 16427    D. Friedman Swap additional input handlers.
+ * Oct 10, 2013    2104     mschenke    Switched to use MapScalesManager
+ * Jul 15, 2014    2954     njensen     Updated init() for MapScalesManager change
+ * Aug 25, 2014    3467     mapeters    Removed changing of editability from swapPanes().
+ * Mar 02, 2015    4204     njensen     Support for swapping part names
+ * Apr 02, 2015    4204     njensen     Fix 4-panel swap of renamed parts
+ * Sep 18, 2015 DR 17996    D. Friedman Clear editor pane's IRenderableDisplay before swap
+ * Oct 21, 2015    5023     njensen     Removed unnecessary setPartName()
  * 
  * </pre>
  * 
@@ -151,13 +152,6 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets
-     * .Composite)
-     */
     @Override
     public void createPartControl(Composite parent) {
         try {
@@ -202,24 +196,12 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
 
         int buttonDown = 0;
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseDown(int,
-         * int, int)
-         */
         @Override
         public boolean handleMouseDown(int x, int y, int mouseButton) {
             buttonDown = mouseButton;
             return false;
         }
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseUp(int, int,
-         * int)
-         */
         @Override
         public boolean handleMouseUp(int x, int y, int mouseButton) {
             if (buttonDown == 3 && buttonDown == mouseButton) { // right click
@@ -231,11 +213,6 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
         }
     };
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.ui.IDisplayPaneContainer#getDisplayPanes()
-     */
     @Override
     public IDisplayPane[] getDisplayPanes() {
         if (this.paneManager == null) {
@@ -245,43 +222,21 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.ui.IDisplayPaneContainer#getLoopProperties()
-     */
     @Override
     public LoopProperties getLoopProperties() {
         return this.loopProperties;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ui.IDisplayPaneContainer#setLoopProperties(com.raytheon
-     * .viz.core.datastructure.LoopProperties)
-     */
     @Override
     public void setLoopProperties(LoopProperties loopProperties) {
         this.loopProperties = loopProperties;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.core.IDisplayPaneContainer#getActiveDisplayPane()
-     */
     @Override
     public IDisplayPane getActiveDisplayPane() {
         return paneManager.getActiveDisplayPane();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.core.IDisplayPaneContainer#refresh()
-     */
     @Override
     public void refresh() {
         paneManager.refresh();
@@ -425,7 +380,10 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
                         IRenderableDisplay display = editorPanes[i]
                                 .getRenderableDisplay();
                         boolean hide = editorHiddenDisplays.contains(display);
-                        // TODO: See note above for the isCompatibleEditor condition.
+                        /*
+                         * TODO: See note above for the isCompatibleEditor
+                         * condition.
+                         */
                         if (isCompatibleEditor) {
                             editorPanes[i].setRenderableDisplay(null);
                         }
@@ -492,11 +450,6 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
                                 }
                             }
                         }
-                        /*
-                         * have to set part name again here cause addPane() or
-                         * removePane() may mess it up
-                         */
-                        theEditor.setPartName(viewName);
                     } else {
                         int min = Math.min(viewPaneCount, editorPaneCount);
                         for (int i = 0; i < min; ++i) {
@@ -626,24 +579,11 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.core.IDisplayPaneContainer#translateClick(double,
-     * double)
-     */
     @Override
     public Coordinate translateClick(double x, double y) {
         return paneManager.translateClick(x, y);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.IDisplayPaneContainer#translateInverseClick(
-     * com.vividsolutions.jts.geom.Coordinate)
-     */
     @Override
     public double[] translateInverseClick(Coordinate c) {
         return paneManager.translateInverseClick(c);
@@ -703,68 +643,34 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
         paneManager.showPane(pane);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @seecom.raytheon.uf.viz.core.IDisplayPaneContainer#
-     * addRenderableDisplayChangedListener
-     * (com.raytheon.uf.viz.core.IRenderableDisplayChangedListener)
-     */
     @Override
     public void addRenderableDisplayChangedListener(
             IRenderableDisplayChangedListener displayChangedListener) {
-
+        // no op
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @seecom.raytheon.uf.viz.core.IDisplayPaneContainer#
-     * notifyRenderableDisplayChangedListeners
-     * (com.raytheon.uf.viz.core.IDisplayPane,
-     * com.raytheon.uf.viz.core.drawables.IRenderableDisplay)
-     */
     @Override
     public void notifyRenderableDisplayChangedListeners(IDisplayPane pane,
             IRenderableDisplay display, DisplayChangeType type) {
-
+        // no op
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @seecom.raytheon.uf.viz.core.IDisplayPaneContainer#
-     * removeRenderableDisplayChangedListener
-     * (com.raytheon.uf.viz.core.IRenderableDisplayChangedListener)
-     */
     @Override
     public void removeRenderableDisplayChangedListener(
             IRenderableDisplayChangedListener displayChangedListener) {
-
+        // no op
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ui.editor.IMultiPaneEditor#addSelectedPaneChangedListener
-     * (com.raytheon.viz.ui.editor.ISelectedPaneChangedListener)
-     */
     @Override
     public void addSelectedPaneChangedListener(
             ISelectedPanesChangedListener listener) {
+        // no op
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ui.editor.IMultiPaneEditor#removeSelectedPaneChangedListener
-     * (com.raytheon.viz.ui.editor.ISelectedPaneChangedListener)
-     */
     @Override
     public void removeSelectedPaneChangedListener(
             ISelectedPanesChangedListener listener) {
+        // no op
     }
 
     @Override
@@ -783,26 +689,11 @@ public class SideView extends ViewPart implements IMultiPaneEditor,
         paneManager.unregisterMouseHandler(handler);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ui.editor.IMultiPaneEditor#getSelectedPanes(java.lang
-     * .String)
-     */
     @Override
     public IDisplayPane[] getSelectedPanes(String action) {
         return paneManager.getSelectedPanes(action);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ui.color.IBackgroundColorChangedListener#setColor(com
-     * .raytheon.viz.ui.color.IBackgroundColorChangedListener.BGColorMode,
-     * org.eclipse.swt.graphics.RGB)
-     */
     @Override
     public void setColor(BGColorMode mode, RGB newColor) {
         for (IDisplayPane pane : getDisplayPanes()) {
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/FourPanelLayoutMenuAction.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/FourPanelLayoutMenuAction.java
index d2a198b918..06dbb8dd5d 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/FourPanelLayoutMenuAction.java
+++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/FourPanelLayoutMenuAction.java
@@ -21,14 +21,11 @@ package com.raytheon.uf.viz.d2d.ui.map.actions;
 
 import java.util.List;
 
-import org.eclipse.ui.part.EditorPart;
-
 import com.raytheon.uf.viz.core.IDisplayPane;
 import com.raytheon.uf.viz.core.drawables.IRenderableDisplay;
 import com.raytheon.uf.viz.d2d.core.ID2DRenderableDisplay;
 import com.raytheon.uf.viz.d2d.core.legend.D2DLegendResource;
 import com.raytheon.uf.viz.d2d.core.legend.D2DLegendResource.LegendMode;
-import com.raytheon.viz.ui.IRenameablePart;
 import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
 import com.raytheon.viz.ui.editor.IMultiPaneEditor;
 
@@ -43,12 +40,13 @@ import com.raytheon.viz.ui.editor.IMultiPaneEditor;
  * 
  * <pre>
  * 
- *    SOFTWARE HISTORY
+ * SOFTWARE HISTORY
  *   
- *    Date         Ticket#     Engineer    Description
- *    ------------ ----------  ----------- --------------------------
- *    Aug 19, 2009             bgonzale    Initial Creation.
- *    Apr 07, 2015  4204       njensen     Keep part name if renamed
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * Aug 19, 2009             bgonzale    Initial Creation.
+ * Apr 07, 2015  4204       njensen     Keep part name if renamed
+ * Oct 21, 2015  5023       njensen     Removed unnecessary part name code (undid previous change)
  * 
  * </pre>
  * 
@@ -64,11 +62,6 @@ public class FourPanelLayoutMenuAction extends AbstractRightClickAction {
         super("Four Panel Layout");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.action.Action#run()
-     */
     @Override
     public void run() {
         if (getContainer() instanceof IMultiPaneEditor == false
@@ -79,14 +72,6 @@ public class FourPanelLayoutMenuAction extends AbstractRightClickAction {
         IRenderableDisplay definiteDisplay = getContainer().getDisplayPanes()[0]
                 .getRenderableDisplay();
 
-        String partName = null;
-        if (editor instanceof EditorPart) {
-            EditorPart part = (EditorPart) editor;
-            if (!part.getPartName().equals(part.getEditorInput().getName())) {
-                partName = part.getPartName();
-            }
-        }
-
         if (editor.getNumberofPanes() > 1) {
             for (IDisplayPane pane : getContainer().getDisplayPanes()) {
                 editor.showPane(pane);
@@ -97,11 +82,6 @@ public class FourPanelLayoutMenuAction extends AbstractRightClickAction {
             }
         }
 
-        // keep the part name if it was customized
-        if (partName != null && editor instanceof IRenameablePart) {
-            ((IRenameablePart) editor).setPartName(partName);
-        }
-
         for (IDisplayPane pane : editor.getDisplayPanes()) {
             List<D2DLegendResource> rscs = pane.getDescriptor()
                     .getResourceList()
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/utility/edex_static/base/plugin-filters/quikscat_filters.xml b/cave/com.raytheon.uf.viz.damagepath/localization/menus/tools/damagepath-index.xml
similarity index 61%
rename from edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/utility/edex_static/base/plugin-filters/quikscat_filters.xml
rename to cave/com.raytheon.uf.viz.damagepath/localization/menus/tools/damagepath-index.xml
index a770b7ddbf..2cd7df9958 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/utility/edex_static/base/plugin-filters/quikscat_filters.xml
+++ b/cave/com.raytheon.uf.viz.damagepath/localization/menus/tools/damagepath-index.xml
@@ -18,15 +18,8 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<pluginDataObjectFilter>
-    <filterElements xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="rectFilterElement">
-        <!-- Exclude all southern hemisphere data. -->
-        <filterElementName>Exclude SouthernHemisphere</filterElementName>
-        <filterType>EXCLUDE</filterType>
-        <upperLeftLat>-0.1</upperLeftLat>
-        <upperLeftLon>-180.0</upperLeftLon>
-        <lowerRightLat>-90.0</lowerRightLat>
-        <lowerRightLon>180.0</lowerRightLon>
-    </filterElements>
-    <filterName>Point.QuikScat</filterName>
-</pluginDataObjectFilter>
+<menuContributionFile>
+    <include installTo="menu:tools?after=tools.Da"
+        fileName="menus/tools/damagepath-menu.xml">
+    </include>
+</menuContributionFile>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/pointdata/bufrquikscat.xml b/cave/com.raytheon.uf.viz.damagepath/localization/menus/tools/damagepath-menu.xml
similarity index 54%
rename from edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/pointdata/bufrquikscat.xml
rename to cave/com.raytheon.uf.viz.damagepath/localization/menus/tools/damagepath-menu.xml
index c5a142160d..630e3a250d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/pointdata/bufrquikscat.xml
+++ b/cave/com.raytheon.uf.viz.damagepath/localization/menus/tools/damagepath-menu.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
     <!--
         This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
         pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
@@ -18,15 +18,10 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<pointDataDescription>
-  <!-- Time in seconds. To use in Java - multiply by 1000 -->
-  <parameter name="validTime" numDims="1" type="LONG" />
-  <parameter name="latitude" numDims="1" type="FLOAT" unit="degree_N" />
-  <parameter name="longitude" numDims="1" type="FLOAT" unit="degree_E" />
-  <parameter name="satelliteID" numDims="1" type="INT" />
-  <parameter name="orbitNumber" numDims="1" type="INT" />
-  <parameter name="windDir" numDims="1" type="FLOAT" unit="degree" />
-  <parameter name="windSpd" numDims="1" type="FLOAT" unit="m/s" />
-  <parameter name="probRain" numDims="1" type="FLOAT" unit="%" />
-  <parameter name="rainIndex" numDims="1" type="INT" />
-</pointDataDescription>
+
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  
+
+    <contribute xsi:type="bundleItem" file="bundles/tools/DamagePath.xml"
+        menuText="Damage Path" id="damagePathTool" timeQuery="false" />
+
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/DamagePathLayer.java b/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/DamagePathLayer.java
index be0a393730..0c3a28ae45 100644
--- a/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/DamagePathLayer.java
+++ b/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/DamagePathLayer.java
@@ -43,6 +43,7 @@ import com.raytheon.uf.common.json.geo.GeoJsonMapUtil;
 import com.raytheon.uf.common.json.geo.IGeoJsonService;
 import com.raytheon.uf.common.json.geo.SimpleGeoJsonService;
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
@@ -88,7 +89,8 @@ import com.vividsolutions.jts.geom.Polygon;
  *                                     INFO level, fix geotools CRS warning.
  * Aug 05, 2015  4635      dgilling    Default save location for damage path
  *                                     is now at SITE level.
- * Aug 18, 2015  3806      njensen     Use SaveableOutputStream to save                                     
+ * Aug 18, 2015  3806      njensen     Use SaveableOutputStream to save
+ * Jan 11, 2016  5242      kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -133,7 +135,7 @@ public class DamagePathLayer<T extends DamagePathResourceData> extends
     private final Job loadJob = new Job("Loading Damage Path") {
         @Override
         protected IStatus run(IProgressMonitor monitor) {
-            LocalizationFile prevFile = getValidDamagePathFile();
+            ILocalizationFile prevFile = getValidDamagePathFile();
             if (prevFile != null) {
                 loadDamagePath(prevFile);
 
@@ -154,7 +156,7 @@ public class DamagePathLayer<T extends DamagePathResourceData> extends
     private final Job saveJob = new Job("Saving Damage Path") {
         @Override
         protected IStatus run(IProgressMonitor monitor) {
-            LocalizationFile file = getDamagePathFile();
+            ILocalizationFile file = getDamagePathFile();
             saveDamagePath(file);
             return Status.OK_STATUS;
         }
@@ -231,11 +233,11 @@ public class DamagePathLayer<T extends DamagePathResourceData> extends
      * future release, remove this function and replace uses with
      * getDamagePathFile.
      */
-    private LocalizationFile getValidDamagePathFile() {
+    private ILocalizationFile getValidDamagePathFile() {
         LocalizationContext ctx = getContext();
-        LocalizationFile file = PathManagerFactory.getPathManager()
+        ILocalizationFile file = PathManagerFactory.getPathManager()
                 .getLocalizationFile(ctx, PATH);
-        LocalizationFile oldFile = PathManagerFactory.getPathManager()
+        ILocalizationFile oldFile = PathManagerFactory.getPathManager()
                 .getLocalizationFile(ctx, OLD_PATH);
         if (file.exists()) {
             return file;
@@ -249,14 +251,14 @@ public class DamagePathLayer<T extends DamagePathResourceData> extends
     @Override
     public void fileUpdated(FileUpdatedMessage message) {
         if (message.getFileName().equals(PATH)) {
-            LocalizationFile file = getDamagePathFile();
+            ILocalizationFile file = getDamagePathFile();
             if (file.exists()) {
                 loadDamagePath(file);
             }
         }
     }
 
-    protected void loadDamagePath(LocalizationFile file) {
+    protected void loadDamagePath(ILocalizationFile file) {
         try {
             DamagePathLoader loader = new DamagePathLoader(file);
             Collection<Pair<Polygon, Map<String, String>>> newData = loader
@@ -279,11 +281,11 @@ public class DamagePathLayer<T extends DamagePathResourceData> extends
             }
         } catch (Exception e) {
             statusHandler.error(
-                    "Error loading damage path file " + file.getName(), e);
+                    "Error loading damage path file " + file.getPath(), e);
         }
     }
 
-    protected void saveDamagePath(LocalizationFile file) {
+    protected void saveDamagePath(ILocalizationFile file) {
         try (SaveableOutputStream sos = file.openOutputStream()) {
             IGeoJsonService json = new SimpleGeoJsonService();
             SimpleFeatureCollection featureCollection = buildFeatureCollection();
@@ -291,7 +293,7 @@ public class DamagePathLayer<T extends DamagePathResourceData> extends
             sos.save();
         } catch (Throwable t) {
             statusHandler.error(
-                    "Error saving damage path file " + file.getName(), t);
+                    "Error saving damage path file " + file.getPath(), t);
         }
     }
 
diff --git a/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/DamagePathLoader.java b/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/DamagePathLoader.java
index 54409d5f96..2b6de83ed1 100644
--- a/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/DamagePathLoader.java
+++ b/cave/com.raytheon.uf.viz.damagepath/src/com/raytheon/uf/viz/damagepath/DamagePathLoader.java
@@ -40,7 +40,7 @@ import com.raytheon.uf.common.json.JsonException;
 import com.raytheon.uf.common.json.geo.GeoJsonMapUtil;
 import com.raytheon.uf.common.json.geo.IGeoJsonService;
 import com.raytheon.uf.common.json.geo.SimpleGeoJsonService;
-import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.util.Pair;
 import com.vividsolutions.jts.geom.Geometry;
@@ -63,6 +63,7 @@ import com.vividsolutions.jts.geom.Polygon;
  *                                     15.1 version of damage path tool.
  * Jul 01, 2015  #4375     dgilling    Remove isValid check to imported 
  *                                     polygons.
+ * Jan 11, 2016  #5242     kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -76,7 +77,7 @@ public final class DamagePathLoader {
 
     private final Collection<Pair<Polygon, Map<String, String>>> damagePathData;
 
-    public DamagePathLoader(LocalizationFile locFile)
+    public DamagePathLoader(ILocalizationFile locFile)
             throws LocalizationException, IOException, JsonException {
         this(locFile, null);
     }
@@ -86,8 +87,9 @@ public final class DamagePathLoader {
         this(null, Paths.get(filePath));
     }
 
-    private DamagePathLoader(LocalizationFile locFileSource, Path realFileSource)
-            throws LocalizationException, IOException, JsonException {
+    private DamagePathLoader(ILocalizationFile locFileSource,
+            Path realFileSource) throws LocalizationException, IOException,
+            JsonException {
         this.damagePathData = new ArrayList<>();
 
         if (locFileSource != null) {
@@ -101,7 +103,7 @@ public final class DamagePathLoader {
         return damagePathData;
     }
 
-    private void loadFromLocalizationFile(final LocalizationFile locFile)
+    private void loadFromLocalizationFile(final ILocalizationFile locFile)
             throws LocalizationException, IOException, JsonException {
         try (InputStream is = locFile.openInputStream()) {
             loadFromInputStream(is);
diff --git a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
index 6c0a799102..1c4a327831 100644
--- a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
@@ -63,13 +63,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.common.dataplugin.bufrquikscat"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.dataplugin.bufrsigwx"
          download-size="0"
diff --git a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamWizard.java b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamWizard.java
index 0c70175d33..aa38786346 100644
--- a/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamWizard.java
+++ b/cave/com.raytheon.uf.viz.derivparam.ui/src/com/raytheon/uf/viz/derivparam/ui/dialogs/DerivedParamWizard.java
@@ -19,8 +19,6 @@
  **/
 package com.raytheon.uf.viz.derivparam.ui.dialogs;
 
-import java.io.File;
-
 import com.raytheon.uf.common.derivparam.library.DerivedParameterGenerator;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
@@ -28,10 +26,10 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.viz.localization.LocalizationPerspectiveUtils;
 import com.raytheon.uf.viz.localization.service.ILocalizationService;
 import com.raytheon.viz.ui.dialogs.CaveSWTWizard;
@@ -47,6 +45,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTWizard;
  * ------------ ---------- ----------- --------------------------
  * Dec 16, 2010            mschenke    Initial creation
  * Sep 17, 2013 2285       mschenke    Fixed serialization of DerivParamDesc
+ * Feb 12, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -74,23 +73,6 @@ public class DerivedParamWizard extends CaveSWTWizard {
         addPage(newFunctionPage);
     }
 
-    /*
-     * Max, I took this out but itwill go away with the SWT Wizard stuff.
-     */
-
-    // @Override
-    // public void createPageControls(Composite pageContainer) {
-    // pageContainer.setLayout(new GridLayout(1, false));
-    // pageContainer.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true,
-    // false));
-    // super.createPageControls(pageContainer);
-    // }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.wizard.Wizard#performFinish()
-     */
     @Override
     public boolean performFinish() {
         IPathManager pm = PathManagerFactory.getPathManager();
@@ -102,15 +84,11 @@ public class DerivedParamWizard extends CaveSWTWizard {
             String fileName = newFunctionPage.getFunctionName() + "."
                     + newFunctionPage.getSelectedFunctionType().getExtension();
             String path = DerivedParameterGenerator.FUNCTIONS_DIR
-                    + File.separator + fileName;
+                    + IPathManager.SEPARATOR + fileName;
             LocalizationFile file = pm.getLocalizationFile(userCtx, path);
-            File f = file.getFile();
-            if (f.exists()) {
-                f.delete();
-            }
-            try {
-                FileUtil.bytes2File(functionContents.getBytes(), f);
-                file.save();
+            try (SaveableOutputStream outStream = file.openOutputStream()) {
+                outStream.write(functionContents.getBytes());
+                outStream.save();
                 functionFile = file;
             } catch (Exception e) {
                 statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
@@ -123,13 +101,9 @@ public class DerivedParamWizard extends CaveSWTWizard {
             String path = DerivedParameterGenerator.XML_DIR
                     + IPathManager.SEPARATOR + fileName;
             LocalizationFile file = pm.getLocalizationFile(userCtx, path);
-            File f = file.getFile();
-            if (f.exists()) {
-                f.delete();
-            }
-            try {
-                FileUtil.bytes2File(definitionContents.getBytes(), f);
-                file.save();
+            try (SaveableOutputStream outStream = file.openOutputStream()) {
+                outStream.write(functionContents.getBytes());
+                outStream.save();
                 definitionFile = file;
             } catch (Exception e) {
                 statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
diff --git a/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml b/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
index a6ea404280..49432d2d26 100644
--- a/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
+++ b/cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
@@ -413,6 +413,13 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="org.apache.commons.lang3"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="com.raytheon.uf.common.units"
diff --git a/cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java b/cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
index db1340ff43..3e6484cec9 100644
--- a/cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
+++ b/cave/com.raytheon.uf.viz.gisdatastore/src/com/raytheon/uf/viz/gisdatastore/rsc/DataStoreResource.java
@@ -127,6 +127,7 @@ import com.vividsolutions.jts.geom.Point;
  * Aug 14, 2014      #3523 mapeters    Updated deprecated DrawableString.textStyle assignments.
  * Aug 21, 2014      #3459 randerso    Restructured Map resource class hierarchy
  * Nov 18, 2014      #3549 njensen     Improved performance of processRequest()
+ * Nov 05, 2015      #5070 randerso    Moved label font management up to AbstractMapResource
  * 
  * </pre>
  * 
@@ -427,7 +428,8 @@ public class DataStoreResource extends
 
                                 DrawableString ds = new DrawableString(label,
                                         null);
-                                ds.font = req.getResource().font;
+                                ds.font = req.getResource().getFont(
+                                        req.getTarget());
                                 Rectangle2D rect = req.getTarget()
                                         .getStringsBounds(ds);
 
@@ -1113,8 +1115,9 @@ public class DataStoreResource extends
     }
 
     @Override
-    protected void paintInternal(IGraphicsTarget aTarget,
+    protected void paintInternal(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
+
         PixelExtent screenExtent = (PixelExtent) paintProps.getView()
                 .getExtent();
 
@@ -1148,12 +1151,6 @@ public class DataStoreResource extends
         double labelMagnification = getCapability(MagnificationCapability.class)
                 .getMagnification();
 
-        if (font == null) {
-            font = aTarget.initializeFont(aTarget.getDefaultFont()
-                    .getFontName(), (float) (10 * labelMagnification), null);
-            font.setSmoothing(false);
-        }
-
         String shadingField = getCapability(ShadeableCapability.class)
                 .getShadingField();
         boolean isShaded = isPolygonal() && (shadingField != null);
@@ -1189,7 +1186,7 @@ public class DataStoreResource extends
 
                 boolean highlightsOnly = updateHighlights && !updateLabels
                         && !updateShading && !updateExtent;
-                queryJob.queueRequest(new Request(aTarget, this, boundingGeom,
+                queryJob.queueRequest(new Request(target, this, boundingGeom,
                         geomField, labelField, shadingField, colorMap,
                         isProduct, highlightsOnly));
                 lastExtent = expandedExtent;
@@ -1210,12 +1207,12 @@ public class DataStoreResource extends
                 && shadedShape.isDrawable()) {
             float opacity = getCapability(ShadeableCapability.class)
                     .getOpacity();
-            aTarget.drawShadedShape(shadedShape, alpha * opacity);
+            target.drawShadedShape(shadedShape, alpha * opacity);
         }
 
         if ((outlineShape != null) && outlineShape.isDrawable()
                 && getCapability(OutlineCapability.class).isOutlineOn()) {
-            aTarget.drawWireframeShape(outlineShape,
+            target.drawWireframeShape(outlineShape,
                     getCapability(ColorableCapability.class).getColor(),
                     getCapability(OutlineCapability.class).getOutlineWidth(),
                     getCapability(OutlineCapability.class).getLineStyle(),
@@ -1227,18 +1224,18 @@ public class DataStoreResource extends
 
         if ((highlightShape != null) && highlightShape.isDrawable()
                 && getCapability(OutlineCapability.class).isOutlineOn()) {
-            aTarget.drawWireframeShape(highlightShape, highlightColor,
+            target.drawWireframeShape(highlightShape, highlightColor,
                     highlightWidth, highlightStyle);
         }
 
         if ((labels != null) && isLabeled && (labelMagnification != 0)) {
-            drawLabels(aTarget, paintProps, worldToScreenRatio);
+            drawLabels(target, paintProps, worldToScreenRatio);
         }
 
         if (rubberBandExtent != null) {
-            aTarget.drawShadedRect(rubberBandExtent, RUBBER_BAND_COLOR, 0.5,
+            target.drawShadedRect(rubberBandExtent, RUBBER_BAND_COLOR, 0.5,
                     null);
-            aTarget.drawRect(rubberBandExtent, RUBBER_BAND_COLOR, 2, 1.0);
+            target.drawRect(rubberBandExtent, RUBBER_BAND_COLOR, 2, 1.0);
         }
 
         if (dragPromptCoord != null) {
@@ -1249,7 +1246,7 @@ public class DataStoreResource extends
             ds.addTextStyle(TextStyle.BOXED, new RGB(255, 255, 255));
             ds.horizontalAlignment = HorizontalAlignment.LEFT;
             ds.verticallAlignment = VerticalAlignment.BOTTOM;
-            aTarget.drawStrings(ds);
+            target.drawStrings(ds);
         }
     }
 
@@ -1279,9 +1276,8 @@ public class DataStoreResource extends
         highlightShape = result.highlightShape;
     }
 
-    private void drawLabels(IGraphicsTarget aTarget,
-            PaintProperties paintProps, double worldToScreenRatio)
-            throws VizException {
+    private void drawLabels(IGraphicsTarget target, PaintProperties paintProps,
+            double worldToScreenRatio) throws VizException {
         double offsetX = getCapability(LabelableCapability.class).getxOffset()
                 * worldToScreenRatio;
         double offsetY = getCapability(LabelableCapability.class).getyOffset()
@@ -1315,7 +1311,7 @@ public class DataStoreResource extends
             DrawableString string = new DrawableString(node.label, color);
             string.setCoordinates(node.location[0] + offsetX, node.location[1]
                     - offsetY);
-            string.font = font;
+            string.font = getFont(target);
             string.horizontalAlignment = HorizontalAlignment.CENTER;
             string.verticallAlignment = VerticalAlignment.MIDDLE;
             boolean add = true;
@@ -1347,7 +1343,7 @@ public class DataStoreResource extends
             }
         }
 
-        aTarget.drawStrings(strings);
+        target.drawStrings(strings);
     }
 
     /**
@@ -1969,17 +1965,13 @@ public class DataStoreResource extends
 
     @Override
     public void resourceChanged(ChangeType type, Object object) {
+        super.resourceChanged(type, object);
         if (type.equals(ChangeType.CAPABILITY)) {
             if (object instanceof ColorableCapability) {
                 if (this.timeRange != null) {
                     // force rebuild of shaded shape to pick up color change
                     lastExtent = null;
                 }
-            } else if (object instanceof MagnificationCapability) {
-                if (font != null) {
-                    font.dispose();
-                    font = null;
-                }
             }
         }
         issueRefresh();
diff --git a/cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/rsc/HpeLabelResource.java b/cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/rsc/HpeLabelResource.java
index 501e7eed14..ce6812c6f6 100644
--- a/cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/rsc/HpeLabelResource.java
+++ b/cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/rsc/HpeLabelResource.java
@@ -71,6 +71,7 @@ import com.raytheon.viz.grid.rsc.general.D2DGridResource;
  * May 5, 2014    3026     mpduff      Initial creation
  * Dec 16, 2014   3026     mpduff      Change location of text
  * Feb 13, 2015   4121     mpduff      Change label caching.
+ * Nov 05, 2015   5070     randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -164,7 +165,7 @@ public class HpeLabelResource extends
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
         if (font == null) {
-            font = target.initializeFont("Dialog", 11, null);
+            font = target.initializeFont("Dialog", 9, null);
         }
         font.setMagnification(getCapability(MagnificationCapability.class)
                 .getMagnification().floatValue());
diff --git a/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportDialog.java b/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportDialog.java
index 96d1ecc296..59b5973803 100644
--- a/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportDialog.java
+++ b/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/KmlExportDialog.java
@@ -180,7 +180,7 @@ public class KmlExportDialog extends CaveSWTDialog {
 
     protected void initializeFramesGroup(Group group) {
         group.setLayout(new GridLayout(5, false));
-        group.setText("Export Location");
+        group.setText("Export Frames");
 
         allFramesButton = new Button(group, SWT.RADIO);
         allFramesButton.setText("All Frames");
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/editor/LocalizationEditorInput.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/editor/LocalizationEditorInput.java
index 41f2e2bd1a..699ca7848d 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/editor/LocalizationEditorInput.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/editor/LocalizationEditorInput.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -31,9 +31,11 @@ import org.eclipse.ui.IMemento;
 import org.eclipse.ui.IPathEditorInput;
 import org.eclipse.ui.IPersistableElement;
 
+import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.LocalizationUtil;
+import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 
@@ -49,7 +51,9 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * ------------ ---------- ----------- --------------------------
  * Nov 3,  2010            mschenke    Initial creation
  * Nov 27, 2013            mschenke    Moved into localization.perspective project
- * Feb 11, 2015  4108      randerso    Implmented hashCode() and equals()
+ * Feb 11, 2015 4108       randerso    Implmented hashCode() and equals()
+ * Jan 06, 2016 4834       nabowle     add refreshLocalizationFile().
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -85,10 +89,21 @@ public class LocalizationEditorInput implements IFileEditorInput,
 
     public void setLocalizationFile(LocalizationFile localizationFile) {
         this.localizationFile = localizationFile;
-        name = LocalizationUtil.extractName(localizationFile.getName());
+        name = LocalizationUtil.extractName(localizationFile.getPath());
         file = null;
     }
 
+    /**
+     * Refreshes the localizationFile reference.
+     */
+    public void refreshLocalizationFile() {
+        IPathManager pathManager = PathManagerFactory.getPathManager();
+        LocalizationFile latestFile = pathManager.getLocalizationFile(
+                this.localizationFile.getContext(),
+                this.localizationFile.getPath());
+        this.localizationFile = latestFile;
+    }
+
     /**
      * @return the localizationFile
      */
@@ -96,55 +111,30 @@ public class LocalizationEditorInput implements IFileEditorInput,
         return localizationFile;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IEditorInput#exists()
-     */
     @Override
     public boolean exists() {
         return localizationFile.exists();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-     */
     @Override
     public ImageDescriptor getImageDescriptor() {
         return null;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IEditorInput#getName()
-     */
     @Override
     public String getName() {
         return name + " - "
                 + localizationFile.getContext().getLocalizationLevel();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IEditorInput#getPersistable()
-     */
     @Override
     public IPersistableElement getPersistable() {
         return this;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IEditorInput#getToolTipText()
-     */
     @Override
     public String getToolTipText() {
-        String tip = localizationFile.getName();
+        String tip = localizationFile.getPath();
         if (localizationFile.isProtected()) {
             tip += " (Protected @ " + localizationFile.getProtectedLevel()
                     + ")";
@@ -152,32 +142,17 @@ public class LocalizationEditorInput implements IFileEditorInput,
         return tip;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-     */
     @SuppressWarnings("rawtypes")
     @Override
     public Object getAdapter(Class adapter) {
         return Platform.getAdapterManager().getAdapter(this, adapter);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IStorageEditorInput#getStorage()
-     */
     @Override
     public IStorage getStorage() throws CoreException {
         return getFile();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IFileEditorInput#getFile()
-     */
     @Override
     public IFile getFile() {
         if (file.exists() == false) {
@@ -192,25 +167,15 @@ public class LocalizationEditorInput implements IFileEditorInput,
         return file;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IPathEditorInput#getPath()
-     */
     @Override
     public IPath getPath() {
         return getFile().getRawLocation();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento)
-     */
     @Override
     public void saveState(IMemento memento) {
         LocalizationContext ctx = localizationFile.getContext();
-        memento.putString(FILE_NAME_ID, localizationFile.getName());
+        memento.putString(FILE_NAME_ID, localizationFile.getPath());
         memento.putString(CONTEXT_NAME_ID, ctx.getContextName());
         memento.putString(CONTEXT_TYPE_ID, ctx.getLocalizationType().name());
         memento.putString(CONTEXT_LEVEL_ID, ctx.getLocalizationLevel().name());
@@ -218,21 +183,11 @@ public class LocalizationEditorInput implements IFileEditorInput,
                 .toPortableString());
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.ui.IPersistableElement#getFactoryId()
-     */
     @Override
     public String getFactoryId() {
         return FACTORY_ID;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#hashCode()
-     */
     @Override
     public int hashCode() {
         final int prime = 31;
@@ -242,11 +197,6 @@ public class LocalizationEditorInput implements IFileEditorInput,
         return result;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/editor/LocalizationEditorUtils.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/editor/LocalizationEditorUtils.java
index 8c4cb0911d..7feeb3f7f4 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/editor/LocalizationEditorUtils.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/editor/LocalizationEditorUtils.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.PlatformUI;
 
-import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -46,6 +46,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 27, 2013            mschenke    Methods extracted from LocalizationPerspectiveUtils
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -72,7 +73,7 @@ public class LocalizationEditorUtils {
         if (reg == null) {
             return new IEditorDescriptor[0];
         }
-        return reg.getEditors(input.getLocalizationFile().getName());
+        return reg.getEditors(input.getLocalizationFile().getPath());
     }
 
     /**
@@ -87,7 +88,7 @@ public class LocalizationEditorUtils {
         if (reg == null) {
             return null;
         }
-        return reg.getDefaultEditor(input.getLocalizationFile().getName());
+        return reg.getDefaultEditor(input.getLocalizationFile().getPath());
     }
 
     /**
@@ -118,7 +119,7 @@ public class LocalizationEditorUtils {
         IEditorRegistry reg = getEditorRegistry();
         if (reg != null) {
             IEditorDescriptor desc = reg.getDefaultEditor(input
-                    .getLocalizationFile().getName());
+                    .getLocalizationFile().getPath());
             String id = DEFAULT_TEXT_EDITOR;
             if (desc != null) {
                 id = desc.getId();
@@ -177,16 +178,16 @@ public class LocalizationEditorUtils {
      * @return the open editor part or null if not being edited
      */
     public static IEditorPart getEditorForFile(IWorkbenchPage page,
-            LocalizationFile file) {
+            ILocalizationFile file) {
         for (IEditorReference ref : page.getEditorReferences()) {
             IEditorPart part = ref.getEditor(false);
             if (part != null) {
                 IEditorInput input = part.getEditorInput();
                 if (input instanceof LocalizationEditorInput) {
-                    LocalizationFile editedFile = ((LocalizationEditorInput) input)
+                    ILocalizationFile editedFile = ((LocalizationEditorInput) input)
                             .getLocalizationFile();
                     if (editedFile.getContext().equals(file.getContext())
-                            && editedFile.getName().equals(file.getName())) {
+                            && editedFile.getPath().equals(file.getPath())) {
                         return part;
                     }
                 }
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/ui/LocalizationSaveAsPopulator.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/ui/LocalizationSaveAsPopulator.java
index 99e20b1819..f2edf90286 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/ui/LocalizationSaveAsPopulator.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/ui/LocalizationSaveAsPopulator.java
@@ -43,6 +43,7 @@ import org.eclipse.ui.texteditor.IDocumentProvider;
 
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
 import com.raytheon.uf.common.localization.FileUpdatedMessage.FileChangeType;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
@@ -69,9 +70,10 @@ import com.raytheon.viz.ui.EditorUtil;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Mar 24, 2011            mschenke     Initial creation
- * Aug 29, 2014 #3527      mapeters     Check for active editor to not 
- *                                      be null before calling isDirty().
+ * Mar 24, 2011            mschenke    Initial creation
+ * Aug 29, 2014 #3527      mapeters    Check for active editor to not 
+ *                                     be null before calling isDirty().
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -166,7 +168,7 @@ public class LocalizationSaveAsPopulator extends CompoundContributionItem {
             LocalizationLevel newLevel) {
         LocalizationEditorInput input = (LocalizationEditorInput) editor
                 .getEditorInput();
-        LocalizationFile fileToSave = input.getLocalizationFile();
+        ILocalizationFile fileToSave = input.getLocalizationFile();
 
         if (newLevel == fileToSave.getContext().getLocalizationLevel()) {
             String myContext = LocalizationManager.getContextName(newLevel);
@@ -183,7 +185,7 @@ public class LocalizationSaveAsPopulator extends CompoundContributionItem {
         // get new level file
         IPathManager pm = PathManagerFactory.getPathManager();
 
-        String name = fileToSave.getName();
+        String name = fileToSave.getPath();
         LocalizationContext newCtx = pm.getContext(fileToSave.getContext()
                 .getLocalizationType(), newLevel);
         final LocalizationFile newFile = pm.getLocalizationFile(newCtx, name);
@@ -249,9 +251,9 @@ public class LocalizationSaveAsPopulator extends CompoundContributionItem {
     private static void saveEditorAs(IEditorPart editor) {
         LocalizationEditorInput input = (LocalizationEditorInput) editor
                 .getEditorInput();
-        LocalizationFile fileToSave = input.getLocalizationFile();
+        ILocalizationFile fileToSave = input.getLocalizationFile();
         FileDialog fd = new FileDialog(editor.getSite().getShell(), SWT.SAVE);
-        fd.setFileName(LocalizationUtil.extractName(fileToSave.getName()));
+        fd.setFileName(LocalizationUtil.extractName(fileToSave.getPath()));
         fd.setOverwrite(true);
         fd.setFilterPath(System.getProperty("user.home"));
 
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
index aa4c178961..8fa092ac17 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -87,14 +87,15 @@ import org.eclipse.ui.part.ViewPart;
 
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
 import com.raytheon.uf.common.localization.FileUpdatedMessage.FileChangeType;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.LocalizationNotificationObserver;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -130,7 +131,7 @@ import com.raytheon.uf.viz.localization.service.ILocalizationService;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 26, 2010            mnash       Initial creation
- * Feb 13, 2013  1610      mschenke    Fixed null pointer by repopulating LocalizationFileGroupData 
+ * Feb 13, 2013  1610      mschenke    Fixed null pointer by repopulating LocalizationFileGroupData
  *                                     objects even if they weren't expanded
  * May  1, 2013  1967      njensen     Fix for pydev 2.7
  * Sep 17, 2013  2285      mschenke    Made openFile refresh items if file not found
@@ -142,7 +143,13 @@ import com.raytheon.uf.viz.localization.service.ILocalizationService;
  * Aug 24, 2015  4393      njensen     Updates for observer changes
  * Oct 13, 2015  4410      bsteffen    Allow localization perspective to mix
  *                                     files for multiple Localization Types.
- * 
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Nov 18, 2015 4834       njensen     Updated to register file observing on PathManager
+ * Dec 03, 2015 4834       njensen     Updated for ILocalizationFile changes
+ * Jan 06, 2016 4834       nabowle     Fix single-user edit-save-edit-save.
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
+ * Jan 15, 2016 5242       kbisanz     Replaced LocalizationFile with
+ *                                     ILocalizationFile where possible
  * 
  * </pre>
  * 
@@ -151,21 +158,22 @@ import com.raytheon.uf.viz.localization.service.ILocalizationService;
  */
 
 public class FileTreeView extends ViewPart implements IPartListener2,
-        ILocalizationService, IResourceChangeListener {
+        ILocalizationService, IResourceChangeListener,
+        ILocalizationPathObserver {
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(FileTreeView.class);
 
     private static class FileTreeFileComparator implements
-            Comparator<LocalizationFile> {
+            Comparator<ILocalizationFile> {
 
         @Override
-        public int compare(LocalizationFile o1, LocalizationFile o2) {
+        public int compare(ILocalizationFile o1, ILocalizationFile o2) {
             if (o1.isDirectory() && (o2.isDirectory() == false)) {
                 return 1;
             } else if ((o1.isDirectory() == false) && o2.isDirectory()) {
                 return -1;
             } else {
-                int nameVal = o1.getName().compareTo(o2.getName());
+                int nameVal = o1.getPath().compareTo(o2.getPath());
                 if (nameVal == 0) {
                     // exact same name, check levels
                     LocalizationLevel l1 = o1.getContext()
@@ -206,11 +214,11 @@ public class FileTreeView extends ViewPart implements IPartListener2,
 
     private class FileUpdateRefresher implements Runnable {
 
-        private final LocalizationFile file;
+        private final ILocalizationFile file;
 
         private final FileChangeType type;
 
-        public FileUpdateRefresher(LocalizationFile file, FileChangeType type) {
+        public FileUpdateRefresher(ILocalizationFile file, FileChangeType type) {
             this.file = file;
             this.type = type;
         }
@@ -223,7 +231,7 @@ public class FileTreeView extends ViewPart implements IPartListener2,
                 for (TreeItem appItem : tree.getItems()) {
                     for (TreeItem rootItem : appItem.getItems()) {
                         TreeItem found = find(rootItem, file.getContext(),
-                                file.getName(), false);
+                                file.getPath(), false);
                         if (found != null) {
                             /*
                              * File found. If updated, set the time stamp to
@@ -313,8 +321,9 @@ public class FileTreeView extends ViewPart implements IPartListener2,
         waitCursor = display.getSystemCursor(SWT.CURSOR_WAIT);
 
         site.getPage().addPartListener(this);
-        ((LocalizationNotificationObserver) PathManagerFactory.getPathManager()
-                .getObserver()).addGlobalFileChangeObserver(this);
+
+        PathManagerFactory.getPathManager().addLocalizationPathObserver(
+                IPathManager.SEPARATOR, this);
 
         ResourcesPlugin.getWorkspace().addResourceChangeListener(this,
                 IResourceChangeEvent.POST_CHANGE);
@@ -341,9 +350,8 @@ public class FileTreeView extends ViewPart implements IPartListener2,
         }
 
         getSite().getPage().removePartListener(this);
-        ((LocalizationNotificationObserver) PathManagerFactory.getPathManager()
-                .getObserver()).removeGlobalFileChangeObserver(this);
-
+        PathManagerFactory.getPathManager()
+                .removeLocalizationPathObserver(this);
         ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
     }
 
@@ -830,8 +838,8 @@ public class FileTreeView extends ViewPart implements IPartListener2,
             }
         }
 
-        final List<LocalizationFile> fileList = new ArrayList<LocalizationFile>();
-        final List<LocalizationFileEntryData> fileDataList = new ArrayList<LocalizationFileEntryData>();
+        final List<LocalizationFile> fileList = new ArrayList<>();
+        final List<LocalizationFileEntryData> fileDataList = new ArrayList<>();
         // get list of files selected
         if (selected.length > 0) {
             // Open File(s) list
@@ -871,7 +879,7 @@ public class FileTreeView extends ViewPart implements IPartListener2,
 
             mgr.add(new CopyToAction(fileDataList.get(0), this));
             mgr.add(new DeleteAction(getSite().getPage(), fileList
-                    .toArray(new LocalizationFile[fileList.size()])));
+                    .toArray(new LocalizationFile[0])));
 
             mgr.add(new Separator());
         } else if ((selected.length == 1)
@@ -885,7 +893,7 @@ public class FileTreeView extends ViewPart implements IPartListener2,
                     .toArray(new LocalizationFile[fileList.size()])));
             mgr.add(new Separator());
         } else {
-            List<LocalizationFile> toDelete = new ArrayList<LocalizationFile>();
+            List<ILocalizationFile> toDelete = new ArrayList<>();
             for (TreeItem item : selected) {
                 int prevSize = toDelete.size();
                 if (item.getData() instanceof FileTreeEntryData) {
@@ -977,17 +985,18 @@ public class FileTreeView extends ViewPart implements IPartListener2,
     }
 
     /**
-     * Builds a list of {@link LocalizationFile}s starting at the item passed in
+     * Builds a list of {@link ILocalizationFile}s starting at the item passed
+     * in
      * 
      * @param item
      * @param files
      *            (option) list to add entries to
      * @return list of files
      */
-    private List<LocalizationFile> buildFileList(TreeItem item,
-            List<LocalizationFile> files) {
+    private List<ILocalizationFile> buildFileList(TreeItem item,
+            List<ILocalizationFile> files) {
         if (files == null) {
-            files = new ArrayList<LocalizationFile>();
+            files = new ArrayList<>();
         }
 
         FileTreeEntryData data = (FileTreeEntryData) item.getData();
@@ -1088,7 +1097,7 @@ public class FileTreeView extends ViewPart implements IPartListener2,
         IPathManager pathManager = PathManagerFactory.getPathManager();
 
         boolean success = false;
-        List<LocalizationFile> currentList = new ArrayList<LocalizationFile>();
+        List<LocalizationFile> currentList = new ArrayList<>();
         LocalizationFile[] files = pathManager.listFiles(
                 getTreeSearchContexts(types), path, filter, false, !recursive);
         if (files == null) {
@@ -1099,8 +1108,8 @@ public class FileTreeView extends ViewPart implements IPartListener2,
 
             for (LocalizationFile file : files) {
                 if (checkName
-                        && (file.getName().isEmpty() || data.getPath().equals(
-                                file.getName()))) {
+                        && (file.getPath().isEmpty() || data.getPath().equals(
+                                file.getPath()))) {
                     continue;
                 }
                 if (file.exists()) {
@@ -1176,11 +1185,11 @@ public class FileTreeView extends ViewPart implements IPartListener2,
         FileTreeEntryData data = (FileTreeEntryData) parentItem.getData();
         data.setRequestedChildren(true);
         PathData pd = data.getPathData();
-        Map<String, List<LocalizationFile>> processedFiles = new HashMap<String, List<LocalizationFile>>();
-        Set<String> processedPaths = new HashSet<String>();
+        Map<String, List<LocalizationFile>> processedFiles = new HashMap<>();
+        Set<String> processedPaths = new HashSet<>();
         // we are expanding a folder
         for (LocalizationFile file : files) {
-            String name = file.getName();
+            String name = file.getPath();
             if (processedPaths.contains(name) == false) {
                 FileTreeEntryData treeData = null;
                 if (file.isDirectory()) {
@@ -1195,7 +1204,7 @@ public class FileTreeView extends ViewPart implements IPartListener2,
             if (file.isDirectory() == false) {
                 List<LocalizationFile> entryFiles = processedFiles.get(name);
                 if (entryFiles == null) {
-                    entryFiles = new ArrayList<LocalizationFile>();
+                    entryFiles = new ArrayList<>();
                     processedFiles.put(name, entryFiles);
                 }
                 entryFiles.add(file);
@@ -1226,7 +1235,7 @@ public class FileTreeView extends ViewPart implements IPartListener2,
         PathData pd = fData.getPathData();
         Set<LocalizationLevel> levels = new HashSet<>();
         Set<LocalizationLevel> redundantLevels = new HashSet<>();
-        for (LocalizationFile file : files) {
+        for (ILocalizationFile file : files) {
             LocalizationLevel level = file.getContext().getLocalizationLevel();
             if (!levels.add(level)) {
                 redundantLevels.add(level);
@@ -1283,7 +1292,7 @@ public class FileTreeView extends ViewPart implements IPartListener2,
      */
     private TreeItem addTreeItem(TreeItem parentItem, FileTreeEntryData treeData) {
         String name = treeData.getName();
-        LocalizationFile file = null;
+        ILocalizationFile file = null;
         int idx = parentItem.getItemCount();
         if (treeData instanceof LocalizationFileEntryData) {
             LocalizationFileEntryData entryData = (LocalizationFileEntryData) treeData;
@@ -1381,16 +1390,16 @@ public class FileTreeView extends ViewPart implements IPartListener2,
     }
 
     /**
-     * Get the image for the provided LocalizationFile.
+     * Get the image for the provided ILocalizationFile.
      * 
      * @param file
-     *            The LocalizationFile
+     *            The ILocalizationFile
      * @return The image
      */
-    private Image getImage(LocalizationFile file) {
+    private Image getImage(ILocalizationFile file) {
         String name = null;
         if (file != null) {
-            name = file.getName();
+            name = file.getPath();
         }
         return getImage(name);
     }
@@ -1422,9 +1431,9 @@ public class FileTreeView extends ViewPart implements IPartListener2,
         }
     }
 
-    private TreeItem find(LocalizationFile file, boolean populateToFind,
+    private TreeItem find(ILocalizationFile file, boolean populateToFind,
             boolean nearestParent) {
-        return find(file.getName(), file.getContext(), populateToFind,
+        return find(file.getPath(), file.getContext(), populateToFind,
                 nearestParent);
     }
 
@@ -1569,12 +1578,19 @@ public class FileTreeView extends ViewPart implements IPartListener2,
                             && (docDelta.getKind() == IResourceDelta.CHANGED)
                             && ((docDelta.getFlags() & IResourceDelta.CONTENT) == IResourceDelta.CONTENT)) {
                         try {
-                            LocalizationFile file = input.getLocalizationFile();
-                            if (file.getContext().getLocalizationLevel()
-                                    .isSystemLevel() == false) {
-                                input.getLocalizationFile().save();
+                            ILocalizationFile file = input
+                                    .getLocalizationFile();
+                            /*
+                             * TODO can't easily replace the deprecated save()
+                             * call because if we use openOutputStream() it will
+                             * overwrite the file contents
+                             */
+                            if (!file.getContext().getLocalizationLevel()
+                                    .isSystemLevel()
+                                    && input.getLocalizationFile().save()) {
+                                input.refreshLocalizationFile();
                             }
-                        } catch (LocalizationOpFailedException e) {
+                        } catch (LocalizationException e) {
                             statusHandler.handle(
                                     Priority.PROBLEM,
                                     "Error saving file: "
@@ -1604,13 +1620,13 @@ public class FileTreeView extends ViewPart implements IPartListener2,
         IPathManager pathManager = PathManagerFactory.getPathManager();
 
         FileChangeType type = message.getChangeType();
-        LocalizationFile file = pathManager.getLocalizationFile(context,
+        ILocalizationFile file = pathManager.getLocalizationFile(context,
                 filePath);
 
         if (file != null) {
             if (((file.exists() == false) && ((type == FileChangeType.ADDED) || (type == FileChangeType.UPDATED)))
                     || (file.exists() && (type == FileChangeType.DELETED))) {
-                System.out.println("Got weird state in update for " + file
+                System.err.println("Got weird state in update for " + file
                         + ": exists=" + file.exists() + ", changeType="
                         + message.getChangeType());
             }
@@ -1784,4 +1800,30 @@ public class FileTreeView extends ViewPart implements IPartListener2,
     public boolean isShown(LocalizationLevel level) {
         return showSet.contains(level);
     }
+
+    @Override
+    public void fileChanged(ILocalizationFile file) {
+        /*
+         * TODO rewrite this whole method to not use fileUpdated() and correctly
+         * refresh/update nodes as necessary
+         */
+        FileChangeType t = null;
+        if (ILocalizationFile.NON_EXISTENT_CHECKSUM.equals(file.getCheckSum())) {
+            t = FileChangeType.DELETED;
+        } else {
+            /*
+             * TODO We don't have the previous checksum available here so we
+             * can't easily identify this change as an add vs update. We need to
+             * handle this cleanly somehow.
+             * 
+             * Temporary fix: Go with ADDED
+             */
+            t = FileChangeType.ADDED;
+        }
+
+        FileUpdatedMessage fum = new FileUpdatedMessage(file.getContext(),
+                file.getPath(), t, file.getTimeStamp().getTime(),
+                file.getCheckSum());
+        fileUpdated(fum);
+    }
 }
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/LocalizationFileDragNDropSource.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/LocalizationFileDragNDropSource.java
index 2f727920c2..31ad830a9c 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/LocalizationFileDragNDropSource.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/LocalizationFileDragNDropSource.java
@@ -20,12 +20,9 @@
 package com.raytheon.uf.viz.localization.perspective.view;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.ViewerDropAdapter;
 import org.eclipse.swt.dnd.DND;
@@ -35,23 +32,14 @@ import org.eclipse.swt.dnd.TransferData;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.FileUpdatedMessage.FileChangeType;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.LocalizationUtil;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
-import com.raytheon.uf.common.localization.msgs.ListResponseEntry;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.common.util.FileUtil;
-import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.localization.filetreeview.FileTreeEntryData;
 import com.raytheon.uf.viz.localization.filetreeview.LocalizationFileEntryData;
 import com.raytheon.uf.viz.localization.filetreeview.LocalizationFileGroupData;
@@ -69,7 +57,8 @@ import com.raytheon.uf.viz.localization.perspective.view.actions.ImportFileActio
  * Jul 1, 2011             mschenke    Initial creation
  * Oct 13, 2015 4410       bsteffen    Allow localization perspective to mix
  *                                     files for multiple Localization Types.
- * 
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Jan 11, 2016 5242       kbisanz     Deleted unused dropLocalizationFile(...)
  * 
  * </pre>
  * 
@@ -120,7 +109,7 @@ public class LocalizationFileDragNDropSource extends ViewerDropAdapter
         if (toDelete != null) {
             try {
                 toDelete.delete();
-            } catch (LocalizationOpFailedException e) {
+            } catch (LocalizationException e) {
                 UFStatus.getHandler().handle(Priority.PROBLEM,
                         "Error deleting old file", e);
             }
@@ -191,64 +180,6 @@ public class LocalizationFileDragNDropSource extends ViewerDropAdapter
         return false;
     }
 
-    private boolean dropLocalizationFile(FileTreeEntryData data,
-            ListResponseEntry toMoveData) {
-        IPathManager pm = PathManagerFactory.getPathManager();
-        LocalizationFile toMove = pm.getLocalizationFile(
-                toMoveData.getContext(), toMoveData.getFileName());
-        String fileName = LocalizationUtil.extractName(toMove.getName());
-        String newName = data.getPath() + File.separator + fileName;
-        LocalizationType type = toMove.getContext().getLocalizationType();
-        if (!data.getPathData().getTypes().contains(type)) {
-            type = data.getPathData().getTypes().get(0);
-        }
-        final LocalizationFile moveTo = pm.getLocalizationFile(pm.getContext(
-                type, toMoveData.getContext().getLocalizationLevel()), newName);
-        boolean move = true;
-        if (moveTo.exists()) {
-            move = MessageDialog.openQuestion(view.getSite().getShell(),
-                    "Override File", "A file with the name '" + fileName
-                            + "' already exists in the '" + data.getName()
-                            + "' folder.  Do you want to override it?");
-        }
-        if (move) {
-            final Runnable select = new Runnable() {
-                @Override
-                public void run() {
-                    view.selectFile(moveTo);
-                }
-            };
-            // Make sure we select the file after the drop
-            if (moveTo.exists() == false) {
-                final ILocalizationFileObserver[] observers = new ILocalizationFileObserver[1];
-                ILocalizationFileObserver observer = new ILocalizationFileObserver() {
-                    @Override
-                    public void fileUpdated(FileUpdatedMessage message) {
-                        if (message.getChangeType() != FileChangeType.DELETED) {
-                            view.fileUpdated(message);
-                            VizApp.runAsync(select);
-                        }
-                        moveTo.removeFileUpdatedObserver(observers[0]);
-                    }
-                };
-                observers[0] = observer;
-                moveTo.addFileUpdatedObserver(observer);
-            } else {
-                VizApp.runAsync(select);
-            }
-            try (InputStream is = toMove.openInputStream();
-                    SaveableOutputStream os = moveTo.openOutputStream()) {
-                FileUtil.copy(is, os);
-                os.save();
-                return true;
-            } catch (IOException | LocalizationException e) {
-                UFStatus.getHandler().handle(Priority.PROBLEM,
-                        "Error copying file contents", e);
-            }
-        }
-        return false;
-    }
-
     private boolean dropFile(List<LocalizationType> types, String dirPath,
             File[] toCopyFiles) {
         boolean oneGood = false;
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/AbstractToAction.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/AbstractToAction.java
index 0835ce8ca8..5d5059778b 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/AbstractToAction.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/AbstractToAction.java
@@ -41,7 +41,7 @@ import com.raytheon.uf.viz.core.localization.LocalizationManager;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Mar 25, 2011            mschenke     Initial creation
+ * Mar 25, 2011            mschenke    Initial creation
  * 
  * </pre>
  * 
@@ -65,21 +65,11 @@ public abstract class AbstractToAction extends Action implements IMenuCreator {
         return this;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.action.Action#run()
-     */
     @Override
     public void run() {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.action.IMenuCreator#dispose()
-     */
     @Override
     public void dispose() {
         if (menu != null) {
@@ -87,13 +77,6 @@ public abstract class AbstractToAction extends Action implements IMenuCreator {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets
-     * .Menu)
-     */
     @Override
     public Menu getMenu(Menu parent) {
         if (menu != null) {
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/CopyToAction.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/CopyToAction.java
index 05a173c3e5..9de1fc2ea1 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/CopyToAction.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/CopyToAction.java
@@ -35,7 +35,6 @@ import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -57,6 +56,8 @@ import com.raytheon.uf.viz.localization.service.ILocalizationService;
  * Nov 3, 2010             mschenke    Initial creation
  * Oct 13, 2015 4410       bsteffen    Allow localization perspective to mix
  *                                     files for multiple Localization Types.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -84,14 +85,6 @@ public class CopyToAction extends AbstractToAction {
         this(data.getFile(), data.getPathData(), service);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.localization.perspective.view.actions.AbstractToAction
-     * #isLevelEnabled(com.raytheon.uf.common.localization.LocalizationContext.
-     * LocalizationLevel)
-     */
     @Override
     protected boolean isLevelEnabled(LocalizationLevel level) {
         boolean enabled = super.isLevelEnabled(level);
@@ -102,21 +95,12 @@ public class CopyToAction extends AbstractToAction {
         return enabled;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.localization.filetreeview.actions.AbstractToAction
-     * #run
-     * (com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
-     * )
-     */
     @Override
     protected void run(LocalizationLevel level) {
         IPathManager pm = PathManagerFactory.getPathManager();
         ILocalizationFile newFile = pm.getLocalizationFile(
                 pm.getContext(file.getContext().getLocalizationType(), level),
-                file.getName());
+                file.getPath());
         removeAlternateTypeFiles(level);
         copyFile(newFile);
     }
@@ -133,12 +117,12 @@ public class CopyToAction extends AbstractToAction {
 
         for (LocalizationType type : pathData.getTypes()) {
             if (type != file.getContext().getLocalizationType()) {
-                LocalizationFile altFile = pm.getLocalizationFile(
-                        pm.getContext(type, level), file.getName());
+                ILocalizationFile altFile = pm.getLocalizationFile(
+                        pm.getContext(type, level), file.getPath());
                 if (altFile.exists()) {
                     try {
                         altFile.delete();
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (LocalizationException e) {
                         statusHandler.handle(Priority.PROBLEM,
                                 "Unable to delete existing " + type.name()
                                         + " " + level + " file.", e);
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/DeleteAction.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/DeleteAction.java
index 70f69dc755..40d1c000c3 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/DeleteAction.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/DeleteAction.java
@@ -25,13 +25,14 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@@ -42,6 +43,8 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.viz.localization.perspective.editor.LocalizationEditorInput;
+import com.raytheon.viz.ui.dialogs.ICloseCallback;
+import com.raytheon.viz.ui.dialogs.SWTMessageBox;
 
 /**
  * Deletes the selected localization file
@@ -55,6 +58,10 @@ import com.raytheon.uf.viz.localization.perspective.editor.LocalizationEditorInp
  * Nov 3, 2010            mschenke     Initial creation
  * Feb 18, 2015 4132      mapeters     Fixed issue with deleting overrides.
  * Jun 29, 2015 946       rferrel      Do not allow delete of a protected level file.
+ * Nov 13, 2015 4946      mapeters     Use SWTMessageBox instead of MessageDialog.
+ * Jan 15, 2016 5242      kbisanz      Replaced LocalizationFile with
+ *                                     ILocalizationFile where possible
+ * Jan 27, 2016 5054      randerso     Cleaned up SWTMessageBox
  * 
  * </pre>
  * 
@@ -92,28 +99,50 @@ public class DeleteAction extends Action {
 
     @Override
     public void run() {
-        String listOfFiles = "";
+        StringBuilder listOfFiles = new StringBuilder();
         for (int i = 0; i < toDelete.length; ++i) {
-            listOfFiles += LocalizationUtil.extractName(toDelete[i].getName())
-                    + "\n";
+            listOfFiles.append(LocalizationUtil.extractName(toDelete[i]
+                    .getPath()));
+            listOfFiles.append("\n");
         }
 
         Shell shell = page.getWorkbenchWindow().getShell();
 
         if (prompt) {
-            boolean choice = MessageDialog.openConfirm(
-                    shell,
-                    "Delete Confirmation",
-                    listOfFiles
-                            + String.format(
-                                    "\n\nAre you sure you want to delete %s?",
-                                    toDelete.length > 1 ? "these items"
-                                            : "this file"));
-            if (!choice) {
-                return;
+            StringBuilder msg = new StringBuilder();
+            msg.append("Are you sure you want to delete ");
+            if (toDelete.length > 1) {
+                msg.append("these " + toDelete.length + " items");
+            } else {
+                msg.append("this file");
             }
+            msg.append("?\n\n").append(listOfFiles);
+
+            SWTMessageBox messageDialog = new SWTMessageBox(shell,
+                    "Delete Confirmation", msg.toString(), SWT.OK | SWT.CANCEL
+                            | SWT.ICON_QUESTION);
+
+            messageDialog.setCloseCallback(new ICloseCallback() {
+
+                @Override
+                public void dialogClosed(Object returnValue) {
+                    if (returnValue instanceof Integer) {
+                        if ((int) returnValue == SWT.OK) {
+                            deleteFiles();
+                        }
+                    }
+                }
+            });
+
+            messageDialog.open();
         }
-        List<IEditorReference> toClose = new ArrayList<IEditorReference>();
+    }
+
+    /**
+     * Delete the selected files and all associated file extension variations.
+     */
+    private void deleteFiles() {
+        List<IEditorReference> toClose = new ArrayList<>();
         // check for open editors and close them
         for (IEditorReference ref : page.getEditorReferences()) {
             IEditorInput input = null;
@@ -125,10 +154,11 @@ public class DeleteAction extends Action {
                                 + "file was open (in order to close it)", e);
             }
             if (input instanceof LocalizationEditorInput) {
-                LocalizationFile editorFile = ((LocalizationEditorInput) input)
+                ILocalizationFile editorFile = ((LocalizationEditorInput) input)
                         .getLocalizationFile();
-                for (LocalizationFile file : toDelete) {
-                    if ((editorFile.compareTo(file) == 0)
+                String editorFilePath = editorFile.getPath();
+                for (ILocalizationFile file : toDelete) {
+                    if ((editorFilePath.equals(file.getPath()))
                             && editorFile.getContext()
                                     .equals(file.getContext())) {
                         toClose.add(ref);
@@ -144,7 +174,7 @@ public class DeleteAction extends Action {
                     false);
         }
 
-        for (LocalizationFile file : toDelete) {
+        for (ILocalizationFile file : toDelete) {
             try {
                 deleteFile(file);
             } catch (Exception e) {
@@ -161,10 +191,10 @@ public class DeleteAction extends Action {
      *            The file to delete
      * @throws Exception
      */
-    private void deleteFile(LocalizationFile file) throws Exception {
+    private void deleteFile(ILocalizationFile file) throws Exception {
         if (file.isDirectory() == false) {
             // Check for file extension
-            String name = LocalizationUtil.extractName(file.getName());
+            String name = LocalizationUtil.extractName(file.getPath());
             String[] parts = name.split("[.]");
 
             if (parts.length > 1) {
@@ -174,11 +204,11 @@ public class DeleteAction extends Action {
 
                 if (associated != null) {
                     String[] extensions = associated.split(",");
-                    String path = file.getName().substring(0,
-                            file.getName().lastIndexOf(name));
+                    String path = file.getPath().substring(0,
+                            file.getPath().lastIndexOf(name));
 
                     String prefix = "";
-                    for (int i = 0; i < parts.length - 1; ++i) {
+                    for (int i = 0; i < (parts.length - 1); ++i) {
                         if (i > 0) {
                             prefix += ".";
                         }
@@ -193,7 +223,7 @@ public class DeleteAction extends Action {
 
                     for (String extension : extensions) {
                         String deletePath = path + "." + extension;
-                        LocalizationFile result = pathManager
+                        ILocalizationFile result = pathManager
                                 .getLocalizationFile(ctx, deletePath);
                         if (result != null) {
                             result.delete();
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/ImportFileAction.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/ImportFileAction.java
index 8fe13d2983..d98c33bbaf 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/ImportFileAction.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/ImportFileAction.java
@@ -57,6 +57,7 @@ import com.raytheon.viz.ui.VizWorkbenchManager;
  * Jun 11, 2015 4541       skorolev    Added NULL test for lf.
  * Oct 13, 2015 4410       bsteffen    Allow localization perspective to mix
  *                                     files for multiple Localization Types.
+ * Dec 03, 2015 4834       njensen     Updated for ILocalizationFile changes                                    
  * 
  * </pre>
  * 
@@ -88,8 +89,7 @@ public class ImportFileAction extends Action {
     }
 
     public ImportFileAction(List<LocalizationType> contextTypes,
-            String directoryPath,
-            String[] filter) {
+            String directoryPath, String[] filter) {
         this(contextTypes, directoryPath);
         if (filter != null) {
             this.fileExtensionFilterArr = new String[filter.length];
@@ -182,7 +182,7 @@ public class ImportFileAction extends Action {
                 ILocalizationFile file = existing.get(0);
                 if (MessageDialog.openConfirm(VizWorkbenchManager.getInstance()
                         .getCurrentWindow().getShell(), "Confirm Overwrite",
-                        String.format(FORMAT_STRING, file.getName(), file
+                        String.format(FORMAT_STRING, file.getPath(), file
                                 .getContext().getLocalizationLevel()))) {
                     existing.clear();
                 }
@@ -288,7 +288,7 @@ public class ImportFileAction extends Action {
 
         private void updateText() {
             ILocalizationFile file = existingFiles.get(curIdx);
-            messageLabel.setText(String.format(FORMAT_STRING, file.getName(),
+            messageLabel.setText(String.format(FORMAT_STRING, file.getPath(),
                     file.getContext().getLocalizationLevel()));
         }
 
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/MoveFileAction.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/MoveFileAction.java
index ea2db1338e..55106c7640 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/MoveFileAction.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/MoveFileAction.java
@@ -50,6 +50,7 @@ import com.raytheon.uf.viz.localization.service.ILocalizationService;
  * Mar 25, 2011            mschenke    Initial creation
  * Oct 13, 2015 4410       bsteffen    Allow localization perspective to mix
  *                                     files for multiple Localization Types.
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * 
  * </pre>
@@ -80,14 +81,6 @@ public class MoveFileAction extends CopyToAction {
         setEnabled(delete.isEnabled());
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.localization.perspective.view.actions.AbstractToAction
-     * #isLevelEnabled(com.raytheon.uf.common.localization.LocalizationContext.
-     * LocalizationLevel)
-     */
     @Override
     protected boolean isLevelEnabled(LocalizationLevel level) {
         boolean enabled = super.isLevelEnabled(level);
@@ -105,7 +98,7 @@ public class MoveFileAction extends CopyToAction {
                         page.getWorkbenchWindow().getShell(),
                         "Move Confirmation",
                         "Are you sure you want to move "
-                                + LocalizationUtil.extractName(file.getName())
+                                + LocalizationUtil.extractName(file.getPath())
                                 + " to "
                                 + level
                                 + " replacing any existing file and deleting this file?");
@@ -113,7 +106,7 @@ public class MoveFileAction extends CopyToAction {
             IPathManager pm = PathManagerFactory.getPathManager();
             final LocalizationFile newFile = pm.getLocalizationFile(
                     pm.getContext(file.getContext().getLocalizationType(),
-                            level), file.getName());
+                            level), file.getPath());
             removeAlternateTypeFiles(level);
             // Make sure we select the file after the drop
             final ILocalizationFileObserver[] observers = new ILocalizationFileObserver[1];
@@ -121,7 +114,7 @@ public class MoveFileAction extends CopyToAction {
                 @Override
                 public void fileUpdated(FileUpdatedMessage message) {
                     if (message.getContext().equals(newFile.getContext())
-                            && message.getFileName().equals(newFile.getName())
+                            && message.getFileName().equals(newFile.getPath())
                             && message.getChangeType() != FileChangeType.DELETED) {
                         service.fileUpdated(message);
                         VizApp.runAsync(new Runnable() {
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/PasteFileAction.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/PasteFileAction.java
index b3bbdd5408..4d07d7a617 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/PasteFileAction.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/PasteFileAction.java
@@ -21,6 +21,7 @@ package com.raytheon.uf.viz.localization.perspective.view.actions;
 
 import java.util.List;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@@ -43,6 +44,8 @@ import com.raytheon.uf.viz.localization.service.ILocalizationService;
  * Dec 3, 2010  6305       mpduff      Initial creation
  * Oct 13, 2015 4410       bsteffen    Allow localization perspective to mix
  *                                     files for multiple Localization Types.
+ * Jan 15, 2016 5242       kbisanz     Replaced LocalizationFile with
+ *                                     ILocalizationFile where possible
  * 
  * 
  * </pre>
@@ -81,12 +84,12 @@ public class PasteFileAction extends CopyToAction {
 
         List<LocalizationType> types = dataToCopyTo.getPathData().getTypes();
         LocalizationType type = file.getContext().getLocalizationType();
-        if(!types.contains(type)){
+        if (!types.contains(type)) {
             type = types.get(0);
         }
         LocalizationContext ctx = pm.getContext(type, level);
 
-        LocalizationFile newFile = pm.getLocalizationFile(ctx,
+        ILocalizationFile newFile = pm.getLocalizationFile(ctx,
                 dataToCopyTo.getPath());
         removeAlternateTypeFiles(level);
         copyFile(newFile);
diff --git a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/RenameAction.java b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/RenameAction.java
index 92afe7fc3c..8566ff1e7e 100644
--- a/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/RenameAction.java
+++ b/cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/actions/RenameAction.java
@@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
 import com.raytheon.uf.common.localization.FileUpdatedMessage.FileChangeType;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@@ -57,6 +58,7 @@ import com.raytheon.viz.ui.VizWorkbenchManager;
  * Apr 27, 2011            mschenke    Initial creation
  * Oct 13, 2015 4410       bsteffen    Allow localization perspective to mix
  *                                     files for multiple Localization Types.
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * 
  * </pre>
@@ -107,13 +109,13 @@ public class RenameAction extends Action {
         }
     }
 
-    private LocalizationFile file;
+    private ILocalizationFile file;
 
     private ILocalizationService service;
 
     private boolean deleteOld;
 
-    public RenameAction(LocalizationFile file, ILocalizationService service,
+    public RenameAction(ILocalizationFile file, ILocalizationService service,
             boolean deleteOld) {
         super("Rename...", IAction.AS_PUSH_BUTTON);
         // Only set not enabled if we are deleting the old file and level is a
@@ -125,13 +127,13 @@ public class RenameAction extends Action {
         this.deleteOld = deleteOld;
     }
 
-    public RenameAction(LocalizationFile file, ILocalizationService service) {
+    public RenameAction(ILocalizationFile file, ILocalizationService service) {
         this(file, service, true);
     }
 
     @Override
     public void run() {
-        String path = file.getName();
+        String path = file.getPath();
         String[] pathParts = LocalizationUtil.splitUnique(path);
         final String name = pathParts[pathParts.length - 1];
         Shell parent = VizWorkbenchManager.getInstance().getCurrentWindow()
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/MANIFEST.MF
index 835206dfaf..a3a5f338f2 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ffmp Plug-in
 Bundle-SymbolicName: com.raytheon.uf.viz.monitor.ffmp;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Activator: com.raytheon.uf.viz.monitor.ffmp.Activator
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.eclipse.ui,
@@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.viz.ui;bundle-version="1.10.13",
  com.raytheon.uf.viz.monitor;bundle-version="1.11.1",
  com.raytheon.uf.common.dataplugin.ffmp;bundle-version="1.11.9",
- org.apache.commons.lang;bundle-version="2.3.0",
  com.raytheon.uf.viz.d2d.core;bundle-version="1.11.15",
  com.raytheon.uf.viz.localization,
  com.raytheon.uf.common.serialization,
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitorConfiguration.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitorConfiguration.java
old mode 100644
new mode 100755
index f9b8dba547..70cf84a43f
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitorConfiguration.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitorConfiguration.java
@@ -19,15 +19,13 @@
  **/
 package com.raytheon.uf.viz.monitor.ffmp;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Set;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.ffmpTable;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.tableFields;
 import com.raytheon.uf.viz.core.localization.HierarchicalPreferenceStore;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.ffmpTable;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.tableFields;
 
 /**
  * FFMPMonitorConfiguration object stores configuration data specific to FFMP.
@@ -38,6 +36,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.tableFields;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 29 June, 2009  2521      dhladky     Initial creation
+ * Jan 04,  2016  5115      skorolev    Corrected imports.
  * 
  * </pre>
  * 
@@ -56,64 +55,17 @@ public class FFMPMonitorConfiguration {
      * Constructor
      */
     public FFMPMonitorConfiguration() {
-//        reload(getStore());
-    }
 
-    /**
-     * Save the configuration object to a file.
-     * 
-     * @throws IOException
-     */
-//    public void save() throws IOException {
-//        HierarchicalPreferenceStore store = getStore();
-//
-//        // Save SCAN Stuff here
-//        store.setValue(MonitorConfigConstants.SCAN_PLUGIN_NAME, pluginName);
-//
-//        // cell table
-//        String[] tempTableAttributes = new String[ffmpTableAttributes.length];
-//
-//        for (int i = 0; i < tempTableAttributes.length; i++) {
-//            tempTableAttributes[i] = Boolean.toString(ffmpTableAttributes[i]);
-//        }
-//
-//        store.setValue(MonitorConfigConstants.SCAN_TVS_TABLE_ATTRIB,
-//                tempTableAttributes);
-//
-//        store.save();
-//    }
+    }
 
     /**
      * @return HierarchicalPreferenceStore
      */
     private HierarchicalPreferenceStore getStore() {
-        return (HierarchicalPreferenceStore) Activator.getDefault().getPreferenceStore();
+        return (HierarchicalPreferenceStore) Activator.getDefault()
+                .getPreferenceStore();
     }
 
-    /**
-     * Load the internal data structures from the HierarchicalPreferenceStore.
-     * 
-     * @param store
-     *            HierarchicalPreferenceStore
-     */
-//    private void reload(HierarchicalPreferenceStore store) {
-//        // Load SCAN Stuff here
-//        // pluginName
-//        this.pluginName = store
-//                .getStringArray(MonitorConfigConstants.SCAN_PLUGIN_NAME);
-//
-//        // cell table
-//        String[] tempTableAttributes = store
-//                .getStringArray(MonitorConfigConstants.SCAN_CELL_TABLE_ATTRIB);
-//        
-//        ffmpTableAttributes = new boolean[tempTableAttributes.length];
-//        for (int i = 0; i < tempTableAttributes.length; i++) {
-//            this.ffmpTableAttributes[i] = Boolean
-//                    .valueOf(tempTableAttributes[i]);
-//        }
-//
-//    }
-
     /**
      * Retrieve one set of values for all attributes on a given table.
      * 
@@ -133,7 +85,6 @@ public class FFMPMonitorConfiguration {
             String value = store.getString(table.toString(field));
             map.put(table.toString(), value);
         }
-        
 
         return map;
     }
@@ -151,15 +102,13 @@ public class FFMPMonitorConfiguration {
         HashMap<String, String> map = new HashMap<String, String>();
 
         for (tableFields field : tableFields.values()) {
-            map.put(field.toString(), store
-                    .getString(attribute.toString(field)));
+            map.put(field.toString(),
+                    store.getString(attribute.toString(field)));
         }
 
         return map;
     }
 
-  
-
     /**
      * Retrieve the threshold data for one of the SCAN tables. Only returns
      * those attributes that have thresholds other than the default "999" value.
@@ -203,7 +152,6 @@ public class FFMPMonitorConfiguration {
         getStore().setValue(attribute.toString(field), value);
     }
 
-   
     /**
      * @return String[] pluginName
      */
@@ -242,6 +190,6 @@ public class FFMPMonitorConfiguration {
      *            boolean[]
      */
     public void setTableAttributes(ffmpTable table, boolean[] tableAttributes) {
-         this.ffmpTableAttributes = tableAttributes.clone();
+        this.ffmpTableAttributes = tableAttributes.clone();
     }
 }
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ffti/FFTISliderCanvas.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ffti/FFTISliderCanvas.java
index b560d7c0fc..97438547fa 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ffti/FFTISliderCanvas.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ffti/FFTISliderCanvas.java
@@ -39,6 +39,22 @@ import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
+/**
+ * FFTI Slider Canvas
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Nov 05, 2015 #5070      randerso    Changed to use system font name (not AWT)
+ * 
+ * </pre>
+ * 
+ * @author randerso
+ * @version 1.0
+ */
 public class FFTISliderCanvas {
     private Composite parentComp;
 
@@ -160,7 +176,8 @@ public class FFTISliderCanvas {
         display = this.parentComp.getDisplay();
 
         this.attribVal = accumAttrib;
-        setValuesNoRedraw(attribVal.getMin(), attribVal.getMax(), attribVal.getInc(), attribVal.getRedThreshold(),
+        setValuesNoRedraw(attribVal.getMin(), attribVal.getMax(),
+                attribVal.getInc(), attribVal.getRedThreshold(),
                 attribVal.getYellowThreshold());
 
         init();
@@ -182,7 +199,7 @@ public class FFTISliderCanvas {
         upperLblRect = new Rectangle(0, 0, 0, 0);
         lowerLblRect = new Rectangle(0, 0, 0, 0);
 
-        labelFont = new Font(display, "Monospaced", 10, SWT.BOLD);
+        labelFont = new Font(display, "Monospace", 10, SWT.BOLD);
         mousePt = new Point(0, 0);
         upperRegion = new Region(display);
         lowerRegion = new Region(display);
@@ -201,6 +218,7 @@ public class FFTISliderCanvas {
 
         canvas.setLayoutData(gd);
         canvas.addPaintListener(new PaintListener() {
+            @Override
             public void paintControl(PaintEvent e) {
                 drawCanvas(e.gc);
             }
@@ -209,12 +227,14 @@ public class FFTISliderCanvas {
         canvas.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseDown(MouseEvent e) {
-                if (upperRegion.contains(e.x, e.y) == true || upperLblRect.contains(e.x, e.y) == true) {
+                if (upperRegion.contains(e.x, e.y) == true
+                        || upperLblRect.contains(e.x, e.y) == true) {
                     mousePt.x = e.x;
                     mousePt.y = e.y;
                     mouseDown = true;
                     moveUpper = true;
-                } else if (lowerRegion.contains(e.x, e.y) == true || lowerLblRect.contains(e.x, e.y) == true) {
+                } else if (lowerRegion.contains(e.x, e.y) == true
+                        || lowerLblRect.contains(e.x, e.y) == true) {
                     mousePt.x = e.x;
                     mousePt.y = e.y;
                     mouseDown = true;
@@ -259,10 +279,12 @@ public class FFTISliderCanvas {
         gc.fillRectangle(barXCoord, barYCoord, barWidth, barHeight);
 
         gc.setBackground(yellowColor);
-        gc.fillRectangle(lowerArrowXCoord, barYCoord, barWidth + 25 - lowerArrowXCoord, barHeight);
+        gc.fillRectangle(lowerArrowXCoord, barYCoord, barWidth + 25
+                - lowerArrowXCoord, barHeight);
 
         gc.setBackground(redColor);
-        gc.fillRectangle(upperArrowXCoord, barYCoord, barWidth + 25 - upperArrowXCoord, barHeight);
+        gc.fillRectangle(upperArrowXCoord, barYCoord, barWidth + 25
+                - upperArrowXCoord, barHeight);
 
         gc.setForeground(blackColor);
         gc.drawRectangle(barXCoord, barYCoord, barWidth, barHeight);
@@ -276,7 +298,8 @@ public class FFTISliderCanvas {
 
     private void updateUpperArrow(GC gc) {
         upperRegion.subtract(upperPtArray);
-        upperPtArray = new int[] { upperArrowXCoord, barBottomYCoord - barHeight - 3, upperArrowXCoord + 4,
+        upperPtArray = new int[] { upperArrowXCoord,
+                barBottomYCoord - barHeight - 3, upperArrowXCoord + 4,
                 barBottomYCoord, upperArrowXCoord - 4, barBottomYCoord };
         upperRegion.add(upperPtArray);
 
@@ -301,7 +324,8 @@ public class FFTISliderCanvas {
 
     private void updateLowerArrow(GC gc) {
         lowerRegion.subtract(lowerPtArray);
-        lowerPtArray = new int[] { lowerArrowXCoord, barBottomYCoord - barHeight - 3, lowerArrowXCoord + 4,
+        lowerPtArray = new int[] { lowerArrowXCoord,
+                barBottomYCoord - barHeight - 3, lowerArrowXCoord + 4,
                 barBottomYCoord, lowerArrowXCoord - 4, barBottomYCoord };
         lowerRegion.add(lowerPtArray);
 
@@ -314,7 +338,8 @@ public class FFTISliderCanvas {
     private void updateLowerLabel(GC gc) {
         gc.setForeground(yellowColor);
         lowerStr = calcDisplayString(lowerDisplayVal);
-        int lblXCoord = (int) (lowerArrowXCoord - ((double) textWidth * (double) lowerStr.length() / 2));
+        int lblXCoord = (int) (lowerArrowXCoord - ((double) textWidth
+                * (double) lowerStr.length() / 2));
         gc.drawString(lowerStr, lblXCoord, lowerLblYCoord, true);
         lowerLblRect.x = lblXCoord;
         lowerLblRect.y = lowerLblYCoord;
@@ -379,17 +404,18 @@ public class FFTISliderCanvas {
 
         double xCoordAsValue = (xCoord - barXCoord) * incPerPixel + minValue;
 
-        if (xCoordAsValue >= this.maxValue) //no rounding for max value
+        if (xCoordAsValue >= this.maxValue) {
             return this.maxValue;
+        }
 
         if (incValue == .25) {
             return (Math.round(xCoordAsValue * 4.00)) / 4.00;
         } else if (incValue == .05) {
-            return (double) (Math.round(xCoordAsValue * 20.0) / 20.0);
+            return Math.round(xCoordAsValue * 20.0) / 20.0;
         } else if (incValue == .10) {
             return (Math.round(xCoordAsValue * 10.00)) / 10.00;
         } else {
-            return (double) Math.round(xCoordAsValue);
+            return Math.round(xCoordAsValue);
         }
     }
 
@@ -402,12 +428,14 @@ public class FFTISliderCanvas {
     }
 
     private int calcValueToBarXCoord(double val) {
-        int result = (int) Math.round((val - minValue) / incPerPixel + barXCoord);
+        int result = (int) Math.round((val - minValue) / incPerPixel
+                + barXCoord);
 
         return result;
     }
 
-    private void setValuesNoRedraw(double min, double max, double inc, double startingUpperVal, double startingLowerVal) {
+    private void setValuesNoRedraw(double min, double max, double inc,
+            double startingUpperVal, double startingLowerVal) {
         if (max < min) {
             return;
         }
@@ -417,7 +445,7 @@ public class FFTISliderCanvas {
         this.rangeValue = max - min;
         this.incValue = inc;
 
-        incPerPixel = this.rangeValue / (double) barWidth;
+        incPerPixel = this.rangeValue / barWidth;
 
         if (inc < 1.00) {
             displayAtInt = false;
@@ -436,11 +464,12 @@ public class FFTISliderCanvas {
 
     public void setValues(FFTIAttribute attribVal) {
         this.attribVal = attribVal;
-        setValues(attribVal.getMin(), attribVal.getMax(), attribVal.getInc(), attribVal.getRedThreshold(),
-                attribVal.getYellowThreshold());
+        setValues(attribVal.getMin(), attribVal.getMax(), attribVal.getInc(),
+                attribVal.getRedThreshold(), attribVal.getYellowThreshold());
     }
 
-    public void setValues(double min, double max, double inc, double startingUpperVal, double startingLowerVal) {
+    public void setValues(double min, double max, double inc,
+            double startingUpperVal, double startingLowerVal) {
         setValuesNoRedraw(min, max, inc, startingUpperVal, startingLowerVal);
         canvas.redraw();
     }
@@ -456,12 +485,15 @@ public class FFTISliderCanvas {
             startingUpperVal = maxValue;
             startingLowerVal = maxValue;
 
-            setValues(this.minValue, this.maxValue, this.incValue, startingUpperVal, startingLowerVal);
+            setValues(this.minValue, this.maxValue, this.incValue,
+                    startingUpperVal, startingLowerVal);
         } else if (upperDisplayVal > maxValue) {
             startingUpperVal = maxValue;
-            setValues(this.minValue, this.maxValue, this.incValue, startingUpperVal, getLowerValue());
+            setValues(this.minValue, this.maxValue, this.incValue,
+                    startingUpperVal, getLowerValue());
         } else {
-            setValues(this.minValue, this.maxValue, this.incValue, getUpperValue(), getLowerValue());
+            setValues(this.minValue, this.maxValue, this.incValue,
+                    getUpperValue(), getLowerValue());
         }
     }
 
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ffti/ToggleCanvas.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ffti/ToggleCanvas.java
index 0c4c2e1cfe..7c06e0f10b 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ffti/ToggleCanvas.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ffti/ToggleCanvas.java
@@ -45,6 +45,7 @@ import org.eclipse.swt.widgets.Display;
  * ------------ ---------- ----------- --------------------------
  * ????????????            lvenable    Initial creation
  * Oct 10, 2013 #2464      lvenable    Fix font memory leak.
+ * Nov 05, 2015 #5070      randerso    Changed to use system font name (not AWT)
  * 
  * </pre>
  * 
@@ -124,7 +125,7 @@ public class ToggleCanvas {
     }
 
     private void init() {
-        labelFont = new Font(display, "Monospaced", 10, SWT.BOLD);
+        labelFont = new Font(display, "Monospace", 10, SWT.BOLD);
 
         parentComp.addDisposeListener(new DisposeListener() {
             @Override
@@ -145,6 +146,7 @@ public class ToggleCanvas {
 
         canvas.setLayoutData(gd);
         canvas.addPaintListener(new PaintListener() {
+            @Override
             public void paintControl(PaintEvent e) {
                 drawCanvas(e.gc);
             }
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
index 4f1d40da37..5f0478ed49 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
@@ -20,6 +20,7 @@
 package com.raytheon.uf.viz.monitor.ffmp.ui.dialogs;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.HashMap;
@@ -32,9 +33,11 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Display;
 
 import com.raytheon.uf.common.dataplugin.ffmp.FFMPRecord.FIELDS;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.monitor.config.FFMPRunConfigurationManager;
 import com.raytheon.uf.common.monitor.config.FFMPSourceConfigurationManager;
 import com.raytheon.uf.common.monitor.xml.FFMPRunXML;
@@ -61,6 +64,9 @@ import com.raytheon.uf.viz.monitor.ffmp.xml.FFMPTableColumnXML;
  * Apr 12, 2013  1902      mpduff       Speed up cell coloring.
  * Apr 15, 2013   1904     mpduff       Don't allow this class to be nulled out
  * Apr 26, 2013 1954       bsteffen    Minor code cleanup throughout FFMP.
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
+ *                                     and replace printStackTrace with
+ *                                     statusHandler.error()
  * 
  * </pre>
  * 
@@ -192,16 +198,16 @@ public class FFMPConfig {
         readDefaultFFMPConfigBasin();
     }
 
-    private void readNewFFMPConfigBasin(LocalizationFile xmlFileName) {
+    private void readNewFFMPConfigBasin(ILocalizationFile xmlFileName) {
         ffmpCfgBasin = null;
 
-        try {
-            ffmpCfgBasin = JAXB.unmarshal(xmlFileName.getFile(),
-                    FFMPConfigBasinXML.class);
+        try (InputStream strm = xmlFileName.openInputStream()) {
+            ffmpCfgBasin = JAXB.unmarshal(strm, FFMPConfigBasinXML.class);
 
             createThresholdManager();
         } catch (Exception e) {
-            e.printStackTrace();
+            statusHandler.error("Error reading FFMP Basin config "
+                    + xmlFileName.getPath(), e);
         }
     }
 
@@ -220,26 +226,26 @@ public class FFMPConfig {
                 return;
             }
 
-            System.out.println("Path Config FFMP: " + file.getAbsolutePath());
-
-            ffmpCfgBasin = JAXB.unmarshal(file,
-                    FFMPConfigBasinXML.class);
+            ffmpCfgBasin = JAXB.unmarshal(file, FFMPConfigBasinXML.class);
 
             createThresholdManager();
         } catch (Exception e) {
-            e.printStackTrace();
+            statusHandler.error("Error reading default FFMP Basin config "
+                    + DEFAULT_CONFIG_XML, e);
         }
     }
 
-    public void saveFFMPBasinConfig(LocalizationFile xmlFileName) {
-        try {
-            JAXB.marshal(ffmpCfgBasin, xmlFileName.getFile());
+    public void saveFFMPBasinConfig(ILocalizationFile xmlFileName) {
+        try (SaveableOutputStream strm = xmlFileName.openOutputStream()) {
+            JAXB.marshal(ffmpCfgBasin, strm);
 
-            xmlFileName.save();
+            strm.save();
 
             createThresholdManager();
         } catch (Exception e) {
-            e.printStackTrace();
+            statusHandler.error(
+                    "Error saving FFMP Basin config " + xmlFileName.getPath(),
+                    e);
         }
     }
 
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/LoadSaveConfigDlg.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/LoadSaveConfigDlg.java
index b872e18d22..190675cc37 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/LoadSaveConfigDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/LoadSaveConfigDlg.java
@@ -39,11 +39,11 @@ import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 
@@ -57,8 +57,9 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  *                                     Initial creation
- * Dec 6, 2012  1353       rferrel     Make dialog non-blocking.
- * Apr 01, 2013  1830      mpduff      Don't allow base files.
+ * Dec 06, 2012 1353       rferrel     Make dialog non-blocking.
+ * Apr 01, 2013 1830       mpduff      Don't allow base files.
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -87,9 +88,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
 
     private List cfgFileList;
 
-    private LocalizationFile[] locFiles;
-
-    private TreeMap<String, LocalizationFile> locFileMap;
+    private TreeMap<String, ILocalizationFile> locFileMap;
 
     private Text newFileNameTF;
 
@@ -122,7 +121,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
 
     @Override
     protected void initializeComponents(Shell shell) {
-        locFileMap = new TreeMap<String, LocalizationFile>();
+        locFileMap = new TreeMap<>();
         controlFont = new Font(shell.getDisplay(), "Monospace", 10, SWT.NORMAL);
 
         createListControl();
@@ -278,7 +277,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
         LocalizationContext context = pm.getContext(
                 LocalizationType.CAVE_STATIC, level);
         String newFileName = "ffmp/guiConfig/" + fileName;
-        LocalizationFile selectedFile = pm.getLocalizationFile(context,
+        ILocalizationFile selectedFile = pm.getLocalizationFile(context,
                 newFileName);
 
         FFMPConfig.getInstance().saveFFMPBasinConfig(selectedFile);
@@ -318,12 +317,12 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
         String[] extensions = new String[] { ".xml" };
         IPathManager pm = PathManagerFactory.getPathManager();
 
-        ArrayList<LocalizationContext> contextList = new ArrayList<LocalizationContext>();
+        java.util.List<LocalizationContext> contextList = new ArrayList<>();
         contextList.add(pm.getContext(LocalizationType.CAVE_STATIC,
                 LocalizationLevel.SITE));
         contextList.add(pm.getContext(LocalizationType.CAVE_STATIC,
                 LocalizationLevel.USER));
-        locFiles = pm.listFiles(contextList
+        ILocalizationFile[] locFiles = pm.listFiles(contextList
                 .toArray(new LocalizationContext[contextList.size()]),
                 "ffmp/guiConfig", extensions, false, true);
 
@@ -333,7 +332,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
 
         for (int i = 0; i < locFiles.length; i++) {
             locFileMap.put(locFiles[i].getContext().getLocalizationLevel()
-                    + ":" + locFiles[i].getName(), locFiles[i]);
+                    + ":" + locFiles[i].getPath(), locFiles[i]);
         }
 
         for (String str : locFileMap.keySet()) {
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
index efb7eedea4..f242029b3b 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPColorUtils.java
@@ -27,11 +27,13 @@ import org.eclipse.swt.graphics.RGB;
 
 import com.raytheon.uf.common.colormap.Color;
 import com.raytheon.uf.common.colormap.ColorMap;
+import com.raytheon.uf.common.colormap.ColorMapException;
+import com.raytheon.uf.common.colormap.ColorMapLoader;
 import com.raytheon.uf.common.colormap.IColorMap;
 import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
 import com.raytheon.uf.common.dataplugin.ffmp.FFMPRecord;
 import com.raytheon.uf.common.dataplugin.ffmp.FFMPRecord.FIELDS;
-import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.style.ParamLevelMatchCriteria;
@@ -40,7 +42,6 @@ import com.raytheon.uf.common.style.StyleManager;
 import com.raytheon.uf.common.style.StyleRule;
 import com.raytheon.uf.common.style.StyleRuleset;
 import com.raytheon.uf.common.style.image.ImagePreferences;
-import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
 import com.raytheon.uf.viz.core.exception.VizException;
 
 /**
@@ -53,11 +54,13 @@ import com.raytheon.uf.viz.core.exception.VizException;
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
  * 08/29/09      2152       D. Hladky   Initial release
- * 05/21/12		DR 14833    G. Zhang    Error handling for invalid cmap 
+ * 05/21/12     DR 14833    G. Zhang    Error handling for invalid cmap 
  * Apr 26, 2013 1954        bsteffen    Minor code cleanup throughout FFMP.
  * Jun 10, 2013 2075        njensen     Improved init time
- * Sep 5, 2013  2051        mnash       Moved style rule instantiation so that we don't get NPEs
+ * Sep 05, 2013 2051        mnash       Moved style rule instantiation so that we don't get NPEs
  * Sep 28, 2015 4756        dhladky     Multiple guidance style rules for FFMP.
+ * Dec 10, 2015 4834        njensen     Use non-deprecated ColorMapLoader
+ * 
  * </pre>
  * 
  * @author dhladky
@@ -65,7 +68,7 @@ import com.raytheon.uf.viz.core.exception.VizException;
  */
 
 public class FFMPColorUtils {
-    
+
     /** Status handler */
     private final IUFStatusHandler statusHandler = UFStatus
             .getHandler(FFMPColorUtils.class);
@@ -130,9 +133,9 @@ public class FFMPColorUtils {
 
             try {
                 cxml = ColorMapLoader.loadColorMap(colormapfile);
-            } catch (VizException e) {
-                statusHandler.error("Error loading ColorMap file: field: " + field
-                        + " time: " + time + " ffgName: " + ffgName
+            } catch (ColorMapException e) {
+                statusHandler.error("Error loading ColorMap file: field: "
+                        + field + " time: " + time + " ffgName: " + ffgName
                         + " TableLoad: " + tableLoad, e);
             }
 
@@ -276,7 +279,7 @@ public class FFMPColorUtils {
 
         return qpeHourToUse;
     }
-    
+
     private void parseFileNames(List<String> fileArray) {
         double hour = 0.0;
         for (String fn : fileArray) {
@@ -344,9 +347,9 @@ public class FFMPColorUtils {
 
     private List<String> getQpeColorMapFiles() {
         List<String> colormaps = new ArrayList<String>();
-        LocalizationFile[] files = ColorMapLoader.listColorMapFiles("ffmp");
-        for (LocalizationFile file : files) {
-            String fn = file.getName();
+        ILocalizationFile[] files = ColorMapLoader.listColorMapFiles("ffmp");
+        for (ILocalizationFile file : files) {
+            String fn = file.getPath();
             if (fn.indexOf("qpe") > 0) {
                 colormaps.add(fn);
             }
@@ -395,14 +398,11 @@ public class FFMPColorUtils {
             if (DEFAULT_PARAMNAME.equalsIgnoreCase(pn)
                     && DEFAULT_COLORMAP.equalsIgnoreCase(cm)) {
                 sr = srl;
-                System.out
-                        .println("FFMPColorUtils.getDefaultColorMap(): StyleRule pn-cm value:  "
-                                + pn + "-" + cm);
                 break;
             }
 
         }
-    
+
         // get the colormapfile name
         String colormapfile = ((ImagePreferences) sr.getPreferences())
                 .getDefaultColormap();
@@ -410,8 +410,8 @@ public class FFMPColorUtils {
         // load the colormap
         try {
             cxml = ColorMapLoader.loadColorMap(colormapfile);
-        } catch (VizException e) {
-            e.printStackTrace();
+        } catch (ColorMapException e) {
+            statusHandler.error("Error loading colormap " + colormapfile, e);
         }
 
         return cxml;
diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
index 527f1b417f..662a5e9d40 100644
--- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
+++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
@@ -202,6 +202,8 @@ import com.vividsolutions.jts.geom.Point;
  * Feb 13, 2015   4121      mpduff      Change label caching.
  * Sep 28, 2015   4756      dhladky     Multiple guidance sources.
  * Oct 26, 2015  5056       dhladky     Simplified Guidance Interpolation.
+ * Nov 05, 2015 5070        randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author dhladky
@@ -1254,7 +1256,7 @@ public class FFMPResource extends
             public void run() {
 
                 if (font == null) {
-                    font = target.initializeFont("Dialog", 11, null);
+                    font = target.initializeFont("Dialog", 9, null);
                 }
 
                 font.setMagnification(getCapability(
@@ -1263,7 +1265,7 @@ public class FFMPResource extends
 
                 if (xfont == null) {
                     IFont.Style[] styles = new IFont.Style[] { IFont.Style.BOLD };
-                    xfont = target.initializeFont("Monospace", 12, styles);
+                    xfont = target.initializeFont("Monospace", 10, styles);
                 }
 
                 xfont.setMagnification(getCapability(
@@ -3190,7 +3192,8 @@ public class FFMPResource extends
         ITimer timer = TimeUtil.getTimer();
         timer.start();
         FfmpTableConfig tableConfig = FfmpTableConfig.getInstance();
-        String ffgGraphType = tableConfig.getTableConfigData(getSiteKey()).getFfgGraphType();
+        String ffgGraphType = tableConfig.getTableConfigData(getSiteKey())
+                .getFfgGraphType();
         Long basinPfaf = null;
         Long dataId = null;
         FFMPVirtualGageBasinMetaData fvgbmd = null;
@@ -3208,7 +3211,7 @@ public class FFMPResource extends
         }
 
         FFMPBasinMetaData mBasin = monitor.getTemplates(getSiteKey()).getBasin(
-                getSiteKey(), basinPfaf); 
+                getSiteKey(), basinPfaf);
         FFMPGraphData fgd = null;
         // VGB
         if (fvgbmd != null) {
@@ -3246,8 +3249,9 @@ public class FFMPResource extends
                 for (Date date : rateBasin.getValues().keySet()) {
 
                     if (date.before(minUriTime) || date.before(barrierTime)
-                            || date.after(mostRecentRefTime))
+                            || date.after(mostRecentRefTime)) {
                         continue;// DR 16148
+                    }
 
                     double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime,
                             date);
@@ -3275,8 +3279,9 @@ public class FFMPResource extends
                 for (Date date : qpeBasin.getValues().keySet()) {
 
                     if (date.before(minUriTime) || date.before(barrierTime)
-                            || date.after(mostRecentRefTime))
+                            || date.after(mostRecentRefTime)) {
                         continue;// DR 16148
+                    }
 
                     double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime,
                             date);
@@ -3337,8 +3342,8 @@ public class FFMPResource extends
         try {
 
             guidBasin = (FFMPGuidanceBasin) monitor.getGraphGuidanceBasin(
-                    getProduct(), ffgGraphType, getSiteKey(), getDataKey(), null,
-                    oldestRefTime, FFMPRecord.ALL, basinPfaf);
+                    getProduct(), ffgGraphType, getSiteKey(), getDataKey(),
+                    null, oldestRefTime, FFMPRecord.ALL, basinPfaf);
             ArrayList<Double> guidTimes = new ArrayList<Double>();
             for (SourceXML ffgSource : getProduct().getGuidanceSourcesByType(
                     ffgGraphType)) {
@@ -3359,8 +3364,10 @@ public class FFMPResource extends
             fgd.setGuidanceTimes(guidTimes);
             guid = true;
         } catch (Exception e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "FFMPMonitor: getGraphData(): missing GUIDANCE dataset.", e);
+            statusHandler
+                    .handle(Priority.PROBLEM,
+                            "FFMPMonitor: getGraphData(): missing GUIDANCE dataset.",
+                            e);
         }
 
         if (fvgbmd != null) {
@@ -3388,7 +3395,8 @@ public class FFMPResource extends
             } catch (Exception e) {
                 statusHandler
                         .handle(Priority.PROBLEM,
-                                "FFMPMonitor: getGraphData(): missing VIRTUAL dataset.", e);
+                                "FFMPMonitor: getGraphData(): missing VIRTUAL dataset.",
+                                e);
             }
         }
 
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogDataGenerator.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogDataGenerator.java
old mode 100644
new mode 100755
index 630134bfbf..269ae3535f
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogDataGenerator.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogDataGenerator.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import com.raytheon.uf.common.dataplugin.fog.FogRecord;
 import com.raytheon.uf.common.dataplugin.fog.FogRecord.FOG_THREAT;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.viz.monitor.config.CommonTableConfig;
 import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType;
@@ -35,7 +36,6 @@ import com.raytheon.uf.viz.monitor.data.TableCellData;
 import com.raytheon.uf.viz.monitor.data.TableData;
 import com.raytheon.uf.viz.monitor.data.TableRowData;
 import com.raytheon.uf.viz.monitor.fog.threshold.FogThresholdMgr;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
 
 /**
  * Generate Data for Fog Dialogs
@@ -49,6 +49,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
  * 12/07/09                  dhladky    Initial Creation.
  * Oct.29, 2012 1297         skorolev   Changed HashMap to Map
  * Oct.31, 2012 1297         skorolev   Clean code
+ * Dec 26, 2015 5114         skorolev   Corrected imports.
  * 
  * </pre>
  * 
@@ -58,9 +59,9 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
 
 public class FogDataGenerator {
 
-    private CommonTableConfig ctc;
+    private final CommonTableConfig ctc;
 
-    private FogThresholdMgr ftm;
+    private final FogThresholdMgr ftm;
 
     /**
      * Generates Fog data
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
index 33a66a8e5a..90a5b60aca 100755
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/FogMonitor.java
@@ -38,8 +38,8 @@ import com.raytheon.uf.common.dataplugin.fog.FogRecord.FOG_THREAT;
 import com.raytheon.uf.common.jms.notification.NotificationMessage;
 import com.raytheon.uf.common.monitor.MonitorAreaUtils;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -89,6 +89,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * Mar 09, 2014 3888       dhladky     Stopped processing when dialogs are null or disposed.
  * Sep 18, 2015 3873       skorolev    Removed common definitions. Replaced deprecated NotificationMessage.
  * Dec 17, 2015 3873       dhladky     Abstracted handling of dialogTime and Zone dialog events.
+ * Jan 04, 2016 5115       skorolev    Corrected imports and replaced Mon.Name with App.Name.
  * 
  * 
  * </pre>
@@ -143,7 +144,7 @@ public class FogMonitor extends ObsMonitor implements IFogResourceListener {
      */
     private FogMonitor() {
         pluginPatterns.add(fssPattern);
-        fogConfig = FSSObsMonitorConfigurationManager.getInstance(MonName.fog);
+        fogConfig = FSSObsMonitorConfigurationManager.getInstance(AppName.FOG);
         updateMonitoringArea();
         initObserver(OBS, this);
         createDataStructures();
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/threshold/FogThresholdMgr.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/threshold/FogThresholdMgr.java
index 9a69ffa15a..2f4700df09 100755
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/threshold/FogThresholdMgr.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/threshold/FogThresholdMgr.java
@@ -22,10 +22,10 @@ package com.raytheon.uf.viz.monitor.fog.threshold;
 import java.util.ArrayList;
 
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.FogDisplay;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.FogMonitor;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.FogDisplay;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.FogMonitor;
 
 /**
  * This class manages the FOG thresholds for display and monitor.
@@ -41,6 +41,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.FogMonitor;
  * May 20, 2014  3086      skorolev     Cleaned code.
  * Sep 04, 2014  3220      skorolev     Removed "site".
  * Sep 18, 2015  3873      skorolev     Adjusted to AppName and removed areaConfigMgr.
+ * Dec 26, 2015  5114      skorolev     Corrected imports.
  * 
  * </pre>
  * 
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayMeteoTab.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayMeteoTab.java
old mode 100644
new mode 100755
index fa82e77f92..271af0a2ed
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayMeteoTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayMeteoTab.java
@@ -29,14 +29,14 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.FogDisplay;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.data.RangesUtil;
 import com.raytheon.uf.viz.monitor.fog.threshold.FogDisplayMeteoData;
 import com.raytheon.uf.viz.monitor.fog.threshold.FogThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.FogDisplay;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
 /**
  * Fog Display Meteo Table.
@@ -48,6 +48,7 @@ import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 21, 2014 3086       skorolev    Cleaned code
+ * Dec 26, 2015 5114       skorolev    Corrected imports.
  * 
  * </pre>
  * 
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayWindTab.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayWindTab.java
old mode 100644
new mode 100755
index bcd0a58828..c4337ff67d
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayWindTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayWindTab.java
@@ -28,289 +28,308 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.FogDisplay;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.fog.threshold.FogDisplayWindData;
 import com.raytheon.uf.viz.monitor.fog.threshold.FogThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.FogDisplay;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
-public class FogDisplayWindTab extends TabItemComp implements IUpdateDisplayWind
-{
+/**
+ * Fog Display Wind Table.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 26, 2015 5115       skorolev    Corrected imports.
+ * 
+ * </pre>
+ * 
+ * @author skorolev
+ * @version 1.0
+ */
+public class FogDisplayWindTab extends TabItemComp implements
+        IUpdateDisplayWind {
     /**
      * Dialog used for editing the FOG display wind data.
      */
     private FogDisplayWindEditDlg fogWindEditDlg;
-    
+
     private ArrayList<String> areaIDArray;
-    
+
     private ArrayList<FogDisplayWindData> fogDataArray;
-    
-    public FogDisplayWindTab(TabFolder parent, DataUsageKey duKey)
-    {
+
+    public FogDisplayWindTab(TabFolder parent, DataUsageKey duKey) {
         super(parent, duKey);
     }
 
-    @Override    
-    protected void createListHeader(Composite parentComp)
-    {
+    @Override
+    protected void createListHeader(Composite parentComp) {
         Composite lblComp = new Composite(parentComp, SWT.NONE);
         GridLayout gl = new GridLayout(5, false);
-        gl.horizontalSpacing = 0;   
+        gl.horizontalSpacing = 0;
         gl.marginHeight = 0;
         gl.marginWidth = 0;
         lblComp.setLayout(gl);
-        
+
         /*
          * Create filler label.
          */
         GridData gd = new GridData(73, SWT.DEFAULT);
         Label fillerLbl = new Label(lblComp, SWT.CENTER);
         fillerLbl.setLayoutData(gd);
-        
+
         /*
          * Wind
          */
         Composite windComp = createGroupComposite(lblComp, 5, null);
-        createLabelComp(windComp, "Wind", "Speed(kt)", false);        
-        createLabelComp(windComp, "Peak", "Wind(kt)", false);   
+        createLabelComp(windComp, "Wind", "Speed(kt)", false);
+        createLabelComp(windComp, "Peak", "Wind(kt)", false);
         createLabelComp(windComp, "Gust", "Speed(kt)", false);
         createLabelComp(windComp, "Wind", "Dir(deg)\n(from)", false);
         createLabelComp(windComp, "Wind", "Dir(deg)\n(to)", false);
-    }    
-    
+    }
+
     /*
      * TODO: redo...
      */
-    protected void populateList()
-    {        
-        if (fogDataArray == null)
-        {
+    @Override
+    protected void populateList() {
+        if (fogDataArray == null) {
             createDataArray();
         }
-        
+
         boolean update = false;
-        if (dataList.getItemCount() > 0)
-        {
+        if (dataList.getItemCount() > 0) {
             update = true;
         }
-        
+
         areaIDArray = new ArrayList<String>();
-        
+
         String currentAreaID;
-        
-        StringBuilder sb = null;       
+
+        StringBuilder sb = null;
         FogDisplayWindData fdwd = null;
-        
-        for (int i = 0; i < fogDataArray.size(); i++)
-        {
+
+        for (int i = 0; i < fogDataArray.size(); i++) {
             sb = new StringBuilder();
-         
+
             fdwd = fogDataArray.get(i);
-            
+
             currentAreaID = fdwd.getAreaID();
             areaIDArray.add(currentAreaID);
-            
+
             sb.append(String.format(areaIdFmt, currentAreaID));
-            
+
             /*
              * Wind Speed
              */
-            appendIntData(sb, fdwd.getWindWindSpeedR(), fdwd.getWindWindSpeedY());
-            
+            appendIntData(sb, fdwd.getWindWindSpeedR(),
+                    fdwd.getWindWindSpeedY());
+
             /*
              * Peak Wind
              */
             appendIntData(sb, fdwd.getWindPeakR(), fdwd.getWindPeakY());
-            
+
             /*
              * Gust Speed
              */
             appendIntData(sb, fdwd.getWindGustR(), fdwd.getWindGustY());
-            
+
             /*
              * Wind Direction: From
              */
-            appendIntData(sb, fdwd.getWindDirFromY(),fdwd.getWindDirFromR());
-            
+            appendIntData(sb, fdwd.getWindDirFromY(), fdwd.getWindDirFromR());
+
             /*
              * Wind Direction: To
              */
             appendIntData(sb, fdwd.getWindDirToR(), fdwd.getWindDirToY());
-            
+
             /*
              * Add the line of data to the list.
              */
             sb.append(" ");
-            
-            if (update == true)
-            {
+
+            if (update == true) {
                 dataList.setItem(i, sb.toString());
-            }
-            else
-            {
+            } else {
                 dataList.add(sb.toString());
-            } 
+            }
         }
-        
-        packListControls();        
+
+        packListControls();
     }
-    
-    private void createDataArray()
-    {
+
+    private void createDataArray() {
         fogDataArray = new ArrayList<FogDisplayWindData>();
-        
-        FogThresholdMgr ftm = FogThresholdMgr.getInstance();        
-        
+
+        FogThresholdMgr ftm = FogThresholdMgr.getInstance();
+
         String xmlKey;
-        String areaID;       
-        
+        String areaID;
+
         ThresholdsXML threshXML = ftm.getThresholdsXmlData(duKey);
-        
+
         ArrayList<AreaXML> areasArray = threshXML.getAreas();
-        
-        for (AreaXML area : areasArray)
-        {
+
+        for (AreaXML area : areasArray) {
             areaID = area.getAreaId();
             FogDisplayWindData fdwd = new FogDisplayWindData();
-            
+
             fdwd.setAreaID(areaID);
 
             /*
              * Wind Speed
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_WIND_SPEED.getXmlKey();
-            fdwd.setWindWindSpeedR(ftm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            fdwd.setWindWindSpeedY(ftm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
+            fdwd.setWindWindSpeedR(ftm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            fdwd.setWindWindSpeedY(ftm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
 
             /*
              * Peak Wind
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_PEAK_WIND.getXmlKey();
-            fdwd.setWindPeakR(ftm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            fdwd.setWindPeakY(ftm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
+            fdwd.setWindPeakR(ftm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            fdwd.setWindPeakY(ftm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
 
             /*
              * Gust Speed
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_GUST_SPEED.getXmlKey();
-            fdwd.setWindGustR(ftm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            fdwd.setWindGustY(ftm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
+            fdwd.setWindGustR(ftm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            fdwd.setWindGustY(ftm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
 
             /*
              * Wind Direction: From
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_DIR_FROM.getXmlKey();
-            fdwd.setWindDirFromR(ftm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            fdwd.setWindDirFromY(ftm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
+            fdwd.setWindDirFromR(ftm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            fdwd.setWindDirFromY(ftm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
 
             /*
              * Wind Direction: To
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_DIR_TO.getXmlKey();
-            fdwd.setWindDirToR(ftm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            fdwd.setWindDirToY(ftm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            fdwd.setWindDirToR(ftm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            fdwd.setWindDirToY(ftm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             fogDataArray.add(fdwd);
         }
     }
-    
-    private FogDisplayWindData getDataAtFirstSelection()
-    {
+
+    private FogDisplayWindData getDataAtFirstSelection() {
         int index = dataList.getSelectionIndex();
-        
-        return fogDataArray.get(index); 
+
+        return fogDataArray.get(index);
     }
-    
-    private void updateFogDataArray(FogDisplayWindData fdwd)
-    {        
-        int[] dataListIndexes = dataList.getSelectionIndices();        
+
+    private void updateFogDataArray(FogDisplayWindData fdwd) {
+        int[] dataListIndexes = dataList.getSelectionIndices();
         int currentIndex = 0;
-        
-        for (int i = 0; i < dataListIndexes.length; i++)
-        {
+
+        for (int i = 0; i < dataListIndexes.length; i++) {
             currentIndex = dataListIndexes[i];
-            
+
             fogDataArray.get(currentIndex).updateData(fdwd);
-        }        
+        }
     }
-    
+
     @Override
-    public void commitDataToXML()
-    {
+    public void commitDataToXML() {
         FogThresholdMgr ftm = FogThresholdMgr.getInstance();
-        
+
         String xmlKey;
         String areaID;
-        
-        for (FogDisplayWindData fdwd : fogDataArray)
-        {
+
+        for (FogDisplayWindData fdwd : fogDataArray) {
             areaID = fdwd.getAreaID();
-            
+
             /*
              * Wind Speed
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_WIND_SPEED.getXmlKey();
-            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, fdwd.getWindWindSpeedR());
-            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, fdwd.getWindWindSpeedY());
+            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    fdwd.getWindWindSpeedR());
+            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    fdwd.getWindWindSpeedY());
 
             /*
              * Peak Wind
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_PEAK_WIND.getXmlKey();
-            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, fdwd.getWindPeakR());
-            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, fdwd.getWindPeakY());
+            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    fdwd.getWindPeakR());
+            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    fdwd.getWindPeakY());
 
             /*
              * Gust Speed
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_GUST_SPEED.getXmlKey();
-            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, fdwd.getWindGustR());
-            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, fdwd.getWindGustY());
+            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    fdwd.getWindGustR());
+            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    fdwd.getWindGustY());
 
             /*
              * Wind Direction: From
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_DIR_FROM.getXmlKey();
-            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, fdwd.getWindDirFromR());
-            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, fdwd.getWindDirFromY());
+            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    fdwd.getWindDirFromR());
+            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    fdwd.getWindDirFromY());
 
             /*
              * Wind Direction: To
              */
             xmlKey = FogDisplay.FOG_DISP_WIND_DIR_TO.getXmlKey();
-            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, fdwd.getWindDirToR());
-            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, fdwd.getWindDirToY());
+            ftm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    fdwd.getWindDirToR());
+            ftm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    fdwd.getWindDirToY());
         }
     }
-    
+
     @Override
-    public void reloadData()
-    {
+    public void reloadData() {
         dataList.removeAll();
         fogDataArray.clear();
         fogDataArray = null;
-        
+
         populateList();
     }
 
     @Override
-    protected void editDataAction()
-    {
+    protected void editDataAction() {
         FogDisplayWindData fdwd = getDataAtFirstSelection();
-        
-        if (fogWindEditDlg == null)
-        {
-            fogWindEditDlg = new FogDisplayWindEditDlg(getParent().getShell(), fdwd, this);
-            fogWindEditDlg.open();            
+
+        if (fogWindEditDlg == null) {
+            fogWindEditDlg = new FogDisplayWindEditDlg(getParent().getShell(),
+                    fdwd, this);
+            fogWindEditDlg.open();
             fogWindEditDlg = null;
         }
     }
 
     @Override
-    public void updateThresholdData(FogDisplayWindData fdwd)
-    {
+    public void updateThresholdData(FogDisplayWindData fdwd) {
         updateFogDataArray(fdwd);
         populateList();
     }
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitorMeteoTab.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitorMeteoTab.java
old mode 100644
new mode 100755
index 2ffc13567b..991099fa26
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitorMeteoTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitorMeteoTab.java
@@ -29,14 +29,14 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.FogMonitor;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.data.RangesUtil;
 import com.raytheon.uf.viz.monitor.fog.threshold.FogMonitorMeteoData;
 import com.raytheon.uf.viz.monitor.fog.threshold.FogThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.FogMonitor;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
 /**
  * Fog Monitor Meteo Table
@@ -48,6 +48,7 @@ import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- -------------
  * May 21, 2014 3086       skorolev    Cleaned code.
+ * Dec 26, 2015 5115       skorolev    Corrected imports
  * 
  * </pre>
  * 
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
index 86dd5d97e8..415a81526f 100755
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
@@ -27,7 +27,6 @@ import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
@@ -56,6 +55,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * Oct 27, 2014 3667       skorolev     Cleaned code.
  * Feb 10, 2015 3886       skorolev     Changed confirmation message.
  * Aug 17, 2015 3841       skorolev     Corrected handleOkBtnSelection.
+ * Jan 04, 2016 5115       skorolev     Replaced MonName with AppName.
  * 
  * </pre>
  * 
@@ -148,7 +148,7 @@ public class FogMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
     protected FSSObsMonitorConfigurationManager getInstance() {
         if (configMgr == null) {
             configMgr = FSSObsMonitorConfigurationManager
-                    .getInstance(MonName.fog);
+                    .getInstance(AppName.FOG);
         }
         return configMgr;
     }
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
index cd7cbaa301..ab7de7453d 100755
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
@@ -28,8 +28,8 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.common.monitor.data.ObConst.DisplayVarName;
 import com.raytheon.uf.viz.monitor.IMonitor;
@@ -62,6 +62,7 @@ import com.raytheon.uf.viz.monitor.ui.dialogs.ZoneTableDlg;
  * Sep 04, 2014 3220       skorolev    Removed "site". Added check on dispose.
  * Sep 18, 2015 3873       skorolev    Adjusted to AppName and MonName.
  * Dec 17, 2015 3873       dhladky     Abstracted handling of dialogTime and Zone dialog events.
+ * Jan 04, 2015 5115       skorolev    Corrected imports and replaced AppName with MonName.
  * 
  * </pre>
  * 
@@ -195,6 +196,7 @@ public class FogZoneTableDlg extends ZoneTableDlg {
     @Override
     public void fireDialogShutdown(IMonitorListener iml) {
         Display.getDefault().asyncExec(new Runnable() {
+            @Override
             public void run() {
                 Iterator<IMonitor> iter = getMonitorControlListeners()
                         .iterator();
@@ -215,6 +217,7 @@ public class FogZoneTableDlg extends ZoneTableDlg {
     @Override
     public void fireKillMonitor() {
         Display.getDefault().asyncExec(new Runnable() {
+            @Override
             public void run() {
                 Iterator<IMonitor> iter = getMonitorControlListeners()
                         .iterator();
@@ -281,7 +284,7 @@ public class FogZoneTableDlg extends ZoneTableDlg {
     protected FSSObsMonitorConfigurationManager getMonitorAreaConfigInstance() {
         if (configMgr == null || configMgr.isPopulated()) {
             configMgr = FSSObsMonitorConfigurationManager
-                    .getInstance(MonName.fog);
+                    .getInstance(AppName.FOG);
         }
         return configMgr;
     }
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/resource/FogResource.java b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/resource/FogResource.java
index 16c71cff3f..4998869637 100644
--- a/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/resource/FogResource.java
+++ b/cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/resource/FogResource.java
@@ -75,6 +75,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  *    16Jun2012    14386       zhao       Fixed a bug causing auto update to fail; 
  *                                        also modified to keep only latest Fog record for each frame.
  *    29Jul2014    3465        mapeters   Updated deprecated drawString() calls.
+ *    05Nov2015    5070        randerso   Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author dhladky
@@ -112,7 +114,7 @@ public class FogResource extends
     private static float[] fogLabelValues = new float[] { 60.0f, 110.0f, 220.0f };
 
     private GriddedImageDisplay gridDisplay = null;
-    
+
     private Date refHour;
 
     /* The font used */
@@ -142,8 +144,7 @@ public class FogResource extends
         if (record == null) {
             return "No Fog Data Available";
         }
-        return "Fog Threat Level "
-                + record.getDataTime().getLegendString();
+        return "Fog Threat Level " + record.getDataTime().getLegendString();
     }
 
     @Override
@@ -167,20 +168,27 @@ public class FogResource extends
         if (!resourceData.dataObjectMap.containsKey(rh)) {
             try {
                 record = resourceData.populateRecord(pdo);
-                resourceData.dataObjectMap.put(record.getRefHour().getTime(), record);
-                resourceData.gridImageMap.put(record.getRefHour().getTime(), null);
+                resourceData.dataObjectMap.put(record.getRefHour().getTime(),
+                        record);
+                resourceData.gridImageMap.put(record.getRefHour().getTime(),
+                        null);
             } catch (VizException e) {
-                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
+                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
+                        e);
             }
-        } else if ( resourceData.dataObjectMap.containsKey(rh) ) {
-        	try {
-        		record = resourceData.populateRecord(pdo);
-        		resourceData.dataObjectMap.remove(record.getRefHour().getTime());
-                resourceData.dataObjectMap.put(record.getRefHour().getTime(), record);
+        } else if (resourceData.dataObjectMap.containsKey(rh)) {
+            try {
+                record = resourceData.populateRecord(pdo);
+                resourceData.dataObjectMap
+                        .remove(record.getRefHour().getTime());
+                resourceData.dataObjectMap.put(record.getRefHour().getTime(),
+                        record);
                 resourceData.gridImageMap.remove(record.getRefHour().getTime());
-                resourceData.gridImageMap.put(record.getRefHour().getTime(), null);
-        	} catch (VizException e) {
-                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
+                resourceData.gridImageMap.put(record.getRefHour().getTime(),
+                        null);
+            } catch (VizException e) {
+                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
+                        e);
             }
         }
     }
@@ -206,7 +214,7 @@ public class FogResource extends
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
         if (this.font == null) {
-            this.font = target.initializeFont("Dialog", 11, null);
+            this.font = target.initializeFont("Dialog", 9, null);
         }
     }
 
@@ -224,8 +232,11 @@ public class FogResource extends
         }
         this.record = resourceData.dataObjectMap.get(refHour);
         if (record != null) {
-            if(record.getThreats()== null) needsUpdate=true;
-            if (resourceData.gridImageMap.get(refHour) != null && needsUpdate==false) {
+            if (record.getThreats() == null) {
+                needsUpdate = true;
+            }
+            if (resourceData.gridImageMap.get(refHour) != null
+                    && needsUpdate == false) {
                 gridDisplay = resourceData.gridImageMap.get(refHour);
             } else {
                 if (needsUpdate) {
@@ -235,7 +246,7 @@ public class FogResource extends
                 gridDisplay = new GriddedImageDisplay(FloatBuffer.wrap(record
                         .getThreats()), descriptor, record.getGridGeometry());
                 resourceData.gridImageMap.put(refHour, gridDisplay);
-                needsUpdate=false;
+                needsUpdate = false;
             }
         }
         if (!refHour.equals(previousDataTime)) {
@@ -309,21 +320,21 @@ public class FogResource extends
             } catch (org.opengis.referencing.operation.TransformException e) {
                 e.printStackTrace();
             }
-            int select = (int) ((record.getNx() * (int) coor.y) + (int) coor.x);
+            int select = (record.getNx() * (int) coor.y) + (int) coor.x;
 
             if (select < record.getNx() * record.getNy() && select > 0
                     && coor.x > 0 && coor.x < record.getNx()) {
                 inspect = "VIS value: "
-                        + record.getVisArray()[(int) (record.getNx() * (int) coor.y)
+                        + record.getVisArray()[record.getNx() * (int) coor.y
                                 + (int) coor.x]
                         + "\n"
                         + " IR 3.9 value: "
-                        + record.getIR_3_9Array()[(int) (record.getNx() * (int) coor.y)
+                        + record.getIR_3_9Array()[record.getNx() * (int) coor.y
                                 + (int) coor.x]
                         + "\n"
                         + " IR 10.7 value: "
-                        + record.getIR_10_7Array()[(int) (record.getNx() * (int) coor.y)
-                                + (int) coor.x] + "\n";
+                        + record.getIR_10_7Array()[record.getNx()
+                                * (int) coor.y + (int) coor.x] + "\n";
             } else {
                 inspect = "NO DATA";
             }
@@ -416,15 +427,15 @@ public class FogResource extends
         monitor.closeDialog();
 
     }
-    
+
     @Override
     public void project(CoordinateReferenceSystem crs) throws VizException {
-            if (record != null) {
-                record.setGridGeometry2D(null);
-                resourceData.resetGridImgMap();
-                needsUpdate = false;
-                issueRefresh();
-            }
+        if (record != null) {
+            record.setGridGeometry2D(null);
+            resourceData.resetGridImgMap();
+            needsUpdate = false;
+            issueRefresh();
+        }
     }
 
 }
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.monitor.safeseas/META-INF/MANIFEST.MF
index f79bfc979d..f69d83b57a 100644
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Safeseas Plug-in
 Bundle-SymbolicName: com.raytheon.uf.viz.monitor.safeseas;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -20,7 +20,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.uf.viz.monitor.fog;bundle-version="1.12.1174"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
-Import-Package: com.raytheon.viz.pointdata,
- org.apache.commons.lang
+Import-Package: com.raytheon.viz.pointdata
 Export-Package: com.raytheon.uf.viz.monitor.safeseas.resources
 Bundle-ClassPath: com.raytheon.uf.viz.monitor.safeseas.jar
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
old mode 100755
new mode 100644
index a22a284705..f67492628c
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/SafeSeasMonitor.java
@@ -35,8 +35,8 @@ import com.raytheon.uf.common.dataplugin.fog.FogRecord.FOG_THREAT;
 import com.raytheon.uf.common.jms.notification.NotificationMessage;
 import com.raytheon.uf.common.monitor.MonitorAreaUtils;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -84,9 +84,9 @@ import com.vividsolutions.jts.geom.Geometry;
  * Apr 28, 2014 3086       skorolev    Removed local getMonitorAreaConfig method.
  * Sep 04, 2014 3220       skorolev    Updated configUpdate method and added updateMonitoringArea.
  * Sep 18, 2015 3873       skorolev    Removed common definitions. Replaced deprecated NotificationMessage.
- * Oct 19, 2015 3841       skorolev    Corrected constructor.
  * Oct 21, 2015 3873       dhladky     Get Obs load off UI thread.
  * Dec 17, 2015 3873       dhladky     Abstracted handling of dialogTime and Zone dialog events.
+ * Jan 04, 2016 5115       skorolev    Corrected imports and replaced AppName with MonName.
  * 
  * </pre>
  * 
@@ -144,12 +144,11 @@ public class SafeSeasMonitor extends ObsMonitor implements ISSResourceListener {
     private SafeSeasMonitor() {
         pluginPatterns.add(fssPattern);
         ssAreaConfig = FSSObsMonitorConfigurationManager
-                .getInstance(MonName.ss);
+                .getInstance(AppName.SAFESEAS);
         updateMonitoringArea();
         initObserver(OBS, this);
         createDataStructures();
         processProductAtStartup();
-        obData.getZoneTableData();
         readTableConfig(MonitorThresholdConfiguration.SAFESEAS_THRESHOLD_CONFIG);
     }
 
@@ -183,6 +182,7 @@ public class SafeSeasMonitor extends ObsMonitor implements ISSResourceListener {
     private void createDataStructures() {
         obData = new ObMultiHrsReports(CommonConfig.AppName.SAFESEAS);
         obData.setThresholdMgr(SSThresholdMgr.getInstance());
+        obData.getZoneTableData();
         algorithmData = new HashMap<Date, Map<String, FOG_THREAT>>();
     }
 
@@ -607,5 +607,5 @@ public class SafeSeasMonitor extends ObsMonitor implements ISSResourceListener {
         }
         MonitoringArea.setPlatformMap(zones);
     }
-    
+
 }
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/threshold/SSThresholdMgr.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/threshold/SSThresholdMgr.java
index ef15925e32..900f4dafaf 100755
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/threshold/SSThresholdMgr.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/threshold/SSThresholdMgr.java
@@ -22,10 +22,10 @@ package com.raytheon.uf.viz.monitor.safeseas.threshold;
 import java.util.ArrayList;
 
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SafeSeasDisplay;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SafeSeasMonitor;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SafeSeasDisplay;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SafeSeasMonitor;
 
 /**
  * This class manages the SafeSeas thresholds for display and monitor.
@@ -41,6 +41,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SafeSeasMonitor;
  * Apr 28, 2014  3086      skorolev     Removed local getMonitorAreaConfig method.
  * Sep 04, 2014  3220      skorolev     Removed "site".
  * Sep 18, 2015  3873      skorolev     Adjusted to AppName and removed areaConfigMgr.
+ * Dec 26, 2015  5114      skorolev     Corrected imports.
  * 
  * </pre>
  * 
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayMeteoTab.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayMeteoTab.java
old mode 100644
new mode 100755
index ff66e05789..ee5215835b
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayMeteoTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayMeteoTab.java
@@ -29,14 +29,14 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SafeSeasDisplay;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.data.RangesUtil;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSDisplayMeteoData;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SafeSeasDisplay;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
 /**
  * SAFESEAS Display Meteo Table
@@ -48,6 +48,7 @@ import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 21, 2014 3086       skorolev    Cleaned code
+ * Dec 26, 2015 5114       skorolev    Corrected imports.
  * 
  * </pre>
  * 
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayProductTab.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayProductTab.java
old mode 100644
new mode 100755
index f7314482c9..7a63b1cf7b
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayProductTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayProductTab.java
@@ -28,375 +28,437 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SafeSeasDisplay;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSDisplayProductData;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SafeSeasDisplay;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
-public class SSDisplayProductTab extends TabItemComp implements IUpdateDisplayProduct
-{
+/**
+ * SAFESEAS Display Product Table.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 26, 2015 5115       skorolev    Corrected imports.
+ * 
+ * </pre>
+ * 
+ * @author skorolev
+ * @version 1.0
+ */
+public class SSDisplayProductTab extends TabItemComp implements
+        IUpdateDisplayProduct {
     SSDisplayProductEditDlg productEditDlg;
-    
+
     private ArrayList<String> areaIDArray;
-    
+
     private ArrayList<SSDisplayProductData> ssDataArray;
-    
-    public SSDisplayProductTab(TabFolder parent, DataUsageKey duKey)
-    {
+
+    public SSDisplayProductTab(TabFolder parent, DataUsageKey duKey) {
         super(parent, duKey);
     }
 
-    @Override    
-    protected void createListHeader(Composite parentComp)
-    {
+    @Override
+    protected void createListHeader(Composite parentComp) {
         Composite lblComp = new Composite(parentComp, SWT.NONE);
         GridLayout gl = new GridLayout(5, false);
-        gl.horizontalSpacing = 0;   
+        gl.horizontalSpacing = 0;
         gl.marginHeight = 0;
         gl.marginWidth = 0;
         lblComp.setLayout(gl);
-        
+
         /*
          * Create filler label.
          */
         GridData gd = new GridData(75, SWT.DEFAULT);
         Label fillerLbl = new Label(lblComp, SWT.CENTER);
         fillerLbl.setLayoutData(gd);
-        
+
         /*
          * Small AirCraft Warning
          */
-        Composite smallAircraftComp = createGroupComposite(lblComp, 4, "Small Craft Advisory");        
+        Composite smallAircraftComp = createGroupComposite(lblComp, 4,
+                "Small Craft Advisory");
         createLabelComp(smallAircraftComp, "Wind", "Speed(kt)", false);
         createLabelComp(smallAircraftComp, "Gust", "Speed(kt)", false);
-        createLabelComp(smallAircraftComp, "Peak", "Wind(kt)", false);    
+        createLabelComp(smallAircraftComp, "Peak", "Wind(kt)", false);
         createLabelComp(smallAircraftComp, "Wave", "Height(ft)", false);
-        
+
         /*
          * Gale Warning
          */
-        Composite galeWarningComp = createGroupComposite(lblComp, 3, "Gale Warning");        
+        Composite galeWarningComp = createGroupComposite(lblComp, 3,
+                "Gale Warning");
         createLabelComp(galeWarningComp, "Wind", "Speed(kt)", false);
         createLabelComp(galeWarningComp, "Gust", "Speed(kt)", false);
-        createLabelComp(galeWarningComp, "Peak", "Wind(kt)", false); 
-        
+        createLabelComp(galeWarningComp, "Peak", "Wind(kt)", false);
+
         /*
          * Storm Warning
          */
-        Composite stormWarningComp = createGroupComposite(lblComp, 3, "Storm Warning");        
+        Composite stormWarningComp = createGroupComposite(lblComp, 3,
+                "Storm Warning");
         createLabelComp(stormWarningComp, "Wind", "Speed(kt)", false);
         createLabelComp(stormWarningComp, "Gust", "Speed(kt)", false);
-        createLabelComp(stormWarningComp, "Peak", "Wind(kt)", false); 
-        
+        createLabelComp(stormWarningComp, "Peak", "Wind(kt)", false);
+
         /*
          * HFWW (Hurricane Force Wind Warning)
          */
-        Composite hfwwComp = createGroupComposite(lblComp, 3, "HFWW");        
+        Composite hfwwComp = createGroupComposite(lblComp, 3, "HFWW");
         createLabelComp(hfwwComp, "Wind", "Speed(kt)", false);
         createLabelComp(hfwwComp, "Gust", "Speed(kt)", false);
-        createLabelComp(hfwwComp, "Peak", "Wind(kt)", false); 
-    }    
-    
+        createLabelComp(hfwwComp, "Peak", "Wind(kt)", false);
+    }
+
     @Override
-    protected void populateList()
-    {   
-        if (ssDataArray == null)
-        {
+    protected void populateList() {
+        if (ssDataArray == null) {
             createDataArray();
         }
-        
+
         boolean update = false;
-        if (dataList.getItemCount() > 0)
-        {
+        if (dataList.getItemCount() > 0) {
             update = true;
         }
-        
+
         areaIDArray = new ArrayList<String>();
-        
+
         String currentAreaID;
-        
-        StringBuilder sb = null;       
+
+        StringBuilder sb = null;
         SSDisplayProductData ssdpd = null;
-        
-        for (int i = 0; i < ssDataArray.size(); i++)
-        {
+
+        for (int i = 0; i < ssDataArray.size(); i++) {
             sb = new StringBuilder();
-            
+
             ssdpd = ssDataArray.get(i);
-            
+
             currentAreaID = ssdpd.getAreaID();
             areaIDArray.add(currentAreaID);
-            
+
             sb.append(String.format(areaIdFmt, currentAreaID));
-            
+
             /*
              * Small Craft Advisory
              */
-            appendIntData(sb, ssdpd.getScaWindSpeedR(), ssdpd.getScaWindSpeedY());
-            appendIntData(sb, ssdpd.getScaGustSpeedR(), ssdpd.getScaGustSpeedY());
+            appendIntData(sb, ssdpd.getScaWindSpeedR(),
+                    ssdpd.getScaWindSpeedY());
+            appendIntData(sb, ssdpd.getScaGustSpeedR(),
+                    ssdpd.getScaGustSpeedY());
             appendIntData(sb, ssdpd.getScaPeakWindR(), ssdpd.getScaPeakWindY());
             appendIntData(sb, ssdpd.getScaWaveHgtR(), ssdpd.getScaWaveHgtY());
-            
+
             /*
              * Gale Warning
              */
-            appendIntData(sb, ssdpd.getGaleWindSpeedR(), ssdpd.getGaleWindSpeedY());
-            appendIntData(sb, ssdpd.getGaleGustSpeedR(), ssdpd.getGaleGustSpeedY());
-            appendIntData(sb, ssdpd.getGalePeakWindR(), ssdpd.getGalePeakWindY());
-            
+            appendIntData(sb, ssdpd.getGaleWindSpeedR(),
+                    ssdpd.getGaleWindSpeedY());
+            appendIntData(sb, ssdpd.getGaleGustSpeedR(),
+                    ssdpd.getGaleGustSpeedY());
+            appendIntData(sb, ssdpd.getGalePeakWindR(),
+                    ssdpd.getGalePeakWindY());
+
             /*
              * Storm Warning
              */
-            appendIntData(sb, ssdpd.getStormWrnWindSpeedR(), ssdpd.getStormWrnWindSpeedY());
-            appendIntData(sb, ssdpd.getStormWrnGustSpeedR(), ssdpd.getStormWrnGustSpeedY());
-            appendIntData(sb, ssdpd.getStormWrnPeakWindR(), ssdpd.getStormWrnPeakWindY());
-            
+            appendIntData(sb, ssdpd.getStormWrnWindSpeedR(),
+                    ssdpd.getStormWrnWindSpeedY());
+            appendIntData(sb, ssdpd.getStormWrnGustSpeedR(),
+                    ssdpd.getStormWrnGustSpeedY());
+            appendIntData(sb, ssdpd.getStormWrnPeakWindR(),
+                    ssdpd.getStormWrnPeakWindY());
+
             /*
              * HFWW
              */
-            appendIntData(sb, ssdpd.getHfwwWindSpeedR(), ssdpd.getHfwwWindSpeedY());
-            appendIntData(sb, ssdpd.getHfwwGustSpeedR(), ssdpd.getHfwwGustSpeedY());
-            appendIntData(sb, ssdpd.getHfwwPeakWindR(), ssdpd.getHfwwPeakWindY());
-            
+            appendIntData(sb, ssdpd.getHfwwWindSpeedR(),
+                    ssdpd.getHfwwWindSpeedY());
+            appendIntData(sb, ssdpd.getHfwwGustSpeedR(),
+                    ssdpd.getHfwwGustSpeedY());
+            appendIntData(sb, ssdpd.getHfwwPeakWindR(),
+                    ssdpd.getHfwwPeakWindY());
+
             /*
              * Append a space and add the data line to the list.
              */
             sb.append(" ");
-            
-            if (update == true)
-            {
+
+            if (update == true) {
                 dataList.setItem(i, sb.toString());
-            }
-            else
-            {
+            } else {
                 dataList.add(sb.toString());
-            }            
+            }
         }
-        
+
         packListControls();
     }
-    
-    private void createDataArray()
-    {
+
+    private void createDataArray() {
         ssDataArray = new ArrayList<SSDisplayProductData>();
-        
-        SSThresholdMgr sstm = SSThresholdMgr.getInstance();   
-        
+
+        SSThresholdMgr sstm = SSThresholdMgr.getInstance();
+
         String xmlKey;
-        String areaID;       
-        
+        String areaID;
+
         ThresholdsXML threshXML = sstm.getThresholdsXmlData(duKey);
-        
+
         ArrayList<AreaXML> areasArray = threshXML.getAreas();
-        
-        for (AreaXML area : areasArray)
-        {
+
+        for (AreaXML area : areasArray) {
             areaID = area.getAreaId();
             SSDisplayProductData ssdpd = new SSDisplayProductData();
-            
+
             ssdpd.setAreaID(areaID);
 
             /*
              * Small Craft Advisory
              */
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_SCA_WIND_SPEED.getXmlKey();
-            ssdpd.setScaWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setScaWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setScaWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setScaWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_SCA_GUST_SPEED.getXmlKey();
-            ssdpd.setScaGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setScaGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setScaGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setScaGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_SCA_PEAK_WIND.getXmlKey();
-            ssdpd.setScaPeakWindR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setScaPeakWindY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setScaPeakWindR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setScaPeakWindY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_SCA_WAVE_HT.getXmlKey();
-            ssdpd.setScaWaveHgtR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setScaWaveHgtY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setScaWaveHgtR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setScaWaveHgtY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Gale Warning
              */
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_GALE_WIND_SPEED.getXmlKey();
-            ssdpd.setGaleWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setGaleWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setGaleWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setGaleWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_GALE_GUST_SPEED.getXmlKey();
-            ssdpd.setGaleGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setGaleGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setGaleGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setGaleGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_GALE_PEAK_WIND.getXmlKey();
-            ssdpd.setGalePeakWindR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setGalePeakWindY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setGalePeakWindR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setGalePeakWindY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Storm Warning
              */
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_STORM_WIND_SPEED.getXmlKey();
-            ssdpd.setStormWrnWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setStormWrnWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setStormWrnWindSpeedR(sstm.getThresholdValue(duKey,
+                    threshKeyR, areaID, xmlKey));
+            ssdpd.setStormWrnWindSpeedY(sstm.getThresholdValue(duKey,
+                    threshKeyY, areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_STORM_GUST_SPEED.getXmlKey();
-            ssdpd.setStormWrnGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setStormWrnGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setStormWrnGustSpeedR(sstm.getThresholdValue(duKey,
+                    threshKeyR, areaID, xmlKey));
+            ssdpd.setStormWrnGustSpeedY(sstm.getThresholdValue(duKey,
+                    threshKeyY, areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_STORM_PEAK_WIND.getXmlKey();
-            ssdpd.setStormWrnPeakWindR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setStormWrnPeakWindY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setStormWrnPeakWindR(sstm.getThresholdValue(duKey,
+                    threshKeyR, areaID, xmlKey));
+            ssdpd.setStormWrnPeakWindY(sstm.getThresholdValue(duKey,
+                    threshKeyY, areaID, xmlKey));
+
             /*
              * HFWW
              */
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_HFWW_WIND_SPEED.getXmlKey();
-            ssdpd.setHfwwWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setHfwwWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setHfwwWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setHfwwWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_HFWW_GUST_SPEED.getXmlKey();
-            ssdpd.setHfwwGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setHfwwGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssdpd.setHfwwGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setHfwwGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_HFWW_PEAK_WIND.getXmlKey();
-            ssdpd.setHfwwPeakWindR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdpd.setHfwwPeakWindY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));     
-            
+            ssdpd.setHfwwPeakWindR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdpd.setHfwwPeakWindY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Add data to the array.
              */
             ssDataArray.add(ssdpd);
         }
     }
-    
-    private SSDisplayProductData getDataAtFirstSelection()
-    {        
+
+    private SSDisplayProductData getDataAtFirstSelection() {
         int index = dataList.getSelectionIndex();
-        
-        return ssDataArray.get(index);        
+
+        return ssDataArray.get(index);
     }
-    
-    private void updateDataArray(SSDisplayProductData ssdpd)
-    {        
-        int[] dataListIndexes = dataList.getSelectionIndices();        
+
+    private void updateDataArray(SSDisplayProductData ssdpd) {
+        int[] dataListIndexes = dataList.getSelectionIndices();
         int currentIndex = 0;
-        
-        for (int i = 0; i < dataListIndexes.length; i++)
-        {
+
+        for (int i = 0; i < dataListIndexes.length; i++) {
             currentIndex = dataListIndexes[i];
-            
+
             ssDataArray.get(currentIndex).updateData(ssdpd);
-        }        
-    }   
-    
+        }
+    }
+
     @Override
-    public void commitDataToXML()
-    {
+    public void commitDataToXML() {
         SSThresholdMgr stm = SSThresholdMgr.getInstance();
-        
+
         String xmlKey;
         String areaID;
-        
-        for (SSDisplayProductData ssdpd : ssDataArray)
-        {
+
+        for (SSDisplayProductData ssdpd : ssDataArray) {
             areaID = ssdpd.getAreaID();
-            
+
             /*
              * Small Craft Advisory
              */
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_SCA_WIND_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getScaWindSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getScaWindSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getScaWindSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getScaWindSpeedY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_SCA_GUST_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getScaGustSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getScaGustSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getScaGustSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getScaGustSpeedY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_SCA_PEAK_WIND.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getScaPeakWindR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getScaPeakWindY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getScaPeakWindR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getScaPeakWindY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_SCA_WAVE_HT.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getScaWaveHgtR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getScaWaveHgtY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getScaWaveHgtR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getScaWaveHgtY());
+
             /*
              * Gale Warning
              */
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_GALE_WIND_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getGaleWindSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getGaleWindSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getGaleWindSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getGaleWindSpeedY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_GALE_GUST_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getGaleGustSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getGaleGustSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getGaleGustSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getGaleGustSpeedY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_GALE_PEAK_WIND.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getGalePeakWindR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getGalePeakWindY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getGalePeakWindR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getGalePeakWindY());
+
             /*
              * Storm Warning
              */
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_STORM_WIND_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getStormWrnWindSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getStormWrnWindSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getStormWrnWindSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getStormWrnWindSpeedY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_STORM_GUST_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getStormWrnGustSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getStormWrnGustSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getStormWrnGustSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getStormWrnGustSpeedY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_STORM_PEAK_WIND.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getStormWrnPeakWindR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getStormWrnPeakWindY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getStormWrnPeakWindR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getStormWrnPeakWindY());
+
             /*
              * HFWW
              */
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_HFWW_WIND_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getHfwwWindSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getHfwwWindSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getHfwwWindSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getHfwwWindSpeedY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_HFWW_GUST_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getHfwwGustSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getHfwwGustSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getHfwwGustSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getHfwwGustSpeedY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_PROD_HFWW_PEAK_WIND.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdpd.getHfwwPeakWindR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdpd.getHfwwPeakWindY());
-        }         
-    }   
-    
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdpd.getHfwwPeakWindR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdpd.getHfwwPeakWindY());
+        }
+    }
+
     @Override
-    public void reloadData()
-    {
+    public void reloadData() {
         dataList.removeAll();
         ssDataArray.clear();
         ssDataArray = null;
-        
+
         populateList();
     }
 
     @Override
-    protected void editDataAction()
-    {
+    protected void editDataAction() {
         SSDisplayProductData sspdp = getDataAtFirstSelection();
-        
-        if (productEditDlg == null)
-        {
-            productEditDlg = new SSDisplayProductEditDlg(getParent().getShell(), sspdp, this);
+
+        if (productEditDlg == null) {
+            productEditDlg = new SSDisplayProductEditDlg(
+                    getParent().getShell(), sspdp, this);
             productEditDlg.open();
             productEditDlg = null;
         }
     }
 
     @Override
-    public void updateThresholdData(SSDisplayProductData sspdp)
-    {
+    public void updateThresholdData(SSDisplayProductData sspdp) {
         updateDataArray(sspdp);
         populateList();
     }
 
-    
 }
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplaySwellTab.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplaySwellTab.java
old mode 100644
new mode 100755
index 6cabc17e8f..80893d8237
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplaySwellTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplaySwellTab.java
@@ -28,313 +28,357 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SafeSeasDisplay;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSDispMonSwellData;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SafeSeasDisplay;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
-public class SSDisplaySwellTab extends TabItemComp implements IUpdateDisplayMonitorSwell
-{
+/**
+ * SAFESEAS Display Swell Table.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 26, 2015 5115       skorolev    Corrected imports.
+ * 
+ * </pre>
+ * 
+ * @author skorolev
+ * @version 1.0
+ */
+public class SSDisplaySwellTab extends TabItemComp implements
+        IUpdateDisplayMonitorSwell {
     private SSDispMonSwellEditDlg displaySwellEditDlg;
-    
+
     private ArrayList<String> areaIDArray;
-    
+
     private ArrayList<SSDispMonSwellData> ssDataArray;
-    
-    public SSDisplaySwellTab(TabFolder parent, DataUsageKey duKey)
-    {
+
+    public SSDisplaySwellTab(TabFolder parent, DataUsageKey duKey) {
         super(parent, duKey, true);
     }
 
-    @Override    
-    protected void createListHeader(Composite parentComp)
-    {
+    @Override
+    protected void createListHeader(Composite parentComp) {
         Composite lblComp = new Composite(parentComp, SWT.NONE);
         GridLayout gl = new GridLayout(5, false);
-        gl.horizontalSpacing = 0;   
+        gl.horizontalSpacing = 0;
         gl.marginHeight = 0;
         gl.marginWidth = 0;
         lblComp.setLayout(gl);
-        
+
         /*
          * Create filler label.
          */
         GridData gd = new GridData(75, SWT.DEFAULT);
         Label fillerLbl = new Label(lblComp, SWT.CENTER);
         fillerLbl.setLayoutData(gd);
-        
+
         /*
          * Primary Swell
          */
-        Composite priSwellComp = createGroupComposite(lblComp, 4, "Primary Swell");
+        Composite priSwellComp = createGroupComposite(lblComp, 4,
+                "Primary Swell");
         createLabelComp(priSwellComp, "Height(ft)", "", false);
         createLabelComp(priSwellComp, "Periods(s)", "", false);
         createLabelComp(priSwellComp, "Dir(deg)", "(from)", false);
-        createLabelComp(priSwellComp, "Dir(deg)", "(to)", false);        
-        
+        createLabelComp(priSwellComp, "Dir(deg)", "(to)", false);
+
         /*
          * Secondary Swell
          */
-        Composite secSwellComp = createGroupComposite(lblComp, 4, "Secondary Swell");
+        Composite secSwellComp = createGroupComposite(lblComp, 4,
+                "Secondary Swell");
         createLabelComp(secSwellComp, "Height(ft)", "", false);
         createLabelComp(secSwellComp, "Periods(s)", "", false);
         createLabelComp(secSwellComp, "Dir(deg)", "(from)", false);
         createLabelComp(secSwellComp, "Dir(deg)", "(to)", false);
-    }    
-    
+    }
+
     @Override
-    protected void populateList()
-    {   
-        if (ssDataArray == null)
-        {
+    protected void populateList() {
+        if (ssDataArray == null) {
             createDataArray();
         }
-        
+
         boolean update = false;
-        if (dataList.getItemCount() > 0)
-        {
+        if (dataList.getItemCount() > 0) {
             update = true;
         }
-        
+
         areaIDArray = new ArrayList<String>();
-        
+
         String currentAreaID;
-        
-        StringBuilder sb = null;       
+
+        StringBuilder sb = null;
         SSDispMonSwellData sssd = null;
-        
-        for (int i = 0; i < ssDataArray.size(); i++)
-        {
+
+        for (int i = 0; i < ssDataArray.size(); i++) {
             sb = new StringBuilder();
-            
+
             sssd = ssDataArray.get(i);
-            
+
             currentAreaID = sssd.getAreaID();
             areaIDArray.add(currentAreaID);
-            
-            sb.append(String.format(areaIdFmt, currentAreaID));           
-            
+
+            sb.append(String.format(areaIdFmt, currentAreaID));
+
             /*
              * Primary Swell
              */
-            appendIntData(sb, sssd.getPriSwellHeightR(), sssd.getPriSwellHeightY());
-            
-            double higherThreshold = Math.max(sssd.getPriSwellPeriodR(), sssd.getPriSwellPeriodY());
-            double lowerThreshold = Math.min(sssd.getPriSwellPeriodR(), sssd.getPriSwellPeriodY()); 
-            if ( rankSwellPeriodHigh ) {
-            	sssd.setRankSwellPeriodHigh(true);
-            	sssd.setPriSwellPeriodR(higherThreshold);
-            	sssd.setPriSwellPeriodY(lowerThreshold);
+            appendIntData(sb, sssd.getPriSwellHeightR(),
+                    sssd.getPriSwellHeightY());
+
+            double higherThreshold = Math.max(sssd.getPriSwellPeriodR(),
+                    sssd.getPriSwellPeriodY());
+            double lowerThreshold = Math.min(sssd.getPriSwellPeriodR(),
+                    sssd.getPriSwellPeriodY());
+            if (rankSwellPeriodHigh) {
+                sssd.setRankSwellPeriodHigh(true);
+                sssd.setPriSwellPeriodR(higherThreshold);
+                sssd.setPriSwellPeriodY(lowerThreshold);
             } else {
-            	sssd.setRankSwellPeriodHigh(false);
-            	sssd.setPriSwellPeriodR(lowerThreshold);
-            	sssd.setPriSwellPeriodY(higherThreshold);
+                sssd.setRankSwellPeriodHigh(false);
+                sssd.setPriSwellPeriodR(lowerThreshold);
+                sssd.setPriSwellPeriodY(higherThreshold);
             }
-            appendIntData(sb, sssd.getPriSwellPeriodR(), sssd.getPriSwellPeriodY());
-            
-            appendIntData(sb, sssd.getPriSwellDirFromY(), sssd.getPriSwellDirFromR());
-            appendIntData(sb, sssd.getPriSwellDirToR(), sssd.getPriSwellDirToY());
-            
+            appendIntData(sb, sssd.getPriSwellPeriodR(),
+                    sssd.getPriSwellPeriodY());
+
+            appendIntData(sb, sssd.getPriSwellDirFromY(),
+                    sssd.getPriSwellDirFromR());
+            appendIntData(sb, sssd.getPriSwellDirToR(),
+                    sssd.getPriSwellDirToY());
+
             /*
              * Secondary Swell
              */
-            appendIntData(sb, sssd.getSecSwellHeightR(), sssd.getSecSwellHeightY());
-            
-            higherThreshold = Math.max(sssd.getSecSwellPeriodR(), sssd.getSecSwellPeriodY());
-            lowerThreshold = Math.min(sssd.getSecSwellPeriodR(), sssd.getSecSwellPeriodY()); 
-            if ( rankSwellPeriodHigh ) {
-            	//sssd.setRankSwellPeriodHigh(true);
-            	sssd.setSecSwellPeriodR(higherThreshold);
-            	sssd.setSecSwellPeriodY(lowerThreshold);
+            appendIntData(sb, sssd.getSecSwellHeightR(),
+                    sssd.getSecSwellHeightY());
+
+            higherThreshold = Math.max(sssd.getSecSwellPeriodR(),
+                    sssd.getSecSwellPeriodY());
+            lowerThreshold = Math.min(sssd.getSecSwellPeriodR(),
+                    sssd.getSecSwellPeriodY());
+            if (rankSwellPeriodHigh) {
+                // sssd.setRankSwellPeriodHigh(true);
+                sssd.setSecSwellPeriodR(higherThreshold);
+                sssd.setSecSwellPeriodY(lowerThreshold);
             } else {
-            	//sssd.setRankSwellPeriodHigh(false);
-            	sssd.setSecSwellPeriodR(lowerThreshold);
-            	sssd.setSecSwellPeriodY(higherThreshold);
+                // sssd.setRankSwellPeriodHigh(false);
+                sssd.setSecSwellPeriodR(lowerThreshold);
+                sssd.setSecSwellPeriodY(higherThreshold);
             }
-            appendIntData(sb, sssd.getSecSwellPeriodR(), sssd.getSecSwellPeriodY());
-            appendIntData(sb, sssd.getSecSwellDirFromY(), sssd.getSecSwellDirFromR());
-            appendIntData(sb, sssd.getSecSwellDirToR(), sssd.getSecSwellDirToY());
-            
+            appendIntData(sb, sssd.getSecSwellPeriodR(),
+                    sssd.getSecSwellPeriodY());
+            appendIntData(sb, sssd.getSecSwellDirFromY(),
+                    sssd.getSecSwellDirFromR());
+            appendIntData(sb, sssd.getSecSwellDirToR(),
+                    sssd.getSecSwellDirToY());
+
             /*
              * Append a space and add the data line to the list.
              */
             sb.append(" ");
-            
-            if (update == true)
-            {
+
+            if (update == true) {
                 dataList.setItem(i, sb.toString());
-            }
-            else
-            {
+            } else {
                 dataList.add(sb.toString());
-            }            
+            }
         }
-        
+
         packListControls();
     }
-    
-    private void createDataArray()
-    {
+
+    private void createDataArray() {
         ssDataArray = new ArrayList<SSDispMonSwellData>();
-        
-        SSThresholdMgr sstm = SSThresholdMgr.getInstance();   
-        
+
+        SSThresholdMgr sstm = SSThresholdMgr.getInstance();
+
         String xmlKey;
-        String areaID;       
-        
+        String areaID;
+
         ThresholdsXML threshXML = sstm.getThresholdsXmlData(duKey);
-        
+
         ArrayList<AreaXML> areasArray = threshXML.getAreas();
-        
-        for (AreaXML area : areasArray)
-        {
+
+        for (AreaXML area : areasArray) {
             areaID = area.getAreaId();
             SSDispMonSwellData sssd = new SSDispMonSwellData();
-            
+
             sssd.setAreaID(areaID);
 
             /*
              * Primary Swell
              */
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_PRIM_HT.getXmlKey();
-            sssd.setPriSwellHeightR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setPriSwellHeightY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey)); 
-            
+            sssd.setPriSwellHeightR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setPriSwellHeightY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_PRIM_PD.getXmlKey();
-            sssd.setPriSwellPeriodR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setPriSwellPeriodY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setPriSwellPeriodR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setPriSwellPeriodY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_FROM.getXmlKey();
-            sssd.setPriSwellDirFromR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setPriSwellDirFromY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setPriSwellDirFromR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setPriSwellDirFromY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_TO.getXmlKey();
-            sssd.setPriSwellDirToR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setPriSwellDirToY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setPriSwellDirToR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setPriSwellDirToY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Secondary Swell
              */
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_SEC_HT.getXmlKey();
-            sssd.setSecSwellHeightR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setSecSwellHeightY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey)); 
-            
+            sssd.setSecSwellHeightR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setSecSwellHeightY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_SEC_PD.getXmlKey();
-            sssd.setSecSwellPeriodR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setSecSwellPeriodY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setSecSwellPeriodR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setSecSwellPeriodY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_FROM.getXmlKey();
-            sssd.setSecSwellDirFromR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setSecSwellDirFromY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setSecSwellDirFromR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setSecSwellDirFromY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_TO.getXmlKey();
-            sssd.setSecSwellDirToR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setSecSwellDirToY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setSecSwellDirToR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setSecSwellDirToY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Add data to array.
              */
             ssDataArray.add(sssd);
         }
     }
-    
-    private SSDispMonSwellData getDataAtFirstSelection()
-    {        
+
+    private SSDispMonSwellData getDataAtFirstSelection() {
         int index = dataList.getSelectionIndex();
-        
-        return ssDataArray.get(index);        
-    }    
-    
-    private void updateDataArray(SSDispMonSwellData sssd)
-    {        
-        int[] dataListIndexes = dataList.getSelectionIndices();        
-        int currentIndex = 0;
-        
-        for (int i = 0; i < dataListIndexes.length; i++)
-        {
-            currentIndex = dataListIndexes[i];
-            
-            ssDataArray.get(currentIndex).updateData(sssd);
-        }        
+
+        return ssDataArray.get(index);
     }
-    
+
+    private void updateDataArray(SSDispMonSwellData sssd) {
+        int[] dataListIndexes = dataList.getSelectionIndices();
+        int currentIndex = 0;
+
+        for (int i = 0; i < dataListIndexes.length; i++) {
+            currentIndex = dataListIndexes[i];
+
+            ssDataArray.get(currentIndex).updateData(sssd);
+        }
+    }
+
     @Override
-    public void commitDataToXML()
-    {
+    public void commitDataToXML() {
         SSThresholdMgr sstm = SSThresholdMgr.getInstance();
-        
+
         String xmlKey;
         String areaID;
-        
-        for (SSDispMonSwellData sssd : ssDataArray)
-        {
-        	
-        	MonitorConfigConstants.setRankSwellPeriodHigh(rankSwellPeriodHigh);
-        	
+
+        for (SSDispMonSwellData sssd : ssDataArray) {
+
+            MonitorConfigConstants.setRankSwellPeriodHigh(rankSwellPeriodHigh);
+
             areaID = sssd.getAreaID();
-            
+
             /*
              * Primary Swell
              */
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_PRIM_HT.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getPriSwellHeightR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getPriSwellHeightY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getPriSwellHeightR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getPriSwellHeightY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_PRIM_PD.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getPriSwellPeriodR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getPriSwellPeriodY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getPriSwellPeriodR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getPriSwellPeriodY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_FROM.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getPriSwellDirFromR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getPriSwellDirFromY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getPriSwellDirFromR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getPriSwellDirFromY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_TO.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getPriSwellDirToR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getPriSwellDirToY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getPriSwellDirToR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getPriSwellDirToY());
+
             /*
              * Secondary Swell
              */
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_SEC_HT.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getSecSwellHeightR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getSecSwellHeightY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getSecSwellHeightR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getSecSwellHeightY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_SEC_PD.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getSecSwellPeriodR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getSecSwellPeriodY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getSecSwellPeriodR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getSecSwellPeriodY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_FROM.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getSecSwellDirFromR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getSecSwellDirFromY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getSecSwellDirFromR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getSecSwellDirFromY());
+
             xmlKey = SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_TO.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getSecSwellDirToR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getSecSwellDirToY());
-        }        
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getSecSwellDirToR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getSecSwellDirToY());
+        }
     }
 
     @Override
-    public void reloadData()
-    {
+    public void reloadData() {
         dataList.removeAll();
         ssDataArray.clear();
         ssDataArray = null;
-        
-        populateList();        
+
+        populateList();
     }
 
     @Override
-    protected void editDataAction()
-    {
+    protected void editDataAction() {
         SSDispMonSwellData sssd = getDataAtFirstSelection();
-        
-        if (displaySwellEditDlg == null)
-        {
-            displaySwellEditDlg = new SSDispMonSwellEditDlg(getParent().getShell(), sssd, this, true);
+
+        if (displaySwellEditDlg == null) {
+            displaySwellEditDlg = new SSDispMonSwellEditDlg(getParent()
+                    .getShell(), sssd, this, true);
             displaySwellEditDlg.open();
             displaySwellEditDlg = null;
         }
@@ -342,10 +386,9 @@ public class SSDisplaySwellTab extends TabItemComp implements IUpdateDisplayMoni
     }
 
     @Override
-    public void updateThresholdData(SSDispMonSwellData sssd)
-    {
+    public void updateThresholdData(SSDispMonSwellData sssd) {
         updateDataArray(sssd);
         populateList();
-        
+
     }
 }
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayWindTab.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayWindTab.java
old mode 100644
new mode 100755
index 6163da4e06..0033818e9a
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayWindTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayWindTab.java
@@ -28,287 +28,303 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SafeSeasDisplay;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSDisplayWindData;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SafeSeasDisplay;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
-public class SSDisplayWindTab extends TabItemComp implements IUpdateDisplayWind
-{
+/**
+ * SAFESEAS Display Wind Table.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 26, 2015 5115       skorolev    Corrected imports.
+ * 
+ * </pre>
+ * 
+ * @author skorolev
+ * @version 1.0
+ */
+public class SSDisplayWindTab extends TabItemComp implements IUpdateDisplayWind {
     private SSDisplayWindEditDlg windEditDlg;
-    
+
     private ArrayList<String> areaIDArray;
-    
+
     private ArrayList<SSDisplayWindData> ssDataArray;
-    
-    public SSDisplayWindTab(TabFolder parent, DataUsageKey duKey)
-    {
+
+    public SSDisplayWindTab(TabFolder parent, DataUsageKey duKey) {
         super(parent, duKey);
     }
 
-    @Override    
-    protected void createListHeader(Composite parentComp)
-    {
+    @Override
+    protected void createListHeader(Composite parentComp) {
         Composite lblComp = new Composite(parentComp, SWT.NONE);
         GridLayout gl = new GridLayout(5, false);
-        gl.horizontalSpacing = 0;   
+        gl.horizontalSpacing = 0;
         gl.marginHeight = 0;
         gl.marginWidth = 0;
         lblComp.setLayout(gl);
-        
+
         /*
          * Create filler label.
          */
         GridData gd = new GridData(73, SWT.DEFAULT);
         Label fillerLbl = new Label(lblComp, SWT.CENTER);
         fillerLbl.setLayoutData(gd);
-        
+
         /*
          * Wind
          */
         Composite windComp = createGroupComposite(lblComp, 5, null);
-        createLabelComp(windComp, "Wind", "Speed(kt)", false);        
-        createLabelComp(windComp, "Peak", "Wind(kt)", false);   
+        createLabelComp(windComp, "Wind", "Speed(kt)", false);
+        createLabelComp(windComp, "Peak", "Wind(kt)", false);
         createLabelComp(windComp, "Gust", "Speed(kt)", false);
         createLabelComp(windComp, "Wind", "Dir(deg)\n(from)", false);
         createLabelComp(windComp, "Wind", "Dir(deg)\n(to)", false);
-    }    
-    
+    }
+
     @Override
-    protected void populateList()
-    {   
-        if (ssDataArray == null)
-        {
+    protected void populateList() {
+        if (ssDataArray == null) {
             createDataArray();
         }
-        
+
         boolean update = false;
-        if (dataList.getItemCount() > 0)
-        {
+        if (dataList.getItemCount() > 0) {
             update = true;
         }
-        
+
         areaIDArray = new ArrayList<String>();
-        
+
         String currentAreaID;
-        
-        StringBuilder sb = null;       
+
+        StringBuilder sb = null;
         SSDisplayWindData ssdwd = null;
-        
-        for (int i = 0; i < ssDataArray.size(); i++)
-        {
+
+        for (int i = 0; i < ssDataArray.size(); i++) {
             sb = new StringBuilder();
-            
+
             ssdwd = ssDataArray.get(i);
-            
+
             currentAreaID = ssdwd.getAreaID();
             areaIDArray.add(currentAreaID);
-            
+
             sb.append(String.format(areaIdFmt, currentAreaID));
-            
+
             /*
              * Wind Speed
              */
             appendIntData(sb, ssdwd.getWindSpeedR(), ssdwd.getWindSpeedY());
-            
+
             /*
              * Peak Wind
              */
             appendIntData(sb, ssdwd.getPeakWindR(), ssdwd.getPeakWindY());
-            
+
             /*
              * Gust Speed
              */
             appendIntData(sb, ssdwd.getGustSpeedR(), ssdwd.getGustSpeedY());
-            
+
             /*
              * Wind Direction From
              */
-            appendIntData(sb, ssdwd.getWindDirFromY(),ssdwd.getWindDirFromR());
-            
+            appendIntData(sb, ssdwd.getWindDirFromY(), ssdwd.getWindDirFromR());
+
             /*
              * Wind Direction To
              */
             appendIntData(sb, ssdwd.getWindDirToR(), ssdwd.getWindDirToY());
-            
+
             /*
              * Append a space and add the data line to the list.
              */
-            if (update == true)
-            {
+            if (update == true) {
                 dataList.setItem(i, sb.toString());
-            }
-            else
-            {
+            } else {
                 dataList.add(sb.toString());
-            }            
+            }
         }
-        
+
         packListControls();
     }
-    
-    private void createDataArray()
-    {
+
+    private void createDataArray() {
         ssDataArray = new ArrayList<SSDisplayWindData>();
-        
-        SSThresholdMgr sstm = SSThresholdMgr.getInstance();   
-        
+
+        SSThresholdMgr sstm = SSThresholdMgr.getInstance();
+
         String xmlKey;
-        String areaID;       
-        
+        String areaID;
+
         ThresholdsXML threshXML = sstm.getThresholdsXmlData(duKey);
-        
+
         ArrayList<AreaXML> areasArray = threshXML.getAreas();
-        
-        for (AreaXML area : areasArray)
-        {
+
+        for (AreaXML area : areasArray) {
             areaID = area.getAreaId();
             SSDisplayWindData ssdwd = new SSDisplayWindData();
-            
+
             ssdwd.setAreaID(areaID);
-            
+
             /*
              * Wind Speed
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_WIND_SPEED.getXmlKey();
-            ssdwd.setWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdwd.setWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));            
-            
+            ssdwd.setWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdwd.setWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Peak Wind
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_PEAK_WIND.getXmlKey();
-            ssdwd.setPeakWindR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdwd.setPeakWindY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));   
-            
+            ssdwd.setPeakWindR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdwd.setPeakWindY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Gust Speed
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_GUST_SPEED.getXmlKey();
-            ssdwd.setGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdwd.setGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey)); 
-            
+            ssdwd.setGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdwd.setGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Wind Direction From
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_DIR_FROM.getXmlKey();
-            ssdwd.setWindDirFromR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdwd.setWindDirFromY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey)); 
-            
+            ssdwd.setWindDirFromR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdwd.setWindDirFromY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Wind Direction To
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_DIR_TO.getXmlKey();
-            ssdwd.setWindDirToR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssdwd.setWindDirToY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey)); 
-            
+            ssdwd.setWindDirToR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssdwd.setWindDirToY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Add data to array.
              */
             ssDataArray.add(ssdwd);
         }
     }
-    
-    private SSDisplayWindData getDataAtFirstSelection()
-    {
-        
+
+    private SSDisplayWindData getDataAtFirstSelection() {
+
         int index = dataList.getSelectionIndex();
-        
+
         return ssDataArray.get(index);
-        
+
     }
-    
-    private void updateDataArray(SSDisplayWindData ssdwd)
-    {        
-        int[] dataListIndexes = dataList.getSelectionIndices();        
+
+    private void updateDataArray(SSDisplayWindData ssdwd) {
+        int[] dataListIndexes = dataList.getSelectionIndices();
         int currentIndex = 0;
-        
-        for (int i = 0; i < dataListIndexes.length; i++)
-        {
+
+        for (int i = 0; i < dataListIndexes.length; i++) {
             currentIndex = dataListIndexes[i];
-            
+
             ssDataArray.get(currentIndex).updateData(ssdwd);
-        }        
+        }
     }
-    
+
     @Override
-    public void commitDataToXML()
-    {
+    public void commitDataToXML() {
         SSThresholdMgr sstm = SSThresholdMgr.getInstance();
-        
+
         String xmlKey;
         String areaID;
-        
-        for (SSDisplayWindData ssdwd : ssDataArray)
-        {
+
+        for (SSDisplayWindData ssdwd : ssDataArray) {
             areaID = ssdwd.getAreaID();
-            
+
             /*
              * Wind Speed
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_WIND_SPEED.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdwd.getWindSpeedR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdwd.getWindSpeedY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdwd.getWindSpeedR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdwd.getWindSpeedY());
+
             /*
              * Peak Wind
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_PEAK_WIND.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdwd.getPeakWindR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdwd.getPeakWindY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdwd.getPeakWindR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdwd.getPeakWindY());
+
             /*
              * Gust Speed
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_GUST_SPEED.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdwd.getGustSpeedR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdwd.getGustSpeedY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdwd.getGustSpeedR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdwd.getGustSpeedY());
+
             /*
              * Wind Direction From
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_DIR_FROM.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdwd.getWindDirFromR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdwd.getWindDirFromY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdwd.getWindDirFromR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdwd.getWindDirFromY());
+
             /*
              * Wind Direction To
              */
             xmlKey = SafeSeasDisplay.SS_DISP_WIND_DIR_TO.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssdwd.getWindDirToR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssdwd.getWindDirToY());
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssdwd.getWindDirToR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssdwd.getWindDirToY());
         }
     }
 
     @Override
-    public void reloadData()
-    {
+    public void reloadData() {
         dataList.removeAll();
         ssDataArray.clear();
         ssDataArray = null;
-        
+
         populateList();
     }
 
     @Override
-    protected void editDataAction()
-    {
+    protected void editDataAction() {
         SSDisplayWindData ssdwd = getDataAtFirstSelection();
-        
-        if (windEditDlg == null)
-        {
-            windEditDlg = new SSDisplayWindEditDlg(getParent().getShell(), ssdwd, this);
+
+        if (windEditDlg == null) {
+            windEditDlg = new SSDisplayWindEditDlg(getParent().getShell(),
+                    ssdwd, this);
             windEditDlg.open();
             windEditDlg = null;
         }
-    }   
+    }
 
     @Override
-    public void updateThresholdData(SSDisplayWindData ssdwd)
-    {
+    public void updateThresholdData(SSDisplayWindData ssdwd) {
         updateDataArray(ssdwd);
         populateList();
     }
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorMeteoTab.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorMeteoTab.java
old mode 100644
new mode 100755
index d8ceb7207c..b459bd2796
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorMeteoTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorMeteoTab.java
@@ -28,318 +28,318 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SafeSeasMonitor;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.data.RangesUtil;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSMonitorMeteoData;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SafeSeasMonitor;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
 /**
  * SAFESEAS Monitor Meteo Table.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 17, 2014 2757       skorolev    Removed unnecessary printouts.
- *
+ * Dec 26, 2015 5114       skorolev    Corrected imports and replaced AppName with MonName.
+ * 
  * </pre>
- *
+ * 
  * @author skorolev
- * @version 1.0	
+ * @version 1.0
  */
-public class SSMonitorMeteoTab extends TabItemComp implements IUpdateMonitorMeteo
-{
+public class SSMonitorMeteoTab extends TabItemComp implements
+        IUpdateMonitorMeteo {
     private SSMonitorMeteoEditDlg monitorMeteoEditDlg;
-    
+
     private ArrayList<String> areaIDArray;
-    
+
     private ArrayList<SSMonitorMeteoData> ssDataArray;
-    
-    public SSMonitorMeteoTab(TabFolder parent, DataUsageKey duKey)
-    {
+
+    public SSMonitorMeteoTab(TabFolder parent, DataUsageKey duKey) {
         super(parent, duKey);
     }
 
-    @Override    
-    protected void createListHeader(Composite parentComp)
-    {
+    @Override
+    protected void createListHeader(Composite parentComp) {
         Composite lblComp = new Composite(parentComp, SWT.NONE);
         GridLayout gl = new GridLayout(5, false);
-        gl.horizontalSpacing = 0;   
+        gl.horizontalSpacing = 0;
         gl.marginHeight = 0;
         gl.marginWidth = 0;
         lblComp.setLayout(gl);
-        
+
         /*
          * Create filler label.
          */
         GridData gd = new GridData(75, SWT.DEFAULT);
         Label fillerLbl = new Label(lblComp, SWT.CENTER);
         fillerLbl.setLayoutData(gd);
-        
+
         /*
          * Meteo
          */
-        Composite meteoComp = createGroupComposite(lblComp, 5, null);        
-        createLabelComp(meteoComp, "Wind", "Speed(kt)", false);        
-        createLabelComp(meteoComp, "Peak", "Wind(kt)", false);  
+        Composite meteoComp = createGroupComposite(lblComp, 5, null);
+        createLabelComp(meteoComp, "Wind", "Speed(kt)", false);
+        createLabelComp(meteoComp, "Peak", "Wind(kt)", false);
         createLabelComp(meteoComp, "Gust", "Speed(kt)", false);
         createLabelComp(meteoComp, "Wave", "Height(ft)", false);
         createLabelComp(meteoComp, "Vis(mi)", "", true);
-    }    
-    
+    }
+
     @Override
-    protected void populateList()
-    {   
-        if (ssDataArray == null)
-        {
+    protected void populateList() {
+        if (ssDataArray == null) {
             createDataArray();
         }
-        
+
         boolean update = false;
-        if (dataList.getItemCount() > 0)
-        {
+        if (dataList.getItemCount() > 0) {
             update = true;
         }
-        
+
         RangesUtil rangeUtil = RangesUtil.getInstance();
-        
+
         areaIDArray = new ArrayList<String>();
-        
+
         String tmpVisStr;
         String currentAreaID;
-        
+
         double visVal = 0.0;
-        
-        StringBuilder sb = null;       
+
+        StringBuilder sb = null;
         SSMonitorMeteoData ssmmd = null;
-        
-        for (int i = 0; i < ssDataArray.size(); i++)
-        {
+
+        for (int i = 0; i < ssDataArray.size(); i++) {
             sb = new StringBuilder();
-            
+
             ssmmd = ssDataArray.get(i);
-            
+
             currentAreaID = ssmmd.getAreaID();
             areaIDArray.add(currentAreaID);
-            
+
             sb.append(String.format(areaIdFmt, currentAreaID));
-            
+
             /*
              * Wind Speed
              */
             appendIntData(sb, ssmmd.getWindSpeedR(), ssmmd.getWindSpeedY());
-            
+
             /*
              * Peak Wind
              */
             appendIntData(sb, ssmmd.getPeakWindR(), ssmmd.getPeakWindY());
-            
+
             /*
              * Gust Wind
              */
             appendIntData(sb, ssmmd.getGustSpeedR(), ssmmd.getGustSpeedY());
-            
+
             /*
              * Wave Height
              */
             appendIntData(sb, ssmmd.getWaveHgtR(), ssmmd.getWaveHgtY());
-            
+
             /*
              * Visibility
-             */            
-            visVal = ssmmd.getVisR();            
-            tmpVisStr = rangeUtil.getVisString((int)visVal);
+             */
+            visVal = ssmmd.getVisR();
+            tmpVisStr = rangeUtil.getVisString((int) visVal);
             sb.append(String.format(dataFmt, tmpVisStr));
-            
-            visVal = ssmmd.getVisY();           
-            tmpVisStr = rangeUtil.getVisString((int)visVal);
-            sb.append(String.format(dataFmt, tmpVisStr));            
-            
+
+            visVal = ssmmd.getVisY();
+            tmpVisStr = rangeUtil.getVisString((int) visVal);
+            sb.append(String.format(dataFmt, tmpVisStr));
+
             /*
              * Append a space and add the data line to the list.
              */
             sb.append(" ");
-            
-            if (update == true)
-            {
+
+            if (update == true) {
                 dataList.setItem(i, sb.toString());
-            }
-            else
-            {
+            } else {
                 dataList.add(sb.toString());
-            }            
+            }
         }
-        
+
         packListControls();
     }
-    
-    private void createDataArray()
-    {
+
+    private void createDataArray() {
         ssDataArray = new ArrayList<SSMonitorMeteoData>();
-        
-        SSThresholdMgr sstm = SSThresholdMgr.getInstance();   
-        
+
+        SSThresholdMgr sstm = SSThresholdMgr.getInstance();
+
         String xmlKey;
-        String areaID;       
-        
+        String areaID;
+
         ThresholdsXML threshXML = sstm.getThresholdsXmlData(duKey);
-        
+
         ArrayList<AreaXML> areasArray = threshXML.getAreas();
-        
-        for (AreaXML area : areasArray)
-        {
+
+        for (AreaXML area : areasArray) {
             areaID = area.getAreaId();
             SSMonitorMeteoData ssmmd = new SSMonitorMeteoData();
-            
+
             ssmmd.setAreaID(areaID);
-            
+
             /*
              * Wind Speed
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_WIND_SPEED.getXmlKey();
-            ssmmd.setWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssmmd.setWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssmmd.setWindSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssmmd.setWindSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Peak Wind
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_PEAK_WIND.getXmlKey();
-            ssmmd.setPeakWindR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssmmd.setPeakWindY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssmmd.setPeakWindR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssmmd.setPeakWindY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Gust Speed
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_GUST_SPEED.getXmlKey();
-            ssmmd.setGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssmmd.setGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssmmd.setGustSpeedR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            ssmmd.setGustSpeedY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Wave Height
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_WAVE_HT.getXmlKey();
-            ssmmd.setWaveHgtR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssmmd.setWaveHgtY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
+            ssmmd.setWaveHgtR(sstm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            ssmmd.setWaveHgtY(sstm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
 
             /*
              * Visibility
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_VIS.getXmlKey();
-            ssmmd.setVisR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            ssmmd.setVisY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            ssmmd.setVisR(sstm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            ssmmd.setVisY(sstm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             /*
              * Add data to array.
              */
             ssDataArray.add(ssmmd);
         }
     }
-    
-    private SSMonitorMeteoData getDataAtFirstSelection()
-    {        
+
+    private SSMonitorMeteoData getDataAtFirstSelection() {
         int index = dataList.getSelectionIndex();
-        
-        return ssDataArray.get(index);        
+
+        return ssDataArray.get(index);
     }
-    
-    private void updateDataArray(SSMonitorMeteoData ssmmd)
-    {        
-        int[] dataListIndexes = dataList.getSelectionIndices();        
+
+    private void updateDataArray(SSMonitorMeteoData ssmmd) {
+        int[] dataListIndexes = dataList.getSelectionIndices();
         int currentIndex = 0;
-        
-        for (int i = 0; i < dataListIndexes.length; i++)
-        {
+
+        for (int i = 0; i < dataListIndexes.length; i++) {
             currentIndex = dataListIndexes[i];
-            
+
             ssDataArray.get(currentIndex).updateData(ssmmd);
-        }        
+        }
     }
-    
+
     @Override
-    public void commitDataToXML()
-    {
+    public void commitDataToXML() {
         SSThresholdMgr sstm = SSThresholdMgr.getInstance();
-        
+
         String xmlKey;
         String areaID;
-        
-        for (SSMonitorMeteoData ssmmd : ssDataArray)
-        {
+
+        for (SSMonitorMeteoData ssmmd : ssDataArray) {
             areaID = ssmmd.getAreaID();
-            
+
             /*
              * Wind Speed
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_WIND_SPEED.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssmmd.getWindSpeedR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssmmd.getWindSpeedY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssmmd.getWindSpeedR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssmmd.getWindSpeedY());
+
             /*
              * Peak Wind
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_PEAK_WIND.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssmmd.getPeakWindR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssmmd.getPeakWindY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssmmd.getPeakWindR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssmmd.getPeakWindY());
+
             /*
              * Gust Speed
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_GUST_SPEED.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssmmd.getGustSpeedR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssmmd.getGustSpeedY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssmmd.getGustSpeedR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssmmd.getGustSpeedY());
+
             /*
              * Wave Height
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_WAVE_HT.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssmmd.getWaveHgtR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssmmd.getWaveHgtY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssmmd.getWaveHgtR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssmmd.getWaveHgtY());
+
             /*
              * Visibility
              */
             xmlKey = SafeSeasMonitor.SS_MON_METEO_VIS.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, ssmmd.getVisR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, ssmmd.getVisY());            
-        }        
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    ssmmd.getVisR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    ssmmd.getVisY());
+        }
     }
 
     @Override
-    public void reloadData()
-    {
+    public void reloadData() {
         dataList.removeAll();
         ssDataArray.clear();
         ssDataArray = null;
-        
-        populateList();        
+
+        populateList();
     }
 
     @Override
-    protected void editDataAction()
-    {
+    protected void editDataAction() {
         SSMonitorMeteoData ssmmd = getDataAtFirstSelection();
-        
-        if (monitorMeteoEditDlg == null)
-        {
-            monitorMeteoEditDlg = new SSMonitorMeteoEditDlg(getParent().getShell(), ssmmd, this);
+
+        if (monitorMeteoEditDlg == null) {
+            monitorMeteoEditDlg = new SSMonitorMeteoEditDlg(getParent()
+                    .getShell(), ssmmd, this);
             monitorMeteoEditDlg.open();
             monitorMeteoEditDlg = null;
         }
     }
 
-    
-
     @Override
-    public void updateThresholdData(SSMonitorMeteoData ssmmd)
-    {
+    public void updateThresholdData(SSMonitorMeteoData ssmmd) {
         updateDataArray(ssmmd);
-        populateList();        
+        populateList();
     }
 }
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorSwellTab.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorSwellTab.java
old mode 100644
new mode 100755
index a28cc5db93..18a4eb3b9c
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorSwellTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorSwellTab.java
@@ -28,320 +28,362 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SafeSeasMonitor;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSDispMonSwellData;
 import com.raytheon.uf.viz.monitor.safeseas.threshold.SSThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SafeSeasMonitor;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
-public class SSMonitorSwellTab extends TabItemComp implements IUpdateDisplayMonitorSwell
-{
+/**
+ * SAFESEAS Monitor Swell Table.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 26, 2015 5115       skorolev    Corrected imports.
+ * 
+ * </pre>
+ * 
+ * @author skorolev
+ * @version 1.0
+ */
+public class SSMonitorSwellTab extends TabItemComp implements
+        IUpdateDisplayMonitorSwell {
     private SSDispMonSwellEditDlg monitorSwellEditDlg;
-    
+
     private ArrayList<String> areaIDArray;
-    
+
     private ArrayList<SSDispMonSwellData> ssDataArray;
-    
-    public SSMonitorSwellTab(TabFolder parent, DataUsageKey duKey)
-    {
+
+    public SSMonitorSwellTab(TabFolder parent, DataUsageKey duKey) {
         super(parent, duKey, true);
     }
 
-    @Override    
-    protected void createListHeader(Composite parentComp)
-    {
+    @Override
+    protected void createListHeader(Composite parentComp) {
         Composite lblComp = new Composite(parentComp, SWT.NONE);
         GridLayout gl = new GridLayout(5, false);
-        gl.horizontalSpacing = 0;   
+        gl.horizontalSpacing = 0;
         gl.marginHeight = 0;
         gl.marginWidth = 0;
         lblComp.setLayout(gl);
-        
+
         /*
          * Create filler label.
          */
         GridData gd = new GridData(75, SWT.DEFAULT);
         Label fillerLbl = new Label(lblComp, SWT.CENTER);
         fillerLbl.setLayoutData(gd);
-        
+
         /*
          * Primary Swell
          */
-        Composite priSwellComp = createGroupComposite(lblComp, 4, "Primary Swell");
+        Composite priSwellComp = createGroupComposite(lblComp, 4,
+                "Primary Swell");
         createLabelComp(priSwellComp, "Height(ft)", "", false);
         createLabelComp(priSwellComp, "Periods(s)", "", false);
         createLabelComp(priSwellComp, "Dir(deg)", "(from)", false);
-        createLabelComp(priSwellComp, "Dir(deg)", "(to)", false);        
-        
+        createLabelComp(priSwellComp, "Dir(deg)", "(to)", false);
+
         /*
          * Secondary Swell
          */
-        Composite secSwellComp = createGroupComposite(lblComp, 4, "Secondary Swell");
+        Composite secSwellComp = createGroupComposite(lblComp, 4,
+                "Secondary Swell");
         createLabelComp(secSwellComp, "Height(ft)", "", false);
         createLabelComp(secSwellComp, "Periods(s)", "", false);
         createLabelComp(secSwellComp, "Dir(deg)", "(from)", false);
         createLabelComp(secSwellComp, "Dir(deg)", "(to)", false);
-    }    
-    
+    }
+
     @Override
-    protected void populateList()
-    {
-        if (ssDataArray == null)
-        {
+    protected void populateList() {
+        if (ssDataArray == null) {
             createDataArray();
         }
-        
+
         boolean update = false;
-        if (dataList.getItemCount() > 0)
-        {
+        if (dataList.getItemCount() > 0) {
             update = true;
         }
-        
+
         areaIDArray = new ArrayList<String>();
-        
+
         String currentAreaID;
-        
-        StringBuilder sb = null;       
+
+        StringBuilder sb = null;
         SSDispMonSwellData sssd = null;
-        
-        for (int i = 0; i < ssDataArray.size(); i++)
-        {
+
+        for (int i = 0; i < ssDataArray.size(); i++) {
             sb = new StringBuilder();
-            
+
             sssd = ssDataArray.get(i);
-            
+
             currentAreaID = sssd.getAreaID();
             areaIDArray.add(currentAreaID);
-            
-            sb.append(String.format(areaIdFmt, currentAreaID));           
-            
+
+            sb.append(String.format(areaIdFmt, currentAreaID));
+
             /*
              * Primary Swell
              */
-            appendIntData(sb, sssd.getPriSwellHeightR(), sssd.getPriSwellHeightY());
-            
-            double higherThreshold = Math.max(sssd.getPriSwellPeriodR(), sssd.getPriSwellPeriodY());
-            double lowerThreshold = Math.min(sssd.getPriSwellPeriodR(), sssd.getPriSwellPeriodY()); 
-            if ( rankSwellPeriodHigh ) {
-            	sssd.setRankSwellPeriodHigh(true);
-            	sssd.setPriSwellPeriodR(higherThreshold);
-            	sssd.setPriSwellPeriodY(lowerThreshold);
+            appendIntData(sb, sssd.getPriSwellHeightR(),
+                    sssd.getPriSwellHeightY());
+
+            double higherThreshold = Math.max(sssd.getPriSwellPeriodR(),
+                    sssd.getPriSwellPeriodY());
+            double lowerThreshold = Math.min(sssd.getPriSwellPeriodR(),
+                    sssd.getPriSwellPeriodY());
+            if (rankSwellPeriodHigh) {
+                sssd.setRankSwellPeriodHigh(true);
+                sssd.setPriSwellPeriodR(higherThreshold);
+                sssd.setPriSwellPeriodY(lowerThreshold);
             } else {
-            	sssd.setRankSwellPeriodHigh(false);
-            	sssd.setPriSwellPeriodR(lowerThreshold);
-            	sssd.setPriSwellPeriodY(higherThreshold);
+                sssd.setRankSwellPeriodHigh(false);
+                sssd.setPriSwellPeriodR(lowerThreshold);
+                sssd.setPriSwellPeriodY(higherThreshold);
             }
-            appendIntData(sb, sssd.getPriSwellPeriodR(), sssd.getPriSwellPeriodY());
-            
-            appendIntData(sb, sssd.getPriSwellDirFromR(), sssd.getPriSwellDirFromY());
-            appendIntData(sb, sssd.getPriSwellDirToR(), sssd.getPriSwellDirToY());
-            
+            appendIntData(sb, sssd.getPriSwellPeriodR(),
+                    sssd.getPriSwellPeriodY());
+
+            appendIntData(sb, sssd.getPriSwellDirFromR(),
+                    sssd.getPriSwellDirFromY());
+            appendIntData(sb, sssd.getPriSwellDirToR(),
+                    sssd.getPriSwellDirToY());
+
             /*
              * Secondary Swell
              */
-            appendIntData(sb, sssd.getSecSwellHeightR(), sssd.getSecSwellHeightY());
-            
-            higherThreshold = Math.max(sssd.getSecSwellPeriodR(), sssd.getSecSwellPeriodY());
-            lowerThreshold = Math.min(sssd.getSecSwellPeriodR(), sssd.getSecSwellPeriodY()); 
-            if ( rankSwellPeriodHigh ) {
-            	//sssd.setRankSwellPeriodHigh(true);
-            	sssd.setSecSwellPeriodR(higherThreshold);
-            	sssd.setSecSwellPeriodY(lowerThreshold);
+            appendIntData(sb, sssd.getSecSwellHeightR(),
+                    sssd.getSecSwellHeightY());
+
+            higherThreshold = Math.max(sssd.getSecSwellPeriodR(),
+                    sssd.getSecSwellPeriodY());
+            lowerThreshold = Math.min(sssd.getSecSwellPeriodR(),
+                    sssd.getSecSwellPeriodY());
+            if (rankSwellPeriodHigh) {
+                // sssd.setRankSwellPeriodHigh(true);
+                sssd.setSecSwellPeriodR(higherThreshold);
+                sssd.setSecSwellPeriodY(lowerThreshold);
             } else {
-            	//sssd.setRankSwellPeriodHigh(false);
-            	sssd.setSecSwellPeriodR(lowerThreshold);
-            	sssd.setSecSwellPeriodY(higherThreshold);
+                // sssd.setRankSwellPeriodHigh(false);
+                sssd.setSecSwellPeriodR(lowerThreshold);
+                sssd.setSecSwellPeriodY(higherThreshold);
             }
-            appendIntData(sb, sssd.getSecSwellPeriodR(), sssd.getSecSwellPeriodY());
-            
-            appendIntData(sb, sssd.getSecSwellDirFromR(), sssd.getSecSwellDirFromY());
-            appendIntData(sb, sssd.getSecSwellDirToR(), sssd.getSecSwellDirToY());
-            
+            appendIntData(sb, sssd.getSecSwellPeriodR(),
+                    sssd.getSecSwellPeriodY());
+
+            appendIntData(sb, sssd.getSecSwellDirFromR(),
+                    sssd.getSecSwellDirFromY());
+            appendIntData(sb, sssd.getSecSwellDirToR(),
+                    sssd.getSecSwellDirToY());
+
             /*
              * Append a space and add the data line to the list.
              */
             sb.append(" ");
-            
-            if (update == true)
-            {
+
+            if (update == true) {
                 dataList.setItem(i, sb.toString());
-            }
-            else
-            {
+            } else {
                 dataList.add(sb.toString());
-            }            
+            }
         }
-        
+
         packListControls();
     }
-    
-    private void createDataArray()
-    {
+
+    private void createDataArray() {
         ssDataArray = new ArrayList<SSDispMonSwellData>();
-        
-        SSThresholdMgr sstm = SSThresholdMgr.getInstance();   
-        
+
+        SSThresholdMgr sstm = SSThresholdMgr.getInstance();
+
         String xmlKey;
-        String areaID;       
-        
+        String areaID;
+
         ThresholdsXML threshXML = sstm.getThresholdsXmlData(duKey);
-        
+
         ArrayList<AreaXML> areasArray = threshXML.getAreas();
-        
-        for (AreaXML area : areasArray)
-        {
+
+        for (AreaXML area : areasArray) {
             areaID = area.getAreaId();
             SSDispMonSwellData sssd = new SSDispMonSwellData();
-            
+
             sssd.setAreaID(areaID);
 
             /*
              * Primary Swell
              */
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_PRIM_HT.getXmlKey();
-            sssd.setPriSwellHeightR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setPriSwellHeightY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey)); 
-            
+            sssd.setPriSwellHeightR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setPriSwellHeightY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_PRIM_PD.getXmlKey();
-            sssd.setPriSwellPeriodR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setPriSwellPeriodY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setPriSwellPeriodR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setPriSwellPeriodY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_PRIM_DIR_FROM.getXmlKey();
-            sssd.setPriSwellDirFromR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setPriSwellDirFromY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setPriSwellDirFromR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setPriSwellDirFromY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_PRIM_DIR_TO.getXmlKey();
-            sssd.setPriSwellDirToR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setPriSwellDirToY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setPriSwellDirToR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setPriSwellDirToY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Secondary Swell
              */
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_SEC_HT.getXmlKey();
-            sssd.setSecSwellHeightR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setSecSwellHeightY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey)); 
-            
+            sssd.setSecSwellHeightR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setSecSwellHeightY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_SEC_PD.getXmlKey();
-            sssd.setSecSwellPeriodR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setSecSwellPeriodY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setSecSwellPeriodR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setSecSwellPeriodY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_SEC_DIR_FROM.getXmlKey();
-            sssd.setSecSwellDirFromR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setSecSwellDirFromY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setSecSwellDirFromR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setSecSwellDirFromY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_SEC_DIR_TO.getXmlKey();
-            sssd.setSecSwellDirToR(sstm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sssd.setSecSwellDirToY(sstm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sssd.setSecSwellDirToR(sstm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sssd.setSecSwellDirToY(sstm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Add data to array.
              */
             ssDataArray.add(sssd);
         }
     }
-    
-    private SSDispMonSwellData getDataAtFirstSelection()
-    {        
+
+    private SSDispMonSwellData getDataAtFirstSelection() {
         int index = dataList.getSelectionIndex();
-        
-        return ssDataArray.get(index);        
-    }    
-    
-    private void updateDataArray(SSDispMonSwellData sssd)
-    {        
-        int[] dataListIndexes = dataList.getSelectionIndices();        
-        int currentIndex = 0;
-        
-        for (int i = 0; i < dataListIndexes.length; i++)
-        {
-            currentIndex = dataListIndexes[i];
-            
-            ssDataArray.get(currentIndex).updateData(sssd);
-        }        
+
+        return ssDataArray.get(index);
     }
-    
+
+    private void updateDataArray(SSDispMonSwellData sssd) {
+        int[] dataListIndexes = dataList.getSelectionIndices();
+        int currentIndex = 0;
+
+        for (int i = 0; i < dataListIndexes.length; i++) {
+            currentIndex = dataListIndexes[i];
+
+            ssDataArray.get(currentIndex).updateData(sssd);
+        }
+    }
+
     @Override
-    public void commitDataToXML() 
-    {
+    public void commitDataToXML() {
         SSThresholdMgr sstm = SSThresholdMgr.getInstance();
-        
+
         String xmlKey;
         String areaID;
-        
-        for (SSDispMonSwellData sssd : ssDataArray)
-        {
+
+        for (SSDispMonSwellData sssd : ssDataArray) {
             areaID = sssd.getAreaID();
-            
+
             /*
              * Primary Swell
              */
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_PRIM_HT.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getPriSwellHeightR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getPriSwellHeightY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getPriSwellHeightR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getPriSwellHeightY());
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_PRIM_PD.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getPriSwellPeriodR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getPriSwellPeriodY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getPriSwellPeriodR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getPriSwellPeriodY());
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_PRIM_DIR_FROM.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getPriSwellDirFromR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getPriSwellDirFromY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getPriSwellDirFromR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getPriSwellDirFromY());
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_PRIM_DIR_TO.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getPriSwellDirToR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getPriSwellDirToY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getPriSwellDirToR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getPriSwellDirToY());
+
             /*
              * Secondary Swell
              */
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_SEC_HT.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getSecSwellHeightR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getSecSwellHeightY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getSecSwellHeightR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getSecSwellHeightY());
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_SEC_PD.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getSecSwellPeriodR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getSecSwellPeriodY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getSecSwellPeriodR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getSecSwellPeriodY());
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_SEC_DIR_FROM.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getSecSwellDirFromR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getSecSwellDirFromY());
-            
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getSecSwellDirFromR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getSecSwellDirFromY());
+
             xmlKey = SafeSeasMonitor.SS_MON_SWELL_SEC_DIR_TO.getXmlKey();
-            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sssd.getSecSwellDirToR());
-            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sssd.getSecSwellDirToY());
-        }             
+            sstm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sssd.getSecSwellDirToR());
+            sstm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sssd.getSecSwellDirToY());
+        }
     }
 
     @Override
-    public void reloadData()
-    {
+    public void reloadData() {
         dataList.removeAll();
         ssDataArray.clear();
         ssDataArray = null;
-        
-        populateList();                
+
+        populateList();
     }
 
     @Override
-    protected void editDataAction()
-    {
+    protected void editDataAction() {
         SSDispMonSwellData sssd = getDataAtFirstSelection();
-        
-        if (monitorSwellEditDlg == null)
-        {
-            monitorSwellEditDlg = new SSDispMonSwellEditDlg(getParent().getShell(), sssd, this, false);
+
+        if (monitorSwellEditDlg == null) {
+            monitorSwellEditDlg = new SSDispMonSwellEditDlg(getParent()
+                    .getShell(), sssd, this, false);
             monitorSwellEditDlg.open();
             monitorSwellEditDlg = null;
         }
-    }   
+    }
 
     @Override
-    public void updateThresholdData(SSDispMonSwellData sssd)
-    {
+    public void updateThresholdData(SSDispMonSwellData sssd) {
         updateDataArray(sssd);
-        populateList();        
+        populateList();
     }
 }
-
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
index 69e52d9916..2e7369935a 100755
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
@@ -27,7 +27,6 @@ import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
@@ -56,7 +55,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * Oct 27, 2014 3667       skorolev    Cleaned code.
  * Feb 10, 2015 3886       skorolev    Changed confirmation message.
  * Aug 17, 2015 3841       skorolev    Corrected handleOkBtnSelection.
- * 
+ * Dec 26, 2015 5115       skorolev    Corrected imports.
  * 
  * </pre>
  * 
@@ -150,7 +149,7 @@ public class SSMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
     public FSSObsMonitorConfigurationManager getInstance() {
         if (configMgr == null) {
             configMgr = FSSObsMonitorConfigurationManager
-                    .getInstance(MonName.ss);
+                    .getInstance(AppName.SAFESEAS);
         }
         return configMgr;
     }
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
old mode 100755
new mode 100644
index adc9cc68c5..facc39bb34
--- a/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSZoneTableDlg.java
@@ -29,8 +29,9 @@ import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.dataplugin.fog.FogRecord.FOG_THREAT;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.common.monitor.data.ObConst.DisplayVarName;
 import com.raytheon.uf.viz.monitor.IMonitor;
@@ -41,7 +42,6 @@ import com.raytheon.uf.viz.monitor.events.IMonitorThresholdEvent;
 import com.raytheon.uf.viz.monitor.listeners.IMonitorListener;
 import com.raytheon.uf.viz.monitor.safeseas.SafeSeasMonitor;
 import com.raytheon.uf.viz.monitor.ui.dialogs.ZoneTableDlg;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
 
 /**
  * SAFESEAS Zone Table Dialog
@@ -328,7 +328,7 @@ public class SSZoneTableDlg extends ZoneTableDlg {
     protected FSSObsMonitorConfigurationManager getMonitorAreaConfigInstance() {
         if (configMgr == null || configMgr.isPopulated()) {
             configMgr = FSSObsMonitorConfigurationManager
-                    .getInstance(MonName.ss);
+                    .getInstance(AppName.SAFESEAS);
         }
         return configMgr;
     }
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/DmdDisplayFilterDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/DmdDisplayFilterDlg.java
index 4542a1e54b..9fee948f49 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/DmdDisplayFilterDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/DmdDisplayFilterDlg.java
@@ -51,6 +51,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Nov 12, 2009 3039       lvenable     Initial creation.
  * 24 Jul 2013 #2143       skorolev     Changes for non-blocking dialog.
  * Aug 15, 2013  2143      mpduff       Remove resize.
+ * Nov 05, 2015 #5070      randerso     Changed to use system font name (not AWT)
+ * 
  * </pre>
  * 
  * @author lvenable
@@ -153,7 +155,7 @@ public class DmdDisplayFilterDlg extends CaveSWTDialog implements
      */
     private void initData() {
         scanCfg = SCANConfig.getInstance();
-        lrgLabelFont = new Font(getDisplay(), "Monospaced", 12, SWT.BOLD);
+        lrgLabelFont = new Font(getDisplay(), "Monospace", 12, SWT.BOLD);
         smLabelFont = new Font(getDisplay(), "Sans", 10, SWT.BOLD);
     }
 
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/StormCellIdDisplayDlg.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/StormCellIdDisplayDlg.java
index cfb0ffe75d..f33f33aef1 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/StormCellIdDisplayDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/StormCellIdDisplayDlg.java
@@ -56,6 +56,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * ------------ ---------- ----------- --------------------------
  * 24 Jul 2013  #2143      skorolev    Changes for non-blocking dialogs.
  * 15 Aug 2013   2143      mpduff      Remove resize.
+ * 05 Nov 2015  #5070      randerso    Changed to use system font name (not AWT)
+ * 
  * </pre>
  * 
  * @author
@@ -240,7 +242,7 @@ public class StormCellIdDisplayDlg extends CaveSWTDialog implements
     protected void initializeComponents(Shell shell) {
         // Initialize all of the controls and layouts
         scanCfg = SCANConfig.getInstance();
-        lrgLabelFont = new Font(getDisplay(), "Monospaced", 12, SWT.BOLD);
+        lrgLabelFont = new Font(getDisplay(), "Monospace", 12, SWT.BOLD);
         smLabelFont = new Font(getDisplay(), "Sans", 10, SWT.BOLD);
         attrUnitMap = scanCfg.getClutterAttributes(ScanTables.CELL);
 
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/ThreeValueSliderCanvas.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/ThreeValueSliderCanvas.java
index 36331bed5a..82531c09d6 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/ThreeValueSliderCanvas.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/ThreeValueSliderCanvas.java
@@ -41,6 +41,22 @@ import org.eclipse.swt.widgets.Display;
 
 import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables;
 
+/**
+ * Three Value Slider Canvas
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Nov 05, 2015 #5070      randerso    Changed to use system font name (not AWT)
+ * 
+ * </pre>
+ * 
+ * @author randerso
+ * @version 1.0
+ */
 public class ThreeValueSliderCanvas {
     private final Composite parentComp;
 
@@ -202,7 +218,7 @@ public class ThreeValueSliderCanvas {
         midLblRect = new Rectangle(0, 0, 0, 0);
         lowerLblRect = new Rectangle(0, 0, 0, 0);
 
-        labelFont = new Font(display, "Monospaced", 10, SWT.BOLD);
+        labelFont = new Font(display, "Monospace", 10, SWT.BOLD);
         mousePt = new Point(0, 0);
         upperRegion = new Region(display);
         midRegion = new Region(display);
@@ -222,6 +238,7 @@ public class ThreeValueSliderCanvas {
 
         canvas.setLayoutData(gd);
         canvas.addPaintListener(new PaintListener() {
+            @Override
             public void paintControl(PaintEvent e) {
                 drawCanvas(e.gc);
             }
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TwoValueSliderCanvas.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TwoValueSliderCanvas.java
index da104f7c56..6d7362519d 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TwoValueSliderCanvas.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/TwoValueSliderCanvas.java
@@ -39,149 +39,188 @@ import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
-public class TwoValueSliderCanvas
-{
+/**
+ * TODO Add Description
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Nov 05, 2015 #5070      randerso    Changed to use system font name (not AWT)
+ * 
+ * </pre>
+ * 
+ * @author randerso
+ * @version 1.0
+ */
+public class TwoValueSliderCanvas {
+    // TODO: is this class redundant with
+    // com.raytheon.viz.ui.widgets.TwoValueSliderCanvas
     private Composite parentComp;
+
     private Display display;
-    
+
     private Color blackColor;
+
     private Color greyColor;
+
     private Color arrowAndLabelColor;
+
     private Color canvasBgColor;
-    
+
     /*
      * Canvas information
      */
-    private Canvas canvas;    
-    private final int CANVAS_WIDTH = 250;  
+    private Canvas canvas;
+
+    private final int CANVAS_WIDTH = 250;
+
     private final int CANVAS_HEIGHT = 50;
-    
+
     /*
      * Bar information.
      */
     private int barBottomYCoord = 45;
+
     private int barWidth = 200;
+
     private int barHeight = 10;
+
     private int barXCoord = 25;
+
     private int barYCoord = 35;
-    
+
     /*
      * Upper arrow, label and values
-     */    
+     */
     private Region upperRegion;
-    private int[] upperPtArray = new int[]{0,0};
+
+    private int[] upperPtArray = new int[] { 0, 0 };
+
     private int upperArrowXCoord = 150;
+
     private Rectangle upperLblRect;
+
     private String upperStr;
+
     private int upperLblYCoord = 1;
+
     private boolean moveUpper = false;
+
     private Double upperDisplayVal = 0.0;
-    
+
     /*
      * Lower arrow, label and values
-     */    
+     */
     private Region lowerRegion;
-    private int[] lowerPtArray = new int[]{0,0};
+
+    private int[] lowerPtArray = new int[] { 0, 0 };
+
     private int lowerArrowXCoord = 50;
+
     private Rectangle lowerLblRect;
+
     private String lowerStr;
+
     private int lowerLblYCoord = 14;
+
     private Color middleColor;
+
     private boolean moveLower = false;
+
     private Double lowerDisplayVal = 0.0;
-    
+
     /*
      * Mouse information.
      */
-    private Point mousePt;    
+    private Point mousePt;
+
     private boolean mouseDown = false;
-    
+
     /*
      * Font/text information
      */
     private Font labelFont;
+
     private int textWidth = 0;
+
     private int textHeight = 0;
-    
+
     /*
      * Min/Range/Increment information
      */
     private double minValue = Double.NaN;
+
     private double rangeValue = Double.NaN;
+
     private double incValue = Double.NaN;
-    
+
     private double incPerPixel = Double.NaN;
+
     private boolean displayAtInt = false;
-    
+
     private String formatStr;
-    
-    public TwoValueSliderCanvas(Composite parentComp, double min, double range, double inc,
-            double startingUpperVal, double startingLowerVal)
-    {
+
+    public TwoValueSliderCanvas(Composite parentComp, double min, double range,
+            double inc, double startingUpperVal, double startingLowerVal) {
         this.parentComp = parentComp;
-        
+
         display = this.parentComp.getDisplay();
-        
+
         setValuesNoRedraw(min, range, inc, startingUpperVal, startingLowerVal);
-        
+
         init();
         createCanvas();
     }
-    
-    private void init()
-    {
+
+    private void init() {
         canvasBgColor = new Color(display, 142, 122, 110);
         arrowAndLabelColor = display.getSystemColor(SWT.COLOR_WHITE);
         middleColor = new Color(display, 110, 150, 110);
         blackColor = display.getSystemColor(SWT.COLOR_BLACK);
         greyColor = display.getSystemColor(SWT.COLOR_GRAY);
-        
-        upperLblRect = new Rectangle(0,0,0,0);
-        lowerLblRect = new Rectangle(0,0,0,0);
-        
-        labelFont = new Font(display, "Monospaced", 10, SWT.BOLD);
-        mousePt = new Point(0,0);
+
+        upperLblRect = new Rectangle(0, 0, 0, 0);
+        lowerLblRect = new Rectangle(0, 0, 0, 0);
+
+        labelFont = new Font(display, "Monospace", 10, SWT.BOLD);
+        mousePt = new Point(0, 0);
         upperRegion = new Region(display);
         lowerRegion = new Region(display);
-        
+
         makeCalculations();
     }
-    
-    private void createCanvas()
-    {        
+
+    private void createCanvas() {
         canvas = new Canvas(parentComp, SWT.DOUBLE_BUFFERED | SWT.BORDER);
-        //canvas = new Canvas(shell, SWT.NO_BACKGROUND);
+        // canvas = new Canvas(shell, SWT.NO_BACKGROUND);
         GridData gd = new GridData(SWT.DEFAULT, SWT.TOP, false, true);
         gd.heightHint = CANVAS_HEIGHT;
         gd.widthHint = CANVAS_WIDTH;
-        
+
         canvas.setSize(CANVAS_WIDTH, CANVAS_HEIGHT);
-        
+
         canvas.setLayoutData(gd);
-        canvas.addPaintListener(new PaintListener()
-        {
-            public void paintControl(PaintEvent e)
-            {                                
+        canvas.addPaintListener(new PaintListener() {
+            @Override
+            public void paintControl(PaintEvent e) {
                 drawCanvas(e.gc);
             }
         });
-        
-        canvas.addMouseListener(new MouseAdapter()
-        {
+
+        canvas.addMouseListener(new MouseAdapter() {
             @Override
-            public void mouseDown(MouseEvent e)
-            {
-                if (upperRegion.contains(e.x, e.y) == true ||
-                        upperLblRect.contains(e.x, e.y) == true)
-                {
+            public void mouseDown(MouseEvent e) {
+                if (upperRegion.contains(e.x, e.y) == true
+                        || upperLblRect.contains(e.x, e.y) == true) {
                     mousePt.x = e.x;
                     mousePt.y = e.y;
                     mouseDown = true;
                     moveUpper = true;
-                }
-                else if (lowerRegion.contains(e.x, e.y) == true ||
-                        lowerLblRect.contains(e.x, e.y) == true)
-                {
+                } else if (lowerRegion.contains(e.x, e.y) == true
+                        || lowerLblRect.contains(e.x, e.y) == true) {
                     mousePt.x = e.x;
                     mousePt.y = e.y;
                     mouseDown = true;
@@ -190,80 +229,74 @@ public class TwoValueSliderCanvas
             }
 
             @Override
-            public void mouseUp(MouseEvent e)
-            {
+            public void mouseUp(MouseEvent e) {
                 mouseDown = false;
                 moveLower = false;
                 moveUpper = false;
-            }            
+            }
         });
-        
-        canvas.addMouseMoveListener(new MouseMoveListener()
-        {
+
+        canvas.addMouseMoveListener(new MouseMoveListener() {
             @Override
-            public void mouseMove(MouseEvent e)
-            {
-                handleMouseMove(e);                
-            }            
+            public void mouseMove(MouseEvent e) {
+                handleMouseMove(e);
+            }
         });
-        
-        canvas.addDisposeListener(new DisposeListener()
-        {
+
+        canvas.addDisposeListener(new DisposeListener() {
             @Override
-            public void widgetDisposed(DisposeEvent e)
-            {
+            public void widgetDisposed(DisposeEvent e) {
                 upperRegion.dispose();
                 lowerRegion.dispose();
                 labelFont.dispose();
                 canvasBgColor.dispose();
                 middleColor.dispose();
-            }            
+            }
         });
     }
-    
-    private void drawCanvas(GC gc)
-    { 
+
+    private void drawCanvas(GC gc) {
         gc.setAntialias(SWT.ON);
         gc.setFont(labelFont);
         gc.setBackground(canvasBgColor);
-        
+
         gc.fillRectangle(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
-        
+
         gc.setBackground(greyColor);
         gc.fillRectangle(barXCoord, barYCoord, barWidth, barHeight);
-        
+
         gc.setBackground(middleColor);
-        gc.fillRectangle(lowerArrowXCoord, barYCoord, barWidth+25-lowerArrowXCoord, barHeight);
-                
+        gc.fillRectangle(lowerArrowXCoord, barYCoord, barWidth + 25
+                - lowerArrowXCoord, barHeight);
+
         gc.setBackground(greyColor);
-        gc.fillRectangle(upperArrowXCoord, barYCoord, barWidth+25-upperArrowXCoord, barHeight);
-        
+        gc.fillRectangle(upperArrowXCoord, barYCoord, barWidth + 25
+                - upperArrowXCoord, barHeight);
+
         gc.setForeground(blackColor);
         gc.drawRectangle(barXCoord, barYCoord, barWidth, barHeight);
-        
+
         updateLowerArrow(gc);
         updateLowerLabel(gc);
-        
-        updateUpperArrow(gc);        
+
+        updateUpperArrow(gc);
         updateUpperLabel(gc);
     }
-    
-    private void updateUpperArrow(GC gc)
-    {
+
+    private void updateUpperArrow(GC gc) {
         upperRegion.subtract(upperPtArray);
-        upperPtArray = new int[]{upperArrowXCoord, barBottomYCoord - barHeight - 3,
-                upperArrowXCoord + 4, barBottomYCoord,
-                upperArrowXCoord - 4, barBottomYCoord};
+        upperPtArray = new int[] { upperArrowXCoord,
+                barBottomYCoord - barHeight - 3, upperArrowXCoord + 4,
+                barBottomYCoord, upperArrowXCoord - 4, barBottomYCoord };
         upperRegion.add(upperPtArray);
-        
+
         gc.setBackground(arrowAndLabelColor);
         gc.fillPolygon(upperPtArray);
         gc.setForeground(blackColor);
         gc.drawPolygon(upperPtArray);
     }
-    
-    private void updateUpperLabel(GC gc)
-    {
+
+    private void updateUpperLabel(GC gc) {
         gc.setForeground(arrowAndLabelColor);
         upperStr = calcDisplayString(upperDisplayVal);
         int lblXCoord = upperArrowXCoord - (textWidth * upperStr.length() / 2);
@@ -273,173 +306,141 @@ public class TwoValueSliderCanvas
         upperLblRect.width = textWidth * upperStr.length();
         upperLblRect.height = textHeight;
     }
-    
-    private void updateLowerArrow(GC gc)
-    {
+
+    private void updateLowerArrow(GC gc) {
         lowerRegion.subtract(lowerPtArray);
-        lowerPtArray = new int[]{lowerArrowXCoord, barBottomYCoord - barHeight - 3,
-                lowerArrowXCoord + 4, barBottomYCoord,
-                lowerArrowXCoord - 4, barBottomYCoord};
+        lowerPtArray = new int[] { lowerArrowXCoord,
+                barBottomYCoord - barHeight - 3, lowerArrowXCoord + 4,
+                barBottomYCoord, lowerArrowXCoord - 4, barBottomYCoord };
         lowerRegion.add(lowerPtArray);
-        
+
         gc.setBackground(arrowAndLabelColor);
-        gc.fillPolygon(lowerPtArray);        
+        gc.fillPolygon(lowerPtArray);
         gc.setForeground(blackColor);
         gc.drawPolygon(lowerPtArray);
     }
-    
-    private void updateLowerLabel(GC gc)
-    {
+
+    private void updateLowerLabel(GC gc) {
         gc.setForeground(arrowAndLabelColor);
         lowerStr = calcDisplayString(lowerDisplayVal);
-        int lblXCoord = (int)(lowerArrowXCoord - ((double)textWidth * (double)lowerStr.length() / 2));
+        int lblXCoord = (int) (lowerArrowXCoord - ((double) textWidth
+                * (double) lowerStr.length() / 2));
         gc.drawString(lowerStr, lblXCoord, lowerLblYCoord, true);
         lowerLblRect.x = lblXCoord;
         lowerLblRect.y = lowerLblYCoord;
         lowerLblRect.width = textWidth * lowerStr.length();
         lowerLblRect.height = textHeight;
     }
-    
-    private void handleMouseMove(MouseEvent e)
-    {
-        if (mouseDown == false)
-        {          
+
+    private void handleMouseMove(MouseEvent e) {
+        if (mouseDown == false) {
             return;
         }
-        
-        if (moveUpper == true)
-        {
+
+        if (moveUpper == true) {
             int xDiff = e.x - mousePt.x;
             upperArrowXCoord += xDiff;
 
-            if (upperArrowXCoord > 225)
-            {
+            if (upperArrowXCoord > 225) {
                 upperArrowXCoord = 225;
-            }
-            else if (upperArrowXCoord < 25)
-            {
+            } else if (upperArrowXCoord < 25) {
                 upperArrowXCoord = 25;
-            }
-            else if (upperArrowXCoord < lowerArrowXCoord)
-            {
+            } else if (upperArrowXCoord < lowerArrowXCoord) {
                 upperArrowXCoord = lowerArrowXCoord;
-            }             
-            
+            }
+
             upperDisplayVal = calcDisplayValue(upperArrowXCoord);
-        }
-        else if (moveLower == true)
-        {
+        } else if (moveLower == true) {
             int xDiff = e.x - mousePt.x;
             lowerArrowXCoord += xDiff;
 
-            if (lowerArrowXCoord > 225)
-            {
+            if (lowerArrowXCoord > 225) {
                 lowerArrowXCoord = 225;
-            }
-            else if (lowerArrowXCoord < 25)
-            {
+            } else if (lowerArrowXCoord < 25) {
                 lowerArrowXCoord = 25;
-            }
-            else if (lowerArrowXCoord > upperArrowXCoord)
-            {
+            } else if (lowerArrowXCoord > upperArrowXCoord) {
                 lowerArrowXCoord = upperArrowXCoord;
-            }          
+            }
             lowerDisplayVal = calcDisplayValue(lowerArrowXCoord);
         }
-        
+
         mousePt.x = e.x;
         mousePt.y = e.y;
         canvas.redraw();
     }
-    
-    private void makeCalculations()
-    {
+
+    private void makeCalculations() {
         Image image = new Image(display, 100, 100);
         GC gc = new GC(image);
         gc.setFont(labelFont);
-        
+
         textWidth = gc.getFontMetrics().getAverageCharWidth();
-        textHeight = gc.getFontMetrics().getHeight();   
-        
+        textHeight = gc.getFontMetrics().getHeight();
+
         gc.dispose();
         image.dispose();
     }
-    
-    private double calcDisplayValue(int xCoord)
-    {
+
+    private double calcDisplayValue(int xCoord) {
         double xCoordAsValue = (xCoord - barXCoord) * incPerPixel + minValue;
-        if (incValue == .25)
-        {            
+        if (incValue == .25) {
             return (Math.round(xCoordAsValue * 4.00)) / 4.00;
-        }
-        else if (incValue == .10)
-        {
+        } else if (incValue == .10) {
             return (Math.round(xCoordAsValue * 10.00)) / 10.00;
-        }
-        else
-        {
-            return (double)Math.round(xCoordAsValue);
+        } else {
+            return Math.round(xCoordAsValue);
         }
     }
-    
-    private String calcDisplayString(Double displVal)
-    {
-        if (displayAtInt == true)
-        {
+
+    private String calcDisplayString(Double displVal) {
+        if (displayAtInt == true) {
             return String.format(formatStr, Math.round(displVal));
-        }
-        else
-        {
+        } else {
             return String.format(formatStr, displVal);
         }
     }
-    
-    private int calcValueToBarXCoord(double val)
-    {
-        int result = (int)Math.round((val - minValue)/incPerPixel + barXCoord);
-        
+
+    private int calcValueToBarXCoord(double val) {
+        int result = (int) Math.round((val - minValue) / incPerPixel
+                + barXCoord);
+
         return result;
     }
-    
-    private void setValuesNoRedraw(double min, double range, double inc, double startingUpperVal, double startingLowerVal)
-    {
+
+    private void setValuesNoRedraw(double min, double range, double inc,
+            double startingUpperVal, double startingLowerVal) {
         this.minValue = min;
-        this.rangeValue = (double)Math.round(range);
+        this.rangeValue = Math.round(range);
         this.incValue = inc;
-        
-        incPerPixel = this.rangeValue / (double)barWidth;
-        
-        if (inc < 1.00)
-        {
+
+        incPerPixel = this.rangeValue / barWidth;
+
+        if (inc < 1.00) {
             displayAtInt = false;
             formatStr = "%1.2f";
-        }
-        else
-        {
+        } else {
             displayAtInt = true;
             formatStr = "%d";
         }
-        
+
         upperArrowXCoord = calcValueToBarXCoord(startingUpperVal);
         lowerArrowXCoord = calcValueToBarXCoord(startingLowerVal);
-        
+
         upperDisplayVal = calcDisplayValue(upperArrowXCoord);
         lowerDisplayVal = calcDisplayValue(lowerArrowXCoord);
     }
-    
-    public void setValues(double min, double range, double inc, double startingUpperVal, double startingLowerVal)
-    {
+
+    public void setValues(double min, double range, double inc,
+            double startingUpperVal, double startingLowerVal) {
         setValuesNoRedraw(min, range, inc, startingUpperVal, startingLowerVal);
         canvas.redraw();
     }
-    
-    public double getUpperValue()
-    {
+
+    public double getUpperValue() {
         return upperDisplayVal;
     }
-    
-    public double getLowerValue()
-    {
+
+    public double getLowerValue() {
         return lowerDisplayVal;
     }
 }
diff --git a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java
index f137892327..e8217ded3e 100644
--- a/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java
+++ b/cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java
@@ -88,6 +88,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * May 09, 2014   3145     mpduff      Dispose the ScanDrawer font
  * Aug 14, 2014 3523       mapeters    Updated deprecated {@link DrawableString#textStyle} 
  *                                     assignments.
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author dhladky
@@ -183,8 +185,9 @@ public class ScanResource extends
                     try {
                         scan = (ScanRecord) pdo;
                         if (scan.getIcao().equals(resourceData.icao)
-                                && scan.getType().equals(getTable().name()))
+                                && scan.getType().equals(getTable().name())) {
                             addRecord(scan);
+                        }
                     } catch (Exception e) {
                         statusHandler.handle(Priority.PROBLEM,
                                 "Error updating SCAN resource", e);
@@ -308,7 +311,7 @@ public class ScanResource extends
 
                 if (getScanDrawer().font == null) {
                     getScanDrawer().setFont(
-                            target.initializeFont("Dialog", 11, null));
+                            target.initializeFont("Dialog", 9, null));
                 }
 
                 if (getScan().getTableKeys(getTable(), resourceData.icao,
@@ -418,9 +421,8 @@ public class ScanResource extends
                 .getMagnification().floatValue();
 
         DrawableString[] strings = new DrawableString[4];
-        strings[0] = new DrawableString(
-                getScanDrawer().sdc.getAttrName(), getCapability(
-                        ColorableCapability.class).getColor());
+        strings[0] = new DrawableString(getScanDrawer().sdc.getAttrName(),
+                getCapability(ColorableCapability.class).getColor());
         strings[0].basics.x = pixel[0];
         strings[0].basics.y = pixel[1];
 
diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
old mode 100755
new mode 100644
index 2b54320588..1da18b3433
--- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
+++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/SnowMonitor.java
@@ -30,8 +30,8 @@ import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.jms.notification.NotificationMessage;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.viz.core.alerts.AlertMessage;
 import com.raytheon.uf.viz.monitor.IMonitor;
 import com.raytheon.uf.viz.monitor.Monitor;
@@ -72,6 +72,10 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * Sep 04, 2014 3220       skorolev    Updated configUpdate method and added updateMonitoringArea.
  * Sep 18, 2015 3873       skorolev    Removed common definitions. Replaced deprecated NotificationMessage.
  * Dec 17, 2015 3873       dhladky     Abstracted handling of dialogTime and Zone dialog events.
+ * <<<<<<< HEAD
+ * =======
+ * Jan 04, 2016 5115       skorolev    Corrected imports and replaced AppName with MonName.
+ * >>>>>>> Omaha #5115 - Added AlertViz image management for FSSObs data.
  * 
  * </pre>
  * 
@@ -98,7 +102,7 @@ public class SnowMonitor extends ObsMonitor implements ISnowResourceListener {
      * This object contains all observation data necessary for the table dialogs
      * and trending plots
      */
-    private ObMultiHrsReports obData;
+    private final ObMultiHrsReports obData;
 
     /** Array of snow listeners **/
     private final List<ISnowResourceListener> snowResources = new ArrayList<ISnowResourceListener>();
@@ -109,7 +113,7 @@ public class SnowMonitor extends ObsMonitor implements ISnowResourceListener {
     private SnowMonitor() {
         pluginPatterns.add(fssPattern);
         snowConfig = FSSObsMonitorConfigurationManager
-                .getInstance(MonName.snow);
+                .getInstance(AppName.SNOW);
         updateMonitoringArea();
         initObserver(OBS, this);
         obData = new ObMultiHrsReports(CommonConfig.AppName.SNOW);
@@ -343,11 +347,11 @@ public class SnowMonitor extends ObsMonitor implements ISnowResourceListener {
     }
 
     /**
-     * Event fire is different, Override.
-     * SnowResource sets the Drawtime.
+     * Event fire is different, Override. SnowResource sets the Drawtime.
      * 
      * @param dialogTime
      */
+    @Override
     public void updateDialogTime(Date dialogTime) {
         if (zoneDialog.linkedToFrame) {
             this.dialogTime = dialogTime;
diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/threshold/SnowThresholdMgr.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/threshold/SnowThresholdMgr.java
index ed385ac564..16c2145546 100755
--- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/threshold/SnowThresholdMgr.java
+++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/threshold/SnowThresholdMgr.java
@@ -22,10 +22,10 @@ package com.raytheon.uf.viz.monitor.snow.threshold;
 import java.util.ArrayList;
 
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SnowDisplay;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SnowMonitor;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SnowDisplay;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SnowMonitor;
 
 /**
  * This class manages the Snow thresholds for display and monitor.
@@ -41,6 +41,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SnowMonitor;
  * May 21, 2014  3086      skorolev     Cleaned code.
  * Sep 04, 2014  3220      skorolev     Removed "site".
  * Sep 18, 2015  3873      skorolev     Adjusted to AppName and removed areaConfigMgr.
+ * Dec 26, 2015  5114      skorolev     Corrected imports.
  * 
  * </pre>
  * 
diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayMeteoTab.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayMeteoTab.java
old mode 100644
new mode 100755
index eb34fa2508..93c03a3616
--- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayMeteoTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayMeteoTab.java
@@ -29,14 +29,14 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SnowDisplay;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.data.RangesUtil;
 import com.raytheon.uf.viz.monitor.snow.threshold.SnowDisplayMeteoData;
 import com.raytheon.uf.viz.monitor.snow.threshold.SnowThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SnowDisplay;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
 /**
  * Snow Display Meteo Table.
@@ -48,6 +48,7 @@ import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 21, 2014 3086       skorolev    Cleaned code.
+ * Dec 26, 2015 5114       skorolev    Corrected imports.
  * 
  * </pre>
  * 
diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayProductTab.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayProductTab.java
old mode 100644
new mode 100755
index 2054b28ce0..0718964e1c
--- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayProductTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayProductTab.java
@@ -28,331 +28,374 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SnowDisplay;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.data.RangesUtil;
 import com.raytheon.uf.viz.monitor.snow.threshold.SnowDisplayProductData;
 import com.raytheon.uf.viz.monitor.snow.threshold.SnowThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SnowDisplay;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
-public class SnowDisplayProductTab extends TabItemComp implements IUpdateDisplayProduct
-{
+/**
+ * SNOW Display Product Table.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 26, 2015 5115       skorolev    Corrected imports.
+ * 
+ * </pre>
+ * 
+ * @author skorolev
+ * @version 1.0
+ */
+public class SnowDisplayProductTab extends TabItemComp implements
+        IUpdateDisplayProduct {
     private SnowDisplayProductEditDlg productEditDlg;
-    
+
     private ArrayList<String> areaIDArray;
-    
+
     private ArrayList<SnowDisplayProductData> snowDataArray;
-    
-    public SnowDisplayProductTab(TabFolder parent, DataUsageKey duKey)
-    {
+
+    public SnowDisplayProductTab(TabFolder parent, DataUsageKey duKey) {
         super(parent, duKey);
     }
 
-    @Override    
-    protected void createListHeader(Composite parentComp)
-    {
+    @Override
+    protected void createListHeader(Composite parentComp) {
         Composite lblComp = new Composite(parentComp, SWT.NONE);
         GridLayout gl = new GridLayout(5, false);
-        gl.horizontalSpacing = 0;   
+        gl.horizontalSpacing = 0;
         gl.marginHeight = 0;
         gl.marginWidth = 0;
         lblComp.setLayout(gl);
-        
+
         /*
          * Create filler label.
          */
         GridData gd = new GridData(68, SWT.DEFAULT);
         Label fillerLbl = new Label(lblComp, SWT.CENTER);
         fillerLbl.setLayoutData(gd);
-        
+
         /*
          * Blizzard Warning
          */
-        Composite blizzardComp = createGroupComposite(lblComp, 4, "Blizzard Warning");
+        Composite blizzardComp = createGroupComposite(lblComp, 4,
+                "Blizzard Warning");
         createLabelComp(blizzardComp, "Vis(mi)", "", true);
         createLabelComp(blizzardComp, "Wind", "Speed(kt)", false);
         createLabelComp(blizzardComp, "Gust", "Speed(kt)", false);
-        createLabelComp(blizzardComp, "Peak", "Wind(kt)", false);        
-        
+        createLabelComp(blizzardComp, "Peak", "Wind(kt)", false);
+
         /*
          * Freezing Precip
          */
-        Composite freezePrecipComp = createGroupComposite(lblComp, 2, "Freezing Precip");
+        Composite freezePrecipComp = createGroupComposite(lblComp, 2,
+                "Freezing Precip");
         createLabelComp(freezePrecipComp, "Temp(F)", "", false);
         createLabelComp(freezePrecipComp, "Hourly", "Prcp(in)", false);
-        
+
         /*
          * Heavy Snow Warning
          */
-        Composite heavySnowWarnComp = createGroupComposite(lblComp, 3, "Heavy Snow Warning");
+        Composite heavySnowWarnComp = createGroupComposite(lblComp, 3,
+                "Heavy Snow Warning");
         createLabelComp(heavySnowWarnComp, "SNINCR", "Hr(in)", false);
         createLabelComp(heavySnowWarnComp, "SNINCR", "Tot(in)", false);
         createLabelComp(heavySnowWarnComp, "Snow", "Depth(in)", false);
-    }    
-    
+    }
+
     @Override
-    protected void populateList()
-    {   
-        if (snowDataArray == null)
-        {
+    protected void populateList() {
+        if (snowDataArray == null) {
             createDataArray();
         }
-        
+
         boolean update = false;
-        if (dataList.getItemCount() > 0)
-        {
+        if (dataList.getItemCount() > 0) {
             update = true;
         }
-        
+
         RangesUtil rangeUtil = RangesUtil.getInstance();
-        
+
         areaIDArray = new ArrayList<String>();
-        
+
         String tmpVisStr;
         String currentAreaID;
-        
+
         double visVal = 0.0;
-        
-        StringBuilder sb = null;       
+
+        StringBuilder sb = null;
         SnowDisplayProductData sdpd = null;
-        
-        for (int i = 0; i < snowDataArray.size(); i++)
-        {
+
+        for (int i = 0; i < snowDataArray.size(); i++) {
             sb = new StringBuilder();
-            
+
             sdpd = snowDataArray.get(i);
-            
+
             currentAreaID = sdpd.getAreaID();
             areaIDArray.add(currentAreaID);
-            
+
             sb.append(String.format(areaIdFmt, currentAreaID));
-            
+
             /*
              * Blizzard Warning
-             */            
-            visVal = sdpd.getBlizWrnVisR();            
-            tmpVisStr = rangeUtil.getVisString((int)visVal);
+             */
+            visVal = sdpd.getBlizWrnVisR();
+            tmpVisStr = rangeUtil.getVisString((int) visVal);
             sb.append(String.format(dataFmt, tmpVisStr));
-            
-            visVal = sdpd.getBlizWrnVisY();           
-            tmpVisStr = rangeUtil.getVisString((int)visVal);
+
+            visVal = sdpd.getBlizWrnVisY();
+            tmpVisStr = rangeUtil.getVisString((int) visVal);
             sb.append(String.format(dataFmt, tmpVisStr));
-            
-            appendIntData(sb, sdpd.getBlizWrnWindSpdR(), sdpd.getBlizWrnWindSpdY());
-            appendIntData(sb, sdpd.getBlizWrnGustSpdR(), sdpd.getBlizWrnGustSpdY());
-            appendIntData(sb, sdpd.getBlizWrnPeakWindR(), sdpd.getBlizWrnPeakWindY());
-            
+
+            appendIntData(sb, sdpd.getBlizWrnWindSpdR(),
+                    sdpd.getBlizWrnWindSpdY());
+            appendIntData(sb, sdpd.getBlizWrnGustSpdR(),
+                    sdpd.getBlizWrnGustSpdY());
+            appendIntData(sb, sdpd.getBlizWrnPeakWindR(),
+                    sdpd.getBlizWrnPeakWindY());
+
             /*
              * Freezing Precip
              */
-            appendIntData(sb, sdpd.getFrzPrecipTempR(), sdpd.getFrzPrecipTempY());
-            appendDecimalData(sb, sdpd.getFrzPrecipHrlyPrcpR(), sdpd.getFrzPrecipHrlyPrcpY());
-            
+            appendIntData(sb, sdpd.getFrzPrecipTempR(),
+                    sdpd.getFrzPrecipTempY());
+            appendDecimalData(sb, sdpd.getFrzPrecipHrlyPrcpR(),
+                    sdpd.getFrzPrecipHrlyPrcpY());
+
             /*
              * Heavy Snow Warning
-             */ 
-            appendIntData(sb, sdpd.getHvySnowSnincrHrR(), sdpd.getHvySnowSnincrHrY());
-            appendIntData(sb, sdpd.getHvySnowSnincrTotR(), sdpd.getHvySnowSnincrTotY());
+             */
+            appendIntData(sb, sdpd.getHvySnowSnincrHrR(),
+                    sdpd.getHvySnowSnincrHrY());
+            appendIntData(sb, sdpd.getHvySnowSnincrTotR(),
+                    sdpd.getHvySnowSnincrTotY());
             appendIntData(sb, sdpd.getHvySnowDepthR(), sdpd.getHvySnowDepthY());
-            
+
             /*
              * Append a space and add the data line to the list.
              */
             sb.append(" ");
-            
-            if (update == true)
-            {
+
+            if (update == true) {
                 dataList.setItem(i, sb.toString());
-            }
-            else
-            {
+            } else {
                 dataList.add(sb.toString());
-            }            
+            }
         }
-        
+
         packListControls();
     }
-    
-    private void createDataArray()
-    {
+
+    private void createDataArray() {
         snowDataArray = new ArrayList<SnowDisplayProductData>();
-        
-        SnowThresholdMgr stm = SnowThresholdMgr.getInstance();   
-        
+
+        SnowThresholdMgr stm = SnowThresholdMgr.getInstance();
+
         String xmlKey;
-        String areaID;       
-        
+        String areaID;
+
         ThresholdsXML threshXML = stm.getThresholdsXmlData(duKey);
-        
+
         ArrayList<AreaXML> areasArray = threshXML.getAreas();
-        
-        for (AreaXML area : areasArray)
-        {
+
+        for (AreaXML area : areasArray) {
             areaID = area.getAreaId();
             SnowDisplayProductData sdpd = new SnowDisplayProductData();
-            
+
             sdpd.setAreaID(areaID);
 
             /*
              * Blizzard Warning
              */
             xmlKey = SnowDisplay.SNOW_DISP_PROD_BLIZZ_VIS.getXmlKey();
-            sdpd.setBlizWrnVisR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdpd.setBlizWrnVisY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdpd.setBlizWrnVisR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdpd.setBlizWrnVisY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_BLIZZ_WIND_SPEED.getXmlKey();
-            sdpd.setBlizWrnWindSpdR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdpd.setBlizWrnWindSpdY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdpd.setBlizWrnWindSpdR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdpd.setBlizWrnWindSpdY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_BLIZZ_GUST_SPEED.getXmlKey();
-            sdpd.setBlizWrnGustSpdR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdpd.setBlizWrnGustSpdY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdpd.setBlizWrnGustSpdR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdpd.setBlizWrnGustSpdY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_BLIZZ_PEAK_WIND.getXmlKey();
-            sdpd.setBlizWrnPeakWindR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdpd.setBlizWrnPeakWindY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
+            sdpd.setBlizWrnPeakWindR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdpd.setBlizWrnPeakWindY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
 
             /*
              * Freezing Precip
              */
             xmlKey = SnowDisplay.SNOW_DISP_PROD_FRZ_TEMP.getXmlKey();
-            sdpd.setFrzPrecipTempR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdpd.setFrzPrecipTempY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdpd.setFrzPrecipTempR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdpd.setFrzPrecipTempY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_FRZ_HOURLY_PRECIP.getXmlKey();
-            sdpd.setFrzPrecipHrlyPrcpR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdpd.setFrzPrecipHrlyPrcpY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdpd.setFrzPrecipHrlyPrcpR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdpd.setFrzPrecipHrlyPrcpY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Heavy Snow Warning
              */
             xmlKey = SnowDisplay.SNOW_DISP_PROD_HSW_SNINCR_HOURLY.getXmlKey();
-            sdpd.setHvySnowSnincrHrR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdpd.setHvySnowSnincrHrY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdpd.setHvySnowSnincrHrR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdpd.setHvySnowSnincrHrY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_HSW_SNINCR_TOTAL.getXmlKey();
-            sdpd.setHvySnowSnincrTotR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdpd.setHvySnowSnincrTotY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdpd.setHvySnowSnincrTotR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdpd.setHvySnowSnincrTotY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_HSW_SNOW_DEPTH.getXmlKey();
-            sdpd.setHvySnowDepthR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdpd.setHvySnowDepthY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdpd.setHvySnowDepthR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdpd.setHvySnowDepthY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Add data to array.
              */
             snowDataArray.add(sdpd);
         }
     }
-    
-    private SnowDisplayProductData getDataAtFirstSelection()
-    {        
+
+    private SnowDisplayProductData getDataAtFirstSelection() {
         int index = dataList.getSelectionIndex();
-        
-        return snowDataArray.get(index);        
+
+        return snowDataArray.get(index);
     }
-    
-    private void updateDataArray(SnowDisplayProductData sdpd)
-    {        
-        int[] dataListIndexes = dataList.getSelectionIndices();        
+
+    private void updateDataArray(SnowDisplayProductData sdpd) {
+        int[] dataListIndexes = dataList.getSelectionIndices();
         int currentIndex = 0;
-        
-        for (int i = 0; i < dataListIndexes.length; i++)
-        {
+
+        for (int i = 0; i < dataListIndexes.length; i++) {
             currentIndex = dataListIndexes[i];
-            
+
             snowDataArray.get(currentIndex).updateData(sdpd);
-        }        
+        }
     }
-    
+
     @Override
-    public void commitDataToXML()
-    {
+    public void commitDataToXML() {
         SnowThresholdMgr stm = SnowThresholdMgr.getInstance();
-        
+
         String xmlKey;
         String areaID;
-        
-        for (SnowDisplayProductData sdpd : snowDataArray)
-        {
+
+        for (SnowDisplayProductData sdpd : snowDataArray) {
             areaID = sdpd.getAreaID();
-            
+
             /*
              * Blizzard Warning
              */
             xmlKey = SnowDisplay.SNOW_DISP_PROD_BLIZZ_VIS.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdpd.getBlizWrnVisR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdpd.getBlizWrnVisY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdpd.getBlizWrnVisR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdpd.getBlizWrnVisY());
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_BLIZZ_WIND_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdpd.getBlizWrnWindSpdR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdpd.getBlizWrnWindSpdY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdpd.getBlizWrnWindSpdR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdpd.getBlizWrnWindSpdY());
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_BLIZZ_GUST_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdpd.getBlizWrnGustSpdR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdpd.getBlizWrnGustSpdY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdpd.getBlizWrnGustSpdR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdpd.getBlizWrnGustSpdY());
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_BLIZZ_PEAK_WIND.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdpd.getBlizWrnPeakWindR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdpd.getBlizWrnPeakWindY());
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdpd.getBlizWrnPeakWindR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdpd.getBlizWrnPeakWindY());
 
             /*
              * Freezing Precip
              */
             xmlKey = SnowDisplay.SNOW_DISP_PROD_FRZ_TEMP.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdpd.getFrzPrecipTempR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdpd.getFrzPrecipTempY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdpd.getFrzPrecipTempR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdpd.getFrzPrecipTempY());
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_FRZ_HOURLY_PRECIP.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdpd.getFrzPrecipHrlyPrcpR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdpd.getFrzPrecipHrlyPrcpY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdpd.getFrzPrecipHrlyPrcpR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdpd.getFrzPrecipHrlyPrcpY());
+
             /*
              * Heavy Snow Warning
              */
             xmlKey = SnowDisplay.SNOW_DISP_PROD_HSW_SNINCR_HOURLY.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdpd.getHvySnowSnincrHrR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdpd.getHvySnowSnincrHrY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdpd.getHvySnowSnincrHrR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdpd.getHvySnowSnincrHrY());
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_HSW_SNINCR_TOTAL.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdpd.getHvySnowSnincrTotR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdpd.getHvySnowSnincrTotY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdpd.getHvySnowSnincrTotR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdpd.getHvySnowSnincrTotY());
+
             xmlKey = SnowDisplay.SNOW_DISP_PROD_HSW_SNOW_DEPTH.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdpd.getHvySnowDepthR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdpd.getHvySnowDepthY());
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdpd.getHvySnowDepthR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdpd.getHvySnowDepthY());
         }
     }
 
     @Override
-    public void reloadData()
-    {
+    public void reloadData() {
         dataList.removeAll();
         snowDataArray.clear();
         snowDataArray = null;
-        
-        populateList();        
+
+        populateList();
     }
 
     @Override
-    protected void editDataAction()
-    {
+    protected void editDataAction() {
         SnowDisplayProductData sdpd = getDataAtFirstSelection();
-        
-        if (productEditDlg == null)
-        {
-            productEditDlg = new SnowDisplayProductEditDlg(getParent().getShell(), sdpd, this);
+
+        if (productEditDlg == null) {
+            productEditDlg = new SnowDisplayProductEditDlg(getParent()
+                    .getShell(), sdpd, this);
             productEditDlg.open();
             productEditDlg = null;
         }
-    }   
+    }
 
     @Override
-    public void updateThresholdData(SnowDisplayProductData sdpd)
-    {
+    public void updateThresholdData(SnowDisplayProductData sdpd) {
         updateDataArray(sdpd);
-        populateList();        
+        populateList();
     }
 }
diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayWindTab.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayWindTab.java
old mode 100644
new mode 100755
index 050fa7db26..f0ea38fb09
--- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayWindTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayWindTab.java
@@ -28,289 +28,306 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SnowDisplay;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.snow.threshold.SnowDisplayWindData;
 import com.raytheon.uf.viz.monitor.snow.threshold.SnowThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SnowDisplay;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
-public class SnowDisplayWindTab extends TabItemComp implements IUpdateDisplayWind
-{
+/**
+ * SNOW Display Wind Table.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 26, 2015 5115       skorolev    Corrected imports.
+ * 
+ * </pre>
+ * 
+ * @author skorolev
+ * @version 1.0
+ */
+public class SnowDisplayWindTab extends TabItemComp implements
+        IUpdateDisplayWind {
     private SnowDisplayWindEditDlg windEditDlg;
-    
+
     private ArrayList<String> areaIDArray;
-    
+
     private ArrayList<SnowDisplayWindData> snowDataArray;
-    
-    public SnowDisplayWindTab(TabFolder parent, DataUsageKey duKey)
-    {
+
+    public SnowDisplayWindTab(TabFolder parent, DataUsageKey duKey) {
         super(parent, duKey);
     }
 
-    @Override    
-    protected void createListHeader(Composite parentComp)
-    {
+    @Override
+    protected void createListHeader(Composite parentComp) {
         Composite lblComp = new Composite(parentComp, SWT.NONE);
         GridLayout gl = new GridLayout(5, false);
-        gl.horizontalSpacing = 0;   
+        gl.horizontalSpacing = 0;
         gl.marginHeight = 0;
         gl.marginWidth = 0;
         lblComp.setLayout(gl);
-        
+
         /*
          * Create filler label.
          */
         GridData gd = new GridData(73, SWT.DEFAULT);
         Label fillerLbl = new Label(lblComp, SWT.CENTER);
         fillerLbl.setLayoutData(gd);
-        
+
         /*
          * Wind
          */
         Composite windComp = createGroupComposite(lblComp, 5, null);
-        createLabelComp(windComp, "Wind", "Speed(kt)", false);        
-        createLabelComp(windComp, "Peak", "Wind(kt)", false);   
+        createLabelComp(windComp, "Wind", "Speed(kt)", false);
+        createLabelComp(windComp, "Peak", "Wind(kt)", false);
         createLabelComp(windComp, "Gust", "Speed(kt)", false);
         createLabelComp(windComp, "Wind", "Dir(deg)\n(from)", false);
         createLabelComp(windComp, "Wind", "Dir(deg)\n(to)", false);
-    }    
-    
+    }
+
     @Override
-    protected void populateList()
-    {   
-        if (snowDataArray == null)
-        {
+    protected void populateList() {
+        if (snowDataArray == null) {
             createDataArray();
         }
-        
+
         boolean update = false;
-        if (dataList.getItemCount() > 0)
-        {
+        if (dataList.getItemCount() > 0) {
             update = true;
         }
-        
+
         areaIDArray = new ArrayList<String>();
-        
+
         String currentAreaID;
-        
-        StringBuilder sb = null;       
+
+        StringBuilder sb = null;
         SnowDisplayWindData sdwd = null;
-        
-        for (int i = 0; i < snowDataArray.size(); i++)
-        {
+
+        for (int i = 0; i < snowDataArray.size(); i++) {
             sb = new StringBuilder();
-            
+
             sdwd = snowDataArray.get(i);
-            
+
             currentAreaID = sdwd.getAreaID();
             areaIDArray.add(currentAreaID);
-            
+
             sb.append(String.format(areaIdFmt, currentAreaID));
-            
+
             /*
              * Wind Speed
-             */            
-            appendIntData(sb, sdwd.getWindWindSpeedR(), sdwd.getWindWindSpeedY());
-            
+             */
+            appendIntData(sb, sdwd.getWindWindSpeedR(),
+                    sdwd.getWindWindSpeedY());
+
             /*
              * Peak Wind
-             */            
+             */
             appendIntData(sb, sdwd.getWindPeakR(), sdwd.getWindPeakY());
-            
+
             /*
              * Gust Speed
-             */            
+             */
             appendIntData(sb, sdwd.getWindGustR(), sdwd.getWindGustY());
-            
+
             /*
              * Wind Direction From
-             */            
-            appendIntData(sb,  sdwd.getWindDirFromY(),sdwd.getWindDirFromR());
-            
+             */
+            appendIntData(sb, sdwd.getWindDirFromY(), sdwd.getWindDirFromR());
+
             /*
              * Wind Direction To
-             */            
+             */
             appendIntData(sb, sdwd.getWindDirToR(), sdwd.getWindDirToY());
-            
+
             /*
              * Append a space and add the data line to the list.
              */
             sb.append(" ");
-            
-            if (update == true)
-            {
+
+            if (update == true) {
                 dataList.setItem(i, sb.toString());
-            }
-            else
-            {
+            } else {
                 dataList.add(sb.toString());
-            }            
+            }
         }
-        
+
         packListControls();
     }
-    
-    private void createDataArray()
-    {
+
+    private void createDataArray() {
         snowDataArray = new ArrayList<SnowDisplayWindData>();
-        
-        SnowThresholdMgr stm = SnowThresholdMgr.getInstance();   
-        
+
+        SnowThresholdMgr stm = SnowThresholdMgr.getInstance();
+
         String xmlKey;
-        String areaID;       
-        
+        String areaID;
+
         ThresholdsXML threshXML = stm.getThresholdsXmlData(duKey);
-        
+
         ArrayList<AreaXML> areasArray = threshXML.getAreas();
-        
-        for (AreaXML area : areasArray)
-        {
+
+        for (AreaXML area : areasArray) {
             areaID = area.getAreaId();
             SnowDisplayWindData sdwd = new SnowDisplayWindData();
-            
+
             sdwd.setAreaID(areaID);
 
             /*
              * Wind Speed
              */
             xmlKey = SnowDisplay.SNOW_DISP_WIND_WIND_SPEED.getXmlKey();
-            sdwd.setWindWindSpeedR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdwd.setWindWindSpeedY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
+            sdwd.setWindWindSpeedR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdwd.setWindWindSpeedY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
 
             /*
              * Peak Wind
              */
             xmlKey = SnowDisplay.SNOW_DISP_WIND_PEAK_WIND.getXmlKey();
-            sdwd.setWindPeakR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdwd.setWindPeakY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdwd.setWindPeakR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            sdwd.setWindPeakY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             /*
              * Gust Speed
              */
             xmlKey = SnowDisplay.SNOW_DISP_WIND_GUST_SPEED.getXmlKey();
-            sdwd.setWindGustR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdwd.setWindGustY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdwd.setWindGustR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            sdwd.setWindGustY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             /*
              * Wind Direction From
              */
             xmlKey = SnowDisplay.SNOW_DISP_WIND_DIR_FROM.getXmlKey();
-            sdwd.setWindDirFromR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdwd.setWindDirFromY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdwd.setWindDirFromR(stm.getThresholdValue(duKey, threshKeyR,
+                    areaID, xmlKey));
+            sdwd.setWindDirFromY(stm.getThresholdValue(duKey, threshKeyY,
+                    areaID, xmlKey));
+
             /*
              * Wind Direction From
              */
             xmlKey = SnowDisplay.SNOW_DISP_WIND_DIR_TO.getXmlKey();
-            sdwd.setWindDirToR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            sdwd.setWindDirToY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            sdwd.setWindDirToR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            sdwd.setWindDirToY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             /*
              * Add data to array.
              */
             snowDataArray.add(sdwd);
         }
     }
-    
-    private SnowDisplayWindData getDataAtFirstSelection()
-    {        
+
+    private SnowDisplayWindData getDataAtFirstSelection() {
         int index = dataList.getSelectionIndex();
-        
-        return snowDataArray.get(index);        
+
+        return snowDataArray.get(index);
     }
-    
-    private void updateDataArray(SnowDisplayWindData sdwd)
-    {        
-        int[] dataListIndexes = dataList.getSelectionIndices();        
+
+    private void updateDataArray(SnowDisplayWindData sdwd) {
+        int[] dataListIndexes = dataList.getSelectionIndices();
         int currentIndex = 0;
-        
-        for (int i = 0; i < dataListIndexes.length; i++)
-        {
+
+        for (int i = 0; i < dataListIndexes.length; i++) {
             currentIndex = dataListIndexes[i];
-            
+
             snowDataArray.get(currentIndex).updateData(sdwd);
-        }        
-    }
-    
-    @Override
-    public void commitDataToXML()
-    {
-        SnowThresholdMgr stm = SnowThresholdMgr.getInstance();
-        
-        String xmlKey;
-        String areaID;
-        
-        for (SnowDisplayWindData sdwd : snowDataArray)
-        {
-            areaID = sdwd.getAreaID();
-            
-            /*
-             * Wind Speed
-             */
-            xmlKey = SnowDisplay.SNOW_DISP_WIND_WIND_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdwd.getWindWindSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdwd.getWindWindSpeedY());
-            
-            /*
-             * Peak Wind
-             */
-            xmlKey = SnowDisplay.SNOW_DISP_WIND_PEAK_WIND.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdwd.getWindPeakR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdwd.getWindPeakY());
-            
-            /*
-             * Gust Speed
-             */
-            xmlKey = SnowDisplay.SNOW_DISP_WIND_GUST_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdwd.getWindGustR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdwd.getWindGustY());
-            
-            /*
-             * Wind Direction From
-             */
-            xmlKey = SnowDisplay.SNOW_DISP_WIND_DIR_FROM.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdwd.getWindDirFromR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdwd.getWindDirFromY());
-            
-            /*
-             * Wind Direction To
-             */
-            xmlKey = SnowDisplay.SNOW_DISP_WIND_DIR_TO.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, sdwd.getWindDirToR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, sdwd.getWindDirToY());
         }
     }
 
     @Override
-    public void reloadData()
-    {
+    public void commitDataToXML() {
+        SnowThresholdMgr stm = SnowThresholdMgr.getInstance();
+
+        String xmlKey;
+        String areaID;
+
+        for (SnowDisplayWindData sdwd : snowDataArray) {
+            areaID = sdwd.getAreaID();
+
+            /*
+             * Wind Speed
+             */
+            xmlKey = SnowDisplay.SNOW_DISP_WIND_WIND_SPEED.getXmlKey();
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdwd.getWindWindSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdwd.getWindWindSpeedY());
+
+            /*
+             * Peak Wind
+             */
+            xmlKey = SnowDisplay.SNOW_DISP_WIND_PEAK_WIND.getXmlKey();
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdwd.getWindPeakR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdwd.getWindPeakY());
+
+            /*
+             * Gust Speed
+             */
+            xmlKey = SnowDisplay.SNOW_DISP_WIND_GUST_SPEED.getXmlKey();
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdwd.getWindGustR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdwd.getWindGustY());
+
+            /*
+             * Wind Direction From
+             */
+            xmlKey = SnowDisplay.SNOW_DISP_WIND_DIR_FROM.getXmlKey();
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdwd.getWindDirFromR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdwd.getWindDirFromY());
+
+            /*
+             * Wind Direction To
+             */
+            xmlKey = SnowDisplay.SNOW_DISP_WIND_DIR_TO.getXmlKey();
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    sdwd.getWindDirToR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    sdwd.getWindDirToY());
+        }
+    }
+
+    @Override
+    public void reloadData() {
         dataList.removeAll();
         snowDataArray.clear();
         snowDataArray = null;
-        
+
         populateList();
     }
-    
-    @Override
-    protected void editDataAction()
-    {
-        SnowDisplayWindData sdwd = getDataAtFirstSelection();
-        
-        if (windEditDlg == null)
-        {
-            windEditDlg = new SnowDisplayWindEditDlg(getParent().getShell(), sdwd, this);
-            windEditDlg.open();
-            windEditDlg = null;
-        } 
-    }    
 
     @Override
-    public void updateThresholdData(SnowDisplayWindData sdwd)
-    {
+    protected void editDataAction() {
+        SnowDisplayWindData sdwd = getDataAtFirstSelection();
+
+        if (windEditDlg == null) {
+            windEditDlg = new SnowDisplayWindEditDlg(getParent().getShell(),
+                    sdwd, this);
+            windEditDlg.open();
+            windEditDlg = null;
+        }
+    }
+
+    @Override
+    public void updateThresholdData(SnowDisplayWindData sdwd) {
         updateDataArray(sdwd);
         populateList();
     }
 }
-
diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitorMeteoTab.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitorMeteoTab.java
old mode 100644
new mode 100755
index c55baca499..b008b51aaa
--- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitorMeteoTab.java
+++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitorMeteoTab.java
@@ -28,339 +28,364 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TabFolder;
 
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SnowMonitor;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.viz.monitor.data.RangesUtil;
 import com.raytheon.uf.viz.monitor.snow.threshold.SnowMonitorMeteoData;
 import com.raytheon.uf.viz.monitor.snow.threshold.SnowThresholdMgr;
 import com.raytheon.uf.viz.monitor.ui.dialogs.TabItemComp;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants.SnowMonitor;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
-public class SnowMonitorMeteoTab extends TabItemComp implements IUpdateMonitorMeteo
-{
+/**
+ * SNOW Monitor Meteo Table.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 26, 2015 5115       skorolev    Corrected imports.
+ * 
+ * </pre>
+ * 
+ * @author skorolev
+ * @version 1.0
+ */
+public class SnowMonitorMeteoTab extends TabItemComp implements
+        IUpdateMonitorMeteo {
     private SnowMonitorMeteoEditDlg meteoEditDlg;
-    
+
     private ArrayList<String> areaIDArray;
-    
+
     private ArrayList<SnowMonitorMeteoData> snowDataArray;
-    
-    public SnowMonitorMeteoTab(TabFolder parent, DataUsageKey duKey)
-    {
+
+    public SnowMonitorMeteoTab(TabFolder parent, DataUsageKey duKey) {
         super(parent, duKey);
     }
 
-    @Override    
-    protected void createListHeader(Composite parentComp)
-    {
+    @Override
+    protected void createListHeader(Composite parentComp) {
         Composite lblComp = new Composite(parentComp, SWT.NONE);
         GridLayout gl = new GridLayout(5, false);
-        gl.horizontalSpacing = 0;   
+        gl.horizontalSpacing = 0;
         gl.marginHeight = 0;
         gl.marginWidth = 0;
         lblComp.setLayout(gl);
-        
+
         /*
          * Create filler label.
          */
         GridData gd = new GridData(74, SWT.DEFAULT);
         Label fillerLbl = new Label(lblComp, SWT.CENTER);
         fillerLbl.setLayoutData(gd);
-        
+
         /*
          * Monitor Meteo
          */
         Composite meteoComp = createGroupComposite(lblComp, 7, null);
         createLabelComp(meteoComp, "Wind", "Speed(kt)", false);
-        createLabelComp(meteoComp, "Peak", "Wind(kt)", false);    
-        createLabelComp(meteoComp, "Gust", "Speed(kt)", false);            
+        createLabelComp(meteoComp, "Peak", "Wind(kt)", false);
+        createLabelComp(meteoComp, "Gust", "Speed(kt)", false);
         createLabelComp(meteoComp, "Temp(F)", "", false);
-        createLabelComp(meteoComp, "Wind", "Chill(F)", false); 
+        createLabelComp(meteoComp, "Wind", "Chill(F)", false);
         createLabelComp(meteoComp, "Vis(mi)", "", true);
         createLabelComp(meteoComp, "Snow", "Depth(in)", false);
-    }    
-    
+    }
+
     @Override
-    protected void populateList()
-    {   
-        if (snowDataArray == null)
-        {
+    protected void populateList() {
+        if (snowDataArray == null) {
             createDataArray();
         }
-        
+
         boolean update = false;
-        if (dataList.getItemCount() > 0)
-        {
+        if (dataList.getItemCount() > 0) {
             update = true;
         }
-        
+
         RangesUtil rangeUtil = RangesUtil.getInstance();
-        
+
         areaIDArray = new ArrayList<String>();
-        
+
         String tmpVisStr;
         String currentAreaID;
-        
+
         double visVal = 0.0;
-        
-        StringBuilder sb = null;       
+
+        StringBuilder sb = null;
         SnowMonitorMeteoData smmd = null;
-        
-        for (int i = 0; i < snowDataArray.size(); i++)
-        {
+
+        for (int i = 0; i < snowDataArray.size(); i++) {
             sb = new StringBuilder();
-            
+
             smmd = snowDataArray.get(i);
-            
+
             currentAreaID = smmd.getAreaID();
             areaIDArray.add(currentAreaID);
-            
+
             sb.append(String.format(areaIdFmt, currentAreaID));
-            
+
             /*
              * Wind Speed
              */
             appendIntData(sb, smmd.getWindSpeedR(), smmd.getWindSpeedY());
-            
+
             /*
              * Peak Wind
              */
             appendIntData(sb, smmd.getPeakWindR(), smmd.getPeakWindY());
-            
+
             /*
              * Gust Speed
              */
             appendIntData(sb, smmd.getGustSpeedR(), smmd.getGustSpeedY());
-            
+
             /*
              * Temperature
              */
             appendIntData(sb, smmd.getTempR(), smmd.getTempY());
-            
+
             /*
              * Wind Chill
              */
             appendIntData(sb, smmd.getWindChillR(), smmd.getWindChillY());
-            
+
             /*
              * Visibility
-             */            
-            visVal = smmd.getVisR();            
-            tmpVisStr = rangeUtil.getVisString((int)visVal);
+             */
+            visVal = smmd.getVisR();
+            tmpVisStr = rangeUtil.getVisString((int) visVal);
             sb.append(String.format(dataFmt, tmpVisStr));
-            
-            visVal = smmd.getVisY();           
-            tmpVisStr = rangeUtil.getVisString((int)visVal);
+
+            visVal = smmd.getVisY();
+            tmpVisStr = rangeUtil.getVisString((int) visVal);
             sb.append(String.format(dataFmt, tmpVisStr));
-            
+
             /*
              * Snow Depth
              */
             appendIntData(sb, smmd.getSnowDepthR(), smmd.getSnowDepthY());
-            
+
             /*
              * Append a space and add the data line to the list.
              */
             sb.append(" ");
-            
-            if (update == true)
-            {
+
+            if (update == true) {
                 dataList.setItem(i, sb.toString());
-            }
-            else
-            {
+            } else {
                 dataList.add(sb.toString());
-            }            
+            }
         }
-        
+
         packListControls();
     }
-    
-    private void createDataArray()
-    {
+
+    private void createDataArray() {
         snowDataArray = new ArrayList<SnowMonitorMeteoData>();
-        
-        SnowThresholdMgr stm = SnowThresholdMgr.getInstance();   
-        
+
+        SnowThresholdMgr stm = SnowThresholdMgr.getInstance();
+
         String xmlKey;
-        String areaID;       
-        
+        String areaID;
+
         ThresholdsXML threshXML = stm.getThresholdsXmlData(duKey);
-        
+
         ArrayList<AreaXML> areasArray = threshXML.getAreas();
-        
-        for (AreaXML area : areasArray)
-        {
+
+        for (AreaXML area : areasArray) {
             areaID = area.getAreaId();
             SnowMonitorMeteoData smmd = new SnowMonitorMeteoData();
-            
+
             smmd.setAreaID(areaID);
-            
+
             /*
              * Wind Speed
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_WIND_SPEED.getXmlKey();
-            smmd.setWindSpeedR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            smmd.setWindSpeedY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            smmd.setWindSpeedR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            smmd.setWindSpeedY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             /*
              * Peak Wind
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_PEAK_WIND.getXmlKey();
-            smmd.setPeakWindR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            smmd.setPeakWindY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            smmd.setPeakWindR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            smmd.setPeakWindY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             /*
              * Gust Speed
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_GUST_SPEED.getXmlKey();
-            smmd.setGustSpeedR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            smmd.setGustSpeedY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            smmd.setGustSpeedR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            smmd.setGustSpeedY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             /*
              * Temperature
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_TEMP.getXmlKey();
-            smmd.setTempR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            smmd.setTempY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            smmd.setTempR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            smmd.setTempY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             /*
              * Wind Chill
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_WIND_CHILL.getXmlKey();
-            smmd.setWindChillR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            smmd.setWindChillY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
+            smmd.setWindChillR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            smmd.setWindChillY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
 
             /*
              * Visibility
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_VIS.getXmlKey();
-            smmd.setVisR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            smmd.setVisY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
+            smmd.setVisR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            smmd.setVisY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
 
             /*
              * Snow Depth
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_SNOW_DEPTH.getXmlKey();
-            smmd.setSnowDepthR(stm.getThresholdValue(duKey, threshKeyR, areaID, xmlKey));
-            smmd.setSnowDepthY(stm.getThresholdValue(duKey, threshKeyY, areaID, xmlKey));
-            
+            smmd.setSnowDepthR(stm.getThresholdValue(duKey, threshKeyR, areaID,
+                    xmlKey));
+            smmd.setSnowDepthY(stm.getThresholdValue(duKey, threshKeyY, areaID,
+                    xmlKey));
+
             /*
              * Add data to array.
              */
             snowDataArray.add(smmd);
         }
     }
-    
-    private SnowMonitorMeteoData getDataAtFirstSelection()
-    {        
+
+    private SnowMonitorMeteoData getDataAtFirstSelection() {
         int index = dataList.getSelectionIndex();
-        
-        return snowDataArray.get(index);        
+
+        return snowDataArray.get(index);
     }
-    
-    private void updateDataArray(SnowMonitorMeteoData smmd)
-    {        
-        int[] dataListIndexes = dataList.getSelectionIndices();        
+
+    private void updateDataArray(SnowMonitorMeteoData smmd) {
+        int[] dataListIndexes = dataList.getSelectionIndices();
         int currentIndex = 0;
-        
-        for (int i = 0; i < dataListIndexes.length; i++)
-        {
+
+        for (int i = 0; i < dataListIndexes.length; i++) {
             currentIndex = dataListIndexes[i];
-            
+
             snowDataArray.get(currentIndex).updateData(smmd);
-        }        
+        }
     }
-    
+
     @Override
-    public void commitDataToXML()
-    {
+    public void commitDataToXML() {
         SnowThresholdMgr stm = SnowThresholdMgr.getInstance();
-        
+
         String xmlKey;
         String areaID;
-        
-        for (SnowMonitorMeteoData smmd : snowDataArray)
-        {
+
+        for (SnowMonitorMeteoData smmd : snowDataArray) {
             areaID = smmd.getAreaID();
-            
+
             /*
              * Wind Speed
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_WIND_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, smmd.getWindSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, smmd.getWindSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    smmd.getWindSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    smmd.getWindSpeedY());
+
             /*
              * Peak Wind
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_PEAK_WIND.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, smmd.getPeakWindR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, smmd.getPeakWindY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    smmd.getPeakWindR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    smmd.getPeakWindY());
+
             /*
              * Gust Speed
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_GUST_SPEED.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, smmd.getGustSpeedR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, smmd.getGustSpeedY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    smmd.getGustSpeedR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    smmd.getGustSpeedY());
+
             /*
              * Temperature
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_TEMP.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, smmd.getTempR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, smmd.getTempY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    smmd.getTempR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    smmd.getTempY());
+
             /*
              * Wind Chill
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_WIND_CHILL.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, smmd.getWindChillR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, smmd.getWindChillY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    smmd.getWindChillR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    smmd.getWindChillY());
+
             /*
              * Visibility
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_VIS.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, smmd.getVisR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, smmd.getVisY());
-            
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    smmd.getVisR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    smmd.getVisY());
+
             /*
              * Snow Depth
              */
             xmlKey = SnowMonitor.SNOW_MON_METEO_SNOW_DEPTH.getXmlKey();
-            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey, smmd.getSnowDepthR());
-            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey, smmd.getSnowDepthY());
+            stm.setThresholdValue(duKey, threshKeyR, areaID, xmlKey,
+                    smmd.getSnowDepthR());
+            stm.setThresholdValue(duKey, threshKeyY, areaID, xmlKey,
+                    smmd.getSnowDepthY());
         }
     }
 
     @Override
-    public void reloadData()
-    {
+    public void reloadData() {
         dataList.removeAll();
         snowDataArray.clear();
         snowDataArray = null;
-        
-        populateList();        
+
+        populateList();
     }
 
     @Override
-    protected void editDataAction()
-    {
+    protected void editDataAction() {
         SnowMonitorMeteoData smmd = getDataAtFirstSelection();
-        
-        if (meteoEditDlg == null)
-        {
-            meteoEditDlg = new SnowMonitorMeteoEditDlg(getParent().getShell(), smmd, this);
+
+        if (meteoEditDlg == null) {
+            meteoEditDlg = new SnowMonitorMeteoEditDlg(getParent().getShell(),
+                    smmd, this);
             meteoEditDlg.open();
             meteoEditDlg = null;
         }
     }
-   
+
     @Override
-    public void updateThresholdData(SnowMonitorMeteoData smmd)
-    {
+    public void updateThresholdData(SnowMonitorMeteoData smmd) {
         updateDataArray(smmd);
         populateList();
     }
diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
index 22f91c669e..2691aa883f 100755
--- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
@@ -27,7 +27,6 @@ import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
@@ -56,6 +55,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * Oct 27, 2014 3667       skorolev    Cleaned code.
  * Feb 10, 2015 3886       skorolev    Changed confirmation message.
  * Aug 17, 2015 3841       skorolev    Corrected handleOkBtnSelection.
+ * Jan 04, 2016 5115       skorolev    Corrected imports and replaced AppName with MonName.
+ * 
  * </pre>
  * 
  * @author mpduff
@@ -137,7 +138,7 @@ public class SnowMonitoringAreaConfigDlg extends MonitoringAreaConfigDlg {
     protected FSSObsMonitorConfigurationManager getInstance() {
         if (configMgr == null) {
             configMgr = FSSObsMonitorConfigurationManager
-                    .getInstance(MonName.snow);
+                    .getInstance(AppName.SNOW);
         }
         return configMgr;
     }
diff --git a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
old mode 100755
new mode 100644
index 3634639818..8b65b6848a
--- a/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowZoneTableDlg.java
@@ -26,8 +26,8 @@ import java.util.List;
 import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.common.monitor.data.ObConst.DisplayVarName;
 import com.raytheon.uf.viz.monitor.IMonitor;
@@ -57,6 +57,7 @@ import com.raytheon.uf.viz.monitor.ui.dialogs.ZoneTableDlg;
  * Sep 04, 2014 3220       skorolev    Removed "site". Added check on dispose.
  * Sep 18, 2015 3873       skorolev    Adjusted to AppName and MonName.
  * Dec 17, 2015 3873       dhladky     Abstracted handling of dialogTime and Zone dialog events.
+ * Jan 04, 2016 5115       skorolev    Corrected imports and replaced AppName with MonName.
  * 
  * </pre>
  * 
@@ -264,7 +265,7 @@ public class SnowZoneTableDlg extends ZoneTableDlg {
     protected FSSObsMonitorConfigurationManager getMonitorAreaConfigInstance() {
         if (configMgr == null || configMgr.isPopulated()) {
             configMgr = FSSObsMonitorConfigurationManager
-                    .getInstance(MonName.snow);
+                    .getInstance(AppName.SNOW);
         }
         return configMgr;
     }
diff --git a/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF
index b4e473be09..c6da873345 100644
--- a/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.monitor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Monitor Plug-in
 Bundle-SymbolicName: com.raytheon.uf.viz.monitor;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Activator: com.raytheon.uf.viz.monitor.Activator
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.eclipse.ui,
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui,
  org.geotools;bundle-version="2.4.0",
  com.raytheon.viz.alerts;bundle-version="1.10.13",
  com.raytheon.uf.common.monitor;bundle-version="1.11.17",
- org.apache.commons.lang;bundle-version="2.3.0",
  com.raytheon.uf.common.wxmath
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.viz.monitor,
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
index 9fe3d14901..ac87f6a8c5 100755
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
+++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
@@ -32,7 +32,6 @@ import java.util.TreeMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.monitor.data.ObConst;
@@ -60,7 +59,8 @@ import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr;
  * Sep 04, 2014  3220      skorolev    Updated getStationTableData method.
  * Sep 25, 2015  3873      skorolev    Added multiHrsTabData.
  * Nov 12, 2015  3841      dhladky     Augmented Slav's update fix.
- * Dec 02  2015  3873      dhladky     Pulled 3841 changes to 16.1.1.
+ * Dec 02  2015  3873      dhladky    Pulled 3841 changes to 16.1.1.
+ * Jan 04, 2016  5115      skorolev    Replaced Mon.Name with App.Name.
  * Jan 11  2016  5219      dhladky     Fixed damage done to cache management by recent updates.
  * 
  * </pre>
@@ -84,7 +84,7 @@ public class ObMultiHrsReports {
     /**
      * application name (snow, fog, safeseas, etc)
      */
-    private CommonConfig.AppName appName;
+    private final CommonConfig.AppName appName;
 
     /**
      * FSSObs records cache. Key is nominal time, value is ObHourReports object
@@ -96,7 +96,7 @@ public class ObMultiHrsReports {
      */
     private ConcurrentHashMap<Date, TableData> multiHrsTabData = new ConcurrentHashMap<Date, TableData>();
 
-    private int maxFrames = ObConst.MAX_FRAMES;
+    private final int maxFrames = ObConst.MAX_FRAMES;
 
     private FSSObsMonitorConfigurationManager cfgMgr = null;
 
@@ -107,15 +107,8 @@ public class ObMultiHrsReports {
      */
     public ObMultiHrsReports(CommonConfig.AppName appName) {
         this.appName = appName;
-
         if (appName.equals(AppName.FOG) || appName.equals(AppName.SAFESEAS)) {
-            if (appName.equals(AppName.FOG)) {
-                cfgMgr = FSSObsMonitorConfigurationManager
-                        .getInstance(MonName.fog);
-            } else if (appName.equals(AppName.SAFESEAS)) {
-                cfgMgr = FSSObsMonitorConfigurationManager
-                        .getInstance(MonName.ss);
-            }
+            cfgMgr = FSSObsMonitorConfigurationManager.getInstance(appName);
             initFogAlgCellType();
         }
     }
@@ -128,7 +121,7 @@ public class ObMultiHrsReports {
      */
     public void addReport(ObReport report) {
         Date nominalTime = report.getRefHour();
-           
+
         /**
          * DR #8723: if wind speed is zero, wind direction should be N/A, not 0
          */
@@ -616,7 +609,8 @@ public class ObMultiHrsReports {
      * Updates table cache
      */
     public void updateTableCache() {
-        // rebuild the table cache
+        // clear and rebuild table data on config changes
+        multiHrsTabData.clear();
         for (Date time : multiHrsReports.keySet()) {
             getZoneTableData(time);
         }
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObTrendDataSet.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObTrendDataSet.java
old mode 100644
new mode 100755
index d507935143..792f5456d6
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObTrendDataSet.java
+++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObTrendDataSet.java
@@ -25,13 +25,16 @@ import java.util.TreeMap;
 
 import com.raytheon.uf.common.monitor.data.CommonConfig;
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants;
 import com.raytheon.uf.common.monitor.data.ObConst;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.common.monitor.data.ObConst.ProductName;
 import com.raytheon.uf.common.monitor.data.ObConst.VarName;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr;
 import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr.ThresholdKey;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
+
 /**
  * This class models data for a SNOW/FOG/SAFESEAS trending plot.
  * 
@@ -40,7 +43,8 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Dec. 23, 2009  3424       zhao       Initial creation.
+ * Dec.23, 2009  3424      zhao        Initial creation.
+ * Dec 26, 2015  5114      skorolev    Replaced MonitorConfigConstants import.
  * 
  * </pre>
  * 
@@ -49,6 +53,8 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
  */
 
 public class ObTrendDataSet {
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(ObTrendDataSet.class);
 
     /**
      * application name (snow, fog, safeseas, etc)
@@ -64,11 +70,12 @@ public class ObTrendDataSet {
      * the enumerated type representation of the trending variable
      */
     private final ObConst.VarName varName;
-    
+
     /**
-     * the enumerated type representation of product name for a trending variable
+     * the enumerated type representation of product name for a trending
+     * variable
      */
-    private final ObConst.ProductName productName; 
+    private final ObConst.ProductName productName;
 
     /**
      * the red threshold
@@ -125,8 +132,9 @@ public class ObTrendDataSet {
      * @param appName
      *            application name (snow, fog, safeseas) of enumerated-type
      */
-    public ObTrendDataSet(String zone, ObConst.VarName varName, ObConst.ProductName productName, 
-            CommonConfig.AppName appName, AbstractThresholdMgr thresholdMgr) {
+    public ObTrendDataSet(String zone, ObConst.VarName varName,
+            ObConst.ProductName productName, CommonConfig.AppName appName,
+            AbstractThresholdMgr thresholdMgr) {
 
         this.zone = zone;
         this.varName = varName;
@@ -146,138 +154,138 @@ public class ObTrendDataSet {
                 redThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.RED, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_VIS
-                        .getXmlKey()) / 16;
+                                .getXmlKey()) / 16;
                 yellowThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.YELLOW, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_VIS
-                        .getXmlKey()) / 16;
+                                .getXmlKey()) / 16;
             } else if (varName == VarName.CEILING) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_CEILING
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_CEILING
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_CEILING
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_CEILING
+                                        .getXmlKey());
             } else if (varName == VarName.WIND_DIR) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_DIR_FROM
+                                        .getXmlKey());
                 redThreshold_2 = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.RED, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_DIR_TO
-                        .getXmlKey());
+                                .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_DIR_FROM
+                                        .getXmlKey());
                 yellowThreshold_2 = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.YELLOW, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_DIR_TO
-                        .getXmlKey());
+                                .getXmlKey());
             } else if (varName == VarName.WIND_SPEED) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_WIND_SPEED
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_WIND_SPEED
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_WIND_SPEED
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_WIND_SPEED
+                                        .getXmlKey());
             } else if (varName == VarName.MAX_WIND_SPEED) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_PEAK_WIND
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_PEAK_WIND
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_PEAK_WIND
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_PEAK_WIND
+                                        .getXmlKey());
             } else if (varName == VarName.GUST_SPEED) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_GUST_SPEED
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_GUST_SPEED
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_GUST_SPEED
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_WIND_GUST_SPEED
+                                        .getXmlKey());
             } else if (varName == VarName.TEMPERATURE) {
                 redThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.RED, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_TEMP
-                        .getXmlKey());
+                                .getXmlKey());
                 yellowThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.YELLOW, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_TEMP
-                        .getXmlKey());
+                                .getXmlKey());
             } else if (varName == VarName.DEWPOINT) {
                 redThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.RED, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_DEWPT
-                        .getXmlKey());
+                                .getXmlKey());
                 yellowThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.YELLOW, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_DEWPT
-                        .getXmlKey());
+                                .getXmlKey());
             } else if (varName == VarName.DEWPOINT_DEPR) {
                 redThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.RED, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_T_TD
-                        .getXmlKey());
+                                .getXmlKey());
                 yellowThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.YELLOW, zone,
                         MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_T_TD
-                        .getXmlKey());
+                                .getXmlKey());
             } else if (varName == VarName.RELATIVE_HUMIDITY) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_REL_HUMIDITY
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_REL_HUMIDITY
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_REL_HUMIDITY
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.FogDisplay.FOG_DISP_METEO_REL_HUMIDITY
+                                        .getXmlKey());
             } else {
-                System.err.println("Unknow variable name = " + varName
+                statusHandler.warn("Unknow variable name = " + varName
                         + " for FOG trend plot");
             }
 
@@ -285,212 +293,212 @@ public class ObTrendDataSet {
 
             if (varName == VarName.WIND_DIR) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_DIR_FROM
+                                        .getXmlKey());
                 redThreshold_2 = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_DIR_TO
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_DIR_TO
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_DIR_FROM
+                                        .getXmlKey());
                 yellowThreshold_2 = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_DIR_TO
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_DIR_TO
+                                        .getXmlKey());
             } else if (varName == VarName.WIND_SPEED) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_WIND_SPEED
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_WIND_SPEED
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_WIND_SPEED
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_WIND_SPEED
+                                        .getXmlKey());
             } else if (varName == VarName.MAX_WIND_SPEED) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_PEAK_WIND
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_PEAK_WIND
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_PEAK_WIND
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_PEAK_WIND
+                                        .getXmlKey());
             } else if (varName == VarName.GUST_SPEED) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_GUST_SPEED
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_GUST_SPEED
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_GUST_SPEED
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_WIND_GUST_SPEED
+                                        .getXmlKey());
             } else if (varName == VarName.TEMPERATURE) {
                 redThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.RED, zone,
                         MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_TEMP
-                        .getXmlKey());
+                                .getXmlKey());
                 yellowThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.YELLOW, zone,
                         MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_TEMP
-                        .getXmlKey());
+                                .getXmlKey());
             } else if (varName == VarName.DEWPOINT) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_DEWPT
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_DEWPT
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_DEWPT
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_DEWPT
+                                        .getXmlKey());
             } else if (varName == VarName.VISIBILITY) {
                 redThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.RED, zone,
                         MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_VIS
-                        .getXmlKey()) / 16;
+                                .getXmlKey()) / 16;
                 yellowThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.YELLOW, zone,
                         MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_VIS
-                        .getXmlKey()) / 16;
+                                .getXmlKey()) / 16;
             } else if (varName == VarName.SEA_LEVEL_PRESS) {
                 redThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.RED, zone,
                         MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SLP
-                        .getXmlKey());
+                                .getXmlKey());
                 yellowThreshold = (float) thresholdMgr.getThresholdValue(
                         DataUsageKey.DISPLAY, ThresholdKey.YELLOW, zone,
                         MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SLP
-                        .getXmlKey());
+                                .getXmlKey());
             } else if (varName == VarName.WIND_CHILL) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_WIND_CHILL
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_WIND_CHILL
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_WIND_CHILL
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_WIND_CHILL
+                                        .getXmlKey());
             } else if (varName == VarName.FROSTBITE_TIME) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_FROSTBITE
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_FROSTBITE
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_FROSTBITE
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_FROSTBITE
+                                        .getXmlKey());
             } else if (varName == VarName.HOURLY_PRECIP) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_HOURLY_PRECIP
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_HOURLY_PRECIP
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_HOURLY_PRECIP
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_HOURLY_PRECIP
+                                        .getXmlKey());
             } else if (varName == VarName.SNOW_DEPTH) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNOW_DEPTH
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNOW_DEPTH
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNOW_DEPTH
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNOW_DEPTH
+                                        .getXmlKey());
             } else if (varName == VarName.SNINCR_HOURLY) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNINCR_HOURLY
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNINCR_HOURLY
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNINCR_HOURLY
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNINCR_HOURLY
+                                        .getXmlKey());
             } else if (varName == VarName.SNINCR_TOTAL) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNINCR_TOTAL
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNINCR_TOTAL
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNINCR_TOTAL
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SnowDisplay.SNOW_DISP_METEO_SNINCR_TOTAL
+                                        .getXmlKey());
             } else {
-                System.err.println("Unknow variable name = " + varName
+                statusHandler.warn("Unknow variable name = " + varName
                         + " for SNOW trend plot");
             }
 
@@ -498,302 +506,506 @@ public class ObTrendDataSet {
 
             if (varName == VarName.WIND_DIR) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_DIR_FROM
+                                        .getXmlKey());
                 redThreshold_2 = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_DIR_TO
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_DIR_TO
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_DIR_FROM
+                                        .getXmlKey());
                 yellowThreshold_2 = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_DIR_TO
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_DIR_TO
+                                        .getXmlKey());
             } else if (varName == VarName.WIND_SPEED) {
-            	if ( productName == ProductName.SCA ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_WIND_SPEED.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_WIND_SPEED.getXmlKey());
-            	} else if ( productName == ProductName.GALE_WARNING ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_WIND_SPEED.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_WIND_SPEED.getXmlKey());
-            	} else if ( productName == ProductName.STORM_WARNING ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_WIND_SPEED.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_WIND_SPEED.getXmlKey());
-            	} else if ( productName == ProductName.HFWW ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_WIND_SPEED.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_WIND_SPEED.getXmlKey());
-            	} else {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_WIND_SPEED.getXmlKey());
-            		yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_WIND_SPEED.getXmlKey());
-            	}
+                if (productName == ProductName.SCA) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_WIND_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_WIND_SPEED
+                                            .getXmlKey());
+                } else if (productName == ProductName.GALE_WARNING) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_WIND_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_WIND_SPEED
+                                            .getXmlKey());
+                } else if (productName == ProductName.STORM_WARNING) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_WIND_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_WIND_SPEED
+                                            .getXmlKey());
+                } else if (productName == ProductName.HFWW) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_WIND_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_WIND_SPEED
+                                            .getXmlKey());
+                } else {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_WIND_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_WIND_SPEED
+                                            .getXmlKey());
+                }
             } else if (varName == VarName.MAX_WIND_SPEED) {
-            	if ( productName == ProductName.SCA ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_PEAK_WIND.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_PEAK_WIND.getXmlKey());
-            	} else if ( productName == ProductName.GALE_WARNING ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_PEAK_WIND.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_PEAK_WIND.getXmlKey());
-            	} else if ( productName == ProductName.STORM_WARNING ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_PEAK_WIND.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_PEAK_WIND.getXmlKey());
-            	} else if ( productName == ProductName.HFWW ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_PEAK_WIND.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_PEAK_WIND.getXmlKey());
-            	} else {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_PEAK_WIND.getXmlKey());
-            		yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_PEAK_WIND.getXmlKey());
-            	}
+                if (productName == ProductName.SCA) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_PEAK_WIND
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_PEAK_WIND
+                                            .getXmlKey());
+                } else if (productName == ProductName.GALE_WARNING) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_PEAK_WIND
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_PEAK_WIND
+                                            .getXmlKey());
+                } else if (productName == ProductName.STORM_WARNING) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_PEAK_WIND
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_PEAK_WIND
+                                            .getXmlKey());
+                } else if (productName == ProductName.HFWW) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_PEAK_WIND
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_PEAK_WIND
+                                            .getXmlKey());
+                } else {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_PEAK_WIND
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_PEAK_WIND
+                                            .getXmlKey());
+                }
             } else if (varName == VarName.GUST_SPEED) {
-            	if ( productName == ProductName.SCA ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_GUST_SPEED.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_GUST_SPEED.getXmlKey());
-            	} else if ( productName == ProductName.GALE_WARNING ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_GUST_SPEED.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_GUST_SPEED.getXmlKey());
-            	} else if ( productName == ProductName.STORM_WARNING ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_GUST_SPEED.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_GUST_SPEED.getXmlKey());
-            	} else if ( productName == ProductName.HFWW ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_GUST_SPEED.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_GUST_SPEED.getXmlKey());
-            	} else {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_GUST_SPEED.getXmlKey());
-            		yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_GUST_SPEED.getXmlKey());
-            	}
+                if (productName == ProductName.SCA) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_GUST_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_GUST_SPEED
+                                            .getXmlKey());
+                } else if (productName == ProductName.GALE_WARNING) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_GUST_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_GALE_GUST_SPEED
+                                            .getXmlKey());
+                } else if (productName == ProductName.STORM_WARNING) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_GUST_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_STORM_GUST_SPEED
+                                            .getXmlKey());
+                } else if (productName == ProductName.HFWW) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_GUST_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_HFWW_GUST_SPEED
+                                            .getXmlKey());
+                } else {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_GUST_SPEED
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_WIND_GUST_SPEED
+                                            .getXmlKey());
+                }
             } else if (varName == VarName.VISIBILITY) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_VIS
-                        .getXmlKey()) / 16;
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_VIS
+                                        .getXmlKey()) / 16;
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_VIS
-                        .getXmlKey()) / 16;
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_VIS
+                                        .getXmlKey()) / 16;
             } else if (varName == VarName.TEMPERATURE) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_TEMP
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_TEMP
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_TEMP
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_TEMP
+                                        .getXmlKey());
             } else if (varName == VarName.DEWPOINT) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_DEWPT
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_DEWPT
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_DEWPT
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_DEWPT
+                                        .getXmlKey());
             } else if (varName == VarName.SEA_LEVEL_PRESS) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_SLP
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_SLP
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_SLP
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_SLP
+                                        .getXmlKey());
             } else if (varName == VarName.SEA_SURFACE_TEMPERATURE) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_SST
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_SST
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_SST
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_SST
+                                        .getXmlKey());
             } else if (varName == VarName.WAVE_HEIGHT) {
-            	if ( productName == ProductName.SCA ) {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_WAVE_HT.getXmlKey());
-                    yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_WAVE_HT.getXmlKey());
-            	} else {
-            		redThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.RED,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_WAVE_HT.getXmlKey());
-            		yellowThreshold = (float) thresholdMgr.getThresholdValue(DataUsageKey.DISPLAY,ThresholdKey.YELLOW,zone,MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_WAVE_HT.getXmlKey());
-            	}
+                if (productName == ProductName.SCA) {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_WAVE_HT
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_PROD_SCA_WAVE_HT
+                                            .getXmlKey());
+                } else {
+                    redThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.RED,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_WAVE_HT
+                                            .getXmlKey());
+                    yellowThreshold = (float) thresholdMgr
+                            .getThresholdValue(
+                                    DataUsageKey.DISPLAY,
+                                    ThresholdKey.YELLOW,
+                                    zone,
+                                    MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_WAVE_HT
+                                            .getXmlKey());
+                }
             } else if (varName == VarName.WAVE_STEEPNESS) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_WAVE_STEEP
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_WAVE_STEEP
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_WAVE_STEEP
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_METEO_WAVE_STEEP
+                                        .getXmlKey());
             } else if (varName == VarName.PRIM_SWELL_HT) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_HT
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_HT
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_HT
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_HT
+                                        .getXmlKey());
             } else if (varName == VarName.PRIM_SWELL_PD) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_PD
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_PD
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_PD
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_PD
+                                        .getXmlKey());
             } else if (varName == VarName.PRIM_SWELL_DIR) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_FROM
+                                        .getXmlKey());
                 redThreshold_2 = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_TO
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_TO
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_FROM
+                                        .getXmlKey());
                 yellowThreshold_2 = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_TO
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_DIR_TO
+                                        .getXmlKey());
             } else if (varName == VarName.SEC_SWELL_HT) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_HT
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_PRIM_HT
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_HT
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_HT
+                                        .getXmlKey());
             } else if (varName == VarName.SEC_SWELL_PD) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_PD
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_PD
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_PD
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_PD
+                                        .getXmlKey());
             } else if (varName == VarName.SEC_SWELL_DIR) {
                 redThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_FROM
+                                        .getXmlKey());
                 redThreshold_2 = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.RED,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_TO
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.RED,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_TO
+                                        .getXmlKey());
                 yellowThreshold = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_FROM
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_FROM
+                                        .getXmlKey());
                 yellowThreshold_2 = (float) thresholdMgr
-                .getThresholdValue(
-                        DataUsageKey.DISPLAY,
-                        ThresholdKey.YELLOW,
-                        zone,
-                        MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_TO
-                        .getXmlKey());
+                        .getThresholdValue(
+                                DataUsageKey.DISPLAY,
+                                ThresholdKey.YELLOW,
+                                zone,
+                                MonitorConfigConstants.SafeSeasDisplay.SS_DISP_SWELL_SEC_DIR_TO
+                                        .getXmlKey());
             } else {
-                System.err.println("Unknow variable name = " + varName
+                statusHandler.warn("Unknow variable name = " + varName
                         + " for SAFESEAS trend plot");
             }
 
@@ -811,11 +1023,11 @@ public class ObTrendDataSet {
      */
     public void addDataPoint(Date obsTime, Float varValue) {
         if (varName == VarName.VISIBILITY && appName == AppName.SAFESEAS) {
-			if (varValue != ObConst.MISSING) {
-				varValue = varValue / TableUtil.milesPerNauticalMile;
-			} else {
-				varValue = ObConst.MISSING;
-			}
+            if (varValue != ObConst.MISSING) {
+                varValue = varValue / TableUtil.milesPerNauticalMile;
+            } else {
+                varValue = ObConst.MISSING;
+            }
         }
         // miss CLR and SKC in the Trend plot.
         if (varName == VarName.CEILING) {
@@ -958,27 +1170,28 @@ public class ObTrendDataSet {
         float min = minValue;
         float max = maxValue;
 
-        //Adjust the min/max value, so it will at least cover two colors (red/yellow/green)
-        //there are six different cases: 1 above + 5 below
-        if (maxValue <= lowerThreshold) //values are below the lower threshold
-        	max = lowerThreshold * 1.1f;
-        else if (minValue >= upperThreshold) //values are above upper threshold
-        	min = upperThreshold * .9f;
+        // Adjust the min/max value, so it will at least cover two colors
+        // (red/yellow/green)
+        // there are six different cases: 1 above + 5 below
+        if (maxValue <= lowerThreshold) // values are below the lower threshold
+            max = lowerThreshold * 1.1f;
+        else if (minValue >= upperThreshold) // values are above upper threshold
+            min = upperThreshold * .9f;
         else if (maxValue < upperThreshold) {
-        	max = upperThreshold ; //values covers across the lower threshold
-        	if (minValue >= lowerThreshold)
-        		min = lowerThreshold * .9f; //values are within the thresholds
+            max = upperThreshold; // values covers across the lower threshold
+            if (minValue >= lowerThreshold)
+                min = lowerThreshold * .9f; // values are within the thresholds
         } else if (minValue > lowerThreshold)
-        	min = lowerThreshold;  //values cover across the upper threshold
+            min = lowerThreshold; // values cover across the upper threshold
 
         float range = max - min;
         if (range > 5) {
             if (range > 1000) {
                 increment = 200;
             } else if (range > 500) {
-            	increment = 100;
+                increment = 100;
             } else if (range > 200) {
-            	increment = 50;
+                increment = 50;
             } else if (range > 100) {
                 increment = 20;
             } else if (range > 50) {
@@ -989,8 +1202,8 @@ public class ObTrendDataSet {
                 increment = 2;
             }
 
-            lowerLimit = (int)min;
-            upperLimit = (int)max;
+            lowerLimit = (int) min;
+            upperLimit = (int) max;
             if (lowerLimit > min) {
                 lowerLimit -= increment;
             }
@@ -1012,9 +1225,9 @@ public class ObTrendDataSet {
                 }
                 increment = 1000 * increment;
                 lowerLimit = Float.valueOf(min * 1000) / increment * increment
-                * 0.001f;
+                        * 0.001f;
                 upperLimit = Float.valueOf(max * 1000) / increment * increment
-                * 0.001f;
+                        * 0.001f;
                 increment = increment / 1000;
                 if (lowerLimit > min) {
                     lowerLimit -= increment;
@@ -1030,9 +1243,9 @@ public class ObTrendDataSet {
                 }
                 increment = 10 * increment;
                 lowerLimit = Float.valueOf(min * 10) / increment * increment
-                * 0.1f;
+                        * 0.1f;
                 upperLimit = Float.valueOf(max * 10) / increment * increment
-                * 0.1f;
+                        * 0.1f;
                 increment = increment / 10;
                 if (lowerLimit > min) {
                     lowerLimit -= increment;
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java
index 649955f0d9..58c03bb87e 100755
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java
+++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObZoneHourReports.java
@@ -25,13 +25,13 @@ import java.util.List;
 import java.util.Map;
 
 import com.raytheon.uf.common.monitor.data.CommonConfig;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants;
 import com.raytheon.uf.common.monitor.data.ObConst;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType;
 import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
 
 /**
  * This class is a container of ObStnHourReports objects for caller-specified
@@ -46,6 +46,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
  * Dec. 1, 2009  3424       zhao       Initial creation.
  * Jan 25, 2010  4281       zhao       Modified updateWorstValuesFog method.
  * Sep 18, 2015  3873       skorolev   Added moving platform's reports.Replaced MonitoringArea with areaConfig.
+ * Dec 26, 2015  5114       skorolev   Replaced MonitorConfigConstants import.
  * 
  * </pre>
  * 
@@ -62,16 +63,16 @@ public class ObZoneHourReports {
     private Date nominalTime;
 
     /** Monitoring area */
-    private String zone;
+    private final String zone;
 
     /** Thresholds manager */
-    private AbstractThresholdMgr thresholdMgr;
+    private final AbstractThresholdMgr thresholdMgr;
 
     /** application name (snow, fog, safeseas, etc) */
-    private CommonConfig.AppName appName;
+    private final CommonConfig.AppName appName;
 
     /** key is station id, value is ObStnHourReports object */
-    private HashMap<String, ObStnHourReports> zoneHourReports;
+    private final HashMap<String, ObStnHourReports> zoneHourReports;
 
     /**
      * this object stores worst values of the observation variables reported
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java
index b51298a54b..754e65871b 100755
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java
+++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/TableUtil.java
@@ -29,6 +29,7 @@ import com.raytheon.uf.common.geospatial.SpatialQueryFactory;
 import com.raytheon.uf.common.monitor.MonitorAreaUtils;
 import com.raytheon.uf.common.monitor.data.CommonConfig;
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants;
 import com.raytheon.uf.common.monitor.data.ObConst;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
 import com.raytheon.uf.common.monitor.xml.AreaIdXML;
@@ -38,7 +39,6 @@ import com.raytheon.uf.viz.monitor.config.CommonTableConfig;
 import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType;
 import com.raytheon.uf.viz.monitor.config.CommonTableConfig.ObsHistType;
 import com.raytheon.uf.viz.monitor.thresholds.AbstractThresholdMgr;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
 
 /**
  * Moved some common utility methods related to
@@ -57,6 +57,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
  * May 23, 2014  3086       skorolev   Corrected ObsHistType. Cleaned code.
  * Sep 18, 2015  3873       skorolev   Added coordinates in the hover text for a newly added zones.Corrected code for Fog and SNOW table data.
  * Oct 22, 2015  3873       dhladky    Cached off the zone/station hover texts.
+ * Dec 26, 2015  5114       skorolev   Replaced MonitorConfigConstants import.
  * 
  * </pre>
  * 
@@ -68,18 +69,19 @@ public final class TableUtil {
 
     private static final IUFStatusHandler statusHandler = UFStatus
             .getHandler(TableUtil.class);
-    
+
     /** Conversion coefficient of nautical miles to statute miles. */
     public static final float milesPerNauticalMile = 1.15078f;
 
     /** Singleton instance of this class */
     private static TableUtil tableUtil = new TableUtil();
+
     /** Hover text lookup map **/
     public Map<String, String> zoneHoverTextMap = null;
+
     /** station text lookup map **/
     public Map<String, String> stationHoverTextMap = null;
 
-
     /**
      * Actual initialization if necessary
      * 
@@ -92,12 +94,12 @@ public final class TableUtil {
 
         return tableUtil;
     }
-    
+
     private TableUtil() {
         zoneHoverTextMap = new ConcurrentHashMap<String, String>();
         stationHoverTextMap = new ConcurrentHashMap<String, String>();
     }
-    
+
     /**
      * Returns the nominal time for a caller-specified time (to be consistent
      * with D2D, here "Nominal time" is defined as the hour of an one-hour
@@ -1005,9 +1007,9 @@ public final class TableUtil {
 
         String zone = zoneXML.getAreaId();
         String hoverText = tableUtil.zoneHoverTextMap.get(zone);
-        
+
         if (hoverText == null) {
-        
+
             ISpatialQuery sq = null;
             String sql = null;
             hoverText = zone.substring(0, 2) + ", ";
@@ -1035,7 +1037,7 @@ public final class TableUtil {
                         Object[] res = (Object[]) results[0];
                         hoverText += (String) res[0];
                     } else {
-                        hoverText += (String) results[0].toString();
+                        hoverText += results[0].toString();
                     }
                 } else {
                     if (zoneXML.getCLat() != null) {
@@ -1044,9 +1046,10 @@ public final class TableUtil {
                     }
                 }
             } catch (Exception e) {
-                statusHandler.error("Unable to query Zone Hover Text: sql: "+sql, e);
+                statusHandler.error("Unable to query Zone Hover Text: sql: "
+                        + sql, e);
             }
-            
+
             tableUtil.zoneHoverTextMap.put(zone, hoverText);
         }
 
@@ -1061,14 +1064,13 @@ public final class TableUtil {
      */
     private static String getStationHoverText(String stnId) {
 
-        
         String hoverText = tableUtil.stationHoverTextMap.get(stnId);
-        
+
         if (hoverText == null) {
-  
+
             String sql = "select catalogtype, name from common_obs_spatial where ( catalogtype=1 or catalogtype=33 or catalogtype = 32 or catalogtype=1000) and stationid = '"
                     + stnId + "'";
-            
+
             ISpatialQuery sq = null;
             Integer stnType = null;
             String stnName = null;
@@ -1097,12 +1099,13 @@ public final class TableUtil {
                 }
 
             } catch (Exception e) {
-                statusHandler.error("Unable to query Station Hover Text: sql: "+sql, e);
+                statusHandler.error("Unable to query Station Hover Text: sql: "
+                        + sql, e);
             }
 
             tableUtil.stationHoverTextMap.put(stnId, hoverText);
         }
-        
+
         return hoverText;
 
     }
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/AbstractThresholdMgr.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/AbstractThresholdMgr.java
index 0d933eb8c5..45da73458a 100755
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/AbstractThresholdMgr.java
+++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/AbstractThresholdMgr.java
@@ -31,20 +31,20 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
+import com.raytheon.uf.common.monitor.config.ThresholdMgr;
 import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants;
 import com.raytheon.uf.common.monitor.data.ObConst;
 import com.raytheon.uf.common.monitor.data.ObConst.DataUsageKey;
+import com.raytheon.uf.common.monitor.xml.AreaThresholdXML;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.viz.core.localization.LocalizationManager;
 import com.raytheon.uf.viz.monitor.config.CommonTableConfig.CellType;
 import com.raytheon.uf.viz.monitor.filename.DefaultFilenameMgr;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
-import com.raytheon.uf.viz.monitor.xml.AreaThresholdXML;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
 /**
  * Abstract threshold manager class used for FOG, SNOW, and SAFESEAS.
@@ -59,6 +59,7 @@ import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
  * Feb 16, 2011 #7346      zhao         added getDirectionalThresholdValueCellType(...)
  * Apr 28, 2014  3086      skorolev     Updated getAreaConfigMgr method.
  * Sep 18, 2015  3873      skorolev     Added getCfgMgr().
+ * Dec 26, 2015  5114      skorolev     Corrected imports and file path for default thresholds.
  * 
  * </pre>
  * 
@@ -159,7 +160,7 @@ public abstract class AbstractThresholdMgr {
          */
         if (defaultFileNameMgr.getDefaultThresholdFilename() != null
                 && defaultFileNameMgr.getDefaultThresholdFilename().length() > 0) {
-            boolean fileNameValid = validateFileName(getDisplayThresholdPath()
+            boolean fileNameValid = validateFileName(getThresholdPath(DataUsageKey.DISPLAY)
                     + defaultFileNameMgr.getDefaultThresholdFilename());
 
             if (defaultFileNameMgr.getDefaultThresholdFilename().compareTo(
@@ -169,13 +170,13 @@ public abstract class AbstractThresholdMgr {
                 displayThreshMgr = new ThresholdMgr(currFullDisplayXmlFileName);
                 loadDefaultDisplayThreshold();
             } else {
-                currFullDisplayXmlFileName = getDisplayThresholdPath()
+                currFullDisplayXmlFileName = getThresholdPath(DataUsageKey.DISPLAY)
                         + defaultFileNameMgr.getDefaultThresholdFilename();
                 displayThreshMgr = new ThresholdMgr(currFullDisplayXmlFileName);
                 displayThreshMgr.readThresholdXml();
             }
         } else {
-            currFullDisplayXmlFileName = getDisplayThresholdPath()
+            currFullDisplayXmlFileName = getThresholdPath(DataUsageKey.DISPLAY)
                     + defDisplayThreshName;
             displayThreshMgr = new ThresholdMgr(currFullDisplayXmlFileName);
             loadDefaultDisplayThreshold();
@@ -184,7 +185,7 @@ public abstract class AbstractThresholdMgr {
         /*
          * Setup the monitor threshold manager
          */
-        currFullMonitorXmlFileName = getMonitorThresholdPath()
+        currFullMonitorXmlFileName = getThresholdPath(DataUsageKey.MONITOR)
                 + defMonitorThreshName;
 
         monitorThreshMgr = new ThresholdMgr(currFullMonitorXmlFileName);
@@ -204,7 +205,7 @@ public abstract class AbstractThresholdMgr {
     private boolean validateFileName(String pathAndFileName) {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
+                LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
         LocalizationFile locFile = pm.getLocalizationFile(context,
                 pathAndFileName);
 
@@ -456,7 +457,7 @@ public abstract class AbstractThresholdMgr {
     public void setDefaultDisplayFileName(String fileName) {
         if (fileName == null) {
             defaultFileNameMgr.setDefaultThresholdFilename("");
-            currFullDisplayXmlFileName = getDisplayThresholdPath()
+            currFullDisplayXmlFileName = getThresholdPath(DataUsageKey.DISPLAY)
                     + defDisplayThreshName;
             return;
         }
@@ -481,7 +482,8 @@ public abstract class AbstractThresholdMgr {
             loadDefaultDisplayThreshold();
             return;
         }
-        currFullDisplayXmlFileName = getDisplayThresholdPath() + fileName;
+        currFullDisplayXmlFileName = getThresholdPath(DataUsageKey.DISPLAY)
+                + fileName;
         displayThreshMgr.setFullPathFileName(currFullDisplayXmlFileName);
         displayThreshMgr.readThresholdXml();
     }
@@ -493,7 +495,7 @@ public abstract class AbstractThresholdMgr {
         String filename = defaultFileNameMgr.getDefaultThresholdFilename();
 
         if (filename == null || filename.trim().length() == 0) {
-            currFullDisplayXmlFileName = getDisplayThresholdPath()
+            currFullDisplayXmlFileName = getThresholdPath(DataUsageKey.DISPLAY)
                     + defDisplayThreshName;
             List<String> areaIDs = null;
             try {
@@ -507,10 +509,11 @@ public abstract class AbstractThresholdMgr {
             ArrayList<String> threshKeys = getThresholdKeys(DataUsageKey.DISPLAY);
             statusHandler.handle(Priority.DEBUG, "---- "
                     + currFullDisplayXmlFileName);
-            displayThreshMgr.createConfigFromDefaults(
+            displayThreshMgr.createDisplayConfigFromDefaults(
                     currFullDisplayXmlFileName, areaIDs, threshKeys);
         } else {
-            currFullDisplayXmlFileName = getDisplayThresholdPath() + filename;
+            currFullDisplayXmlFileName = getThresholdPath(DataUsageKey.DISPLAY)
+                    + filename;
             displayThreshMgr.setFullPathFileName(currFullDisplayXmlFileName);
             displayThreshMgr.readThresholdXml();
         }
@@ -532,8 +535,8 @@ public abstract class AbstractThresholdMgr {
         // Sort the area IDs
         Collections.sort(areaIDs);
         ArrayList<String> threshKeys = getThresholdKeys(DataUsageKey.MONITOR);
-        monitorThreshMgr.createConfigFromDefaults(currFullMonitorXmlFileName,
-                areaIDs, threshKeys);
+        monitorThreshMgr.createMonitorConfigFromDefaults(
+                currFullMonitorXmlFileName, areaIDs, threshKeys);
     }
 
     /**
@@ -546,7 +549,8 @@ public abstract class AbstractThresholdMgr {
         if (newFileName.trim().compareTo(defDisplayThreshName) == 0) {
             return;
         }
-        currFullDisplayXmlFileName = getDisplayThresholdPath() + newFileName;
+        currFullDisplayXmlFileName = getThresholdPath(DataUsageKey.DISPLAY)
+                + newFileName;
         displayThreshMgr.setFullPathFileName(currFullDisplayXmlFileName);
         displayThreshMgr.saveThresholdXml();
     }
@@ -605,12 +609,12 @@ public abstract class AbstractThresholdMgr {
      * 
      * @return File path.
      */
-    public String getDisplayThresholdPath() {
+    public String getThresholdPath(DataUsageKey usage) {
         String fs = String.valueOf(File.separatorChar);
         StringBuilder sb = new StringBuilder();
         sb.append(appName.name().toLowerCase()).append(fs);
         sb.append("threshold").append(fs);
-        sb.append("display").append(fs);
+        sb.append(usage.name().toLowerCase()).append(fs);
         return sb.toString();
     }
 
@@ -621,10 +625,9 @@ public abstract class AbstractThresholdMgr {
      */
     public String getMonitorThresholdPath() {
         String fs = String.valueOf(File.separatorChar);
-        StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder("monitoring");
+        sb.append(fs);
         sb.append(appName.name().toLowerCase()).append(fs);
-        sb.append("threshold").append(fs);
-        sb.append("monitor").append(fs);
         return sb.toString();
     }
 
@@ -753,13 +756,14 @@ public abstract class AbstractThresholdMgr {
         FSSObsMonitorConfigurationManager mgr = null;
         switch (this.appName) {
         case FOG:
-            mgr = FSSObsMonitorConfigurationManager.getInstance(MonName.fog);
+            mgr = FSSObsMonitorConfigurationManager.getInstance(AppName.FOG);
             break;
         case SAFESEAS:
-            mgr = FSSObsMonitorConfigurationManager.getInstance(MonName.ss);
+            mgr = FSSObsMonitorConfigurationManager
+                    .getInstance(AppName.SAFESEAS);
             break;
         case SNOW:
-            mgr = FSSObsMonitorConfigurationManager.getInstance(MonName.snow);
+            mgr = FSSObsMonitorConfigurationManager.getInstance(AppName.SNOW);
             break;
         default:
             statusHandler.error("Unable to handle unknown appName: "
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
old mode 100644
new mode 100755
index 41418b7f6d..775ff02ad3
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
+++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
@@ -51,7 +51,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * ------------ ---------- ----------- --------------------------
  * Apr 6, 2009             lvenable     Initial creation
  * Jun 17, 2010 5551,5548  skorolev     Add "Open" and "Help" menu itemsec
- * Dec 6, 2012 #1351       skorolev     Changes for non-blocking dialogs.
+ * Dec  6, 2012 #1351      skorolev     Changes for non-blocking dialogs.
+ * Dec 26, 2015  5114      skorolev     Corrected menu actions according to getThresholdPath.
  * 
  * </pre>
  * 
@@ -206,6 +207,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         MenuItem exitMI = new MenuItem(fileMenu, SWT.NONE);
         exitMI.setText("Exit");
         exitMI.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 close();
             }
@@ -237,6 +239,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         MenuItem open = new MenuItem(fileMenu, SWT.NONE);
         open.setText("Open");
         open.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 menuOpenAction();
             }
@@ -245,6 +248,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         MenuItem saveAsMI = new MenuItem(fileMenu, SWT.NONE);
         saveAsMI.setText("Save As...");
         saveAsMI.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 menuSaveAsAction();
             }
@@ -253,6 +257,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         MenuItem selectAsDefaultMI = new MenuItem(fileMenu, SWT.NONE);
         selectAsDefaultMI.setText("Select As Default...");
         selectAsDefaultMI.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 menuSelectAsDefaultAction();
             }
@@ -261,6 +266,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         MenuItem loadDefaultMI = new MenuItem(fileMenu, SWT.NONE);
         loadDefaultMI.setText("Load Default");
         loadDefaultMI.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 menuLoadDefaultAction();
             }
@@ -269,6 +275,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         MenuItem deleteMI = new MenuItem(fileMenu, SWT.NONE);
         deleteMI.setText("Delete");
         deleteMI.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 menuDeleteAction();
             }
@@ -285,6 +292,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         MenuItem saveMI = new MenuItem(fileMenu, SWT.NONE);
         saveMI.setText("Save");
         saveMI.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 menuSaveAction();
             }
@@ -314,6 +322,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         commitBtn.setText("Commit Changes");
         commitBtn.setLayoutData(gd);
         commitBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 commitChangeAction();
                 close();
@@ -329,7 +338,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         if (deleteDlg == null) {
             AbstractThresholdMgr atm = getThresholdMgr();
             deleteDlg = new LoadSaveDeleteSelectDlg(shell, DialogType.DELETE,
-                    atm.getDisplayThresholdPath(),
+                    atm.getThresholdPath(DataUsageKey.DISPLAY),
                     atm.getDefaultFileName(DataUsageKey.DISPLAY));
             deleteDlg.setCloseCallback(new ICloseCallback() {
                 @Override
@@ -374,7 +383,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         if (saveAsDlg == null) {
             AbstractThresholdMgr atm = getThresholdMgr();
             saveAsDlg = new LoadSaveDeleteSelectDlg(shell, DialogType.SAVE_AS,
-                    atm.getDisplayThresholdPath(),
+                    atm.getThresholdPath(DataUsageKey.DISPLAY),
                     atm.getDefaultFileName(DataUsageKey.DISPLAY));
             saveAsDlg.setCloseCallback(new ICloseCallback() {
                 @Override
@@ -407,7 +416,8 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         if (selectDlg == null) {
             AbstractThresholdMgr atm = getThresholdMgr();
             selectDlg = new LoadSaveDeleteSelectDlg(shell,
-                    DialogType.SELECT_DEFAULT, atm.getDisplayThresholdPath(),
+                    DialogType.SELECT_DEFAULT,
+                    atm.getThresholdPath(DataUsageKey.DISPLAY),
                     atm.getDefaultFileName(DataUsageKey.DISPLAY));
             selectDlg.setCloseCallback(new ICloseCallback() {
                 @Override
@@ -448,7 +458,7 @@ public abstract class MonitorDisplayThreshDlg extends CaveSWTDialog {
         if (openDlg == null) {
             AbstractThresholdMgr atm = getThresholdMgr();
             openDlg = new LoadSaveDeleteSelectDlg(shell, DialogType.OPEN,
-                    atm.getDisplayThresholdPath(), null);
+                    atm.getThresholdPath(DataUsageKey.DISPLAY), null);
             openDlg.setCloseCallback(new ICloseCallback() {
                 @Override
                 public void dialogClosed(Object returnValue) {
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
old mode 100644
new mode 100755
index 27bf30cf6f..ead81948eb
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
+++ b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
@@ -46,13 +46,13 @@ import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 
 import com.raytheon.uf.common.monitor.data.CommonConfig;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants;
 import com.raytheon.uf.viz.monitor.config.CommonTableConfig;
 import com.raytheon.uf.viz.monitor.config.CommonTableConfig.SortDirection;
 import com.raytheon.uf.viz.monitor.data.ColumnAttribData;
 import com.raytheon.uf.viz.monitor.data.TableCellData;
 import com.raytheon.uf.viz.monitor.data.TableData;
 import com.raytheon.uf.viz.monitor.data.TableRowData;
-import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
 
 /**
  * Abstract table composite that is the main foundation for a table displaying
@@ -66,6 +66,7 @@ import com.raytheon.uf.viz.monitor.util.MonitorConfigConstants;
  * Apr 7, 2009             lvenable    Initial creation
  * Oct 7, 2013  #2436      lvenable    Disposed of the sort color.
  * Nov 7, 2013  DR 16703   gzhang      Check in code for Lee for FFMP and Safeseas
+ * Dec 26, 2015  5114      skorolev    Corrected imports.
  * 
  * </pre>
  * 
@@ -187,6 +188,7 @@ public abstract class TableComp extends Composite {
         packColumns();
 
         this.addDisposeListener(new DisposeListener() {
+            @Override
             public void widgetDisposed(DisposeEvent arg0) {
                 tiFont.dispose();
                 lineColor.dispose();
@@ -257,6 +259,7 @@ public abstract class TableComp extends Composite {
          * cell and also draw a blue line to show the selected row.
          */
         table.addListener(SWT.PaintItem, new Listener() {
+            @Override
             public void handleEvent(Event event) {
                 table.deselectAll();
                 event.gc.setForeground(lineColor);
@@ -281,10 +284,10 @@ public abstract class TableComp extends Composite {
                 TableItem ti = (TableItem) event.item;
                 int idx = table.indexOf(ti);
                 if (idx == table.getItemCount() - 1) {
-                      event.gc.drawLine(rect.x, rect.y + rect.height - 2, rect.x
-                             + rect.width, rect.y + rect.height - 2);
+                    event.gc.drawLine(rect.x, rect.y + rect.height - 2, rect.x
+                            + rect.width, rect.y + rect.height - 2);
                 }
-                
+
                 if (tableIndex >= 0) {
                     event.gc.setForeground(parent.getDisplay().getSystemColor(
                             SWT.COLOR_BLUE));
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java b/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
old mode 100755
new mode 100644
diff --git a/cave/com.raytheon.uf.viz.ncwf/src/com/raytheon/uf/viz/ncwf/rsc/NcwfMovementResource.java b/cave/com.raytheon.uf.viz.ncwf/src/com/raytheon/uf/viz/ncwf/rsc/NcwfMovementResource.java
index 3504c84349..f5013b6f81 100644
--- a/cave/com.raytheon.uf.viz.ncwf/src/com/raytheon/uf/viz/ncwf/rsc/NcwfMovementResource.java
+++ b/cave/com.raytheon.uf.viz.ncwf/src/com/raytheon/uf/viz/ncwf/rsc/NcwfMovementResource.java
@@ -29,8 +29,6 @@ import org.eclipse.swt.graphics.RGB;
 
 import com.raytheon.uf.common.dataplugin.bufrncwf.BUFRncwf;
 import com.raytheon.uf.common.dataplugin.bufrncwf.NCWFFeature;
-import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
-import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
 import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.pointdata.PointDataView;
 import com.raytheon.uf.common.time.DataTime;
@@ -54,8 +52,9 @@ import com.vividsolutions.jts.geom.Coordinate;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Sep 16, 2009            bsteffen     Initial creation
- * Jul 24, 2014 3429       mapeters     Updated deprecated drawLine() calls.
+ * Sep 16, 2009            bsteffen    Initial creation
+ * Jul 24, 2014 3429       mapeters    Updated deprecated drawLine() calls.
+ * Feb 04, 2016 5310       tgurney     Remove dependency on dataURI
  * 
  * </pre>
  * 
@@ -168,7 +167,8 @@ public class NcwfMovementResource extends
             // Draw the body of the arrow
             DrawableLine line = new DrawableLine();
             line.setCoordinates(centerPixel[0], centerPixel[1], centerPixel[2]);
-            line.addPoint(or_centerPixel[0], or_centerPixel[1], or_centerPixel[2]);
+            line.addPoint(or_centerPixel[0], or_centerPixel[1],
+                    or_centerPixel[2]);
             line.basics.color = color;
             line.width = 1.5f;
             lines.add(line);
@@ -181,8 +181,8 @@ public class NcwfMovementResource extends
     }
 
     private DrawableLine createArrowHead(IGraphicsTarget target,
-            double[] center,
-            Double length, Double dir, RGB color) throws VizException {
+            double[] center, Double length, Double dir, RGB color)
+            throws VizException {
         double[] pointPixel = target.getPointOnCircle(center[0], center[1],
                 center[2], length, dir + 210);
 
@@ -191,8 +191,7 @@ public class NcwfMovementResource extends
         line.setCoordinates(pointPixel[0], pointPixel[1], pointPixel[2]);
         line.addPoint(center[0], center[1], center[2]);
         double[] pointPixel2 = target.getPointOnCircle(center[0], center[1],
-                center[2],
-                length, dir + 150);
+                center[2], length, dir + 150);
         line.addPoint(pointPixel2[0], pointPixel2[1], pointPixel2[2]);
         line.basics.color = color;
         line.width = 1.5f;
@@ -209,21 +208,13 @@ public class NcwfMovementResource extends
         if (!recordsMap.containsKey(displayedDataTime)) {
             recordsMap.put(displayedDataTime, new ArrayList<BUFRncwf>());
         }
-        RequestConstraint constraint = new RequestConstraint();
 
-        constraint.setConstraintType(ConstraintType.IN);
-
-        for (BUFRncwf r : records) {
-
-            constraint.addToConstraintValueList(r.getDataURI());
-        }
-        Map<String, RequestConstraint> constraints = new HashMap<String, RequestConstraint>();
-        constraints.put("dataURI", constraint);
         // Request the point data
         PointDataContainer pdc = PointDataRequest.requestPointDataAllLevels(
                 displayedDataTime,
                 resourceData.getMetadataMap().get("pluginName")
-                        .getConstraintValue(), parameters, null, constraints);
+                        .getConstraintValue(), parameters, null,
+                resourceData.getMetadataMap());
 
         for (int uriCounter = 0; uriCounter < pdc.getAllocatedSz(); uriCounter++) {
             PointDataView pdv = pdc.readRandom(uriCounter);
@@ -253,6 +244,7 @@ public class NcwfMovementResource extends
         this.recordsToParse.get(displayedDataTime).clear();
     }
 
+    @Override
     protected void addRecord(BUFRncwf obj) {
         if (!recordsToParse.containsKey(obj.getDataTime())) {
             recordsToParse.put(obj.getDataTime(), new ArrayList<BUFRncwf>());
diff --git a/cave/com.raytheon.uf.viz.ncwf/src/com/raytheon/uf/viz/ncwf/rsc/NcwfPolygonResource.java b/cave/com.raytheon.uf.viz.ncwf/src/com/raytheon/uf/viz/ncwf/rsc/NcwfPolygonResource.java
index 92e2fa5fb4..cb012eb26c 100644
--- a/cave/com.raytheon.uf.viz.ncwf/src/com/raytheon/uf/viz/ncwf/rsc/NcwfPolygonResource.java
+++ b/cave/com.raytheon.uf.viz.ncwf/src/com/raytheon/uf/viz/ncwf/rsc/NcwfPolygonResource.java
@@ -53,7 +53,8 @@ import com.vividsolutions.jts.geom.GeometryFactory;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Sep 16, 2009            bsteffen     Initial creation
+ * Sep 16, 2009            bsteffen    Initial creation
+ * Feb 04, 2016 5310       tgurney     Remove dependency on dataURI
  * 
  * </pre>
  * 
@@ -175,14 +176,12 @@ public class NcwfPolygonResource extends
         DataTime dataTime = null;
 
         for (BUFRncwf r : records) {
-            constraint.addToConstraintValueList(r.getDataURI());
             dataTime = r.getDataTime();
         }
-        Map<String, RequestConstraint> constraints = new HashMap<String, RequestConstraint>();
-        constraints.put("dataURI", constraint);
         PointDataContainer pdc = PointDataRequest.requestPointDataAllLevels(
                 dataTime, resourceData.getMetadataMap().get("pluginName")
-                        .getConstraintValue(), parameters, null, constraints);
+                        .getConstraintValue(), parameters, null,
+                resourceData.getMetadataMap());
 
         for (int uriCounter = 0; uriCounter < pdc.getAllocatedSz(); uriCounter++) {
             PointDataView pdv = pdc.readRandom(uriCounter);
@@ -206,6 +205,7 @@ public class NcwfPolygonResource extends
 
     }
 
+    @Override
     protected void addRecord(BUFRncwf obj) {
 
         DataTime time = calculateBinTime(obj.getDataTime());
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/utility/edex_static/base/distribution/bufrquikscat.xml b/cave/com.raytheon.uf.viz.points/localization/menus/tools/points-index.xml
similarity index 85%
rename from edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/utility/edex_static/base/distribution/bufrquikscat.xml
rename to cave/com.raytheon.uf.viz.points/localization/menus/tools/points-index.xml
index a0053ff004..2d5bc24df6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/utility/edex_static/base/distribution/bufrquikscat.xml
+++ b/cave/com.raytheon.uf.viz.points/localization/menus/tools/points-index.xml
@@ -18,6 +18,8 @@
         See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
         further_licensing_information.
     -->
-<requestPatterns xmlns:ns2="group">
-    <regex>^ISXX.*</regex>
-</requestPatterns>
+<menuContributionFile>
+    <include installTo="menu:tools?after=tools.Po"
+        fileName="menus/tools/points-menu.xml">
+    </include>
+</menuContributionFile>
diff --git a/cave/com.raytheon.uf.viz.points/localization/menus/tools/points-menu.xml b/cave/com.raytheon.uf.viz.points/localization/menus/tools/points-menu.xml
new file mode 100644
index 0000000000..f945d21685
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.points/localization/menus/tools/points-menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">  
+
+    <contribute xsi:type="bundleItem" file="bundles/tools/Points.xml"
+		menuText="Points" id="pointsTool" timeQuery="false" />
+
+</menuTemplate>
diff --git a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/PointsDataManager.java b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/PointsDataManager.java
index 8f10dd20a6..b9a328aad4 100644
--- a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/PointsDataManager.java
+++ b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/PointsDataManager.java
@@ -22,7 +22,6 @@ package com.raytheon.uf.viz.points;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -51,6 +50,7 @@ import org.geotools.referencing.datum.DefaultEllipsoid;
 import com.raytheon.uf.common.awipstools.GetWfoCenterPoint;
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
 import com.raytheon.uf.common.localization.FileUpdatedMessage.FileChangeType;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
@@ -58,8 +58,8 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -89,6 +89,10 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Dec 05, 2012 #1364      rferrel     Replace File.Separator with IPathManager.SEPARATOR
  *                                      to work correctly on all platforms.
  * Oct 20, 2014 #3418      dlovely     Fixed a possible NPE in loadPoint.
+ * Nov 12, 2015  4834      njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Dec 09, 2015  4834      njensen     updates for API changes to LocalizationFile
+ * Jan 11, 2016 5242       kbisanz     Replaced calls to deprecated LocalizationFile methods
+ * Feb 12, 2016 #5242      dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -396,7 +400,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
      */
     private void storePoint(LocalizationFile dir, Point point, String fileName) {
         LocalizationFile lFile = pathMgr.getLocalizationFile(userCtx, dir
-                .getName().trim() + IPathManager.SEPARATOR + fileName);
+                .getPath().trim() + IPathManager.SEPARATOR + fileName);
 
         try {
             marshalPointToXmlFile(point, lFile);
@@ -445,7 +449,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
                     processRequests();
                 }
             } else {
-                String dirPath = pointsDir.getName().trim();
+                String dirPath = pointsDir.getPath().trim();
                 String name = D2D_POINTS_GROUP.replace(' ',
                         PointUtilities.DELIM_CHAR);
                 String path = dirPath + IPathManager.SEPARATOR + name;
@@ -454,7 +458,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
                 if (!d2dDir.isDirectory()) {
                     try {
                         d2dDir.delete();
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (LocalizationException e) {
                         statusHandler.handle(Priority.PROBLEM,
                                 "Unable to create group: " + D2D_POINTS_GROUP);
                         return points;
@@ -530,7 +534,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
      */
     private Coordinate loadHome() {
         LocalizationFile lFile = pathMgr.getLocalizationFile(
-                pointsDir.getContext(), pointsDir.getName().trim()
+                pointsDir.getContext(), pointsDir.getPath().trim()
                         + IPathManager.SEPARATOR + HOME_LOCATION_FILE);
         Point point = null;
         if (lFile.exists()) {
@@ -555,7 +559,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
         points.clear();
         childrenKeyMap.clear();
 
-        String path = pointsDir.getName().trim();
+        String path = pointsDir.getPath().trim();
         LocalizationFile[] files = pathMgr.listFiles(userCtx, path,
                 new String[] { POINT_FILENAME_EXT }, true, false);
 
@@ -682,7 +686,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
      * @return lFile
      */
     private LocalizationFile getGroupDir(Point point) {
-        String path = (pointsDir.getName() + point.getGroup().replace(' ',
+        String path = (pointsDir.getPath() + point.getGroup().replace(' ',
                 PointUtilities.DELIM_CHAR));
         LocalizationFile dir = pathMgr.getLocalizationFile(userCtx, path);
         return dir;
@@ -765,7 +769,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
      */
     private String getPointFilename(Point point) {
         StringBuilder sb = new StringBuilder();
-        sb.append(pointsDir.getName().trim());
+        sb.append(pointsDir.getPath().trim());
         String group = point.getGroup();
         if (!group.startsWith(IPathManager.SEPARATOR)) {
             sb.append(IPathManager.SEPARATOR);
@@ -786,7 +790,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
     private String getPointDirName(Point node) {
         String group = node.getGroup();
         StringBuilder sb = new StringBuilder();
-        sb.append(pointsDir.getName().trim());
+        sb.append(pointsDir.getPath().trim());
         if (group.length() > 0) {
             if (group.startsWith(IPathManager.SEPARATOR) == false) {
                 sb.append(IPathManager.SEPARATOR);
@@ -884,22 +888,22 @@ public class PointsDataManager implements ILocalizationFileObserver {
      * 
      * @param parentNode
      * @return groupNode
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public IPointNode createTempGroup(IPointNode parentNode)
-            throws LocalizationOpFailedException {
+            throws LocalizationException {
         Point parent = (Point) parentNode;
         String path = getPointDirName(parent);
         StringBuilder sb = new StringBuilder(path);
 
-        LocalizationFile[] dirs = pathMgr.listStaticFiles(sb.toString(),
+        ILocalizationFile[] dirs = pathMgr.listStaticFiles(sb.toString(),
                 new String[0], false, false);
         sb.append(IPathManager.SEPARATOR).append(GROUP_TEMP_PREFIX);
         int end = sb.length();
 
         List<String> names = new ArrayList<String>();
-        for (LocalizationFile lf : dirs) {
-            names.add(lf.getName().trim());
+        for (ILocalizationFile lf : dirs) {
+            names.add(lf.getPath().trim());
         }
 
         int cnt = 0;
@@ -960,7 +964,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
             put(key, point);
             childrenKeyMap.get(newParentKey).add(key);
         } else {
-            Point newGroup = new GroupNode((Point) point);
+            Point newGroup = new GroupNode(point);
             String newGroupKey = newParentKey + IPathManager.SEPARATOR
                     + point.getName();
             newGroup.setGroup(newGroupKey);
@@ -1021,7 +1025,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
     private IPointNode createGroup(String parent, String name) {
         StringBuilder sb = new StringBuilder();
         sb.append(parent);
-        sb.replace(0, pointsDir.getName().trim().length(), "");
+        sb.replace(0, pointsDir.getPath().trim().length(), "");
         sb.append(IPathManager.SEPARATOR).append(name);
         Point gPoint = new GroupNode(name);
         gPoint.setGroup(sb.toString().replace(PointUtilities.DELIM_CHAR, ' '));
@@ -1035,20 +1039,17 @@ public class PointsDataManager implements ILocalizationFileObserver {
         LocalizationFile[] files = pathMgr.listFiles(userCtx, parent,
                 new String[] {}, false, false);
         for (LocalizationFile lf : files) {
-            if (groupPath.equals(lf.getName().trim())) {
+            if (groupPath.equals(lf.getPath().trim())) {
                 return null;
             }
         }
 
-        try {
-            // Must create a file in the directory to force its creation.
-            String p = lFile.getName().trim() + IPathManager.SEPARATOR
-                    + GROUP_INFO;
-            LocalizationFile lf = pathMgr.getLocalizationFile(userCtx, p);
-            OutputStream outStream = lf.openOutputStream();
+        // Must create a file in the directory to force its creation.
+        String p = lFile.getPath().trim() + IPathManager.SEPARATOR + GROUP_INFO;
+        ILocalizationFile lf = pathMgr.getLocalizationFile(userCtx, p);
+        try (SaveableOutputStream outStream = lf.openOutputStream()) {
             outStream.write(gPoint.getGroup().getBytes());
-            outStream.close();
-            lf.save();
+            outStream.save();
         } catch (LocalizationException e) {
             statusHandler.handle(Priority.PROBLEM,
                     "Unable to create the group: " + gPoint.getGroup(), e);
@@ -1075,13 +1076,13 @@ public class PointsDataManager implements ILocalizationFileObserver {
      * @return groups
      */
     public String[] getGroupList() {
-        LocalizationFile[] files = pathMgr.listFiles(userCtx, pointsDir
-                .getName().trim(), new String[] {}, true, false);
+        ILocalizationFile[] files = pathMgr.listFiles(userCtx, pointsDir
+                .getPath().trim(), new String[] {}, true, false);
         String[] groups = new String[files.length - 1];
-        int start = files[0].getName().trim().length();
+        int start = files[0].getPath().trim().length();
         for (int index = 1; index < files.length; ++index) {
-            LocalizationFile lf = files[index];
-            groups[index - 1] = lf.getName().trim().substring(start)
+            ILocalizationFile lf = files[index];
+            groups[index - 1] = lf.getPath().trim().substring(start)
                     .replace(PointUtilities.DELIM_CHAR, ' ');
         }
         Arrays.sort(groups);
@@ -1113,13 +1114,6 @@ public class PointsDataManager implements ILocalizationFileObserver {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.localization.ILocalizationFileObserver#fileUpdated
-     * (com.raytheon.uf.common.localization.FileUpdatedMessage)
-     */
     @Override
     public void fileUpdated(FileUpdatedMessage message) {
         String fileName = new File(message.getFileName()).getName();
@@ -1160,7 +1154,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
         boolean stateChange = false;
 
         StringBuilder sb = new StringBuilder(message.getFileName());
-        sb.replace(0, pointsDir.getName().length(), "");
+        sb.replace(0, pointsDir.getPath().length(), "");
         sb.replace(sb.lastIndexOf(IPathManager.SEPARATOR), sb.length(), "");
         String groupKey = sb.toString().replace(PointUtilities.DELIM_CHAR, ' ');
 
@@ -1298,7 +1292,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
         boolean stateChange = false;
         StringBuilder sb = new StringBuilder(message.getFileName());
         sb.setLength(sb.lastIndexOf(IPathManager.SEPARATOR));
-        sb.replace(0, pointsDir.getName().length(), "");
+        sb.replace(0, pointsDir.getPath().length(), "");
         String key = sb.toString().replace(PointUtilities.DELIM_CHAR, ' ');
         String parentKey = null;
         int index = key.lastIndexOf(IPathManager.SEPARATOR);
@@ -1364,7 +1358,7 @@ public class PointsDataManager implements ILocalizationFileObserver {
                         deleteKey);
                 try {
                     lFile.delete();
-                } catch (LocalizationOpFailedException e) {
+                } catch (LocalizationException e) {
                     statusHandler.handle(Priority.PROBLEM,
                             e.getLocalizedMessage(), e);
                 }
@@ -1505,9 +1499,6 @@ public class PointsDataManager implements ILocalizationFileObserver {
      * ADDED if file was successfully created.
      * 
      * @param point
-     * @return returns true if point was successfully added, false otherwise,
-     *         for example when a duplicate point name exists and forceOverwrite
-     *         was false
      */
     private void storePoint(Point point) {
         LocalizationFile dir = getGroupDir(point);
@@ -1522,7 +1513,6 @@ public class PointsDataManager implements ILocalizationFileObserver {
      * DELETE if file removal is successful.
      * 
      * @param point
-     * @return
      */
     public void deletePoint(final Point point) {
         IPointNode parentNode = getParent(point);
@@ -1589,10 +1579,8 @@ public class PointsDataManager implements ILocalizationFileObserver {
             lFile = pathMgr.getLocalizationFile(userCtx, name);
         }
         try {
-            if (!lFile.delete()) {
-                statusHandler.error("Unable to remove file: " + lFile);
-            }
-        } catch (LocalizationOpFailedException e1) {
+            lFile.delete();
+        } catch (LocalizationException e1) {
             statusHandler.handle(Priority.PROBLEM,
                     "Error deleting locatization file from server: " + lFile);
         }
@@ -1739,10 +1727,10 @@ public class PointsDataManager implements ILocalizationFileObserver {
      */
     private void marshalPointToXmlFile(Point point, LocalizationFile lFile)
             throws LocalizationException, IOException {
-        OutputStream stream = lFile.openOutputStream();
-        JAXB.marshal(point, stream);
-        stream.close();
-        lFile.save();
+        try (SaveableOutputStream outStream = lFile.openOutputStream()) {
+            JAXB.marshal(point, outStream);
+            outStream.save();
+        }
     }
 
     /**
@@ -1755,14 +1743,8 @@ public class PointsDataManager implements ILocalizationFileObserver {
      */
     private Point unmarshalPointFromXmlFile(LocalizationFile lFile)
             throws LocalizationException, IOException {
-        InputStream stream = null;
-        try {
-            stream = lFile.openInputStream();
-            return JAXB.unmarshal(stream, Point.class);
-        } finally {
-            if (stream != null) {
-                stream.close();
-            }
+        try (InputStream inStream = lFile.openInputStream()) {
+            return JAXB.unmarshal(inStream, Point.class);
         }
     }
 
diff --git a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/data/PointSize.java b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/data/PointSize.java
index c27965e39d..02b9478dfb 100644
--- a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/data/PointSize.java
+++ b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/data/PointSize.java
@@ -29,6 +29,7 @@ package com.raytheon.uf.viz.points.data;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 08, 2012 #875       rferrel     Initial Creation.
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -38,7 +39,7 @@ package com.raytheon.uf.viz.points.data;
 
 public enum PointSize {
 
-    SMALL(12), DEFAULT(14), LARGE(18), EXTRA_LARGE(24), XXL(30);
+    SMALL(10), DEFAULT(12), LARGE(15), EXTRA_LARGE(20), XXL(25);
 
     private static final String POINTS_NAME = " pt";
 
diff --git a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/action/PointEditAction.java b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/action/PointEditAction.java
index 039875cba8..b1b934ad6d 100644
--- a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/action/PointEditAction.java
+++ b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/action/PointEditAction.java
@@ -19,7 +19,8 @@
  ******************************************************************************************/
 package com.raytheon.uf.viz.points.ui.action;
 
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
 
 import com.raytheon.uf.viz.points.ui.dialog.PointsMgrDialog;
 import com.raytheon.uf.viz.points.ui.layer.PointsToolLayer;
@@ -35,6 +36,7 @@ import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 27, 2012 875        rferrel     Initial creation
+ * Jan 15, 2015 5054       randerso    Properly parented Dialog to CAVE window
  * 
  * 
  * </pre>
@@ -63,7 +65,9 @@ public class PointEditAction extends AbstractRightClickAction {
     @Override
     public void run() {
         if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
-            dialog = new PointsMgrDialog(Display.getCurrent().getShells()[0],
+            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+                    .getShell();
+            dialog = new PointsMgrDialog(shell,
                     (PointsToolLayer) getSelectedRsc());
             dialog.setBlockOnOpen(false);
             dialog.open();
diff --git a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
index 84bc8e8a8e..b421186774 100644
--- a/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
+++ b/cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
@@ -63,7 +63,7 @@ import org.eclipse.swt.widgets.TreeColumn;
 import org.eclipse.swt.widgets.TreeItem;
 import org.eclipse.ui.PlatformUI;
 
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -87,12 +87,13 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * October-2010              epolster    Initial Creation. 
+ * October-2010            epolster    Initial Creation. 
  * Jul 31, 2012 #875       rferrel     Integrated into CAVE.
  * Oct  2, 2012 #1234      rferrel     Clicking on new group/point when no
  *                                      node selected will now add the new
  *                                      to the root node.
  * Apr 01, 2014 #2976      lvenable     Added SWT dispose checks in runAsync call.
+ * Nov 30, 2015  4834      njensen      Remove LocalizationOpFailedException
  * 
  * </pre>
  * 
@@ -353,6 +354,7 @@ public class PointsMgrDialog extends CaveJFACEDialog implements
                 && !getShell().getDisplay().isDisposed()) {
             loadTreeInput();
             getShell().getDisplay().syncExec(new Runnable() {
+                @Override
                 public void run() {
                     pointsTreeViewer.setInput(getTableInput());
                 }
@@ -424,7 +426,7 @@ public class PointsMgrDialog extends CaveJFACEDialog implements
             setCursorBusy(true);
             editSelectedNode = true;
             selectedNode = dataManager.createTempGroup(parentNode);
-        } catch (LocalizationOpFailedException e1) {
+        } catch (LocalizationException e1) {
             statusHandler.handle(
                     Priority.PROBLEM,
                     "Unable to create a temporary group under: "
@@ -546,6 +548,7 @@ public class PointsMgrDialog extends CaveJFACEDialog implements
         final Text modText = new Text(composite, SWT.NONE);
         final int inset = showBorder ? 1 : 0;
         composite.addListener(SWT.Resize, new Listener() {
+            @Override
             public void handleEvent(Event e) {
                 Rectangle rect = composite.getClientArea();
                 modText.setBounds(rect.x + inset, rect.y + inset, rect.width
@@ -553,6 +556,7 @@ public class PointsMgrDialog extends CaveJFACEDialog implements
             }
         });
         Listener textListener = new Listener() {
+            @Override
             public void handleEvent(final Event e) {
                 switch (e.type) {
                 case SWT.KeyUp:
diff --git a/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/image/PointSetDataCallback.java b/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/image/PointSetDataCallback.java
index 467578d92a..7428853166 100644
--- a/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/image/PointSetDataCallback.java
+++ b/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/image/PointSetDataCallback.java
@@ -20,11 +20,18 @@
 package com.raytheon.uf.viz.pointset.image;
 
 import java.io.FileNotFoundException;
+import java.nio.ByteBuffer;
 import java.nio.DoubleBuffer;
 import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
+import java.util.Map;
+
+import javax.measure.unit.Unit;
 
 import com.raytheon.uf.common.colormap.image.ColorMapData;
 import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
+import com.raytheon.uf.common.dataplugin.pointset.PointSetConstants;
 import com.raytheon.uf.common.dataplugin.pointset.PointSetRecord;
 import com.raytheon.uf.common.datastorage.DataStoreFactory;
 import com.raytheon.uf.common.datastorage.IDataStore;
@@ -43,8 +50,9 @@ import com.raytheon.uf.viz.core.exception.VizException;
  * SOFTWARE HISTORY
  * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- -------------------------------------
  * Aug 28, 2015  4709     bsteffen  Initial creation
+ * Jan 25, 2016  5208     bsteffen  Support scale, offset and int types.
  * 
  * </pre>
  * 
@@ -56,10 +64,16 @@ public class PointSetDataCallback implements
 
     private final PointSetRecord record;
 
+    private Unit<?> dataUnit;
+
     public PointSetDataCallback(PointSetRecord record) {
         this.record = record;
     }
 
+    public Unit<?> getDataUnit() {
+        return dataUnit;
+    }
+
     @Override
     public ColorMapData getColorMapData() throws VizException {
         IDataStore store = DataStoreFactory.getDataStore(record
@@ -67,17 +81,53 @@ public class PointSetDataCallback implements
         try {
             IDataRecord record = store.retrieve(this.record.getDataURI(),
                     DataStoreFactory.DEF_DATASET_NAME, Request.ALL);
+            dataUnit = this.record.getParameter().getUnit();
+            Map<String, Object> attrs = record.getDataAttributes();
+            if (attrs != null) {
+                Number offset = (Number) attrs
+                        .get(PointSetConstants.ADD_OFFSET);
+                Number scale = (Number) attrs
+                        .get(PointSetConstants.SCALE_FACTOR);
+
+                if (offset != null) {
+                    double offsetVal = offset.doubleValue();
+                    if (offsetVal != 0.0) {
+                        dataUnit = dataUnit.plus(offsetVal);
+                    }
+                }
+                if (scale != null) {
+                    double scaleVal = scale.doubleValue();
+                    if (scaleVal != 0.0) {
+                        dataUnit = dataUnit.times(scaleVal);
+                    }
+                }
+            }
             Object data = record.getDataObject();
             if (data instanceof float[]) {
                 float[] fdata = (float[]) data;
                 return new ColorMapData(FloatBuffer.wrap(fdata),
                         new int[] { fdata.length }, ColorMapDataType.FLOAT,
-                        this.record.getParameter().getUnit());
+                        dataUnit);
             } else if (data instanceof double[]) {
-                double[] fdata = (double[]) data;
-                return new ColorMapData(DoubleBuffer.wrap(fdata),
-                        new int[] { fdata.length }, ColorMapDataType.DOUBLE,
-                        this.record.getParameter().getUnit());
+                double[] ddata = (double[]) data;
+                return new ColorMapData(DoubleBuffer.wrap(ddata),
+                        new int[] { ddata.length }, ColorMapDataType.DOUBLE,
+                        dataUnit);
+            } else if (data instanceof byte[]) {
+                byte[] bdata = (byte[]) data;
+                return new ColorMapData(ByteBuffer.wrap(bdata),
+                        new int[] { bdata.length },
+                        ColorMapDataType.SIGNED_BYTE, dataUnit);
+            } else if (data instanceof short[]) {
+                short[] sdata = (short[]) data;
+                return new ColorMapData(ShortBuffer.wrap(sdata),
+                        new int[] { sdata.length }, ColorMapDataType.SHORT,
+                        dataUnit);
+            } else if (data instanceof int[]) {
+                int[] idata = (int[]) data;
+                return new ColorMapData(IntBuffer.wrap(idata),
+                        new int[] { idata.length }, ColorMapDataType.INT,
+                        dataUnit);
             } else {
                 throw new VizException("Unsupported data of type "
                         + data.getClass().getSimpleName());
diff --git a/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/image/PointSetImagePreferences.java b/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/image/PointSetImagePreferences.java
new file mode 100644
index 0000000000..85b1663c56
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/image/PointSetImagePreferences.java
@@ -0,0 +1,67 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.viz.pointset.image;
+
+import javax.measure.unit.Unit;
+
+import com.raytheon.uf.common.dataplugin.pointset.PointSetRecord;
+import com.raytheon.uf.common.parameter.Parameter;
+import com.raytheon.uf.common.style.image.ColorMapParameterFactory;
+import com.raytheon.uf.common.style.image.ImagePreferences;
+
+/**
+ * Custom version of {@link ImagePreferences} that uses the units from the
+ * record as display units. This is only useful if there is no other style rule.
+ * This can be used to pass the unit information from the {@link PointSetRecord}
+ * to the {@link ColorMapParameterFactory}.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- ---------------------
+ * Jan 25, 2016  5208     bsteffen  Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bsteffen
+ * @version 1.0
+ */
+public class PointSetImagePreferences extends ImagePreferences {
+
+    private final Parameter parameter;
+
+    public PointSetImagePreferences(Parameter parameter) {
+        super();
+        this.parameter = parameter;
+    }
+
+    @Override
+    public Unit<?> getDisplayUnits() {
+        return parameter.getUnit();
+    }
+
+    @Override
+    public String getDisplayUnitLabel() {
+        return parameter.getUnitString();
+    }
+
+}
diff --git a/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/rsc/PointSetFrame.java b/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/rsc/PointSetFrame.java
index 8bf6885886..cd7fe066cd 100644
--- a/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/rsc/PointSetFrame.java
+++ b/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/rsc/PointSetFrame.java
@@ -43,8 +43,9 @@ import com.raytheon.uf.viz.pointset.image.PointSetLocationCallback;
  * SOFTWARE HISTORY
  * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- --------------------------------------------
  * Aug 28, 2015  4709     bsteffen  Initial creation
+ * Jan 25, 2016  5208     bsteffen  Ensure correct units are used for conversion
  * 
  * </pre>
  * 
@@ -62,6 +63,8 @@ public class PointSetFrame {
 
     private ITriangulatedImage image;
 
+    private PointSetDataCallback dataCallback;
+
     private volatile boolean staged = false;
 
     public PointSetFrame(PointSetRecord record, PointSetResource resource) {
@@ -98,7 +101,7 @@ public class PointSetFrame {
 
         double dataValue = image.getDataValue(x, y);
         if (displayUnit != null) {
-            UnitConverter converter = record.getParameter().getUnit()
+            UnitConverter converter = dataCallback.getDataUnit()
                     .getConverterTo(displayUnit);
             dataValue = converter.convert(dataValue);
         }
@@ -113,9 +116,10 @@ public class PointSetFrame {
                     ColorMapCapability.class).getColorMapParameters();
             ITriangulatedImageExtension triangleExt = target
                     .getExtension(ITriangulatedImageExtension.class);
+            this.dataCallback = new PointSetDataCallback(record);
             this.image = triangleExt.initializeImage(colorMapParameters,
                     new PointSetLocationCallback(resource.getDescriptor(),
-                            record), new PointSetDataCallback(record));
+                            record), dataCallback);
             return false;
         } else if (staged) {
             ITriangulatedImageExtension triangleExt = target
diff --git a/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/rsc/PointSetResource.java b/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/rsc/PointSetResource.java
index 3a7e2fb3fe..c6b79dd883 100644
--- a/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/rsc/PointSetResource.java
+++ b/cave/com.raytheon.uf.viz.pointset/src/com/raytheon/uf/viz/pointset/rsc/PointSetResource.java
@@ -26,11 +26,11 @@ import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
 import java.nio.ShortBuffer;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.measure.converter.UnitConverter;
 import javax.measure.unit.Unit;
 import javax.measure.unit.UnitFormat;
 
@@ -44,6 +44,7 @@ import com.raytheon.uf.common.colormap.image.ColorMapData;
 import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
 import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
+import com.raytheon.uf.common.dataplugin.level.Level;
 import com.raytheon.uf.common.dataplugin.pointset.PointSetRecord;
 import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
 import com.raytheon.uf.common.numeric.UnsignedNumbers;
@@ -54,6 +55,9 @@ import com.raytheon.uf.common.style.StyleManager;
 import com.raytheon.uf.common.style.StyleManager.StyleType;
 import com.raytheon.uf.common.style.StyleRule;
 import com.raytheon.uf.common.style.image.ColorMapParameterFactory;
+import com.raytheon.uf.common.style.level.Level.LevelType;
+import com.raytheon.uf.common.style.level.RangeLevel;
+import com.raytheon.uf.common.style.level.SingleLevel;
 import com.raytheon.uf.common.time.DataTime;
 import com.raytheon.uf.common.util.BufferUtil;
 import com.raytheon.uf.viz.core.IGraphicsTarget;
@@ -66,6 +70,7 @@ import com.raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
 import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
 import com.raytheon.uf.viz.pointset.image.PointSetDataCallback;
+import com.raytheon.uf.viz.pointset.image.PointSetImagePreferences;
 import com.vividsolutions.jts.geom.Coordinate;
 
 /**
@@ -76,8 +81,9 @@ import com.vividsolutions.jts.geom.Coordinate;
  * SOFTWARE HISTORY
  * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- ---------------------
  * Aug 28, 2015  4709     bsteffen  Initial creation
+ * Jan 25, 2016  5208     bsteffen  Better default style
  * 
  * </pre>
  * 
@@ -112,19 +118,16 @@ public class PointSetResource extends
     public ColorMapParameters createColorMapParameters(PointSetRecord record)
             throws VizException {
         ParamLevelMatchCriteria matchCriteria = new ParamLevelMatchCriteria();
-        matchCriteria.setParameterName(Arrays.asList(record.getParameter()
-                .getAbbreviation()));
-        // TODO convert level to a style level.
-        //matchCriteria.setLevels(new ArrayList<Level>());
-        matchCriteria.setCreatingEntityNames(Arrays.asList(record
+        matchCriteria.setParameterName(Collections.singletonList(record
+                .getParameter().getAbbreviation()));
+        matchCriteria.setLevels(Collections
+                .singletonList(convertLevelForStyle(record.getLevel())));
+        matchCriteria.setCreatingEntityNames(Collections.singletonList(record
                 .getDatasetId()));
         try {
             styleRule = StyleManager.getInstance().getStyleRule(
                     StyleType.IMAGERY, matchCriteria);
-            if (styleRule != null) {
-                return ColorMapParameterFactory.build(styleRule, record
-                        .getParameter().getUnit());
-            } else {
+            if (styleRule == null) {
                 ColorMapData data = new PointSetDataCallback(record)
                         .getColorMapData();
                 ColorMapDataType type = data.getDataType();
@@ -144,15 +147,91 @@ public class PointSetResource extends
                         max = val;
                     }
                 }
-
-                return ColorMapParameterFactory.build(min, max,
-                        data.getDataUnit(), matchCriteria);
+                styleRule = new StyleRule();
+                styleRule.setPreferences(new PointSetImagePreferences(record
+                        .getParameter()));
+                float[] factoryData = { min, max };
+                return ColorMapParameterFactory.build(styleRule, factoryData,
+                        null, data.getDataUnit());
             }
+            return ColorMapParameterFactory.build(styleRule, record
+                    .getParameter().getUnit());
+
         } catch (StyleException e) {
             throw new VizException(e);
         }
     }
 
+    /**
+     * Convert a com.raytheon.uf.common.dataplugin.level.Level into a
+     * com.raytheon.uf.common.style.level.Level
+     */
+    protected com.raytheon.uf.common.style.level.Level convertLevelForStyle(
+            Level level) {
+        LevelType type = LevelType.DEFAULT;
+        String master = level.getMasterLevel().getName();
+        if (master.equalsIgnoreCase("MB")) {
+            type = LevelType.PRESSURE;
+        } else if (master.equalsIgnoreCase("FHAG")) {
+            type = LevelType.HEIGHT_AGL;
+        } else if (master.equalsIgnoreCase("FH")) {
+            type = LevelType.HEIGHT_AGL;
+        } else if (master.equalsIgnoreCase("SFC")) {
+            type = LevelType.SURFACE;
+        } else if (master.equalsIgnoreCase("K")) {
+            type = LevelType.THETA;
+        } else if (master.equals("BL")) {
+            type = LevelType.MB_AGL;
+        } else {
+            /*
+             * Many masterlevels match the type so attempt valueOf, it is normal
+             * for this to fail for many obscure master levels.
+             */
+            try {
+                type = LevelType.valueOf(master);
+            } catch (IllegalArgumentException e) {
+                type = LevelType.DEFAULT;
+            }
+        }
+        Unit<?> unitsIn = level.getMasterLevel().getUnit();
+        if (level.isLevelTwoValid()) {
+            RangeLevel result = new RangeLevel(type);
+            result.setLowerValue(level.getLevelonevalue());
+            result.setUpperValue(level.getLeveltwovalue());
+            /*
+             * This is a bit roundabout but it is the only way that
+             * com.raytheon.uf.common.style.level.Level exposes units
+             */
+            Unit<?> unitsOut = result.getUpperMeasure().getUnit();
+            if (unitsIn != null && !unitsIn.equals(unitsOut)
+                    && unitsIn.isCompatible(unitsOut)) {
+                UnitConverter converter = unitsIn.getConverterTo(unitsOut);
+                double lowerValue = level.getLevelonevalue();
+                double upperValue = level.getLeveltwovalue();
+                lowerValue = converter.convert(lowerValue);
+                upperValue = converter.convert(upperValue);
+                result.setLowerValue(lowerValue);
+                result.setUpperValue(upperValue);
+            }
+            return result;
+        } else {
+            SingleLevel result = new SingleLevel(type);
+            result.setValue(level.getLevelonevalue());
+            /*
+             * This is a bit roundabout but it is the only way that
+             * com.raytheon.uf.common.style.level.Level exposes units
+             */
+            Unit<?> unitsOut = result.getMeasure().getUnit();
+            if (unitsIn != null && !unitsIn.equals(unitsOut)
+                    && unitsIn.isCompatible(unitsOut)) {
+                double value = level.getLevelonevalue();
+                value = unitsIn.getConverterTo(unitsOut).convert(value);
+                result.setValue(value);
+            }
+            return result;
+        }
+    }
+
     private float extractVal(ColorMapDataType type, Buffer buffer)
             throws VizException {
         switch (type) {
@@ -255,7 +334,7 @@ public class PointSetResource extends
             AbstractStylePreferences prefs = styleRule.getPreferences();
             String prefsUnitStr = prefs.getDisplayUnitLabel();
             if (prefsUnitStr != null) {
-                unitStr = prefs.getDisplayUnitLabel();
+                unitStr = prefsUnitStr;
             }
         } else {
             ColorMapParameters parameters = getCapability(
@@ -280,8 +359,7 @@ public class PointSetResource extends
             boolean includeLevel = true;
             if (styleRule != null) {
                 AbstractStylePreferences prefs = styleRule.getPreferences();
-                includeLevel = !prefs.getDisplayFlags()
-                        .hasFlag("NoPlane");
+                includeLevel = !prefs.getDisplayFlags().hasFlag("NoPlane");
             }
             String datasetIdPart = frame.getRecord().getDatasetId();
             String levelPart = "";
@@ -289,8 +367,7 @@ public class PointSetResource extends
                 levelPart = " " + record.getLevel();
             }
             String paramPart = " " + record.getParameter().getName() + " ("
-                    + getDisplayUnitString(record)
-                    + ")";
+                    + getDisplayUnitString(record) + ")";
             return datasetIdPart + levelPart + paramPart;
         }
     }
diff --git a/cave/com.raytheon.uf.viz.productbrowser.datalisting/src/com/raytheon/uf/viz/productbrowser/datalisting/DataListingProductBrowserDefinition.java b/cave/com.raytheon.uf.viz.productbrowser.datalisting/src/com/raytheon/uf/viz/productbrowser/datalisting/DataListingProductBrowserDefinition.java
index 032dbdb88c..7f978a4d3a 100644
--- a/cave/com.raytheon.uf.viz.productbrowser.datalisting/src/com/raytheon/uf/viz/productbrowser/datalisting/DataListingProductBrowserDefinition.java
+++ b/cave/com.raytheon.uf.viz.productbrowser.datalisting/src/com/raytheon/uf/viz/productbrowser/datalisting/DataListingProductBrowserDefinition.java
@@ -39,9 +39,11 @@ import com.raytheon.uf.common.serialization.comm.RequestRouter;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.viz.core.DescriptorMap;
+import com.raytheon.uf.viz.core.RecordFactory;
 import com.raytheon.uf.viz.core.drawables.AbstractRenderableDisplay;
 import com.raytheon.uf.viz.core.drawables.IRenderableDisplay;
 import com.raytheon.uf.viz.core.drawables.ResourcePair;
+import com.raytheon.uf.viz.core.exception.NoPluginException;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.IMapDescriptor;
 import com.raytheon.uf.viz.core.map.MapDescriptor;
@@ -79,13 +81,15 @@ import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
  * Date          Ticket#  Engineer  Description
  * ------------- -------- --------- --------------------------
  * Jun 04, 2015  4153     bsteffen  Initial creation
+ * Nov 03, 2015  5030     mapeters  Quietly handle CAVE & EDEX plugins being out of sync
  * 
  * </pre>
  * 
  * @author bsteffen
  * @version 1.0
  */
-public abstract class DataListingProductBrowserDefinition implements PreferenceBasedDataDefinition {
+public abstract class DataListingProductBrowserDefinition implements
+        PreferenceBasedDataDefinition {
 
     private static final transient IUFStatusHandler logger = UFStatus
             .getHandler(DataListingProductBrowserDefinition.class);
@@ -106,22 +110,22 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
 
     @Override
     public List<ProductBrowserPreference> getPreferences() {
-        return Arrays.asList(enabledPreference, orderPreference, formatPreference);
+        return Arrays.asList(enabledPreference, orderPreference,
+                formatPreference);
     }
 
     protected boolean isEnabled() {
         return (Boolean) enabledPreference.getValue();
     }
-    
+
     protected boolean isFormatted() {
         return (Boolean) formatPreference.getValue();
     }
-    
+
     protected String[] getOrderedKeys() {
         return (String[]) orderPreference.getValue();
     }
-   
-    
+
     protected Map<String, String> createKeyValMap(String[] selection) {
         Map<String, String> keyVals = new HashMap<>();
         int index = 1;
@@ -136,13 +140,16 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
         return keyVals;
     }
 
-    public DataListingProductBrowserDefinition(String displayName, DataListing listing) {
+    public DataListingProductBrowserDefinition(String displayName,
+            DataListing listing) {
         this.displayName = displayName;
         this.listing = listing;
-        this.enabledPreference = ProductBrowserPreferenceConstants.createEnabledPreference();
-        this.formatPreference = ProductBrowserPreferenceConstants.createFormatPreference();
-        this.orderPreference = ProductBrowserPreferenceConstants.createOrderPreference(listing.getKeys().toArray(
-                new String[0]));
+        this.enabledPreference = ProductBrowserPreferenceConstants
+                .createEnabledPreference();
+        this.formatPreference = ProductBrowserPreferenceConstants
+                .createFormatPreference();
+        this.orderPreference = ProductBrowserPreferenceConstants
+                .createOrderPreference(listing.getKeys().toArray(new String[0]));
 
         new ProductBrowserPreferenceListener(displayName, enabledPreference);
         new ProductBrowserPreferenceListener(displayName, formatPreference);
@@ -151,7 +158,8 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
     }
 
     private static String createDisplayName(String pluginName) {
-        return Character.toUpperCase(pluginName.charAt(0)) + pluginName.substring(1);
+        return Character.toUpperCase(pluginName.charAt(0))
+                + pluginName.substring(1);
     }
 
     @Override
@@ -159,14 +167,29 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
         if (!isEnabled()) {
             return false;
         }
+
+        try {
+            RecordFactory.getInstance().getPluginClass(listing.getPluginName());
+        } catch (NoPluginException e) {
+            String msg = "Unable to display "
+                    + displayName
+                    + " data in Product Browser because the server does not support the "
+                    + listing.getPluginName() + " plugin";
+            logger.debug(msg);
+            return false;
+        }
+
         DbQueryRequest request = new DbQueryRequest();
-        request.setConstraints(listing.getRequestConstraints(Collections.<String, String> emptyMap()));
+        request.setConstraints(listing.getRequestConstraints(Collections
+                .<String, String> emptyMap()));
         request.setLimit(1);
         try {
-            DbQueryResponse response = (DbQueryResponse) RequestRouter.route(request);
+            DbQueryResponse response = (DbQueryResponse) RequestRouter
+                    .route(request);
             return response.getNumResults() > 0;
         } catch (Exception e) {
-            logger.error("Error initializing product browser data for " + displayName, e);
+            logger.error("Error initializing product browser data for "
+                    + displayName, e);
             return false;
         }
     }
@@ -174,7 +197,8 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
     @Override
     public List<ProductBrowserLabel> getLabels(String[] selection) {
         if (selection.length == 0) {
-            ProductBrowserLabel label = new ProductBrowserLabel(displayName, listing.getPluginName());
+            ProductBrowserLabel label = new ProductBrowserLabel(displayName,
+                    listing.getPluginName());
             label.setProduct(listing.getKeys().isEmpty());
             return Collections.singletonList(label);
         }
@@ -182,26 +206,34 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
         String nextKey = getOrderedKeys()[keyVals.size()];
         try {
             if (isFormatted()) {
-                Map<String, String> formattedMap = listing.getFormattedValues(nextKey, keyVals);
-                List<ProductBrowserLabel> labels = new ArrayList<>(formattedMap.size());
+                Map<String, String> formattedMap = listing.getFormattedValues(
+                        nextKey, keyVals);
+                List<ProductBrowserLabel> labels = new ArrayList<>(
+                        formattedMap.size());
                 for (Entry<String, String> entry : formattedMap.entrySet()) {
-                    ProductBrowserLabel label = new ProductBrowserLabel(entry.getValue(), entry.getKey());
-                    label.setProduct(selection.length >= listing.getKeys().size());
+                    ProductBrowserLabel label = new ProductBrowserLabel(
+                            entry.getValue(), entry.getKey());
+                    label.setProduct(selection.length >= listing.getKeys()
+                            .size());
                     labels.add(label);
                 }
                 return labels;
             } else {
                 Collection<String> values = listing.getValues(nextKey, keyVals);
-                List<ProductBrowserLabel> labels = new ArrayList<>(values.size());
+                List<ProductBrowserLabel> labels = new ArrayList<>(
+                        values.size());
                 for (String value : values) {
-                    ProductBrowserLabel label = new ProductBrowserLabel(value, value);
-                    label.setProduct(selection.length >= listing.getKeys().size());
+                    ProductBrowserLabel label = new ProductBrowserLabel(value,
+                            value);
+                    label.setProduct(selection.length >= listing.getKeys()
+                            .size());
                     labels.add(label);
                 }
                 return labels;
             }
         } catch (Exception e) {
-            logger.error("Error querying " + nextKey + " for " + displayName + " in the product browser.", e);
+            logger.error("Error querying " + nextKey + " for " + displayName
+                    + " in the product browser.", e);
             return Collections.emptyList();
         }
     }
@@ -209,9 +241,11 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
     @Override
     public String getProductInfo(String[] selection) {
         StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(PluginDataObject.PLUGIN_NAME_ID + " = " + listing.getPluginName());
+        stringBuilder.append(PluginDataObject.PLUGIN_NAME_ID + " = "
+                + listing.getPluginName());
         int index = 1;
-        for (Entry<String, String> entry : createKeyValMap(selection).entrySet()) {
+        for (Entry<String, String> entry : createKeyValMap(selection)
+                .entrySet()) {
             if (index >= selection.length) {
                 break;
             }
@@ -231,7 +265,8 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
     public void loadResource(String[] selection, DisplayType displayType) {
         Map<String, String> keyVals = createKeyValMap(selection);
         AbstractResourceData resourceData = createResourceData(keyVals);
-        ResourcePair resourcePair = createResourcePair(resourceData, displayType);
+        ResourcePair resourcePair = createResourcePair(resourceData,
+                displayType);
         try {
             AbstractRenderableDisplay display = createRenderableDisplay(resourcePair);
             AbstractEditor editor = createOrOpenEditor(display);
@@ -239,7 +274,8 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
             b.setDisplays(new AbstractRenderableDisplay[] { display });
             new BundleProductLoader(editor, b).schedule();
         } catch (VizException e) {
-            logger.error("Failed to load resource of type " + resourceData.getClass().getSimpleName(), e);
+            logger.error("Failed to load resource of type "
+                    + resourceData.getClass().getSimpleName(), e);
         }
     }
 
@@ -259,21 +295,25 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
      * this will fall back to using UiUtil.
      */
     protected AbstractEditor createOrOpenEditor(IRenderableDisplay display) {
-        String editorId = DescriptorMap.getEditorId(display.getDescriptor().getClass().getName());
+        String editorId = DescriptorMap.getEditorId(display.getDescriptor()
+                .getClass().getName());
         IEditorPart editorPart = EditorUtil.getActiveEditor();
-        if (editorPart != null && editorId.equals(editorPart.getEditorSite().getId())) {
+        if (editorPart != null
+                && editorId.equals(editorPart.getEditorSite().getId())) {
             return (AbstractEditor) editorPart;
         }
         editorPart = EditorUtil.findEditor(editorId);
         if (editorPart != null) {
             return (AbstractEditor) editorPart;
         }
-        IWorkbenchWindow window = VizWorkbenchManager.getInstance().getCurrentWindow();
+        IWorkbenchWindow window = VizWorkbenchManager.getInstance()
+                .getCurrentWindow();
         /*
          * This part allows the perspective manager to make an editor which may
          * have some customizations.
          */
-        AbstractVizPerspectiveManager mgr = VizPerspectiveListener.getInstance(window).getActivePerspectiveManager();
+        AbstractVizPerspectiveManager mgr = VizPerspectiveListener.getInstance(
+                window).getActivePerspectiveManager();
         if (mgr != null) {
             AbstractEditor editor = mgr.openNewEditor();
             if (editor == null) {
@@ -287,14 +327,17 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
         return UiUtil.createOrOpenEditor(editorId, display);
     }
 
-    protected abstract AbstractResourceData createResourceData(Map<String, String> keyVals);
+    protected abstract AbstractResourceData createResourceData(
+            Map<String, String> keyVals);
 
-    protected ResourcePair createResourcePair(AbstractResourceData resourceData, DisplayType displayType) {
+    protected ResourcePair createResourcePair(
+            AbstractResourceData resourceData, DisplayType displayType) {
         ResourcePair pair = new ResourcePair();
         pair.setResourceData(resourceData);
         LoadProperties loadProperties = new LoadProperties();
         if (displayType != null) {
-            loadProperties.getCapabilities().getCapability(resourceData, DisplayTypeCapability.class)
+            loadProperties.getCapabilities()
+                    .getCapability(resourceData, DisplayTypeCapability.class)
                     .setDisplayType(displayType);
         }
         pair.setLoadProperties(loadProperties);
@@ -302,11 +345,11 @@ public abstract class DataListingProductBrowserDefinition implements PreferenceB
         return pair;
     }
 
-    protected AbstractRenderableDisplay createRenderableDisplay(ResourcePair resourcePair) throws VizException {
+    protected AbstractRenderableDisplay createRenderableDisplay(
+            ResourcePair resourcePair) throws VizException {
         IMapDescriptor mapDescriptor = new MapDescriptor();
         mapDescriptor.getResourceList().add(resourcePair);
         return new MapRenderableDisplay(mapDescriptor);
     }
 
-
 }
diff --git a/cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseEastNPN.xml b/cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseEastNPN.xml
index 1dfd7a51c4..019f49cc0f 100644
--- a/cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseEastNPN.xml
+++ b/cave/com.raytheon.uf.viz.profiler/localization/menus/upperair/baseEastNPN.xml
@@ -20,7 +20,7 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
-	                menuText="Bloomfield MO (BLMM7)" id="profBloomfield MO"
+	                menuText="Bloomfield MO (BLMM7)" id="profBloomfield_MO"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
 	        <substitute key="wmoid" value="74662"/>
         	<substitute key="productURI" value="/profiler/%/3000/74662/%"/>
@@ -80,7 +80,7 @@
         	<substitute key="productURI" value="/profiler/%/3000/74542/%"/>
 	    </contribute>
 	    <contribute xsi:type="bundleItem" file="bundles/UpperAirProfiler.xml" 
-	                menuText="Okolona MS (OKOM6)" id="profOkolona MS"
+	                menuText="Okolona MS (OKOM6)" id="profOkolona_MS"
 	                editorType="com.raytheon.uf.viz.profiler.ui.ProfilerEditor">
 	        <substitute key="wmoid" value="74769"/>
         	<substitute key="productURI" value="/profiler/%/3000/74769/%"/>
diff --git a/cave/com.raytheon.uf.viz.profiler/src/com/raytheon/uf/viz/profiler/ProfilerResource.java b/cave/com.raytheon.uf.viz.profiler/src/com/raytheon/uf/viz/profiler/ProfilerResource.java
index db5167b6ac..2fb20f122b 100644
--- a/cave/com.raytheon.uf.viz.profiler/src/com/raytheon/uf/viz/profiler/ProfilerResource.java
+++ b/cave/com.raytheon.uf.viz.profiler/src/com/raytheon/uf/viz/profiler/ProfilerResource.java
@@ -62,9 +62,9 @@ import com.vividsolutions.jts.geom.Coordinate;
 
 /**
  * Handles profiler data
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
@@ -85,8 +85,10 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 08/14/2014         3523 mapeters    Updated deprecated {@link DrawableString#textStyle}
  *                                     assignments.
  * 07/22/2015          688 nabowle     Synchronize plotObjects access.
+ * 05/11/2015         5070 randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
- *
+ * 
  * @author dhladky
  * @version 1.0
  */
@@ -126,7 +128,7 @@ public class ProfilerResource extends
 
     /**
      * Required method for getting data
-     *
+     * 
      * @param resourceData
      * @param loadProperties
      */
@@ -176,7 +178,7 @@ public class ProfilerResource extends
         incX = (ProfilerUtils.profilerRectangle.width / NUM_PROFILE_STAFFS);
         incYheight = ProfilerUtils.profilerRectangle.height / MAX_Y;
 
-        this.font = target.initializeFont("Dialog", 11, null);
+        this.font = target.initializeFont("Dialog", 9, null);
 
         ColorMapParameters params = getCapability(ColorMapCapability.class)
                 .getColorMapParameters();
@@ -261,7 +263,8 @@ public class ProfilerResource extends
                 earliestTime = Math.min(earliestTime, validTime);
                 latestTime = Math.max(latestTime, validTime);
             }
-            long earliestRequestTime = earliestTime - NUM_PROFILE_STAFFS * 3600000;
+            long earliestRequestTime = earliestTime - NUM_PROFILE_STAFFS
+                    * 3600000;
             List<DataTime> requestTimes = new ArrayList<DataTime>();
             for (DataTime time : resourceData.getAvailableTimes()) {
                 long validTime = time.getValidTime().getTimeInMillis();
@@ -312,7 +315,7 @@ public class ProfilerResource extends
 
     /**
      * Set the width scalar
-     *
+     * 
      * @param props
      * @return
      */
@@ -325,7 +328,7 @@ public class ProfilerResource extends
 
     /**
      * get the scale width value
-     *
+     * 
      * @return
      */
     private double getScaleWidth() {
@@ -334,7 +337,7 @@ public class ProfilerResource extends
 
     /**
      * Set the height scalar
-     *
+     * 
      * @param props
      * @return
      */
@@ -347,7 +350,7 @@ public class ProfilerResource extends
 
     /**
      * Get the scalar height
-     *
+     * 
      * @return
      */
     private double getScaleHeight() {
@@ -356,7 +359,7 @@ public class ProfilerResource extends
 
     /**
      * gets the pixel coverage for this image
-     *
+     * 
      * @return
      */
     private PixelCoverage getPixelCoverage(Coordinate c) {
@@ -375,7 +378,7 @@ public class ProfilerResource extends
 
     /**
      * iterate through our list of profile plots and draw images
-     *
+     * 
      * @throws VizException
      */
     private void drawProfiles(PaintProperties paintProps) throws VizException {
@@ -413,7 +416,7 @@ public class ProfilerResource extends
 
     /**
      * Create profile windBards
-     *
+     * 
      * @param profile
      * @throws VizException
      */
@@ -453,7 +456,7 @@ public class ProfilerResource extends
     }
 
     /**
-     *
+     * 
      * @param index
      * @param level
      * @return
@@ -481,14 +484,15 @@ public class ProfilerResource extends
 
     /**
      * @throws VizException
-     *
+     * 
      */
     public void drawXAxis(PaintProperties paintProps, Double magnification)
             throws VizException {
         // left edge of graph
         DrawableLine[] lines = new DrawableLine[2];
         lines[0] = new DrawableLine();
-        lines[0].setCoordinates(ProfilerUtils.profilerRectangle.x,
+        lines[0].setCoordinates(
+                ProfilerUtils.profilerRectangle.x,
                 (ProfilerUtils.profilerRectangle.y + ProfilerUtils.profilerRectangle.height));
         lines[0].addPoint(ProfilerUtils.profilerRectangle.x,
                 ProfilerUtils.profilerRectangle.y);
@@ -537,9 +541,11 @@ public class ProfilerResource extends
 
         // draw right edge
         lines[1] = new DrawableLine();
-        lines[1].setCoordinates((ProfilerUtils.profilerRectangle.x + ProfilerUtils.profilerRectangle.width),
+        lines[1].setCoordinates(
+                (ProfilerUtils.profilerRectangle.x + ProfilerUtils.profilerRectangle.width),
                 (ProfilerUtils.profilerRectangle.y + ProfilerUtils.profilerRectangle.height));
-        lines[1].addPoint((ProfilerUtils.profilerRectangle.x + ProfilerUtils.profilerRectangle.width),
+        lines[1].addPoint(
+                (ProfilerUtils.profilerRectangle.x + ProfilerUtils.profilerRectangle.width),
                 ProfilerUtils.profilerRectangle.y);
         lines[1].basics.color = ProfilerUtils.GRAPH_COLOR;
         lines[1].width = ProfilerUtils.GRAPH_LINE_WIDTH;
@@ -551,7 +557,7 @@ public class ProfilerResource extends
 
     /**
      * @throws VizException
-     *
+     * 
      */
     public void drawYAxis(PaintProperties paintProps, Double magnification)
             throws VizException {
@@ -713,7 +719,7 @@ public class ProfilerResource extends
     }
 
     /**
-     *
+     * 
      * @param height
      * @return
      */
@@ -723,7 +729,7 @@ public class ProfilerResource extends
     }
 
     /**
-     *
+     * 
      * @param w
      * @return
      */
diff --git a/cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/Window.java b/cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/Window.java
index 1a622a7eac..5e0c442f65 100644
--- a/cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/Window.java
+++ b/cave/com.raytheon.uf.viz.python.swt/src/com/raytheon/uf/viz/python/swt/Window.java
@@ -30,14 +30,15 @@ import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.python.swt.widgets.Widget;
 
 /**
- * TODO Add Description
+ * Allows opening a jface Window from Python
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jul 14, 2009            chammack     Initial creation
+ * Jul 14, 2009            chammack    Initial creation
+ * Jan 14, 2016 5054       randerso    Eliminate dummy shell
  * 
  * </pre>
  * 
@@ -52,7 +53,7 @@ public class Window extends org.eclipse.jface.window.Window {
     protected List<Widget> widgetList;
 
     public Window(String title, List<Widget> widgetList) {
-        super(new Shell());
+        super((Shell) null);
         this.title = title;
         this.widgetList = widgetList;
     }
diff --git a/cave/com.raytheon.uf.viz.radarapps.fsi/localization/menus/tools/fsi-tools-index.xml b/cave/com.raytheon.uf.viz.radarapps.fsi/localization/menus/tools/fsi-tools-index.xml
new file mode 100644
index 0000000000..a81f8e219c
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.radarapps.fsi/localization/menus/tools/fsi-tools-index.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuContributionFile>
+    <include installTo="menu:tools?after=tools.Fs"
+        fileName="menus/tools/fsi-tools-menu.xml">
+    </include>
+</menuContributionFile>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.radarapps.fsi/localization/menus/tools/fsi-tools-menu.xml b/cave/com.raytheon.uf.viz.radarapps.fsi/localization/menus/tools/fsi-tools-menu.xml
new file mode 100644
index 0000000000..5899163698
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.radarapps.fsi/localization/menus/tools/fsi-tools-menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <contribute xsi:type="command"
+        commandId="com.raytheon.viz.ui.viz.radarapps.fsi.startFSI"
+        menuText="4-D Storm Investigator (FSI)" />      
+
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.radarapps.rps/src/com/raytheon/uf/viz/radarapps/rps/ListEditorWindow.java b/cave/com.raytheon.uf.viz.radarapps.rps/src/com/raytheon/uf/viz/radarapps/rps/ListEditorWindow.java
index bb9effca67..5144fe520c 100644
--- a/cave/com.raytheon.uf.viz.radarapps.rps/src/com/raytheon/uf/viz/radarapps/rps/ListEditorWindow.java
+++ b/cave/com.raytheon.uf.viz.radarapps.rps/src/com/raytheon/uf/viz/radarapps/rps/ListEditorWindow.java
@@ -100,9 +100,9 @@ import com.raytheon.uf.viz.radarapps.products.ui.RadarProductUI;
 
 /**
  * RPS List Editor window
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
@@ -111,8 +111,9 @@ import com.raytheon.uf.viz.radarapps.products.ui.RadarProductUI;
  * 2013-01-31   DR 15458   D. Friedman Send RPS list so that it will be
  *                                     accepted for any VCP.
  * 2015-06-10   4498       nabowle     Rename Util->RcmUtil
+ * 2016-01-20   5271       bkowal      Code cleanup.
  * </pre>
- *
+ * 
  */
 public class ListEditorWindow {
     private static final transient IUFStatusHandler statusHandler = UFStatus
@@ -452,8 +453,9 @@ public class ListEditorWindow {
 
     protected void onClose(ShellEvent e) {
         e.doit = false;
-        if (!checkUnsaved())
+        if (!checkUnsaved()) {
             return;
+        }
         // TODO: reset if just going to make invisible...
         listEditor.dispose();
     }
@@ -479,8 +481,9 @@ public class ListEditorWindow {
         SendRpsList msg = new SendRpsList();
         msg.radarIDs = Arrays.asList(rpg);
         msg.requests = Arrays.asList(listEditor.getRpsList().getRequests());
-        /* Specify that the RadarServer should accept this list no matter
-         * what VCP the RPG is currently using.
+        /*
+         * Specify that the RadarServer should accept this list no matter what
+         * VCP the RPG is currently using.
          */
         msg.vcp = RpsList.UNSPECIFIED_VCP;
         String error = null;
@@ -566,10 +569,11 @@ public class ListEditorWindow {
 
         RadarProduct rp = ProductInfo.getInstance().getPoductForCode(
                 req.productCode);
-        Collection<RadarProduct> variants = ProductInfo.getInstance().select(
-                new ProductInfo.Selector(null, rp.mnemonic, null, null));
         StringBuilder sb = new StringBuilder();
         if (rp != null) {
+            Collection<RadarProduct> variants = ProductInfo.getInstance()
+                    .select(new ProductInfo.Selector(null, rp.mnemonic, null,
+                            null));
             if (rp.name != null)
                 sb.append(rp.name);
             /*
@@ -645,7 +649,6 @@ public class ListEditorWindow {
             sb.append(String.format("Product #%d", req.productCode));
         }
         return sb.toString();
-        // return element.toString();
     }
 
     private VCPInfo chooseVcp(String message) {
@@ -738,45 +741,6 @@ public class ListEditorWindow {
         return listEditor.saveList();
     }
 
-    private void onStoreList() {
-        if (!sendCheck())
-            return;
-
-        StoreDialog sd = new StoreDialog(getShell(), listEditor);
-        if (sd.open() == Window.OK) {
-            if (!checkListLength(sd.getRadarIDs(), sd.getVcps()))
-                return;
-
-            RcmClient client = RadarApps.getRcmSystem().getClient();
-            for (int vcp : sd.getVcps()) {
-                SendRpsList msg = new SendRpsList();
-                msg.radarIDs = sd.getRadarIDs();
-                if (msg.radarIDs.size() == 0)
-                    return;
-                msg.requests = Arrays.asList(listEditor.getRpsList()
-                        .getRequests());
-                msg.vcp = vcp;
-                msg.store = true;
-
-                String error = null;
-                try {
-                    ReplyObj ro = client.sendRequest(msg, 2000);
-                    error = ro.error;
-                } catch (IOException e) {
-                    error = e.toString();
-                }
-                if (error != null) {
-                    MessageBox mb = new MessageBox(getShell(), SWT.ICON_ERROR
-                            | SWT.OK);
-                    mb.setText("Error");
-                    mb.setMessage(error);
-                    mb.open();
-                } else
-                    listEditor.setDirty(false);
-            }
-        }
-    }
-
     private boolean sendCheck() {
         if (listEditor.getRequestList().size() >= 1)
             return true;
diff --git a/cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/text/SpellCheckTextViewer.java b/cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/text/SpellCheckTextViewer.java
index c4045b7b7d..cbcda315f7 100644
--- a/cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/text/SpellCheckTextViewer.java
+++ b/cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/text/SpellCheckTextViewer.java
@@ -66,7 +66,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.viz.core.VizApp;
@@ -81,15 +81,16 @@ import com.raytheon.uf.viz.spellchecker.jobs.EnhancedSpellCheckJob;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jun 18, 2014 3453       rblum     Initial creation
- * Aug 06, 2014 3453       rblum     Refreshing all viewers on enable/
- *                                   disable of spell checking.
- * Aug 18, 2014 3453       rblum     Added the spell check dictionary
- *                                   to site level localization.
- * Oct 01, 2014 3453       rblum     Allow MB3 click anywhere in the textbox
- *                                   to enable/disable spellcheck.
- * Mar 27, 2015 4138       dhladky   Guava name change.
- * Apr 14, 2015 4362       mapeters  Allow external contribution of menu items.
+ * Jun 18, 2014 3453       rblum       Initial creation
+ * Aug 06, 2014 3453       rblum       Refreshing all viewers on enable/
+ *                                     disable of spell checking.
+ * Aug 18, 2014 3453       rblum       Added the spell check dictionary
+ *                                     to site level localization.
+ * Oct 01, 2014 3453       rblum       Allow MB3 click anywhere in the textbox
+ *                                     to enable/disable spellcheck.
+ * Mar 27, 2015 4138       dhladky     Guava name change.
+ * Apr 14, 2015 4362       mapeters    Allow external contribution of menu items.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
  * 
  * </pre>
  * 
@@ -387,7 +388,7 @@ public class SpellCheckTextViewer extends TextViewer implements
                         if (lf != null) {
                             lf.save();
                         }
-                    } catch (LocalizationOpFailedException exception) {
+                    } catch (LocalizationException exception) {
                         statusHandler.error(
                                 "Unable to save dictionary into localization",
                                 exception);
diff --git a/cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
index 4ebf054218..01bae8cbac 100644
--- a/cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.stats/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Stats
 Bundle-SymbolicName: com.raytheon.uf.viz.stats;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.uf.common.util;bundle-version="1.12.1174",
  com.google.guava;bundle-version="1.0.0",
  com.raytheon.uf.common.units;bundle-version="1.0.0",
- com.raytheon.uf.common.event;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0"
+ com.raytheon.uf.common.event;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.viz.stats.collector,
diff --git a/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/ColorManagerDlg.java b/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/ColorManagerDlg.java
deleted file mode 100644
index f26367d842..0000000000
--- a/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/ColorManagerDlg.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.viz.stats.ui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.ColorDialog;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-
-import com.raytheon.uf.common.stats.data.GraphData;
-import com.raytheon.viz.ui.dialogs.CaveSWTDialogBase;
-
-/**
- * TODO Add Description
- *
- * <pre>
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Oct 18, 2012            mpduff     Initial creation
- *
- * </pre>
- *
- * @author mpduff
- * @version 1.0
- */
-
-public class ColorManagerDlg extends CaveSWTDialogBase {
-    private Composite mainComp;
-
-    private final IColorSelection callback;
-
-    private Button individualRdo;
-
-    private Tree selectionTree;
-
-    private final GraphData graphData;
-
-    private final List<Button> radioList = new ArrayList<Button>();
-
-    /** Map of group -> composite */
-    private final Map<String, Composite> compMap = new HashMap<String, Composite>();
-
-    private final Map<String, Map<String, Label>> labelMap = new HashMap<String, Map<String, Label>>();
-
-    /** A map of unique keys, RGB for the check boxes that are checked. */
-    private final Map<String, RGB> keyRgbMap = new LinkedHashMap<String, RGB>();;
-
-    protected ColorManagerDlg(Shell parentShell, GraphData graphData,
-            IColorSelection callback) {
-        super(parentShell, SWT.DIALOG_TRIM | SWT.MIN | SWT.RESIZE,
-                CAVE.DO_NOT_BLOCK | CAVE.MODE_INDEPENDENT
-                        | CAVE.INDEPENDENT_SHELL);
-        setText("Color Manager");
-        this.callback = callback;
-        this.graphData = graphData;
-    }
-
-    @Override
-    protected Layout constructShellLayout() {
-        // Create the main layout for the shell.
-        GridLayout mainLayout = new GridLayout(1, false);
-        mainLayout.marginHeight = 2;
-        mainLayout.marginWidth = 2;
-
-        return mainLayout;
-    }
-
-    @Override
-    protected void initializeComponents(Shell shell) {
-        mainComp = new Composite(shell, SWT.NONE);
-        GridLayout gl = new GridLayout(1, false);
-        gl.marginHeight = 0;
-        gl.marginWidth = 0;
-        gl.horizontalSpacing = 0;
-        gl.verticalSpacing = 5;
-        GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-        mainComp.setLayout(gl);
-        mainComp.setLayoutData(gd);
-
-        createGroups();
-        createActionControls();
-        setupColorsAndKeyRgbMap();
-    }
-
-    private void createGroups() {
-        ScrolledComposite scrolledComp = new ScrolledComposite(mainComp,
-                SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-        GridLayout gl = new GridLayout(1, false);
-        gl.verticalSpacing = 1;
-        scrolledComp.setLayout(gl);
-
-        GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gd.widthHint = 220;
-        gd.heightHint = 350;
-        scrolledComp.setLayoutData(gd);
-
-        gl = new GridLayout(1, false);
-        gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-        Composite composite = new Composite(scrolledComp, SWT.NONE);
-        composite.setLayout(gl);
-        composite.setLayoutData(gd);
-        scrolledComp.setContent(composite);
-        scrolledComp.setExpandHorizontal(true);
-        scrolledComp.setExpandVertical(true);
-
-        gl = new GridLayout(1, false);
-        gd = new GridData(SWT.FILL, SWT.FILL, true, false);
-        Composite indComp = new Composite(composite, SWT.NONE);
-        indComp.setLayout(gl);
-        indComp.setLayoutData(gd);
-        individualRdo = new Button(indComp, SWT.RADIO);
-        individualRdo.setText("Individual");
-        individualRdo.setSelection(true);
-        individualRdo.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                handleIndividualSelection();
-            }
-        });
-
-        Map<String, List<String>> groupMap = graphData.getGroupAndNamesMap();
-
-        for (String group : groupMap.keySet()) {
-            if (!labelMap.containsKey(group)) {
-                labelMap.put(group, new HashMap<String, Label>());
-            }
-
-            gl = new GridLayout(1, false);
-            gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-            Composite comp = new Composite(composite, SWT.NONE);
-            comp.setLayout(gl);
-            comp.setLayoutData(gd);
-
-            Button btn1 = new Button(comp, SWT.RADIO);
-            btn1.setText(group);
-            btn1.addSelectionListener(new SelectionAdapter() {
-                @Override
-                public void widgetSelected(SelectionEvent e) {
-                    handleGroupSelection(((Button) e.getSource()).getText());
-                }
-            });
-
-            radioList.add(btn1);
-
-            gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-            gl = new GridLayout(1, false);
-            ScrolledComposite sc = new ScrolledComposite(comp, SWT.BORDER);
-            sc.setLayout(gl);
-            sc.setLayoutData(gd);
-            sc.setExpandHorizontal(true);
-            sc.setExpandVertical(true);
-            compMap.put(group, sc);
-
-            gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-            gl = new GridLayout(2, false);
-            Composite memberComp = new Composite(sc, SWT.NONE);
-            memberComp.setLayout(gl);
-            memberComp.setLayoutData(gd);
-
-            sc.setContent(memberComp);
-            List<String> memberList = groupMap.get(group);
-            for (String member : memberList) {
-                gd = new GridData(20, 10);
-                Label lbl = new Label(memberComp, SWT.BORDER);
-                lbl.setLayoutData(gd);
-                lbl.addMouseListener(new MouseAdapter() {
-                    @Override
-                    public void mouseDown(MouseEvent e) {
-                        Label lbl = (Label) e.getSource();
-                        handleLabelClickEvent(lbl);
-                    }
-                });
-
-                Label memberLbl = new Label(memberComp, SWT.NONE);
-                memberLbl.setText(member);
-                labelMap.get(group).put(member, lbl);
-            }
-
-            sc.layout();
-
-        }
-
-        scrolledComp.layout();
-    }
-
-    private void createActionControls() {
-        Composite buttonComp = new Composite(shell, SWT.NONE);
-        buttonComp.setLayout(new GridLayout(3, false));
-        buttonComp.setLayoutData(new GridData(SWT.CENTER, SWT.DEFAULT, true,
-                false));
-
-        int buttonWidth = 80;
-
-        GridData gd = new GridData(buttonWidth, SWT.DEFAULT);
-        Button okBtn = new Button(buttonComp, SWT.PUSH);
-        okBtn.setText("OK");
-        okBtn.setLayoutData(gd);
-        okBtn.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                handleApply();
-                close();
-            }
-        });
-
-        gd = new GridData(buttonWidth, SWT.DEFAULT);
-        Button applyBtn = new Button(buttonComp, SWT.PUSH);
-        applyBtn.setText("Apply");
-        applyBtn.setLayoutData(gd);
-        applyBtn.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                handleApply();
-            }
-        });
-
-        gd = new GridData(buttonWidth, SWT.DEFAULT);
-        Button cancelBtn = new Button(buttonComp, SWT.PUSH);
-        cancelBtn.setText("Cancel");
-        cancelBtn.setLayoutData(gd);
-        cancelBtn.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                close();
-            }
-        });
-    }
-
-    /**
-     * Setup the colors for the labels and put the key, RGB in the selected map.
-     */
-    private void setupColorsAndKeyRgbMap() {
-        ColorManager cm = new ColorManager();
-        int count = 0;
-        Color c;
-
-        for (String key : labelMap.keySet()) {
-            count = 0;
-            for (String memberKey : labelMap.get(key).keySet()) {
-                c = new Color(this.getDisplay(), cm.getColorAtIndex(count));
-                labelMap.get(key).get(memberKey).setBackground(c);
-                ++count;
-                c.dispose();
-                keyRgbMap.put(key + "::" + memberKey, labelMap.get(key).get(memberKey).getBackground().getRGB());
-            }
-        }
-
-        for (String key : labelMap.keySet()) {
-            for (String memberKey : labelMap.get(key).keySet()) {
-                keyRgbMap.put(key + "::" + memberKey, labelMap.get(key).get(memberKey).getBackground().getRGB());
-            }
-        }
-    }
-
-    private void handleIndividualSelection() {
-        for (Button rdo: this.radioList) {
-            rdo.setSelection(false);
-        }
-
-        for (String key : this.compMap.keySet()) {
-            compMap.get(key).setEnabled(false);
-        }
-    }
-
-    private void handleGroupSelection(String group) {
-        individualRdo.setSelection(false);
-        for (Button rdo: this.radioList) {
-            if (!rdo.getText().equals(group)) {
-                rdo.setSelection(false);
-            }
-        }
-
-        for (String compMapKey: compMap.keySet()) {
-            if (compMapKey.equals(group)) {
-                compMap.get(compMapKey).setEnabled(true);
-            } else {
-                compMap.get(compMapKey).setEnabled(false);
-            }
-        }
-
-    }
-
-    /**
-     * Handle the color label that is being clicked.
-     *
-     * @param lbl
-     *            Label that was clicked.
-     */
-    private void handleLabelClickEvent(Label lbl) {
-        RGB rgb = lbl.getBackground().getRGB();
-        String key = (String) lbl.getData();
-
-        ColorDialog colorDlg = new ColorDialog(this.getShell());
-        colorDlg.setRGB(rgb);
-        colorDlg.setText("Select a Color");
-
-        RGB returnRGB = colorDlg.open();
-
-        if (returnRGB == null) {
-            return;
-        }
-
-        Color c = new Color(this.getDisplay(), returnRGB);
-        lbl.setBackground(c);
-        c.dispose();
-
-        if (keyRgbMap.containsKey(key) == true) {
-            keyRgbMap.put(key, returnRGB);
-        }
-    }
-
-    private void handleApply() {
-        // TODO Auto-generated method stub
-//        System.out.println("TODO:  Implement me");
-    }
-
-}
diff --git a/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/SelectionManagerDlg.java b/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/SelectionManagerDlg.java
index d12231d3c5..c94f676570 100644
--- a/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/SelectionManagerDlg.java
+++ b/cave/com.raytheon.uf.viz.stats/src/com/raytheon/uf/viz/stats/ui/SelectionManagerDlg.java
@@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 
 import com.raytheon.uf.common.stats.data.GraphData;
-import com.raytheon.viz.ui.dialogs.CaveSWTDialogBase;
+import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 
 /**
  * Stats Selection Manager Dialog.
@@ -55,6 +55,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialogBase;
  * ------------ ---------- ----------- --------------------------
  * Oct 18, 2012            lvenable    Initial creation
  * Jan 17, 2013  1357      mpduff      Added selection state handling.
+ * Jan 15, 2016 5054       randerso    Change to subclass CaveSWTDialog
  * 
  * </pre>
  * 
@@ -62,7 +63,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialogBase;
  * @version 1.0
  */
 
-public class SelectionManagerDlg extends CaveSWTDialogBase {
+public class SelectionManagerDlg extends CaveSWTDialog {
     /** Main Composite */
     private Composite mainComp;
 
@@ -85,8 +86,8 @@ public class SelectionManagerDlg extends CaveSWTDialogBase {
     public SelectionManagerDlg(Shell parentShell, GraphData graphData,
             IGroupSelection callback) {
         super(parentShell, SWT.DIALOG_TRIM | SWT.MIN | SWT.RESIZE,
-                CAVE.DO_NOT_BLOCK | CAVE.MODE_INDEPENDENT
-                        | CAVE.INDEPENDENT_SHELL);
+                CAVE.DO_NOT_BLOCK | CAVE.PERSPECTIVE_INDEPENDENT
+                        | CAVE.MODE_INDEPENDENT | CAVE.INDEPENDENT_SHELL);
         setText("Selection Manager");
 
         this.callback = callback;
diff --git a/cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java b/cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java
index cb62bc5960..b8f8e8296e 100644
--- a/cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java
+++ b/cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java
@@ -38,9 +38,7 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.tcs.Radius;
 import com.raytheon.uf.common.dataplugin.tcs.TropicalCycloneSummary;
 import com.raytheon.uf.common.dataplugin.tcs.util.TCSConstants;
-import com.raytheon.uf.common.dataplugin.tcs.util.Util;
-import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
-import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
+import com.raytheon.uf.common.dataplugin.tcs.util.TcsUtil;
 import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.pointdata.PointDataView;
 import com.raytheon.uf.common.time.DataTime;
@@ -69,17 +67,20 @@ import com.raytheon.viz.pointdata.PointDataRequest;
 import com.vividsolutions.jts.geom.Coordinate;
 
 /**
- * Tropical Cyclone summary resource
+ * Resource for displaying data from a {@link TropicalCycloneSummary}.
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Oct 22, 2010            jsanchez     Initial creation
- * Jul 29, 2014 #3465      mapeters     Updated deprecated drawString() calls.
- * Sep 17, 2014 3632       bclement     fixed index out of bounds
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- ---------------------------------------
+ * Oct 22, 2010           jsanchez  Initial creation
+ * Jul 29, 2014  3465     mapeters  Updated deprecated drawString() calls.
+ * Sep 17, 2014  3632     bclement  fixed index out of bounds
+ * Nov 05, 2015  5070     randerso  Adjust font sizes for dpi scaling
+ * Nov 30, 2015  5149     bsteffen  Rename TcsUtil, update class javadoc
+ * Jan 27, 2016  5285     tgurney   Remove dependency on dataURI
  * 
  * </pre>
  * 
@@ -123,7 +124,7 @@ public class TCSResource extends
         if (font != null) {
             font.dispose();
         }
-        this.font = target.initializeFont("Monospace", 11,
+        this.font = target.initializeFont("Monospace", 9,
                 new Style[] { Style.ITALIC });
         this.symbolLoader = new SymbolLoader();
     }
@@ -142,13 +143,15 @@ public class TCSResource extends
         color = getCapability(ColorableCapability.class).getColor();
         font.setMagnification(getCapability(MagnificationCapability.class)
                 .getMagnification().floatValue());
-        
+
         double screenToWorldRatio = paintProps.getCanvasBounds().width
                 / paintProps.getView().getExtent().getWidth();
         double scale = (PLOT_WIDTH / 2.0) / screenToWorldRatio;
 
-        DataTime dt = resourceData.isHourlyForecast ? new DataTime(paintProps
-                .getDataTime().getRefTime()) : paintProps.getDataTime();
+        DataTime dt = paintProps.getDataTime();
+        if (resourceData.isHourlyForecast && dt != null) {
+            dt = new DataTime(dt.getRefTime());
+        }
         Collection<TropicalCycloneSummary> toParse = recordsToParse.get(dt);
         if (toParse != null && toParse.size() > 0) {
             updateRecords(dt);
@@ -176,7 +179,7 @@ public class TCSResource extends
             PaintProperties paintProps, PointDataView pdv, double scale)
             throws VizException {
 
-        TropicalCycloneSummary storm = Util.interplateStorm(pdv,
+        TropicalCycloneSummary storm = TcsUtil.interplateStorm(pdv,
                 paintProps.getDataTime());
         displayOneStorm(target, paintProps, (float) storm.getLongitude(),
                 (float) storm.getLatitude(), storm.getPressure(),
@@ -298,14 +301,12 @@ public class TCSResource extends
 
         if (paintProps.getZoomLevel() * descriptor.getMapWidth() / 1000 < ZOOM_LEVEL) {
             drawLegends(target, paintProps, scale);
-            drawRadius(target, name, descriptor.pixelToWorld(loc), scale,
-                    radiusList);
+            drawRadius(target, descriptor.pixelToWorld(loc), radiusList);
         }
     }
 
-    private void drawRadius(IGraphicsTarget target, String name,
-            double[] latLon, double scale, ArrayList<Radius> radiusList)
-            throws VizException {
+    private void drawRadius(IGraphicsTarget target, double[] latLon,
+            ArrayList<Radius> radiusList) throws VizException {
         Coordinate[] coordinates = null;
 
         // Draw the XX KT... lines.
@@ -504,18 +505,10 @@ public class TCSResource extends
 
     protected void updateRecords(DataTime dataTime) throws VizException {
         PointDataContainer pdc = null;
-        RequestConstraint constraint = new RequestConstraint();
-        Map<String, RequestConstraint> constraints = new HashMap<String, RequestConstraint>();
-
-        for (TropicalCycloneSummary record : recordsToParse.get(dataTime)) {
-            constraint.setConstraintType(ConstraintType.IN);
-            constraint.addToConstraintValueList(record.getDataURI());
-        }
-        constraints.put(DATAURI, constraint);
         // Request the point data
         pdc = PointDataRequest.requestPointDataAllLevels(dataTime, resourceData
                 .getMetadataMap().get("pluginName").getConstraintValue(),
-                getParameters(), null, constraints);
+                getParameters(), null, resourceData.getMetadataMap());
 
         if (recordsToDisplay.containsKey(dataTime)) {
             recordsToDisplay.get(dataTime).combine(pdc);
diff --git a/cave/com.raytheon.uf.viz.thinclient.alertviz/src/com/raytheon/uf/viz/thinclient/alertviz/ThinAlertVizComponent.java b/cave/com.raytheon.uf.viz.thinclient.alertviz/src/com/raytheon/uf/viz/thinclient/alertviz/ThinAlertVizComponent.java
index 9148ce6d0e..920ed75887 100644
--- a/cave/com.raytheon.uf.viz.thinclient.alertviz/src/com/raytheon/uf/viz/thinclient/alertviz/ThinAlertVizComponent.java
+++ b/cave/com.raytheon.uf.viz.thinclient.alertviz/src/com/raytheon/uf/viz/thinclient/alertviz/ThinAlertVizComponent.java
@@ -19,16 +19,8 @@
  **/
 package com.raytheon.uf.viz.thinclient.alertviz;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.MessageBox;
-
 import com.raytheon.uf.common.comm.HttpClient;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.viz.alertviz.ui.dialogs.AlertVisualization;
 import com.raytheon.uf.viz.core.jobs.StatsJob;
 import com.raytheon.uf.viz.core.localization.CAVELocalizationAdapter;
 import com.raytheon.uf.viz.product.alertviz.AlertVizApplication;
@@ -48,10 +40,11 @@ import com.raytheon.uf.viz.thinclient.localization.ThinClientLocalizationInitial
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Nov 29, 2011            mschenke     Initial creation
- * Jan 12, 2012  27        rferrel      Added exit option
- * Nov 06, 2014  3356      njensen      Always initialize ILocalizationAdapter   
- *                                       in case cache preference is not enabled
+ * Nov 29, 2011            mschenke    Initial creation
+ * Jan 12, 2012  27        rferrel     Added exit option
+ * Nov 06, 2014  3356      njensen     Always initialize ILocalizationAdapter   
+ *                                      in case cache preference is not enabled
+ * Jan 25, 2016  5054      randerso    Removed override of createAlertVisualization
  * 
  * </pre>
  * 
@@ -103,33 +96,4 @@ public class ThinAlertVizComponent extends AlertVizApplication implements
     protected void initializeObservers() {
         ThinClientNotificationManagerJob.getInstance();
     }
-
-    @Override
-    protected AlertVisualization createAlertVisualization(
-            boolean runningStandalone, final Display display) {
-        return new AlertVisualization(runningStandalone, display) {
-
-            @Override
-            protected void createTrayMenuItems() {
-                super.createTrayMenuItems();
-                if (!runningStandalone) {
-                    new MenuItem(trayItemMenu, SWT.SEPARATOR);
-                }
-                MenuItem exitMI = new MenuItem(trayItemMenu, SWT.NONE);
-                exitMI.setText("Exit...");
-                exitMI.addSelectionListener(new SelectionAdapter() {
-                    @Override
-                    public void widgetSelected(SelectionEvent event) {
-                        MessageBox mb = new MessageBox(shell, SWT.ICON_QUESTION
-                                | SWT.YES | SWT.NO);
-                        mb.setText("Confirm Exit");
-                        mb.setMessage("Any unsaved changes will be lost.\n Are you sure you want to exit?");
-                        if (mb.open() == SWT.YES) {
-                            display.dispose();
-                        }
-                    }
-                });
-            }
-        };
-    }
 }
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt b/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt
index 0927149bfb..6e057604a8 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/ThinClientPluginBlacklist.txt
@@ -39,4 +39,23 @@ gov.noaa.nws.ncep.viz.rsc.wstm
 gov.noaa.nws.ncep.viz.rsc.wou
 #localization
 com.raytheon.uf.viz.localization.perspective
-org.eclipse.wst.xml.ui
\ No newline at end of file
+org.eclipse.wst.xml.ui
+com.python.pydev
+com.python.pydev.analysis
+com.python.pydev.codecompletion
+com.python.pydev.debug
+com.python.pydev.fastparser
+com.python.pydev.refactoring
+org.python.pydev
+org.python.pydev.ast
+org.python.pydev.core
+org.python.pydev.customizations
+org.python.pydev.debug
+org.python.pydev.django
+org.python.pydev.help
+org.python.pydev.jython
+org.python.pydev.parser
+org.python.pydev.refactoring
+org.python.pydev.shared_core
+org.python.pydev.shared_interactive_console
+org.python.pydev.shared_ui
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java
index 81a397b09e..dca22bfe46 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java
@@ -77,6 +77,7 @@ import com.raytheon.viz.ui.personalities.awips.CAVE;
  * Jun 26, 2015  4474     bsteffen  Register the PathManager as an OSGi service.
  * Dec 04, 2015  5169     bsteffen  Allow ProductAlertObserver to send messages
  *                                  to the AutoUpdater
+ * Feb 08, 2016, 5281     tjensen   Combined Data and Menu Refresh Intervals
  * 
  * </pre>
  * 
@@ -93,13 +94,6 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
 
     private StatsJob statsJob;
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent#startInternal
-     * (java.lang.String)
-     */
     @Override
     protected void startInternal(String componentName) throws Exception {
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
@@ -111,7 +105,7 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
         // Initialize the timed menu time refresher
         store.addPropertyChangeListener(new TimedRefresher(
                 new MenuTimeRefreshTask(),
-                ThinClientPreferenceConstants.P_MENU_TIME_REFRESH_INTERVAL));
+                ThinClientPreferenceConstants.P_DATA_REFRESH_INTERVAL));
 
         // Start network statistics
         statsJob = new StatsJob("HTTP Network Statistics", HttpClient
@@ -163,12 +157,6 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
                         .getUnderlyingFactory()));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent#
-     * initializeLocalization()
-     */
     @Override
     protected void initializeLocalization() throws Exception {
         /*
@@ -197,23 +185,11 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
                         PathManagerFactory.getPathManager(), null);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent#
-     * createAWIPSWorkbenchAdvisor()
-     */
     @Override
     protected AWIPSWorkbenchAdvisor createAWIPSWorkbenchAdvisor() {
         return new ThinClientWorkbenchAdvisor();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.ui.personalities.awips.AbstractCAVEComponent#
-     * initializeObservers()
-     */
     @Override
     protected void initializeObservers() {
         ThinClientNotificationManagerJob.getInstance();
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/preferences/ThinClientConnectionPreferences.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/preferences/ThinClientConnectionPreferences.java
index 3f9e857614..c4c4ada054 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/preferences/ThinClientConnectionPreferences.java
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/preferences/ThinClientConnectionPreferences.java
@@ -23,6 +23,7 @@ package com.raytheon.uf.viz.thinclient.cave.preferences;
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.ComboFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.RadioGroupFieldEditor;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
 import com.raytheon.uf.viz.core.localization.HierarchicalPreferenceStore;
@@ -39,6 +40,8 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 8, 2011            mschenke     Initial creation
+ * Feb 08, 2016, 5281     tjensen      Replaced disableJms checkbox with radio buttons 
+ *                                      and combined Data and Menu Refresh Intervals
  * 
  * </pre>
  * 
@@ -47,12 +50,10 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
  */
 public class ThinClientConnectionPreferences extends FieldEditorPreferencePage {
 
-    private BooleanFieldEditor disableJMS;
+    private RadioGroupFieldEditor dataRefreshMethod;
 
     private BooleanFieldEditor disableMenuTimes;
 
-    private ComboFieldEditor menuTimeInterval;
-
     private ComboFieldEditor dataUpdateInterval;
 
     /**
@@ -65,49 +66,35 @@ public class ThinClientConnectionPreferences extends FieldEditorPreferencePage {
         setDescription("Thin Client Connections");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors
-     * ()
-     */
     @Override
     protected void createFieldEditors() {
-        disableJMS = new BooleanFieldEditor(
-                ThinClientPreferenceConstants.P_DISABLE_JMS, "Disable &JMS",
+        dataRefreshMethod = new RadioGroupFieldEditor(
+                ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD,
+                "Data Refresh: ",
+                2,
+                new String[][] {
+                        {
+                                "&Automatic Push",
+                                ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH },
+                        {
+                                "&Timed Poll",
+                                ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL } },
                 getFieldEditorParent());
-        addField(disableJMS);
+        addField(dataRefreshMethod);
 
         disableMenuTimes = new BooleanFieldEditor(
                 ThinClientPreferenceConstants.P_DISABLE_MENU_TIMES,
-                "Disable Menu &Times", getFieldEditorParent());
+                "Disable &Menu Times", getFieldEditorParent());
 
         addField(disableMenuTimes);
 
         HierarchicalPreferenceStore uiStore = Activator.getDefault()
                 .getUiPreferenceStore();
-        float[] intervals = uiStore
-                .getFloatArray(ThinClientPreferenceConstants.P_MENU_TIME_UPDATE_INTERVALS);
-        String[][] values = new String[intervals.length + 1][2];
-        values[0] = new String[] { "Off", "0" };
-        for (int i = 0; i < intervals.length; ++i) {
-            String val = Integer.toString((int) intervals[i]);
-            values[i + 1] = new String[] { val, val };
-        }
-
-        menuTimeInterval = new ComboFieldEditor(
-                ThinClientPreferenceConstants.P_MENU_TIME_REFRESH_INTERVAL,
-                "&Menu Time Update Interval (min)", values,
-                getFieldEditorParent());
-
-        // TODO: Hook in periodic menu time updating (URICatalog?)
-        addField(menuTimeInterval);
 
         // Add data update options
-        intervals = uiStore
+        float[] intervals = uiStore
                 .getFloatArray(ThinClientPreferenceConstants.P_DATA_UPDATE_INTERVALS);
-        values = new String[intervals.length + 1][2];
+        String[][] values = new String[intervals.length + 1][2];
         values[0] = new String[] { "Off", "0" };
         for (int i = 0; i < intervals.length; ++i) {
             String val = Integer.toString((int) intervals[i]);
@@ -119,30 +106,25 @@ public class ThinClientConnectionPreferences extends FieldEditorPreferencePage {
                 "&Data Update Interval (min)", values, getFieldEditorParent());
 
         addField(dataUpdateInterval);
-        boolean disableJMS = getPreferenceStore().getBoolean(
-                ThinClientPreferenceConstants.P_DISABLE_JMS);
-        menuTimeInterval.setEnabled(disableJMS, getFieldEditorParent());
+        boolean disableJMS = ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL
+                .equals(getPreferenceStore().getString(
+                        ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD));
         dataUpdateInterval.setEnabled(disableJMS, getFieldEditorParent());
     }
 
     @Override
     public void propertyChange(PropertyChangeEvent event) {
         super.propertyChange(event);
-        this.updateEnabledFields();
+        if (event.getSource() == dataRefreshMethod) {
+            this.updateEnabledFields((String) event.getNewValue());
+        }
+        ;
     }
 
-    @Override
-    protected void checkState() {
-        super.checkState();
-        this.updateEnabledFields();
-    }
-
-    private void updateEnabledFields() {
-        boolean disableMenuTimes = this.disableMenuTimes.getBooleanValue();
-        boolean disableJMS = this.disableJMS.getBooleanValue();
+    private void updateEnabledFields(String refreshMethod) {
+        boolean disableJMS = ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL
+                .equals(refreshMethod);
         dataUpdateInterval.setEnabled(disableJMS, getFieldEditorParent());
-        menuTimeInterval.setEnabled(!disableMenuTimes && disableJMS,
-                getFieldEditorParent());
     }
 
 }
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/preferences/ThinClientServerPreferences.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/preferences/ThinClientServerPreferences.java
index c8aa01fd84..10efa97156 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/preferences/ThinClientServerPreferences.java
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/preferences/ThinClientServerPreferences.java
@@ -20,9 +20,7 @@
 
 package com.raytheon.uf.viz.thinclient.cave.preferences;
 
-import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
-import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -55,6 +53,7 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
  * Feb 04, 2014 2704       njensen     Only one field for proxy server
  * Jun 26, 2014 3236       njensen     Proxy server can now be text or combo field
  * Oct 08, 2015 4891       njensen     Added tooltip to useProxies
+ * Feb 09, 2016 5281       tjensen     Remove option for Use Proxy Server
  * 
  * </pre>
  * 
@@ -63,8 +62,6 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
  */
 public class ThinClientServerPreferences extends FieldEditorPreferencePage {
 
-    private BooleanFieldEditor useProxies;
-
     private TextOrComboEditor proxyServer;
 
     private Button connectivityButton;
@@ -79,23 +76,8 @@ public class ThinClientServerPreferences extends FieldEditorPreferencePage {
         setDescription("Thin Client Servers (changes require a restart)");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.jface.preference.FieldEditorPreferencePage#createFieldEditors
-     * ()
-     */
     @Override
     protected void createFieldEditors() {
-        useProxies = new BooleanFieldEditor(
-                ThinClientPreferenceConstants.P_USE_PROXIES,
-                "&Use Proxy Servers", getFieldEditorParent());
-        useProxies
-                .getDescriptionControl(getFieldEditorParent())
-                .setToolTipText(
-                        "Connect to a remote proxy server configured to support thin clients");
-        addField(useProxies);
 
         proxyServer = new TextOrComboEditor(getFieldEditorParent(),
                 this.getPreferenceStore(),
@@ -182,22 +164,4 @@ public class ThinClientServerPreferences extends FieldEditorPreferencePage {
         }
     }
 
-    @Override
-    public void propertyChange(PropertyChangeEvent event) {
-        super.propertyChange(event);
-        this.updateEnabledFields();
-    }
-
-    @Override
-    protected void checkState() {
-        super.checkState();
-        this.updateEnabledFields();
-    }
-
-    private void updateEnabledFields() {
-        boolean useProxies = this.useProxies.getBooleanValue();
-        proxyServer.setEnabled(useProxies, connectivityButton.getParent());
-        connectivityButton.setEnabled(useProxies);
-    }
-
 }
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/DataRefreshTask.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/DataRefreshTask.java
index f3ca4f41aa..d43ac33183 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/DataRefreshTask.java
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/DataRefreshTask.java
@@ -45,6 +45,7 @@ import com.raytheon.viz.alerts.observers.ProductAlertObserver;
  * Feb 21, 2014  16744    dfriedman  Update all alert observers
  * Dec 04, 2015  5169     bsteffen   Allow ProductAlertObserver to send messages
  *                                   to the AutoUpdater
+ * Feb 08, 2016  5281     tjensen    Replaced disableJms with dataRefreshMethod
  * 
  * </pre>
  * 
@@ -54,15 +55,12 @@ import com.raytheon.viz.alerts.observers.ProductAlertObserver;
 
 public class DataRefreshTask implements RefreshTimerTask {
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.util.TimerTask#run()
-     */
     @Override
     public void run() {
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-        if (store.getBoolean(ThinClientPreferenceConstants.P_DISABLE_JMS)) {
+        if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL
+                .equals(store
+                        .getString(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD))) {
             Collection<AlertMessage> alerts = ThinClientDataUpdateTree
                     .getInstance().updateAllData();
 
@@ -75,25 +73,11 @@ public class DataRefreshTask implements RefreshTimerTask {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.thinclient.refresh.TimedRefresher.RefreshTimerTask
-     * #scheduled()
-     */
     @Override
     public void scheduled() {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.thinclient.refresh.TimedRefresher.RefreshTimerTask
-     * #stopped()
-     */
     @Override
     public void stopped() {
 
diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/MenuTimeRefreshTask.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/MenuTimeRefreshTask.java
index 2675424050..c4240f3fc2 100644
--- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/MenuTimeRefreshTask.java
+++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/refresh/MenuTimeRefreshTask.java
@@ -24,7 +24,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import com.raytheon.uf.viz.thinclient.Activator;
 import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
 import com.raytheon.uf.viz.thinclient.refresh.TimedRefresher.RefreshTimerTask;
-import com.raytheon.viz.alerts.jobs.MenuUpdater;
 
 /**
  * Timer task that is responsible for requerying menu times
@@ -36,6 +35,7 @@ import com.raytheon.viz.alerts.jobs.MenuUpdater;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 10, 2011            mschenke     Initial creation
+ * Feb 08, 2016  5281      tjensen      Replaced disableJms with dataRefreshMethod
  * 
  * </pre>
  * 
@@ -45,42 +45,23 @@ import com.raytheon.viz.alerts.jobs.MenuUpdater;
 
 public class MenuTimeRefreshTask implements RefreshTimerTask {
 
-    private MenuUpdater menuUpdater = new MenuUpdater();
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.util.TimerTask#run()
-     */
     @Override
     public void run() {
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-        if (!store.getBoolean(ThinClientPreferenceConstants.P_DISABLE_JMS)) {
+        if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH
+                .equals(store
+                        .getString(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD))) {
             return;
         }
         ThinClientURICatalog.getInstance().requeryAllMenuTimes();
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.thinclient.refresh.TimedRefresher.RefreshTimerTask
-     * #scheduled()
-     */
     @Override
     public void scheduled() {
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.thinclient.refresh.TimedRefresher.RefreshTimerTask
-     * #stopped()
-     */
     @Override
     public void stopped() {
 
diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ThinClientNotificationManagerJob.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ThinClientNotificationManagerJob.java
index 7e058551c6..0b427b0aa5 100644
--- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ThinClientNotificationManagerJob.java
+++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ThinClientNotificationManagerJob.java
@@ -36,8 +36,8 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
 
 /**
  * Listens to changes to the "Disable JMS" option in the Thin Client
- * Preferences. Will automatically connect to and disconnect from the
- * JMS Server as the option is updated.
+ * Preferences. Will automatically connect to and disconnect from the JMS Server
+ * as the option is updated.
  * 
  * <pre>
  * 
@@ -48,6 +48,7 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
  * Nov 29, 2011            bsteffen     Initial creation
  * Aug 27, 2013 2295       bkowal       The entire jms connection string is now
  *                                      provided by EDEX.
+ * Feb 08, 2016 5281       tjensen      Replaced disableJms with dataRefreshMethod
  * 
  * </pre>
  * 
@@ -62,7 +63,7 @@ public class ThinClientNotificationManagerJob extends NotificationManagerJob
 
     private static ThinClientNotificationManagerJob instance;
 
-    private Boolean disableJMS;
+    private String dataRefreshMethod;
 
     public static synchronized ThinClientNotificationManagerJob getInstance() {
         if (instance == null) {
@@ -75,17 +76,20 @@ public class ThinClientNotificationManagerJob extends NotificationManagerJob
     public ThinClientNotificationManagerJob() {
         super();
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-        disableJMS = store
-                .getBoolean(ThinClientPreferenceConstants.P_DISABLE_JMS);
+        dataRefreshMethod = store
+                .getString(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD);
+
         store.addPropertyChangeListener(this);
-        if (!disableJMS) {
+        if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH
+                .equals(dataRefreshMethod)) {
             connect(true);
         }
     }
 
     @Override
     protected void connect(boolean notifyError) {
-        if (disableJMS == null || disableJMS) {
+        if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL
+                .equals(dataRefreshMethod)) {
             return;
         } else {
             super.connect(notifyError);
@@ -94,10 +98,12 @@ public class ThinClientNotificationManagerJob extends NotificationManagerJob
 
     @Override
     public void propertyChange(PropertyChangeEvent event) {
-        if (ThinClientPreferenceConstants.P_DISABLE_JMS.equals(event
+        if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD.equals(event
                 .getProperty())) {
-            disableJMS = Boolean.valueOf(String.valueOf(event.getNewValue()));
-            if (disableJMS) {
+            dataRefreshMethod = String.valueOf(event.getNewValue());
+
+            if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL
+                    .equals(dataRefreshMethod)) {
                 disconnect(true);
             } else {
                 if (VizApp.getJmsConnectionString() == null) {
diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationAdapter.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationAdapter.java
index aed15d8878..3b8cb79f62 100644
--- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationAdapter.java
+++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationAdapter.java
@@ -34,7 +34,6 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.viz.core.localization.BundleScanner;
 import com.raytheon.uf.viz.core.localization.CAVELocalizationAdapter;
 import com.raytheon.uf.viz.thinclient.Activator;
@@ -51,10 +50,11 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Aug 9, 2011             njensen     Initial creation
+ * Aug 09, 2011            njensen     Initial creation
  * Aug 13, 2013       2033 mschenke    Changed to search all plugins when 
  *                                     CAVE_STATIC BASE context searched
  * May 29, 2015       4532 bsteffen    Always use super when sync job is running.
+ * Nov 30, 2015       4834 njensen     Remove LocalizationOpFailedException
  * 
  * </pre>
  * 
@@ -81,52 +81,23 @@ public class ThinClientLocalizationAdapter extends CAVELocalizationAdapter
         store.addPropertyChangeListener(this);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.localization.CAVELocalizationAdapter#retrieve
-     * (com.raytheon.uf.common.localization.LocalizationFile)
-     */
     @Override
-    public void retrieve(LocalizationFile file)
-            throws LocalizationOpFailedException {
+    public void retrieve(LocalizationFile file) throws LocalizationException {
         if (syncJobsRunning.get() > 0) {
             super.retrieve(file);
             return;
         }
-        try {
-            File localFile = file.getFile(false);
-            if (localFile.exists() == false || localFile.length() == 0) {
-                super.retrieve(file);
-            }
-        } catch (LocalizationOpFailedException e) {
-            throw e;
-        } catch (LocalizationException e) {
-            /*
-             * At the time of this writing, nothing will actually throw any
-             * LocalizationException other than LocalizationOpFailedException.
-             * However since LocalizationFile.getFile(boolean) has a method
-             * signature indicating it could throw any LocalizationException
-             * this code should be able to handle any LocalizationException in
-             * case the implementation of getFile changes in the future.
-             */
-            throw new LocalizationOpFailedException(e);
+
+        File localFile = file.getFile(false);
+        if (localFile.exists() == false || localFile.length() == 0) {
+            super.retrieve(file);
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.localization.CAVELocalizationAdapter#listDirectory
-     * (com.raytheon.uf.common.localization.LocalizationContext[],
-     * java.lang.String, boolean, boolean)
-     */
     @Override
     public ListResponse[] listDirectory(LocalizationContext[] contexts,
             String path, boolean recursive, boolean filesOnly)
-            throws LocalizationOpFailedException {
+            throws LocalizationException {
         if (shouldUseRemoteFiles()) {
             return super.listDirectory(contexts, path, recursive, filesOnly);
         } else {
@@ -171,18 +142,10 @@ public class ThinClientLocalizationAdapter extends CAVELocalizationAdapter
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.uf.viz.core.localization.CAVELocalizationAdapter#
-     * getLocalizationMetadata
-     * (com.raytheon.uf.common.localization.LocalizationContext[],
-     * java.lang.String)
-     */
     @Override
     public ListResponse[] getLocalizationMetadata(
             LocalizationContext[] context, String fileName)
-            throws LocalizationOpFailedException {
+            throws LocalizationException {
         if (shouldUseRemoteFiles()) {
             return super.getLocalizationMetadata(context, fileName);
         } else {
@@ -229,7 +192,8 @@ public class ThinClientLocalizationAdapter extends CAVELocalizationAdapter
                 .equals(event.getProperty())) {
             useRemoteFiles = !Boolean.valueOf(String.valueOf(event
                     .getNewValue()));
-        } else if (ThinClientPreferenceConstants.P_SYNC_REMOTE_LOCALIZATION.equals(event.getProperty())) {
+        } else if (ThinClientPreferenceConstants.P_SYNC_REMOTE_LOCALIZATION
+                .equals(event.getProperty())) {
             boolean sync = Boolean.valueOf(String.valueOf(event.getNewValue()));
             if (sync) {
                 syncJobsRunning.incrementAndGet();
diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
index ea3bdc74aa..df07ba6e9e 100644
--- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
+++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
@@ -64,6 +64,7 @@ import com.raytheon.uf.viz.thinclient.ui.ThinClientConnectivityDialog;
  * Sep 05, 2014  3570       bclement    HTTP client API changes
  * Jan 26, 2015  3952       njensen     gzip handled by default
  * Jul 06, 2015  4614       njensen     explicitly enable gzip
+ * Feb 08, 2016  5281       tjensen     Replaced disableJms with dataRefreshMethod
  * 
  * </pre>
  * 
@@ -100,8 +101,8 @@ public class ThinClientLocalizationInitializer extends LocalizationInitializer {
         }
 
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-        boolean disableJMS = store
-                .getBoolean(ThinClientPreferenceConstants.P_DISABLE_JMS);
+        String dataRefreshMethod = store
+                .getString(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD);
 
         if (store.getBoolean(ThinClientPreferenceConstants.P_USE_PROXIES)) {
             String proxyAddr = store
@@ -129,12 +130,11 @@ public class ThinClientLocalizationInitializer extends LocalizationInitializer {
                     false);
             VizApp.setHttpServer(servicesProxy);
 
-            if (!disableJMS) {
+            if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH
+                    .equals(dataRefreshMethod)) {
                 GetServersResponse resp = ConnectivityManager
                         .checkLocalizationServer(servicesProxy, false);
-                if (!disableJMS) {
-                    VizApp.setJmsConnectionString(resp.getJmsConnectionString());
-                }
+                VizApp.setJmsConnectionString(resp.getJmsConnectionString());
             }
 
             String pypiesProxy = ThinClientUriUtil.getPypiesAddress(proxyAddr);
@@ -146,7 +146,8 @@ public class ThinClientLocalizationInitializer extends LocalizationInitializer {
             VizServers.getInstance().setServerLocations(serversMap);
         } else {
             processGetServers();
-            if (disableJMS) {
+            if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL
+                    .equals(dataRefreshMethod)) {
                 VizApp.setJmsConnectionString(null);
             }
         }
diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java
index 25647c5e00..c6dcee086a 100644
--- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java
+++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/PreferenceInitializer.java
@@ -38,6 +38,8 @@ import com.raytheon.uf.viz.thinclient.Activator;
  * ------------ ---------- ----------- --------------------------
  * Oct 21, 2011            mschenke    Initial creation
  * Oct 08, 2015  4891      njensen     Default data update interval to 5
+ * Feb 08, 2016  5281      tjensen     Replaced disableJms with dataRefreshMethod, 
+ *                                      combined Data and Menu Refresh Intervals
  * 
  * </pre>
  * 
@@ -61,8 +63,12 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
                 false);
         store.setDefault(ThinClientPreferenceConstants.P_CACHE_MAPS, true);
 
-        // By default keep jms enabled
-        store.setDefault(ThinClientPreferenceConstants.P_DISABLE_JMS, false);
+        /*
+         * By default, use automatic data push. If unavailable, timed poll
+         * method will be used.
+         */
+        store.setDefault(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD,
+                ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH);
 
         store.setDefault(
                 ThinClientPreferenceConstants.P_ENABLE_REQUEST_COMPRESSION,
@@ -71,9 +77,6 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
         // Menu times will be enabled by default
         store.setDefault(ThinClientPreferenceConstants.P_DISABLE_MENU_TIMES,
                 false);
-        // Default menu refresh interval
-        store.setDefault(
-                ThinClientPreferenceConstants.P_MENU_TIME_REFRESH_INTERVAL, 5);
 
         // Default data refresh rate
         store.setDefault(ThinClientPreferenceConstants.P_DATA_REFRESH_INTERVAL,
diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/ThinClientPreferenceConstants.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/ThinClientPreferenceConstants.java
index f8b93b6299..c17b54df73 100644
--- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/ThinClientPreferenceConstants.java
+++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/preferences/ThinClientPreferenceConstants.java
@@ -35,7 +35,8 @@ import org.eclipse.jface.preference.IPreferenceStore;
  * Feb 04, 2014 2704       njensen      Consolidate services and pypies proxy addresses
  * Jun 24, 2014 3236       njensen      Added proxy address options
  * May 29, 2015 4532       bsteffen     Add sync localization option.
- * 
+ * Feb 08, 2016 5281       tjensen      Replaced disableJms with dataRefreshMethod, 
+ *                                       combined Data and Menu Refresh Intervals
  * 
  * </pre>
  * 
@@ -49,12 +50,8 @@ public class ThinClientPreferenceConstants {
 
     public static String P_DATA_REFRESH_INTERVAL = "dataRefreshRate";
 
-    public static String P_MENU_TIME_REFRESH_INTERVAL = "menuRefreshInterval";
-
     public static String P_USE_PROXIES = "useHttpProxy";
 
-    public static String P_MENU_TIME_UPDATE_INTERVALS = "menuTimeUpdateInterval";
-
     public static String P_DATA_UPDATE_INTERVALS = "dataUpdateInterval";
 
     public static String P_CACHE_WEATHER = "cachePypies";
@@ -80,7 +77,11 @@ public class ThinClientPreferenceConstants {
 
     public static String P_DISABLE_MENU_TIMES = "disableMenuTimes";
 
-    public static String P_DISABLE_JMS = "disableJms";
+    public static String P_DATA_REFRESH_METHOD = "dataRefreshMethod";
+
+    public static String P_DATA_REFRESH_METHOD_PUSH = "push";
+
+    public static String P_DATA_REFRESH_METHOD_POLL = "poll";
 
     public static String P_ENABLE_REQUEST_COMPRESSION = "enableRequestCompression";
 
diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
index 9e4e6a8c79..37ebab78b8 100644
--- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
+++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
@@ -26,11 +26,11 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 
 import com.raytheon.uf.common.localization.msgs.GetServersResponse;
@@ -45,7 +45,6 @@ import com.raytheon.uf.viz.core.localization.ConnectivityPreferenceDialog;
 import com.raytheon.uf.viz.core.localization.LocalizationConstants;
 import com.raytheon.uf.viz.core.localization.LocalizationManager;
 import com.raytheon.uf.viz.core.localization.ServerRemembrance;
-import com.raytheon.uf.viz.core.localization.TextOrCombo;
 import com.raytheon.uf.viz.thinclient.Activator;
 import com.raytheon.uf.viz.thinclient.ThinClientUriUtil;
 import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
@@ -69,8 +68,9 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
  * Jun 03, 2014  3217     bsteffen    Add option to always open startup dialog.
  * Jun 24, 2014  3236     njensen     Add ability to remember multiple servers
  * Oct 08, 2015  4891     njensen     Added tooltip to useProxyCheck
- * 
- * 
+ * Feb 08, 2016  5281     tjensen     Reworked interface to simply options
+ * Feb 15, 2016  5281     tjensen     Added check for null in validate method
+ * Feb 18, 2016  5281     tjensen     Fix issue when no JMS available.
  * 
  * </pre>
  * 
@@ -127,113 +127,96 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
 
     private IConnectivityCallback pypiesCallback = new PypiesCallback();
 
-    private Button useProxyCheck;
-
-    private boolean useProxy = false;
-
-    private Button disableJmsCheck;
+    private boolean useProxy = true;
 
     private Button alwaysPromptCheck;
 
-    private boolean disableJms = false;
+    private String dataRefreshMethod;
 
     private boolean jmsGood = false;
 
     private boolean alwaysPrompt;
 
-    private Label jmsErrorLabel;
-
     private IConnectivityCallback jmsCallback = new JmsCallback();
 
-    private TextOrCombo proxySrv;
-
     private String proxyAddress;
 
+    private Button autoPullBtn;
+
+    private Button timedPollBtn;
+
+    private final String dataRefreshTooltip = "Automatic Push: Data pushed as soon as available\n"
+            + "Timed Poll: Poll for new data at scheduled intervals";
+
+    private final String unableConnectJMS = "\n\nUnable to connect to JMS: Automatic Push disabled";
+
+    private Group dataRefreshGroup;
+
     public ThinClientConnectivityDialog(boolean checkAlertViz) {
         super(checkAlertViz, "Thin Client Connectivity Preferences");
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
-        useProxy = store
-                .getBoolean(ThinClientPreferenceConstants.P_USE_PROXIES);
-        disableJms = store
-                .getBoolean(ThinClientPreferenceConstants.P_DISABLE_JMS);
+        dataRefreshMethod = store
+                .getString(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD);
         proxyAddress = store
                 .getString(ThinClientPreferenceConstants.P_PROXY_ADDRESS);
     }
 
+    @Override
+    protected String[] getServerOptions() {
+        IPreferenceStore thinPrefs = Activator.getDefault()
+                .getPreferenceStore();
+        return ServerRemembrance.getServerOptions(thinPrefs,
+                ThinClientPreferenceConstants.P_PROXY_SERVER_OPTIONS);
+    }
+
     @Override
     protected void createTextBoxes(Composite textBoxComp) {
         super.createTextBoxes(textBoxComp);
 
-        Label label = new Label(textBoxComp, SWT.RIGHT);
-        label.setText("Use Proxy Server:");
-        GridData gd = new GridData(SWT.RIGHT, SWT.CENTER, false, true);
-        gd.horizontalIndent = 20;
-        label.setLayoutData(gd);
+        // Reuse the localization stuff for proxy
+        localizationLabel.setText("Proxy Server:");
+        localizationSrv.setText(proxyAddress == null ? "" : proxyAddress);
 
-        Composite proxyComp = new Composite(textBoxComp, SWT.NONE);
+        new Label(textBoxComp, SWT.NONE);
+        Composite drComp = new Composite(textBoxComp, SWT.NONE);
         GridLayout gl = new GridLayout(2, false);
         gl.marginHeight = 0;
         gl.marginWidth = 0;
-        proxyComp.setLayout(gl);
-        gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
-        proxyComp.setLayoutData(gd);
+        drComp.setLayout(gl);
+        GridData gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
+        drComp.setLayoutData(gd);
 
-        useProxyCheck = new Button(proxyComp, SWT.CHECK | SWT.LEFT);
-        useProxyCheck.setSelection(useProxy);
-        useProxyCheck.addSelectionListener(new SelectionAdapter() {
+        dataRefreshGroup = new Group(drComp, SWT.BORDER_SOLID);
+        dataRefreshGroup.setText("Data Refresh:");
+        gl = new GridLayout(2, true);
+        gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL
+                | GridData.GRAB_HORIZONTAL);
+        dataRefreshGroup.setLayout(gl);
+        dataRefreshGroup.setLayoutData(gd);
+        autoPullBtn = new Button(dataRefreshGroup, SWT.RADIO);
+        autoPullBtn.setText("Automatic Push");
+        if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH
+                .equals(dataRefreshMethod)) {
+            autoPullBtn.setSelection(true);
+        }
+        timedPollBtn = new Button(dataRefreshGroup, SWT.RADIO);
+        timedPollBtn.setText("Timed Poll");
+        if (ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL
+                .equals(dataRefreshMethod)) {
+            timedPollBtn.setSelection(true);
+        }
+        timedPollBtn.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
-                updateProxyEnabled();
-            }
-        });
-        useProxyCheck
-                .setToolTipText("Connect to a remote proxy server configured to support thin clients");
-
-        IPreferenceStore thinPrefs = Activator.getDefault()
-                .getPreferenceStore();
-        String[] proxyOptions = ServerRemembrance.getServerOptions(thinPrefs,
-                ThinClientPreferenceConstants.P_PROXY_SERVER_OPTIONS);
-        proxySrv = new TextOrCombo(proxyComp, SWT.BORDER, proxyOptions);
-        gd = new GridData(SWT.FILL, SWT.CENTER, true, true);
-        proxySrv.widget.setLayoutData(gd);
-        proxySrv.setText(proxyAddress == null ? "" : proxyAddress);
-        proxySrv.widget.setBackground(getTextColor(servicesGood && pypiesGood));
-        proxySrv.addSelectionListener(new SelectionListener() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                // user clicked an option
-                validate();
-            }
-
-            @Override
-            public void widgetDefaultSelected(SelectionEvent e) {
-                // user hit Enter
-                performOk();
-            }
-        });
-
-        new Label(textBoxComp, SWT.NONE);
-
-        Composite jmsComp = new Composite(textBoxComp, SWT.NONE);
-        gl = new GridLayout(2, false);
-        gl.marginHeight = 0;
-        gl.marginWidth = 0;
-        jmsComp.setLayout(gl);
-
-        disableJmsCheck = new Button(jmsComp, SWT.CHECK | SWT.LEFT);
-        disableJmsCheck.setSelection(disableJms);
-        disableJmsCheck.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                disableJms = disableJmsCheck.getSelection();
+                if (timedPollBtn.getSelection()) {
+                    dataRefreshMethod = ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_POLL;
+                } else {
+                    dataRefreshMethod = ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD_PUSH;
+                }
                 validate();
             }
         });
-        disableJmsCheck.setText("Disable JMS");
-        jmsErrorLabel = new Label(jmsComp, SWT.LEFT);
-        jmsErrorLabel.setText("Error connecting to JMS");
-        jmsErrorLabel.setForeground(display.getSystemColor(SWT.COLOR_RED));
-        jmsErrorLabel.setVisible(true);
+        dataRefreshGroup.setToolTipText(dataRefreshTooltip);
         new Label(textBoxComp, SWT.NONE);
 
         alwaysPrompt = LocalizationManager
@@ -252,16 +235,14 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
             }
 
         });
-
-        updateProxyEnabled();
     }
 
     @Override
     protected void applySettings() {
         IPersistentPreferenceStore thinStore = Activator.getDefault()
                 .getPreferenceStore();
-        thinStore.setValue(ThinClientPreferenceConstants.P_DISABLE_JMS,
-                disableJms);
+        thinStore.setValue(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD,
+                dataRefreshMethod);
         thinStore.setValue(ThinClientPreferenceConstants.P_USE_PROXIES,
                 useProxy);
 
@@ -271,30 +252,26 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
                 LocalizationConstants.P_LOCALIZATION_PROMPT_ON_STARTUP,
                 alwaysPrompt);
 
-        if (useProxy) {
-            thinStore.setValue(ThinClientPreferenceConstants.P_PROXY_ADDRESS,
-                    proxyAddress);
-            String proxyServerOptions = ServerRemembrance.formatServerOptions(
-                    proxyAddress, thinStore,
-                    ThinClientPreferenceConstants.P_PROXY_SERVER_OPTIONS);
-            thinStore.setValue(
-                    ThinClientPreferenceConstants.P_PROXY_SERVER_OPTIONS,
-                    proxyServerOptions);
+        thinStore.setValue(ThinClientPreferenceConstants.P_PROXY_ADDRESS,
+                proxyAddress);
+        String proxyServerOptions = ServerRemembrance.formatServerOptions(
+                proxyAddress, thinStore,
+                ThinClientPreferenceConstants.P_PROXY_SERVER_OPTIONS);
+        thinStore.setValue(
+                ThinClientPreferenceConstants.P_PROXY_SERVER_OPTIONS,
+                proxyServerOptions);
 
-            if (getAlertVizServer() != null) {
-                localStore.setValue(LocalizationConstants.P_ALERT_SERVER,
-                        getAlertVizServer());
-            }
-            LocalizationManager.getInstance().setCurrentSite(getSite());
+        if (getAlertVizServer() != null) {
+            localStore.setValue(LocalizationConstants.P_ALERT_SERVER,
+                    getAlertVizServer());
+        }
+        LocalizationManager.getInstance().setCurrentSite(getSite());
 
-            try {
-                localStore.save();
-            } catch (IOException e) {
-                statusHandler.handle(Priority.SIGNIFICANT,
-                        "Unable to persist localization preference store", e);
-            }
-        } else {
-            super.applySettings();
+        try {
+            localStore.save();
+        } catch (IOException e) {
+            statusHandler.handle(Priority.SIGNIFICANT,
+                    "Unable to persist localization preference store", e);
         }
 
         /*
@@ -314,51 +291,50 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
 
     @Override
     public boolean validate() {
-        if (!useProxy) {
-            boolean superResult = super.validate();
-            validateJms(superResult);
-            return superResult && jmsGood;
-        }
 
         status = null;
         details = null;
 
-        // validate proxy
-        if (proxySrv != null && !proxySrv.widget.isDisposed()
-                && proxySrv.widget.isEnabled()) {
-            proxyAddress = proxySrv.getText();
-        }
-        if (proxyAddress != null && proxyAddress.length() > 0) {
-            validateServices();
-            validatePypies();
-        } else {
-            status = "Please enter a thin client proxy server address";
-        }
-        if (proxySrv != null && !proxySrv.widget.isDisposed()) {
-            proxySrv.widget.setBackground(getTextColor(servicesGood
-                    && pypiesGood));
-        }
+        // If we don't have a localizationSrv yet, fail validation gracefully.
+        if (localizationSrv != null) {
+            // validate proxy
+            proxyAddress = localizationSrv.getText();
 
-        validateJms(servicesGood);
-
-        // validate site
-        if (siteText != null && !siteText.isDisposed()) {
-            super.setSite(siteText.getText());
-        }
-        super.validateSite();
-        if (siteText != null && !siteText.isDisposed()) {
-            siteText.setBackground(getTextColor(isSiteGood()));
-        }
-
-        // validate alertviz
-        // apparently alertvizserver == null means it's alertviz itself
-        if (alertVizServer != null) {
-            if (alertVizText != null && !alertVizText.isDisposed()) {
-                setAlertVizServer(alertVizText.getText());
+            if (proxyAddress != null && proxyAddress.length() > 0) {
+                validateServices();
+                validatePypies();
+            } else {
+                servicesGood = false;
+                pypiesGood = false;
+                status = "Please enter a thin client proxy server address";
             }
-            super.validateAlertviz();
-            if (alertVizText != null && !alertVizText.isDisposed()) {
-                alertVizText.setBackground(getTextColor(isAlertVizGood()));
+
+            if (localizationSrv != null && !localizationSrv.widget.isDisposed()) {
+                localizationSrv.widget.setBackground(getTextColor(servicesGood
+                        && pypiesGood));
+            }
+
+            validateJms(servicesGood);
+
+            // validate site
+            if (siteText != null && !siteText.isDisposed()) {
+                super.setSite(siteText.getText());
+            }
+            super.validateSite();
+            if (siteText != null && !siteText.isDisposed()) {
+                siteText.setBackground(getTextColor(isSiteGood()));
+            }
+
+            // validate alertviz
+            // apparently alertvizserver == null means it's alertviz itself
+            if (alertVizServer != null) {
+                if (alertVizText != null && !alertVizText.isDisposed()) {
+                    setAlertVizServer(alertVizText.getText());
+                }
+                super.validateAlertviz();
+                if (alertVizText != null && !alertVizText.isDisposed()) {
+                    alertVizText.setBackground(getTextColor(isAlertVizGood()));
+                }
             }
         }
 
@@ -381,22 +357,6 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
                 pypiesCallback);
     }
 
-    private void updateProxyEnabled() {
-        useProxy = useProxyCheck.getSelection();
-        proxySrv.widget.setEnabled(useProxy);
-        super.setLocalizationEnabled(!useProxy);
-        if (useProxy) {
-            if (localizationSrv != null && !localizationSrv.widget.isDisposed()) {
-                localizationSrv.widget.setBackground(getTextColor(true));
-            }
-        } else {
-            if (proxySrv != null && !proxySrv.widget.isDisposed()) {
-                proxySrv.widget.setBackground(getTextColor(true));
-            }
-        }
-        validate();
-    }
-
     /**
      * Validates that a connection to JMS works.
      * 
@@ -404,36 +364,43 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
      *            if we've successfully connected to edex
      */
     private void validateJms(boolean hasEdexConnection) {
-        // only check Jms if it's enabled and we can connect to the services
-        if (!disableJms) {
-            if (hasEdexConnection) {
-                try {
-                    String server = useProxy ? ThinClientUriUtil
-                            .getServicesAddress(proxyAddress)
-                            : getLocalization();
-                    GetServersResponse response = ConnectivityManager
-                            .checkLocalizationServer(server, false);
-                    ConnectivityManager.checkJmsServer(
-                            response.getJmsConnectionString(), jmsCallback);
-                } catch (VizException e) {
-                    if (status == null) {
-                        status = "Error connecting to JMS";
-                    }
-                    appendDetails(buildDetails(new ConnectivityResult(false,
-                            null, e)));
-                    jmsGood = false;
-                }
-            } else {
-                // JMS can't be good if we're not connected to edex cause
-                // then we don't even know where to connect to
+        if (hasEdexConnection) {
+            try {
+                String server = ThinClientUriUtil
+                        .getServicesAddress(proxyAddress);
+                GetServersResponse response = ConnectivityManager
+                        .checkLocalizationServer(server, false);
+                ConnectivityManager.checkJmsServer(
+                        response.getJmsConnectionString(), jmsCallback);
+            } catch (VizException e) {
+                appendDetails(buildDetails(new ConnectivityResult(false, null,
+                        e)));
                 jmsGood = false;
             }
-        }
-        jmsGood = (jmsGood || disableJms);
-        if (jmsErrorLabel != null && !jmsErrorLabel.isDisposed()) {
-            jmsErrorLabel.setVisible(!jmsGood);
+        } else {
+            // JMS can't be good if we're not connected to edex cause
+            // then we don't even know where to connect to
+            jmsGood = false;
         }
 
+        // If display items are not disposed, update them as needed.
+        if (!autoPullBtn.isDisposed() && !timedPollBtn.isDisposed()
+                && !dataRefreshGroup.isDisposed()) {
+            if (jmsGood && !autoPullBtn.isEnabled()) {
+                autoPullBtn.setEnabled(true);
+                autoPullBtn.setSelection(true);
+                timedPollBtn.setSelection(false);
+                dataRefreshGroup.setToolTipText(dataRefreshTooltip);
+            } else if (!jmsGood && autoPullBtn.isEnabled()) {
+                autoPullBtn.setEnabled(false);
+                autoPullBtn.setSelection(false);
+                timedPollBtn.setSelection(true);
+                dataRefreshGroup.setToolTipText(dataRefreshTooltip
+                        + unableConnectJMS);
+                // Since JMS is now disabled, we're in a good state.
+                jmsGood = true;
+            }
+        }
     }
 
 }
diff --git a/cave/com.raytheon.uf.viz.vaa/src/com/raytheon/uf/viz/vaa/rsc/VAAResource.java b/cave/com.raytheon.uf.viz.vaa/src/com/raytheon/uf/viz/vaa/rsc/VAAResource.java
index e7dee65e28..5030f8e976 100644
--- a/cave/com.raytheon.uf.viz.vaa/src/com/raytheon/uf/viz/vaa/rsc/VAAResource.java
+++ b/cave/com.raytheon.uf.viz.vaa/src/com/raytheon/uf/viz/vaa/rsc/VAAResource.java
@@ -72,6 +72,7 @@ import com.vividsolutions.jts.geom.Polygon;
  * Nov 23, 2009  3268     jsanchez    Initial creation
  * Jun 06, 2014  2061     bsteffen    Remove unneccessary imports
  * Jul 29, 2014  3465     mapeters    Updated deprecated drawString() calls.
+ * Nov 05, 2015  5070     randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -80,7 +81,8 @@ import com.vividsolutions.jts.geom.Polygon;
  */
 public class VAAResource extends
         AbstractVizResource<VAAResourceData, MapDescriptor> {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(VAAResource.class);
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(VAAResource.class);
 
     protected DataTime displayedDataTime;
 
@@ -345,7 +347,7 @@ public class VAAResource extends
         int mag = getCapability(MagnificationCapability.class)
                 .getMagnification().intValue();
         this.plotWidth = actualPlotWidth * mag;
-        this.font = target.initializeFont("Monospace", 11,
+        this.font = target.initializeFont("Monospace", 9,
                 new Style[] { Style.ITALIC });
         this.symbolLoader = new SymbolLoader();
     }
diff --git a/cave/com.raytheon.uf.viz.vil/src/com/raytheon/uf/viz/vil/VILResource.java b/cave/com.raytheon.uf.viz.vil/src/com/raytheon/uf/viz/vil/VILResource.java
index df06568ab9..d145737625 100644
--- a/cave/com.raytheon.uf.viz.vil/src/com/raytheon/uf/viz/vil/VILResource.java
+++ b/cave/com.raytheon.uf.viz.vil/src/com/raytheon/uf/viz/vil/VILResource.java
@@ -64,12 +64,14 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 
  * <pre>
  * 
- *    SOFTWARE HISTORY
- *   
- *    Date         Ticket#     Engineer    Description
- *    ------------ ----------  ----------- --------------------------
- *    11Nov2009    2037        dhladky     Initial Creation.
- *    Mar  3, 2014 2804        mschenke    Set back up clipping pane
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * 11Nov2009    2037        dhladky     Initial Creation.
+ * Mar  3, 2014 2804        mschenke    Set back up clipping pane
+ * Nov 05, 2015 5070        randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author dhladky
@@ -200,7 +202,7 @@ public class VILResource extends
             this.displayedDataTime = paintProps.getDataTime();
 
             if (this.font == null) {
-                this.font = target.initializeFont("Dialog", 11, null);
+                this.font = target.initializeFont("Dialog", 9, null);
             }
 
             // Pull the record out
diff --git a/cave/com.raytheon.uf.viz.volumebrowser.dataplugin/src/com/raytheon/uf/viz/volumebrowser/dataplugin/AbstractInventoryDataCatalog.java b/cave/com.raytheon.uf.viz.volumebrowser.dataplugin/src/com/raytheon/uf/viz/volumebrowser/dataplugin/AbstractInventoryDataCatalog.java
index d7b4d43e60..0c50c09807 100644
--- a/cave/com.raytheon.uf.viz.volumebrowser.dataplugin/src/com/raytheon/uf/viz/volumebrowser/dataplugin/AbstractInventoryDataCatalog.java
+++ b/cave/com.raytheon.uf.viz.volumebrowser.dataplugin/src/com/raytheon/uf/viz/volumebrowser/dataplugin/AbstractInventoryDataCatalog.java
@@ -30,13 +30,7 @@ import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-
 import com.raytheon.uf.common.dataplugin.level.Level;
-import com.raytheon.uf.common.dataplugin.level.LevelFactory;
 import com.raytheon.uf.common.dataplugin.level.mapping.LevelMapping;
 import com.raytheon.uf.common.dataplugin.level.mapping.LevelMappingFactory;
 import com.raytheon.uf.common.dataplugin.level.util.LevelUtilities;
@@ -64,15 +58,17 @@ import com.raytheon.viz.volumebrowser.vbui.VolumeBrowserAction;
  * <pre>
  * 
  * SOFTWARE HISTORY
+ * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
- * Apr 14, 2010           bsteffen  Initial creation
+ * ------------- -------- --------- --------------------------------------------
+ * Apr 14, 2010  5021     bsteffen  Initial creation
  * Jul 25, 2013  2112     bsteffen  Fix volume browser sounding errors.
- * Jan 30, 2014  2725     ekladstr  updated exception handling during move of derived
- *                                  parameters to common
+ * Jan 30, 2014  2725     ekladstr  updated exception handling during move of
+ *                                  derived parameters to common
  * Sep 09, 2014  3356     njensen   Remove CommunicationException
  * May 18, 2015  4412     bsteffen  Use all level mappings for plane names
  * Aug 03, 2015  3861     bsteffen  Move resource creation to ProductCreators
+ * Feb 01, 2016  5275     bsteffen  Extract InventoryUpdateJob
  * 
  * </pre>
  * 
@@ -84,6 +80,8 @@ public abstract class AbstractInventoryDataCatalog extends AbstractDataCatalog {
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(AbstractInventoryDataCatalog.class);
 
+    public static final String SOUNDING_PARAMETER = "Snd";
+
     protected static final String[] soundingParams = { "T", "GH", "uW", "vW",
             "DpT" };
 
@@ -92,121 +90,135 @@ public abstract class AbstractInventoryDataCatalog extends AbstractDataCatalog {
                 .getInventory(getDefaultPlugin());
     }
 
+    /**
+     * Check if there are any plugins supported by this catalog which are
+     * supported by the {@link ProductCreatorManager} for the provided
+     * {@link ResourceType}.
+     */
+    private boolean supportedResourceType(ResourceType resourceType) {
+        ProductCreatorManager theMan = ProductCreatorManager.getInstance();
+        for (String pluginName : getPlugins()) {
+            if (theMan.getCreator(pluginName, resourceType) != null) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public void getAvailableData(AvailableDataRequest request) {
         ResourceType resourceType = VolumeBrowserAction.getVolumeBrowserDlg()
                 .getDialogSettings().getViewSelection().getResourceType();
-        boolean load = false;
-        for (String pluginName : getPlugins()) {
-            if (ProductCreatorManager.getInstance().getCreator(pluginName,
-                    resourceType) != null) {
-                load = true;
-                break;
-            }
-        }
-        if (!load) {
+        if (!supportedResourceType(resourceType)) {
             return;
         }
-        String[] selectedSources = request.getSelectedSources();
-        String[] selectedFields = request.getSelectedFields();
-        String[] selectedPlanes = request.getSelectedPlanes();
-        boolean sourcesEmpty = selectedSources == null
-                || selectedSources.length == 0;
-        boolean fieldsEmpty = selectedFields == null
-                || selectedFields.length == 0;
-        // TODO find some way to filter sounding to soundingParams
-        request.addAvailableField("Snd");
         final AbstractInventory inventory = getInventory();
         if (inventory == null) {
             return;
         }
-        final Collection<String> sources3D = get3DSources(selectedPlanes);
-        Collection<String> sourcesToProcess = null;
-        Collection<String> sourcesToProcessFiltered3D = null;
-        if (!sourcesEmpty) {
-            sourcesToProcessFiltered3D = sourcesToProcess = new ArrayList<String>(
-                    Arrays.asList(selectedSources));
-            if (sources3D != null) {
-                sourcesToProcessFiltered3D = new ArrayList<String>(
-                        sourcesToProcess);
-                sourcesToProcessFiltered3D.retainAll(sources3D);
-            }
+        MenuItemManager menuManager = MenuItemManager.getInstance();
+
+        boolean isSounding = false;
+
+        InventoryUpdateJob job = new InventoryUpdateJob(inventory);
+
+        /* Get all possible sources */
+        job.setAllPossibleSources(menuManager
+                .getAvailableKeys(DataSelection.SOURCES));
+
+        /*
+         * Get all possible parameters --- must transform Snd into other
+         * parameters
+         */
+        Set<String> possibleParameters = menuManager
+                .getAvailableKeys(DataSelection.FIELDS);
+        if (possibleParameters.contains(SOUNDING_PARAMETER)) {
+            isSounding = true;
+            possibleParameters = new HashSet<>(possibleParameters);
+            possibleParameters.remove(SOUNDING_PARAMETER);
+            possibleParameters.addAll(Arrays.asList(soundingParams));
         }
-        Collection<String> paramsToProcess = null;
-        if (!fieldsEmpty) {
-            paramsToProcess = Arrays.asList(selectedFields);
-            if (paramsToProcess.contains("Snd")) {
-                paramsToProcess = new ArrayList<String>(paramsToProcess);
-                paramsToProcess.addAll(Arrays.asList(soundingParams));
+        job.setAllPossibleParameters(possibleParameters);
+
+        /*
+         * Get all possible levels --- must perform level mappings and take into
+         * account when planes contains points and lines, luckily getLevels does
+         * all that for us.
+         */
+        Set<String> possiblePlanes = menuManager
+                .getAvailableKeys(DataSelection.PLANES);
+
+        Set<Level> possibleLevels = getLevels(
+                possiblePlanes.toArray(new String[0]), null);
+        job.setAllPossibleLevels(possibleLevels);
+
+        /* Get the selected sources */
+        String[] selectedSources = request.getSelectedSources();
+        List<String> selectedSourcesAsList = null;
+        if(selectedSources != null && selectedSources.length > 0){
+            selectedSourcesAsList = Arrays.asList(selectedSources);
+            job.setSelectedSources(selectedSourcesAsList);
+        }
+        
+        /*
+         * Get the selected parameters --- must transform Snd into other
+         * parameters
+         */
+        String[] selectedFields = request.getSelectedFields();
+        if(selectedFields != null && selectedFields.length > 0){
+            Collection<String> selectedParameters = Arrays.asList(selectedFields);
+            if(selectedParameters.contains(SOUNDING_PARAMETER)){
+                selectedParameters = new HashSet<>(selectedParameters);
+                selectedParameters.remove(SOUNDING_PARAMETER);
+                selectedParameters.addAll(Arrays.asList(soundingParams));
             }
+            job.setSelectedParameters(selectedParameters);
+        }
+        
+        /*
+         * Get the selected levels --- must perform level mappings and take into
+         * account when planes contains points and lines, luckily getLevels does
+         * all that for us.
+         */
+        String[] selectedPlanes = request.getSelectedPlanes();
+        if (selectedPlanes != null && selectedPlanes.length > 0) {
+            Set<Level> selectedLevels = getLevels(selectedPlanes, null);
+            job.setSelectedLevels(selectedLevels);
         }
 
-        final Collection<Level> levelsToProcess = getLevels(selectedPlanes,
-                null);
-        final Collection<Level> levelsToProcessFiltered3D = getLevels(
-                selectedPlanes, selectedSources);
-        if (request.isCanceled()) {
-            return;
+        if (selectedPlanes != null && selectedPlanes.length > 0) {
+            job.setPlaneFilteredSources(get3DSources(selectedPlanes));
         }
+
+        job.schedule();
+
         Collection<? extends Level> levels3D = get3DLevels();
 
-        // Make final versions of everything to pass into the thread.
-        final Collection<String> fSourcesToProcess = sourcesToProcess;
-        final Collection<String> fSourcesToProcessFiltered3D = sourcesToProcessFiltered3D;
-        final Collection<String> fParamsToProcess = paramsToProcess;
-
-        // The result queues.
-        final BlockingQueue<String> sourceQueue = new LinkedBlockingQueue<String>();
-        final BlockingQueue<String> fieldQueue = new LinkedBlockingQueue<String>();
-        final BlockingQueue<String> levelQueue = new LinkedBlockingQueue<String>();
-        // Query the inventory in a new Thread, this allows us to update the UI
-        // as things are added to the queue, and also allows us to interupt this
-        // thread if the availableDataRequest is canceled.
-        Job inventoryJob = new Job("Loading available inventory") {
-
-            @Override
-            protected IStatus run(IProgressMonitor monitor) {
-                try {
-                    inventory.checkSources(sources3D, fParamsToProcess,
-                            levelsToProcess, sourceQueue);
-                    inventory.checkParameters(fSourcesToProcessFiltered3D,
-                            null, levelsToProcessFiltered3D, false, fieldQueue);
-                    inventory.checkLevels(fSourcesToProcess, fParamsToProcess,
-                            null, levelQueue);
-                } catch (InterruptedException e) {
-                    // no-op
-                }
-                return Status.OK_STATUS;
-            }
-
-        };
-        inventoryJob.setSystem(true);
-        inventoryJob.schedule();
-
-        while (inventoryJob.getResult() == null || !sourceQueue.isEmpty()
-                || !fieldQueue.isEmpty() || !levelQueue.isEmpty()) {
-            String source = sourceQueue.poll();
+        while (!job.isDone()) {
+            String source = job.pollSource();
             while (source != null) {
                 request.addAvailableSource(source);
-                source = sourceQueue.poll();
+                source = job.pollSource();
             }
-            String field = fieldQueue.poll();
+            String field = job.pollParameter();
             while (field != null) {
+                if (isSounding) {
+                    request.addAvailableField(SOUNDING_PARAMETER);
+                }
                 request.addAvailableField(field);
-                field = fieldQueue.poll();
+                field = job.pollParameter();
             }
-            String levelStr = levelQueue.poll();
-            while (levelStr != null) {
-                // Convert levels into planes.
-                Level level = LevelFactory.getInstance().getLevel(levelStr);
-
+            Level level = job.pollLevel();
+            while (level != null) {
+                /* Convert levels into planes. */
                 if (levels3D.contains(level)) {
-                    for (String plane : get3DPlanes(sourcesToProcess)) {
+                    for (String plane : get3DPlanes(selectedSourcesAsList)) {
                         request.addAvailablePlane(plane);
                     }
                 }
-                request.addAvailablePlane("spatial-"
-                        + level.getMasterLevel().getName());
+                String spatialPlane = "spatial-"
+                        + level.getMasterLevel().getName();
+                request.addAvailablePlane(spatialPlane);
                 Collection<LevelMapping> lms = LevelMappingFactory.getInstance(
                         LevelMappingFactory.VOLUMEBROWSER_LEVEL_MAPPING_FILE)
                         .getAllLevelMappingsForLevel(level);
@@ -216,14 +228,11 @@ public abstract class AbstractInventoryDataCatalog extends AbstractDataCatalog {
                         request.addAvailablePlane(lm.getKey());
                     }
                 }
-                levelStr = levelQueue.poll();
+                level = job.pollLevel();
 
             }
             if (request.isCanceled()) {
-                Thread thread = inventoryJob.getThread();
-                if (thread != null) {
-                    thread.interrupt();
-                }
+                job.interrupt();
                 break;
             }
             try {
@@ -234,7 +243,7 @@ public abstract class AbstractInventoryDataCatalog extends AbstractDataCatalog {
         }
     }
 
-    // GIven a list of planes, return the sources that are valid for any point
+    // Given a list of planes, return the sources that are valid for any point
     // or line planes
     protected Collection<String> get3DSources(String[] planes) {
         return null;
diff --git a/cave/com.raytheon.uf.viz.volumebrowser.dataplugin/src/com/raytheon/uf/viz/volumebrowser/dataplugin/InventoryUpdateJob.java b/cave/com.raytheon.uf.viz.volumebrowser.dataplugin/src/com/raytheon/uf/viz/volumebrowser/dataplugin/InventoryUpdateJob.java
new file mode 100644
index 0000000000..e65717a96d
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.volumebrowser.dataplugin/src/com/raytheon/uf/viz/volumebrowser/dataplugin/InventoryUpdateJob.java
@@ -0,0 +1,249 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.viz.volumebrowser.dataplugin;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+
+import com.raytheon.uf.common.dataplugin.level.Level;
+import com.raytheon.uf.common.dataplugin.level.LevelFactory;
+import com.raytheon.uf.common.derivparam.inv.AbstractInventory;
+
+/**
+ * 
+ * Job for querying the {@link AbstractInventory} to determine what possible
+ * Sources, Parameters, and Levels have available data. The full set of all
+ * available sources, parameters, and levels must be provided. If anything has
+ * already been selected then it should be provided to narrow down the possible
+ * results. If no selection is provided then all items will be considered.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- -----------------
+ * Feb 01, 2016  5275     bsteffen  Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bsteffen
+ * @version 1.0
+ */
+final class InventoryUpdateJob extends Job {
+
+    private final LevelFactory levelFactory = LevelFactory.getInstance();
+
+    private final AbstractInventory inventory;
+
+    private final BlockingQueue<String> sourceQueue = new LinkedBlockingQueue<String>();
+
+    private final BlockingQueue<String> parameterQueue = new LinkedBlockingQueue<String>();
+
+    private final BlockingQueue<String> levelQueue = new LinkedBlockingQueue<String>();
+
+    private Collection<String> allPossibleSources;
+
+    private Collection<String> selectedSources;
+
+    private Collection<String> planeFilteredSources;
+
+    private Collection<String> allPossibleParameters;
+
+    private Collection<String> selectedParameters;
+
+    private Collection<Level> allPossibleLevels;
+
+    private Collection<Level> selectedLevels;
+
+    public InventoryUpdateJob(AbstractInventory inventory) {
+        super("Loading available inventory");
+        setSystem(true);
+        this.inventory = inventory;
+    }
+
+    /**
+     * Set all possible sources, this must be called before the job is
+     * scheduled.
+     */
+    public void setAllPossibleSources(Collection<String> allPossibleSources) {
+        this.allPossibleSources = allPossibleSources;
+    }
+
+    /**
+     * Set the selected sources, if this is not called then all possible sources
+     * will be used when determining available parameters and levels.
+     */
+    public void setSelectedSources(Collection<String> selectedSources) {
+        this.selectedSources = selectedSources;
+    }
+
+    /**
+     * When the volume browser is in a mode where the planes menus allow the
+     * user to select a point or line instead of a level then this job needs to
+     * know what sources are available for the selected point or line. For
+     * example if a point is in Hawaii then sources only over Alsaka should not
+     * be in this set. This will be used when determining what sources or
+     * parameters are available, this is not necessary when the planes menu in
+     * the volume browser contain levels.
+     */
+    public void setPlaneFilteredSources(Collection<String> planeFilteredSources) {
+        this.planeFilteredSources = planeFilteredSources;
+    }
+
+    /**
+     * Set all possible parameters, this must be called before the job is
+     * scheduled.
+     */
+    public void setAllPossibleParameters(
+            Collection<String> allPossibleParameters) {
+        this.allPossibleParameters = allPossibleParameters;
+    }
+
+    /**
+     * Set the selected parameters, if this is not called then all possible
+     * parameters will be used when determining available sources and levels.
+     */
+    public void setSelectedParameters(Collection<String> selectedParameters) {
+        this.selectedParameters = selectedParameters;
+    }
+
+    /**
+     * Set all possible levels, this must be called before the job is scheduled.
+     */
+    public void setAllPossibleLevels(Collection<Level> allPossibleLevels) {
+        this.allPossibleLevels = allPossibleLevels;
+    }
+
+    /**
+     * Set the selected levels, if this is not called then all possible levels
+     * will be used when determining available sources and parameters.
+     */
+    public void setSelectedLevels(Collection<Level> selectedLevels) {
+        this.selectedLevels = selectedLevels;
+    }
+
+    @Override
+    protected IStatus run(IProgressMonitor monitor) {
+        if (selectedSources == null) {
+            selectedSources = allPossibleSources;
+        }
+        if (selectedParameters == null) {
+            selectedParameters = allPossibleParameters;
+        }
+        if (selectedLevels == null) {
+            selectedLevels = allPossibleLevels;
+        }
+        if (planeFilteredSources == null) {
+            planeFilteredSources = allPossibleSources;
+        }
+
+        Collection<String> planeFilteredSelectedSources = new HashSet<>(
+                selectedSources);
+        planeFilteredSelectedSources.retainAll(planeFilteredSources);
+
+        /*
+         * The query methods on the inventory will modify the input lists so
+         * make a copy since the original might be in use elsewhere.
+         */
+        planeFilteredSources = new LinkedList<>(planeFilteredSources);
+        allPossibleParameters = new LinkedList<>(allPossibleParameters);
+        allPossibleLevels = new LinkedList<>(allPossibleLevels);
+
+        try {
+            inventory.checkSources(planeFilteredSources, selectedParameters,
+                    selectedLevels, sourceQueue);
+            if (monitor.isCanceled()) {
+                return Status.CANCEL_STATUS;
+            }
+            inventory.checkParameters(planeFilteredSelectedSources,
+                    allPossibleParameters, selectedLevels, false,
+                    parameterQueue);
+            if (monitor.isCanceled()) {
+                return Status.CANCEL_STATUS;
+            }
+            inventory.checkLevels(selectedSources, selectedParameters,
+                    allPossibleLevels, levelQueue);
+        } catch (InterruptedException e) {
+            // no-op
+        }
+        return Status.OK_STATUS;
+    }
+
+    /**
+     * Attempt to interrupt the current query and cancel the job.
+     */
+    public void interrupt() {
+        cancel();
+        Thread thread = getThread();
+        if (thread != null) {
+            thread.interrupt();
+        }
+    }
+
+    /**
+     * @return true when all queries are complete and all the results have been
+     *         read.
+     */
+    public boolean isDone() {
+        return getResult() != null && sourceQueue.isEmpty()
+                && parameterQueue.isEmpty() && levelQueue.isEmpty();
+    }
+
+    /**
+     * @return a single available source or null if no new sources are
+     *         available. Even if null is returned it is possible for a new
+     *         source to be found as available if the job is still running.
+     */
+    public String pollSource() {
+        return sourceQueue.poll();
+    }
+
+    /**
+     * @return a single available parameter or null if no new parameters are
+     *         available. Even if null is returned it is possible for a new
+     *         parameter to be found as available if the job is still running.
+     */
+    public String pollParameter() {
+        return parameterQueue.poll();
+    }
+
+    /**
+     * @return a single available level or null if no new levels are available.
+     *         Even if null is returned it is possible for a new level to be
+     *         found as available if the job is still running.
+     */
+    public Level pollLevel() {
+        String levelStr = levelQueue.poll();
+        if (levelStr == null) {
+            return null;
+        } else {
+            return levelFactory.getLevel(levelStr);
+        }
+    }
+}
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/graph/CrossSectionGraph.java b/cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/graph/CrossSectionGraph.java
index 6113755d41..4c781a83c7 100644
--- a/cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/graph/CrossSectionGraph.java
+++ b/cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/graph/CrossSectionGraph.java
@@ -81,6 +81,7 @@ import com.vividsolutions.jts.geom.Point;
  * Aug 13, 2013  2262     dgilling  Use new wxmath hgt2pres method.
  * Jun 14, 2014  3242     njensen   Null safety checks
  * Oct 27, 2015  5051     bsteffen  Use cached topo
+ * Nov 05, 2015  5070     randerso  Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -191,7 +192,7 @@ public class CrossSectionGraph extends AbstractGraph {
     protected void paintTitles(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
         if (titleFont == null) {
-            titleFont = target.initializeFont((String) null, 11.0f,
+            titleFont = target.initializeFont((String) null, 9,
                     new IFont.Style[] { IFont.Style.BOLD });
         }
 
@@ -240,7 +241,7 @@ public class CrossSectionGraph extends AbstractGraph {
     protected void paintUnits(IGraphicsTarget target, PaintProperties paintProps)
             throws VizException {
         if (unitsFont == null) {
-            unitsFont = target.initializeFont((String) null, 10.0f,
+            unitsFont = target.initializeFont((String) null, 8,
                     new IFont.Style[] {});
         }
 
@@ -422,7 +423,7 @@ public class CrossSectionGraph extends AbstractGraph {
         case PRESSURE:
             Coordinate[] lineData;
             lineData = GeoUtil.splitLine(numPoints, line.getCoordinates());
-            
+
             heights = CachedTopoQuery.getInstance().getHeight(lineData);
 
             if (csDesc.getHeightScale().getHeightType() == LevelType.PRESSURE) {
diff --git a/cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionContourResource.java b/cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionContourResource.java
index 8fb74e0113..afb61cf336 100644
--- a/cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionContourResource.java
+++ b/cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionContourResource.java
@@ -75,6 +75,8 @@ import com.vividsolutions.jts.geom.Envelope;
  * Feb 17, 2009           njensen     Refactored to new rsc architecture
  * Feb 09, 2011  8244     bkowal      Enabled the magnification capability.
  * Feb 17, 2014  2661     bsteffen    Use only u,v for vectors.
+ * Nov 10, 2015  4689     kbisanz     Ensure corners are within grid when
+ *                                    zooming.
  * 
  * </pre>
  * 
@@ -236,14 +238,15 @@ public class CrossSectionContourResource extends AbstractCrossSectionResource
 
                 // This does several things at once.
                 // 1. Expand the grid area by 25% to avoid constant recontouring
-                // 2. Make sure the new area is not outside the data area
-                // 3. Round everything to ints
-                minCorner.x = Math.max((int) (minCorner.x - width / 4), 0);
-                minCorner.y = Math.min((int) (minCorner.y - height / 4) + 1,
-                        GRID_SIZE);
-                maxCorner.x = Math.min((int) (maxCorner.x + width / 4) + 1,
-                        GRID_SIZE);
-                maxCorner.y = Math.max((int) (maxCorner.y + height / 4), 0);
+                // 2. Round everything to ints
+                minCorner.x = (int) (minCorner.x - width / 4);
+                minCorner.y = (int) (minCorner.y - height / 4) + 1;
+                maxCorner.x = (int) (maxCorner.x + width / 4) + 1;
+                maxCorner.y = (int) (maxCorner.y + height / 4);
+
+                // Ensure corners are within the bounds of the grid.
+                constrainPoint(minCorner);
+                constrainPoint(maxCorner);
 
                 // Copy the data to a smaller array for the subgrid area.
                 List<float[]> newDataList = new ArrayList<float[]>();
@@ -318,6 +321,24 @@ public class CrossSectionContourResource extends AbstractCrossSectionResource
                 posLineStyle, negLineStyle, this.crossSectionFont, null);
     }
 
+    /**
+     * Ensure point is between 0 and grid size, updating values if necessary.
+     * 
+     * @param point
+     *            Point to check and update.
+     */
+    private void constrainPoint(DirectPosition2D point) {
+        // Ensure values are at least 0. Zooming near the edge of the
+        // screen may cause values less than 0.
+        point.x = Math.max(point.x, 0.0);
+        point.y = Math.max(point.y, 0.0);
+
+        // Ensure values are at most GRID_SIZE. Zooming near the edge
+        // of the screen may cause values greater than GRID_SIZE.
+        point.x = Math.min(point.x, GRID_SIZE);
+        point.y = Math.min(point.y, GRID_SIZE);
+    }
+
     @Override
     public void setDescriptor(CrossSectionDescriptor descriptor) {
         super.setDescriptor(descriptor);
diff --git a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/graph/TimeHeightGraph.java b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/graph/TimeHeightGraph.java
index dfa1a1afc9..1d34272865 100644
--- a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/graph/TimeHeightGraph.java
+++ b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/graph/TimeHeightGraph.java
@@ -52,8 +52,9 @@ import com.vividsolutions.jts.geom.Coordinate;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jul 03, 2010            bsteffen     Initial creation
- * Jun 18, 2014 3242       njensen      Null safety checks
+ * Jul 03, 2010            bsteffen    Initial creation
+ * Jun 18, 2014 3242       njensen     Null safety checks
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -167,7 +168,7 @@ public class TimeHeightGraph extends AbstractGraph {
     protected void paintTitles(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
         if (titleFont == null) {
-            titleFont = target.initializeFont((String) null, 11.0f,
+            titleFont = target.initializeFont((String) null, 9,
                     new IFont.Style[] { IFont.Style.BOLD });
         }
 
@@ -191,7 +192,7 @@ public class TimeHeightGraph extends AbstractGraph {
     protected void paintUnits(IGraphicsTarget target, PaintProperties paintProps)
             throws VizException {
         if (unitsFont == null) {
-            unitsFont = target.initializeFont((String) null, 10.0f,
+            unitsFont = target.initializeFont((String) null, 8,
                     new IFont.Style[] {});
         }
 
diff --git a/cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/graph/VarHeightGraph.java b/cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/graph/VarHeightGraph.java
index d66c827688..b600ebe65e 100644
--- a/cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/graph/VarHeightGraph.java
+++ b/cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/graph/VarHeightGraph.java
@@ -70,6 +70,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  *                                     graphResource in paintUnits() to prevent
  *                                     ConcurrentModification in a single thread.
  * Jul 21, 2015 4220       mapeters    Reset zoomHandler when constructing this graph
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -191,7 +192,7 @@ public class VarHeightGraph extends AbstractGraph {
     protected void paintTitles(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
         if (titleFont == null) {
-            titleFont = target.initializeFont((String) null, 11.0f,
+            titleFont = target.initializeFont((String) null, 9,
                     new IFont.Style[] { IFont.Style.BOLD });
         }
 
@@ -216,7 +217,7 @@ public class VarHeightGraph extends AbstractGraph {
     protected void paintUnits(IGraphicsTarget target, PaintProperties paintProps)
             throws VizException {
         if (unitsFont == null) {
-            unitsFont = target.initializeFont((String) null, 10.0f,
+            unitsFont = target.initializeFont((String) null, 8,
                     new IFont.Style[] {});
         }
         paintHeightUnits(target, paintProps);
diff --git a/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/VizXyEditor.java b/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/VizXyEditor.java
index 7103d6dad2..350bddba44 100644
--- a/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/VizXyEditor.java
+++ b/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/VizXyEditor.java
@@ -43,8 +43,9 @@ import com.raytheon.viz.ui.panes.PaneManager;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 08, 2009            mschenke     Initial creation
- * Mar 02, 2015  4204      njensen      Overrode setPartName()
+ * Oct 08, 2009            mschenke    Initial creation
+ * Mar 02, 2015  4204      njensen     Overrode setPartName()
+ * Oct 21, 2015  5023      njensen     Renamed getEditorName() to getDefaultName()
  * 
  * </pre>
  * 
@@ -86,25 +87,11 @@ public class VizXyEditor extends VizMultiPaneEditor implements
         return (XyPaneManager) editorInput.getPaneManager();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.ui.editor.AbstractEditor#getNewPaneManager()
-     */
     @Override
     protected PaneManager getNewPaneManager() {
         return new XyPaneManager();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.uf.viz.core.IRenderableDisplayChangedListener#
-     * renderableDisplayChanged(com.raytheon.uf.viz.core.IDisplayPane,
-     * com.raytheon.uf.viz.core.drawables.IRenderableDisplay,
-     * com.raytheon.uf.viz
-     * .core.IRenderableDisplayChangedListener.DisplayChangeType)
-     */
     @Override
     public void renderableDisplayChanged(IDisplayPane pane,
             IRenderableDisplay newRenderableDisplay, DisplayChangeType type) {
@@ -131,7 +118,7 @@ public class VizXyEditor extends VizMultiPaneEditor implements
     }
 
     @Override
-    protected String getEditorName() {
+    protected String getDefaultName() {
         if (name == null) {
             IEditorDescriptor desc = PlatformUI.getWorkbench()
                     .getEditorRegistry().findEditor(getSite().getId());
diff --git a/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/graph/AbstractGraph.java b/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/graph/AbstractGraph.java
index cae34a1cff..8938865693 100644
--- a/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/graph/AbstractGraph.java
+++ b/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/graph/AbstractGraph.java
@@ -69,6 +69,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  *                                     magnification settings.
  * Jun 18, 2014 3242       njensen     Replace deprecated calls
  * Jul 21, 2015 4220       mapeters    Added zoomHandler
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -471,12 +472,12 @@ public abstract class AbstractGraph implements IGraph {
         }
 
         if (unitsFont == null) {
-            unitsFont = target.initializeFont((String) null, 10.0f,
+            unitsFont = target.initializeFont((String) null, 8,
                     new IFont.Style[] {});
         }
 
         if (titleFont == null) {
-            titleFont = target.initializeFont((String) null, 11.0f,
+            titleFont = target.initializeFont((String) null, 9,
                     new IFont.Style[] { IFont.Style.BOLD });
         }
 
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.product/.classpath b/cave/com.raytheon.uf.viz.zoneselector/.classpath
similarity index 84%
rename from javaUtilities/com.raytheon.wes2bridge.utility.product/.classpath
rename to cave/com.raytheon.uf.viz.zoneselector/.classpath
index bc74aabe31..098194ca4b 100644
--- a/javaUtilities/com.raytheon.wes2bridge.utility.product/.classpath
+++ b/cave/com.raytheon.uf.viz.zoneselector/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.product/.project b/cave/com.raytheon.uf.viz.zoneselector/.project
similarity index 91%
rename from javaUtilities/com.raytheon.wes2bridge.utility.product/.project
rename to cave/com.raytheon.uf.viz.zoneselector/.project
index 9e98d23626..50b9164660 100644
--- a/javaUtilities/com.raytheon.wes2bridge.utility.product/.project
+++ b/cave/com.raytheon.uf.viz.zoneselector/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.raytheon.wes2bridge.utility.product</name>
+	<name>com.raytheon.uf.viz.zoneselector</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/cave/com.raytheon.uf.viz.zoneselector/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.zoneselector/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..3b33ad24c2
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.zoneselector/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Zoneselector
+Bundle-SymbolicName: com.raytheon.uf.viz.zoneselector;singleton:=true
+Bundle-Version: 1.16.0.qualifier
+Bundle-Vendor: RAYTHEON
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: org.osgi.framework;version="1.3.0"
+Bundle-ActivationPolicy: lazy
+Require-Bundle: com.raytheon.uf.common.status;bundle-version="1.15.0",
+ com.raytheon.uf.viz.core;bundle-version="1.15.2",
+ com.raytheon.uf.viz.core.maps;bundle-version="1.15.0",
+ com.raytheon.uf.viz.core.rsc;bundle-version="1.14.1",
+ com.raytheon.uf.common.geospatial;bundle-version="1.15.1",
+ com.raytheon.uf.common.dataplugin.gfe;bundle-version="1.15.0",
+ com.raytheon.viz.core;bundle-version="1.15.0",
+ com.raytheon.viz.ui;bundle-version="1.15.3",
+ org.apache.commons.lang3;bundle-version="3.4.0",
+ org.eclipse.core.runtime;bundle-version="3.8.0",
+ org.geotools;bundle-version="10.5.0"
+Export-Package: com.raytheon.uf.viz.zoneselector
diff --git a/cave/com.raytheon.uf.viz.zoneselector/build.properties b/cave/com.raytheon.uf.viz.zoneselector/build.properties
new file mode 100644
index 0000000000..e9863e281e
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.zoneselector/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml
diff --git a/cave/com.raytheon.uf.viz.zoneselector/plugin.xml b/cave/com.raytheon.uf.viz.zoneselector/plugin.xml
new file mode 100644
index 0000000000..a3e6ff984d
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.zoneselector/plugin.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.ui.themes">
+      <fontDefinition
+            categoryId="com.raytheon.uf.viz.core.theme"
+            id="com.raytheon.uf.viz.zoneSelectorFont"
+            label="Zone Selector Label Font"
+            value="DejaVu Sans Mono-bold-12">
+         <description>
+            The map label font for CAVE
+         </description>
+      </fontDefinition>
+   </extension>
+
+</plugin>
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/AbstractZoneSelector.java b/cave/com.raytheon.uf.viz.zoneselector/src/com/raytheon/uf/viz/zoneselector/AbstractZoneSelector.java
similarity index 91%
rename from cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/AbstractZoneSelector.java
rename to cave/com.raytheon.uf.viz.zoneselector/src/com/raytheon/uf/viz/zoneselector/AbstractZoneSelector.java
index 8825bc4890..653fc839ca 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/AbstractZoneSelector.java
+++ b/cave/com.raytheon.uf.viz.zoneselector/src/com/raytheon/uf/viz/zoneselector/AbstractZoneSelector.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.viz.gfe.ui.zoneselector;
+package com.raytheon.uf.viz.zoneselector;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -58,7 +58,6 @@ import com.raytheon.uf.viz.core.maps.MapStore;
 import com.raytheon.uf.viz.core.maps.display.MapRenderableDisplay;
 import com.raytheon.uf.viz.core.maps.rsc.DbMapResourceData;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
-import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector.IZoneSelectionListener;
 import com.raytheon.viz.ui.panes.PaneManager;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
@@ -75,7 +74,10 @@ import com.vividsolutions.jts.geom.Envelope;
  * Aug 23, 2011            randerso    Initial creation
  * May 30, 2013 #2028      randerso    Fixed date line issue with map display
  * Jan 07, 2014 #2662      randerso    Fixed limitZones (subDomainUGCs) support
- * Aug 31, 2015  4749      njensen     Set selectCB to null on dispose
+ * Aug 31, 2015 #4749      njensen     Set selectCB to null on dispose
+ * Feb 05, 2016 #5316      randerso    Moved into separate package.
+ *                                     Additonal changes to support use in GHG Monitor,
+ *                                     MakeHazard, and ZoneCombiner
  * 
  * </pre>
  * 
@@ -84,12 +86,16 @@ import com.vividsolutions.jts.geom.Envelope;
  */
 
 public abstract class AbstractZoneSelector extends PaneManager {
+    public static interface IZoneSelectionListener {
+        public void zoneSelected(String zone);
+    }
+
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(AbstractZoneSelector.class);
 
     protected static final int SCROLL_MAX = 10000;
 
-    private static final double ZOOM_LIMIT = 0.1;
+    private static final double ZOOM_LIMIT = 1.0 / 16.0;
 
     protected Composite parent;
 
@@ -99,6 +105,8 @@ public abstract class AbstractZoneSelector extends PaneManager {
 
     private LoopProperties loopProperties;
 
+    protected RGB noZoneColor;
+
     protected RGB backColor;
 
     protected List<String> mapNames;
@@ -133,6 +141,7 @@ public abstract class AbstractZoneSelector extends PaneManager {
      */
     public AbstractZoneSelector(Composite parent, GridLocation gloc,
             IZoneSelectionListener selectCB) {
+        super();
         this.parent = parent;
         this.gloc = gloc;
         this.selectCB = selectCB;
@@ -175,11 +184,11 @@ public abstract class AbstractZoneSelector extends PaneManager {
     // zone combinations and maps. If set to None, then all items in
     // the maps are allowed.
     public void setLimitZones(List<String> limitZones) {
-        if (this.limitZoneNames == null && limitZones == null) {
+        if ((this.limitZoneNames == null) && (limitZones == null)) {
             return;
         }
 
-        if (this.limitZoneNames != null
+        if ((this.limitZoneNames != null)
                 && this.limitZoneNames.equals(limitZones)) {
             return;
         }
@@ -249,8 +258,8 @@ public abstract class AbstractZoneSelector extends PaneManager {
         int mapWidth = gridRange.getSpan(0);
         int mapHeight = gridRange.getSpan(1);
 
-        int hSel = hBar.getSelection() + hBar.getThumb() / 2;
-        int vSel = vBar.getSelection() + vBar.getThumb() / 2;
+        int hSel = hBar.getSelection() + (hBar.getThumb() / 2);
+        int vSel = vBar.getSelection() + (vBar.getThumb() / 2);
 
         int hThumb = (int) (SCROLL_MAX * zoomLevel);
         int vThumb = (int) (SCROLL_MAX * zoomLevel);
@@ -261,11 +270,11 @@ public abstract class AbstractZoneSelector extends PaneManager {
         hBar.setValues(hSel, 0, SCROLL_MAX, hThumb, hThumb / 10, hThumb);
         vBar.setValues(vSel, 0, SCROLL_MAX, vThumb, vThumb / 10, vThumb);
 
-        hSel = hBar.getSelection() + hBar.getThumb() / 2;
-        vSel = vBar.getSelection() + vBar.getThumb() / 2;
+        hSel = hBar.getSelection() + (hBar.getThumb() / 2);
+        vSel = vBar.getSelection() + (vBar.getThumb() / 2);
 
-        double xShift = ((double) hSel / SCROLL_MAX - 0.5) * mapWidth;
-        double yShift = ((double) vSel / SCROLL_MAX - 0.5) * mapHeight;
+        double xShift = (((double) hSel / SCROLL_MAX) - 0.5) * mapWidth;
+        double yShift = (((double) vSel / SCROLL_MAX) - 0.5) * mapHeight;
 
         extent.shift(xShift - currShiftX, yShift - currShiftY);
         extent.scale(zoomLevel / extent.getScale());
@@ -276,7 +285,7 @@ public abstract class AbstractZoneSelector extends PaneManager {
         this.refresh();
     }
 
-    protected void setMap(List<String> mapNames) {
+    protected void setMap(List<String> mapNames, boolean clipToDomain) {
         this.mapNames = mapNames;
         List<ZoneSelectorResource> mapRscList = new ArrayList<ZoneSelectorResource>();
         for (String mapName : mapNames) {
@@ -291,7 +300,8 @@ public abstract class AbstractZoneSelector extends PaneManager {
                         .retrieveMap(bundlePath).getResourceData();
 
                 ZoneSelectorResource rsc = new ZoneSelectorResource(rscData,
-                        new LoadProperties(), gloc, this.limitZoneNames);
+                        new LoadProperties(), gloc, this.limitZoneNames,
+                        noZoneColor, clipToDomain);
                 mapRscList.add(rsc);
             } catch (VizException e) {
                 statusHandler.handle(Priority.PROBLEM, "Error loading map: "
@@ -383,11 +393,11 @@ public abstract class AbstractZoneSelector extends PaneManager {
         this.zoneNames.clear();
         for (ZoneSelectorResource mapRsc : mapRscList) {
             for (String ean : mapRsc.getZoneNames()) {
-                if (ean != null && !ean.isEmpty()) {
+                if ((ean != null) && !ean.isEmpty()) {
                     // ensure we only add a zone once, and that it should
                     // be included (limitZoneNames is none or is in list)
                     if (!this.zoneNames.contains(ean)
-                            && (this.limitZoneNames == null || this.limitZoneNames
+                            && ((this.limitZoneNames == null) || this.limitZoneNames
                                     .contains(ean))) {
                         this.zoneNames.add(ean);
                     }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java b/cave/com.raytheon.uf.viz.zoneselector/src/com/raytheon/uf/viz/zoneselector/ZoneSelectorResource.java
similarity index 92%
rename from cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
rename to cave/com.raytheon.uf.viz.zoneselector/src/com/raytheon/uf/viz/zoneselector/ZoneSelectorResource.java
index e43f17c071..df40daa90f 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
+++ b/cave/com.raytheon.uf.viz.zoneselector/src/com/raytheon/uf/viz/zoneselector/ZoneSelectorResource.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.viz.gfe.ui.zoneselector;
+package com.raytheon.uf.viz.zoneselector;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -29,7 +29,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ArrayBlockingQueue;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -60,6 +60,7 @@ import com.raytheon.uf.viz.core.PixelExtent;
 import com.raytheon.uf.viz.core.RGBColors;
 import com.raytheon.uf.viz.core.catalog.DirectDbQuery;
 import com.raytheon.uf.viz.core.catalog.DirectDbQuery.QueryLanguage;
+import com.raytheon.uf.viz.core.drawables.IFont;
 import com.raytheon.uf.viz.core.drawables.IShadedShape;
 import com.raytheon.uf.viz.core.drawables.IWireframeShape;
 import com.raytheon.uf.viz.core.drawables.PaintProperties;
@@ -75,8 +76,6 @@ import com.raytheon.uf.viz.core.rsc.capabilities.ShadeableCapability;
 import com.raytheon.viz.core.rsc.jts.JTSCompiler;
 import com.raytheon.viz.core.rsc.jts.JTSCompiler.JTSGeometryData;
 import com.raytheon.viz.core.rsc.jts.JTSCompiler.PointStyle;
-import com.raytheon.viz.gfe.Activator;
-import com.raytheon.viz.gfe.rsc.GFEFonts;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
@@ -110,6 +109,9 @@ import com.vividsolutions.jts.io.WKBReader;
  * Sep 04, 2014     #3365  ccody       Changes for removing Data_Delivery dependencies
  * Apr 06, 2015     #17340 randerso    Eliminated clipping to GFE domain, code cleanup
  * Jul 13, 2015      4500  rjpeter     Fix SQL Injection concerns.
+ * Feb 05, 2016 #5316      randerso    Moved into separate package.
+ *                                     Additonal changes to support use in GHG Monitor,
+ *                                     MakeHazard, and ZoneCombiner
  * </pre>
  * 
  * @author randerso
@@ -117,23 +119,13 @@ import com.vividsolutions.jts.io.WKBReader;
  */
 
 public class ZoneSelectorResource extends DbMapResource {
-    private static final String EDIT_AREA = "editarea";
-
-    private static final RGB NO_ZONE_COLOR;
-    static {
-        String s = Activator.getDefault().getPreferenceStore()
-                .getString("ZoneCombiner_noZoneColor");
-        if (s.isEmpty()) {
-            s = "black";
-        }
-        NO_ZONE_COLOR = RGBColors.getRGBColor(s);
-    }
+    protected static final String ZONE_SELECTOR_FONT_ID = "com.raytheon.uf.viz.zoneSelectorFont";
 
     private static GeometryFactory gf = new GeometryFactory();
 
     private static PreparedGeometryFactory pgf = new PreparedGeometryFactory();
 
-    public String myWfo;
+    private String myWfo;
 
     class MapQueryJob extends Job {
 
@@ -319,7 +311,8 @@ public class ZoneSelectorResource extends DbMapResource {
                                 Point point = poly.getInteriorPoint();
                                 if (point.getCoordinate() != null) {
                                     LabelNode node = new LabelNode(zoneName,
-                                            point, req.target, req.rsc.font);
+                                            point, req.target,
+                                            req.rsc.getFont(req.target));
                                     newLabels.add(node);
                                 }
                             }
@@ -522,6 +515,11 @@ public class ZoneSelectorResource extends DbMapResource {
             }
             return false;
         }
+
+        @Override
+        public String toString() {
+            return "(" + this.groupLabel + ", " + this.color + ")";
+        }
     }
 
     private class LabelTuple {
@@ -571,24 +569,28 @@ public class ZoneSelectorResource extends DbMapResource {
 
     private final WorldWrapCorrector worldWrapCorrector;
 
+    private final boolean clipToDomain;
+
     /**
-     * @param data
+     * @param resourceData
      * @param loadProperties
      * @param gloc
      * @param limitZones
+     * @param clipToDomain
      */
-    public ZoneSelectorResource(DbMapResourceData data,
+    public ZoneSelectorResource(DbMapResourceData resourceData,
             LoadProperties loadProperties, GridLocation gloc,
-            List<String> limitZones) {
-        super(data, loadProperties);
+            List<String> limitZones, RGB defaultFillColor, boolean clipToDomain) {
+        super(resourceData, loadProperties);
         this.zoneData = new HashMap<String, ZoneInfo>();
         this.geomFactory = new GeometryFactory();
         this.queryJob = new MapQueryJob();
-        this.defaultFillColor = NO_ZONE_COLOR;
+        this.defaultFillColor = defaultFillColor;
         this.outlineColor = RGBColors.getRGBColor("white");
         this.wfoOutlineColor = RGBColors.getRGBColor("yellow");
         this.gloc = gloc;
         this.limitZones = limitZones;
+        this.clipToDomain = clipToDomain;
 
         GeneralEnvelope env = new GeneralEnvelope(MapUtil.LATLON_PROJECTION);
         env.setEnvelope(-180.0, -90.0, 180.0, 90.0);
@@ -647,25 +649,44 @@ public class ZoneSelectorResource extends DbMapResource {
     }
 
     /**
-     * @param zoneName
+     * Set the list of zones to the specified color
+     * 
      * @param color
+     * @param zones
      */
-    public void setZone(String zoneName, RGB color) {
-        ZoneInfo info = zoneData.get(zoneName);
-        if (info != null) {
-            info.setColor(color);
+    public void setZone(RGB color, String... zones) {
+        boolean refresh = false;
 
-            int index = info.getShapeIndex();
-            if ((this.target != null) && (index >= 0)
-                    && (index < shapeList.length)) {
-                shapeList[index].dispose();
-                shapeList[index] = computeShape(this.target, this.descriptor,
-                        info.getGeometry(), color);
+        for (String zoneName : zones) {
+            ZoneInfo info = zoneData.get(zoneName);
+            if (info != null) {
+                refresh = true;
+                info.setColor(color);
+
+                int index = info.getShapeIndex();
+                if ((this.target != null) && (index >= 0)
+                        && (index < shapeList.length)) {
+                    shapeList[index].dispose();
+                    shapeList[index] = computeShape(this.target,
+                            this.descriptor, info.getGeometry(), color);
+                }
             }
+        }
+
+        if (refresh) {
             issueRefresh();
         }
     }
 
+    /**
+     * Clear all selected zones
+     */
+    public void clearZones() {
+        String[] zones = zoneData.keySet().toArray(new String[zoneData.size()]);
+        setZone(defaultFillColor, zones);
+
+    }
+
     /**
      * @param myWfo
      *            the myWfo to set
@@ -698,15 +719,22 @@ public class ZoneSelectorResource extends DbMapResource {
         this.wfoOutlineColor = wfoOutlineColor;
     }
 
+    @Override
+    protected IFont getFont(IGraphicsTarget target) {
+        if (font == null) {
+            IFont font = target.initializeFont(ZONE_SELECTOR_FONT_ID);
+            font.setSmoothing(false);
+            font.setScaleFont(false);
+            this.font = font;
+        }
+        return font;
+    }
+
     @Override
     protected void paintInternal(IGraphicsTarget aTarget,
             PaintProperties paintProps) throws VizException {
         this.target = aTarget;
 
-        if (font == null) {
-            font = GFEFonts.getFont(aTarget, 2);
-        }
-
         PixelExtent screenExtent = (PixelExtent) paintProps.getView()
                 .getExtent();
 
@@ -814,7 +842,7 @@ public class ZoneSelectorResource extends DbMapResource {
                                 RGBColors.getRGBColor("white"));
                         ds.setCoordinates(node.getLocation()[0],
                                 node.getLocation()[1]);
-                        ds.font = font;
+                        ds.font = getFont(target);
                         ds.horizontalAlignment = HorizontalAlignment.CENTER;
                         ds.verticallAlignment = VerticalAlignment.MIDDLE;
                         ds.addTextStyle(TextStyle.DROP_SHADOW);
@@ -855,12 +883,7 @@ public class ZoneSelectorResource extends DbMapResource {
         query.append(" FROM ");
         query.append(resourceData.getTable());
 
-        // add any constraints
-        String[] constraints = resourceData.getConstraints();
-        if ((constraints != null) && (constraints.length > 0)) {
-            query.append(" WHERE ").append(
-                    StringUtils.join(constraints, " AND "));
-        }
+        addConstraints(query);
 
         query.append(';');
 
@@ -890,8 +913,7 @@ public class ZoneSelectorResource extends DbMapResource {
             IMapDescriptor descriptor, Geometry g, RGB color) {
 
         IShadedShape newShadedShape = target.createShadedShape(false,
-                new GeneralGridGeometry(descriptor.getGridGeometry()), true);
-        // new GeneralGridGeometry(descriptor.getGridGeometry()));
+                new GeneralGridGeometry(descriptor.getGridGeometry()));
         JTSCompiler shapeCompiler = new JTSCompiler(newShadedShape, null,
                 descriptor);
         JTSGeometryData geomData = shapeCompiler.createGeometryData();
@@ -943,7 +965,7 @@ public class ZoneSelectorResource extends DbMapResource {
     }
 
     /**
-     * 
+     * @return list of zone names
      */
     public List<String> getZoneNames() {
         if (zoneData.isEmpty()) {
@@ -968,12 +990,7 @@ public class ZoneSelectorResource extends DbMapResource {
                 // add the geometry table
                 query.append(resourceData.getTable());
 
-                // add any constraints
-                String[] constraints = resourceData.getConstraints();
-                if ((constraints != null) && (constraints.length > 0)) {
-                    query.append(" WHERE ").append(
-                            StringUtils.join(constraints, " AND "));
-                }
+                addConstraints(query);
 
                 query.append(';');
 
@@ -1045,12 +1062,7 @@ public class ZoneSelectorResource extends DbMapResource {
                 query.append(" FROM ");
                 query.append(resourceData.getTable());
 
-                // add any constraints
-                String[] constraints = resourceData.getConstraints();
-                if ((constraints != null) && (constraints.length > 0)) {
-                    query.append(" WHERE ").append(
-                            StringUtils.join(constraints, " AND "));
-                }
+                addConstraints(query);
 
                 query.append(';');
 
@@ -1101,6 +1113,35 @@ public class ZoneSelectorResource extends DbMapResource {
         return this.boundingEnvelope;
     }
 
+    private void addConstraints(StringBuilder query) {
+        String[] constraints = resourceData.getConstraints();
+
+        // if any constraints add the WHERE clause
+        if (clipToDomain
+                || ((constraints != null) && (constraints.length != 0))) {
+            query.append(" WHERE ");
+            boolean firstConstraint = true;
+
+            // add the geospatial constraint, if desired
+            if (clipToDomain) {
+                query.append(getGeospatialConstraint(
+                        resourceData.getGeomField(), null));
+                firstConstraint = false;
+            }
+
+            // add any additional constraints
+            if (constraints != null) {
+                for (String constraint : resourceData.getConstraints()) {
+                    if (!firstConstraint) {
+                        query.append(" AND ");
+                    }
+                    query.append(constraint);
+                    firstConstraint = false;
+                }
+            }
+        }
+    }
+
     /*
      * (non-Javadoc)
      * 
diff --git a/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF
index df55058980..41251c09bd 100644
--- a/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.aviation/META-INF/MANIFEST.MF
@@ -24,7 +24,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.viz.ui.personalities.awips;bundle-version="1.12.1174",
  com.raytheon.uf.viz.application;bundle-version="1.0.0",
  com.raytheon.uf.common.tafqueue;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
  com.raytheon.uf.common.auth;bundle-version="1.12.1174",
  com.raytheon.uf.viz.datacube,
  com.raytheon.uf.common.dataplugin.taf
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationAction.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationAction.java
index 9c182c9027..ca0faefc85 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationAction.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationAction.java
@@ -26,8 +26,7 @@ import org.apache.commons.configuration.ConfigurationException;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
+import org.eclipse.swt.widgets.Display;
 
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -48,6 +47,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * 7/09/2010    5078        rferrel     Added check of config
  *                                      files in execute.
  * 10/19/2010   7347        rferrel     Replace reference to TAF_SITE_CONFIG.
+ * 01/26/2016   5054        randerso    Change top level dialog to be parented to the display
  * 
  * </pre>
  * 
@@ -62,7 +62,7 @@ public class AviationAction extends AbstractHandler {
     private AviationDialog aviationDlg;
 
     @Override
-    public Object execute(ExecutionEvent arg0) throws ExecutionException {
+    public Object execute(ExecutionEvent event) throws ExecutionException {
         // Do nothing if needed configuration files are missing or
         // unreadable.
         try {
@@ -76,10 +76,8 @@ public class AviationAction extends AbstractHandler {
             return null;
         }
 
-        Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getShell();
-        if (aviationDlg == null || aviationDlg.getShell().isDisposed()) {
-            aviationDlg = new AviationDialog(shell);
+        if ((aviationDlg == null) || aviationDlg.getShell().isDisposed()) {
+            aviationDlg = new AviationDialog(Display.getCurrent());
             aviationDlg.setCloseCallback(new ICloseCallback() {
 
                 @Override
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationComponent.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationComponent.java
index 6f97118a40..a09eb5ef04 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationComponent.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationComponent.java
@@ -20,7 +20,6 @@
 package com.raytheon.viz.aviation;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
 
@@ -34,10 +33,11 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 28, 2011            mschenke     Initial creation
+ * Apr 28, 2011            mschenke    Initial creation
  * Oct 08, 2012 1229       rferrel     Make a blocking dialog.
  * Oct 17, 2012 1229       rferrel     Changes for non-blocking
  *                                      AviationDialog.
+ * Jan 26, 2016 5054       randerso    Change top level dialog to be parented to the display
  * 
  * </pre>
  * 
@@ -56,8 +56,7 @@ public class AviationComponent extends AbstractCAVEDialogComponent {
      */
     @Override
     protected void startInternal(String componentName) throws Exception {
-        AviationDialog aviationDlg = new AviationDialog(new Shell(
-                Display.getCurrent()));
+        AviationDialog aviationDlg = new AviationDialog(Display.getCurrent());
         aviationDlg.open();
         blockUntilClosed(aviationDlg);
     }
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationDialog.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationDialog.java
index fa6f2ba68c..3dc453c17b 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationDialog.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AviationDialog.java
@@ -40,6 +40,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Layout;
 import org.eclipse.swt.widgets.Shell;
@@ -98,6 +99,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * 12 Aug 2013  2256        lvenable    Removed unnecessary font code and other code clean up.
  * 06 May 2014  3091        rferrel     Use OUP authorization to bring up send dialog.
  * 15 Sep 2015  4880        njensen     Removed ForecastModel reference
+ * 26 Jan 2016  5054        randerso    Change top level dialog to be parented to the display
  * 
  * </pre>
  * 
@@ -162,10 +164,10 @@ public class AviationDialog extends CaveSWTDialog implements IBackupRestart {
     /**
      * Create a non-blocking dialog.
      * 
-     * @param parent
+     * @param display
      */
-    public AviationDialog(Shell parent) {
-        super(parent, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
+    public AviationDialog(Display display) {
+        super(display, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
                 | CAVE.INDEPENDENT_SHELL | CAVE.DO_NOT_BLOCK);
         setText("AvnFPS Menu");
 
@@ -236,8 +238,8 @@ public class AviationDialog extends CaveSWTDialog implements IBackupRestart {
             if (productDisplayList == null) {
                 productDisplayList = new ArrayList<String>();
             }
-            if (productDisplayList.size() == 0
-                    && config.getDefaultProduct() != null) {
+            if ((productDisplayList.size() == 0)
+                    && (config.getDefaultProduct() != null)) {
                 productDisplayList.add(config.getDefaultProduct());
             }
         } catch (Exception e) {
@@ -326,7 +328,7 @@ public class AviationDialog extends CaveSWTDialog implements IBackupRestart {
             @Override
             public void widgetSelected(SelectionEvent event) {
                 shell.setVisible(false);
-                if (tafMonitorDlg == null
+                if ((tafMonitorDlg == null)
                         || tafMonitorDlg.getShell().isDisposed()) {
                     ResourceConfigMgr configMgr = ResourceConfigMgr
                             .getInstance();
@@ -351,7 +353,8 @@ public class AviationDialog extends CaveSWTDialog implements IBackupRestart {
             @Override
             public void widgetSelected(SelectionEvent event) {
                 shell.setVisible(false);
-                if (climateMenuDlg == null || climateMenuDlg.getShell() == null
+                if ((climateMenuDlg == null)
+                        || (climateMenuDlg.getShell() == null)
                         || climateMenuDlg.isDisposed()) {
                     // Create an array of message types
                     StatusMessageType[] msgTypes = new StatusMessageType[4];
@@ -528,7 +531,7 @@ public class AviationDialog extends CaveSWTDialog implements IBackupRestart {
                         "Error no stations configured for " + product);
             }
         } else {
-            if (tafMonitorDlg == null || tafMonitorDlg.getShell() == null
+            if ((tafMonitorDlg == null) || (tafMonitorDlg.getShell() == null)
                     || tafMonitorDlg.isDisposed()) {
                 tafMonitorDlg = new TafMonitorDlg(shell, stationList,
                         productDisplayList);
@@ -537,7 +540,7 @@ public class AviationDialog extends CaveSWTDialog implements IBackupRestart {
                     @Override
                     public void dialogClosed(Object returnValue) {
                         tafMonitorDlg = null;
-                        if (dlgCount.decrementAndGet() == 0
+                        if ((dlgCount.decrementAndGet() == 0)
                                 && !productDisplayList.isEmpty()) {
                             shell.dispose();
                         }
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigAction.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigAction.java
index be61d4a321..28b4f12f0c 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigAction.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigAction.java
@@ -25,8 +25,7 @@ import org.apache.commons.configuration.ConfigurationException;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
+import org.eclipse.swt.widgets.Display;
 
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -38,14 +37,15 @@ import com.raytheon.viz.avnconfig.TafSiteConfigFactory;
  * 
  * <pre>
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * May 15, 2008	1119		grichard	Initial creation.
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * May 15, 2008 1119       grichard     Initial creation.
  * Jul  9, 2010 5078        rferrel     Check for existence of
  *                                      config files in execute.
  * Oct 19, 2010 7347        rferrel     Replace reference to TAF_SITE_CONFIG
  * Oct 08, 2012 1229        rferrel     Changes to work with non-blocking AvnConfigDlg.
  * Feb 13, 2013 1549        rferrel     Minor code clean up.
+ * Jan 26, 2016 5054        randerso    Change top level dialog to be parented to the display
  * 
  * </pre>
  * 
@@ -81,9 +81,7 @@ public class AvnconfigAction extends AbstractHandler {
         }
 
         if (avnfpsSetupDlg == null) {
-            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                    .getShell();
-            avnfpsSetupDlg = new AvnconfigDlg(shell);
+            avnfpsSetupDlg = new AvnconfigDlg(Display.getCurrent());
         }
         avnfpsSetupDlg.open();
 
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigComponent.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigComponent.java
index 6b25f189d8..2a08a70228 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigComponent.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigComponent.java
@@ -20,7 +20,6 @@
 package com.raytheon.viz.aviation;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
 
@@ -33,9 +32,10 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 28, 2011            mschenke     Initial creation
+ * Apr 28, 2011            mschenke    Initial creation
  * Oct 17, 2012 1229       rferrel     Changes for non-blocking
  *                                      AvnconfigDlg.
+ * Jan 26, 2016  5054      randerso    Change top level dialog to be parented to the display
  * </pre>
  * 
  * @author mschenke
@@ -53,8 +53,7 @@ public class AvnconfigComponent extends AbstractCAVEDialogComponent {
      */
     @Override
     protected void startInternal(String componentName) throws Exception {
-        AvnconfigDlg avnfspSetupDlg = new AvnconfigDlg(new Shell(
-                Display.getCurrent()));
+        AvnconfigDlg avnfspSetupDlg = new AvnconfigDlg(Display.getCurrent());
         avnfspSetupDlg.open();
         blockUntilClosed(avnfspSetupDlg);
     }
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigDlg.java
index acec5ea387..273417cc43 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigDlg.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/AvnconfigDlg.java
@@ -29,6 +29,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
@@ -65,6 +66,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 15 Oct 2012  1229       rferrel     Changes for non-blocking TextEditorSetupDlg.
  * 15 Oct 2012  1229       rferrel     Changed for non-blocking HelpUsageDlg.
  * 13 Feb 2013  1549       rferrel     Minor code cleanup.
+ * 26 Jan 2016  5054       randerso    Change top level dialog to be parented to the display
  * 
  * </pre>
  * 
@@ -112,11 +114,10 @@ public class AvnconfigDlg extends CaveSWTDialog {
     /**
      * Constructor.
      * 
-     * @param parent
-     *            Parent shell.
+     * @param display
      */
-    public AvnconfigDlg(Shell parent) {
-        super(parent, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
+    public AvnconfigDlg(Display display) {
+        super(display, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
                 | CAVE.INDEPENDENT_SHELL | CAVE.DO_NOT_BLOCK);
         setText("AvnFPS Setup");
     }
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/CigVisDistComponent.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/CigVisDistComponent.java
index e08224ed32..b03520e7fc 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/CigVisDistComponent.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/CigVisDistComponent.java
@@ -22,7 +22,6 @@ package com.raytheon.viz.aviation;
 import java.util.List;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.aviation.climatology.CigVisDistributionDlg;
 import com.raytheon.viz.avncommon.AvnMessageMgr.StatusMessageType;
@@ -38,9 +37,10 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 28, 2011            mschenke     Initial creation
+ * Apr 28, 2011            mschenke    Initial creation
  * Oct 17, 2012 1229       rferrel     Changes for non-blocking
  *                                       CigVisDistributionDlg.
+ * Jan 26, 2016  5054      randerso    Change top level dialog to be parented to the display
  * 
  * </pre>
  * 
@@ -62,8 +62,7 @@ public class CigVisDistComponent extends AbstractCAVEDialogComponent {
         List<String> siteList = TafSiteConfigFactory.getInstance()
                 .getSiteList();
         CigVisDistributionDlg cigVisDistDialog = new CigVisDistributionDlg(
-                new Shell(Display.getCurrent()), siteList,
-                StatusMessageType.Metar, null);
+                Display.getCurrent(), siteList, StatusMessageType.Metar, null);
         cigVisDistDialog.open();
         blockUntilClosed(cigVisDistDialog);
     }
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/CigVisTrendComponent.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/CigVisTrendComponent.java
index 33d8c0cdf4..f57590594b 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/CigVisTrendComponent.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/CigVisTrendComponent.java
@@ -22,7 +22,6 @@ package com.raytheon.viz.aviation;
 import java.util.List;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.aviation.climatology.CigVisTrendDlg;
 import com.raytheon.viz.avncommon.AvnMessageMgr.StatusMessageType;
@@ -38,9 +37,11 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 28, 2011            mschenke     Initial creation
+ * Apr 28, 2011            mschenke    Initial creation
  * Oct 17, 2012 1229       rferrel     Changes for non-blocking
  *                                      CigVisTrendDlg.
+ * Jan 26, 2016 5054       randerso    Change top level dialog to be parented to the display
+ * 
  * </pre>
  * 
  * @author mschenke
@@ -60,8 +61,8 @@ public class CigVisTrendComponent extends AbstractCAVEDialogComponent {
     protected void startInternal(String componentName) throws Exception {
         List<String> siteList = TafSiteConfigFactory.getInstance()
                 .getSiteList();
-        CigVisTrendDlg cigVisTrendDialog = new CigVisTrendDlg(new Shell(
-                Display.getCurrent()), siteList, StatusMessageType.Metar, null);
+        CigVisTrendDlg cigVisTrendDialog = new CigVisTrendDlg(
+                Display.getCurrent(), siteList, StatusMessageType.Metar, null);
         cigVisTrendDialog.open();
         blockUntilClosed(cigVisTrendDialog);
     }
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/MetarComponent.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/MetarComponent.java
index 8044098c5b..b44ced10b2 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/MetarComponent.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/MetarComponent.java
@@ -22,7 +22,6 @@ package com.raytheon.viz.aviation;
 import java.util.List;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.aviation.climatology.MetarDisplayDialog;
 import com.raytheon.viz.avncommon.AvnMessageMgr.StatusMessageType;
@@ -38,9 +37,10 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 28, 2011            mschenke     Initial creation
+ * Apr 28, 2011            mschenke    Initial creation
  * Oct 17, 2012 1229       rferrel     Changes for non-blocking
  *                                      MetarDisplayDialog.
+ * Jan 26, 2016 5054       randerso    Allow dialog to be parented by display
  * 
  * </pre>
  * 
@@ -61,8 +61,8 @@ public class MetarComponent extends AbstractCAVEDialogComponent {
     protected void startInternal(String componentName) throws Exception {
         List<String> siteList = TafSiteConfigFactory.getInstance()
                 .getSiteList();
-        MetarDisplayDialog metarDialog = new MetarDisplayDialog(new Shell(
-                Display.getCurrent()), siteList, StatusMessageType.Metar, null);
+        MetarDisplayDialog metarDialog = new MetarDisplayDialog(
+                Display.getCurrent(), siteList, StatusMessageType.Metar, null);
         metarDialog.open();
         blockUntilClosed(metarDialog);
     }
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/WindRoseComponent.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/WindRoseComponent.java
index 1974df6cb1..78baae9128 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/WindRoseComponent.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/WindRoseComponent.java
@@ -22,7 +22,6 @@ package com.raytheon.viz.aviation;
 import java.util.List;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.aviation.climatology.WindRosePlotDlg;
 import com.raytheon.viz.avncommon.AvnMessageMgr.StatusMessageType;
@@ -38,9 +37,9 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 28, 2011            mschenke     Initial creation
- * Oct 17, 2012 1229       rferrel     Changes for non-blocking
- *                                      WindRosePlotDlg.
+ * Apr 28, 2011            mschenke    Initial creation
+ * Oct 17, 2012 1229       rferrel     Changes for non-blocking WindRosePlotDlg.
+ * Jan 26, 2016 5054       randerso    Allow dialog to be parented by display
  * 
  * </pre>
  * 
@@ -61,8 +60,8 @@ public class WindRoseComponent extends AbstractCAVEDialogComponent {
     protected void startInternal(String componentName) throws Exception {
         List<String> siteList = TafSiteConfigFactory.getInstance()
                 .getSiteList();
-        WindRosePlotDlg windRoseDialog = new WindRosePlotDlg(new Shell(
-                Display.getCurrent()), siteList, StatusMessageType.WindRose,
+        WindRosePlotDlg windRoseDialog = new WindRosePlotDlg(
+                Display.getCurrent(), siteList, StatusMessageType.WindRose,
                 null);
         windRoseDialog.open();
         blockUntilClosed(windRoseDialog);
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
index 1ba7d81cc2..6c999d7b45 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
@@ -59,7 +59,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.ActionFactory;
 
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -103,6 +103,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * Oct 15, 2012 #1229      rferrel      Changes for non-blocking HelpUsageDlg.
  * Mar 04, 2015 #15639     zhao         Added 'heightHint' to 'Idents' list so GUI won't become too large 
  * Jul 07, 2015 16907      zhao         Changed 'ish-' to 'isd-' 
+ * Nov 30, 2015  4834      njensen      Remove LocalizationOpFailedException
  * Jan 15, 2016 18482      zhao         Add a "Usage" to "Help..." 
  * Jan 21, 2016 18395      zhao         Modified processData()
  * 
@@ -653,7 +654,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
 
         gd = new GridData(SWT.DEFAULT, SWT.FILL, false, true);
         gd.widthHint = 60;
-        gd.heightHint = 250; 
+        gd.heightHint = 250;
         identList = new List(identComp, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL);
         identList.setLayoutData(gd);
         identList.setFont(textFont);
@@ -964,35 +965,19 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
             for (int i = 0; i < siteList.size(); i++) {
                 identList.add(siteList.get(i));
             }
-        } catch (IOException e) {
+        } catch (IOException | LocalizationException e) {
             statusHandler.handle(Priority.PROBLEM, e.getMessage());
         } catch (ConfigurationException e) {
             statusHandler.handle(Priority.PROBLEM, e.toString());
-        } catch (LocalizationOpFailedException e) {
-            statusHandler.handle(Priority.PROBLEM, e.getMessage());
         }
     }
 
     private void setIdsSite(String site, String pil) {
         try {
             TafSiteConfigFactory.getInstance().setIdsSite(site, pil);
-        } catch (ConfigurationException e) {
+        } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
-        } catch (LocalizationOpFailedException e) {
-            // TODO Auto-generated catch block. Please revise as appropriate.
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
-        } catch (FileNotFoundException e) {
-            // TODO Auto-generated catch block. Please revise as appropriate.
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
-        } catch (IOException e) {
-            // TODO Auto-generated catch block. Please revise as appropriate.
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
         }
-
     }
 
     private void getSiteInfoList(String ident, int timeout) {
@@ -1068,9 +1053,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
                     siteInfoList.add(sb.toString());
                     assessDataBtn.setEnabled(false);
                 }
-
             }
-
         });
     }
 
@@ -1126,7 +1109,6 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
         }
     }
 
-    @SuppressWarnings("unchecked")
     private void processData() {
         ClimateDataManager dataMgr = ClimateDataManager.getInstance();
         String[] items = siteInfoList.getItems();
@@ -1172,6 +1154,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
         try {
             dlg.setFilterPath(ClimateDataPython.getIshFilePath() + "/tmp/");
         } catch (VizException e) {
+            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
         }
 
         dlg.setFileName("climatedata_" + t + ".log");
@@ -1181,19 +1164,13 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
         }
 
         File file = new File(filename);
-        FileWriter writer;
-        try {
-            setWait(true);
-            writer = new FileWriter(file);
-            BufferedWriter buf = new BufferedWriter(writer);
-
-            buf.write(fileAssessST.getText());
-
-            buf.close();
-            writer.close();
+        setWait(true);
+        try (FileWriter writer = new FileWriter(file)) {
+            try (BufferedWriter buf = new BufferedWriter(writer)) {
+                buf.write(fileAssessST.getText());
+            }
         } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            statusHandler.error("Error writing to file " + file, e);
         } finally {
             setWait(false);
         }
@@ -1213,28 +1190,15 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
     private String getSitePil(String site) {
         try {
             return TafSiteConfigFactory.getInstance().getIdsPil(site);
-        } catch (ConfigurationException e) {
-            // TODO Auto-generated catch block. Please revise as appropriate.
+        } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
-        } catch (LocalizationOpFailedException e) {
-            // TODO Auto-generated catch block. Please revise as appropriate.
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
-        } catch (FileNotFoundException e) {
-            // TODO Auto-generated catch block. Please revise as appropriate.
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
-        } catch (IOException e) {
-            // TODO Auto-generated catch block. Please revise as appropriate.
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
         }
         return "";
     }
 
     public void updateMonitor(final String msg) {
         getDisplay().asyncExec(new Runnable() {
+            @Override
             public void run() {
                 fileAssessST
                         .setText(fileAssessST.getText().trim() + "\n" + msg);
@@ -1253,6 +1217,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
 
     public void overwriteMonitor(final String msg) {
         getDisplay().asyncExec(new Runnable() {
+            @Override
             public void run() {
                 statusTF.setText(msg);
             }
@@ -1262,6 +1227,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
     public void assessBtn(final boolean enabled) {
         if (!isDisposed()) {
             getDisplay().asyncExec(new Runnable() {
+                @Override
                 public void run() {
                     assessDataBtn.setEnabled(enabled);
                 }
@@ -1271,6 +1237,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
 
     public void scriptsBtn(final boolean enabled) {
         getDisplay().asyncExec(new Runnable() {
+            @Override
             public void run() {
                 genScriptsBtn.setEnabled(enabled);
             }
@@ -1279,6 +1246,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
 
     public void processBtn(final boolean enabled) {
         getDisplay().asyncExec(new Runnable() {
+            @Override
             public void run() {
                 processDataBtn.setEnabled(enabled);
             }
@@ -1288,6 +1256,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
     public void validateBtn(final boolean enabled) {
         if (!isDisposed()) {
             getDisplay().asyncExec(new Runnable() {
+                @Override
                 public void run() {
                     validateBtn.setEnabled(enabled);
                 }
@@ -1298,6 +1267,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
     public void commitBtn(final boolean enabled) {
         if (!isDisposed()) {
             getDisplay().asyncExec(new Runnable() {
+                @Override
                 public void run() {
                     commitBtn.setEnabled(enabled);
                 }
@@ -1308,6 +1278,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
     public void rejectBtn(final boolean enabled) {
         if (!isDisposed()) {
             getDisplay().asyncExec(new Runnable() {
+                @Override
                 public void run() {
                     rejectBtn.setEnabled(enabled);
                 }
@@ -1318,6 +1289,7 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
     public void saveLogBtn(final boolean enabled) {
         if (!isDisposed()) {
             getDisplay().asyncExec(new Runnable() {
+                @Override
                 public void run() {
                     saveLogBtn.setEnabled(enabled);
                 }
@@ -1441,15 +1413,8 @@ public class ClimateDataMenuDlg extends CaveSWTDialog {
     private void removeIdsSite(String site) {
         try {
             TafSiteConfigFactory.getInstance().removeIdsSite(site);
-        } catch (ConfigurationException e) {
+        } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
-        } catch (LocalizationOpFailedException e) {
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
-        } catch (FileNotFoundException e) {
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
         }
     }
 
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisDistributionDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisDistributionDlg.java
index 804dfa4c22..972351e7fd 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisDistributionDlg.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisDistributionDlg.java
@@ -45,6 +45,7 @@ import org.eclipse.swt.printing.PrinterData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
@@ -81,15 +82,16 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 4/10/2008    934        grichard    Populated site lists with icaos. 
  * 8/28/2008    1506       grichard    Added resizeability to dialog shell.
  * 9/12/2008    1444       grichard    Accommodate separate message logs.
- * 1/18/2010    3823       njensen    retrieveData() and objReceived()
+ * 1/18/2010    3823       njensen     retrieveData() and objReceived()
  * 3/31/2011    8774       rferrel     killProcess when doing a disposed
  * 4/4/2011     8896       rferrel     Made timeout configurable
  * 4/14/2011    8861       rferrel     Use SaveImageDlg class
  * 04/08/2012   1229       rferrel     Made dialog non-blocking.
- * 10/15/2012   1229       rferrel      Changes for non-blocking HelpUsageDlg.
+ * 10/15/2012   1229       rferrel     Changes for non-blocking HelpUsageDlg.
  * 16 Aug 2013  #2256      lvenable    Fixed image and cursor memory leaks.
- * 19Mar2014    #2925       lvenable    Added dispose checks for runAsync.
- * 12/22/2015   18342      zhao        Modified code for 'jnt' in objReceived() 
+ * 19Mar2014    #2925      lvenable    Added dispose checks for runAsync.
+ * 12/22/2015   18342      zhao        Modified code for 'jnt' in objReceived()
+ * 01/26/2016   5054       randerso    Allow dialog to be parented by display
  * 
  * </pre>
  * 
@@ -230,6 +232,29 @@ public class CigVisDistributionDlg extends CaveSWTDialog implements
         this.statusCompRGB = statusCompRGB;
     }
 
+    /**
+     * Constructor.
+     * 
+     * @param display
+     * 
+     * @param icaos
+     *            Array of ICAOs
+     * @param msgType
+     *            Status message type.
+     * @param statusCompRGB
+     *            Message status comp background color.
+     */
+    public CigVisDistributionDlg(Display display, java.util.List<String> icaos,
+            StatusMessageType msgType, RGB statusCompRGB) {
+        super(display, SWT.DIALOG_TRIM | SWT.RESIZE,
+                CAVE.PERSPECTIVE_INDEPENDENT | CAVE.DO_NOT_BLOCK);
+        setText("AvnFPS - Ceiling/Visibility Distribution");
+
+        this.icaos = icaos;
+        this.msgType = msgType;
+        this.statusCompRGB = statusCompRGB;
+    }
+
     @Override
     protected Layout constructShellLayout() {
         // Create the main layout for the shell.
@@ -504,7 +529,7 @@ public class CigVisDistributionDlg extends CaveSWTDialog implements
         yAxisScale.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
-                if (yAxisScale.getSelection() % 5 != 0) {
+                if ((yAxisScale.getSelection() % 5) != 0) {
                     updateDisplayedGraph();
                     return;
                 }
@@ -530,7 +555,7 @@ public class CigVisDistributionDlg extends CaveSWTDialog implements
         drawBtn.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
-                if (siteList != null && siteList.getItemCount() != 0) {
+                if ((siteList != null) && (siteList.getItemCount() != 0)) {
                     String site = siteList.getItem(siteList.getSelectionIndex());
                     if (!site.equals(dataSite)) {
                         retrieveData(site);
@@ -559,21 +584,21 @@ public class CigVisDistributionDlg extends CaveSWTDialog implements
         cigVisTabFolder = new TabFolder(tabComp, SWT.NONE);
         cigVisTabFolder.setLayoutData(gd);
 
-        if (siteList != null && siteList.getItemCount() != 0) {
+        if ((siteList != null) && (siteList.getItemCount() != 0)) {
             data.setSite(siteList.getItem(siteList.getSelectionIndex()));
         }
         byMonthTab = new TabItem(cigVisTabFolder, SWT.NONE);
         byMonthTab.setText("By Month");
         byMonthTab.setControl(new CigVisByMonthTabComp(cigVisTabFolder, data,
                 this));
-        if (siteList != null && siteList.getItemCount() != 0) {
+        if ((siteList != null) && (siteList.getItemCount() != 0)) {
             data.setSite(siteList.getItem(siteList.getSelectionIndex()));
         }
         byHourTab = new TabItem(cigVisTabFolder, SWT.NONE);
         byHourTab.setText("By Hour");
         byHourTab.setControl(new CigVisByHourTabComp(cigVisTabFolder, data,
                 this));
-        if (siteList != null && siteList.getItemCount() != 0) {
+        if ((siteList != null) && (siteList.getItemCount() != 0)) {
             data.setSite(siteList.getItem(siteList.getSelectionIndex()));
         }
         byWindDirTab = new TabItem(cigVisTabFolder, SWT.NONE);
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisTrendDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisTrendDlg.java
index 7f03c8e93c..498065edb0 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisTrendDlg.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisTrendDlg.java
@@ -43,6 +43,7 @@ import org.eclipse.swt.printing.PrinterData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Layout;
@@ -72,8 +73,9 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 4/14/2011    8861       rferrel     Use SaveImageDlg class
  * 10/09/2912   1229       rferrel     Made non-blocking
  * 10/15/2012   1229       rferrel     Changes for non-blocking HelpUsageDlg.
- * 12 Aug 2013  #2256      lvenable    Disposed of images after printing and removed
+ * 08/12/2013   2256       lvenable    Disposed of images after printing and removed
  *                                     cursor memory leak.
+ * 01/26/2016   5054       randerso    Change top level dialog to be parented to the display
  * 
  * </pre>
  * 
@@ -228,6 +230,29 @@ public class CigVisTrendDlg extends CaveSWTDialog {
         this.statusCompRGB = statusCompRGB;
     }
 
+    /**
+     * Constructor.
+     * 
+     * @param display
+     * 
+     * @param icaos
+     *            Array of ICAOs
+     * @param msgType
+     *            Status message type.
+     * @param statusCompRGB
+     *            Message status comp background color.
+     */
+    public CigVisTrendDlg(Display display, java.util.List<String> icaos,
+            StatusMessageType msgType, RGB statusCompRGB) {
+        super(display, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
+                | CAVE.DO_NOT_BLOCK);
+        setText("AvnFPS - Ceiling/Visibility Trend");
+
+        this.icaos = icaos;
+        this.msgType = msgType;
+        this.statusCompRGB = statusCompRGB;
+    }
+
     @Override
     protected Layout constructShellLayout() {
         GridLayout mainLayout = new GridLayout(1, false);
@@ -558,7 +583,7 @@ public class CigVisTrendDlg extends CaveSWTDialog {
         getBtn.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
-                if (siteList != null && siteList.getItemCount() != 0) {
+                if ((siteList != null) && (siteList.getItemCount() != 0)) {
                     CigVisTrendDataManager dataMgr = CigVisTrendDataManager
                             .getInstance();
                     dataMgr.getMetar(siteList.getItem(siteList
@@ -576,7 +601,7 @@ public class CigVisTrendDlg extends CaveSWTDialog {
             @SuppressWarnings("unchecked")
             @Override
             public void widgetSelected(SelectionEvent event) {
-                if (siteList != null && siteList.getItemCount() != 0) {
+                if ((siteList != null) && (siteList.getItemCount() != 0)) {
                     CigVisTrendDataManager dataMgr = CigVisTrendDataManager
                             .getInstance();
 
@@ -594,12 +619,12 @@ public class CigVisTrendDlg extends CaveSWTDialog {
                         int minutes = tms.get(Calendar.MINUTE);
                         int h0 = hour - 1;
                         int h1 = hour + 1;
-                        trendHourComp.setValueText(hour * 15
+                        trendHourComp.setValueText((hour * 15)
                                 + Math.round(minutes / 4.0));
                         trendHourComp.validateValueInputs();
                         trendHourComp.setRangeText(
-                                h0 * 15 + Math.round(minutes / 4.0), h1 * 15
-                                        + Math.round(minutes / 4.0));
+                                (h0 * 15) + Math.round(minutes / 4.0),
+                                (h1 * 15) + Math.round(minutes / 4.0));
                         trendHourComp.validateRangeInputs();
 
                         int yday = tms.get(Calendar.DAY_OF_YEAR);
@@ -623,7 +648,7 @@ public class CigVisTrendDlg extends CaveSWTDialog {
                             vis1 = Double.parseDouble(range[1]);
                         }
 
-                        if (vis0 > vsby || vsby >= vis1) {
+                        if ((vis0 > vsby) || (vsby >= vis1)) {
                             double[] visArray = { 0.0, 0.4, 1.1, 3.1, 6.1,
                                     Integer.MAX_VALUE };
 
@@ -631,7 +656,7 @@ public class CigVisTrendDlg extends CaveSWTDialog {
                                 vis0 = visArray[i - 1];
                                 vis1 = visArray[i];
 
-                                if (vis0 <= vsby && vsby < vis1) {
+                                if ((vis0 <= vsby) && (vsby < vis1)) {
                                     break;
                                 }
                             }
@@ -662,7 +687,7 @@ public class CigVisTrendDlg extends CaveSWTDialog {
                             cig1 = Integer.parseInt(range[1]);
                         }
 
-                        if (cig0 > cig || cig >= cig1) {
+                        if ((cig0 > cig) || (cig >= cig1)) {
                             int[] cigArray = { 0, 210, 610, 1020, 3130, 5050,
                                     Integer.MAX_VALUE };
 
@@ -670,7 +695,7 @@ public class CigVisTrendDlg extends CaveSWTDialog {
                                 cig0 = cigArray[i - 1];
                                 cig1 = cigArray[i];
 
-                                if (cig0 <= cig && cig < cig1) {
+                                if ((cig0 <= cig) && (cig < cig1)) {
                                     break;
                                 }
                             }
@@ -729,7 +754,7 @@ public class CigVisTrendDlg extends CaveSWTDialog {
                             ff1 = Double.parseDouble(range[1]);
                         }
 
-                        if (ff0 > ff || ff >= ff1) {
+                        if ((ff0 > ff) || (ff >= ff1)) {
                             double[] ffArray = { 0, 5, 12, 32,
                                     Integer.MAX_VALUE };
 
@@ -737,7 +762,7 @@ public class CigVisTrendDlg extends CaveSWTDialog {
                                 ff0 = ffArray[i];
                                 ff1 = ffArray[i + 1];
 
-                                if (ff0 <= ff && ff < ff1) {
+                                if ((ff0 <= ff) && (ff < ff1)) {
                                     break;
                                 }
                             }
@@ -864,7 +889,7 @@ public class CigVisTrendDlg extends CaveSWTDialog {
     }
 
     private void retrieveData() {
-        if (siteList != null && siteList.getItemCount() != 0) {
+        if ((siteList != null) && (siteList.getItemCount() != 0)) {
             statusMessageComp.setMessageText(
                     "Retrieving data for "
                             + siteList.getItem(siteList.getSelectionIndex())
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/MetarDisplayDialog.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/MetarDisplayDialog.java
index 414a748eae..249229ffcc 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/MetarDisplayDialog.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/MetarDisplayDialog.java
@@ -46,6 +46,7 @@ import org.eclipse.swt.printing.Printer;
 import org.eclipse.swt.printing.PrinterData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
@@ -92,6 +93,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 4/12/2011    8861       rferrel     Added file permission check in savedata
  * 10/09/2012   1229       rferrel     Change to non-blocking dialog.
  * 10/15/2012   1229       rferrel     Changes for non-blocking HelpUsageDlg.
+ * 01/26/2016   5054       randerso    Allow dialog to be parented by display
  * 
  * </pre>
  * 
@@ -193,6 +195,30 @@ public class MetarDisplayDialog extends CaveSWTDialog implements
         this.showDecoded = true;
     }
 
+    /**
+     * Constructor.
+     * 
+     * @param display
+     * 
+     * @param icaos
+     *            Array of ICAOs
+     * @param msgType
+     *            Status message type.
+     * @param statusCompRGB
+     *            Message status comp background color.
+     */
+    public MetarDisplayDialog(Display display, java.util.List<String> icaos,
+            StatusMessageType msgType, RGB statusCompRGB) {
+        super(display, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
+                | CAVE.DO_NOT_BLOCK);
+        setText("AvnFPS - METAR Display");
+
+        this.icaos = icaos;
+        this.msgType = msgType;
+        this.statusCompRGB = statusCompRGB;
+        this.showDecoded = true;
+    }
+
     @Override
     protected Layout constructShellLayout() {
         // Create the main layout for the shell.
@@ -282,10 +308,10 @@ public class MetarDisplayDialog extends CaveSWTDialog implements
                     Rectangle trim = printer.computeTrim(0, 0, 0, 0);
                     Point dpi = printer.getDPI();
                     int leftMargin = dpi.x + trim.x;
-                    int rightMargin = clientArea.width - dpi.x + trim.x
+                    int rightMargin = (clientArea.width - dpi.x) + trim.x
                             + trim.width;
                     int topMargin = dpi.y + trim.y;
-                    int bottomMargin = clientArea.height - dpi.y + trim.y
+                    int bottomMargin = (clientArea.height - dpi.y) + trim.y
                             + trim.height;
 
                     int tabSize = 4;
@@ -330,20 +356,20 @@ public class MetarDisplayDialog extends CaveSWTDialog implements
                         char c = textToPrint.charAt(index);
                         index++;
                         if (c != 0) {
-                            if (c == 0x0a || c == 0x0d) {
-                                if (c == 0x0d && index < end
-                                        && textToPrint.charAt(index) == 0x0a) {
+                            if ((c == 0x0a) || (c == 0x0d)) {
+                                if ((c == 0x0d) && (index < end)
+                                        && (textToPrint.charAt(index) == 0x0a)) {
                                     index++;
                                 }
                                 if (wordBuffer.length() > 0) {
                                     String word = wordBuffer.toString();
                                     int wordWidth = gc.stringExtent(word).x;
-                                    if (x + wordWidth > rightMargin) {
+                                    if ((x + wordWidth) > rightMargin) {
                                         x = leftMargin;
                                         y += lineHeight;
-                                        if (y + lineHeight > bottomMargin) {
+                                        if ((y + lineHeight) > bottomMargin) {
                                             printer.endPage();
-                                            if (index + 1 < end) {
+                                            if ((index + 1) < end) {
                                                 y = topMargin;
                                                 printer.startPage();
                                             }
@@ -355,9 +381,9 @@ public class MetarDisplayDialog extends CaveSWTDialog implements
                                 }
                                 x = leftMargin;
                                 y += lineHeight;
-                                if (y + lineHeight > bottomMargin) {
+                                if ((y + lineHeight) > bottomMargin) {
                                     printer.endPage();
-                                    if (index + 1 < end) {
+                                    if ((index + 1) < end) {
                                         y = topMargin;
                                         printer.startPage();
                                     }
@@ -370,12 +396,12 @@ public class MetarDisplayDialog extends CaveSWTDialog implements
                                     if (wordBuffer.length() > 0) {
                                         String word = wordBuffer.toString();
                                         int wordWidth = gc.stringExtent(word).x;
-                                        if (x + wordWidth > rightMargin) {
+                                        if ((x + wordWidth) > rightMargin) {
                                             x = leftMargin;
                                             y += lineHeight;
-                                            if (y + lineHeight > bottomMargin) {
+                                            if ((y + lineHeight) > bottomMargin) {
                                                 printer.endPage();
-                                                if (index + 1 < end) {
+                                                if ((index + 1) < end) {
                                                     y = topMargin;
                                                     printer.startPage();
                                                 }
@@ -392,7 +418,7 @@ public class MetarDisplayDialog extends CaveSWTDialog implements
                             }
                         }
                     }
-                    if (y + lineHeight <= bottomMargin) {
+                    if ((y + lineHeight) <= bottomMargin) {
                         printer.endPage();
                     }
 
@@ -704,7 +730,7 @@ public class MetarDisplayDialog extends CaveSWTDialog implements
     }
 
     private void retrieveClimateData() {
-        if (stationList != null && stationList.getItemCount() != 0) {
+        if ((stationList != null) && (stationList.getItemCount() != 0)) {
             final int timeout = ClimateTimeoutManager.getInstance()
                     .getClimateMetarTimeout();
             final String site = stationList.getItem(stationList
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRoseConfigDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRoseConfigDlg.java
index 818b7fca6b..bf7a7aabc6 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRoseConfigDlg.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRoseConfigDlg.java
@@ -19,12 +19,10 @@
  **/
 package com.raytheon.viz.aviation.climatology;
 
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.INIConfiguration;
+import org.apache.commons.configuration.HierarchicalINIConfiguration;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -42,13 +40,14 @@ import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Spinner;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.viz.core.RGBColors;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 
@@ -62,6 +61,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 28 FEB 2008  938        lvenable    Initial creation 
  * 18 JUN 2008  1119       lvenable    Updated dialog to reflect user changes.
  * 04 OCT 2012  1229       rferrel     Made non-blocking.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 11, 2016 5242       dgilling    Removed calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -574,13 +575,7 @@ public class WindRoseConfigDlg extends CaveSWTDialog {
 
                 try {
                     updateData();
-                } catch (ConfigurationException e) {
-                    // TODO Auto-generated catch block
-                    System.err.println(e.getStackTrace());
-                } catch (LocalizationOpFailedException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                } catch (IOException e) {
+                } catch (Exception e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
                 }
@@ -605,13 +600,7 @@ public class WindRoseConfigDlg extends CaveSWTDialog {
 
                 try {
                     updateData();
-                } catch (ConfigurationException e) {
-                    // TODO Auto-generated catch block
-                    System.err.println(e.getStackTrace());
-                } catch (LocalizationOpFailedException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                } catch (IOException e) {
+                } catch (Exception e) {
                     // TODO Auto-generated catch block
                     e.printStackTrace();
                 }
@@ -691,11 +680,10 @@ public class WindRoseConfigDlg extends CaveSWTDialog {
      * 
      * @throws IOException
      * @throws ConfigurationException
-     * @throws LocalizationOpFailedException
-     * @throws LocalizationCommunicationException
+     * @throws LocalizationException
      */
     private void updateData() throws IOException, ConfigurationException,
-            LocalizationOpFailedException {
+            LocalizationException {
         windRoseConfigData.setCalmRgb(calmColor.getRGB());
         windRoseConfigData.setVariableRgb(variableColor.getRGB());
         windRoseConfigData.setVar1Rgb(windSpeed1Color.getRGB());
@@ -716,15 +704,9 @@ public class WindRoseConfigDlg extends CaveSWTDialog {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(
                 LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-        LocalizationFile lFile = pm.getLocalizationFile(context, filepath);
-        File file = lFile.getFile();
+        ILocalizationFile lFile = pm.getLocalizationFile(context, filepath);
 
-        if (!file.getParentFile().exists()) {
-            file.getParentFile().mkdirs();
-        }
-
-        INIConfiguration config;
-        config = new INIConfiguration();
+        HierarchicalINIConfiguration config = new HierarchicalINIConfiguration();
 
         config.setProperty("wind.num_spd", "4");
         config.setProperty("wind.num_dir", pointsCbo.getText());
@@ -755,10 +737,10 @@ public class WindRoseConfigDlg extends CaveSWTDialog {
         config.setProperty("wind_4.color",
                 RGBColors.getColorName(aboveColor.getRGB()));
 
-        FileWriter writer = new FileWriter(file);
-        config.save(writer);
-        writer.close();
-        lFile.save();
+        try (SaveableOutputStream outStream = lFile.openOutputStream()) {
+            config.save(outStream);
+            outStream.save();
+        }
     }
 
     /**
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRosePlotDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRosePlotDlg.java
index 5a308a114b..3ad148ea75 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRosePlotDlg.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/WindRosePlotDlg.java
@@ -48,6 +48,7 @@ import org.eclipse.swt.printing.PrinterData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Layout;
@@ -88,6 +89,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 08OCT2012    1229       rferrel     Made non-blocking.
  * 10/15/2012   1229       rferrel     Changes for non-blocking HelpUsageDlg.
  * 03Dec2013    16754      zhao        Modified printImage()
+ * 26Jan2016    5054       randerso    Allow dialog to be parented by display
  * 
  * </pre>
  * 
@@ -217,6 +219,29 @@ public class WindRosePlotDlg extends CaveSWTDialog {
         this.statusCompRGB = statusCompRGB;
     }
 
+    /**
+     * Constructor.
+     * 
+     * @param display
+     * 
+     * @param icaos
+     *            Array of ICAOs
+     * @param msgType
+     *            Status message type.
+     * @param statusCompRGB
+     *            Message status comp background color.
+     */
+    public WindRosePlotDlg(Display display, java.util.List<String> icaos,
+            StatusMessageType msgType, RGB statusCompRGB) {
+        super(display, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
+                | CAVE.DO_NOT_BLOCK);
+        setText("Wind Rose Plot");
+
+        this.icaos = icaos;
+        this.msgType = msgType;
+        this.statusCompRGB = statusCompRGB;
+    }
+
     @Override
     protected Layout constructShellLayout() {
         // Create the main layout for the shell.
@@ -333,7 +358,7 @@ public class WindRosePlotDlg extends CaveSWTDialog {
         configureMI.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
-                if (configDlg == null || configDlg.getShell() == null
+                if ((configDlg == null) || (configDlg.getShell() == null)
                         || configDlg.isDisposed()) {
                     configDlg = new WindRoseConfigDlg(shell, windRoseConfigData);
                     configDlg.open();
@@ -594,7 +619,7 @@ public class WindRosePlotDlg extends CaveSWTDialog {
      * Redraw the Wind Rose diagram.
      */
     private void redrawWindRose() {
-        if (siteList != null && siteList.getItemCount() != 0) {
+        if ((siteList != null) && (siteList.getItemCount() != 0)) {
             if (waitCursor == null) {
                 waitCursor = new Cursor(shell.getDisplay(), SWT.CURSOR_WAIT);
                 defaultCursor = shell.getCursor();
@@ -672,8 +697,8 @@ public class WindRosePlotDlg extends CaveSWTDialog {
 
             if ((numMonthsCbo.getSelectionIndex() + monthCbo
                     .getSelectionIndex()) > 11) {
-                endMonth = numMonthsCbo.getSelectionIndex()
-                        + monthCbo.getSelectionIndex() - 12;
+                endMonth = (numMonthsCbo.getSelectionIndex() + monthCbo
+                        .getSelectionIndex()) - 12;
                 header.append(MONTHS[endMonth]);
             } else {
                 endMonth = numMonthsCbo.getSelectionIndex()
@@ -693,8 +718,8 @@ public class WindRosePlotDlg extends CaveSWTDialog {
             int endHour = 0;
 
             if (((numHoursSpnr.getSelection() - 1) + hourSpnr.getSelection()) > 23) {
-                endHour = (numHoursSpnr.getSelection() - 1)
-                        + hourSpnr.getSelection() - 24;
+                endHour = ((numHoursSpnr.getSelection() - 1) + hourSpnr
+                        .getSelection()) - 24;
                 header.append(String.format(hourFmt, endHour));
             } else {
                 endHour = (numHoursSpnr.getSelection() - 1)
@@ -747,11 +772,12 @@ public class WindRosePlotDlg extends CaveSWTDialog {
             Point screenDPI = shell.getDisplay().getDPI();
             Point printerDPI = printer.getDPI();
             Rectangle bounds = printer.getBounds();
-            int destX = (screenDPI.x*bounds.width - printerDPI.x*imageData.width)/screenDPI.x/2;
+            int destX = ((screenDPI.x * bounds.width) - (printerDPI.x * imageData.width))
+                    / screenDPI.x / 2;
             if (destX < 0) {
                 destX = 0;
             }
-            int destY = (screenDPI.x*bounds.height - printerDPI.x*imageData.height)/screenDPI.x*80/100/2;
+            int destY = ((((screenDPI.x * bounds.height) - (printerDPI.x * imageData.height)) / screenDPI.x) * 80) / 100 / 2;
             if (destY < 0) {
                 destY = 0;
             }
@@ -760,9 +786,10 @@ public class WindRosePlotDlg extends CaveSWTDialog {
             Image printerImage = new Image(printer, imageData);
 
             if (printer.startPage()) {
-                gc.drawImage(printerImage, 0, 0, imageData.width, imageData.height, destX, destY, 
-                                printerDPI.x*imageData.width/screenDPI.x, 
-                                printerDPI.x*imageData.height/screenDPI.x);
+                gc.drawImage(printerImage, 0, 0, imageData.width,
+                        imageData.height, destX, destY,
+                        (printerDPI.x * imageData.width) / screenDPI.x,
+                        (printerDPI.x * imageData.height) / screenDPI.x);
                 printer.endPage();
             }
 
@@ -816,11 +843,11 @@ public class WindRosePlotDlg extends CaveSWTDialog {
             String station = siteList.getItem(siteList.getSelectionIndex());
             TafSiteData site = config.getSite(station);
             double center_lat = Double.parseDouble(site.latitude)
-                    - Math.toDegrees(kmlOffset * kmlSize / 6378.0);
+                    - Math.toDegrees((kmlOffset * kmlSize) / 6378.0);
             double center_lon = Double.parseDouble(site.longitude);
             double aspect = 1.0;
             double lat_offset = Math.toDegrees(kmlSize / (2.0 * 6378.0));
-            double lon_offset = aspect * lat_offset
+            double lon_offset = (aspect * lat_offset)
                     / Math.cos(Math.toRadians(center_lat));
             double north_lat = center_lat + lat_offset;
             double south_lat = center_lat - lat_offset;
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
index 3417678d4e..1d0c5e053c 100755
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
@@ -24,8 +24,11 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.lang.reflect.Constructor;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -90,12 +93,13 @@ import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 
 import com.raytheon.uf.common.dataplugin.taf.TafRecord;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.python.PyUtil;
 import com.raytheon.uf.common.python.PythonScript;
@@ -248,8 +252,10 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeOperations;
  * Oct 16, 2015 4645        skorolev    Added updateWordWrap.
  * 10/23/2015   18061       zhao        Fixed a bug in checkBaiscSyntaxError() 
  * Nov 12, 2015 4834        njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Nov 12, 2015 4834        njensen     Changed LocalizationOpFailedException to LocalizationException
  * Dec 09, 2015 4645        skorolev    Initiated wrapChk using ResourceTag. Removed popup menu persistance.
  * Jan 07, 2016 4860        skorolev    Initiated TextDisplayModel at start of dialog.
+ * Feb 11, 2016 5242        dgilling    Remove calls to deprecated Localization APIs.
  * Feb 15, 2016 4860        njensen     Use AviationTextUtility directly
  * 
  * </pre>
@@ -2399,10 +2405,10 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
                 setWaitCursor(true);
                 String fname = tempTafPath
                         + filepath.substring(filepath.lastIndexOf('/') + 1);
-                LocalizationFile lFile = pm.getLocalizationFile(context, fname);
-                File file = lFile.getFile();
+                ILocalizationFile lFile = pm
+                        .getLocalizationFile(context, fname);
 
-                if (filename == null && file.exists()) {
+                if (filename == null && lFile.exists()) {
                     MessageBox questionMB = new MessageBox(shell,
                             SWT.ICON_WARNING | SWT.OK | SWT.CANCEL);
                     questionMB.setText("Save TAF");
@@ -2415,34 +2421,32 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
                     }
                 }
 
-                FileWriter writer = new FileWriter(file);
-                BufferedWriter output = new BufferedWriter(writer);
-                // Save WMO, wmo site, issue time, and BBB on first line
-                output.write(editorTafTabComp.getWmoId());
-                output.write("\t");
-                output.write(editorTafTabComp.getWmoSiteId());
-                output.write("\t");
-                output.write(editorTafTabComp.getLargeTF());
-                output.write(System.getProperty("line.separator"));
-                output.write(editorTafTabComp.getTextEditorControl().getText());
-                output.close();
+                try (SaveableOutputStream outStream = lFile.openOutputStream();
+                        Writer out = new BufferedWriter(new OutputStreamWriter(
+                                outStream))) {
+                    // Save WMO, wmo site, issue time, and BBB on first line
+                    out.write(editorTafTabComp.getWmoId());
+                    out.write("\t");
+                    out.write(editorTafTabComp.getWmoSiteId());
+                    out.write("\t");
+                    out.write(editorTafTabComp.getLargeTF());
+                    out.write(System.getProperty("line.separator"));
+                    out.write(editorTafTabComp.getTextEditorControl().getText());
+                    out.close();
+                    outStream.save();
 
-                lFile.save();
+                    setMessageStatusOK("File " + filepath
+                            + " saved successfully.");
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    setMessageStatusError("An IOException occured while saving file "
+                            + filepath);
+                } catch (LocalizationException e) {
+                    e.printStackTrace();
+                    setMessageStatusError("A LocalizationOpFailedException occured while saving file "
+                            + filepath);
+                }
 
-                setMessageStatusOK("File " + filepath + " saved successfully.");
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                setMessageStatusError("Unable to open file " + filepath
-                        + " for writing.");
-
-            } catch (IOException e) {
-                e.printStackTrace();
-                setMessageStatusError("An IOException occured while saving file "
-                        + filepath);
-            } catch (LocalizationException e) {
-                e.printStackTrace();
-                setMessageStatusError("A LocalizationOpFailedException occured while saving file "
-                        + filepath);
             } finally {
                 setWaitCursor(false);
             }
@@ -2592,45 +2596,48 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
 
                     try {
                         setWaitCursor(true);
+
                         String fname = tempTafPath
                                 + filepath
                                         .substring(filepath.lastIndexOf('/') + 1);
-                        LocalizationFile lFile = pm.getLocalizationFile(
+                        ILocalizationFile lFile = pm.getLocalizationFile(
                                 context, fname);
-                        File file = lFile.getFile();
-                        FileReader reader = new FileReader(file);
-                        BufferedReader input = new BufferedReader(reader);
-                        StringBuilder contents = new StringBuilder();
-                        String line = null;
-                        line = input.readLine();
 
-                        if (line == null) {
-                            errorMsg = "empty file";
-                        } else {
-                            String[] values = line.split("\t");
-                            // Assume first line contains wmo, wmo site
-                            // and issue time.
-                            if (values.length != 3) {
-                                errorMsg = "parse error";
+                        StringBuilder contents = new StringBuilder();
+                        try (InputStream inStream = lFile.openInputStream();
+                                BufferedReader in = new BufferedReader(
+                                        new InputStreamReader(inStream))) {
+                            String line = null;
+                            line = in.readLine();
+
+                            if (line == null) {
+                                errorMsg = "empty file";
+                            } else {
+                                String[] values = line.split("\t");
+                                // Assume first line contains wmo, wmo site
+                                // and issue time.
+                                if (values.length != 3) {
+                                    errorMsg = "parse error";
+                                    contents.append(line);
+                                    contents.append(System
+                                            .getProperty("line.separator"));
+                                } else {
+                                    editorTafTabComp.setWmoIdLbl(values[0]
+                                            .trim());
+                                    editorTafTabComp.setWmoSiteLbl(values[1]
+                                            .trim());
+                                    editorTafTabComp.setLargeTF(values[2]
+                                            .trim());
+                                }
+                            }
+
+                            while ((line = in.readLine()) != null) {
                                 contents.append(line);
                                 contents.append(System
                                         .getProperty("line.separator"));
-                            } else {
-                                editorTafTabComp.setWmoIdLbl(values[0].trim());
-                                editorTafTabComp
-                                        .setWmoSiteLbl(values[1].trim());
-                                editorTafTabComp.setLargeTF(values[2].trim());
                             }
                         }
 
-                        while ((line = input.readLine()) != null) {
-                            contents.append(line);
-                            contents.append(System
-                                    .getProperty("line.separator"));
-                        }
-
-                        input.close();
-
                         String tafText = contents.toString();
                         List<String> sitesInTaf = getSitesInTaf(tafText);
                         String icao = "----";
@@ -2640,7 +2647,7 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
                             bbb = editorTafTabComp.getBBB();
                         }
 
-                        if (sitesInTaf.size() > 0) {
+                        if (!sitesInTaf.isEmpty()) {
                             icao = sitesInTaf.get(0);
                         } else if (errorMsg == null) {
                             errorMsg = "uable to determine station";
@@ -2653,19 +2660,16 @@ public class TafViewerEditorDlg extends CaveSWTDialog implements ITafSettable,
                         if (editorTafTabComp.isTafSent()) {
                             editorTafTabComp.updateTafSent(false);
                         }
-                    } catch (FileNotFoundException e) {
-                        setMessageStatusError("File " + filepath
-                                + " not found.");
-                    } catch (IOException e) {
-                        setMessageStatusError("An IOException occured while opening file "
+
+                        setMessageStatusOK("File " + filepath
+                                + " opened successfully.");
+                    } catch (IOException | LocalizationException e) {
+                        setMessageStatusError("An Exception occured while reading file "
                                 + filepath);
                     } finally {
                         if (errorMsg != null) {
                             setMessageStatusError("File " + filepath + ": "
                                     + errorMsg);
-                        } else {
-                            setMessageStatusOK("File " + filepath
-                                    + " opened successfully.");
                         }
                         setWaitCursor(false);
                     }
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/guidance/MosViewer.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/guidance/MosViewer.java
index 7229a26075..cff156d43a 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/guidance/MosViewer.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/guidance/MosViewer.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -43,9 +43,9 @@ import com.raytheon.viz.aviation.resource.ResourceConfigMgr.ResourceTag;
 
 /**
  * MosViewer class contains a basic setup for the Guidance tab on the TAF viewer
- * editor dialog. This setup is currently used by the GFS-MOS, GFSLAMP, ETA-MOS,
- * and NGM-MOS tabs.
- * 
+ * editor dialog. This setup is currently used by the GFS-MOS, GFSLAMP, and
+ * ETA-MOS tabs.
+ *
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
@@ -55,12 +55,13 @@ import com.raytheon.viz.aviation.resource.ResourceConfigMgr.ResourceTag;
  * 01 Dec 2010  3263       rferrel     Created generateToolTip to get table tool tips.
  * 28 APR 2011  8065       rferrel     Add flag to indicate display is current
  *                                     and implement data caching
- * 
+ * Feb 09, 2016 5283       nabowle     Remove NGM MOS support.
+ *
  * </pre>
- * 
+ *
  * @author lvenable
  * @version 1.0
- * 
+ *
  */
 public class MosViewer extends ViewerTab implements
         IRequestCompleteListener<String[]> {
@@ -174,7 +175,7 @@ public class MosViewer extends ViewerTab implements
 
     /**
      * Constructor.
-     * 
+     *
      * @param parent
      *            Parent composite.
      */
@@ -534,7 +535,7 @@ public class MosViewer extends ViewerTab implements
 
     /**
      * Check if the text starts with any probability text.
-     * 
+     *
      * @param textLine
      *            List of text to test against.
      * @return True if probability, false otherwise.
@@ -553,7 +554,7 @@ public class MosViewer extends ViewerTab implements
 
     /**
      * Getter/Accessor of stationList (based on configuration)
-     * 
+     *
      * @return stationList
      */
     @Override
@@ -563,7 +564,7 @@ public class MosViewer extends ViewerTab implements
 
     /**
      * Setter/Mutator of stationList (based on configuration)
-     * 
+     *
      * @param stationList
      */
     @Override
@@ -593,12 +594,6 @@ public class MosViewer extends ViewerTab implements
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.aviation.guidance.ViewerTab#getSite(java.lang.String)
-     */
     @Override
     public String getSite(String site) {
         return chooseModel(site, model);
@@ -606,7 +601,7 @@ public class MosViewer extends ViewerTab implements
 
     /**
      * Obtain the model.
-     * 
+     *
      * @return model
      */
     public String getModel() {
diff --git a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/SendDialog.java b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/SendDialog.java
index 70b017e7f0..f3560149c0 100644
--- a/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/SendDialog.java
+++ b/cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/SendDialog.java
@@ -88,7 +88,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 20May2015    4510       rferrel     Added {@link #getForecasterId()}.
  * Sep 25, 2015 4918       rferrel     Allow selection of forecaster to send a TAF.
  * Nov 06, 2015 5108       rferrel     Display warning when forecast xmittime will result in a
- *                                      header time the same as any existing pending forecast.
+ *                                     header time the same as any existing pending forecast.
+ * Feb 12, 2016 5335       tgurney     Add alert popup when TAF send fails
  * 
  * </pre>
  * 
@@ -337,6 +338,9 @@ public class SendDialog extends CaveSWTDialog {
         configMgr.setDefaultFontAndColors(repsonsibleLbl);
 
         List<ForecasterConfig> forecasters = getForecasters();
+        if (forecasters == null) {
+            forecasters = new ArrayList<ForecasterConfig>();
+        }
         String forecaster = AviationDialog.getForecaster();
         gd = new GridData(SWT.CENTER, SWT.DEFAULT, false, false);
         gd.minimumWidth = 100;
@@ -454,6 +458,8 @@ public class SendDialog extends CaveSWTDialog {
                     .getSelectionIndex());
             forecasterId = selString.split("\\s+")[1];
         } catch (IllegalArgumentException ex) {
+            String msg = "Cannot send the TAF. No forecaster is selected.";
+            statusHandler.handle(Priority.SIGNIFICANT, msg, ex);
             return;
         }
 
@@ -673,7 +679,7 @@ public class SendDialog extends CaveSWTDialog {
 
         File f = AvnConfigFileUtil.getStaticFile(FORECAST_CONFIG_FILE);
         if (f == null) {
-            statusHandler.handle(Priority.PROBLEM,
+            statusHandler.handle(Priority.SIGNIFICANT,
                     "Cannot send the TAF. Unable to load, "
                             + FORECAST_CONFIG_FILE
                             + ", unable to obtain forecaster's ID. ");
@@ -683,7 +689,7 @@ public class SendDialog extends CaveSWTDialog {
             forecasters = JAXB.unmarshal(f, AviationForecasterConfig.class)
                     .getForecasterConfig();
         } catch (RuntimeException ex) {
-            statusHandler.handle(Priority.PROBLEM,
+            statusHandler.handle(Priority.SIGNIFICANT,
                     "Cannot send the TAF. Unable to parse, "
                             + FORECAST_CONFIG_FILE
                             + ", unable to obtain forecaster's ID. ", ex);
diff --git a/cave/com.raytheon.viz.avnconfig/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.avnconfig/META-INF/MANIFEST.MF
index 1e17761e4d..93499930de 100644
--- a/cave/com.raytheon.viz.avnconfig/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.avnconfig/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Avnconfig Plug-in
 Bundle-SymbolicName: com.raytheon.viz.avnconfig;singleton:=true
-Bundle-Version: 1.15.0.qualifier
+Bundle-Version: 1.15.1.qualifier
 Bundle-Activator: com.raytheon.viz.avnconfig.Activator
 Bundle-Vendor: Raytheon
 Require-Bundle: org.eclipse.ui,
@@ -10,8 +10,8 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.uf.viz.core,
  com.raytheon.viz.ui;bundle-version="1.11.9",
  org.geotools,
- org.apache.commons.lang;bundle-version="2.3.0",
- com.raytheon.viz.pointdata;bundle-version="1.15.0"
+ com.raytheon.viz.pointdata;bundle-version="1.15.0",
+ org.apache.commons.configuration;bundle-version="1.10.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.raytheon.uf.common.dataplugin.persist,
@@ -22,8 +22,7 @@ Import-Package: com.raytheon.uf.common.dataplugin.persist,
  com.raytheon.uf.common.pointdata.spatial,
  com.raytheon.uf.common.serialization.comm,
  com.raytheon.uf.common.time,
- com.raytheon.uf.common.util,
- org.apache.commons.configuration
+ com.raytheon.uf.common.util
 Export-Package: com.raytheon.viz.avncommon,
  com.raytheon.viz.avnconfig
 Bundle-ClassPath: com.raytheon.viz.avnconfig.jar
diff --git a/cave/com.raytheon.viz.avnconfig/localization/aviation/python/MosData.py b/cave/com.raytheon.viz.avnconfig/localization/aviation/python/MosData.py
index 8a6b6b8926..f552d47384 100644
--- a/cave/com.raytheon.viz.avnconfig/localization/aviation/python/MosData.py
+++ b/cave/com.raytheon.viz.avnconfig/localization/aviation/python/MosData.py
@@ -327,7 +327,15 @@
 #       	Relationship Type: In Response to
 #       	Status:           TEST
 #       	Title:             AvnFPS: Allow WFOs to update HDF5 climate files
-#       
+#
+# ----------------------------------------------------------------------------
+#
+#     SOFTWARE HISTORY
+#
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    02/09/2016      5283          nabowle        Remove NGM support.
+#
 #
 import cPickle, logging, os, time
 import numpy
@@ -640,7 +648,7 @@ class _NetCDFFile:
             self._validTimeList.append(self.issuetime + (f * 3600))
         
         #
-        # NGMMOS.  The internal ID should be four characters long.
+        # The internal ID should be four characters long.
         if len(ident) == 3:
             ident = 'K'+ident
             
@@ -773,19 +781,6 @@ class _AvnNetCDFFile(_NetCDFFile):
     Header = 'AVN MOS Guidance'
     Model = 'AVN'    
 
-###############################################################################
-class _NgmNetCDFFile(_NetCDFFile):
-    """NGM MOS NetCDF file"""
-    NumData = 15    # 42 hours
-    NumVsbyCat = 5
-    NumCigCat = 7
-    POP6hr = 'POP6hr'   # to avoid repeating code
-    SEVERE6hr='severe6hr'
-    VsbyValues = {1: 0.25, 2: 0.75, 3: 2.0, 4: 4.0, 5: 99.0}
-    CigValues = {1: 100, 2: 400, 3: 700, 4: 2000, 5: 5000, 6: 10000, 7: 25000}
-    Header = 'NGM MOS Guidance'
-    Model = 'NGM'    
-
 ###############################################################################
 class _GfsNetCDFFile(_NetCDFFile):
     """GFS MOS NetCDF file"""
@@ -1210,8 +1205,6 @@ def _cleanup(path, nhours):
 def retrieve(model, idlist, includeReport, refTime=None):
     if model == 'avnmos':
         nc = _AvnNetCDFFile()
-    elif model == 'ngmmos':
-        nc = _NgmNetCDFFile()
     elif model == 'gfsmos':
         nc = _GfsNetCDFFile()
     elif model == 'etamos':
diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfiguration.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfiguration.java
index 10a82b1999..fe113e1d68 100644
--- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfiguration.java
+++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/AvnConfiguration.java
@@ -19,21 +19,22 @@
  **/
 package com.raytheon.viz.avnconfig;
 
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.HierarchicalINIConfiguration;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -63,6 +64,9 @@ import com.raytheon.viz.avnconfig.AvnConfigConstants.RuleType;
  * Aug 07, 2014 3502       bclement     changes to StringUtil.split()
  * Jun 02, 2015 17533      yteng       changes to getRules() to retrieve 
  *                                     all rules
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 11, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
+ * 
  * </pre>
  * 
  * @author avarani
@@ -251,28 +255,27 @@ public class AvnConfiguration {
      *            - The array of rules
      * @throws ConfigurationException
      * @throws IOException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public void setRules(String site, DataSource source,
             ArrayList<MethodData> data) throws ConfigurationException,
-            IOException, LocalizationOpFailedException {
+            IOException, LocalizationException {
         String filepath = "aviation/config/tafs/" + site + "/"
                 + source.getFilename();
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(
                 LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
-        LocalizationFile lFile = pm.getLocalizationFile(context, filepath);
-        File file = lFile.getFile();
+        ILocalizationFile lFile = pm.getLocalizationFile(context, filepath);
 
-        if (!file.getParentFile().exists()) {
-            file.getParentFile().mkdirs();
+        HierarchicalINIConfiguration config = new HierarchicalINIConfiguration();
+        if (lFile.exists()) {
+            try (InputStream inStream = lFile.openInputStream()) {
+                config.load(inStream);
+            }
         }
-
-        HierarchicalINIConfiguration config = new HierarchicalINIConfiguration(
-                file);
         config.setDelimiterParsingDisabled(true);
-        int numActiveRules = 0;
 
+        int numActiveRules = 0;
         for (MethodData method : data) {
             String key = "rule_" + numActiveRules;
             config.setProperty(key + ".method", method.getMethodName());
@@ -287,7 +290,7 @@ public class AvnConfiguration {
                 config.setProperty(key + ".msgfromfile", Boolean.toString(true));
             }
 
-            ArrayList<MethodArgData> args = method.getMethodArgsArray();
+            List<MethodArgData> args = method.getMethodArgsArray();
 
             for (MethodArgData arg : args) {
                 config.setProperty(key + "." + arg.getArgName(),
@@ -298,7 +301,6 @@ public class AvnConfiguration {
         }
 
         String activeRules = "";
-
         for (int i = 0; i < numActiveRules; i++) {
             activeRules += i;
 
@@ -309,10 +311,10 @@ public class AvnConfiguration {
 
         config.setProperty("rules.active", activeRules);
 
-        FileWriter writer = new FileWriter(file);
-        config.save(writer);
-        writer.close();
-        lFile.save();
+        try (SaveableOutputStream outStream = lFile.openOutputStream()) {
+            config.save(outStream);
+            outStream.save();
+        }
     }
 
     /**
@@ -327,14 +329,16 @@ public class AvnConfiguration {
      * @return rules
      * @throws ConfigurationException
      * @throws IOException
+     * @throws LocalizationException
      */
     public ArrayList<MethodData> getRules(String site, DataSource source,
-            final int maxSeverity) throws ConfigurationException, IOException {
+            final int maxSeverity) throws ConfigurationException, IOException,
+            LocalizationException {
         ArrayList<MethodData> rules = new ArrayList<MethodData>();
         String filepath = "aviation/config/tafs/" + site + "/"
                 + source.getFilename();
         IPathManager pm = PathManagerFactory.getPathManager();
-        LocalizationFile lFile = pm.getStaticLocalizationFile(filepath);
+        ILocalizationFile lFile = pm.getStaticLocalizationFile(filepath);
 
         if (lFile == null) {
             if (site.equals("XXXX")) {
@@ -345,23 +349,23 @@ public class AvnConfiguration {
             }
         }
 
-        File file = lFile.getFile();
-
-        if (!file.exists()) {
+        if (!lFile.exists()) {
             return getRules("XXXX", source, maxSeverity);
         } else {
             MethodData defaultRule = null;
-            ArrayList<MethodData> defaultRules = getRules(source);
-            HierarchicalINIConfiguration config = new HierarchicalINIConfiguration(
-                    file);
+            List<MethodData> defaultRules = getRules(source);
+            HierarchicalINIConfiguration config = new HierarchicalINIConfiguration();
+            try (InputStream inStream = lFile.openInputStream()) {
+                config.load(inStream);
+            }
             config.setDelimiterParsingDisabled(true);
-            
+
             String[] activeRules = config.getStringArray("rules.active");
-            if (activeRules == null || activeRules.length == 0)  {
-                throw new ConfigurationException(file.getName()
+            if (activeRules == null || activeRules.length == 0) {
+                throw new ConfigurationException(lFile.getPath()
                         + ", no list of active rules");
             }
-            
+
             for (String activeRule : activeRules) {
                 if (activeRule.trim().equals("")) {
                     continue;
@@ -370,7 +374,7 @@ public class AvnConfiguration {
                 String method = config.getString(key + ".method");
 
                 if (method == null) {
-                    throw new ConfigurationException(file.getName()
+                    throw new ConfigurationException(lFile.getPath()
                             + " unable to find [" + key + "]");
                 }
 
@@ -413,21 +417,21 @@ public class AvnConfiguration {
                     if (sevIndex < MINIMUM_SEVERITY) {
                         errMsg = String
                                 .format("File \"%s\" missing severity in rule %s and default is bad value %d; using %d.",
-                                        file.getAbsoluteFile(), key, sevIndex,
+                                        lFile.getPath(), key, sevIndex,
                                         MINIMUM_SEVERITY);
                         sevIndex = MINIMUM_SEVERITY;
                     } else if (sevIndex > maxSeverity) {
                         errMsg = String
                                 .format("File \"%s\" missing severity in rule %s and default is bad value %d; using %d."
                                         + "\nThis may be caused by SyntaxMonitorCfg.xml not having enough colors listed in the tag <MonitorColors>",
-                                        file.getAbsoluteFile(), key, sevIndex,
+                                        lFile.getPath(), key, sevIndex,
                                         maxSeverity);
                         sevIndex = maxSeverity;
                     } else {
                         priority = Priority.INFO;
                         errMsg = String
                                 .format("File \"%s\" missing severity in rule %s using default %d",
-                                        file.getAbsoluteFile(), key, sevIndex);
+                                        lFile.getPath(), key, sevIndex);
                     }
                 } else {
                     try {
@@ -435,21 +439,21 @@ public class AvnConfiguration {
                         if (sevIndex < MINIMUM_SEVERITY) {
                             errMsg = String
                                     .format("File \"%s\" in rule %s bad severity value %d; using %d.",
-                                            file.getAbsoluteFile(), key,
-                                            sevIndex, MINIMUM_SEVERITY);
+                                            lFile.getPath(), key, sevIndex,
+                                            MINIMUM_SEVERITY);
                             sevIndex = MINIMUM_SEVERITY;
                         } else if (sevIndex > maxSeverity) {
                             errMsg = String
                                     .format("File \"%s\" in rule %s bad severity value %d; using %d."
                                             + "\nThis may be caused by SyntaxMonitorCfg.xml not having enough colors listed in the tag <MonitorColors>",
-                                            file.getAbsoluteFile(), key,
-                                            sevIndex, maxSeverity);
+                                            lFile.getPath(), key, sevIndex,
+                                            maxSeverity);
                             sevIndex = maxSeverity;
                         }
                     } catch (NumberFormatException ex) {
                         errMsg = String
                                 .format("File \"%s\" in rule %s bad severity value %s; using %d.",
-                                        file.getAbsoluteFile(), key, severity,
+                                        lFile.getPath(), key, severity,
                                         MINIMUM_SEVERITY);
                         sevIndex = MINIMUM_SEVERITY;
                     }
@@ -466,8 +470,8 @@ public class AvnConfiguration {
                 }
 
                 // Should always be a default value for the optional arguments.
-                ArrayList<String> args = defaultRule.getArgs();
-                ArrayList<String> defaultArgValues = defaultRule.getArgValues();
+                List<String> args = defaultRule.getArgs();
+                List<String> defaultArgValues = defaultRule.getArgValues();
 
                 for (int i = 0; i < args.size(); i++) {
                     String arg = args.get(i);
diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/ITafSiteConfig.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/ITafSiteConfig.java
index 5f30c11c81..21f1b9e257 100644
--- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/ITafSiteConfig.java
+++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/ITafSiteConfig.java
@@ -8,7 +8,7 @@ import java.util.Map;
 import org.apache.commons.configuration.ConfigurationException;
 
 import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.viz.avnconfig.AvnConfigConstants.triggerType;
 
 /**
@@ -24,6 +24,7 @@ import com.raytheon.viz.avnconfig.AvnConfigConstants.triggerType;
  * Oct 20, 2010            rferrel     Initial creation
  * Dec  7, 2010 7621       rferrel     Added getTemplateFile.
  * Feb 16, 2011 7878       rferrel     Modifications to handle ids.cfg.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
  * 
  * </pre>
  * 
@@ -60,11 +61,10 @@ public interface ITafSiteConfig {
      * @param defaultProduct
      *            - New default product
      * @throws ConfigurationException
-     * @throws LocalizationCommunicationException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public void setDefault(String defaultProduct)
-            throws ConfigurationException, LocalizationOpFailedException;
+            throws ConfigurationException, LocalizationException;
 
     /**
      * @return defaultProduct
@@ -107,12 +107,11 @@ public interface ITafSiteConfig {
      * @param collectivePil
      *            - product's collective Pil value
      * @throws ConfigurationException
-     * @throws LocalizationCommunicationException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public void saveProduct(String newProduct, List<String> siteList,
             String workPil, String collectivePil)
-            throws ConfigurationException, LocalizationOpFailedException;
+            throws ConfigurationException, LocalizationException;
 
     /**
      * Removes a product and save the change.
@@ -120,11 +119,10 @@ public interface ITafSiteConfig {
      * @param product
      *            - product name to delete
      * @throws ConfigurationException
-     * @throws LocalizationCommunicationException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public void deleteProduct(String product) throws ConfigurationException,
-            LocalizationOpFailedException;
+            LocalizationException;
 
     /**
      * Update a site's start Hour template and save the change.
@@ -136,11 +134,10 @@ public interface ITafSiteConfig {
      * @param template
      *            - new template
      * @throws ConfigurationException
-     * @throws LocalizationCommunicationException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public void saveTafTemplate(String siteId, String startHour, String template)
-            throws ConfigurationException, LocalizationOpFailedException;
+            throws ConfigurationException, LocalizationException;
 
     /**
      * Obtain the template for the given site and start hour
@@ -172,11 +169,10 @@ public interface ITafSiteConfig {
      *            - new taf site data
      * @throws IOException
      * @throws ConfigurationException
-     * @throws LocalizationCommunicationException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public void setSite(String siteId, TafSiteData site) throws IOException,
-            ConfigurationException, LocalizationOpFailedException;
+            ConfigurationException, LocalizationException;
 
     /**
      * Get a sorted list of sites names.
@@ -210,10 +206,10 @@ public interface ITafSiteConfig {
      * @return identList
      * @throws IOException
      * @throws ConfigurationException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public List<String> getIdsSiteList() throws IOException,
-            ConfigurationException, LocalizationOpFailedException;
+            ConfigurationException, LocalizationException;
 
     /**
      * Get pil value for the desired site.
@@ -222,10 +218,10 @@ public interface ITafSiteConfig {
      * @return pil
      * @throws IOException
      * @throws ConfigurationException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public String getIdsPil(String site) throws IOException,
-            ConfigurationException, LocalizationOpFailedException;
+            ConfigurationException, LocalizationException;
 
     /**
      * Generate a ids site/ident entry.
@@ -236,18 +232,18 @@ public interface ITafSiteConfig {
      *            - site's pil/METAR AFOS ID
      * @throws IOException
      * @throws ConfigurationException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public void setIdsSite(String site, String pil) throws IOException,
-            ConfigurationException, LocalizationOpFailedException;
+            ConfigurationException, LocalizationException;
 
     /**
      * Delete the ids site/ident entry.
      * 
      * @param site
      * @throws ConfigurationException
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
     public void removeIdsSite(String site) throws ConfigurationException,
-            LocalizationOpFailedException;
+            LocalizationException;
 }
diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/OpenDlg.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/OpenDlg.java
index 3b272fb6bc..2845165644 100644
--- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/OpenDlg.java
+++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/OpenDlg.java
@@ -36,9 +36,9 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Shell;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 
@@ -55,10 +55,10 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  *                                     Initial creation.
  * Oct 12, 2012 1229       rferrel     Made subclass of CaveSWTDialog
  *                                      and non-blocking.
+ * Jan 20, 2016 5242       njensen     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
- * @version 1.0
  */
 public class OpenDlg extends CaveSWTDialog {
 
@@ -75,19 +75,18 @@ public class OpenDlg extends CaveSWTDialog {
     /**
      * List of localized files used to generate the file list.
      */
-    private LocalizationFile[] locFiles;
+    private ILocalizationFile[] locFiles;
 
     /**
      * Uses file's display name as key to get the associated localized file.
      */
-    private Map<String, LocalizationFile> locFileMap;
+    private Map<String, ILocalizationFile> locFileMap;
 
     /**
      * Constructor
      * 
      * @param parent
      *            shell
-     * @param type
      */
     public OpenDlg(Shell parent) {
         super(parent, SWT.TITLE, CAVE.DO_NOT_BLOCK);
@@ -118,7 +117,7 @@ public class OpenDlg extends CaveSWTDialog {
      * Set up the dialog's display components.
      */
     private void initializeComponents() {
-        locFileMap = new TreeMap<String, LocalizationFile>();
+        locFileMap = new TreeMap<>();
         controlFont = new Font(shell.getDisplay(), "Monospace", 10, SWT.NORMAL);
 
         createListControl();
@@ -176,7 +175,7 @@ public class OpenDlg extends CaveSWTDialog {
             public void widgetSelected(SelectionEvent event) {
                 int selectedIndex = cfgFileList.getSelectionIndex();
                 String str = cfgFileList.getItem(selectedIndex);
-                LocalizationFile selectedFile = locFileMap.get(str);
+                ILocalizationFile selectedFile = locFileMap.get(str);
                 setReturnValue(selectedFile);
                 close();
             }
@@ -203,7 +202,7 @@ public class OpenDlg extends CaveSWTDialog {
         LocalizationType[] types = new LocalizationType[] {
                 LocalizationType.CAVE_CONFIG, LocalizationType.CAVE_STATIC,
                 LocalizationType.COMMON_STATIC };
-        ArrayList<LocalizationFile> localFiles = new ArrayList<LocalizationFile>();
+        java.util.List<ILocalizationFile> localFiles = new ArrayList<>();
         for (LocalizationType type : types) {
             LocalizationContext[] contexts = PathManagerFactory
                     .getPathManager().getLocalSearchHierarchy(type);
@@ -213,13 +212,13 @@ public class OpenDlg extends CaveSWTDialog {
                                 extensions, true, true)));
             }
         }
-        locFiles = localFiles.toArray(new LocalizationFile[0]);
+        locFiles = localFiles.toArray(new ILocalizationFile[0]);
         if (locFiles == null) {
             return;
         }
 
         for (int i = 0; i < locFiles.length; i++) {
-            if (locFiles[i].getName().startsWith("aviation/avnsetup") == false) {
+            if (locFiles[i].getPath().startsWith("aviation/avnsetup") == false) {
                 String contextName = locFiles[i].getContext().getContextName();
                 if (contextName == null) {
                     contextName = " - " + "BASE";
@@ -227,7 +226,7 @@ public class OpenDlg extends CaveSWTDialog {
                     contextName = " - " + contextName;
                 }
                 locFileMap
-                        .put(locFiles[i].getName() + contextName, locFiles[i]);
+                        .put(locFiles[i].getPath() + contextName, locFiles[i]);
             }
         }
 
diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafProductConfigDlg.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafProductConfigDlg.java
index 989b4623fc..900911aa4c 100644
--- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafProductConfigDlg.java
+++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafProductConfigDlg.java
@@ -47,7 +47,7 @@ import org.eclipse.swt.widgets.Text;
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.db.AfosToAwips;
 import com.raytheon.uf.common.dataplugin.text.request.GetPartialAfosIdRequest;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -69,6 +69,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 12 Oct 2012  1229       rferrel     Convert to CaveSWTDialog subclass
  *                                      and make non-blocking.
  * 15 OCT 2012  1229       rferrel     Changes for non-blocking HelpUsageDlg.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
  * 
  * </pre>
  * 
@@ -328,7 +329,7 @@ public class TafProductConfigDlg extends CaveSWTDialog {
                                 .setMessageText(
                                         "An error occured while attempting to delete a product.",
                                         new RGB(255, 0, 0));
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (LocalizationException e) {
                         msgStatusComp
                                 .setMessageText(
                                         "An error occured while attempting to delete a product.",
@@ -457,11 +458,7 @@ public class TafProductConfigDlg extends CaveSWTDialog {
                     } catch (FileNotFoundException e) {
                         msgStatusComp.setMessageText(e.getMessage(), new RGB(
                                 255, 0, 0));
-                    } catch (ConfigurationException e) {
-                        msgStatusComp.setMessageText(
-                                "An error occured while saving product "
-                                        + product + ".", new RGB(255, 0, 0));
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (ConfigurationException | LocalizationException e) {
                         msgStatusComp.setMessageText(
                                 "An error occured while saving product "
                                         + product + ".", new RGB(255, 0, 0));
@@ -513,7 +510,7 @@ public class TafProductConfigDlg extends CaveSWTDialog {
                             .setMessageText(
                                     "An error occured when attempting to set default product.",
                                     new RGB(255, 0, 0));
-                } catch (LocalizationOpFailedException e) {
+                } catch (LocalizationException e) {
                     msgStatusComp
                             .setMessageText(
                                     "An error occured when attempting to set default product.",
@@ -546,8 +543,7 @@ public class TafProductConfigDlg extends CaveSWTDialog {
                     String description = "TAF Product Configuration Help";
 
                     String helpText = "This dialog is used to define TAF/TWEB product (list of\nforecasts).\n\nThee products should be defined AFTER relevant site/route\nconfiguration files have been created.\n\nTo add a new product, enter product label in the \"Products\"\nentry field and press <Enter>. Then enter all TAF ids or\nTWEB routes in the \"Idents\" entry field, press <Enter>\nafter typing one item. Press \"Save\" button to save\nconfiguration file.\n\nTo remove a product, press \"Delede\" below \"Products\" list.\n\nTo remove an ident from the product definition, use\n\"Delete\" button in the \"Idents\" column. You must then save\nthe product. This will NOT delete TAF/TWEB configuration\nfiles, this can only be done from the command line.\n\nThe \"Verify\" button can be used to check for existence and\nproper syntax of all relevant files.";
-                    usageDlg = new HelpUsageDlg(shell, description,
-                            helpText);
+                    usageDlg = new HelpUsageDlg(shell, description, helpText);
                     usageDlg.open();
                 } else {
                     usageDlg.bringToTop();
@@ -606,12 +602,8 @@ public class TafProductConfigDlg extends CaveSWTDialog {
                 productsList.add(product);
             }
 
-        } catch (IOException ex) {
-            // TODO handle this
-            ex.printStackTrace();
         } catch (Exception ex) {
-            // TODO handle this
-            ex.printStackTrace();
+            statusHandler.error(ex.getLocalizedMessage(), ex);
         }
     }
 
diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafSiteConfigIni.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafSiteConfigIni.java
index b360759419..570b9e9a81 100644
--- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafSiteConfigIni.java
+++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafSiteConfigIni.java
@@ -21,9 +21,10 @@ package com.raytheon.viz.avnconfig;
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -36,14 +37,15 @@ import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.commons.configuration.HierarchicalINIConfiguration;
 import org.apache.commons.configuration.XMLConfiguration;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.viz.core.localization.LocalizationManager;
 import com.raytheon.viz.avnconfig.AvnConfigConstants.triggerType;
 
@@ -66,7 +68,9 @@ import com.raytheon.viz.avnconfig.AvnConfigConstants.triggerType;
  * Apr 08, 2011 8856       rferrel     Can now make a new station's templates
  * May 24, 2011 9060       rferrel     Limit downloading of localization files.
  * Aug 09, 2013 2033       mschenke    Switched File.separator to IPathManager.SEPARATOR
- * May 19, 2015 17417      yteng       Get all sites from product 
+ * May 19, 2015 17417      yteng       Get all sites from product
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Jan 20, 2016 5242       njensen     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -182,15 +186,9 @@ public class TafSiteConfigIni implements ITafSiteConfig {
     private TafSiteConfigIni() throws ConfigurationException,
             FileNotFoundException {
         defaultProduct = readFile(getFile(DEFAULT_PRODUCT_FILE));
-        configMaps = new HashMap<String, HierarchicalINIConfiguration>();
+        configMaps = new HashMap<>();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.avnconfig.ITafSiteConfig#setTriggers(java.util.Map,
-     * java.util.Map, java.util.Map)
-     */
     @Override
     public void setTriggers(Map<String, String> tafMap,
             Map<String, String> mtrMap, Map<String, String> cfpMap)
@@ -214,13 +212,6 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         throw new ConfigurationException("Unable to save triggers.");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#getTriggers(com.raytheon.viz
-     * .avnconfig.AvnConfigConstants.triggerType)
-     */
     @Override
     public HashMap<String, String> getTriggers(triggerType type) {
         HashMap<String, String> triggerMap = new HashMap<String, String>();
@@ -311,12 +302,6 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         return siteList;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#setDefault(java.lang.String)
-     */
     @Override
     public void setDefault(String defaultProduct) throws ConfigurationException {
         this.defaultProduct = defaultProduct;
@@ -330,23 +315,11 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.avnconfig.ITafSiteConfig#getDefaultProduct()
-     */
     @Override
     public String getDefaultProduct() {
         return defaultProduct;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#getProductWorkPil(java.lang
-     * .String)
-     */
     @Override
     public String getProductWorkPil(String product) {
         HierarchicalConfiguration config = getProductConfig(product);
@@ -360,13 +333,6 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         return "XXXWRKTAF";
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#getProductCollectivePil(java
-     * .lang.String)
-     */
     @Override
     public String getProductCollectivePil(String product) {
         HierarchicalConfiguration config = getProductConfig(product);
@@ -379,17 +345,12 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         return "";
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.avnconfig.ITafSiteConfig#getAllProducts()
-     */
     @Override
     public Map<String, List<String>> getAllProducts() {
-        Map<String, List<String>> products = new HashMap<String, List<String>>();
+        Map<String, List<String>> products = new HashMap<>();
 
-        for (LocalizationFile lFile : getLfiles(TAFS_DIR, PROD_EXT)) {
-            String name = lFile.getName();
+        for (ILocalizationFile lFile : getLfiles(TAFS_DIR, PROD_EXT)) {
+            String name = lFile.getPath();
             String product = name.substring(name.lastIndexOf("/") + 1,
                     name.length() - PROD_DOT_EXT_LEN);
             products.put(product, getProductSites(product));
@@ -398,17 +359,10 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         return products;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#saveProduct(java.lang.String,
-     * java.util.ArrayList, java.lang.String, java.lang.String)
-     */
     @Override
     public void saveProduct(String newProduct, List<String> siteList,
             String workPil, String collectivePil) throws ConfigurationException {
-        LocalizationFile lFile = null;
+        ILocalizationFile lFile = null;
 
         try {
             lFile = getFile(TAFS_DIR + File.separator + newProduct
@@ -422,7 +376,6 @@ public class TafSiteConfigIni implements ITafSiteConfig {
             HierarchicalINIConfiguration config = configMaps.get(newProduct);
             if (config == null) {
                 config = new HierarchicalINIConfiguration();
-                config.setFile(lFile.getFile(false));
             }
 
             config.setDelimiterParsingDisabled(true);
@@ -436,23 +389,20 @@ public class TafSiteConfigIni implements ITafSiteConfig {
             config.setProperty("sites.idents", idents.toString());
             config.setProperty("sites.workpil", workPil);
             config.setProperty("sites.collective", collectivePil);
-            config.save();
-            lFile.save();
-            configMaps.put(newProduct, config);
-        } catch (LocalizationException ex) {
-            throw new ConfigurationException(ex);
+            try (SaveableOutputStream sos = lFile.openOutputStream()) {
+                config.save(sos);
+                sos.save();
+                configMaps.put(newProduct, config);
+            }
+        } catch (LocalizationException | IOException e) {
+            throw new ConfigurationException("Error saving file "
+                    + lFile.getPath(), e);
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#deleteProduct(java.lang.String)
-     */
     @Override
     public void deleteProduct(String product) throws ConfigurationException,
-            LocalizationOpFailedException {
+            LocalizationException {
 
         HierarchicalINIConfiguration config = configMaps.get(product);
 
@@ -461,7 +411,7 @@ public class TafSiteConfigIni implements ITafSiteConfig {
             configMaps.remove(product);
         }
 
-        LocalizationFile lFile = null;
+        ILocalizationFile lFile = null;
         try {
             lFile = getFile(TAFS_DIR + File.separator + product + PROD_DOT_EXT);
             lFile.delete();
@@ -481,19 +431,22 @@ public class TafSiteConfigIni implements ITafSiteConfig {
      * @throws FileNotFoundException
      * @throws ConfigurationException
      */
-    private String readFile(LocalizationFile lFile)
+    private String readFile(ILocalizationFile lFile)
             throws FileNotFoundException, ConfigurationException {
-        File file = lFile.getFile();
-        if (file != null && file.exists()) {
-            char[] c = new char[(int) file.length()];
-            FileReader reader = new FileReader(file);
-            try {
-                reader.read(c);
-                reader.close();
-            } catch (IOException ex) {
-                throw new ConfigurationException(ex.getMessage());
+        if (lFile != null && lFile.exists()) {
+            StringBuilder sb = new StringBuilder();
+            char[] cbuf = new char[4096];
+            try (InputStream is = lFile.openInputStream();
+                    InputStreamReader isr = new InputStreamReader(is)) {
+                int n;
+                while ((n = isr.read(cbuf)) > 0) {
+                    sb.append(cbuf, 0, n);
+                }
+            } catch (IOException | LocalizationException e) {
+                throw new ConfigurationException("Error reading "
+                        + lFile.getPath(), e);
             }
-            return String.valueOf(c).trim();
+            return sb.toString().trim();
         } else {
             return null;
         }
@@ -511,13 +464,14 @@ public class TafSiteConfigIni implements ITafSiteConfig {
      */
     private void writeFile(String filename, String value) throws IOException,
             LocalizationException {
-        LocalizationFile lFile = getFile(filename);
-        File file = lFile.getFile(false);
-        file.getParentFile().mkdirs();
-        FileWriter writer = new FileWriter(file);
-        writer.write(value);
-        writer.close();
-        lFile.save();
+        ILocalizationFile lFile = getFile(filename);
+        try (SaveableOutputStream sos = lFile.openOutputStream();
+                OutputStreamWriter writer = new OutputStreamWriter(sos)) {
+            writer.write(value);
+            writer.flush();
+            writer.close();
+            sos.save();
+        }
     }
 
     @Override
@@ -527,13 +481,6 @@ public class TafSiteConfigIni implements ITafSiteConfig {
                 + startHour + TMPL_DOT_EXT);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#saveTafTemplate(java.lang.String
-     * , java.lang.String, java.lang.String)
-     */
     @Override
     public void saveTafTemplate(String siteId, String startHour, String template)
             throws ConfigurationException {
@@ -552,23 +499,11 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#getTafTemplate(java.lang.String
-     * , java.lang.String)
-     */
     @Override
     public String getTafTemplate(String siteId, String startHour) {
         return siteMap.get(siteId).get(startHour);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.avnconfig.ITafSiteConfig#getSite(java.lang.String)
-     */
     @Override
     public TafSiteData getSite(String siteId) throws IOException,
             ConfigurationException {
@@ -650,12 +585,17 @@ public class TafSiteConfigIni implements ITafSiteConfig {
     private HierarchicalINIConfiguration readProductMap(String product)
             throws ConfigurationException, FileNotFoundException {
         String name = TAFS_DIR + File.separator + product + PROD_DOT_EXT;
-        LocalizationFile lFile = getFile(name);
+        ILocalizationFile lFile = getFile(name);
         HierarchicalINIConfiguration config = null;
         if (lFile.exists()) {
-            File file = lFile.getFile();
-            config = new HierarchicalINIConfiguration(file);
-            configMaps.put(product, config);
+            try (InputStream is = lFile.openInputStream()) {
+                config = new HierarchicalINIConfiguration();
+                config.load(is);
+                configMaps.put(product, config);
+            } catch (IOException | LocalizationException e) {
+                throw new ConfigurationException("Error reading "
+                        + lFile.getPath(), e);
+            }
         }
         return config;
     }
@@ -670,7 +610,7 @@ public class TafSiteConfigIni implements ITafSiteConfig {
      * @return lFileArray The array of localized files in the directory with the
      *         desired extension
      */
-    private LocalizationFile[] getLfiles(String dir, String ext) {
+    private ILocalizationFile[] getLfiles(String dir, String ext) {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(
                 LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
@@ -718,12 +658,6 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         return sb.toString();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.avnconfig.ITafSiteConfig#setSite(java.lang.String,
-     * com.raytheon.viz.avnconfig.TafSiteData)
-     */
     @Override
     public void setSite(String siteId, TafSiteData site) throws IOException,
             ConfigurationException {
@@ -731,11 +665,8 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(
                 LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
-        LocalizationFile lFile = pm.getLocalizationFile(context, filepath);
+        ILocalizationFile lFile = pm.getLocalizationFile(context, filepath);
         try {
-            File file = lFile.getFile(false);
-
-            file.getParentFile().mkdirs();
             HierarchicalINIConfiguration config = new HierarchicalINIConfiguration();
             config.setDelimiterParsingDisabled(true);
             config.setProperty("headers.wmo", site.wmo);
@@ -749,15 +680,17 @@ public class TafSiteConfigIni implements ITafSiteConfig {
                     arrayToString(site.visibility));
             config.setProperty("thresholds.tafduration", site.hours);
             config.setProperty("sites.acars", site.acars);
-            // TODO why is this a String[] instead of just a String like the
-            // other
-            // Alternate Ids?
+            /*
+             * TODO why is this a String[] instead of just a String like the
+             * other Alternate Ids?
+             */
             config.setProperty("sites.radars", arrayToString(site.radars));
             config.setProperty("sites.gfsmos", site.gfsmos);
             config.setProperty("sites.gfslamp", site.gfslamp);
-            // TODO why is this a String[] instead of just a String like the
-            // other
-            // Alternate Ids?
+            /*
+             * TODO why is this a String[] instead of just a String like the
+             * other Alternate Ids?
+             */
             config.setProperty("sites.metar", arrayToString(site.metar));
             config.setProperty("sites.nam", site.nam);
             config.setProperty("sites.profilers", arrayToString(site.profilers));
@@ -785,20 +718,15 @@ public class TafSiteConfigIni implements ITafSiteConfig {
                 config.setProperty("qc.currentwx", "0");
             }
 
-            FileWriter writer = new FileWriter(file);
-            config.save(writer);
-            writer.close();
-            lFile.save();
+            try (SaveableOutputStream sos = lFile.openOutputStream()) {
+                config.save(sos);
+                sos.save();
+            }
         } catch (LocalizationException ex) {
             throw new ConfigurationException(ex.getMessage());
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.avnconfig.ITafSiteConfig#getSiteList()
-     */
     @Override
     public ArrayList<String> getSiteList() {
         ArrayList<String> siteList = new ArrayList<String>();
@@ -813,18 +741,13 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         return siteList;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.avnconfig.ITafSiteConfig#getProductList()
-     */
     @Override
     public ArrayList<String> getProductList() {
         ArrayList<String> productList = new ArrayList<String>();
         String defaultProduct = getDefaultProduct();
 
-        for (LocalizationFile lFile : getLfiles(TAFS_DIR, PROD_EXT)) {
-            String name = lFile.getName();
+        for (ILocalizationFile lFile : getLfiles(TAFS_DIR, PROD_EXT)) {
+            String name = lFile.getPath();
             String product = name.substring(name.lastIndexOf("/") + 1,
                     name.length() - PROD_DOT_EXT_LEN);
             if (product.equals(defaultProduct) == false) {
@@ -856,12 +779,18 @@ public class TafSiteConfigIni implements ITafSiteConfig {
             IPathManager pm = PathManagerFactory.getPathManager();
             LocalizationContext context = pm.getContext(
                     LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
-            LocalizationFile lFile = pm.getLocalizationFile(context, filepath);
+            ILocalizationFile lFile = pm.getLocalizationFile(context, filepath);
             HierarchicalINIConfiguration config = new HierarchicalINIConfiguration();
             config.setDelimiterParsingDisabled(true);
-            config.load(lFile.getFile());
-            this.idsConfig = config;
+            try (InputStream is = lFile.openInputStream()) {
+                config.load(is);
+                this.idsConfig = config;
+            } catch (IOException | LocalizationException e) {
+                throw new ConfigurationException("Error reading "
+                        + lFile.getPath(), e);
+            }
         }
+
         return this.idsConfig;
     }
 
@@ -870,23 +799,18 @@ public class TafSiteConfigIni implements ITafSiteConfig {
      * 
      * @return lFile
      */
-    private LocalizationFile getIdsLfile() {
+    private ILocalizationFile getIdsLfile() {
         String filepath = IDS_FILE;
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(
                 LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
-        LocalizationFile lFile = pm.getLocalizationFile(context, filepath);
+        ILocalizationFile lFile = pm.getLocalizationFile(context, filepath);
         return lFile;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.avnconfig.ITafSiteConfig#getIdsSiteList()
-     */
     @Override
     public ArrayList<String> getIdsSiteList() throws IOException,
-            ConfigurationException, LocalizationOpFailedException {
+            ConfigurationException, LocalizationException {
         HierarchicalINIConfiguration config = getIdsConfig();
         ArrayList<String> siteList = new ArrayList<String>();
         for (Object site : config.getSections()) {
@@ -896,71 +820,51 @@ public class TafSiteConfigIni implements ITafSiteConfig {
         return siteList;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#getIdsPil(java.lang.String)
-     */
     @Override
     public String getIdsPil(String site) throws IOException,
-            ConfigurationException, LocalizationOpFailedException {
+            ConfigurationException, LocalizationException {
         HierarchicalINIConfiguration config = getIdsConfig();
         String pil = config.getProperty(site + ".pil").toString();
         return pil;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#setIdsSite(java.lang.String,
-     * java.lang.String)
-     */
     @Override
     public void setIdsSite(String site, String pil) throws IOException,
             ConfigurationException {
         HierarchicalINIConfiguration config = getIdsConfig();
-        LocalizationFile lFile = getIdsLfile();
-        try {
-            File file = lFile.getFile(false);
+        config.setProperty(site + ".pil", pil);
 
-            config.setProperty(site + ".pil", pil);
-            config.save(file);
-            lFile.save();
+        ILocalizationFile lFile = getIdsLfile();
+        try (SaveableOutputStream sos = lFile.openOutputStream()) {
+            config.save(sos);
+            sos.save();
         } catch (LocalizationException e) {
-            throw new IOException("Unable to save file: " + lFile.getName());
+            throw new IOException("Unable to save file: " + lFile.getPath());
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.avnconfig.ITafSiteConfig#removeIdsSite(java.lang.String)
-     */
     @Override
     public synchronized void removeIdsSite(String site)
             throws ConfigurationException {
-        LocalizationFile lFile = getIdsLfile();
-        try {
-            File file = lFile.getFile(false);
+        HierarchicalINIConfiguration config = getIdsConfig();
+        HierarchicalINIConfiguration newConfig = new HierarchicalINIConfiguration();
 
-            HierarchicalINIConfiguration config = getIdsConfig();
-            HierarchicalINIConfiguration newConfig = new HierarchicalINIConfiguration();
-
-            // Do not include the site in the new config.
-            for (Object newSite : config.getSections()) {
-                if (!newSite.equals(site)) {
-                    newConfig.setProperty(newSite + ".pil",
-                            config.getProperty(newSite + ".pil"));
-                }
+        // Do not include the site in the new config.
+        for (Object newSite : config.getSections()) {
+            if (!newSite.equals(site)) {
+                newConfig.setProperty(newSite + ".pil",
+                        config.getProperty(newSite + ".pil"));
             }
-            newConfig.save(file);
-            lFile.save();
+        }
+
+        ILocalizationFile lFile = getIdsLfile();
+        try (SaveableOutputStream sos = lFile.openOutputStream()) {
+            newConfig.save(sos);
+            sos.save();
             this.idsConfig = newConfig;
-        } catch (LocalizationException ex) {
-            throw new ConfigurationException(ex.getMessage());
+        } catch (LocalizationException | IOException e) {
+            throw new ConfigurationException("Error saving " + lFile.getPath(),
+                    e);
         }
     }
 }
diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafSiteInfoEditorDlg.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafSiteInfoEditorDlg.java
index 8dbc5f7312..539767b160 100644
--- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafSiteInfoEditorDlg.java
+++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TafSiteInfoEditorDlg.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -53,7 +53,7 @@ import com.raytheon.uf.common.dataquery.requests.DbQueryRequest;
 import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
 import com.raytheon.uf.common.dataquery.responses.DbQueryResponse;
 import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.pointdata.spatial.ObStation;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -67,7 +67,7 @@ import com.vividsolutions.jts.geom.Point;
 
 /**
  * TAF site information editor dialog.
- * 
+ *
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
@@ -83,12 +83,14 @@ import com.vividsolutions.jts.geom.Point;
  * 15 Oct 2012  1229       rferrel     Changes for non-blocking TextEditorSetupDlg.
  * 15 OCT 2012  1229       rferrel     Changes for non-blocking HelpUsageDlg.
  * 11 Sep 2013  2277       mschenke    Got rid of ScriptCreator references
- * 
+ * Nov 30, 2015 4834       njensen     Remove LocalizationOpFailedException
+ * Feb 09, 2016 5283       nabowle     Remove NGM MOS support.
+ *
  * </pre>
- * 
+ *
  * @author lvenable
  * @version 1.0
- * 
+ *
  */
 public class TafSiteInfoEditorDlg extends CaveSWTDialog {
     private final transient IUFStatusHandler statusHandler = UFStatus
@@ -245,7 +247,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Constructor.
-     * 
+     *
      * @param parent
      *            Parent shell.
      */
@@ -307,7 +309,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Converts an array into a comma separated string
-     * 
+     *
      * @param array
      * @return string
      */
@@ -451,7 +453,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
                     } catch (ConfigurationException e) {
                         msgStatusComp.setMessageText("Error saving data for "
                                 + siteIdTF.getText(), new RGB(255, 0, 0));
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (LocalizationException e) {
                         msgStatusComp.setMessageText("Error saving data for "
                                 + siteIdTF.getText(), new RGB(255, 0, 0));
                     } catch (IOException e) {
@@ -962,12 +964,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
                     } catch (FileNotFoundException e) {
                         msgStatusComp.setMessageText(e.getMessage(), new RGB(
                                 255, 0, 0));
-                    } catch (ConfigurationException e) {
-                        msgStatusComp.setMessageText(
-                                "Error creating templates for "
-                                        + siteIdTF.getText(),
-                                new RGB(255, 0, 0));
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (ConfigurationException | LocalizationException e) {
                         msgStatusComp.setMessageText(
                                 "Error creating templates for "
                                         + siteIdTF.getText(),
@@ -988,7 +985,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Query for a icao station's information.
-     * 
+     *
      * @param icao
      *            - station ID
      * @return obStation
@@ -1107,7 +1104,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate the data and color the text fields accordingly.
-     * 
+     *
      * @return boolean - True if all the data is valid.
      */
     private boolean validateData() {
@@ -1254,7 +1251,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate AFOS
-     * 
+     *
      * @return boolean
      */
     private boolean isAfosValid() {
@@ -1263,7 +1260,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Site ID
-     * 
+     *
      * @return boolean
      */
     private boolean isSiteIdValid() {
@@ -1275,7 +1272,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate WMO
-     * 
+     *
      * @return boolean
      */
     private boolean isWmoValid() {
@@ -1284,7 +1281,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate runway list
-     * 
+     *
      * @return boolean
      */
     private boolean isRunwayValid() {
@@ -1312,7 +1309,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Height for Radar Cutoff list.
-     * 
+     *
      * @return boolean
      */
     private boolean isRadarHeightValid(String text) {
@@ -1346,7 +1343,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Height for Profiler Cutoff list.
-     * 
+     *
      * @return boolean
      */
     private boolean isProfilerHeightValid(String text) {
@@ -1380,7 +1377,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate METAR
-     * 
+     *
      * @return boolean
      */
     private boolean isMetarValid() {
@@ -1403,7 +1400,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Profilers list
-     * 
+     *
      * @return boolean
      */
     private boolean isProfilerValid() {
@@ -1427,7 +1424,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Radars list
-     * 
+     *
      * @return boolean
      */
     private boolean isRadarValid() {
@@ -1451,7 +1448,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Visibility list
-     * 
+     *
      * @return boolean
      */
     private boolean isVsbyValid() {
@@ -1487,7 +1484,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Ceiling list
-     * 
+     *
      * @return boolean
      */
     private boolean isCigValid() {
@@ -1522,8 +1519,8 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
     }
 
     /**
-     * Validate ACARS, ETA, ETAMOS, GFSLAMP, GFSMOS, and NGMMOS
-     * 
+     * Validate ACARS, ETA, ETAMOS, GFSLAMP, and GFSMOS.
+     *
      * @return boolean
      */
     private boolean isOtherValid(String text) {
@@ -1538,7 +1535,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Latitude
-     * 
+     *
      * @return boolean
      */
     private boolean isLatitudeValid() {
@@ -1559,7 +1556,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Longitude
-     * 
+     *
      * @return boolean
      */
     private boolean isLongitudeValid() {
@@ -1580,7 +1577,7 @@ public class TafSiteInfoEditorDlg extends CaveSWTDialog {
 
     /**
      * Validate Elevation
-     * 
+     *
      * @return boolean
      */
     private boolean isElevationValid() {
diff --git a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TextEditorSetupDlg.java b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TextEditorSetupDlg.java
index 1ae42bfec2..3e0bec59e7 100644
--- a/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TextEditorSetupDlg.java
+++ b/cave/com.raytheon.viz.avnconfig/src/com/raytheon/viz/avnconfig/TextEditorSetupDlg.java
@@ -21,11 +21,15 @@ package com.raytheon.viz.avnconfig;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 
@@ -53,12 +57,10 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Shell;
 
-import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.viz.core.localization.LocalizationManager;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 import com.raytheon.viz.ui.dialogs.ICloseCallback;
@@ -78,6 +80,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * 11 OCT 2012  1229       rferrel     Changes for non-blocking FindReplaceDlg.
  * 15 OCT 2012  1229       rferrel     Made dialog non-blocking.
  * 15 OCT 2012  1229       rferrel     Changes for non-blocking HelpUsageDlg.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 11, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -503,12 +507,7 @@ public class TextEditorSetupDlg extends CaveSWTDialog {
                     } catch (FileNotFoundException e) {
                         msgStatusComp.setMessageText(e.getMessage(), new RGB(
                                 255, 0, 0));
-                    } catch (ConfigurationException e) {
-                        msgStatusComp
-                                .setMessageText(
-                                        "An error occured when saving the TAF template.",
-                                        new RGB(255, 0, 0));
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (ConfigurationException | LocalizationException e) {
                         msgStatusComp
                                 .setMessageText(
                                         "An error occured when saving the TAF template.",
@@ -744,87 +743,52 @@ public class TextEditorSetupDlg extends CaveSWTDialog {
         openedFile.getContext().setContextName(
                 LocalizationManager.getInstance().getCurrentSite());
 
-        File fn = openedFile.getFile();
+        if (editorStTxt.getText().isEmpty()) {
+            msgStatusComp.setMessageText("Unable to save empty file + "
+                    + openedFile, new RGB(255, 0, 0));
+            return;
+        }
 
-        if (fn != null) {
-            try {
+        try (SaveableOutputStream outStream = openedFile.openOutputStream();
+                Writer out = new BufferedWriter(new OutputStreamWriter(
+                        outStream))) {
+            out.write(editorStTxt.getText());
+            out.close();
+            outStream.save();
 
-                if (fn.exists() == false) {
-                    File parentFile = fn.getParentFile();
-
-                    if (parentFile.mkdirs() == false) {
-                        System.out.println("Could not create directories...");
-                    }
-
-                    if (fn.createNewFile() == false) {
-                        System.out.println("Cannot create file...");
-                    }
-                }
-
-                if (editorStTxt.getText().isEmpty()) {
-                    msgStatusComp.setMessageText("Unable to save empty file + "
-                            + fn, new RGB(255, 0, 0));
-                    return;
-                }
-
-                BufferedWriter output = new BufferedWriter(new FileWriter(fn));
-                output.write(editorStTxt.getText());
-                output.close();
-
-                openedFile.save();
-
-                filePathLbl.setText(fn.toString());
-
-                msgStatusComp.setMessageText("File " + fn
-                        + " saved successfully.", new RGB(0, 255, 0));
-                TafSiteConfigFactory.clearInstance();
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-                msgStatusComp.setMessageText("Unable to open file " + fn
-                        + " for writing.", new RGB(255, 0, 0));
-            } catch (IOException e) {
-                e.printStackTrace();
-                msgStatusComp.setMessageText(
-                        "An error occured while saving file " + fn, new RGB(
-                                255, 0, 0));
-            } catch (LocalizationOpFailedException e) {
-                msgStatusComp.setMessageText(
-                        "An error occured while saving file " + fn, new RGB(
-                                255, 0, 0));
-                e.printStackTrace();
-            }
+            filePathLbl.setText(openedFile.toString());
+            msgStatusComp.setMessageText("File " + openedFile
+                    + " saved successfully.", new RGB(0, 255, 0));
+            TafSiteConfigFactory.clearInstance();
+        } catch (IOException | LocalizationException e) {
+            e.printStackTrace();
+            msgStatusComp.setMessageText("An error occured while saving file "
+                    + openedFile, new RGB(255, 0, 0));
         }
     }
 
     // mmaron DR 2928
     // saves to the same dir as the opened file - according to njensen
     private void saveFileAs() {
-        FileDialog dlg = new FileDialog(shell, SWT.SAVE);
-        IPathManager pm = PathManagerFactory.getPathManager();
-        String path = pm.getFile(
-                pm.getContext(LocalizationType.CAVE_STATIC,
-                        LocalizationLevel.BASE), "aviation").getAbsolutePath();
         if (openedFile == null) {
             msgStatusComp.setMessageText(
                     "No file opened.  Please open file first.", new RGB(255, 0,
                             0));
             return;
         }
-        path = openedFile.getFile().getAbsolutePath();
-        System.out.println(path);
-        path = path.substring(1, path.lastIndexOf('/'));
 
+        String path = openedFile.getFile().getParentFile().getAbsolutePath();
+        FileDialog dlg = new FileDialog(shell, SWT.SAVE);
         dlg.setFilterPath(path);
         String fn = dlg.open();
+
         if (fn != null) {
-            try {
-                BufferedWriter output = new BufferedWriter(new FileWriter(
-                        new File(fn)));
+            try (Writer output = Files.newBufferedWriter(Paths.get(fn),
+                    StandardCharsets.UTF_8)) {
                 output.write(editorStTxt.getText());
-                output.close();
+
                 msgStatusComp.setMessageText("File " + fn
                         + " saved successfully.", new RGB(0, 255, 0));
-
                 TafSiteConfigFactory.clearInstance();
             } catch (FileNotFoundException e) {
                 msgStatusComp.setMessageText("Unable to open file " + fn
@@ -881,30 +845,31 @@ public class TextEditorSetupDlg extends CaveSWTDialog {
         openedFile = lFile;
 
         if (openedFile != null) {
-            try {
-                StringBuilder contents = new StringBuilder();
-                BufferedReader input = new BufferedReader(new FileReader(
-                        new File(openedFile.getFile().getAbsolutePath())));
-                String line = null;
+            if (openedFile.exists()) {
+                try (InputStream inStream = openedFile.openInputStream();
+                        BufferedReader in = new BufferedReader(
+                                new InputStreamReader(inStream))) {
+                    StringBuilder contents = new StringBuilder();
 
-                while ((line = input.readLine()) != null) {
-                    contents.append(line);
-                    contents.append(System.getProperty("line.separator"));
+                    String line = null;
+                    while ((line = in.readLine()) != null) {
+                        contents.append(line);
+                        contents.append(System.getProperty("line.separator"));
+                    }
+
+                    editorStTxt.setText(contents.toString());
+                    msgStatusComp.setMessageText("File " + openedFile
+                            + " opened successfully.", new RGB(0, 255, 0));
+                    filePathLbl.setText(openedFile.toString());
+                } catch (IOException | LocalizationException e) {
+                    msgStatusComp
+                            .setMessageText(
+                                    "An error occured while opening file "
+                                            + openedFile, new RGB(255, 0, 0));
                 }
-
-                editorStTxt.setText(contents.toString());
-
-                input.close();
-                msgStatusComp.setMessageText("File " + openedFile
-                        + " opened successfully.", new RGB(0, 255, 0));
-                filePathLbl.setText(openedFile.getFile().toString());
-            } catch (FileNotFoundException e) {
+            } else {
                 msgStatusComp.setMessageText("File " + openedFile
                         + " not found.", new RGB(255, 0, 0));
-            } catch (IOException e) {
-                msgStatusComp.setMessageText(
-                        "An error occured while opening file " + openedFile,
-                        new RGB(255, 0, 0));
             }
         }
     }
diff --git a/cave/com.raytheon.viz.awipstools/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.awipstools/META-INF/MANIFEST.MF
index a8b0c61750..1874a041fe 100644
--- a/cave/com.raytheon.viz.awipstools/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.awipstools/META-INF/MANIFEST.MF
@@ -2,13 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Awipstools Plug-in
 Bundle-SymbolicName: com.raytheon.viz.awipstools;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Activator: com.raytheon.viz.awipstools.Activator
 Bundle-Vendor: Raytheon
 Eclipse-RegisterBuddy: org.apache.velocity, com.raytheon.uf.viz.core.rsc
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
- org.apache.commons.lang,
  com.raytheon.viz.ui,
  javax.measure,
  com.raytheon.uf.common.pointdata,
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuA.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuA.xml
new file mode 100644
index 0000000000..9d5cd253ab
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuA.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+	<contribute xsi:type="bundleItem" file="bundles/tools/AzRan.xml"
+			menuText="Az/Ran Overlay" id="AzRanTool" timeQuery="false" />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuB.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuB.xml
new file mode 100644
index 0000000000..f1b5b14911
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuB.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	
+	<contribute xsi:type="bundleItem" file="bundles/tools/Baselines.xml"
+		menuText="Baselines" id="baselinesTool" timeQuery="false" />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuC.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuC.xml
new file mode 100644
index 0000000000..bb3db8ffeb
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuC.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+		
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.choosebyid"
+		menuText="Choose By ID..." id="chooseByIDTool" />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuD.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuD.xml
new file mode 100644
index 0000000000..7812f87942
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuD.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+	<contribute xsi:type="bundleItem" file="bundles/tools/DistanceBearing.xml"
+		menuText="Distance Bearing" id="distanceBearingTool" timeQuery="false" />
+
+    <contribute xsi:type="bundleItem" file="bundles/tools/DistanceScale.xml"
+        menuText="Distance Scale" id="distanceScaleTool" timeQuery="false" />
+		
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.distancespeed"
+		menuText="Distance Speed" />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuE.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuE.xml
new file mode 100644
index 0000000000..de7a0f9c78
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuE.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <contribute xsi:type="bundleItem" file="bundles/tools/EstimatedActualVelocity.xml"
+        menuText="Estimated Actual Velocity" id="estimatedActualVelocityTool" timeQuery="false" />
+ 	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuF.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuF.xml
new file mode 100644
index 0000000000..b4e299566b
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuF.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+	<contribute xsi:type="bundleItem" file="bundles/tools/FeatureFollowingZoom.xml"
+		menuText="Feature Following Zoom" id="featureFollowingZoomTool" timeQuery="false" />	
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuH.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuH.xml
new file mode 100644
index 0000000000..a93df18f65
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuH.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    
+    <contribute xsi:type="bundleItem" file="bundles/tools/Home.xml"
+		menuText="Home" id="homeTool" timeQuery="false" />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuL.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuL.xml
new file mode 100644
index 0000000000..8f2c434ab0
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuL.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.lapstools"
+		menuText="LAPS tools..." id="lapsTools" />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuP.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuP.xml
new file mode 100644
index 0000000000..681ea9992c
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuP.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.puthomecursor"
+		menuText="Put home cursor..." />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuR.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuR.xml
new file mode 100644
index 0000000000..cf24d9ab72
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuR.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    
+    <contribute xsi:type="bundleItem" file="bundles/tools/RangeRings.xml"
+		menuText="Range Rings" id="rangeRingsTool" timeQuery="false" />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuS.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuS.xml
new file mode 100644
index 0000000000..122662865e
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuS.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.sunrise"
+		menuText="Sunrise/Sunset..." />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuT.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuT.xml
new file mode 100644
index 0000000000..a1064bf812
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuT.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  
+    <contribute xsi:type="command"
+        commandId="com.raytheon.viz.awipstools.timeofarrival"
+        menuText="Time Of Arrival / Lead Time" />
+
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuU.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuU.xml
new file mode 100644
index 0000000000..f99955ebab
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuU.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.unitscalculator"
+		menuText="Units Calculator..." />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuV.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuV.xml
new file mode 100644
index 0000000000..0b6c79a53f
--- /dev/null
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseTools-menuV.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <contribute xsi:type="bundleItem" file="bundles/tools/VRShear.xml"
+		menuText="VR - Shear" id="vrShearTool" timeQuery="false" />
+	
+	<!-- example arbitrary command below, commandAction parameter is required, 
+	the others default to false if undefined.  If captureOutput is true then after 
+	the launched command closes a dialog box will show the contents printed to 
+	standard output.  If showStdOut is true then standard output will be echoed on 
+	standard out of cave ( not very useful ) -->
+	<!--
+	<contribute xsi:type="command"
+		commandId="com.raytheon.viz.awipstools.arbitrary"
+		menuText="ps -A" >
+		<parameter key="commandAction" value="/bin/ps -A" />
+		<parameter key="captureOutput" value="true" />
+		<parameter key="showStdOut" value="false" />
+	</contribute>
+	-->
+	
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
deleted file mode 100644
index bf9fec5407..0000000000
--- a/cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-	<contribute xsi:type="bundleItem" file="bundles/tools/AzRan.xml"
-			menuText="Az/Ran Overlay" id="AzRanTool" timeQuery="false" />
-	
-	<contribute xsi:type="bundleItem" file="bundles/tools/Baselines.xml"
-		menuText="Baselines" id="baselinesTool" timeQuery="false" />
-		
-	<contribute xsi:type="command"
-		commandId="com.raytheon.viz.awipstools.choosebyid"
-		menuText="Choose By ID..." id="chooseByIDTool" />
-  
-    <!-- TODO move into damage path plugin somehow -->
-<!--    <contribute xsi:type="bundleItem" file="bundles/tools/DamagePath.xml"
-        menuText="Damage Path" id="damagePathTool" timeQuery="false" /> -->
-		
-	<contribute xsi:type="bundleItem" file="bundles/tools/DistanceBearing.xml"
-		menuText="Distance Bearing" id="distanceBearingTool" timeQuery="false" />
-		
-	<contribute xsi:type="command"
-		commandId="com.raytheon.viz.awipstools.distancespeed"
-		menuText="Distance Speed" />
-		
-	<contribute xsi:type="bundleItem" file="bundles/tools/DistanceScale.xml"
-		menuText="Distance Scale" id="distanceScaleTool" timeQuery="false" />
-	
-    <contribute xsi:type="bundleItem" file="bundles/tools/EstimatedActualVelocity.xml"
-        menuText="Estimated Actual Velocity" id="estimatedActualVelocityTool" timeQuery="false" />
- 
-	<contribute xsi:type="bundleItem" file="bundles/tools/FeatureFollowingZoom.xml"
-		menuText="Feature Following Zoom" id="featureFollowingZoomTool" timeQuery="false" />
-		
-	<contribute xsi:type="command"
-		commandId="com.raytheon.viz.ui.viz.radarapps.fsi.startFSI"
-		menuText="4-D Storm Investigator (FSI)" />    	
-    
-    <contribute xsi:type="bundleItem" file="bundles/tools/Home.xml"
-		menuText="Home" id="homeTool" timeQuery="false" />
-    
-    <contribute xsi:type="command"
-		commandId="com.raytheon.viz.awipstools.lapstools"
-		menuText="LAPS tools..." id="lapsTools" />
-    
-    <!-- TODO move into points plugin somehow -->
-    <contribute xsi:type="bundleItem" file="bundles/tools/Points.xml"
-		menuText="Points" id="pointsTool" timeQuery="false" />
-    
-    <contribute xsi:type="command"
-		commandId="com.raytheon.viz.awipstools.puthomecursor"
-		menuText="Put home cursor..." />
-    
-    <contribute xsi:type="command"
-		commandId="com.raytheon.viz.radar.ui.RadarDisplayControls"
-		menuText="Radar Display Controls..." />
-    
-    <contribute xsi:type="bundleItem" file="bundles/tools/RangeRings.xml"
-		menuText="Range Rings" id="rangeRingsTool" timeQuery="false" />
-    
-    <contribute xsi:type="command"
-		commandId="com.raytheon.viz.awipstools.sunrise"
-		menuText="Sunrise/Sunset..." />
-    
-    <contribute xsi:type="command"
-		commandId="com.raytheon.viz.texteditor.opentexteditor"
-		menuText="Text Window..." />
-  
-    <contribute xsi:type="command"
-        commandId="com.raytheon.viz.awipstools.timeofarrival"
-        menuText="Time Of Arrival / Lead Time" />
-    
-    <contribute xsi:type="command"
-		commandId="com.raytheon.viz.awipstools.unitscalculator"
-		menuText="Units Calculator..." />
-    
-    <contribute xsi:type="bundleItem" file="bundles/tools/VRShear.xml"
-		menuText="VR - Shear" id="vrShearTool" timeQuery="false" />
-	
-	<!-- example arbitrary command below, commandAction parameter is required, 
-	the others default to false if undefined.  If captureOutput is true then after 
-	the launched command closes a dialog box will show the contents printed to 
-	standard output.  If showStdOut is true then standard output will be echoed on 
-	standard out of cave ( not very useful ) -->
-	<!--
-	<contribute xsi:type="command"
-		commandId="com.raytheon.viz.awipstools.arbitrary"
-		menuText="ps -A" >
-		<parameter key="commandAction" value="/bin/ps -A" />
-		<parameter key="captureOutput" value="true" />
-		<parameter key="showStdOut" value="false" />
-	</contribute>
-	-->
-	
-</menuTemplate>
diff --git a/cave/com.raytheon.viz.awipstools/localization/menus/tools/toolsindex.xml b/cave/com.raytheon.viz.awipstools/localization/menus/tools/toolsindex.xml
index 001e84003b..2c8befc6a8 100644
--- a/cave/com.raytheon.viz.awipstools/localization/menus/tools/toolsindex.xml
+++ b/cave/com.raytheon.viz.awipstools/localization/menus/tools/toolsindex.xml
@@ -19,7 +19,46 @@
         further_licensing_information.
     -->
 <menuContributionFile>
-	<include installTo="menu:tools?after=tools.start"
-		fileName="menus/tools/baseToolsMenu.xml">
+	<include installTo="menu:tools?after=tools.A"
+		fileName="menus/tools/baseTools-menuA.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.B"
+		fileName="menus/tools/baseTools-menuB.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.C"
+		fileName="menus/tools/baseTools-menuC.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.Di"
+		fileName="menus/tools/baseTools-menuD.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.E"
+		fileName="menus/tools/baseTools-menuE.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.Fe"
+		fileName="menus/tools/baseTools-menuF.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.H"
+		fileName="menus/tools/baseTools-menuH.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.L"
+		fileName="menus/tools/baseTools-menuL.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.Pu"
+		fileName="menus/tools/baseTools-menuP.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.Ran"
+		fileName="menus/tools/baseTools-menuR.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.S"
+		fileName="menus/tools/baseTools-menuS.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.Ti"
+		fileName="menus/tools/baseTools-menuT.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.U"
+		fileName="menus/tools/baseTools-menuU.xml">
+	</include>
+	<include installTo="menu:tools?after=tools.V"
+		fileName="menus/tools/baseTools-menuV.xml">
 	</include>
 </menuContributionFile>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsDataManager.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsDataManager.java
index 758876b573..0b8d5798d8 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsDataManager.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsDataManager.java
@@ -22,10 +22,11 @@ package com.raytheon.viz.awipstools;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -45,12 +46,14 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.preference.IPersistentPreferenceStore;
 
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.LocalizationUtil;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
@@ -89,6 +92,7 @@ import com.vividsolutions.jts.geom.LineString;
  * Jun 03, 2014 3191       njensen     Improved saving/loading storm track data
  * Feb 24, 2015 3978       njensen     Changed to use abstract InputStream
  * Aug 18, 2015 3806       njensen     Use SaveableOutputStream to save
+ * Feb 12, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -251,7 +255,7 @@ public class ToolsDataManager implements ILocalizationFileObserver {
     private void loadStormData() {
         IPathManager pathMgr = PathManagerFactory.getPathManager();
         LocalizationFile f = pathMgr.getLocalizationFile(
-                userToolsDir.getContext(), userToolsDir.getName()
+                userToolsDir.getContext(), userToolsDir.getPath()
                         + IPathManager.SEPARATOR + STORM_TRACK_FILE);
         if (f.exists()) {
             try (InputStream is = f.openInputStream()) {
@@ -286,7 +290,7 @@ public class ToolsDataManager implements ILocalizationFileObserver {
             stormData.setDate(SimulatedTime.getSystemTime().getTime());
             IPathManager pathMgr = PathManagerFactory.getPathManager();
             LocalizationFile f = pathMgr.getLocalizationFile(
-                    userToolsDir.getContext(), userToolsDir.getName()
+                    userToolsDir.getContext(), userToolsDir.getPath()
                             + IPathManager.SEPARATOR + STORM_TRACK_FILE);
 
             try (SaveableOutputStream sos = f.openOutputStream()) {
@@ -375,46 +379,27 @@ public class ToolsDataManager implements ILocalizationFileObserver {
                                     + name + "\"");
                 }
 
-                String fileName = userToolsDir.getName() + File.separator
+                String fileName = userToolsDir.getPath() + File.separator
                         + BASELINE_PREFIX + name + BASELINE_EXT;
 
-                LocalizationFile lf = pathMgr.getLocalizationFile(
+                ILocalizationFile lf = pathMgr.getLocalizationFile(
                         userToolsDir.getContext(), fileName);
-                File file = lf.getFile();
-
-                // create the local directory if necessary
-                if (!file.getParentFile().exists()) {
-                    file.getParentFile().mkdirs();
-                }
-
-                BufferedWriter out = null;
-                try {
-                    out = new BufferedWriter(new FileWriter(file));
-
+                try (SaveableOutputStream outStream = lf.openOutputStream();
+                        Writer out = new BufferedWriter(new OutputStreamWriter(
+                                outStream))) {
                     for (Coordinate point : baseline.getCoordinates()) {
                         out.write(String.format("%f %f\n", point.y, point.x));
                     }
+                    out.close();
+                    outStream.save();
                 } catch (IOException e) {
-                    statusHandler.handle(Priority.PROBLEM,
-                            "Error writing to file: " + file.getAbsolutePath(),
+                    statusHandler.error("Error writing to file: " + lf, e);
+                } catch (LocalizationException e) {
+                    statusHandler.error(
+                            "Error storing localization file to server: " + lf,
                             e);
-                } finally {
-                    if (out != null) {
-                        try {
-                            out.close();
-                            lf.save();
-                        } catch (IOException e) {
-                            statusHandler.handle(
-                                    Priority.PROBLEM,
-                                    "Error writing to file: "
-                                            + file.getAbsolutePath(), e);
-                        } catch (LocalizationException e) {
-                            statusHandler.handle(Priority.PROBLEM,
-                                    "Error storing locatization file to server: "
-                                            + lf, e);
-                        }
-                    }
                 }
+
                 name = baselineStoreQueue.poll();
             }
             return Status.OK_STATUS;
@@ -467,10 +452,10 @@ public class ToolsDataManager implements ILocalizationFileObserver {
         baselines = new HashMap<String, LineString>();
 
         LocalizationFile[] files = pathMgr.listFiles(userToolsDir.getContext(),
-                userToolsDir.getName(), new String[] { BASELINE_EXT }, false,
+                userToolsDir.getPath(), new String[] { BASELINE_EXT }, false,
                 true);
         for (LocalizationFile lf : files) {
-            String fileName = lf.getFile().getName();
+            String fileName = LocalizationUtil.extractName(lf.getPath());
             if (fileName.startsWith(BASELINE_PREFIX)) {
                 LineString baseline = loadBaseline(fileName);
                 String name = fileName.substring(BASELINE_PREFIX.length())
@@ -483,15 +468,13 @@ public class ToolsDataManager implements ILocalizationFileObserver {
     private LineString loadBaseline(String fileName) {
         LineString baseline = null;
 
-        LocalizationFile lf = pathMgr.getLocalizationFile(
-                userToolsDir.getContext(), userToolsDir.getName()
+        ILocalizationFile lf = pathMgr.getLocalizationFile(
+                userToolsDir.getContext(), userToolsDir.getPath()
                         + File.separator + fileName);
-        File file = lf.getFile();
-
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new FileReader(file));
 
+        try (InputStream inStream = lf.openInputStream();
+                BufferedReader in = new BufferedReader(new InputStreamReader(
+                        inStream))) {
             List<Coordinate> coords = new ArrayList<Coordinate>();
             String line = null;
             while ((line = in.readLine()) != null) {
@@ -517,17 +500,9 @@ public class ToolsDataManager implements ILocalizationFileObserver {
                     .handle(Priority.PROBLEM,
                             "Invalid number in wfo center point file, using default",
                             e);
-        } catch (IOException e) {
-            statusHandler.handle(Priority.PROBLEM, "Error writing to file: "
-                    + file.getAbsolutePath(), e);
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    // nothing to do
-                }
-            }
+        } catch (IOException | LocalizationException e) {
+            statusHandler.handle(Priority.PROBLEM, "Error reading from file: "
+                    + lf, e);
         }
 
         return baseline;
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
index 8b840644ca..f66873a1b4 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
@@ -71,53 +71,57 @@ import com.vividsolutions.jts.geom.LineString;
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 05-28-2010   #6042      bkowal      When an Impossible Track Exception
- *                                     Is Encountered, The Track Will Now
- *                                     Be Reverted Back To Its Previous
- *                                     State. Replaced Impossible Storm
- *                                     Exception With Impossible Track
- *                                     Exception.
- *  06-23-2010  #6468      bkowal      The Tool Will No Longer Generate
- *                                     An Exception When It Is Initially
- *                                     Added To The Map While Looping
- *                                     Is Running.
- *  06-23-2010  #5925      bkowal      The Tool Will No Longer Generate An
- *                                     Exception When The Polyline Mode
- *                                     Is Enabled Even When A Track
- *                                     Has Not Been Generated.
- *  07-14-2010  #6558      bkowal      The tool will no longer generate an
- *                                     exception when it is moved from a
- *                                     pane with a larger frame count to a
- *                                     pane with a smaller frame count. 
- *                                     The track will now always be centered around
- *                                     the initial location of the drag-me point
- *                                     when the track was created.
- *  10-27-2010  #6964      bkowal      The LineStyle is now passed as a parameter to
- *                                     the IGraphicsTarget drawWireframeShape method.
- *  15Mar2013	15693	mgamazaychikov Made sure that magnification capability works.
- *  06-11-2013  DR 16234   D. Friedman Fix pivot index when frames count is reduced.
- *  06-24-2013  DR 16317   D. Friedman Handle "motionless" track.
- *  01-28-2014  DR16465 mgamazaychikov Fixed the problem with anchor point when frame 
- *                                     count changes; made line width configurable.
- *  04-07-2014  DR 17232   D. Friedman Make sure pivot indexes are valid.
- *  04-24-2014  DR 16356   Qinglu Lin  Updated generateTrackInfo(), generateNewTrackInfo(),
- *                                     and createTrack().
- *  06-03-14    3191       njensen     Fix postData to not retrieve
- *  06-17-2014  DR17409 mgamazaychikov Fix futurePoints calculation in generateNewTrackInfo()
- *                                     and generateExistingTrackInfo()
- *  07-24-2014  3429       mapeters    Updated deprecated drawLine() calls.
- *  08-21-2014  DR 15700   Qinglu Lin  handle the situation where frameTime is null in paintTrack().
- *  09-09-2014  RM #657    Qinglu Lin  handle StormTrackState.trackType is null.
- *  09-25-2014  ASM #16773 D. Friedman Fix NPE.
- *  10-10-2014  ASM #16844 D. Friedman Prevent some errors when moving track.
+ * 
+ * Date          Ticket#  Engineer   Description
+ * ------------- -------- ---------- -------------------------------------------
+ * May 28, 2010  6042     bkowal     When an Impossible Track Exception Is
+ *                                   Encountered, The Track Will Now Be Reverted
+ *                                   Back To Its Previous State. Replaced
+ *                                   Impossible Storm Exception With Impossible
+ *                                   Track Exception.
+ * Jun 23, 2010  6468     bkowal     The Tool Will No Longer Generate An
+ *                                   Exception When It Is Initially Added To The
+ *                                   Map While Looping Is Running.
+ * Jun 23, 2010  5925     bkowal     The Tool Will No Longer Generate An
+ *                                   Exception When The Polyline Mode Is Enabled
+ *                                   Even When A Track Has Not Been Generated.
+ * Jul 14, 2010  6558     bkowal     The tool will no longer generate an
+ *                                   exception when it is moved from a pane with
+ *                                   a larger frame count to a pane with a
+ *                                   smaller frame count. The track will now
+ *                                   always be centered around the initial
+ *                                   location of the drag-me point when the
+ *                                   track was created.
+ * Oct 27, 2010  6964     bkowal     The LineStyle is now passed as a parameter
+ *                                   to the IGraphicsTarget drawWireframeShape
+ *                                   method.
+ * Mar 15, 2013  15693    mgamazay   Made sure that magnification capability
+ *                                   works.
+ * Jun 11, 2013  16234    dfriedman  Fix pivot index when frames count is
+ *                                   reduced.
+ * Jun 24, 2013  16317    dfriedman  Handle "motionless" track.
+ * Jan 28, 2014  16465    mgamazay   Fixed the problem with anchor point when
+ *                                   frame count changes; made line width
+ *                                   configurable.
+ * Apr 07, 2014  17232    dfriedman  Make sure pivot indexes are valid.
+ * Apr 24, 2014  16356    qlin       Updated generateTrackInfo(),
+ *                                   generateNewTrackInfo(), and createTrack().
+ * Jun 03, 2014  3191     njensen    Fix postData to not retrieve
+ * Jun 17, 2014  17409    mgamazay   Fix futurePoints calculation in
+ *                                   generateNewTrackInfo() and
+ *                                   generateExistingTrackInfo()
+ * Jul 24, 2014  3429     mapeters   Updated deprecated drawLine() calls.
+ * Aug 21, 2014  15700    qlin       handle the situation where frameTime is
+ *                                   null in paintTrack().
+ * Sep 09, 2014  657      qlin       handle StormTrackState.trackType is null.
+ * Sep 25, 2014  16773    dfriedman  Fix NPE.
+ * Oct 10, 2014  16844    dfriedman  Prevent some errors when moving track.
+ * Dec 02, 2015  5150     bsteffen   Add option to use constant end time.
+ * 
  * </pre>
  * 
  * @author mschenke
- * @version 1.0
  */
-
 public class StormTrackDisplay implements IRenderable {
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(StormTrackDisplay.class);
@@ -408,7 +412,7 @@ public class StormTrackDisplay implements IRenderable {
                 coords = new Coordinate[] { c1,
                         new Coordinate(worldPixel[0], worldPixel[1]), c3 };
             }
-            line = new GeometryFactory().createLineString(coords);
+            line = gf.createLineString(coords);
 
             if (state.dragMePoint != null) {
                 state.dragMeLine = manager.figureLineFromPoint(line,
@@ -518,7 +522,7 @@ public class StormTrackDisplay implements IRenderable {
                 double[] p = descriptor.pixelToWorld(paintProps.getView()
                         .getExtent().getCenter());
                 point = new Coordinate(p[0], p[1]);
-                state.dragMePoint = new GeometryFactory().createPoint(point);
+                state.dragMePoint = gf.createPoint(point);
             }
         }
 
@@ -777,7 +781,7 @@ public class StormTrackDisplay implements IRenderable {
                     if (currentState.dragMePoint == null) {
                         double[] p = descriptor.pixelToWorld(paintProps
                                 .getView().getExtent().getCenter());
-                        currentState.dragMePoint = new GeometryFactory()
+                        currentState.dragMePoint = gf
                                 .createPoint(new Coordinate(p[0], p[1]));
                     }
                     theAnchorPoint = currentState.dragMePoint.getCoordinate();
@@ -837,7 +841,7 @@ public class StormTrackDisplay implements IRenderable {
     }
 
     private void generateExistingTrackInfo(StormTrackState state,
-            PaintProperties paintProps) throws ImpossibleTrackException {
+            PaintProperties paintProps) {
         int moveIndex = this.trackUtil.getCurrentFrame(paintProps
                 .getFramesInfo());
         moveIndex = Math.min(moveIndex, state.timePoints.length - 1);
@@ -995,7 +999,7 @@ public class StormTrackDisplay implements IRenderable {
     }
 
     private void generateNewTrackInfo(StormTrackState state, int anchorIndex,
-            PaintProperties paintProps) throws ImpossibleTrackException {
+            PaintProperties paintProps) {
         double speed, angle, oppositeAngle;
         int frameCount = trackUtil.getFrameCount(paintProps.getFramesInfo());
         if (state.timePoints != null) {
@@ -1194,7 +1198,7 @@ public class StormTrackDisplay implements IRenderable {
         int shortestDistance = (int) Math.round(minIntervalInSeconds
                 * state.speed);
 
-        int tickLengthInMeters = (int) Math.round(shortestDistance) / 2;
+        int tickLengthInMeters = Math.round(shortestDistance) / 2;
 
         // Create track
         Coordinate[] coords = new Coordinate[state.timePoints.length
@@ -1412,13 +1416,16 @@ public class StormTrackDisplay implements IRenderable {
                     state.color, radius, 180 + screenAngle, hMid, vMid, magnification);
 
             // End time:
-            Calendar currentTime = Calendar.getInstance();
-            currentTime.setTime(SimulatedTime.getSystemTime().getTime());
-            long delta = state.futurePoints[state.futurePoints.length - 1].time
-                    .getMatchValid()
-                    - state.futurePoints[0].time.getMatchValid();
-            time = this.timeFormat.format(new Date(currentTime
-                    .getTimeInMillis() + delta));
+            long endTime = state.futurePoints[state.futurePoints.length - 1].time
+                    .getMatchValid();
+            if (state.liveOffsetEndTime) {
+                Calendar currentTime = Calendar.getInstance();
+                currentTime.setTime(SimulatedTime.getSystemTime().getTime());
+                long delta = endTime
+                        - state.futurePoints[0].time.getMatchValid();
+                endTime = currentTime.getTimeInMillis() + delta;
+            }
+            time = this.timeFormat.format(new Date(endTime));
             paintTextAtPoint(target, time,
                     state.futurePoints[state.futurePoints.length - 1].coord,
                     state.color, radius, -90 + screenAngle, hEnd, vEnd, magnification);
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackState.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackState.java
index 227a166b3e..22511efaa3 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackState.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackState.java
@@ -31,37 +31,38 @@ import com.vividsolutions.jts.geom.LineString;
 import com.vividsolutions.jts.geom.Point;
 
 /**
- * TODO Add Description
+ * All of the state information needed to display and manipulate a storm track.
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 07-14-2010   #6558      bkowal      Added a variable that will be used
- *                                     to indicate when the user manually
- *                                     moves the drag-me point. A new method
- *                                     has been created to calculate the pivot
- *                                     indexes.
- * 10-27-2010   #6964      bkowal      Added a public class member for the LineStyle.
- * 11/29/2012   15571      Qinglu Lin  Added compuateCurrentStormCenter();
- * 15Mar2013	15693	mgamazaychikov Added magnification.
- * 06-24-2013   DR 16317   D. Friedman Handle "motionless" track.
- * 04-24-2014   DR 16356   Qinglu Lin  Added newWarnGen, oneStormAngle, justSwitchedToLOS, 
- *                                     justSwitchedToOS, and trackType.
- * 06-24-2014   DR 17436   Qinglu Lin  Assigned "unknown" to trackType. 
+ * 
+ * Date          Ticket#  Engineer   Description
+ * ------------- -------- ---------- -------------------------------------------
+ * Jul 14, 2010  6558     bkowal     Added a variable that will be used to
+ *                                   indicate when the user manually moves the
+ *                                   drag-me point. A new method has been
+ *                                   created to calculate the pivot indexes.
+ * Oct 27, 2010  6964     bkowal     Added a public class member for the
+ *                                   LineStyle.
+ * Nov 29, 2012  15571    qlin       Added compuateCurrentStormCenter();
+ * Mar 15, 2013  15693    mgamazay   Added magnification.
+ * Jun 24, 2013  16317    dfriedman  Handle "motionless" track.
+ * Apr 24, 2014  16356    qlin       Added newWarnGen, oneStormAngle,
+ *                                   justSwitchedToLOS, justSwitchedToOS, and
+ *                                   trackType.
+ * Jun 24, 2014  17436    qlin       Assigned "unknown" to trackType.
+ * Dec 02, 2015  5150     bsteffen   Add option to use constant end time.
  * 
  * </pre>
  * 
  * @author mschenke
- * @version 1.0
  */
-
 public class StormTrackState {
 
     public enum Mode {
         DRAG_ME, TRACK, NONE
-    };
+    }
 
     public enum DisplayType {
         POINT("me"), POLY("line"), CIRCULAR("me");
@@ -209,6 +210,12 @@ public class StormTrackState {
 
     public boolean justSwitchedToOS = false;
 
+    /*
+     * When true the end time will be adjusted on the display to be offset from
+     * the current time instead of the last frame.
+     */
+    public boolean liveOffsetEndTime = true;
+
     public static String trackType = "unknown";
 
     /** Compute the coordinate of the storm center at the time defined by dataTime via interpolation. */
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/ArbitraryHandler.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/ArbitraryHandler.java
index 17cb716335..c295253543 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/ArbitraryHandler.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/ArbitraryHandler.java
@@ -16,6 +16,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.handlers.HandlerUtil;
 
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -23,6 +24,22 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.util.RunProcess;
 import com.raytheon.uf.viz.core.VizApp;
 
+/**
+ * Arbitrary handler
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 15, 2015 5054       randerso    Remove unnecessary new Shell
+ * 
+ * </pre>
+ * 
+ * @author unknown
+ * @version 1.0
+ */
 public class ArbitraryHandler extends AbstractHandler {
 
     private static final transient IUFStatusHandler statusHandler = UFStatus
@@ -94,6 +111,7 @@ public class ArbitraryHandler extends AbstractHandler {
 
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
+        final Shell shell = HandlerUtil.getActiveShell(event);
         final String command = event.getParameter("commandAction");
         final String captureOutput = event.getParameter("captureOutput");
         final String showStdOut = event.getParameter("showStdOut");
@@ -135,7 +153,7 @@ public class ArbitraryHandler extends AbstractHandler {
                                     @Override
                                     public void run() {
                                         final ScrollableDialog dialog = new ScrollableDialog(
-                                                new Shell(), "\'" + command
+                                                shell, "\'" + command
                                                         + "\' Output",
                                                 "Output from execution:",
                                                 stringOutput);
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/LapsToolsIO.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/LapsToolsIO.java
index 641149fa20..5d1c2b6584 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/LapsToolsIO.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/LapsToolsIO.java
@@ -5,7 +5,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.io.OutputStream;
+import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Collection;
@@ -14,23 +14,19 @@ import java.util.List;
 import java.util.Map;
 
 import javax.xml.bind.JAXB;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 
 import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
 import com.raytheon.uf.common.geospatial.SpatialException;
 import com.raytheon.uf.common.geospatial.SpatialQueryFactory;
 import com.raytheon.uf.common.geospatial.SpatialQueryResult;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.time.SimulatedTime;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.localization.LocalizationManager;
@@ -49,6 +45,7 @@ import com.vividsolutions.jts.geom.Envelope;
  * ------------ ---------- -----------   --------------------------
  * May 2009     #          bsteffen      Initial creation
  * Nov 2013     #          mccaslin      New design approach, changed from OS calls to file io, read xml code, etc
+ * Feb 12, 2016 5242       dgilling      Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -57,9 +54,6 @@ import com.vividsolutions.jts.geom.Envelope;
  */
 public class LapsToolsIO {
 
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(LapsToolsIO.class);
-
     private static final String WHATGOTIN_FILE_FRMT = "%s/%s.wgi";
 
     private static File fxaData;
@@ -139,20 +133,16 @@ public class LapsToolsIO {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
-        LocalizationFile xmlLocalizationFile = pm.getLocalizationFile(lc,
+        ILocalizationFile xmlLocalizationFile = pm.getLocalizationFile(lc,
                 "LAPS/domain" + ".xml");
-        if (!xmlLocalizationFile.exists())
+        if (!xmlLocalizationFile.exists()) {
             return false;
+        }
 
         LapsDomain domain = new LapsDomain();
-        try {
-            JAXBContext jaxbContext = JAXBContext.newInstance(LapsDomain.class);
-            // unmarshal XML file to java object
-            Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
-            domain = (LapsDomain) jaxbUnmarshaller
-                    .unmarshal(xmlLocalizationFile.getFile());
-
-        } catch (JAXBException e) {
+        try (InputStream inStream = xmlLocalizationFile.openInputStream()) {
+            domain = JAXB.unmarshal(inStream, LapsDomain.class);
+        } catch (LocalizationException e) {
             throw new VizException("xml is unreadable: "
                     + e.getLocalizedMessage());
         }
@@ -231,7 +221,7 @@ public class LapsToolsIO {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.USER);
-        LocalizationFile xmlLocalizationFile = pm.getLocalizationFile(lc,
+        ILocalizationFile xmlLocalizationFile = pm.getLocalizationFile(lc,
                 "LAPS" + IPathManager.SEPARATOR + "domain.xml");
         LapsDomain lapsdomain = new LapsDomain();
         lapsdomain.setNx(data.getNx());
@@ -241,12 +231,10 @@ public class LapsToolsIO {
         lapsdomain.setGridCenLat(data.getGridCenter().y);
         lapsdomain.setGridCenLon(data.getGridCenter().x);
         // marshal java object to XML file
-        OutputStream stream;
-        try {
-            stream = xmlLocalizationFile.openOutputStream();
-            JAXB.marshal(lapsdomain, stream);
-            stream.close();
-            xmlLocalizationFile.save();
+        try (SaveableOutputStream outStream = xmlLocalizationFile
+                .openOutputStream()) {
+            JAXB.marshal(lapsdomain, outStream);
+            outStream.save();
         } catch (LocalizationException e) {
             throw new VizException("Unable to save LapsDomain to xml.");
         }
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/dialog/PutHomeCursorDialog.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/dialog/PutHomeCursorDialog.java
index 58024aea18..72a198a3ae 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/dialog/PutHomeCursorDialog.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/dialog/PutHomeCursorDialog.java
@@ -83,6 +83,7 @@ import com.vividsolutions.jts.io.WKTWriter;
  *                                    code.  Wrote ticket #3047 for common_obs_spatial
  *                                    for the city/state issues.
  * Nov 11, 2014  3401     rferrel     Add Enter key events.
+ * Jan 15, 2015  5054     randerso    Remove unnecessary new Shell
  * 
  * </pre>
  * 
@@ -482,7 +483,7 @@ public class PutHomeCursorDialog extends CaveSWTDialog implements
                 c.y = Float.parseFloat(latTextField.getText());
                 if ((c.y < -180) || c.y > 180) {
                     MessageDialog
-                            .openError(new Shell(), "Put Home Cursor Error",
+                            .openError(shell, "Put Home Cursor Error",
                                     "Latitude must be between -90 and 90.  Please correct.");
 
                     latTextField.setFocus();
@@ -490,7 +491,7 @@ public class PutHomeCursorDialog extends CaveSWTDialog implements
                 }
             } catch (NumberFormatException nfe) {
                 MessageDialog
-                        .openError(new Shell(), "Put Home Cursor Error",
+                        .openError(shell, "Put Home Cursor Error",
                                 "The input for the Latitude not a number.  Please correct.");
                 latTextField.setFocus();
                 return;
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/AzimuthToolLayer.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/AzimuthToolLayer.java
index 3f9bce2f55..8144402889 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/AzimuthToolLayer.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/AzimuthToolLayer.java
@@ -94,6 +94,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  *                                       updated functions in 'mouseHandler' to prevent
  *                                       errors when MB1 dragging tool off screen and to
  *                                       only change cursor to hand in editable mode.
+ *  05-11-2015  #5070        randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -251,6 +252,7 @@ public class AzimuthToolLayer extends
      * 
      * @see com.raytheon.viz.core.rsc.IVizResource#getName()
      */
+    @Override
     public String getName() {
         return AZIMUTH_LOCATION;
     }
@@ -280,9 +282,10 @@ public class AzimuthToolLayer extends
      * @seecom.raytheon.viz.core.rsc.IVizResource#init(com.raytheon.viz.core.
      * IGraphicsTarget)
      */
+    @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
         labelFont = target.initializeFont(
-                target.getDefaultFont().getFontName(), 12.0f,
+                target.getDefaultFont().getFontName(), 10,
                 new Style[] { Style.BOLD });
 
         for (int i = 0; i < labels.length; ++i) {
@@ -306,6 +309,7 @@ public class AzimuthToolLayer extends
      * @seecom.raytheon.viz.core.rsc.IVizResource#paint(com.raytheon.viz.core.
      * IGraphicsTarget, com.raytheon.viz.core.PixelExtent, double, float)
      */
+    @Override
     protected void paintInternal(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
         labelFont.setMagnification(getCapability(MagnificationCapability.class)
@@ -416,6 +420,7 @@ public class AzimuthToolLayer extends
      * 
      * @see com.raytheon.uf.viz.core.rsc.AbstractVizResource#dispose()
      */
+    @Override
     protected void disposeInternal() {
         labelFont.dispose();
         if (shape != null) {
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/DistanceBearingToolLayer.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/DistanceBearingToolLayer.java
index c7a4f2df88..3cb289ae70 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/DistanceBearingToolLayer.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/DistanceBearingToolLayer.java
@@ -79,6 +79,7 @@ import com.vividsolutions.jts.geom.LineSegment;
  *  15Mar2013	15693	mgamazaychikov	 Added magnification capability.
  *  07-21-14    #3412        mapeters    Updated deprecated drawCircle call.
  *  07-29-14     3465        mapeters    Updated deprecated drawString() calls.
+ *  05-11-2015  #5070        randerso    Adjust font sizes for dpi scaling
  * </pre>
  * 
  * @author ebabin
@@ -87,8 +88,8 @@ import com.vividsolutions.jts.geom.LineSegment;
 public class DistanceBearingToolLayer extends
         AbstractMovableToolLayer<LineSegment> implements
         IContextMenuContributor {
-	
-	private IFont labelFont;
+
+    private IFont labelFont;
 
     public static final String DEFAULT_NAME = "Distance Bearing";
 
@@ -110,12 +111,14 @@ public class DistanceBearingToolLayer extends
         // add magnification capability
         getCapabilities().addCapability(new MagnificationCapability());
         deleteElementAction = new AbstractRightClickAction() {
+            @Override
             public void run() {
                 deleteSelected();
             }
         };
         deleteElementAction.setText("Delete Entire Element");
         moveElementAction = new AbstractRightClickAction() {
+            @Override
             public void run() {
                 selectedVertex = null;
                 makeSelectedLive();
@@ -123,6 +126,7 @@ public class DistanceBearingToolLayer extends
         };
         moveElementAction.setText("Move Entire Element");
         moveVertexAction = new AbstractRightClickAction() {
+            @Override
             public void run() {
                 makeSelectedLive();
             }
@@ -135,12 +139,13 @@ public class DistanceBearingToolLayer extends
         super.initInternal(target);
         setObjects(ToolsDataManager.getInstance().getDistanceBearings());
         gc = new GeodeticCalculator(descriptor.getCRS());
-        // initialize font for  magnification capability
+        // initialize font for magnification capability
         labelFont = target.initializeFont(
-                target.getDefaultFont().getFontName(), 12.0f,
+                target.getDefaultFont().getFontName(), 10,
                 new Style[] { Style.BOLD });
     }
 
+    @Override
     protected void paint(IGraphicsTarget target, PaintProperties paintProps,
             LineSegment line, SelectionStatus status) throws VizException {
         double radius = (MAGIC_CIRCLE_RADIUS * paintProps.getZoomLevel());
@@ -175,7 +180,7 @@ public class DistanceBearingToolLayer extends
             target.drawCircle(circles);
         }
         String label = computeRangeAndAzimuth(line);
-        // set font for  magnification capability
+        // set font for magnification capability
         labelFont.setMagnification(getCapability(MagnificationCapability.class)
                 .getMagnification().floatValue());
         double[] center = descriptor.worldToPixel(new double[] { line.p0.x,
@@ -187,7 +192,8 @@ public class DistanceBearingToolLayer extends
         string.setCoordinates(labelLoc[0], labelLoc[1]);
         target.drawStrings(string);
 
-        target.drawWireframeShape(wireframeShape, color, lineWidth, lineStyle, labelFont);
+        target.drawWireframeShape(wireframeShape, color, lineWidth, lineStyle,
+                labelFont);
         wireframeShape.dispose();
     }
 
@@ -226,6 +232,7 @@ public class DistanceBearingToolLayer extends
         return rangeAndAzimuth;
     }
 
+    @Override
     public String getDefaultName() {
         return DEFAULT_NAME;
     }
@@ -241,6 +248,7 @@ public class DistanceBearingToolLayer extends
         }
     }
 
+    @Override
     protected boolean isClicked(IDisplayPaneContainer container,
             Coordinate clickPoint, LineSegment line) {
         double[] point0 = container.translateInverseClick(line.p0);
@@ -264,10 +272,12 @@ public class DistanceBearingToolLayer extends
         return false;
     }
 
+    @Override
     protected LineSegment makeLive(LineSegment line) {
         return new LineSegment(new Coordinate(line.p0), new Coordinate(line.p1));
     }
 
+    @Override
     protected LineSegment move(Coordinate lastClickLoc, Coordinate clickLoc,
             LineSegment line) {
 
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/HomeToolLayer.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/HomeToolLayer.java
index 9d64531e3a..521a7e1a1d 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/HomeToolLayer.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/HomeToolLayer.java
@@ -75,6 +75,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  *                                       MB3 clicking off the map in editable mode.
  *  14Aug2014    3523        mapeters    Updated deprecated {@link DrawableString#textStyle} 
  *                                       assignments.
+ *  05Nov2015   #5070        randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author ebabin
@@ -84,8 +86,8 @@ import com.vividsolutions.jts.geom.Coordinate;
 
 public class HomeToolLayer extends AbstractMovableToolLayer<Coordinate>
         implements IContextMenuContributor, IPointChangedListener {
-	
-	private IFont labelFont;
+
+    private IFont labelFont;
 
     public static final String DEFAULT_NAME = "Home Location";
 
@@ -97,28 +99,28 @@ public class HomeToolLayer extends AbstractMovableToolLayer<Coordinate>
 
     private GeodeticCalculator gc;
 
-	public HomeToolLayer(GenericToolsResourceData<HomeToolLayer> resourceData,
-			LoadProperties loadProperties) {
-		super(resourceData, loadProperties, false);
-		// add magnification capability
-		getCapabilities().addCapability(new MagnificationCapability());
-		selectLocationAction = new AbstractRightClickAction() {
-			@Override
-			public void run() {
-				save(null, lastMouseLoc);
-				resetHome();
-			}
-		};
-		selectLocationAction.setText("Select Location");
-		moveElementAction = new AbstractRightClickAction() {
-			@Override
-			public void run() {
-				makeSelectedLive();
-			}
-		};
-		moveElementAction.setText("Move Entire Element");
-		this.rightClickMovesToCoord = true;
-	}
+    public HomeToolLayer(GenericToolsResourceData<HomeToolLayer> resourceData,
+            LoadProperties loadProperties) {
+        super(resourceData, loadProperties, false);
+        // add magnification capability
+        getCapabilities().addCapability(new MagnificationCapability());
+        selectLocationAction = new AbstractRightClickAction() {
+            @Override
+            public void run() {
+                save(null, lastMouseLoc);
+                resetHome();
+            }
+        };
+        selectLocationAction.setText("Select Location");
+        moveElementAction = new AbstractRightClickAction() {
+            @Override
+            public void run() {
+                makeSelectedLive();
+            }
+        };
+        moveElementAction.setText("Move Entire Element");
+        this.rightClickMovesToCoord = true;
+    }
 
     @Override
     protected void disposeInternal() {
@@ -128,9 +130,9 @@ public class HomeToolLayer extends AbstractMovableToolLayer<Coordinate>
 
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
-    	// initialize font for  magnification capability
-    	labelFont = target.initializeFont(
-                target.getDefaultFont().getFontName(), 12.0f,
+        // initialize font for magnification capability
+        labelFont = target.initializeFont(
+                target.getDefaultFont().getFontName(), 10,
                 new Style[] { Style.BOLD });
         super.initInternal(target);
         resetHome();
@@ -149,7 +151,7 @@ public class HomeToolLayer extends AbstractMovableToolLayer<Coordinate>
     protected void paint(IGraphicsTarget target, PaintProperties paintProps,
             Coordinate home, SelectionStatus status) throws VizException {
         RGB color = getCapability(ColorableCapability.class).getColor();
-    	// set font for  magnification capability
+        // set font for magnification capability
         labelFont.setMagnification(getCapability(MagnificationCapability.class)
                 .getMagnification().floatValue());
         if (status == SelectionStatus.SELECTED) {
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/RangeRingsLayer.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/RangeRingsLayer.java
index 23f2968bc3..2ae658751e 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/RangeRingsLayer.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/RangeRingsLayer.java
@@ -81,6 +81,8 @@ import com.vividsolutions.jts.geom.Point;
  *  07-21-14    #3412       mapeters    Updated deprecated drawCircle call.
  *  07-29-14    #3465       mapeters    Updated deprecated drawString() calls.
  *  08-13-14    #3467       mapeters    ringDialog notifies this of changes.
+ *  05-11-2015  #5070       randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author ebabin
@@ -126,6 +128,7 @@ public class RangeRingsLayer extends AbstractMovableToolLayer<RangeRing>
         // add magnification capability
         getCapabilities().addCapability(new MagnificationCapability());
         moveElementAction = new AbstractRightClickAction() {
+            @Override
             public void run() {
                 makeSelectedLive();
             }
@@ -144,16 +147,16 @@ public class RangeRingsLayer extends AbstractMovableToolLayer<RangeRing>
     }
 
     @Override
-	protected void initInternal(IGraphicsTarget target) throws VizException {
-		super.initInternal(target);
-		resourceData.addChangeListener(this);
-		resetRings();
-		displayDialog();
-		// initialize font for magnification capability
-		labelFont = target.initializeFont(
-				target.getDefaultFont().getFontName(), 12.0f,
-				new Style[] { Style.BOLD });
-	}
+    protected void initInternal(IGraphicsTarget target) throws VizException {
+        super.initInternal(target);
+        resourceData.addChangeListener(this);
+        resetRings();
+        displayDialog();
+        // initialize font for magnification capability
+        labelFont = target.initializeFont(
+                target.getDefaultFont().getFontName(), 10,
+                new Style[] { Style.BOLD });
+    }
 
     private void resetRings() {
         setObjects(dataManager.getRangeRings());
@@ -186,10 +189,11 @@ public class RangeRingsLayer extends AbstractMovableToolLayer<RangeRing>
         });
     }
 
+    @Override
     protected void paint(IGraphicsTarget target, PaintProperties paintProps,
             RangeRing ring, SelectionStatus status) throws VizException {
-    	// set font for  magnification capability
-    	labelFont.setMagnification(getCapability(MagnificationCapability.class)
+        // set font for magnification capability
+        labelFont.setMagnification(getCapability(MagnificationCapability.class)
                 .getMagnification().floatValue());
         if (ring.isVisible()) {
             RGB color = getCapability(ColorableCapability.class).getColor();
@@ -268,6 +272,7 @@ public class RangeRingsLayer extends AbstractMovableToolLayer<RangeRing>
         return ring;
     }
 
+    @Override
     public String getDefaultName() {
         return DEFAULT_NAME;
     }
@@ -296,6 +301,7 @@ public class RangeRingsLayer extends AbstractMovableToolLayer<RangeRing>
         issueRefresh();
     }
 
+    @Override
     protected boolean isClicked(IDisplayPaneContainer container,
             Coordinate mouseLoc, RangeRing ring) {
 
@@ -314,10 +320,12 @@ public class RangeRingsLayer extends AbstractMovableToolLayer<RangeRing>
 
     }
 
+    @Override
     protected RangeRing makeLive(RangeRing object) {
         return object.clone();
     }
 
+    @Override
     protected RangeRing move(Coordinate lastClickedCoordinate,
             Coordinate clickLoc, RangeRing ring) {
         ring.setCenterCoordinate(clickLoc);
diff --git a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/TimeOfArrivalLayer.java b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/TimeOfArrivalLayer.java
index 2ae8f455da..bbf3d07f9c 100644
--- a/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/TimeOfArrivalLayer.java
+++ b/cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/TimeOfArrivalLayer.java
@@ -39,7 +39,6 @@ import org.opengis.coverage.grid.GridEnvelope;
 
 import com.raytheon.uf.common.geospatial.LocalTimeZone;
 import com.raytheon.uf.common.geospatial.SpatialException;
-import com.raytheon.uf.common.time.DataTime;
 import com.raytheon.uf.viz.core.DrawableCircle;
 import com.raytheon.uf.viz.core.DrawableString;
 import com.raytheon.uf.viz.core.IDisplayPane;
@@ -75,39 +74,45 @@ import com.raytheon.viz.ui.input.EditableManager;
 import com.raytheon.viz.ui.input.InputAdapter;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.LineSegment;
+import com.vividsolutions.jts.geom.LineString;
 
 /**
- * TODO Add Description
+ * Layer which contains a configurable storm track as well as a Time Of
+ * Arrival/Lead Time point. The primary purpose is to display the distance and
+ * time it would take to reach the lead point following the storm track.
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * June 28 2010 #6513      bkowal      Switching the mode of the Time of Arrival /
- *                                     Lead time tool to Polyline before creating a
- *                                     a track will no longer cause the tool to
- *                                     crash.
- * July 28 2010 #4518      bkowal      CDT time will now be displayed in the Time of
- *                                     Arrival point label when the scale is
- *                                     WFO or State(s).
- *  Aug 19 2010 #4518      bkowal      Instead of CDT time, the users local time
- *                                     will be displayed. Progressive Disclosure  
- *                                     Properties are now used to determine whether
- *                                     local time should be displayed or not.
- *  Oct 19 2010 #6753      bkowal      Added logic to change the text alignment from
- *                                     left-to-right if there is not enough room
- *                                     for the text to the left of the point.
- * 15Mar2013	15693	mgamazaychikov Added magnification capability.
- *  Apr 12 2013 DR 16032   D. Friedman Make it work in multiple panes.
- *  Aug 14 2014 3523       mapeters    Updated deprecated {@link DrawableString#textStyle} 
- *                                     assignments.
+ * 
+ * Date          Ticket#  Engineer   Description
+ * ------------- -------- ---------- -------------------------------------------
+ * Jun 28, 2010  6513     bkowal     Switching the mode of the Time of Arrival /
+ *                                   Lead time tool to Polyline before creating
+ *                                   a a track will no longer cause the tool to
+ *                                   crash.
+ * Jul 28, 2010  4518     bkowal     CDT time will now be displayed in the Time
+ *                                   of Arrival point label when the scale is
+ *                                   WFO or State(s).
+ * Aug 19, 2010  4518     bkowal     Instead of CDT time, the users local time
+ *                                   will be displayed. Progressive Disclosure
+ *                                   Properties are now used to determine
+ *                                   whether local time should be displayed or
+ *                                   not.
+ * Oct 19, 2010  6753     bkowal     Added logic to change the text alignment
+ *                                   from left-to-right if there is not enough
+ *                                   room for the text to the left of the point.
+ * Mar 15, 2013  15693    mgamazay   Added magnification capability.
+ * Apr 12, 2013  16032    dfriedman  Make it work in multiple panes.
+ * Aug 14, 2014  3523     mapeters   Updated deprecated DrawableString.textStyle
+ *                                   assignments.
+ * Dec 02, 2015  5150     bsteffen   Calculate correct lead time for Polylines.
+ * 
  * </pre>
  * 
  * @author mschenke
- * @version 1.0
  */
-
 public class TimeOfArrivalLayer extends AbstractStormTrackResource {
 
     public static class LeadTimeState {
@@ -122,9 +127,15 @@ public class TimeOfArrivalLayer extends AbstractStormTrackResource {
         public boolean changed;
     }
 
+    /* Thread Dangerous: Must only be used on the "paint" thread. */
     private final DateFormat timeFormat = new SimpleDateFormat("HH:mm");
 
-    // private DateFormat localTimeFormat = new SimpleDateFormat("HH:mmz");
+    /*
+     * Thread Dangerous: Must only be used on the "paint" thread.
+     * 
+     * The time zone should be set based off the end time before each use.
+     */
+    private final DateFormat localTimeFormat = new SimpleDateFormat("HH:mmz");
 
     private static final String formatString = "%sZ (%s) %s miles";
 
@@ -306,6 +317,8 @@ public class TimeOfArrivalLayer extends AbstractStormTrackResource {
             if (displayState.mode == Mode.TRACK) {
                 if (displayState.displayType == DisplayType.CIRCULAR) {
                     constructCircularStuff(target);
+                } else if (displayState.displayType == DisplayType.POLY) {
+                    constructPolyStuff(target);
                 }
             }
         }
@@ -451,6 +464,44 @@ public class TimeOfArrivalLayer extends AbstractStormTrackResource {
         }
     }
 
+    /**
+     * Create lines in jazzyExtras that mirror the dragMeLine projected out to
+     * intersect the lead point. Should only be used when the display type is
+     * {@link DisplayType#POLY}.
+     */
+    private void constructPolyStuff(IGraphicsTarget target) {
+        if (jazzyExtras != null) {
+            jazzyExtras.dispose();
+        }
+
+        jazzyExtras = target.createWireframeShape(false, descriptor);
+        Coordinate startLonLat = getLeadDragMePoint();
+        if(startLonLat == null){
+            return;
+        }
+        Coordinate endLonLat = leadState.loc;
+        
+        double[] startPixel = descriptor.worldToPixel(new double[] {
+                startLonLat.x, startLonLat.y });
+        double[] endPixel = descriptor.worldToPixel(new double[] {
+                endLonLat.x, endLonLat.y });
+        
+        double dx = endPixel[0] - startPixel[0];
+        double dy = endPixel[1] - startPixel[1];
+        
+        LineString fullLine = displayState.dragMeLine;
+        double[][] pixels = new double[fullLine.getNumPoints()][];
+        for (int i = 0; i < fullLine.getNumPoints(); i += 1) {
+            Coordinate c = fullLine.getCoordinateN(i);
+            pixels[i] = descriptor.worldToPixel(new double[] {
+                    c.x, c.y });
+            pixels[i][0] += dx;
+            pixels[i][1] += dy; 
+        }
+        jazzyExtras.addLineSegment(pixels);
+        
+    }
+
     private void constructCircularStuff(IGraphicsTarget target)
             throws VizException {
 
@@ -550,6 +601,7 @@ public class TimeOfArrivalLayer extends AbstractStormTrackResource {
         // Default angle for POINT
         displayState.displayType = StormTrackState.DisplayType.POINT;
         displayState.labelMode = LabelMode.TIME;
+        displayState.liveOffsetEndTime = false;
         state.angle = 48;
         state.dragMePoint = null;
         state.dragMeLine = null;
@@ -584,7 +636,135 @@ public class TimeOfArrivalLayer extends AbstractStormTrackResource {
         });
     }
 
+    /**
+     * Determine a point along the dragMeLine that can be combined with the lead
+     * point to create a line that is perpendicular to the storm track. This is
+     * the point that is used when determining the distance of the lead point.
+     * This method will return null if the lead point is too far from the storm
+     * track so no point exists. Should only be used when the display type is
+     * {@link DisplayType#POLY}.
+     */
+    private Coordinate getLeadDragMePoint() {
+        /*
+         * The input and output points are all in Lon/Lat but all math is
+         * performed in the descriptor pixel space to minimize the potential for
+         * projection related problems.
+         */
+        Coordinate startLonLat = displayState.timePoints[0].coord;
+        Coordinate endLonLat = displayState.timePoints[displayState.timePoints.length - 1].coord;
+
+        double[] startPixel = descriptor.worldToPixel(new double[] {
+                startLonLat.x, startLonLat.y });
+        double[] endPixel = descriptor.worldToPixel(new double[] { endLonLat.x,
+                endLonLat.y });
+        double[] leadPixel = descriptor.worldToPixel(new double[] {
+                leadState.loc.x, leadState.loc.y });
+
+        double dx = leadPixel[0] - endPixel[0];
+        double dy = leadPixel[1] - endPixel[1];
+
+        double[] leadStartPixel = { startPixel[0] + dx, startPixel[1] + dy };
+
+        /*
+         * This is a line that is parallel to the storm track and the same
+         * distance as the timePoints in the storm track.
+         */
+        LineSegment leadLine = new LineSegment(leadStartPixel[0],
+                leadStartPixel[1], leadPixel[0], leadPixel[1]);
+
+        LineString fullLine = displayState.dragMeLine;
+        Coordinate c = fullLine.getCoordinateN(0);
+        double[] prevPixel = descriptor.worldToPixel(new double[] { c.x, c.y });
+        Coordinate bestIntersection = null;
+        for (int i = 1; i < fullLine.getNumPoints(); i += 1) {
+            c = fullLine.getCoordinateN(i);
+            double[] currPixel = descriptor.worldToPixel(new double[] { c.x,
+                    c.y });
+            LineSegment segment = new LineSegment(prevPixel[0], prevPixel[1],
+                    currPixel[0], currPixel[1]);
+            /*
+             * The leadLine may not be long enough to reach from the lead point
+             * to the dragMeLine so must use lineIntersection to extend both
+             * segments infinitely
+             */
+            Coordinate intersection = segment.lineIntersection(leadLine);
+            /*
+             * lineIntersection may extends both lines but only an intersection
+             * that is actually on the segment is valid so ensure that the
+             * intersection point is reasonably close to the segment.
+             */
+            if (segment.distance(intersection) < 0.0000001) {
+                /*
+                 * If the dragMeLine is complex thre can be multiple
+                 * intersections, only keep the closest one.
+                 */
+                if (bestIntersection == null) {
+                    bestIntersection = intersection;
+                } else if (bestIntersection.distance(new Coordinate(
+                        leadPixel[0], leadPixel[1])) > intersection
+                        .distance(new Coordinate(leadPixel[0], leadPixel[1]))) {
+                    bestIntersection = intersection;
+
+                }
+            }
+            prevPixel = currPixel;
+        }
+        if (bestIntersection != null) {
+            double[] intersectionLonLat = descriptor.pixelToWorld(new double[] {
+                    bestIntersection.x, bestIntersection.y });
+            return new Coordinate(intersectionLonLat[0], intersectionLonLat[1]);
+        }
+        return bestIntersection;
+    }
+
+    /**
+     * Determine the distance(in meters) from the lead point to the current
+     * point, line, or front. This is the distance displayed in the lead time
+     * text. This method will return Double.NaN if the lead point is
+     * unrealistic.
+     */
+    private double getLeadDistance() {
+        GeodeticCalculator gc = new GeodeticCalculator();
+        if (displayState.displayType == DisplayType.POLY) {
+            Coordinate dragMe = getLeadDragMePoint();
+            if (dragMe == null) {
+                return Double.NaN;
+            }
+            gc.setStartingGeographicPoint(dragMe.x, dragMe.y);
+            gc.setDestinationGeographicPoint(leadState.loc.x, leadState.loc.y);
+            double distance = gc.getOrthodromicDistance();
+            double angle = unadjustAngle(gc.getAzimuth());
+            double stateAngle = unadjustAngle(displayState.angle);
+            if(Math.abs(angle - stateAngle) > 180){
+                distance = -1*distance;
+            }
+            return distance;
+        }else{
+            StormCoord start = displayState.timePoints[0];
+            Coordinate end = displayState.timePoints[displayState.timePoints.length - 1].coord;
+
+            gc.setStartingGeographicPoint(start.coord.x, start.coord.y);
+            gc.setDestinationGeographicPoint(end.x, end.y);
+            double distFromStartEnd = gc.getOrthodromicDistance();
+            
+            end = leadState.loc;
+            gc.setDestinationGeographicPoint(end.x, end.y);
+            double angle = unadjustAngle(gc.getAzimuth());
+            double stateAngle = unadjustAngle(displayState.angle);
+            double distance = gc.getOrthodromicDistance();
+
+            if (Math.abs(angle - stateAngle) >= 22.5) {
+                return Double.NaN;
+            }else{
+                return distance
+                        - distFromStartEnd;
+            }
+        }
+    }
+
     private void updateLeadTimeState() {
+        leadState.changed = false;
+
         // based on display state and lead time location, figure out distance,
         // duration, and time
 
@@ -592,94 +772,69 @@ public class TimeOfArrivalLayer extends AbstractStormTrackResource {
             return;
         }
 
-        // First get Time from start point
-        StormCoord start = displayState.timePoints[0];
-        Coordinate end = displayState.timePoints[displayState.timePoints.length - 1].coord;
-
-        GeodeticCalculator gc = new GeodeticCalculator();
-        gc.setStartingGeographicPoint(start.coord.x, start.coord.y);
-        gc.setDestinationGeographicPoint(end.x, end.y);
-        double distFromStartEnd = gc.getOrthodromicDistance();
-
-        end = leadState.loc;
-        gc.setDestinationGeographicPoint(end.x, end.y);
-        double angle = unadjustAngle(gc.getAzimuth());
-        double stateAngle = unadjustAngle(displayState.angle);
-        double distance = gc.getOrthodromicDistance();
-        leadState.distance = distance;
-
-        // TODO: Figure out point on line and distance to line if in POLY mode
-        // and set distance accordingly, then uncomment TODO in constructLines
-
-        if (Math.abs(angle - stateAngle) >= 22.5) {
+        double distance = getLeadDistance();
+        if (Double.isNaN(distance)) {
             leadState.text = "Unrealistic Point of Arrival";
-        } else {
-
-            long timeInSec = (long) (distance / displayState.speed);
-            DataTime toa = new DataTime(new Date(start.time.getMatchValid()
-                    + (timeInSec * 1000)));
-
-            Date date = new Date(toa.getMatchValid());
-            Date refDate = new Date(
-                    displayState.timePoints[displayState.timePoints.length - 1].time
-                            .getMatchValid());
-
-            boolean negative = date.getTime() < refDate.getTime();
-
-            String miles = "";
-            String hoursMinutesFormat = "";
-            if (negative) {
-                hoursMinutesFormat += "-";
-                miles += "-";
-            }
-
-            long timeDiffInMinutes = Math.abs(date.getTime()
-                    - refDate.getTime())
-                    / (60 * 1000);
-
-            long hours = timeDiffInMinutes / 60;
-            long minutes = timeDiffInMinutes % 60;
-            Object[] args = new Object[2];
-            if (hours > 0) {
-                hoursMinutesFormat += "%02d hours ";
-                args[0] = hours;
-                args[1] = minutes;
-            } else {
-                args[0] = minutes;
-            }
-
-            hoursMinutesFormat += "%02d minutes";
-
-            miles += (int) metersToMiles.convert(Math.abs(distance
-                    - distFromStartEnd));
-
-            String time = this.timeFormat.format(date);
-            int currentDisplayWidth = ((IMapDescriptor) this.descriptor)
-                    .getMapWidth();
-
-            if (!this.pdProps.isDisclosed(currentDisplayWidth)) {
-                // Do not include Local time
-                leadState.text = String.format(formatString, time,
-                        String.format(hoursMinutesFormat, args), miles);
-            } else {
-                // Include Local time
-                String localTime = ""; // this.localTimeFormat.format(date);
-                try {
-                    DateFormat df = new SimpleDateFormat("HH:mmz");
-                    // System.err.println(end.x + " " + end.y);
-                    df.setTimeZone(LocalTimeZone.getLocalTimeZone(end));
-                    localTime = df.format(date);
-                } catch (SpatialException e) {
-                    e.printStackTrace();
-                }
-
-                leadState.text = String.format(
-                        TimeOfArrivalLayer.formatStringIncludeLocal, time,
-                        localTime, String.format(hoursMinutesFormat, args),
-                        miles);
-            }
+            return;
+        }
+        StormCoord endStormCoord = displayState.timePoints[displayState.timePoints.length - 1];
+
+        Date refDate = endStormCoord.time.getValidTimeAsDate();
+        long timeInSec = (long) (distance / displayState.speed);
+
+        Date date = new Date(refDate.getTime() + (timeInSec * 1000));
+
+        boolean negative = date.getTime() < refDate.getTime();
+
+        String miles = "";
+        String hoursMinutesFormat = "";
+        if (negative) {
+            hoursMinutesFormat += "-";
+            miles += "-";
+        }
+
+        long timeDiffInMinutes = Math.abs(date.getTime() - refDate.getTime())
+                / (60 * 1000);
+
+        long hours = timeDiffInMinutes / 60;
+        long minutes = timeDiffInMinutes % 60;
+        Object[] args = new Object[2];
+        if (hours > 0) {
+            hoursMinutesFormat += "%02d hours ";
+            args[0] = hours;
+            args[1] = minutes;
+        } else {
+            args[0] = minutes;
+        }
+
+        hoursMinutesFormat += "%02d minutes";
+
+        miles += (int) metersToMiles.convert(Math.abs(distance));
+
+        String time = this.timeFormat.format(date);
+        int currentDisplayWidth = ((IMapDescriptor) this.descriptor)
+                .getMapWidth();
+
+        if (!this.pdProps.isDisclosed(currentDisplayWidth)) {
+            // Do not include Local time
+            leadState.text = String.format(formatString, time,
+                    String.format(hoursMinutesFormat, args), miles);
+        } else {
+            // Include Local time
+            String localTime = "";
+            try {
+                Coordinate end = endStormCoord.coord;
+                localTimeFormat
+                        .setTimeZone(LocalTimeZone.getLocalTimeZone(end));
+                localTime = localTimeFormat.format(date);
+            } catch (SpatialException e) {
+                e.printStackTrace();
+            }
+
+            leadState.text = String.format(
+                    TimeOfArrivalLayer.formatStringIncludeLocal, time,
+                    localTime, String.format(hoursMinutesFormat, args), miles);
         }
-        leadState.changed = false;
     }
 
     public void makeEditableAndReopenDialog() {
diff --git a/cave/com.raytheon.viz.bcd/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.bcd/META-INF/MANIFEST.MF
index cc55c60389..40e0e955cc 100644
--- a/cave/com.raytheon.viz.bcd/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.bcd/META-INF/MANIFEST.MF
@@ -2,14 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BCD Plug-in
 Bundle-SymbolicName: com.raytheon.viz.bcd;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: Raytheon
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  com.raytheon.viz.core,
  com.raytheon.viz.ui,
  org.geotools,
- org.apache.commons.lang,
  com.raytheon.uf.viz.core.maps;bundle-version="1.0.0",
  com.raytheon.uf.common.pointdata;bundle-version="1.12.1174"
 Bundle-ActivationPolicy: lazy
diff --git a/cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java b/cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java
index f8e03266f9..643dc41e87 100644
--- a/cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java
+++ b/cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java
@@ -45,14 +45,12 @@ import com.raytheon.uf.viz.core.IGraphicsTarget.HorizontalAlignment;
 import com.raytheon.uf.viz.core.IView;
 import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.core.datastructure.WireframeCache;
-import com.raytheon.uf.viz.core.drawables.IFont;
 import com.raytheon.uf.viz.core.drawables.IWireframeShape;
 import com.raytheon.uf.viz.core.drawables.PaintProperties;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.IMapDescriptor;
 import com.raytheon.uf.viz.core.map.MapDescriptor;
 import com.raytheon.uf.viz.core.maps.rsc.StyledMapResource;
-import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
 import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
 import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
@@ -65,20 +63,21 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 
  * <pre>
  * 
- *    SOFTWARE HISTORY
- *   
- *    Date          Ticket#     Engineer    Description
- *    ------------	----------	-----------	--------------------------
- *    7/1/06                    chammack    Initial Creation.
- *    1/10/08       562         bphillip    Modified to handle .bcx files
- *    02/11/09                  njensen     Refactored to new rsc architecture
- *    07/31/12      DR 14935    D. Friedman Handle little-endian files
- *    Jul 28, 2014  3397        bclement    switched to non deprecated version of createWireframeShape()
- *                                          now closes on FileInputStream instead of FileChannel in initInternal()
- *    Jul 29, 2014  3465        mapeters    Updated deprecated drawString() calls.
- *    Aug 04, 2014  3489        mapeters    Updated deprecated getStringBounds() calls.
- *    Aug 13, 2014  3492        mapeters    Updated deprecated createWireframeShape() calls.
- *    Aug 21, 2014 #3459        randerso    Restructured Map resource class hierarchy
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#     Engineer    Description
+ * ------------	----------	-----------	--------------------------
+ * 7/1/06                    chammack    Initial Creation.
+ * 1/10/08       562         bphillip    Modified to handle .bcx files
+ * 02/11/09                  njensen     Refactored to new rsc architecture
+ * 07/31/12      DR 14935    D. Friedman Handle little-endian files
+ * Jul 28, 2014  3397        bclement    switched to non deprecated version of createWireframeShape()
+ *                                       now closes on FileInputStream instead of FileChannel in initInternal()
+ * Jul 29, 2014  3465        mapeters    Updated deprecated drawString() calls.
+ * Aug 04, 2014  3489        mapeters    Updated deprecated getStringBounds() calls.
+ * Aug 13, 2014  3492        mapeters    Updated deprecated createWireframeShape() calls.
+ * Aug 21, 2014 #3459        randerso    Restructured Map resource class hierarchy
+ * Nov 05, 2015 #5070        randerso    Moved label font management up to AbstractMapResource
  * 
  * </pre>
  * 
@@ -86,8 +85,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 
  */
 public class BCDResource extends
-        StyledMapResource<BCDResourceData, MapDescriptor> implements
-        IResourceDataChanged {
+        StyledMapResource<BCDResourceData, MapDescriptor> {
 
     /** The wireframe object */
     private IWireframeShape wireframeShape;
@@ -103,8 +101,6 @@ public class BCDResource extends
 
     private int maxLen = 0;
 
-    private IFont font;
-
     private ArrayList<BcxLabel> labels;
 
     private class BcxLabel {
@@ -139,16 +135,14 @@ public class BCDResource extends
      */
     @Override
     protected void disposeInternal() {
+        super.disposeInternal();
+
         WireframeCache.getInstance().unregisterWireframe(
                 resourceData.getFilename(), gridGeometry);
 
         wireframeShape = null; // drop the reference
 
         lastTarget = null;
-        resourceData.removeChangeListener(this);
-        if (font != null) {
-            font.dispose();
-        }
     }
 
     /*
@@ -307,6 +301,7 @@ public class BCDResource extends
     @Override
     protected void paintInternal(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
+
         if (ready && isBCX) {
             int displayWidth = (int) (descriptor.getMapWidth() * paintProps
                     .getZoomLevel());
@@ -319,13 +314,8 @@ public class BCDResource extends
             double density = getCapability(DensityCapability.class)
                     .getDensity();
 
-            if (font == null) {
-                font = target.initializeFont(target.getDefaultFont()
-                        .getFontName(), (float) (10 * magnification), null);
-            }
-
             DrawableString stringN = new DrawableString("N");
-            stringN.font = font;
+            stringN.font = getFont(target);
             Rectangle2D charSize = target.getStringsBounds(stringN);
             double charWidth = charSize.getWidth();
 
@@ -348,7 +338,7 @@ public class BCDResource extends
 
                 if (view.isVisible(p.pixel) && (p.distance >= minSepDist)) {
                     DrawableString string = new DrawableString(p.label, color);
-                    string.font = font;
+                    string.font = getFont(target);
                     string.setCoordinates(p.pixel[0], p.pixel[1]);
                     string.horizontalAlignment = HorizontalAlignment.CENTER;
                     strings.add(string);
@@ -372,24 +362,4 @@ public class BCDResource extends
 
         this.initInternal(this.lastTarget);
     }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.rsc.IResourceDataChanged#resourceChanged(com
-     * .raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType,
-     * java.lang.Object)
-     */
-    @Override
-    public void resourceChanged(ChangeType type, Object object) {
-        if (type == ChangeType.CAPABILITY) {
-            if (object instanceof MagnificationCapability) {
-                if (font != null) {
-                    font.dispose();
-                    font = null;
-                }
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.dataaccess/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.dataaccess/META-INF/MANIFEST.MF
index d07a314ca3..63f952d4a7 100644
--- a/cave/com.raytheon.viz.dataaccess/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.dataaccess/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Viz Data Access
 Bundle-SymbolicName: com.raytheon.viz.dataaccess
-Bundle-Version: 1.15.0.qualifier
+Bundle-Version: 1.15.1.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
@@ -10,7 +10,7 @@ Require-Bundle: com.raytheon.uf.viz.core;bundle-version="1.14.0",
  com.raytheon.uf.common.dataaccess;bundle-version="1.0.0",
  com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
  javax.measure;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.common.style;bundle-version="1.0.0",
  com.raytheon.uf.common.numeric;bundle-version="1.14.0",
  com.raytheon.uf.viz.core.grid;bundle-version="1.15.0",
diff --git a/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/AbstractDataAccessResource.java b/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/AbstractDataAccessResource.java
index 1f2bd30890..4ccba2e9aa 100644
--- a/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/AbstractDataAccessResource.java
+++ b/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/AbstractDataAccessResource.java
@@ -21,7 +21,7 @@ package com.raytheon.viz.dataaccess.rsc;
 
 import java.util.Arrays;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.raytheon.uf.common.time.DataTime;
 import com.raytheon.uf.viz.core.IGraphicsTarget;
diff --git a/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/geometry/GenericGeometryResource.java b/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/geometry/GenericGeometryResource.java
index edd09301c4..b1fa77808c 100644
--- a/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/geometry/GenericGeometryResource.java
+++ b/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/geometry/GenericGeometryResource.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
 import com.raytheon.uf.common.dataaccess.geom.IGeometryData;
diff --git a/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/grid/GenericGridResource.java b/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/grid/GenericGridResource.java
index cf98d4233f..38f22bfc8c 100644
--- a/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/grid/GenericGridResource.java
+++ b/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/grid/GenericGridResource.java
@@ -26,7 +26,7 @@ import java.util.Map;
 
 import javax.measure.unit.UnitFormat;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
diff --git a/cave/com.raytheon.viz.geotiff/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.geotiff/META-INF/MANIFEST.MF
index 6cf04801fc..5b6a1f8d21 100644
--- a/cave/com.raytheon.viz.geotiff/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.geotiff/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geotiff Plug-in
 Bundle-SymbolicName: com.raytheon.viz.geotiff;singleton:=true
-Bundle-Version: 1.14.1.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Activator: com.raytheon.viz.geotiff.Activator
 Bundle-Vendor: Raytheon
 Require-Bundle: org.eclipse.ui,
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.viz.core,
  org.geotools,
  com.raytheon.viz.ui,
- org.apache.commons.lang,
  com.raytheon.uf.viz.core.maps;bundle-version="1.12.1174"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/cave/com.raytheon.viz.gfe.feature/feature.xml b/cave/com.raytheon.viz.gfe.feature/feature.xml
index 5a222d6888..e2c34a6263 100644
--- a/cave/com.raytheon.viz.gfe.feature/feature.xml
+++ b/cave/com.raytheon.viz.gfe.feature/feature.xml
@@ -44,4 +44,17 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="com.raytheon.uf.common.gfe.ifpclient"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="com.raytheon.uf.viz.zoneselector"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
index 8c519f474a..3fa75b12c7 100644
--- a/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.gfe/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GFE Plug-in
 Bundle-SymbolicName: com.raytheon.viz.gfe;singleton:=true
-Bundle-Version: 1.15.1.qualifier
+Bundle-Version: 1.16.1.qualifier
 Bundle-Activator: com.raytheon.viz.gfe.Activator
 Bundle-Vendor: Raytheon
 Require-Bundle: org.eclipse.ui,
@@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.uf.viz.spellchecker;bundle-version="1.0.0";resolution:=optional,
  javax.measure,
  com.raytheon.viz.ui,
- org.apache.commons.lang,
  org.jep,
  org.apache.velocity,
  com.raytheon.viz.core.contours,
@@ -38,7 +37,10 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.uf.common.plugin.nwsauth;bundle-version="1.14.0",
  com.raytheon.uf.viz.core.grid;bundle-version="1.15.0",
  com.raytheon.uf.common.dataaccess;bundle-version="1.15.0",
- com.raytheon.uf.viz.core.point;bundle-version="1.15.0"
+ com.raytheon.uf.viz.core.point;bundle-version="1.15.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
+ com.raytheon.uf.common.gfe.ifpclient;bundle-version="1.15.0",
+ com.raytheon.uf.viz.zoneselector;bundle-version="1.16.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.viz.gfe,
  com.raytheon.viz.gfe.constants,
diff --git a/cave/com.raytheon.viz.gfe/help/GFETrainingIntroGridManager.html b/cave/com.raytheon.viz.gfe/help/GFETrainingIntroGridManager.html
index a5197e6f05..e1e90d08b7 100644
--- a/cave/com.raytheon.viz.gfe/help/GFETrainingIntroGridManager.html
+++ b/cave/com.raytheon.viz.gfe/help/GFETrainingIntroGridManager.html
@@ -17,7 +17,7 @@ here.
 The Grid Manager looks complex because it displays a large amount of
 information
 and offers a long list of features that help you manipulate the gridded
-forecast data. While it's appearance can be intimidating, once you have
+forecast data. While its appearance can be intimidating, once you have
 performed the exercises and understand how each of the features work,
 you
 will understand that it is necessarily complex. Refer to the <a
@@ -32,4 +32,4 @@ labels that name its various parts.
 Manager in Normal Display Mode
 <br>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/cave/com.raytheon.viz.gfe/help/SmartInit.html b/cave/com.raytheon.viz.gfe/help/SmartInit.html
index 5d9ddd2baf..1037f99870 100644
--- a/cave/com.raytheon.viz.gfe/help/SmartInit.html
+++ b/cave/com.raytheon.viz.gfe/help/SmartInit.html
@@ -127,7 +127,7 @@ function is the constructor to the class, which calls the base class
 (class
 it has been defined from) with three arguments, self, "sourceDb",
 and "destDb". The source db is the name of the D2D database, such
-as NAM80, NAM40, NAM12, NGM80, RUC80, GFS40, gfsLR. The
+as NAM80, NAM40, NAM12, RUC80, GFS40, gfsLR. The
 destination database is the name of the output
 database, such as NAM12, GFS40, NAM_V. If there is an underscore
 in the destination database, then the format is the
diff --git a/cave/com.raytheon.viz.gfe/help/dfcConfig.html b/cave/com.raytheon.viz.gfe/help/dfcConfig.html
index f410847111..59ec8eada0 100644
--- a/cave/com.raytheon.viz.gfe/help/dfcConfig.html
+++ b/cave/com.raytheon.viz.gfe/help/dfcConfig.html
@@ -192,19 +192,6 @@ archive program</font></div>
 <div class="1Heading"><font color="#3366FF">&nbsp;&nbsp;&nbsp;&nbsp; 'Wind':[0,
 6, 12, 18, 24, 30, 36, 42, 48, 54, 60, 66, 72],</font></div>
 
-<div class="1Heading"><font color="#3366FF">&nbsp;&nbsp;&nbsp;&nbsp; },</font></div>
-<font color="#3366FF">&nbsp;&nbsp;&nbsp; 'NGM':</font></div>
-
-<div class="1Heading">
-<div class="1Heading"><font color="#3366FF">&nbsp;&nbsp;&nbsp; {'T':[0,
-6, 12, 18, 24, 30, 36, 42, 48],</font></div>
-
-<div class="1Heading"><font color="#3366FF">&nbsp;&nbsp;&nbsp;&nbsp; 'Td':[0,
-6, 12, 18, 24, 30, 36, 42, 48],</font></div>
-
-<div class="1Heading"><font color="#3366FF">&nbsp;&nbsp;&nbsp;&nbsp; 'Wind':[0,
-6, 12, 18, 24, 30, 36, 42, 48],</font></div>
-
 <div class="1Heading"><font color="#3366FF">&nbsp;&nbsp;&nbsp;&nbsp; },</font></div>
 <font color="#3366FF">&nbsp;&nbsp;&nbsp; 'MesoNAM':</font></div>
 
diff --git a/cave/com.raytheon.viz.gfe/help/gfeConfig_GHist.html b/cave/com.raytheon.viz.gfe/help/gfeConfig_GHist.html
index ffa27d7aee..2c29ec7fe6 100644
--- a/cave/com.raytheon.viz.gfe/help/gfeConfig_GHist.html
+++ b/cave/com.raytheon.viz.gfe/help/gfeConfig_GHist.html
@@ -214,14 +214,12 @@ for the text is HistoryModelText_<i>modelname</i> and the format for
 the
 color is HistoryModelColor_<i>modelname</i>. </p>
   <p><b><tt>HistoryModelColor_MRF = '#30df10'</tt></b> <br>
-  <b><tt>HistoryModelColor_NGM = 'orange'</tt></b> <br>
   <b><tt>HistoryModelColor_RUC = '#00ffff'</tt></b> <br>
   <b><tt>HistoryModelColor_MOS = '#e6c8a1'</tt></b> <br>
   <b><tt>HistoryModelColor_NAM = '#ffff52'</tt></b> <br>
   <b><tt>HistoryModelColor_MesoNAM = '#ff99ff'</tt></b> <br>
   <b><tt>HistoryModelColor_AVN = 'pink'</tt></b> <br>
   <b><tt>HistoryModelText_MRF = 'MRF'</tt></b> <br>
-  <b><tt>HistoryModelText_NGM = 'NGM'</tt></b> <br>
   <b><tt>HistoryModelText_RUC = 'RUC'</tt></b> <br>
   <b><tt>HistoryModelText_MOS = 'MOS'</tt></b> <br>
   <b><tt>HistoryModelText_NAM = 'NAM'</tt></b> <br>
diff --git a/cave/com.raytheon.viz.gfe/help/localConfig.html b/cave/com.raytheon.viz.gfe/help/localConfig.html
index bd6e0ddef1..0662f6a7e2 100644
--- a/cave/com.raytheon.viz.gfe/help/localConfig.html
+++ b/cave/com.raytheon.viz.gfe/help/localConfig.html
@@ -716,10 +716,6 @@ models and the Python object name that is required:
       <td style="vertical-align: top;">parmsNAM12<br>
       </td>
     </tr>
-    <tr>
-      <td>NGM80</td>
-      <td>parmsNGM80</td>
-    </tr>
     <tr>
       <td>RUC80</td>
       <td>parmsRUC80</td>
@@ -818,12 +814,6 @@ models and the Python object name that is required:
       <td style="vertical-align: top;">parmsNAM95<br>
       </td>
     </tr>
-    <tr>
-      <td style="vertical-align: top;">NGM95<br>
-      </td>
-      <td style="vertical-align: top;">parmsNGM95<br>
-      </td>
-    </tr>
     <tr>
       <td style="vertical-align: top;">MOSGuide<br>
       </td>
@@ -1644,8 +1634,6 @@ MyNAM.
 <br>
 <tt>&nbsp;&nbsp;&nbsp; "GFS40" : ["GFS40"],</tt>
 <br>
-<tt>&nbsp;&nbsp;&nbsp; "NGM80" : ["NGM80"],</tt>
-<br>
 <tt>&nbsp;&nbsp;&nbsp; "MyNAM" : ["NAM12"],</tt>
 <br>
 <tt>&nbsp;&nbsp;&nbsp; "gfsLR" : ["gfsLR"]</tt>
@@ -1822,8 +1810,6 @@ modify entries, rather than redefining the entire dictionary.<br>
 <br>
 <tt>&nbsp;&nbsp;&nbsp; "NAM80": ["tp", "cp"],</tt>
 <br>
-<tt>&nbsp;&nbsp;&nbsp; "NGM80": ["tp", "cp"],</tt>
-<br>
 <tt>&nbsp;&nbsp;&nbsp; "RUC80": ["tp", "cp"],</tt>
 <br>
 <tt>&nbsp;&nbsp;&nbsp; "NAM40": ["tp", "cp"],</tt>
diff --git a/cave/com.raytheon.viz.gfe/help/serverConfig.html b/cave/com.raytheon.viz.gfe/help/serverConfig.html
index 5715dd67c3..61b2b716da 100644
--- a/cave/com.raytheon.viz.gfe/help/serverConfig.html
+++ b/cave/com.raytheon.viz.gfe/help/serverConfig.html
@@ -1252,9 +1252,6 @@ NAM40&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
 NAM80&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
 ('NAM80',&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; GRID,&nbsp;&nbsp;
 '', NO,&nbsp; NO,&nbsp; 2, 0)<br>
-NGM80&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
-('NGM80',&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; GRID,&nbsp;&nbsp;
-'', NO,&nbsp; NO,&nbsp; 2, 0)<br>
 GFS40&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
 ('GFS40',&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; GRID,&nbsp;&nbsp;
 '', NO,&nbsp; NO,&nbsp; 2, 0)<br>
@@ -1276,9 +1273,6 @@ NO,&nbsp; NO,&nbsp; 3, 0)<br>
 MRFMOS&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
 ('MRFMOS',&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; GRID,&nbsp;&nbsp; '',
 NO,&nbsp; NO,&nbsp; 3, 0)<br>
-NGMMOS&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
-('NGMMOS',&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; GRID,&nbsp;&nbsp; '',
-NO,&nbsp; NO,&nbsp; 3, 0)<br>
 HPCStn&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
 ('HPCSTN',&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; GRID,&nbsp;&nbsp; '',
 NO,&nbsp; NO,&nbsp; 2, 0)<br>
@@ -1420,7 +1414,6 @@ run modules. For example, here is the section in serverConfig.py:
 &nbsp;&nbsp;&nbsp; "NAM80" : ["NAM80"],<br>
 &nbsp;&nbsp;&nbsp; "RUC80" : ["RUC80"],<br>
 &nbsp;&nbsp;&nbsp; "gfsLR" : ["gfsLR"],<br>
-&nbsp;&nbsp;&nbsp; "NGM80" : ["NGM80"],<br>
 &nbsp;&nbsp;&nbsp; "NAM12" : ["NAM12"],<br>
 &nbsp;&nbsp;&nbsp; "GFS40" : ["GFS40"],<br>
 &nbsp;&nbsp;&nbsp; "GFS190" : ["GFS190"],<br>
@@ -1514,7 +1507,6 @@ and</tt>
 &nbsp;&nbsp;&nbsp; "NAM40": ["tp", "cp"],<br>
 &nbsp;&nbsp;&nbsp; "NAM20": ["tp", "cp"],<br>
 &nbsp;&nbsp;&nbsp; "NAM12": ["tp", "cp"],<br>
-&nbsp;&nbsp;&nbsp; "NGM80": ["tp", "cp"],<br>
 &nbsp;&nbsp;&nbsp; "gfsLR": ["tp", "cp"],<br>
 &nbsp;&nbsp;&nbsp; "RUC80": ["tp", "cp"],<br>
 &nbsp;&nbsp;&nbsp; "MSAS": ["tp", "cp"],<br>
@@ -1791,8 +1783,6 @@ database.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 (RUC80, STD1_MODEL + localRUC80Parms),<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(NGM80, STD6_MODEL + localNGM80Parms),<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 (GFS40, STD6_MODEL + localGFS40Parms),<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 (GFS190, STD6_MODEL + localGFS190Parms),<br>
@@ -1815,8 +1805,6 @@ database.
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 (MRFMOS, MOS_MODEL + localMOSParms),<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-(NGMMOS, MOS_MODEL + localMOSParms),<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 (HPCStn, MOS_MODEL + localMOSParms),<br>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 (HPCGrid, MOS_MODEL + localMOSParms),<br>
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/itool/SetupTextEA.py b/cave/com.raytheon.viz.gfe/localization/gfe/itool/SetupTextEA.py
index 102c760a03..043c4b6c92 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/itool/SetupTextEA.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/itool/SetupTextEA.py
@@ -252,30 +252,11 @@ class setupTextEA:
 
     def __saveEA(self, name, grid):
         #save edit area from a grid
-        #domain = self.__client.domain
-        #size = domain[1]
-        #size = AFPS.CC2Dint(size[0], size[1])
-        #origin = domain[2][0]
-        #extent = domain[2][1]
-        #area = AFPS.CD2Dfloat(AFPS.CC2Dfloat(origin[0],origin[1]), 
-        #  AFPS.CC2Dfloat(extent[0],extent[1]))
-        #gloc = AFPS.GridLocation(domain[0], size, area)
-        gloc = self.__dataMgr.getClient().getDBGridLocation()
+        gloc = self.__dataMgr.getParmManager().compositeGridLocation()
         id = ReferenceID(name)
         # convert grid to polygons
         grid2d = Grid2DBit.createBitGrid(gloc.getNx().intValue(), gloc.getNy().intValue(), grid)
         refdata = ReferenceData(gloc, id, grid2d)
-        #refdata.convertToLatLon()
-        #polygons = refdata.polygons()
-        
-        # convert polygons to required format for saveEditArea ifpc library
-        #ea = []
-        #for p in polygons:
-        #    points = []
-        #    pts = p.points()
-        #    for pt in pts:
-        #        points.append((pt.x, pt.y))
-        #    ea.append((p.include(), points))
      
         # save the edit area
         self.__dataMgr.getRefManager().saveRefSet(refdata)
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/itool/TextProductTest.py b/cave/com.raytheon.viz.gfe/localization/gfe/itool/TextProductTest.py
index 2821fef528..683aee912f 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/itool/TextProductTest.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/itool/TextProductTest.py
@@ -279,6 +279,7 @@ from com.raytheon.viz.gfe.textformatter import TextProductFinishWaiter, Formatte
 from com.raytheon.viz.gfe.smarttool import TextFileUtil
 from com.raytheon.viz.gfe.dialogs.formatterlauncher import ConfigData
 ProductStateEnum = ConfigData.ProductStateEnum
+from com.raytheon.uf.common.activetable import ActiveTableMode
 
 class ProcessInfo:
     def __init__(self, entry, name, pid, script):
@@ -499,7 +500,7 @@ class ITool (ISmartScript.ISmartScript):
         if clearHazards:
             if self._reportingMode not in ["Pretty"]:
                 self.output("WARNING::Clearing Hazards Table", self._outFile)
-            self._dataMgr.getClient().clearPracticeTable("TBW")
+            self._dataMgr.getClient().clearVTECTable(ActiveTableMode.PRACTICE)
 
     def _createCombinationsFile(self, entry):
         fn = entry.get("combinationsFileName", None)
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
index efd064b248..d70f37c51c 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py
@@ -33,6 +33,7 @@
 #    05/28/2014      2841          randerso       Added separate configurable limits for
 #                                                 text formatter and product script tasks
 #    02/04/2015      17039         ryu            Removed HighlightFramingCodes setting.
+#    02/09/2016      5283          nabowle        Remove NGM support.
 
 GFESUITE_HOME = "/awips2/GFESuite"
 GFESUITE_PRDDIR = "/tmp/products"
@@ -635,14 +636,11 @@ HistoryOriginColor_Other = "gray75"
 # listed here, then the HistoryOriginText_Populated and
 # HistoryOriginColor_Populated is used.
 HistoryModelColor_gfsLR = '#30df10'
-HistoryModelColor_NGM80 = 'orange'
-HistoryModelColor_NGM95 = 'orange'
 HistoryModelColor_RUC80 = '#00ffff'
 HistoryModelColor_MAVMOS = '#e6c8a1'
 HistoryModelColor_GFSMOS = '#e6d8a1'
 HistoryModelColor_METMOS = '#e6b8a1'
 HistoryModelColor_MEXMOS = '#e6a8a1'
-HistoryModelColor_NGMMOS = '#e608a1'
 HistoryModelColor_NAM80 = '#ffff52'
 HistoryModelColor_NAM95 = '#ffff52'
 HistoryModelColor_NAM40 = '#ff99ff'
@@ -670,14 +668,11 @@ HistoryModelColor_NamDNG5 = '#808000'
 HistoryModelText_GFS80 = 'GFS'
 HistoryModelText_GFS40 = 'GFS'
 HistoryModelText_GFS190 = 'GFS'
-HistoryModelText_NGM80 = 'NGM'
-HistoryModelText_NGM95 = 'NGM'
 HistoryModelText_RUC80 = 'RUC'
 HistoryModelText_GFSMOS = 'GFSMOS'
 HistoryModelText_MEXMOS = 'MEXMOS'
 HistoryModelText_MAVMOS = 'MAVMOS'
 HistoryModelText_METMOS = 'METMOS'
-HistoryModelText_NGMMOS = 'NGMMOS'
 HistoryModelText_NAM80 = 'N80'
 HistoryModelText_NAM95 = 'N95'
 HistoryModelText_NAM40 = 'N40'
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifySumTemps.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifySumTemps.py
index fd16bd8406..b8feb77322 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifySumTemps.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerifySumTemps.py
@@ -22,6 +22,7 @@
 #    11/21/13        16770         ryu            Change name of temporary files
 #                                                 for dual domain.
 #    11/26/2014      #649          zhao           changed "dbName" to "dbid"  
+#    02/10/2016      5283          nabowle        Remove NGM support.
 #=====================================================================
 #
 #  S T A R T   C O N F I G U R A T I O N   S E C T I O N
@@ -57,7 +58,7 @@ BADTHRESHOLD=10
 MODLIST=["Official","MOSGuideBC","MOSGuide","GFS40","GFS40BC",
          "ADJMAV","ADJMAVBC","NAM12","NAM12BC","DGEX","DGEXBC",
          "ADJMEX","ADJMEXBC","ADJMET","ADJMETBC","SREF","SREFBC",
-         "NGM80","NGM80BC","ADJFWC","ADJFWCBC","ADJDGX","ADJDGXBC",]
+         "ADJFWC","ADJFWCBC","ADJDGX","ADJDGXBC",]
 #
 #  The e-mail address to be 'From' when e-mails are sent
 #     an example:  EMAIL_FROM_ADDRES="timothy.barker@noaa.gov"
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/ModelBlend.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/ModelBlend.py
index 5f6284e07f..50aeeb68fa 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/ModelBlend.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/ModelBlend.py
@@ -30,6 +30,7 @@
 # generated if user sets them that way.
 #
 # Author: Tim Barker
+#    2016
 #    2009-12-18: Rewritten to run from Java. Removed features that depend
 #                on prestarted Tkinter app: dialog derived from tkSimpleDialog,
 #                global-level IntVars and StringVars, IntVars and StringVars
@@ -44,7 +45,14 @@
 #                optional edge effects when working on an edit area,
 #                simplify using previous model runs, and make negative
 #                weights optional.
-#    2002-10-09: Original Implementation from Les Colin Idea
+#    2002-10-09: Original Implementation from Les Colin Idea 
+#----------------------------------------------------------------------------
+#
+#     SOFTWARE HISTORY
+#
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    02/10/2016      5283          nabowle        Remove NGM support.
 #---------------------------------------------------------------------
 #
 #  C O N F I G U R A T I O N   S E C T I O N
@@ -63,7 +71,7 @@ MAX_IN_COLUMN=15
 USE_NEGATIVE_WEIGHTS=1
 #
 #  List of GFE model databases that you will potentially blend.
-#  The name is followd by a number (separated by a colon) that
+#  The name is followed by a number (separated by a colon) that
 #  gives the number of versions to potentially blend.  The versions
 #  is followed by a list of elements for which to add this model
 #  (assumed to be for all elements if missing) or if the list starts
@@ -83,8 +91,6 @@ Models=("ADJMET:2",
         "GFS40BC:2:MaxT,MinT,MaxRH,MinRH,TdMrn,TdAft,T,Td,RH",
         "ADJFWC:1",
         "ADJFWCBC:1",
-        "NGM80:1",
-        "NGM80BC:1",
         "ADJMEX:2",
         "ADJMEXBC:2:MaxT,MinT,MaxRH,MinRH,TdMrn,TdAft,T,Td,RH",
         "ADJMEH:1:MaxT,MinT,PoP",
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
index de2ce7e41e..de2ee75cc4 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/WindGustFromAlgorithm.py
@@ -28,6 +28,13 @@
 #          Matthew H. Belk      NWS Taunton, MA       Last Modified: 06/16/03
 #          Mathewson            FSL                   Modified: 3/30/04
 #             -change in model names to OB3 names
+#----------------------------------------------------------------------------
+#
+#     SOFTWARE HISTORY
+#
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    02/10/2016      5283          nabowle        Remove NGM support.
 # ----------------------------------------------------------------------------
 
 ToolType = "numeric"
@@ -47,7 +54,7 @@ VariableList = [
          ("Momentum algorithm:", "RUC", "radio", ["RUC", "Power"]),
          ("Use BL Winds:", "No", "radio", ["Yes", "No"]),
          ("Model:", "NAM12", "radio",
-                    ["GFS80", "NAM12", "gfsLR", "NGM80", "RUC80"])
+                    ["GFS80", "NAM12", "gfsLR", "RUC80"])
 ]
 
 
@@ -365,11 +372,6 @@ class Tool (SmartScript.SmartScript):
             self._modelCube = ["MB1000", "MB850", "MB700", "MB500", "MB300"]
             self._blCube = []
 
-        elif self._model.find( 'NGM80') != -1:
-            self._modelCube = ["MB1000", "MB950", "MB850", "MB700", "MB500",
-                               "MB400", "MB300"]
-            self._blCube = ["FH1829", "FH2743", "FH3658"]
-
         elif self._model.find( 'RUC80') != -1:
             self._modelCube = ["MB1000", "MB950", "MB900", "MB850", "MB800",
                                "MB750", "MB700", "MB650", "MB600", "MB550",
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/HLSTCV_Common.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/HLSTCV_Common.py
index ed8bfa547a..701506d2ac 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/HLSTCV_Common.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textProducts/HLSTCV_Common.py
@@ -11,6 +11,9 @@ import pprint
 from AbsTime import *
 from StartupDialog import IFPDialog as Dialog
 from LockingFile import File
+
+from com.raytheon.viz.core.mode import CAVEMode
+
 AWIPS_ENVIRON = "AWIPS2"
 
 class TextProduct(GenericHazards.TextProduct):
@@ -437,8 +440,7 @@ class TextProduct(GenericHazards.TextProduct):
         return ['CAN', 'UPG']
     
     def _setVTECActiveTable(self, argDict):
-        dataMgr = argDict["dataMgr"]
-        gfeMode = dataMgr.getOpMode().name()
+        gfeMode = CAVEMode.getMode().name()
         
         self.debug_print("*" *100, 1)
         self.debug_print("gfeMode = '%s'" % (gfeMode), 1)
@@ -1147,8 +1149,7 @@ FORECASTER STEWART"""
             return None
         
     def _getAdvisoryPath(self):
-        dataMgr = self._argDict["dataMgr"]
-        gfeMode = dataMgr.getOpMode().name()
+        gfeMode = CAVEMode.getMode().name()
         if gfeMode == "PRACTICE":
             return os.path.join("gfe", "tcvAdvisories", "practice")
         else:
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/ForecastNarrative.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/ForecastNarrative.py
index c6f9781439..2872f36e73 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/ForecastNarrative.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/ForecastNarrative.py
@@ -553,7 +553,7 @@ class ForecastNarrative(TextRules.TextRules, SampleAnalysis.SampleAnalysis):
             self.__sampler = argDict["ifpClient"].sampleRequest(self.__samplerRequests)
         else:
             self.progressMessage(.3, 80, "Sampling Data -- please wait...")                        
-            self.__sampler = HistoSampler(argDict["ifpClient"], self.__samplerRequests)
+            self.__sampler = HistoSampler(argDict["ifpClient"].getJavaClient(), self.__samplerRequests)
         print "Time to Sample Data", time.time()-time1
         #if error is not None:
         #    return error
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
index 5e76555ab0..56c4c5defd 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
@@ -26,6 +26,9 @@ import JUtil, VarDictGroker
 import RedirectLogging
 import UFStatusHandler
 
+from com.raytheon.uf.viz.core import VizApp
+from com.raytheon.uf.common.gfe.ifpclient import PyFPClient
+
 #
 # Runs the text formatter to generate text products
 #   
@@ -45,6 +48,7 @@ import UFStatusHandler
 #                                                mixed case is not enabled for the product.
 #                                                Cleaned up file writing code
 #    07/29/2015      #4263         dgilling      Support updated TextProductManager.
+#    11/30/2015      #5129         dgilling      Support new IFPClient.
 # 
 #
 
@@ -75,6 +79,9 @@ except:
     logger = logging.getLogger()
     logger.exception("Exception occurred")
 
+## TODO: Remove use of DataManager in this code. Will need to coordinate with
+## the field developers to ensure local site overrides aren't relying on having
+## access to it.
 def executeFromJava(databaseID, site, username, dataMgr, forecastList, logFile, cmdLineVarDict=None,
                     drtTime=None, vtecMode=None, vtecActiveTable="active", testMode=0 ):
     if type(forecastList) is not list:
@@ -202,7 +209,7 @@ def runFormatter(databaseID, site, forecastList, cmdLineVarDict, vtecMode,
         testMode = 0
 
     # Create an ifpClient
-    ifpClient = dataMgr.getClient()
+    ifpClient = PyFPClient(VizApp.getWsId(), site)
     
     global GridLoc
     GridLoc = ifpClient.getDBGridLocation()
@@ -215,7 +222,7 @@ def runFormatter(databaseID, site, forecastList, cmdLineVarDict, vtecMode,
 
     import Analysis
 
-    site = str(ifpClient.getSiteID().get(0))
+    site = str(ifpClient.getSiteID()[0])
 
     # Create dictionary of arguments
     argDict = {
@@ -263,7 +270,7 @@ def runFormatter(databaseID, site, forecastList, cmdLineVarDict, vtecMode,
     time.tzset()
 
     # Create the formatter
-    formatter = TextFormatter.TextFormatter(dataMgr)
+    formatter = TextFormatter.TextFormatter(dataMgr, ifpClient)
 
     # For each Forecast Type,
     #   Create generate forecast
@@ -492,11 +499,14 @@ def ppDef(definition):
         return s
     else:
         return "<Definition not dictionary>\n" + `definition`
-    
-def getVarDict(paths, dspName, dataMgr, issuedBy, dataSource):
+
+## TODO: Investigate if the dependency on DataManager can be removed here.
+## At the moment this passes through to ValuesDialog for building special
+## widgets in the DialogAreaComposite.    
+def getVarDict(paths, dspName, dataMgr, ifpClient, issuedBy, dataSource):
     importModules(paths)
     
-    tz = str(dataMgr.getClient().getSiteTimeZone())
+    tz = str(ifpClient.getSiteTimeZone())
     os.environ['TZ'] = tz
     time.tzset()
     productDef = displayNameDict[dspName][1]
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
index f7f56f9583..9f29069d9e 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
@@ -42,6 +42,7 @@
 #                                                 added NOTE about false postives for duplicate ETNs
 #    10/16/2015      17771         dgilling       Remove __sitesIgnoreNatlEtn.
 #    10/29/2015      17701         yteng          Correct parm selection for Hazards to exclude Hazardsnc
+#    12/07/2015      5129          dgilling       Support new IFPClient.
 #
 
 
@@ -932,7 +933,7 @@ class HazardsTable(VTECTableUtil.VTECTableUtil):
         #the server.   Returns None on failure.
 
         try:
-            table = self.__ifpClient.getVTECActiveTable(self.__dataMgr.getSiteID(), self.__activeTableMode)
+            table = self.__ifpClient.getVTECActiveTable(self.__activeTableMode)
             table = ActiveTableVtec.transformActiveTableToPython(table)
             return table
 
@@ -1060,7 +1061,7 @@ class HazardsTable(VTECTableUtil.VTECTableUtil):
                 sampreqs.add(SamplerRequest(pid, ea, tr.toJavaObj()))
 
         # Perform sampling
-        hs = HistoSampler(self.__ifpClient, sampreqs)
+        hs = HistoSampler(self.__ifpClient.getJavaClient(), sampreqs)
         #parmHistos = hs.getParmHisto_SeqOf()
         parmHistos = hs.getParmHisto()
 
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/TextFormatter.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/TextFormatter.py
index 685f9fa083..7a4ad6d040 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/TextFormatter.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/TextFormatter.py
@@ -34,6 +34,7 @@
 #    ------------    ----------    -----------    --------------------------
 #    02/12/2014          #2591     randerso       Added retry when loading combinations fails
 #    10/20/2014          #3685     randerso       Changed default of lowerCase to True if not specified
+#    11/30/2015          #5129     dgilling       Support new IFPClient.
 
 import string, getopt, sys, time, os, types, math
 import ModuleAccessor
@@ -54,12 +55,14 @@ MAX_TRIES = 2
 #IFPImporter = IFPImporter.IFPImporter
 
 class TextFormatter:
-    def __init__(self, dataManager):
+    ## TODO: Remove dataManager from constructor and do not add it to 
+    ## the argDict
+    def __init__(self, dataManager, ifpClient):
         # Variable for unique combinations
         self.__comboNumber = -1
         self.dataMgr = dataManager
+        self.ifpClient = ifpClient
         self.log = logging.getLogger("FormatterRunner.TextFormatter.TextFormatter")
-        pass
 
 #    def __del__(self):
 #        for i in LatLonIds:
@@ -166,13 +169,13 @@ class TextFormatter:
 
             try:
                 text = product.generateForecast(argDict)
-            except RuntimeError, e:
+            except RuntimeError as e:
                 msg = e.message
                 if msg.find('java.lang.ThreadDeath') > -1:
                     self.log.info("Formatter Canceled")
                 else:
                     self.log.error("Caught Exception: ", exc_info=True)
-                raise Exception
+                raise e
 
             # requirement for TEST phrasing for TEST products
             if argDict.get('testMode', 0):
@@ -608,7 +611,7 @@ class TextFormatter:
                 pointList = []
                 for point in points:
                     pointList.append(makePoint(point))
-                refData = makeArea(self.dataMgr.getClient().getDBGridLocation(), pointList, refname=name)
+                refData = makeArea(self.ifpClient.getDBGridLocation(), pointList, refname=name)
                 # Make sure we have at least one grid point in
                 # the edit area
                 if refData.getGrid().isAnyBitsSet():
@@ -623,7 +626,7 @@ class TextFormatter:
         else:
             from com.raytheon.uf.common.dataplugin.gfe.grid import Grid2DBit
             # Get grid cell coordinates for lat/lon
-            gridLoc = self.dataMgr.getClient().getDBGridLocation()
+            gridLoc = self.ifpClient.getDBGridLocation()
             nx = gridLoc.getNx()
             ny = gridLoc.getNy()
             cc2D = gridLoc.gridCell(float(lat), float(lon))
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CommonUtils.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CommonUtils.py
index b01ecd2c8a..609cb014ea 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CommonUtils.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/CommonUtils.py
@@ -27,6 +27,11 @@
 #
 # Author: hansen
 # ----------------------------------------------------------------------------
+# History
+# Time          Ticket Number   Developer   Comments
+# -----------------------------------------------------------------------------
+# 01/08/2016    5129            dgilling    Fix signatures to calls in WeatherSubKey.
+# ----------------------------------------------------------------------------
 
 from math import *
 import types, string
@@ -94,7 +99,7 @@ class CommonUtils:
         #   DmgW, GW will be collapsed to DmgW
         wxType = subkey1.wxType() # Assumed to be similar, so we'll take the first one
         if wxType == "<NoWx>":
-            WeatherSubKey.weatherSubKey(self._argDict['dataMgr'], "<NoCov>", "<NoWx>", "<NoInten>", "<NoVis>", [])
+            WeatherSubKey.weatherSubKey(self._argDict['site'], "<NoCov>", "<NoWx>", "<NoInten>", "<NoVis>", [])
             
         rankFuzzFactor = self.rankFuzzFactor()
         #print "rank1, rank2", rank1, rank2
@@ -118,7 +123,7 @@ class CommonUtils:
         if vis is None:
             vis = "<NoVis>"
         #print coverage, wxType, intensity, vis, attrList
-        return WeatherSubKey.weatherSubKey(self._argDict['dataMgr'], coverage, wxType, intensity, vis, attrList)
+        return WeatherSubKey.weatherSubKey(self._argDict['site'], coverage, wxType, intensity, vis, attrList)
     
     def removeSimilarAttrs(self, attrList):
         similarAttrLists = self.similarAttributeLists()
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/EditAreaUtils.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/EditAreaUtils.py
index f2c2e4f305..06933aa8e1 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/EditAreaUtils.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/EditAreaUtils.py
@@ -1,19 +1,19 @@
 ##
 # This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-# 
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
 # This software product contains export-restricted data whose
 # export/transfer/disclosure is restricted by U.S. law. Dissemination
 # to non-U.S. persons whether in the United States or abroad requires
 # an export license or other authorization.
 # 
-# Contractor Name:        Raytheon Company
-# Contractor Address:     6825 Pine Street, Suite 340
-#                         Mail Stop B8
-#                         Omaha, NE 68106
-#                         402.291.0100
-# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
 # See the AWIPS II Master Rights File ("Master Rights File.pdf") for
 # further licensing information.
 ##
@@ -46,7 +46,6 @@ class  EditAreaUtils(TextUtils.TextUtils):
         # Must set this up in order to do intersections and unions
         self.__ifpClient = argDict["ifpClient"]
         self.__gridLoc = self.__ifpClient.getDBGridLocation()
-        self.__dataMgr = argDict["dataMgr"]
 
     def getIFPClient(self):
         return self.__ifpClient
@@ -121,7 +120,7 @@ class  EditAreaUtils(TextUtils.TextUtils):
         refList = ArrayList()
         refList.add(refID)
         tmp = argDict["ifpClient"].getReferenceData(refList).get(0)
-        if (tmp is not None):
+        if tmp is not None:
             tmp.getGrid()
         return tmp
 
@@ -305,9 +304,8 @@ class  EditAreaUtils(TextUtils.TextUtils):
 
     def saveEditAreas(self, editAreas):
         # Save a list of ReferenceData objects
-        refMgr = self.__dataMgr.getRefManager()
-        for ea in editAreas:        
-            refMgr.saveRefSet(ea)
+        ifpClient = self.getIFPClient()
+        ifpClient.saveReferenceData(editAreas)
         
     def getComboNumber(self):
         # Put initial comboNumber from constructor into EditAreaUtils as well.
@@ -347,6 +345,7 @@ class  EditAreaUtils(TextUtils.TextUtils):
 
     def deleteEditAreas(self, editAreas):
         # Delete a list of ReferenceData, ReferenceID, or string objects        
+        ifpClient = self.getIFPClient()
         ids = []
         for area in editAreas:
             if type(area) is str:
@@ -358,6 +357,4 @@ class  EditAreaUtils(TextUtils.TextUtils):
                 except:
                     # reference id
                     ids.append(area)            
-        refMgr = self.__dataMgr.getRefManager()        
-        for ea in ids:            
-            refMgr.deleteRefSet(ea, False)
+        ifpClient.deleteReferenceData(ids)
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Interfaces.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Interfaces.py
index bec69ac5b6..62f5118319 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Interfaces.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/Interfaces.py
@@ -75,7 +75,7 @@ class Interfaces(TextUtils.TextUtils):
         if sampleFromServer:
             sampler = ifpClient.sampleRequest(samplerRequests)
         else:
-            sampler = HistoSampler(ifpClient, samplerRequests)        
+            sampler = HistoSampler(ifpClient.getJavaClient(), samplerRequests)        
         if sampler.isValid() != 1:
             print "Cannot Sample: Check for invalid Weather Elements, ",\
               "Invalid Areas", str(samplerRequests)
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/PhraseBuilder.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/PhraseBuilder.py
index 872a5eb575..5d9dd7e278 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/PhraseBuilder.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/PhraseBuilder.py
@@ -33,6 +33,7 @@
 #                                           for two lists based on Virgil's 
 #                                           suggestion
 # 04/20/2015    4027            randerso    Changes for mixed case product generation.
+# 01/08/2016    5129            dgilling    Fix signatures to calls in WeatherSubKey.
 # ----------------------------------------------------------------------------
 
 import types
@@ -1830,7 +1831,7 @@ class PhraseBuilder(ConfigVariables.ConfigVariables,
         if intensity is not None:
             newkeyList = []
             for subkey in subkeyList:
-               newSubkey = WeatherSubKey.weatherSubKey(self._argDict['dataMgr'], subkey.coverage(), subkey.wxType(), intensity,
+               newSubkey = WeatherSubKey.weatherSubKey(self._argDict['site'], subkey.coverage(), subkey.wxType(), intensity,
                                               subkey.visibility(), subkey.attributes())
                newkeyList.append(newSubkey)
             subkeyList = newkeyList
@@ -4063,7 +4064,7 @@ class PhraseBuilder(ConfigVariables.ConfigVariables,
                     newStats.append((subkey, rank))
             stats = newStats
             if stats == []:
-                emptyKey = WeatherSubKey.weatherSubKey(self._argDict['dataMgr'],
+                emptyKey = WeatherSubKey.weatherSubKey(self._argDict['site'],
                     "<NoCov>", "<NoWx>", "<NoInten>", "<NoVis>", [])
                 stats = [(emptyKey, 100)]
         return stats
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SampleAnalysis.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SampleAnalysis.py
index 961a3b740d..bed4fdf44f 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SampleAnalysis.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/SampleAnalysis.py
@@ -974,7 +974,7 @@ class SampleAnalysis(CommonUtils.CommonUtils):
         if dataType == "WEATHER":
             rankList.sort(self.rankedSortOrder)
             rankList = [
-                (WeatherSubKey.weatherSubKey(self._argDict["dataMgr"], subkey.coverage(), subkey.wxType(), subkey.intensity(),
+                (WeatherSubKey.weatherSubKey(self._argDict["site"], subkey.coverage(), subkey.wxType(), subkey.intensity(),
                                     subkey.visibility(),
                                     self.removeSimilarAttrs(subkey.attributes())),
                  rank) for subkey, rank in rankList
@@ -1061,7 +1061,7 @@ class SampleAnalysis(CommonUtils.CommonUtils):
             aggVis = aggregateKey.visibility()
             aggAttrs = aggregateKey.attributes()
         attrList = self.removeDups(attrList)
-        aggregateKey = WeatherSubKey.weatherSubKey(self._argDict["dataMgr"], aggCov, subkeyType, aggInten, aggVis, aggAttrs)
+        aggregateKey = WeatherSubKey.weatherSubKey(self._argDict["site"], aggCov, subkeyType, aggInten, aggVis, aggAttrs)
         #print "aggregateKey", aggregateKey
         return aggregateKey
 
@@ -1304,7 +1304,7 @@ class SampleAnalysis(CommonUtils.CommonUtils):
                 if covAreal == areal:
                     # Make sure this cov can be used with
                     # the wxType
-                    availableCoverages = WeatherSubKey.availableCoverages(self._argDict["dataMgr"], wxType)
+                    availableCoverages = WeatherSubKey.availableCoverages(self._argDict["site"], wxType)
                     if cov in availableCoverages:
                         aggCov = cov
                         break
@@ -1375,7 +1375,7 @@ class SampleAnalysis(CommonUtils.CommonUtils):
             percentCov = int(round(percentCov))
             # Check to see if it meets threshold
             # Make a temporary wxKey to check wxkey_coverage_percentage
-            wxKey = WeatherSubKey.weatherSubKey(self._argDict["dataMgr"], cov, wxType, "<NoInten>", "<NoVis>", [])
+            wxKey = WeatherSubKey.weatherSubKey(self._argDict["site"], cov, wxType, "<NoInten>", "<NoVis>", [])
             #print "wxKey", wxKey, sum, percentCov
             if percentCov >= self.wxkey_coverage_percentage(
                 parmHisto, timeRange, componentName, wxKey):
@@ -1418,11 +1418,11 @@ class SampleAnalysis(CommonUtils.CommonUtils):
             sum = dict[key]
             subkeyRank = float(sum)/(totalHours * totalPoints) * 100.0
             if wxPart == "coverage":
-                subkey = WeatherSubKey.weatherSubKey(self._argDict["dataMgr"], key, wxType, "<NoInten>", "<NoVis>", [])
+                subkey = WeatherSubKey.weatherSubKey(self._argDict["site"], key, wxType, "<NoInten>", "<NoVis>", [])
             elif wxPart == "intensity":
-                subkey = WeatherSubKey.weatherSubKey(self._argDict["dataMgr"], "<NoCov>", wxType, key, "<NoVis>", [])
+                subkey = WeatherSubKey.weatherSubKey(self._argDict["site"], "<NoCov>", wxType, key, "<NoVis>", [])
             elif wxPart == "visibility":
-                subkey = WeatherSubKey.weatherSubKey(self._argDict["dataMgr"], "<NoCov>", wxType,"<NoInten>" , key, [])
+                subkey = WeatherSubKey.weatherSubKey(self._argDict["site"], "<NoCov>", wxType,"<NoInten>" , key, [])
             if firstTime:
                 aggRank = subkeyRank
                 curKey = subkey
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VarDictGroker.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VarDictGroker.py
index ba7f7e085c..991228eafc 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VarDictGroker.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/VarDictGroker.py
@@ -20,12 +20,12 @@
 import ProcessVariableList, types
 
 class VarDictGroker:
-    def __init__(self, module, definition, name, issuedBy=None, parent=None):
+    def __init__(self, module, definition, name, issuedBy=None, dataMgr=None):
         self._module = module
         self._definition = definition
         self._name = name
         self._issuedBy = issuedBy
-        self._parent = parent
+        self._dataMgr = dataMgr
 
     def getVarDict(self):
         # Create and display the User Dialog for this product.
@@ -52,7 +52,7 @@ class VarDictGroker:
             print "processVariableList is not None"
             co = processVariableList.im_func.func_code
             if co.co_argcount > 2:
-                argValues = [self._definition, self._parent]
+                argValues = [self._definition, self._dataMgr]
             else:
                 argValues = [self._definition]
 
@@ -103,7 +103,7 @@ class VarDictGroker:
                 # Display User Dialog
                 print "ProcessVariableList.ProcessVariableList"
                 processVarList = ProcessVariableList.ProcessVariableList(
-                                                                         self._name, varList, varDict={}, parent=self._parent)                
+                                                                         self._name, varList, varDict={}, dataMgr=self._dataMgr)                
                 self._selectionStatus = processVarList.status()
                 if not self._selectionStatus == "OK":
                     return None   # User Cancelled
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WeatherSubKey.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WeatherSubKey.py
index dc410a20de..c5366b22fd 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WeatherSubKey.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/regular/WeatherSubKey.py
@@ -33,7 +33,8 @@ from com.raytheon.uf.common.dataplugin.gfe.weather import WeatherSubKey as JavaW
 #    09/09/08                      njensen       Initial Creation.
 #    04/20/2015      4027          randerso      Added __eq__ and __hash__ so WeatherSubKey works
 #                                                correctly when used as key in a dict.
-#                                                Changed several methods which were static methods in Java                                                 
+#                                                Changed several methods which were static methods in Java
+#    12/08/2015      5129          dgilling      Remove dependency on DataManager.                                                 
 #
 
 class WeatherSubKey:
@@ -76,28 +77,22 @@ class WeatherSubKey:
     def wxDef(self):
         return WxDefinition.WxDefinition(self.__key.wxDef())
     
-def availableCoverages(dataMgr, wxType):
-    siteId = dataMgr.getSiteID()         
+def availableCoverages(siteId, wxType):
     return JUtil.javaObjToPyVal(JavaWeatherSubKey.availableCoverages(siteId, wxType))
 
-def availableAttributes(dataMgr, wxType):
-    siteId = dataMgr.getSiteID()         
+def availableAttributes(siteId, wxType):
     return JUtil.javaObjToPyVal(JavaWeatherSubKey.availableAttributes(siteId, wxType))
 
-def availableIntensities(dataMgr, wxType):
-    siteId = dataMgr.getSiteID()         
+def availableIntensities(siteId, wxType):
     return JUtil.javaObjToPyVal(JavaWeatherSubKey.availableIntensities(siteId, wxType))
 
-def availableVisibilities(dataMgr):
-    siteId = dataMgr.getSiteID()         
+def availableVisibilities(siteId):         
     return JUtil.javaObjToPyVal(JavaWeatherSubKey.availableVisibilities(siteId))
 
-def availableWxTypes(dataMgr):
-    siteId = dataMgr.getSiteID()         
+def availableWxTypes(siteId):
     return JUtil.javaObjToPyVal(JavaWeatherSubKey.availableWxTypes(siteId))
 
-def weatherSubKey(dataMgr, coverage, wxType, intensity, vis, attrList):
-    siteId = dataMgr.getSiteID()         
+def weatherSubKey(siteId, coverage, wxType, intensity, vis, attrList):
     javaSubKey = JavaWeatherSubKey(siteId, coverage, wxType,
             intensity, vis, JUtil.pyValToJavaObj(attrList))
     return WeatherSubKey(javaSubKey)    
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/BOIVerifyConfig.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/BOIVerifyConfig.py
index 7359289239..c72577aa44 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/BOIVerifyConfig.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/BOIVerifyConfig.py
@@ -17,6 +17,14 @@
 # See the AWIPS II Master Rights File ("Master Rights File.pdf") for
 # further licensing information.
 ##
+#----------------------------------------------------------------------------
+#
+#     SOFTWARE HISTORY
+#
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    ??              ??            ??             Initial creation
+#    02/10/2016      5283          nabowle        Remove NGM support.
 #---------------------------------------------------------------------
 #
 #  B O I V E R I F Y   C O N F I G U R A T I O N
@@ -95,7 +103,7 @@ SAVE_MODELS=["GFS40","GFS40BC","ADJMAV","ADJMAVBC","ADJMEX","ADJMEXBC",
             "MOSGuide","MOSGuideBC",
             "NAM12","NAM12BC","ADJMET","ADJMETBC",
             "DGEX","DGEXBC","ADJDGX","ADJDGXBC",
-            "NGM80","NGM80BC","ADJFWC","ADJFWCBC",
+            "ADJFWC","ADJFWCBC",
             "ADJKAF","ADJKAFBC",
             "SREF","SREFBC",
             "Official","ISC",
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
index 207d0c68f5..379a678767 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
@@ -77,6 +77,7 @@
 #
 #    Sep 11, 2015    4858          dgilling       Remove notification processing from publishElements.
 #    Jan 20, 2016    4751          randerso       Fix type of mask returned from getComposite() to work with numpy 1.9.2
+#    Jan 28, 2016    5129          dgilling       Support changes to IFPClient.
 ########################################################################
 import types, string, time, sys
 from math import *
@@ -345,8 +346,11 @@ class SmartScript(BaseTool.BaseTool):
     def vtecActiveTable(self):
         #returns the VTEC active table (or specified table)
         import ActiveTableVtec
-        entries = self.__dataMgr.getClient().getVTECActiveTable(self.__dataMgr.getSiteID())
-        return ActiveTableVtec.transformActiveTableToPython(entries)
+        entries = self.__dataMgr.getActiveTable()
+        try:
+            return ActiveTableVtec.transformActiveTableToPython(entries)
+        except:
+            raise TypeError("SmartScript vtecActiveTable: could not convert to python objects.")
 
 
     def gfeOperatingMode(self):
@@ -683,7 +687,7 @@ class SmartScript(BaseTool.BaseTool):
         from com.raytheon.viz.gfe.edittool import GridID
         gid = GridID(parm, gridTime.javaDate())
 
-        wxType = self.__dataMgr.getClient().getGridParmInfo(parm.getParmID()).getGridType()
+        wxType = self.__dataMgr.getClient().getPythonClient().getGridParmInfo(parm.getParmID()).getGridType()
         if GridType.SCALAR.equals(wxType):
             from com.raytheon.uf.common.dataplugin.gfe.slice import ScalarGridSlice
             slice = ScalarGridSlice()
@@ -1945,7 +1949,7 @@ class SmartScript(BaseTool.BaseTool):
         for element in elementList:
             # get the inventory for this element from the server
             parm = self.getParm("Fcst", element, "SFC")
-            recList = self.__dataMgr.getClient().getGridInventory(parm.getParmID())
+            recList = self.__dataMgr.getClient().getPythonClient().getGridInventory(parm.getParmID())
             publishTimeRange = timeRange
             if recList is not None:
                 recSize = recList.size()
diff --git a/cave/com.raytheon.viz.gfe/plugin.xml b/cave/com.raytheon.viz.gfe/plugin.xml
index f9ccdabbb3..d1b854b858 100644
--- a/cave/com.raytheon.viz.gfe/plugin.xml
+++ b/cave/com.raytheon.viz.gfe/plugin.xml
@@ -1355,9 +1355,6 @@
 				<command commandId="com.raytheon.viz.gfe.actions.ShowProcessMonitorDialog"
 					label="Process Monitor...">
 				</command>
-				<command commandId="com.raytheon.viz.ghg.openGhgMonitor"
-					label="GHG Monitor...">
-				</command>
 			</menu>
 			<menu id="GFEMaps" label="Maps" mnemonic="M">
 				<visibleWhen>
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ActivateSiteComponent.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ActivateSiteComponent.java
index 7bb314ed0e..938223afca 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ActivateSiteComponent.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ActivateSiteComponent.java
@@ -19,9 +19,6 @@
  **/
 package com.raytheon.viz.gfe;
 
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-
 import com.raytheon.viz.gfe.dialogs.sbu.SiteActivationDlg;
 import com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent;
 
@@ -34,8 +31,10 @@ import com.raytheon.viz.ui.personalities.awips.AbstractAWIPSComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Aug 15, 2011            bphillip     Initial creation
+ * Aug 15, 2011            bphillip    Initial creation
  * Oct 26, 2012 1287       rferrel     Force blocking of SiteActivationDlg.
+ * Jan 26, 2015 5054       randerso    Use null shell as parent,
+ *                                     Results in display as parent for jface dialogs
  * 
  * </pre>
  * 
@@ -54,8 +53,7 @@ public class ActivateSiteComponent extends AbstractAWIPSComponent {
      */
     @Override
     protected void startInternal(String componentName) throws Exception {
-        SiteActivationDlg dlg = new SiteActivationDlg(new Shell(
-                Display.getCurrent()));
+        SiteActivationDlg dlg = new SiteActivationDlg(null);
         dlg.setBlockOnOpen(true);
         dlg.open();
     }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/Activator.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/Activator.java
index d2c70bbc84..5b953508ca 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/Activator.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/Activator.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.viz.gfe;
 
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
@@ -43,6 +43,10 @@ import com.raytheon.viz.gfe.dialogs.GFEConfigDialog;
  * Oct 30, 2012 1298       rferrel     Must be a blocking dialog.
  * Dec 09, 2013 #2367      dgilling    Remove shutdown of ProcedureJob and
  *                                     SmartToolJob.
+ * Oct 28, 2015 #5054      randerso    Make GfeConfigDlg parented by workbench window if
+ *                                     workbench is running.
+ * Jan 26, 2015 #5054      randerso    If no workbench is running use null shell as parent,
+ *                                     Results in display as parent for jface dialogs
  * 
  * </pre>
  * 
@@ -113,10 +117,15 @@ public class Activator extends AbstractUIPlugin implements BundleActivator {
     public PythonPreferenceStore getPreferenceStore() {
         synchronized (this) {
             if (pythonPrefs == null) {
-                if (cfgDlg == null || cfgDlg.getShell() == null
+                if ((cfgDlg == null) || (cfgDlg.getShell() == null)
                         || cfgDlg.isDisposed()) {
-                    cfgDlg = new GFEConfigDialog(
-                            new Shell(Display.getDefault()));
+                    Shell shell = null;
+                    if (PlatformUI.isWorkbenchRunning()) {
+                        shell = PlatformUI.getWorkbench()
+                                .getActiveWorkbenchWindow().getShell();
+                    }
+
+                    cfgDlg = new GFEConfigDialog(shell);
                     // Must keep as a blocking dialog for eclipse plugins to
                     // work properly.
                     cfgDlg.setBlockOnOpen(true);
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ClearPracticeGrids.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ClearPracticeGrids.java
index b4839370fe..635d0a26c5 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ClearPracticeGrids.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ClearPracticeGrids.java
@@ -30,17 +30,16 @@ import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
 import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable;
 import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable.LockMode;
-import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerMsg;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.dataplugin.gfe.server.request.LockRequest;
+import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.time.TimeRange;
-import com.raytheon.viz.gfe.GFEServerException;
 import com.raytheon.viz.gfe.core.DataManager;
+import com.raytheon.viz.gfe.core.DataManagerUIFactory;
 import com.raytheon.viz.gfe.core.IParmManager;
-import com.raytheon.viz.gfe.core.internal.IFPClient;
 import com.raytheon.viz.gfe.core.parm.Parm;
 
 /**
@@ -53,6 +52,7 @@ import com.raytheon.viz.gfe.core.parm.Parm;
  * ------------ ---------- ----------- --------------------------
  * Apr 10, 2010     #4475  randerso     Initial creation
  * May 02, 2013      1949  rjpeter      Change ServerResponse return type.
+ * Nov 18, 2015      5129  dgilling     Support new IFPClient.
  * </pre>
  * 
  * @author randerso
@@ -64,7 +64,7 @@ public class ClearPracticeGrids extends AbstractHandler {
 
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
-        DataManager dataManager = DataManager.getCurrentInstance();
+        DataManager dataManager = DataManagerUIFactory.getCurrentInstance();
         if (dataManager == null) {
             return null;
         }
@@ -74,57 +74,42 @@ public class ClearPracticeGrids extends AbstractHandler {
         String s = dataManager.getSiteID() + "_GRID_Prac_Fcst_00000000_0000";
         DatabaseID dbid = new DatabaseID(s);
 
-        try {
-            // for each parmId in the database
-            ParmID[] parmList = pm.getAvailableParms(dbid);
-            for (ParmID parmID : parmList) {
-                // if the parm exists
-                Parm parm = pm.getParm(parmID);
-                if (parm != null) {
+        // for each parmId in the database
+        ParmID[] parmList = pm.getAvailableParms(dbid);
+        for (ParmID parmID : parmList) {
+            // if the parm exists
+            Parm parm = pm.getParm(parmID);
+            if (parm != null) {
 
-                    TimeRange tr = parm.getInventorySpan();
-                    if (tr.getDuration() > 0) {
-                        // break any locks held by others
-                        List<TimeRange> locks = parm.getLockTable()
-                                .lockedByOther();
-                        if (locks.size() > 0) {
-                            ArrayList<LockRequest> lreq = new ArrayList<LockRequest>();
-                            for (TimeRange lock : locks) {
-                                lreq.add(new LockRequest(parmID, lock,
-                                        LockMode.BREAK_LOCK));
-                            }
-                            ServerResponse<List<LockTable>> sr = client
-                                    .requestLockChange(lreq);
-                            if (!sr.isOkay()) {
-                                List<ServerMsg> messages = sr.getMessages();
-                                StringBuilder msg = new StringBuilder(
-                                        "Error attempting to remove locks.");
-                                for (ServerMsg serverMsg : messages) {
-                                    msg.append("\n").append(
-                                            serverMsg.getMessage());
-                                }
-                                statusHandler.handle(Priority.PROBLEM,
-                                        msg.toString());
-                            }
+                TimeRange tr = parm.getInventorySpan();
+                if (tr.getDuration() > 0) {
+                    // break any locks held by others
+                    List<TimeRange> locks = parm.getLockTable().lockedByOther();
+                    if (!locks.isEmpty()) {
+                        List<LockRequest> lreq = new ArrayList<LockRequest>();
+                        for (TimeRange lock : locks) {
+                            lreq.add(new LockRequest(parmID, lock,
+                                    LockMode.BREAK_LOCK));
+                        }
+                        ServerResponse<List<LockTable>> sr = client
+                                .requestLockChange(lreq);
+                        if (!sr.isOkay()) {
+                            statusHandler.error(String.format(
+                                    "Error attempting to remove locks: %s",
+                                    sr.message()));
                         }
-
-                        // delete all grids
-                        parm.deleteTR(tr);
-                        parm.saveParameter(tr);
                     }
+
+                    // delete all grids
+                    parm.deleteTR(tr);
+                    parm.saveParameter(tr);
                 }
             }
-
-            statusHandler.handle(Priority.SIGNIFICANT,
-                    "Prac_Fcst database has been cleared.");
-
-        } catch (GFEServerException e) {
-            statusHandler
-                    .handle(Priority.PROBLEM,
-                            "Unexpected exception while attempting to clear practice grids",
-                            e);
         }
 
+        statusHandler.handle(Priority.SIGNIFICANT,
+                "Prac_Fcst database has been cleared.");
+
         return null;
     }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ClearPracticeVTECTable.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ClearPracticeVTECTable.java
index 643b04e9d8..24720e8485 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ClearPracticeVTECTable.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ClearPracticeVTECTable.java
@@ -21,7 +21,7 @@
 package com.raytheon.viz.gfe.actions;
 
 /**
- * TODO Add Description
+ * Action handler to clear practice active table.
  * 
  * <pre>
  *
@@ -30,6 +30,7 @@ package com.raytheon.viz.gfe.actions;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Apr 23, 2010            wkwock     Initial creation
+ * Nov 17, 2015  #5129     dgilling   Support new IFPClient.
  *
  * </pre>
  *
@@ -40,40 +41,38 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 
+import com.raytheon.uf.common.activetable.ActiveTableMode;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.viz.gfe.Activator;
-import com.raytheon.viz.gfe.constants.StatusConstants;
 import com.raytheon.viz.gfe.core.DataManager;
+import com.raytheon.viz.gfe.core.DataManagerUIFactory;
 
 public class ClearPracticeVTECTable extends AbstractHandler {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(ClearPracticeVTECTable.class);
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(ClearPracticeVTECTable.class);
 
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-
-		try {
-			DataManager dm = DataManager.getCurrentInstance();
-			if (dm != null) {
-				dm.getClient().clearPracticeTable(dm.getSiteID());
-
-				statusHandler.handle(Priority.SIGNIFICANT,
-						"Practice VTEC table has been cleared.");
-			} else {
-				statusHandler.handle(Priority.PROBLEM,
-						"Failed to clear practice VTEC table");
-			}
-
-		} catch (VizException e) {
-			statusHandler.handle(
-							Priority.PROBLEM,
-							"Unexpected exception while attempting to clear practice VTEC table",
-							e);
-		}
-
-		return null;
-	}
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        DataManager dm = DataManagerUIFactory.getCurrentInstance();
+        if (dm != null) {
+            ServerResponse<?> sr = dm.getClient().clearVTECTable(
+                    ActiveTableMode.PRACTICE);
+            if (!sr.isOkay()) {
+                statusHandler
+                        .error(String.format(
+                                "Failed to clear practice VTEC table: %s",
+                                sr.message()));
+            } else {
+                statusHandler.handle(Priority.SIGNIFICANT,
+                        "Practice VTEC table has been cleared.");
+            }
+        } else {
+            statusHandler.handle(Priority.PROBLEM,
+                    "Failed to clear practice VTEC table");
+        }
 
+        return null;
+    }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowDeleteSelectionTimeRangeDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowDeleteSelectionTimeRangeDialog.java
index 5561b8d732..2f26ffa0c1 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowDeleteSelectionTimeRangeDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowDeleteSelectionTimeRangeDialog.java
@@ -37,6 +37,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * Jan 23, 2008            Eric Babin  Initial Creation
  * Oct 25, 2012 1287       rferrel     Changes for non-blocking ShowDeleteSelectionTimeRangeDialog.
  * Aug 27, 2015 4749       njensen     Now extends GfeShowDialogHandler
+ * Dec 02, 2015 5129       dgilling    Support modified dialog constructor.
  * 
  * </pre>
  * 
@@ -46,6 +47,7 @@ public class ShowDeleteSelectionTimeRangeDialog extends GfeShowDialogHandler {
     @Override
     protected CaveJFACEDialog createDialog(Shell shell, DataManager dm,
             ExecutionEvent event) {
-        return new SaveDeleteSelectTRDialog(shell, dm, "Delete");
+        return new SaveDeleteSelectTRDialog(shell,
+                dm.getSelectTimeRangeManager(), "Delete");
     }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowIscRequestReplyDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowIscRequestReplyDialog.java
index c6e004df8c..8d96bd0789 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowIscRequestReplyDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowIscRequestReplyDialog.java
@@ -42,6 +42,7 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeOperations;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 15, 2015  #4858     dgilling     Initial creation
+ * Nov 30, 2015  #5129     dgilling     Add DataManager instance as a field.
  * 
  * </pre>
  * 
@@ -65,16 +66,19 @@ public class ShowIscRequestReplyDialog extends AbstractHandler {
 
         if (iscRequestDlg == null || iscRequestDlg.getShell() == null
                 || iscRequestDlg.isDisposed()) {
-            iscRequestDlg = new ISCRequestReplyDlg(shell);
-            iscRequestDlg.setCloseCallback(new ICloseCallback() {
+            DataManager dm = DataManagerUIFactory.getCurrentInstance();
+            if (dm != null) {
+                iscRequestDlg = new ISCRequestReplyDlg(dm, shell);
+                iscRequestDlg.setCloseCallback(new ICloseCallback() {
 
-                @Override
-                public void dialogClosed(Object returnValue) {
-                    iscRequestDlg = null;
+                    @Override
+                    public void dialogClosed(Object returnValue) {
+                        iscRequestDlg = null;
 
-                }
-            });
-            iscRequestDlg.open();
+                    }
+                });
+                iscRequestDlg.open();
+            }
         } else {
             iscRequestDlg.bringToTop();
         }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSaveSelectionTimeRangeDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSaveSelectionTimeRangeDialog.java
index bf7a75250e..8a7b85f904 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSaveSelectionTimeRangeDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSaveSelectionTimeRangeDialog.java
@@ -38,6 +38,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * Nov 11, 2008 1213       wdougherty  Use SelectTimeRangeContainer
  * Oct 25, 2012 1287       rferrel     Code changes for non-blocking SaveDeleteSelectTRDialog.
  * Aug 27, 2015 4749       njensen     Now extends GfeShowDialogHandler
+ * Dec 02, 2015 5129       dgilling    Support modified dialog constructor.
  * 
  * </pre>
  * 
@@ -47,6 +48,7 @@ public class ShowSaveSelectionTimeRangeDialog extends GfeShowDialogHandler {
     @Override
     protected CaveJFACEDialog createDialog(Shell shell, DataManager dm,
             ExecutionEvent event) {
-        return new SaveDeleteSelectTRDialog(shell, dm, "Save");
+        return new SaveDeleteSelectTRDialog(shell,
+                dm.getSelectTimeRangeManager(), "Save");
     }
 }
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/config/ConfigCatalog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/config/ConfigCatalog.java
index 63be999edb..133ab9e8bf 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/config/ConfigCatalog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/config/ConfigCatalog.java
@@ -19,7 +19,6 @@
  **/
 package com.raytheon.viz.gfe.config;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -29,6 +28,8 @@ import java.util.Set;
 import jep.JepException;
 
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
@@ -50,6 +51,7 @@ import com.raytheon.uf.common.util.FileUtil;
  * Jan 21, 2010            randerso     Initial creation
  * Jul 08, 2014 3361       njensen      Consolidated code
  * Sep 29, 2014 2975       njensen      Only look up files in CAVE_STATIC
+ * Feb 05, 2016 5242       dgilling     Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -82,22 +84,20 @@ public class ConfigCatalog {
      * @return true if config file is hidden
      */
     public boolean isHidden(String name) {
-        LocalizationFile lf = getFile(name);
-        File file = lf.getFile();
         boolean rtnVal = false;
-        if (file == null || !file.exists()) {
+
+        LocalizationFile lf = getFile(name);
+        if (lf == null || !lf.exists()) {
             throw new IllegalArgumentException("No such GFE config file: "
                     + name);
         } else {
-            // Look for HideConfigFile = True in the file
-            PythonScript pscript = null;
-            try {
-                String configPath = GfePyIncludeUtil.getConfigIncludePath();
-                String vtecPath = GfePyIncludeUtil.getVtecIncludePath();
+            String configPath = GfePyIncludeUtil.getConfigIncludePath();
+            String vtecPath = GfePyIncludeUtil.getVtecIncludePath();
 
-                pscript = new PythonScript(file.getAbsolutePath(),
-                        PyUtil.buildJepIncludePath(configPath, vtecPath),
-                        getClass().getClassLoader(), preEvals);
+            // Look for HideConfigFile = True in the file
+            try (PythonScript pscript = new PythonScript(lf.getFile()
+                    .getAbsolutePath(), PyUtil.buildJepIncludePath(configPath,
+                    vtecPath), getClass().getClassLoader(), preEvals)) {
                 Boolean scriptValue = (Boolean) pscript.execute(
                         "checkHideConfigFile", null);
                 rtnVal = scriptValue.booleanValue();
@@ -108,10 +108,6 @@ public class ConfigCatalog {
                         Priority.PROBLEM,
                         "Error loading GFE config file: "
                                 + e.getLocalizedMessage(), e);
-            } finally {
-                if (pscript != null) {
-                    pscript.dispose();
-                }
             }
         }
         return rtnVal;
@@ -122,8 +118,8 @@ public class ConfigCatalog {
      * 
      * @return the localization files for the procedures.
      */
-    public LocalizationFile[] getFiles() {
-        LocalizationFile[] procFiles = PathManagerFactory.getPathManager()
+    public ILocalizationFile[] getFiles() {
+        ILocalizationFile[] procFiles = PathManagerFactory.getPathManager()
                 .listStaticFiles(LocalizationType.CAVE_STATIC,
                         GfePyIncludeUtil.CONFIG, new String[] { EXTENSION },
                         false, true);
@@ -136,9 +132,8 @@ public class ConfigCatalog {
      * @return the simple names of the procedures.
      */
     public Collection<String> getNames() {
-        Collection<String> result = new HashSet<String>();
-        LocalizationFile[] procFiles = getFiles();
-        result = scriptNames(procFiles);
+        ILocalizationFile[] procFiles = getFiles();
+        Collection<String> result = scriptNames(procFiles);
         return result;
     }
 
@@ -148,8 +143,8 @@ public class ConfigCatalog {
      * @return The localization file for the script
      */
     public LocalizationFile getFile(String scriptName) {
-        String fname = GfePyIncludeUtil.CONFIG + File.separator + scriptName
-                + EXTENSION;
+        String fname = GfePyIncludeUtil.CONFIG + IPathManager.SEPARATOR
+                + scriptName + EXTENSION;
         LocalizationFile file = PathManagerFactory.getPathManager()
                 .getStaticLocalizationFile(LocalizationType.CAVE_STATIC, fname);
         return file;
@@ -163,16 +158,14 @@ public class ConfigCatalog {
      *            the array of LocalizationFiles.
      * @return a Collection of simple script names with no duplicates.
      */
-    protected Collection<String> scriptNames(LocalizationFile[] scriptFiles) {
+    protected Collection<String> scriptNames(ILocalizationFile[] scriptFiles) {
         Set<String> procs = new HashSet<String>();
-        String fname = null;
-        String[] fsplit = null;
-        String script = null;
         if (scriptFiles != null) {
-            for (LocalizationFile file : scriptFiles) {
-                fname = file.getName();
-                fsplit = fname.split(FileUtil.fileSeparatorRegex);
-                script = fsplit[fsplit.length - 1].replaceAll("\\.py$", "");
+            for (ILocalizationFile file : scriptFiles) {
+                String fname = file.getPath();
+                String[] fsplit = fname.split(FileUtil.fileSeparatorRegex);
+                String script = fsplit[fsplit.length - 1].replaceAll("\\.py$",
+                        "");
                 procs.add(script);
             }
         }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
index b5c18c84dd..39bc1146aa 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
@@ -20,22 +20,28 @@
 package com.raytheon.viz.gfe.core;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.ui.IWorkbenchWindow;
 
+import com.raytheon.uf.common.activetable.ActiveTableMode;
 import com.raytheon.uf.common.activetable.ActiveTableRecord;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
 import com.raytheon.uf.common.dataplugin.gfe.request.GetIscSendStatusRequest.IscSendStatus;
+import com.raytheon.uf.common.dataplugin.gfe.request.IscRequestQueryRequest.IscQueryResponse;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
 import com.raytheon.uf.common.message.WsId;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -44,14 +50,13 @@ import com.raytheon.uf.common.time.ISimulatedTimeChangeListener;
 import com.raytheon.uf.common.time.SimulatedTime;
 import com.raytheon.uf.common.time.TimeRange;
 import com.raytheon.uf.viz.core.VizApp;
-import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.core.localization.LocalizationManager;
 import com.raytheon.uf.viz.core.notification.jobs.NotificationManagerJob;
 import com.raytheon.viz.core.mode.CAVEMode;
 import com.raytheon.viz.gfe.GFEServerException;
 import com.raytheon.viz.gfe.core.internal.DataMgrInitStatus;
 import com.raytheon.viz.gfe.core.internal.GFEParmCacheInitJob;
 import com.raytheon.viz.gfe.core.internal.GFETopoManager;
-import com.raytheon.viz.gfe.core.internal.IFPClient;
 import com.raytheon.viz.gfe.core.internal.NotificationRouter;
 import com.raytheon.viz.gfe.core.internal.ParmManager;
 import com.raytheon.viz.gfe.core.internal.ReferenceSetManager;
@@ -104,6 +109,7 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeProhibitedOpException;
  * 08/14/2015    4750      dgilling    Remove use of PythonScript in doIscRequestQuery.
  * 08/20/2015    4749      dgilling    Ensure TextProductManager is disposed on dispose.
  * 09/15/2015    4858      dgilling    Disable ISC when DRT mode is enabled.
+ * 11/18/2015    5129      dgilling    Support new IFPClient.
  * </pre>
  * 
  * @author chammack
@@ -195,7 +201,7 @@ public class DataManager implements ISimulatedTimeChangeListener {
 
     private Map<String, String> officeTypeDict;
 
-    private HashSet<String> knownOfficeTypes;
+    private Set<String> knownOfficeTypes;
 
     private List<String> allSites;
 
@@ -204,7 +210,7 @@ public class DataManager implements ISimulatedTimeChangeListener {
     private final SmartToolJobPool toolJobPool;
 
     private boolean previousIscSendState;
-    
+
     private final AtomicBoolean smartToolsInitialized;
 
     private final AtomicBoolean proceduresInitialized;
@@ -231,7 +237,8 @@ public class DataManager implements ISimulatedTimeChangeListener {
             throws GFEServerException {
         this.spatialDisplayManager = factory.createSpatialDisplayManager(this,
                 discriminator);
-        this.client = new IFPClient(VizApp.getWsId(), this);
+        this.client = new IFPClient(VizApp.getWsId(), LocalizationManager
+                .getInstance().getSite());
         this.router = new NotificationRouter(this.getSiteID());
         NotificationManagerJob.addObserver("edex.alerts.gfe", this.router);
 
@@ -260,23 +267,25 @@ public class DataManager implements ISimulatedTimeChangeListener {
         this.editActionProcessor = new EditActionProcessor(this);
 
         // get office type information, convert to Dictionary
-        this.allSites = client.getKnownSites();
-        List<String> allOT = client.getKnownOfficeTypes();
-        this.officeTypeDict = new HashMap<String, String>();
-        for (int i = 0; i < allSites.size(); i++) {
-            officeTypeDict.put(allSites.get(i), allOT.get(i));
-        }
+        ServerResponse<Map<String, String>> sr = client
+                .getKnownSitesWithOfficeType();
+        this.officeTypeDict = Collections.unmodifiableMap(sr.getPayload());
+        this.allSites = Collections.unmodifiableList(new ArrayList<>(
+                this.officeTypeDict.keySet()));
         this.officeType = officeTypeDict.get(this.siteId);
 
         // determine all known office types
-        this.knownOfficeTypes = new HashSet<String>(allOT);
+        this.knownOfficeTypes = Collections
+                .unmodifiableSet(new HashSet<String>(this.officeTypeDict
+                        .values()));
 
         ISCInitJob iscInitJob = new ISCInitJob(this);
         iscInitJob.setSystem(true);
         iscInitJob.schedule();
 
         // get the ISC states
-        IscSendStatus iscSendStatus = client.getIscSendStatus();
+        ServerResponse<IscSendStatus> sr2 = client.iscSendStatus();
+        IscSendStatus iscSendStatus = sr2.getPayload();
         this.sendISConSave = iscSendStatus.isSendISConSave();
         this.sendISConPublish = iscSendStatus.isSendISConPublish();
         this.requestISC = iscSendStatus.isRequestISC();
@@ -431,12 +440,8 @@ public class DataManager implements ISimulatedTimeChangeListener {
      */
     public synchronized String getSiteID() {
         if (siteId == null) {
-            try {
-                siteId = getClient().getSiteID().get(0);
-            } catch (GFEServerException e) {
-                statusHandler.handle(Priority.PROBLEM, "Unable to get site ID",
-                        e);
-            }
+            ServerResponse<String> sr = getClient().getSiteID();
+            siteId = sr.getPayload();
         }
         return siteId;
     }
@@ -489,16 +494,24 @@ public class DataManager implements ISimulatedTimeChangeListener {
     }
 
     /**
-     * Return the inventory for a parm
+     * Obtains and returns the current server inventory for the specified
+     * weather element identifier.
      * 
      * @param parmID
-     * @return inventory for the parm
-     * 
-     * @throws GFEServerException
+     *            Weather element to retrieve inventory for.
+     * @return inventory for the parm. In the case of failure, an empty list
+     *         will be returned.
      */
-    public List<TimeRange> serverParmInventory(final ParmID parmID)
-            throws GFEServerException {
-        return this.client.getGridInventory(parmID);
+    public List<TimeRange> serverParmInventory(final ParmID parmID) {
+        ServerResponse<List<TimeRange>> sr = client.getGridInventory(parmID);
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Unable to obtain serverParmInventory for %s: %s", parmID,
+                    sr.message()));
+            return Collections.emptyList();
+        }
+
+        return sr.getPayload();
     }
 
     /**
@@ -610,53 +623,49 @@ public class DataManager implements ISimulatedTimeChangeListener {
     }
 
     /**
-     * @return A List of Objects, the active table.
-     * @throws VizException
+     * Returns the current vtecActiveTable, based upon the current
+     * {@code CAVEMode}.
+     * 
+     * @return The current active table.
      */
-    public List<ActiveTableRecord> getActiveTable() throws VizException {
-        List<ActiveTableRecord> result = getClient().getVTECActiveTable(siteId);
-        return result;
+    public List<ActiveTableRecord> getActiveTable() {
+        ActiveTableMode tableName = (CAVEMode.getMode() == CAVEMode.PRACTICE) ? ActiveTableMode.PRACTICE
+                : ActiveTableMode.OPERATIONAL;
+        ServerResponse<List<ActiveTableRecord>> sr = getClient()
+                .getVTECActiveTable(tableName);
+        if (!sr.isOkay()) {
+            statusHandler.error("Unable to obtain vtecActiveTable: "
+                    + sr.message());
+        }
+        return sr.getPayload();
     }
 
-    @SuppressWarnings("unchecked")
-    public Object[] doIscRequestQuery() {
-        String xml = null;
-        List<String> parmsWanted = new ArrayList<String>();
-        Map<String, Map<String, List<Map<String, String>>>> domainDict = null;
-        Map<String, String> serverDictS2T = null;
-        Map<String, Map<String, String>> serverDictT2S = null;
-
-        try {
-            ServerResponse<List<Object>> sResponse = client.iscRequestQuery();
-            if (!sResponse.isOkay()) {
-                return null;
-            }
-            List<Object> response = sResponse.getPayload();
-            xml = (String) response.get(0);
-            List<String> parmList = (List<String>) response.get(2);
-            for (String p : parmList) {
-                parmsWanted.add(p.replace("_SFC", ""));
-            }
-
-            Map<String, Object> obj = (Map<String, Object>) response.get(1);
-            domainDict = (Map<String, Map<String, List<Map<String, String>>>>) obj
-                    .get("domains");
-            serverDictS2T = (Map<String, String>) obj.get("serverDictS2T");
-            serverDictT2S = (Map<String, Map<String, String>>) obj
-                    .get("serverDictT2S");
-        } catch (GFEServerException e) {
-            statusHandler
-                    .handle(Priority.PROBLEM,
-                            "Server Problem: Unable to get server info from iscRequestQuery",
-                            e);
+    public IscQueryResponse doIscRequestQuery() {
+        ServerResponse<IscQueryResponse> sr = client.iscRequestQuery();
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Unable to get server info from iscRequestQuery: %s",
+                    sr.message()));
+            return new IscQueryResponse();
         }
 
-        return new Object[] { xml, parmsWanted, domainDict, serverDictS2T,
-                serverDictT2S };
+        Collection<String> parmsWanted = Collections.emptyList();
+        Collection<String> parms = sr.getPayload().getRequestedParms();
+        parmsWanted = new ArrayList<>(parms.size());
+        for (String parm : parms) {
+            parmsWanted.add(parm.replace("_SFC", StringUtils.EMPTY));
+        }
+
+        return new IscQueryResponse(sr.getPayload().getDomainDict(), sr
+                .getPayload().getServerDictT2S(), parmsWanted);
     }
 
-    public void makeISCRequest(String xmlreq) throws GFEServerException {
-        client.iscMakeISCRequest(xmlreq);
+    public void makeISCRequest(String xmlRequest) {
+        ServerResponse<?> sr = client.iscRequestMake(xmlRequest);
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Unable to process iscRequestMake: %s", sr.message()));
+        }
     }
 
     public String officeType(String site) {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/IReferenceSetManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/IReferenceSetManager.java
index e411006a46..237496a05f 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/IReferenceSetManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/IReferenceSetManager.java
@@ -26,10 +26,12 @@ import com.raytheon.uf.common.dataplugin.gfe.grid.Grid2DFloat;
 import com.raytheon.uf.common.dataplugin.gfe.reference.GroupID;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
+import com.raytheon.uf.common.python.concurrent.PythonJobCoordinator;
 import com.raytheon.viz.gfe.core.msgs.IEditAreaGroupInvChangedListener;
 import com.raytheon.viz.gfe.core.msgs.IReferenceSetChangedListener;
 import com.raytheon.viz.gfe.core.msgs.IReferenceSetIDChangedListener;
 import com.raytheon.viz.gfe.core.msgs.IReferenceSetInvChangedListener;
+import com.raytheon.viz.gfe.query.QueryScript;
 
 /**
  * Public interface for ReferenceSetManager
@@ -42,6 +44,8 @@ import com.raytheon.viz.gfe.core.msgs.IReferenceSetInvChangedListener;
  * 02/14/2013        #1506  mnash       Move away from using QueryScript on the UI thread
  * 02/26/2013        #1708  randerso    Remove evaluateRefSet from public interface
  * Aug 13, 2015   4749      njensen     Extends DisposableManager
+ * Nov 18, 2015   5129      dgilling    Remove UI-related arguments from deleteRefSet.
+ * Dec 16, 2015   4816      dgilling    Add getPythonThreadPool.
  * 
  * </pre>
  * 
@@ -151,11 +155,9 @@ public interface IReferenceSetManager extends DisposableManager {
      * works, returns true.
      * 
      * @param refID
-     * @param withVerification
      * @return true if successful
      */
-    public abstract boolean deleteRefSet(final ReferenceID refID,
-            boolean withVerification);
+    public abstract boolean deleteRefSet(final ReferenceID refID);
 
     /**
      * Undo for Reference Sets. Uses _prevRefSet
@@ -342,4 +344,14 @@ public interface IReferenceSetManager extends DisposableManager {
      * @return true is query will recurse
      */
     public boolean willRecurse(String name, String query);
+
+    /**
+     * Returns a reference to the {@link PythonJobCoordinator} so other classes
+     * can evaluate query-based edit areas using this
+     * {@code IReferenceSetManager}'s thread pool.
+     * 
+     * @return {@code PythonJobCoordinator} for evaluating query-based edit
+     *         areas.
+     */
+    public PythonJobCoordinator<QueryScript> getPythonThreadPool();
 }
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/ISelectTimeRangeManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/ISelectTimeRangeManager.java
index 353ee90721..8e1aced8db 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/ISelectTimeRangeManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/ISelectTimeRangeManager.java
@@ -19,6 +19,8 @@
  **/
 package com.raytheon.viz.gfe.core;
 
+import java.util.TimeZone;
+
 import com.raytheon.uf.common.dataplugin.gfe.time.SelectTimeRange;
 import com.raytheon.uf.common.dataplugin.gfe.time.SelectTimeRange.Mode;
 
@@ -33,6 +35,7 @@ import com.raytheon.uf.common.dataplugin.gfe.time.SelectTimeRange.Mode;
  * Dec 3, 2009             randerso    Initial creation
  * Aug 1, 2012   #965      dgilling    Change location of SelectTimeRange.
  * Aug 13, 2015  4749      njensen     Extends DisposableManager
+ * Dec 02, 2015  5129      dgilling    Add getTimeZone.
  * 
  * </pre>
  * 
@@ -78,4 +81,10 @@ public interface ISelectTimeRangeManager extends DisposableManager {
      */
     public void remove(String name);
 
+    /**
+     * Returns the local site's time zone.
+     * 
+     * @return
+     */
+    public TimeZone getTimeZone();
 }
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/SampleSetMgrInitJob.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/SampleSetMgrInitJob.java
index 8b9357d62e..df782e4ac9 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/SampleSetMgrInitJob.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/SampleSetMgrInitJob.java
@@ -37,6 +37,7 @@ import com.raytheon.viz.gfe.core.internal.SampleSetManager;
  * ------------ ---------- ----------- --------------------------
  * Jan 25, 2011            njensen     Initial creation
  * Sep 09, 2014  #3592     randerso    Removed unused DataManager parameter to SampleSetManager constructor
+ * Nov 19, 2014  #5129     dgilling    Pass IFPClient into constructor.
  * 
  * </pre>
  * 
@@ -61,7 +62,7 @@ public class SampleSetMgrInitJob extends Job {
      */
     @Override
     protected IStatus run(IProgressMonitor monitor) {
-        dataMgr.sampleSetManager = new SampleSetManager();
+        dataMgr.sampleSetManager = new SampleSetManager(dataMgr.getClient());
         dataMgr.getInitStatus().setSampleSetMgrDone(true);
 
         return Status.OK_STATUS;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/SelectTRMgrInitJob.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/SelectTRMgrInitJob.java
index 8f69e402a5..a831078ea4 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/SelectTRMgrInitJob.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/SelectTRMgrInitJob.java
@@ -19,11 +19,16 @@
  **/
 package com.raytheon.viz.gfe.core;
 
+import java.util.TimeZone;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.viz.gfe.core.internal.SelectTimeRangeManager;
 
 /**
@@ -36,6 +41,7 @@ import com.raytheon.viz.gfe.core.internal.SelectTimeRangeManager;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jan 25, 2011            njensen     Initial creation
+ * Dec 02, 2015  #5129     dgilling    Support modified constructor.
  * 
  * </pre>
  * 
@@ -45,6 +51,9 @@ import com.raytheon.viz.gfe.core.internal.SelectTimeRangeManager;
 
 public class SelectTRMgrInitJob extends Job {
 
+    private final IUFStatusHandler statusHandler = UFStatus
+            .getHandler(getClass());
+
     private DataManager dataMgr;
 
     public SelectTRMgrInitJob(DataManager dm) {
@@ -52,15 +61,19 @@ public class SelectTRMgrInitJob extends Job {
         this.dataMgr = dm;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.
-     * IProgressMonitor)
-     */
     @Override
     protected IStatus run(IProgressMonitor monitor) {
-        dataMgr.selectTimeRangeManager = new SelectTimeRangeManager(dataMgr);
+        ServerResponse<String> sr = dataMgr.getClient().getSiteTimeZone(
+                dataMgr.getSiteID());
+        TimeZone tz;
+        if (sr.isOkay()) {
+            tz = TimeZone.getTimeZone(sr.getPayload());
+        } else {
+            statusHandler.error("Unable to retrieve GFE time zone, using GMT");
+            tz = TimeZone.getTimeZone("GMT");
+        }
+
+        dataMgr.selectTimeRangeManager = new SelectTimeRangeManager(tz);
         dataMgr.getInitStatus().setSelectTRMgrDone(true);
 
         return Status.OK_STATUS;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/UIFormat.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/UIFormat.java
index 86b7b67460..34288277c9 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/UIFormat.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/UIFormat.java
@@ -25,7 +25,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.TimeZone;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/DiscreteGridData.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/DiscreteGridData.java
index 7545ad856c..95bc1a1c6e 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/DiscreteGridData.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/DiscreteGridData.java
@@ -25,7 +25,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.mutable.MutableByte;
+import org.apache.commons.lang3.mutable.MutableByte;
 import org.geotools.geometry.jts.JTS;
 import org.opengis.metadata.spatial.PixelOrientation;
 import org.opengis.referencing.FactoryException;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/WeatherGridData.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/WeatherGridData.java
index a2e03963c5..610638f62e 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/WeatherGridData.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/WeatherGridData.java
@@ -24,7 +24,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang.mutable.MutableByte;
+import org.apache.commons.lang3.mutable.MutableByte;
 import org.geotools.geometry.jts.JTS;
 import org.opengis.metadata.spatial.PixelOrientation;
 import org.opengis.referencing.FactoryException;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractSpatialDisplayManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractSpatialDisplayManager.java
index 57428c73fd..dc70e03d93 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractSpatialDisplayManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractSpatialDisplayManager.java
@@ -25,11 +25,10 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.commands.ICommandService;
 
-import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.time.DataTime;
@@ -42,7 +41,6 @@ import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
 import com.raytheon.uf.viz.core.rsc.ResourceList;
 import com.raytheon.uf.viz.core.rsc.ResourceProperties;
-import com.raytheon.uf.viz.core.rsc.capabilities.ColorMapCapability;
 import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.GFEOperationFailedException;
 import com.raytheon.viz.gfe.actions.ShowISCMarkersAction;
@@ -164,6 +162,7 @@ public abstract class AbstractSpatialDisplayManager implements
      * 
      * @see com.raytheon.viz.gfe.core.ISpatialDisplayManager#getActivatedParm()
      */
+    @Override
     public Parm getActivatedParm() {
         return activeParm;
     }
@@ -186,6 +185,7 @@ public abstract class AbstractSpatialDisplayManager implements
      * addActivatedParmChangedListener
      * (com.raytheon.viz.gfe.core.msgs.IActivatedParmChangedListener)
      */
+    @Override
     public void addActivatedParmChangedListener(
             IActivatedParmChangedListener listener) {
         Validate.notNull(listener, "Attempting to add null listener");
@@ -199,6 +199,7 @@ public abstract class AbstractSpatialDisplayManager implements
      * removeActivatedParmChangedListener
      * (com.raytheon.viz.gfe.core.msgs.IActivatedParmChangedListener)
      */
+    @Override
     public void removeActivatedParmChangedListener(
             IActivatedParmChangedListener parmChangeListener) {
         this.activatedParmChangedListeners.remove(parmChangeListener);
@@ -238,6 +239,7 @@ public abstract class AbstractSpatialDisplayManager implements
      * addGridVisibilityChangedListener
      * (com.raytheon.viz.gfe.core.msgs.IGridVisibilityChangedListener)
      */
+    @Override
     public void addGridVisibilityChangedListener(
             IGridVisibilityChangedListener listener) {
         Validate.notNull(listener, "Attempting to add null listener");
@@ -251,6 +253,7 @@ public abstract class AbstractSpatialDisplayManager implements
      * removeGridVisibilityChangedListener
      * (com.raytheon.viz.gfe.core.msgs.IGridVisibilityChangedListener)
      */
+    @Override
     public void removeGridVisibilityChangedListener(
             IGridVisibilityChangedListener parmChangeListener) {
         this.gridVisibilityChangedListeners.remove(parmChangeListener);
@@ -491,6 +494,7 @@ public abstract class AbstractSpatialDisplayManager implements
      * com.raytheon.viz.gfe.core.ISpatialDisplayManager#activateParm(com.raytheon
      * .viz.gfe.core.parm.Parm)
      */
+    @Override
     public void activateParm(Parm parmToActivate)
             throws GFEOperationFailedException {
         // Keep any resources on descriptors in sync
@@ -504,11 +508,11 @@ public abstract class AbstractSpatialDisplayManager implements
                 if (props.isSystemResource()) {
                     continue;
                 }
-                Parm parm = ((GFEResource) rsc).getParm();
+                Parm parm = rsc.getParm();
                 if (parm.equals(parmToActivate)) {
                     props.setVisible(true);
                 }
-                ((GFEResource) rsc).reset();
+                rsc.reset();
             }
         }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFETopoManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFETopoManager.java
index d96e0ed720..ee3178d7b2 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFETopoManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFETopoManager.java
@@ -27,23 +27,25 @@ import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.dataplugin.gfe.slice.ScalarGridSlice;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.viz.gfe.GFEServerException;
 import com.raytheon.viz.gfe.core.DataManager;
 import com.raytheon.viz.gfe.core.ITopoManager;
 
 /**
  * GFETopoMgr manages the set of topography data sets available from the
  * ifpServer.
- * 
+ * <p>
  * All parms now use the same topo data, since the assumption is that all parms
  * in a database have the same exact GridLocation.
  * 
  * <pre>
+ * 
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Jul  2, 2008		#1160	randerso	Initial creation
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jul 02, 2008     #1160   randerso    Initial creation
  * Nov 20, 2013     #2331   randerso    Re-implemented to better match A1 design
+ * Nov 18, 2015     #5129   dgilling    Updates for new IFPClient.
  * 
  * </pre>
  * 
@@ -85,19 +87,14 @@ public class GFETopoManager implements ITopoManager {
         if (compositeTopo == null) {
             GridLocation gloc = dataManager.getParmManager()
                     .compositeGridLocation();
-            try {
-                ServerResponse<ScalarGridSlice> sr = this.dataManager
-                        .getClient().getTopoData(gloc);
-                if (!sr.isOkay()) {
-                    statusHandler
-                            .error("Error getting topography data from IFPServer: "
-                                    + sr.message());
-                }
-                compositeTopo = sr.getPayload();
-            } catch (GFEServerException e) {
-                statusHandler.error(
-                        "Error getting topography data from IFPServer: ", e);
+            ServerResponse<ScalarGridSlice> sr = dataManager.getClient()
+                    .getTopoData(gloc);
+            if (!sr.isOkay()) {
+                statusHandler
+                        .error("Error getting topography data from IFPServer: "
+                                + sr.message());
             }
+            compositeTopo = sr.getPayload();
         }
         return compositeTopo;
     }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
deleted file mode 100644
index f45a73494d..0000000000
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
+++ /dev/null
@@ -1,821 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-
-package com.raytheon.viz.gfe.core.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import com.raytheon.uf.common.activetable.ActiveTableMode;
-import com.raytheon.uf.common.activetable.ActiveTableRecord;
-import com.raytheon.uf.common.activetable.request.ClearPracticeVTECTableRequest;
-import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
-import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
-import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo;
-import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
-import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteDefinition;
-import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteKey;
-import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
-import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
-import com.raytheon.uf.common.dataplugin.gfe.request.AbstractGfeRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.CommitGridsRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.CreateNewDbRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetActiveTableRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetClientsRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetDbInventoryRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetDiscreteDefinitionRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetGridDataRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetGridHistoryRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetGridInventoryRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetGridParmInfoRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetIscSendStatusRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetIscSendStatusRequest.IscSendStatus;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetKnownOfficeTypesRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetKnownSitesRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetLockTablesRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetOfficialDbNameRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetParmListRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetTopoDataRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GetWXDefinitionRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.GridLocRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.IscCreateDomainDictRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.IscGetRequestXmlRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.IscMakeRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.IscRequestQueryRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.LockChangeRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.SaveGfeGridRequest;
-import com.raytheon.uf.common.dataplugin.gfe.request.SendIscGridRequest;
-import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable;
-import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerMsg;
-import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
-import com.raytheon.uf.common.dataplugin.gfe.server.request.CommitGridRequest;
-import com.raytheon.uf.common.dataplugin.gfe.server.request.GetGridRequest;
-import com.raytheon.uf.common.dataplugin.gfe.server.request.LockRequest;
-import com.raytheon.uf.common.dataplugin.gfe.server.request.LockTableRequest;
-import com.raytheon.uf.common.dataplugin.gfe.server.request.SaveGridRequest;
-import com.raytheon.uf.common.dataplugin.gfe.server.request.SendISCRequest;
-import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
-import com.raytheon.uf.common.dataplugin.gfe.slice.ScalarGridSlice;
-import com.raytheon.uf.common.dataplugin.gfe.weather.WeatherSubKey;
-import com.raytheon.uf.common.dataplugin.gfe.weather.WxDefinition;
-import com.raytheon.uf.common.message.WsId;
-import com.raytheon.uf.common.site.SiteMap;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.common.time.TimeRange;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.localization.LocalizationManager;
-import com.raytheon.uf.viz.core.requests.ThriftClient;
-import com.raytheon.viz.core.mode.CAVEMode;
-import com.raytheon.viz.gfe.Activator;
-import com.raytheon.viz.gfe.GFEServerException;
-import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.gfe.core.IParmManager;
-import com.raytheon.viz.gfe.core.IReferenceSetManager;
-import com.raytheon.viz.gfe.core.parm.Parm;
-
-/**
- * This class provides the interface to the IFPServer.
- * 
- * <pre>
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 4/10/08      875        bphillip    Initial Creation
- * 4/17/08      1075       randerso    Created temporary static grid location data
- * 4/18/08      875        bphillip    Refined save functionality
- * 06/17/08     #940       bphillip    Implemented GFE Locking
- * 01/29/09     #1271      njensen     Moved communication from ProductSrv to GfeSrv
- * 06/11/09     #1947      rjpeter     Fixed null pointers.
- * 07/09/09     #2590      njensen     Site ID from preferences and sent on all requests.
- * 09/22/09     #3058      rjpeter     Removed GFE Edex dependency.
- * 05/02/13     #1969      randerso    Added createNewDb method
- * 06/06/13     #2073      dgilling    Make getGridInventory() better match A1,
- *                                     fix warnings.
- * 11/20/2013   #2331      randerso    Added getTopoData method
- * 04/03/2014   #2737      randerso    Moved clientISCSendStatus to SaveGFEGridRequest
- * 04/09/2014   #3004      dgilling    Support moved ClearPracticeVTECTableRequest.
- * 07/01/2014   #3149      randerso    Changed getGridData to handle limited number of grids returned 
- *                                     and re-request if not all data returned
- * 09/23/14     #3648      randerso    Changed getParmList to return results even if some DbIds
- *                                     have errors
- * 
- * </pre>
- * 
- * @author bphillip
- * @version 1.0
- */
-public class IFPClient {
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(IFPClient.class);
-
-    // we pull the site ID from CAVE configuration because the server
-    // can run as multiple sites but the client can only be one
-    private static final String siteID = LocalizationManager.getInstance()
-            .getCurrentSite();
-
-    /** The workstationID of the owner of this IFPClient instance */
-    private final WsId workstationID;
-
-    private DataManager dataManager;
-
-    /**
-     * Creates a new IFPClient
-     * 
-     * @param wsId
-     *            The workstationID of the creator
-     */
-    public IFPClient(WsId wsId, DataManager dataManager) {
-        this.dataManager = dataManager;
-        workstationID = wsId;
-        try {
-            // get and set the WxDefinition
-            WxDefinition wxDef = getWXDefinition();
-            WeatherSubKey.setWxDefinition(siteID, wxDef);
-
-            // get and set the DiscreteDefinition
-            DiscreteDefinition dDef = getDiscreteDefinition();
-            DiscreteKey.setDiscreteDefinition(siteID, dDef);
-
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-
-        }
-    }
-
-    /**
-     * Gets a list of ParmIDs for the provided databaseID from the IFPServer
-     * 
-     * @param id
-     *            The database ID for which to get the ParmIDs
-     * @return The list of parms for the provided databaseID
-     * @throws GFEServerException
-     * 
-     */
-    public List<ParmID> getParmList(DatabaseID id) throws GFEServerException {
-        return getParmList(Arrays.asList(new DatabaseID[] { id }));
-    }
-
-    /**
-     * Gets a list of ParmIDs for the provided list of databaseIDs from the
-     * IFPServer
-     * 
-     * @param ids
-     *            The list of databaseIDS for which to get the parmIDs
-     * @return The list of parms for the provided list of databaseIDs
-     * @throws GFEServerException
-     * 
-     */
-    @SuppressWarnings("unchecked")
-    public List<ParmID> getParmList(List<DatabaseID> ids)
-            throws GFEServerException {
-        GetParmListRequest request = new GetParmListRequest();
-        request.setDbIds(ids);
-        ServerResponse<?> sr = makeRequest(request, false);
-        List<ParmID> parmIds = (List<ParmID>) sr.getPayload();
-        if (!sr.isOkay()) {
-            String msg = formatSRMessage(sr);
-            if (parmIds != null && !parmIds.isEmpty()) {
-                // got something so display an error message and continue
-                statusHandler.error(msg);
-            } else {
-                // got nothing so throw exception
-                throw new GFEServerException(msg);
-            }
-        }
-
-        return parmIds;
-    }
-
-    /**
-     * Gets the grid parm info for the specified parmIDs from the IFPServer
-     * 
-     * @param parmIds
-     *            The parm IDs to get parm info for
-     * @return The parm information
-     * @throws GFEServerException
-     * 
-     */
-    @SuppressWarnings("unchecked")
-    public List<GridParmInfo> getGridParmInfo(List<ParmID> parmIds)
-            throws GFEServerException {
-        GetGridParmInfoRequest request = new GetGridParmInfoRequest();
-        request.setParmIds(parmIds);
-        ServerResponse<?> sr = makeRequest(request);
-        return (List<GridParmInfo>) sr.getPayload();
-    }
-
-    public GridParmInfo getGridParmInfo(ParmID parmId)
-            throws GFEServerException {
-        List<GridParmInfo> gpi = getGridParmInfo(Arrays
-                .asList(new ParmID[] { parmId }));
-        if ((gpi == null) || gpi.isEmpty()) {
-            return null;
-        } else {
-            return gpi.get(0);
-        }
-    }
-
-    /**
-     * Gets the localized site ID for this GFE instance
-     * 
-     * @return The site ID for this GFE instance
-     * @throws GFEServerException
-     * 
-     */
-    public List<String> getSiteID() throws GFEServerException {
-        List<String> siteIds = new ArrayList<String>();
-        siteIds.add(siteID);
-        return siteIds;
-    }
-
-    /**
-     * Returns the time zone of the localized site
-     * 
-     * @return the time zone
-     * @throws GFEServerException
-     */
-    public String getSiteTimeZone() throws GFEServerException {
-        return getDBGridLocation().getTimeZone();
-    }
-
-    /**
-     * Returns the grid inventory for a given parmId
-     * 
-     * @param parmId
-     *            The parmId to get the inventory for
-     * @return A map of TimeRange(as a string) to the inventory as a list of
-     *         GFERecords
-     * @throws GFEServerException
-     */
-    public List<TimeRange> getGridInventory(ParmID parmId)
-            throws GFEServerException {
-        Map<ParmID, List<TimeRange>> inventory = getGridInventory(Arrays
-                .asList(new ParmID[] { parmId }));
-        List<TimeRange> times = inventory.get(parmId);
-        if (times == null) {
-            times = Collections.emptyList();
-        }
-        return times;
-    }
-
-    /**
-     * Gets the inventory of GFERecords from the IFPServer for the specified
-     * list of parmIds
-     * 
-     * @param parmIds
-     *            The parmIDs to get the inventory
-     * @return The inventory of GFERecords
-     * @throws GFEServerException
-     * 
-     */
-    @SuppressWarnings("unchecked")
-    public Map<ParmID, List<TimeRange>> getGridInventory(List<ParmID> parmIds)
-            throws GFEServerException {
-        GetGridInventoryRequest request = new GetGridInventoryRequest();
-        request.setParmIds(parmIds);
-        ServerResponse<Map<ParmID, List<TimeRange>>> response = (ServerResponse<Map<ParmID, List<TimeRange>>>) makeRequest(
-                request, false);
-        return response.getPayload();
-    }
-
-    /**
-     * Requests a lock change identified by a single lock request.
-     * 
-     * @param lockRequest
-     *            The lock request
-     * @return The server response containing the changed lock tables
-     * @throws GFEServerException
-     */
-    public ServerResponse<List<LockTable>> requestLockChange(
-            LockRequest lockRequest) throws GFEServerException {
-        ArrayList<LockRequest> lreq = new ArrayList<LockRequest>();
-        lreq.add(lockRequest);
-        return requestLockChange(lreq);
-    }
-
-    /**
-     * Requests a lock change identified by a list of lock requests
-     * 
-     * @param lreq
-     *            The lock requests
-     * @return The server response containing the changed lock tables
-     * @throws GFEServerException
-     */
-    @SuppressWarnings("unchecked")
-    public ServerResponse<List<LockTable>> requestLockChange(
-            List<LockRequest> lreq) throws GFEServerException {
-        LockChangeRequest request = new LockChangeRequest();
-        request.setRequests(lreq);
-        ServerResponse<?> sr = makeRequest(request);
-        return (ServerResponse<List<LockTable>>) sr;
-    }
-
-    /**
-     * Gets the list of available databases from the IFPServer
-     * 
-     * @return The list of available databases
-     * @throws GFEServerException
-     * 
-     */
-    @SuppressWarnings("unchecked")
-    public List<DatabaseID> getAvailableDbs() throws GFEServerException {
-        GetDbInventoryRequest request = new GetDbInventoryRequest();
-        ServerResponse<?> sr = makeRequest(request);
-        return (List<DatabaseID>) sr.getPayload();
-    }
-
-    @SuppressWarnings("unchecked")
-    public List<String> getClients() throws GFEServerException {
-        GetClientsRequest request = new GetClientsRequest();
-        ServerResponse<?> sr = makeRequest(request);
-        return (List<String>) sr.getPayload();
-    }
-
-    /**
-     * Retrieves the lock table from the server for this parm object.<br>
-     * This is a temporary method and will be replaced by a lock notification
-     * system to prevent large amounts of server requests when many parms are
-     * being saved
-     * 
-     * @param parmId
-     *            The parm to get the lock table for
-     * @return The lock table for the specified parm
-     * @throws GFEServerException
-     * 
-     */
-    @SuppressWarnings("unchecked")
-    public LockTable getLockTable(ParmID parmId) throws GFEServerException {
-        List<LockTableRequest> ltReq = new ArrayList<LockTableRequest>();
-        ltReq.add(new LockTableRequest(parmId));
-        GetLockTablesRequest request = new GetLockTablesRequest();
-        request.setRequests(ltReq);
-        ServerResponse<?> sr = makeRequest(request);
-        return ((List<LockTable>) sr.getPayload()).get(0);
-    }
-
-    /**
-     * Gets a LockTable identified by a single database id
-     * 
-     * @param dbId
-     *            The database id
-     * @return The requested table
-     * @throws GFEServerException
-     */
-    public List<LockTable> getLockTable(DatabaseID dbId)
-            throws GFEServerException {
-        List<LockTableRequest> request = Arrays
-                .asList(new LockTableRequest[] { new LockTableRequest(dbId) });
-        return getLockTable(request);
-    }
-
-    /**
-     * Gets a list of LockTables identified by a list of lock table requests
-     * 
-     * @param ltrList
-     *            The list of lock table requests
-     * @return The list of LockTables
-     * @throws GFEServerException
-     */
-    @SuppressWarnings("unchecked")
-    public List<LockTable> getLockTable(List<LockTableRequest> ltrList)
-            throws GFEServerException {
-        GetLockTablesRequest request = new GetLockTablesRequest();
-        request.setRequests(ltrList);
-        ServerResponse<?> sr = makeRequest(request);
-        return (List<LockTable>) sr.getPayload();
-    }
-
-    /**
-     * Gets the grid location of the localized GFE instance
-     * 
-     * @return The grid location of the localized GFE instance
-     * @throws GFEServerException
-     */
-    @SuppressWarnings("unchecked")
-    public GridLocation getDBGridLocation() throws GFEServerException {
-        GridLocRequest request = new GridLocRequest();
-        ServerResponse<List<Object>> sr = (ServerResponse<List<Object>>) makeRequest(request);
-        if (sr.isOkay()) {
-            return (GridLocation) sr.getPayload().get(0);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Saves the parm information to the server
-     * 
-     * @param requests
-     *            the save grid requests
-     * @throws GFEServerException
-     */
-    public ServerResponse<?> saveGrids(List<SaveGridRequest> requests)
-            throws GFEServerException {
-        ServerResponse<?> response = null;
-        if (!requests.isEmpty()) {
-            SaveGfeGridRequest request = new SaveGfeGridRequest(
-                    dataManager.clientISCSendStatus(), requests);
-            response = makeRequest(request);
-        }
-        logResponse(response);
-        return response;
-    }
-
-    /**
-     * Gets the list of known sites from the server
-     * 
-     * @return The list of known sites from the server
-     * @throws GFEServerException
-     */
-    @SuppressWarnings("unchecked")
-    public List<String> getKnownSites() throws GFEServerException {
-        return (List<String>) makeRequest(new GetKnownSitesRequest())
-                .getPayload();
-    }
-
-    /**
-     * Gets the list of known office types from the server
-     * 
-     * @return The list of known office types from the server
-     * @throws GFEServerException
-     */
-    @SuppressWarnings("unchecked")
-    public List<String> getKnownOfficeTypes() throws GFEServerException {
-        return (List<String>) makeRequest(new GetKnownOfficeTypesRequest())
-                .getPayload();
-    }
-
-    public IscSendStatus getIscSendStatus() throws GFEServerException {
-        GetIscSendStatusRequest request = new GetIscSendStatusRequest();
-        request.setSiteID(siteID);
-        return (IscSendStatus) makeRequest(request).getPayload();
-    }
-
-    /**
-     * Logs a message to the message display
-     * 
-     * @param message
-     *            The message to display
-     */
-    private void logMessage(String message) {
-        Status statusMessage = new Status(IStatus.INFO, Activator.PLUGIN_ID,
-                message + "\n");
-        Activator.getDefault().getLog().log(statusMessage);
-    }
-
-    /**
-     * Logs error messages contained in a ServerResponse object
-     * 
-     * @param sr
-     *            The ServerResponse object containing the messages
-     */
-    private void logResponse(ServerResponse<?> sr) {
-        for (ServerMsg msg : sr.getMessages()) {
-            logMessage(msg.getMessage());
-        }
-    }
-
-    /**
-     * Gets the discrete definition
-     * 
-     * @return The discrete definition
-     * @throws GFEServerException
-     */
-    @SuppressWarnings("unchecked")
-    public DiscreteDefinition getDiscreteDefinition() throws GFEServerException {
-        GetDiscreteDefinitionRequest request = new GetDiscreteDefinitionRequest();
-        ServerResponse<DiscreteDefinition> sr = (ServerResponse<DiscreteDefinition>) makeRequest(request);
-        if (!sr.isOkay()) {
-            StringBuilder msg = new StringBuilder(
-                    "Unable to retrieve DiscreteDefinition: ");
-            for (ServerMsg s : sr.getMessages()) {
-                msg.append("\n   ").append(s.getMessage());
-            }
-
-            statusHandler.handle(Priority.PROBLEM, msg.toString());
-        }
-        return sr.getPayload();
-    }
-
-    /**
-     * Gets the Wx Definition from the server
-     * 
-     * @return The Wx Definition
-     * @throws GFEServerException
-     */
-    @SuppressWarnings("unchecked")
-    public WxDefinition getWXDefinition() throws GFEServerException {
-        GetWXDefinitionRequest request = new GetWXDefinitionRequest();
-        ServerResponse<WxDefinition> sr = (ServerResponse<WxDefinition>) makeRequest(request);
-        if (!sr.isOkay()) {
-            StringBuilder msg = new StringBuilder(
-                    "Unable to retrieve WxDefinition: ");
-            for (ServerMsg s : sr.getMessages()) {
-                msg.append("\n   ").append(s.getMessage());
-            }
-
-            statusHandler.handle(Priority.PROBLEM, msg.toString());
-        }
-        return sr.getPayload();
-    }
-
-    /**
-     * Makes a call to ReferenceSetManager to retrieve an ArrayList of
-     * ReferenceData
-     * 
-     * @param need
-     * @return an ArrayList of ReferenceData
-     */
-    public List<ReferenceData> getReferenceData(ArrayList<ReferenceID> need) {
-        IReferenceSetManager ref = dataManager.getRefManager();
-
-        return ref.getReferenceData(need);
-    }
-
-    /**
-     * Makes a call to ReferenceSetManager to retrieve an ArrayList of
-     * ReferenceID objects
-     * 
-     * @return an ArrayList of ReferenceID
-     */
-    public List<ReferenceID> getReferenceInventory() {
-        IReferenceSetManager ref = dataManager.getRefManager();
-        List<ReferenceID> refList = ref.getAvailableSets();
-
-        return refList;
-    }
-
-    /**
-     * Gets the grid data based on a parmID and a list of time ranges
-     * 
-     * @param parmId
-     * @param gridTimes
-     * @return List of grid slices
-     * @throws GFEServerException
-     */
-    @SuppressWarnings("unchecked")
-    public List<IGridSlice> getGridData(ParmID parmId, List<TimeRange> gridTimes)
-            throws GFEServerException {
-        GetGridRequest req = new GetGridRequest(parmId, gridTimes);
-        GetGridDataRequest request = new GetGridDataRequest();
-        request.addRequest(req);
-
-        List<IGridSlice> slices = new ArrayList<IGridSlice>(gridTimes.size());
-        while (slices.size() < gridTimes.size()) {
-            ServerResponse<List<IGridSlice>> resp = (ServerResponse<List<IGridSlice>>) makeRequest(request);
-            slices.addAll(resp.getPayload());
-
-            // if no slices returned (shouldn't happen unless server code is
-            // broken)
-            if (slices.isEmpty()) {
-                String msg = "No data returned from GetGridDataRequest for "
-                        + parmId + " for times:" + req.getTimes();
-                statusHandler.error(msg);
-                throw new GFEServerException(msg);
-            }
-
-            // if not all slices returned
-            if (slices.size() < gridTimes.size()) {
-                // request remaining times.
-                req.setTimes(gridTimes.subList(slices.size(), gridTimes.size()));
-            }
-        }
-
-        return slices;
-    }
-
-    /**
-     * Gets a parm, if there is no parm in the ParmManager it adds it based on
-     * parmId
-     * 
-     * @param parmId
-     * @param parmMan
-     * @return a parm
-     */
-    public Parm getParm(ParmID parmId, IParmManager parmMan) {
-        Parm parm = parmMan.getParm(parmId);
-        if (parm == null) {
-            parm = parmMan.addParm(parmId, true, false);
-            parm = parmMan.getParm(parmId);
-        }
-        return parm;
-    }
-
-    /**
-     * Commits a list of grids to the official database via a list of commit
-     * grid requests
-     * 
-     * @param requests
-     *            The commit grid requests
-     * @return The ServerResponse containing any server side messages
-     * @throws GFEServerException
-     */
-    public ServerResponse<?> commitGrid(List<CommitGridRequest> requests)
-            throws GFEServerException {
-
-        CommitGridsRequest commitRequest = new CommitGridsRequest();
-        commitRequest.setCommits(requests);
-        ServerResponse<?> sr = makeRequest(commitRequest);
-        return sr;
-    }
-
-    /**
-     * Commits a single grid to the official database
-     * 
-     * @param req
-     *            The commitGridRequest
-     * @throws GFEServerException
-     */
-    public ServerResponse<?> commitGrid(CommitGridRequest req)
-            throws GFEServerException {
-        List<CommitGridRequest> requests = new ArrayList<CommitGridRequest>();
-        requests.add(req);
-        return commitGrid(requests);
-    }
-
-    /**
-     * Gets the official database name for this localized instance of GFE
-     * 
-     * @return The official database name
-     * @throws GFEServerException
-     */
-    @SuppressWarnings("unchecked")
-    public ServerResponse<List<DatabaseID>> getOfficialDBName()
-            throws GFEServerException {
-        GetOfficialDbNameRequest request = new GetOfficialDbNameRequest();
-        return (ServerResponse<List<DatabaseID>>) makeRequest(request);
-    }
-
-    public List<ActiveTableRecord> getVTECActiveTable(String siteId)
-            throws VizException {
-        CAVEMode mode = dataManager.getOpMode();
-        ActiveTableMode atMode = ActiveTableMode.OPERATIONAL;
-        if (mode.equals(CAVEMode.PRACTICE)) {
-            atMode = ActiveTableMode.PRACTICE;
-        }
-        return getVTECActiveTable(siteId, atMode);
-    }
-
-    @SuppressWarnings("unchecked")
-    public List<ActiveTableRecord> getVTECActiveTable(String siteId,
-            ActiveTableMode mode) throws VizException {
-        GetActiveTableRequest request = new GetActiveTableRequest();
-        request.setRequestedSiteId(SiteMap.getInstance().getSite4LetterId(
-                siteId));
-        request.setMode(mode);
-        ServerResponse<?> sr = makeRequest(request);
-        return (List<ActiveTableRecord>) sr.getPayload();
-    }
-
-    public ServerResponse<?> sendISC(List<SendISCRequest> req)
-            throws GFEServerException {
-        SendIscGridRequest request = new SendIscGridRequest();
-        request.setRequests(req);
-        return makeRequest(request);
-    }
-
-    @SuppressWarnings("unchecked")
-    public ServerResponse<List<Object>> iscRequestQuery()
-            throws GFEServerException {
-        IscRequestQueryRequest request = new IscRequestQueryRequest();
-        return (ServerResponse<List<Object>>) makeRequest(request);
-    }
-
-    @SuppressWarnings("unchecked")
-    public ServerResponse<Object> iscGetDomainDict(String xml)
-            throws GFEServerException {
-        IscCreateDomainDictRequest request = new IscCreateDomainDictRequest();
-        request.setXml(xml);
-        return (ServerResponse<Object>) makeRequest(request);
-    }
-
-    public String iscGetRequestXML(String xml, List<String> selectedServers,
-            List<String> selectedWE) throws GFEServerException {
-        IscGetRequestXmlRequest request = new IscGetRequestXmlRequest();
-        request.setXml(xml);
-        request.setSelectedServers(selectedServers);
-        request.setSelectedWEList(selectedWE);
-        return (String) makeRequest(request).getPayload();
-    }
-
-    public void iscMakeISCRequest(String xmlRequest) throws GFEServerException {
-        IscMakeRequest task = new IscMakeRequest();
-        task.setXml(xmlRequest);
-        makeRequest(task);
-    }
-
-    public ServerResponse<?> makeRequest(AbstractGfeRequest request)
-            throws GFEServerException {
-        return makeRequest(request, true);
-    }
-
-    private ServerResponse<?> makeRequest(AbstractGfeRequest request,
-            boolean throwExceptionsBasedOnResponse) throws GFEServerException {
-        ServerResponse<?> rval = null;
-
-        try {
-            // System.out.println("IFPClient.makeRequest: "
-            // + request.getClass().getSimpleName());
-            request.setWorkstationID(workstationID);
-            request.setSiteID(siteID);
-            Object obj = ThriftClient.sendRequest(request);
-
-            if (obj instanceof ServerResponse) {
-                rval = (ServerResponse<?>) obj;
-            } else {
-                throw new GFEServerException(
-                        "Received invalid response object from GFE Server.  Received ["
-                                + obj.getClass().getName() + "] excepted ["
-                                + ServerResponse.class.getName());
-            }
-        } catch (VizException e) {
-            throw new GFEServerException(e);
-        }
-
-        if ((throwExceptionsBasedOnResponse) && (rval != null)
-                && (!rval.isOkay())) {
-            String msg = formatSRMessage(rval);
-            throw new GFEServerException(msg);
-
-        }
-
-        return rval;
-    }
-
-    private String formatSRMessage(ServerResponse<?> rval) {
-        StringBuilder sb = new StringBuilder();
-        if (rval.getMessages().size() > 1) {
-            sb.append("Errors ");
-        } else {
-            sb.append("Error ");
-        }
-        sb.append("occurred on GFE server: ");
-        Iterator<ServerMsg> iter = rval.getMessages().iterator();
-        while (iter.hasNext()) {
-            sb.append(iter.next().getMessage());
-            if (iter.hasNext()) {
-                sb.append(", ");
-            }
-        }
-        String msg = sb.toString();
-        return msg;
-    }
-
-    public void clearPracticeTable(String siteId) throws VizException {
-        try {
-            ClearPracticeVTECTableRequest request = new ClearPracticeVTECTableRequest(
-                    SiteMap.getInstance().getSite4LetterId(siteId),
-                    workstationID);
-            ThriftClient.sendRequest(request);
-        } catch (VizException e) {
-            throw new GFEServerException(
-                    "Could not clear practice active table.", e);
-        }
-    }
-
-    public ServerResponse<?> getGridHistory(ParmID parmID,
-            List<TimeRange> timeRanges) throws GFEServerException {
-        GetGridHistoryRequest request = new GetGridHistoryRequest();
-        request.setParmID(parmID);
-        request.setTimeRanges(timeRanges);
-        return makeRequest(request);
-    }
-
-    public ServerResponse<?> createNewDb(DatabaseID dbId)
-            throws GFEServerException {
-        CreateNewDbRequest request = new CreateNewDbRequest(dbId);
-        return makeRequest(request);
-    }
-
-    public ServerResponse<ScalarGridSlice> getTopoData(GridLocation gloc)
-            throws GFEServerException {
-        GetTopoDataRequest request = new GetTopoDataRequest(gloc);
-        return (ServerResponse<ScalarGridSlice>) makeRequest(request, false);
-    }
-}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
index 1f93cf831b..89564455c4 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
@@ -50,12 +50,14 @@ import com.raytheon.uf.common.dataplugin.gfe.server.notify.DBInvChangeNotificati
 import com.raytheon.uf.common.dataplugin.gfe.server.notify.GridHistoryUpdateNotification;
 import com.raytheon.uf.common.dataplugin.gfe.server.notify.GridUpdateNotification;
 import com.raytheon.uf.common.dataplugin.gfe.server.notify.LockNotification;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.LockTableRequest;
 import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.LocalizationUtil;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.site.notify.SiteActivationNotification;
@@ -148,6 +150,8 @@ import com.raytheon.viz.gfe.types.MutableInteger;
  * 10/30/2014    #3775     randerso    Changed to createMutableDb before getting initial database inventory
  * 01/13/2015    #3955     randerso    Changed getProductDatabase() to return mutableDb for EditTopo
  * 03/12/2015    #4246     randerso    Changes to support VCModules at base, site, and user levels
+ * 11/17/2015    #5129     dgilling    Changes to support new IFPClient
+ * 02/05/2016    #5242     dgilling    Remove calls to deprecated Localization APIs.
  * </pre>
  * 
  * @author chammack
@@ -458,7 +462,14 @@ public class ParmManager implements IParmManager, IMessageClient {
         Message.registerInterest(this, EnableDisableTopoMsg.class);
 
         // Get the composite grid location
-        this.gloc = dataManager.getClient().getDBGridLocation();
+        ServerResponse<GridLocation> sr = dataManager.getClient()
+                .getDBGridLocation();
+        this.gloc = sr.getPayload();
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Unable to get DBGridLocation from ifpServer: %s",
+                    sr.message()));
+        }
 
         this.systemTimeRange = recalcSystemTimeRange();
         this.parmIDCacheServer = new HashMap<DatabaseID, List<ParmID>>();
@@ -549,55 +560,47 @@ public class ParmManager implements IParmManager, IMessageClient {
      * Determines the name of the database that is used by products. This is the
      * official database identifier or if none, the mutable database id.
      * 
-     * @return
-     * @throws GFEServerException
+     * @return The {@code DatabaseID} of the official database.
      */
     private DatabaseID determineProductDatabase() {
-        DatabaseID mutableDb = this.getMutableDatabase();
-
         CAVEMode opMode = CAVEMode.getMode();
         if (opMode.equals(CAVEMode.PRACTICE) || opMode.equals(CAVEMode.TEST)) {
             return mutableDb;
         }
 
-        ServerResponse<List<DatabaseID>> sr;
-        try {
-            sr = this.dataManager.getClient().getOfficialDBName();
-            List<DatabaseID> databases = sr.getPayload();
+        ServerResponse<List<DatabaseID>> sr = dataManager.getClient()
+                .getOfficialDBName();
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Unable to get official DB names: %s", sr.message()));
+            return new DatabaseID();
+        }
 
-            if (!sr.isOkay()) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Network problem: Unable to get official DB names.\n"
-                                + sr);
-            }
+        List<DatabaseID> databases = sr.getPayload();
 
-            // if no official databases, then use the mutable database
-            if (databases.isEmpty()) {
-                return mutableDb;
-            }
+        // if no official databases, then use the mutable database
+        if (databases.isEmpty()) {
+            return mutableDb;
+        }
 
-            // the official database names from the server don't include the
-            // model time, so see if we can add a model time in if appropriate.
-            for (int i = 0; i < databases.size(); i++) {
-                // find a match for siteid, type and format with the mutable
-                if (mutableDb.getSiteId().equals(databases.get(i).getSiteId())
-                        && mutableDb.getDbType().equals(
-                                databases.get(i).getDbType())
-                        && mutableDb.getFormat().equals(
-                                databases.get(i).getFormat())) {
-                    // found a match -- now put the model time from the mutable
-                    // database onto this database
-                    DatabaseID off = databases.get(i);
-                    return new DatabaseID(off.getSiteId(), off.getFormat(),
-                            off.getDbType(), off.getModelName(),
-                            mutableDb.getModelTime());
-
-                }
+        /*
+         * the official database names from the server don't include the model
+         * time, so see if we can add a model time in if appropriate.
+         */
+        for (DatabaseID db : databases) {
+            // find a match for siteid, type and format with the mutable
+            if ((mutableDb.getSiteId().equals(db.getSiteId()))
+                    && (mutableDb.getDbType().equals(db.getDbType()))
+                    && (mutableDb.getFormat().equals(db.getFormat()))) {
+                /*
+                 * found a match -- now put the model time from the mutable
+                 * database onto this database
+                 */
+                return new DatabaseID(db.getSiteId(), db.getFormat(),
+                        db.getDbType(), db.getModelName(),
+                        mutableDb.getModelTime());
 
             }
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Network problem: Unable to get official DB names.", e);
         }
 
         // can't find an official database that matches the mutable database
@@ -803,10 +806,10 @@ public class ParmManager implements IParmManager, IMessageClient {
         }
 
         if (!uncachedDbs.isEmpty()) {
-            // retrieve cache
-            try {
-                List<ParmID> results = dataManager.getClient().getParmList(
-                        uncachedDbs);
+            ServerResponse<List<ParmID>> sr = dataManager.getClient()
+                    .getParmList(uncachedDbs);
+            if (sr.isOkay()) {
+                List<ParmID> results = sr.getPayload();
                 parmIDs.addAll(results);
 
                 // add results to parmIDCache
@@ -849,9 +852,9 @@ public class ParmManager implements IParmManager, IMessageClient {
                         }
                     }
                 }
-            } catch (GFEServerException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error retrieving all parm IDs", e);
+            } else {
+                statusHandler.error(String.format(
+                        "Error retrieving all parm IDs: %s", sr.message()));
             }
         }
 
@@ -861,9 +864,10 @@ public class ParmManager implements IParmManager, IMessageClient {
 
     @Override
     public ParmID[] getAvailableParms(DatabaseID dbID) {
-        // a derivation from AWIPS1:
-        // short-circuit the checks and just return an empty array back
-        // if we have an invalid DatabaseID
+        /*
+         * a derivation from AWIPS1: short-circuit the checks and just return an
+         * empty array back if we have an invalid DatabaseID
+         */
         if ((dbID == null) || (!dbID.isValid())) {
             return new ParmID[0];
         }
@@ -878,19 +882,19 @@ public class ParmManager implements IParmManager, IMessageClient {
         if (cacheParmIDs != null) {
             parmIds = new ArrayList<ParmID>(cacheParmIDs);
         } else {
-            if (this.availableServerDatabases.contains(dbID)) {
-                try {
-                    parmIds = dataManager.getClient().getParmList(dbID);
-                } catch (GFEServerException e) {
-                    statusHandler
-                            .handle(Priority.PROBLEM,
-                                    "Unable to get parm list of db: "
-                                            + dbID.toString(), e);
-                }
-
-                // cache the result for next time
-                synchronized (this.parmIDCacheServer) {
-                    this.parmIDCacheServer.put(dbID, parmIds);
+            if (availableServerDatabases.contains(dbID)) {
+                ServerResponse<List<ParmID>> sr = dataManager.getClient()
+                        .getParmList(dbID);
+                if (!sr.isOkay()) {
+                    statusHandler.error(String.format(
+                            "Unable to access parm list: %s", sr.message()));
+                    return new ParmID[0];
+                } else {
+                    parmIds = sr.getPayload();
+                    // cache the result for next time
+                    synchronized (this.parmIDCacheServer) {
+                        this.parmIDCacheServer.put(dbID, parmIds);
+                    }
                 }
             }
         }
@@ -1412,7 +1416,7 @@ public class ParmManager implements IParmManager, IMessageClient {
     // returns the pointer.
     // ---------------------------------------------------------------------------
     private Parm createDbParmInternal(final ParmID pid, boolean mutableParm,
-            boolean displayable) throws GFEServerException {
+            boolean displayable) {
 
         if (getParm(pid) != null) {
             return null;
@@ -1422,10 +1426,28 @@ public class ParmManager implements IParmManager, IMessageClient {
             return null;
         }
 
-        GridParmInfo gpi = dataManager.getClient().getGridParmInfo(pid);
+        ServerResponse<GridParmInfo> sr1 = dataManager.getClient()
+                .getGridParmInfo(pid);
+        if (!sr1.isOkay()) {
+            statusHandler.error(String.format(
+                    "Couldn't get GridParmInfo for parm %s: %s", pid,
+                    sr1.message()));
+            return null;
+        }
+        GridParmInfo gpi = sr1.getPayload();
 
-        return new DbParm(pid, gpi, mutableParm, displayable, this.dataManager);
+        ServerResponse<List<LockTable>> sr2 = dataManager.getClient()
+                .getLockTable(new LockTableRequest(pid));
+        List<LockTable> lt = sr2.getPayload();
+        if ((!sr2.isOkay()) || (lt.size() != 1)) {
+            statusHandler.error(String.format(
+                    "Couldn't get lockTable for parm %s: %s", pid,
+                    sr2.message()));
+            return null;
+        }
 
+        return new DbParm(pid, gpi, mutableParm, displayable, dataManager,
+                lt.get(0));
     }
 
     private Parm createVirtualCalculatedParm(final VCModule module,
@@ -2892,16 +2914,16 @@ public class ParmManager implements IParmManager, IMessageClient {
      * @return A filtered list of available databases.
      */
     private List<DatabaseID> getDatabaseInventory() {
-        List<DatabaseID> dbIds = null;
-
-        try {
-            dbIds = dataManager.getClient().getAvailableDbs();
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-            return new ArrayList<DatabaseID>(0);
+        ServerResponse<List<DatabaseID>> sr = dataManager.getClient()
+                .getDbInventory();
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format("GetDbInventory fail: %s",
+                    sr.message()));
+            return Collections.emptyList();
         }
 
-        return filterDbIds(dbIds);
+        List<DatabaseID> dbs = sr.getPayload();
+        return filterDbIds(dbs);
     }
 
     /**
@@ -3109,15 +3131,9 @@ public class ParmManager implements IParmManager, IMessageClient {
                     FileUtil.join("gfe", "vcmodule"), new String[] { "py" },
                     false, true);
             for (LocalizationFile lf : files) {
-                try {
-                    String modName = lf.getFile(false).getName()
-                            .split("\\.(?=[^\\.]+$)")[0];
-                    modMap.put(modName, lf);
-                } catch (LocalizationException e) {
-                    statusHandler.error(
-                            "Error getting local file name for VCModule " + lf,
-                            e);
-                }
+                String modName = LocalizationUtil.extractName(lf.getPath())
+                        .replace(".py", "");
+                modMap.put(modName, lf);
             }
         }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
index bd96d063c7..fcc57ee4a2 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
@@ -24,11 +24,9 @@ import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.lang.ref.WeakReference;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -52,6 +50,7 @@ import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData.CoordinateType;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData.RefType;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
 import com.raytheon.uf.common.localization.FileUpdatedMessage.FileChangeType;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
@@ -64,9 +63,9 @@ import com.raytheon.uf.common.localization.LocalizationUtil;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
 import com.raytheon.uf.common.python.concurrent.IPythonExecutor;
 import com.raytheon.uf.common.python.concurrent.IPythonJobListener;
+import com.raytheon.uf.common.python.concurrent.PythonInterpreterFactory;
 import com.raytheon.uf.common.python.concurrent.PythonJobCoordinator;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -87,7 +86,6 @@ import com.raytheon.viz.gfe.query.QueryScript;
 import com.raytheon.viz.gfe.query.QueryScriptExecutor;
 import com.raytheon.viz.gfe.query.QueryScriptFactory;
 import com.raytheon.viz.gfe.query.QueryScriptRecurseExecutor;
-import com.raytheon.viz.gfe.ui.AccessMgr;
 import com.vividsolutions.jts.geom.Envelope;
 
 /**
@@ -114,7 +112,10 @@ import com.vividsolutions.jts.geom.Envelope;
  * Aug 13, 2015       4749  njensen     Shut down coordinator on dispose()
  * Aug 26, 2015       4807  randerso    Change refDataCache so it will release unused edit areas
  *                                      Clean up deprecations and old style logging.
- * Aug 27, 2015       4947  njensen     Fixed removeReferenceSetIDChangedListener()                                     
+ * Aug 27, 2015       4947  njensen     Fixed removeReferenceSetIDChangedListener()
+ * Nov 18, 2015       5129  dgilling    Use new IFPClient for get/save/delete 
+ *                                      of reference data.
+ * Dec 14, 2015       4816  dgilling    Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -123,13 +124,18 @@ import com.vividsolutions.jts.geom.Envelope;
  */
 public class ReferenceSetManager implements IReferenceSetManager,
         IMessageClient, ISpatialEditorTimeChangedListener {
+
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(ReferenceSetManager.class);
 
-    private static final String EDIT_AREAS_DIR = FileUtil.join("gfe",
+    private static final String QUERY_THREAD_POOL_NAME = "gfequeryscript";
+
+    private static final int NUM_QUERY_THREADS = 1;
+
+    public static final String EDIT_AREAS_DIR = FileUtil.join("gfe",
             "editAreas");
 
-    private static final String EDIT_AREA_GROUPS_DIR = FileUtil.join("gfe",
+    public static final String EDIT_AREA_GROUPS_DIR = FileUtil.join("gfe",
             "editAreaGroups");
 
     /**
@@ -235,21 +241,20 @@ public class ReferenceSetManager implements IReferenceSetManager,
      */
     private void getInventory() {
         // load the complete list of edit areas
-        List<ReferenceID> refIDs = new ArrayList<ReferenceID>();
-        IPathManager pm = PathManagerFactory.getPathManager();
-        LocalizationFile[] contents = pm.listStaticFiles(
-                LocalizationType.COMMON_STATIC, EDIT_AREAS_DIR,
-                new String[] { ".xml" }, false, true);
-        if (contents != null) {
-            for (LocalizationFile lf : contents) {
-                String s = LocalizationUtil.extractName(lf.getName());
-                String area = s.replace(".xml", "");
-                refIDs.add(new ReferenceID(area, false, lf.getContext()
-                        .getLocalizationLevel()));
-            }
+        List<ReferenceID> refIDs;
+        ServerResponse<List<ReferenceID>> sr = dataManager.getClient()
+                .getReferenceInventory();
+        if (sr.isOkay()) {
+            refIDs = sr.getPayload();
+        } else {
+            refIDs = Collections.emptyList();
+            statusHandler.error(String.format(
+                    "Unable to update inventory from IFPServer: %s",
+                    sr.message()));
         }
 
         // load the edit area group lists
+        IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationFile[] groupFiles = pm.listStaticFiles(
                 LocalizationType.COMMON_STATIC, EDIT_AREA_GROUPS_DIR,
                 new String[] { ".txt" }, false, true);
@@ -280,8 +285,8 @@ public class ReferenceSetManager implements IReferenceSetManager,
      * @param lf
      */
     private void loadGroup(LocalizationFile lf) {
-        String groupName = Paths.get(lf.getName()).getFileName().toString()
-                .replace(".txt", "");
+        String groupName = LocalizationUtil.extractName(lf.getPath()).replace(
+                ".txt", "");
         GroupID group = new GroupID(groupName, lf.isProtected(), lf
                 .getContext().getLocalizationLevel());
         if (group.equals("Misc")) {
@@ -542,9 +547,10 @@ public class ReferenceSetManager implements IReferenceSetManager,
     @SuppressWarnings("unchecked")
     public ReferenceSetManager(DataManager dataManager) {
         // ready the PythonJobCoordinator
-        AbstractPythonScriptFactory<QueryScript> factory = new QueryScriptFactory(
+        PythonInterpreterFactory<QueryScript> factory = new QueryScriptFactory(
                 dataManager);
-        coordinator = PythonJobCoordinator.newInstance(factory);
+        coordinator = new PythonJobCoordinator<>(NUM_QUERY_THREADS,
+                QUERY_THREAD_POOL_NAME, factory);
 
         // MessageClient("ReferenceSetMgr", msgHandler);
         this.dataManager = dataManager;
@@ -747,31 +753,18 @@ public class ReferenceSetManager implements IReferenceSetManager,
             }
         }
 
-        String filePath = FileUtil.join(EDIT_AREAS_DIR, refSetID.getName()
-                + ".xml");
-        LocalizationFile lf = PathManagerFactory.getPathManager()
-                .getStaticLocalizationFile(LocalizationType.COMMON_STATIC,
-                        filePath);
-
-        if (lf != null) {
-            try (InputStream in = lf.openInputStream()) {
-                refData = (ReferenceData) ReferenceData.getJAXBManager()
-                        .unmarshalFromInputStream(in);
-            } catch (Exception e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error reading xml file " + lf.toString(), e);
-            }
+        // get it from ifpServer
+        ServerResponse<ReferenceData> sr = dataManager.getClient()
+                .getReferenceData(refSetID);
+        if (sr.isOkay()) {
+            refData = sr.getPayload();
         } else {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Unable to find reference data " + refSetID);
+            statusHandler.error(String.format(
+                    "Failure to get reference data [%s] from IFPServer: %s",
+                    refSetID.getName(), sr.message()));
         }
 
         if (refData != null) {
-            refData.setId(new ReferenceID(refSetID.getName(), false, lf
-                    .getContext().getLocalizationLevel()));
-            refData.setGloc(dataManager.getParmManager()
-                    .compositeGridLocation());
-
             // Convert to AWIPS, and then produce a grid
             if (!refData.isQuery()) {
                 refData.getGrid();
@@ -849,22 +842,12 @@ public class ReferenceSetManager implements IReferenceSetManager,
             refData.setPolygons(null, CoordinateType.LATLON);
         }
 
-        IPathManager pm = PathManagerFactory.getPathManager();
-
-        LocalizationContext ctx = pm.getContext(LocalizationType.COMMON_STATIC,
-                LocalizationLevel.USER);
-        LocalizationFile lf = pm.getLocalizationFile(
-                ctx,
-                FileUtil.join(EDIT_AREAS_DIR, refData.getId().getName()
-                        + ".xml"));
-
-        // save locally and then to server
-        try (SaveableOutputStream out = lf.openOutputStream()) {
-            ReferenceData.getJAXBManager().marshalToStream(refData, out);
-            out.save();
-        } catch (Exception e) {
-            statusHandler.error("Error saving reference set "
-                    + refData.getId().getName() + " to " + lf.toString(), e);
+        ServerResponse<?> sr = dataManager.getClient().saveReferenceData(
+                Arrays.asList(refData));
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "UNable to save ReferenceData: %s with IFPServer: %s",
+                    refData.getId().getName(), sr.message()));
             return false;
         }
 
@@ -883,29 +866,17 @@ public class ReferenceSetManager implements IReferenceSetManager,
      * com.raytheon.edex.plugin.gfe.reference.ReferenceID)
      */
     @Override
-    public boolean deleteRefSet(final ReferenceID refID,
-            boolean withVerification) {
-        IPathManager pm = PathManagerFactory.getPathManager();
-
-        LocalizationContext ctx = pm.getContext(LocalizationType.COMMON_STATIC,
-                LocalizationLevel.USER);
-        LocalizationFile lf = pm.getLocalizationFile(ctx,
-                FileUtil.join(EDIT_AREAS_DIR, refID.getName() + ".xml"));
-
-        if ((lf != null)
-                && (!withVerification || AccessMgr.verifyDelete(lf.getName(),
-                        LocalizationType.COMMON_STATIC, false))) {
-            try {
-                lf.delete();
-                return true;
-            } catch (LocalizationException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Unable to delete edit area " + refID.getName()
-                                + " from server.", e);
-            }
+    public boolean deleteRefSet(final ReferenceID refID) {
+        ServerResponse<?> sr = dataManager.getClient().deleteReferenceData(
+                Arrays.asList(refID));
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Unable to delete ReferenceData: %s with IFPServer: %s",
+                    refID.getName(), sr.message()));
+            return false;
         }
 
-        return false;
+        return true;
     }
 
     /*
@@ -1682,7 +1653,7 @@ public class ReferenceSetManager implements IReferenceSetManager,
         IPythonExecutor<QueryScript, ReferenceData> executor = new QueryScriptExecutor(
                 "evaluate", argMap);
         try {
-            coordinator.submitAsyncJob(executor, listener);
+            coordinator.submitJobWithCallback(executor, listener);
         } catch (Exception e) {
             statusHandler.handle(Priority.ERROR,
                     "Unable to submit job to ExecutorService", e);
@@ -1705,7 +1676,7 @@ public class ReferenceSetManager implements IReferenceSetManager,
         IPythonExecutor<QueryScript, ReferenceData> executor = new QueryScriptExecutor(
                 "evaluate", argMap);
         try {
-            ea = coordinator.submitSyncJob(executor);
+            ea = coordinator.submitJob(executor).get();
         } catch (Exception e) {
             statusHandler.handle(Priority.ERROR, "Failed to evaluate query: "
                     + query, e);
@@ -1723,7 +1694,7 @@ public class ReferenceSetManager implements IReferenceSetManager,
                 argMap);
         int result = 0;
         try {
-            result = coordinator.submitSyncJob(executor);
+            result = coordinator.submitJob(executor).get();
         } catch (Exception e) {
             statusHandler.handle(Priority.ERROR,
                     "Unable to submit job to ExecutorService", e);
@@ -1823,4 +1794,9 @@ public class ReferenceSetManager implements IReferenceSetManager,
         };
         evaluateActiveRefSet(listener);
     }
+
+    @Override
+    public PythonJobCoordinator<QueryScript> getPythonThreadPool() {
+        return coordinator;
+    }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/SampleSetManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/SampleSetManager.java
index 7a9af4c856..a058e700ee 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/SampleSetManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/SampleSetManager.java
@@ -19,7 +19,8 @@
  **/
 package com.raytheon.viz.gfe.core.internal;
 
-import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -36,28 +37,27 @@ import org.geotools.referencing.GeodeticCalculator;
 
 import com.raytheon.uf.common.dataplugin.gfe.sample.SampleData;
 import com.raytheon.uf.common.dataplugin.gfe.sample.SampleId;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.LocalizationUtil;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.GFEException;
 import com.raytheon.viz.gfe.core.ISampleSetManager;
 import com.raytheon.viz.gfe.core.msgs.ISampleSetChangedListener;
 import com.raytheon.viz.gfe.edittool.GridID;
-import com.raytheon.viz.gfe.ui.AccessMgr;
 import com.vividsolutions.jts.geom.Coordinate;
 
 /**
@@ -65,9 +65,9 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 
  * <pre>
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Apr 14, 2008	879			rbell	    Initial creation
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * Apr 14, 2008 879         rbell       Initial creation
  * 11Jun2008    #1193       ebabin      Updates for toggling lat/lon for sample set.
  * Apr 9, 2009  1288        rjpeter     Added ISampleSetChangedListener handling.
  * Aug 6, 2013  1561        njensen     Use pm.listFiles() instead of pm.listStaticFiles()
@@ -75,6 +75,10 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Sep 08, 2104 #3592       randerso    Changed to use new pm listStaticFiles().
  *                                      Reworked inventory to use a map to better handle
  *                                      files at multiple localization levels
+ * Nov 12, 2015 4834        njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Nov 19, 2015 5129        dgilling    Support new IFPClient.
+ * Feb 10, 2016 5242        dgilling    Remove calls to deprecated Localization APIs.
+ * 
  * </pre>
  * 
  * @author rbell
@@ -86,11 +90,13 @@ public class SampleSetManager implements ISampleSetManager,
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(SampleSetManager.class);
 
-    private static final String SAMPLE_SETS_DIR = FileUtil.join("gfe",
-            "sampleSets");
+    public static final String SAMPLE_SETS_DIR = "gfe" + IPathManager.SEPARATOR
+            + "sampleSets";
 
     private static final String MARKER_NAME = "ISC_Marker_Set";
 
+    private final IFPClient ifpClient;
+
     private SampleId loadedSet;
 
     private SortedMap<String, SampleId> inventory;
@@ -112,34 +118,33 @@ public class SampleSetManager implements ISampleSetManager,
      * 
      * Gets the initial sample inventory.
      */
-    public SampleSetManager() {
+    public SampleSetManager(IFPClient ifpClient) {
         this.loadedSet = new SampleId();
 
-        this.inventory = new TreeMap<String, SampleId>();
-
         this.locations = new ArrayList<Coordinate>();
 
         this.markerLocations = new HashMap<String, List<Coordinate>>();
 
         this.sampleSetChangedListeners = new HashSet<ISampleSetChangedListener>();
 
-        this.pathManager = PathManagerFactory.getPathManager();
+        this.ifpClient = ifpClient;
 
-        this.sampleSetDir = pathManager.getLocalizationFile(pathManager
-                .getContext(LocalizationType.COMMON_STATIC,
-                        LocalizationLevel.BASE), SAMPLE_SETS_DIR);
-
-        // initialize the inventory
-        LocalizationFile[] files = pathManager.listStaticFiles(
-                LocalizationType.COMMON_STATIC, SAMPLE_SETS_DIR,
-                new String[] { ".xml" }, true, true);
-
-        for (LocalizationFile lf : files) {
-            String name = LocalizationUtil.extractName(lf.getName()).replace(
-                    ".xml", "");
-            this.inventory.put(name, new SampleId(name, false, lf.getContext()
-                    .getLocalizationLevel()));
+        this.inventory = new TreeMap<String, SampleId>();
+        ServerResponse<List<SampleId>> sr = this.ifpClient.getSampleInventory();
+        if (sr.isOkay()) {
+            for (SampleId id : sr.getPayload()) {
+                this.inventory.put(id.getName(), id);
+            }
+        } else {
+            statusHandler.error(String.format(
+                    "Unable to get sample inventory from IFPServer: %s",
+                    sr.message()));
         }
+
+        this.pathManager = PathManagerFactory.getPathManager();
+        this.sampleSetDir = this.pathManager.getLocalizationFile(
+                this.pathManager.getContext(LocalizationType.COMMON_STATIC,
+                        LocalizationLevel.BASE), SAMPLE_SETS_DIR);
         this.sampleSetDir.addFileUpdatedObserver(this);
 
         // load default sample points
@@ -157,23 +162,11 @@ public class SampleSetManager implements ISampleSetManager,
         getMarkerPoints();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.ISampleSetManager#dispose()
-     */
     @Override
     public void dispose() {
         this.sampleSetDir.removeFileUpdatedObserver(this);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#sampleSetLocations(java.lang
-     * .String)
-     */
     @Override
     public List<Coordinate> sampleSetLocations(final String setName) {
         // verify set in inventory
@@ -189,55 +182,34 @@ public class SampleSetManager implements ISampleSetManager,
         String fileName = FileUtil.join(SAMPLE_SETS_DIR, sampleId.getName()
                 + ".xml");
 
-        LocalizationFile lf = this.pathManager.getLocalizationFile(
-                this.pathManager.getContext(LocalizationType.COMMON_STATIC,
+        ILocalizationFile lf = pathManager.getLocalizationFile(
+                pathManager.getContext(LocalizationType.COMMON_STATIC,
                         sampleId.getAccess()), fileName);
 
-        File file = null;
-        try {
-            file = lf.getFile(true);
-        } catch (LocalizationException e) {
-            if (file == null) {
-                statusHandler.error("An error occurred retrieving SampleSet: "
-                        + fileName, e);
-                return Collections.emptyList();
-            }
+        List<Coordinate> points = Collections.emptyList();
+        try (InputStream inStream = lf.openInputStream()) {
+            SampleData sampleData = SampleData.getJAXBManager()
+                    .unmarshalFromInputStream(inStream);
+            points = sampleData.getPoints();
+        } catch (IOException | LocalizationException | SerializationException e) {
+            statusHandler.error("Unable to load sampledata: " + lf, e);
         }
 
-        SampleData sampleData = null;
-        try {
-            sampleData = SampleData.getJAXBManager().unmarshalFromXmlFile(
-                    file.getAbsolutePath());
-        } catch (Exception e) {
-            statusHandler.error("Unable to load sampledata: " + file, e);
-            return Collections.emptyList();
-        }
-
-        return sampleData.getPoints();
+        return points;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#loadSampleSet(com.raytheon
-     * .edex.plugin.gfe.sample.SampleId,
-     * com.raytheon.viz.gfe.core.internal.SampleSetManager.SampleSetLoadMode)
-     */
     @Override
     public void loadSampleSet(final SampleId sampleId,
             SampleSetLoadMode loadMode) {
-        File f = this.pathManager.getStaticFile(FileUtil.join(SAMPLE_SETS_DIR,
-                sampleId.getName() + ".xml"));
-
-        SampleData sampleData = null;
-        try {
-            sampleData = SampleData.getJAXBManager().unmarshalFromXmlFile(
-                    f.getPath());
-            sampleData.setSampleId(sampleId);
-        } catch (Exception e) {
-            statusHandler.error("Unable to load sampledata: " + f);
+        ServerResponse<SampleData> sr = ifpClient.getSampleData(sampleId);
+        if (!sr.isOkay()) {
+            statusHandler
+                    .error(String
+                            .format("Failure to get sample data from from IFPServer for [%s]: %s",
+                                    sampleId.getName(), sr.message()));
+            return;
         }
+        SampleData sampleData = sr.getPayload();
 
         // set the loadedSet flag appropriately
         if ((loadMode == SampleSetLoadMode.REPLACE)
@@ -256,11 +228,6 @@ public class SampleSetManager implements ISampleSetManager,
         return;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.ISampleSetManager#clearSamples()
-     */
     @Override
     public void clearSamples() {
         mergeSamples(new ArrayList<Coordinate>(), SampleSetLoadMode.REPLACE);
@@ -269,12 +236,6 @@ public class SampleSetManager implements ISampleSetManager,
         return;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @seecom.raytheon.viz.gfe.core.ISampleSetManager#addAnchoredSample(com.
-     * vividsolutions.jts.geom.Coordinate)
-     */
     @Override
     public void addAnchoredSample(final Coordinate sampleLocation) {
         mergeSamples(Arrays.asList(sampleLocation), SampleSetLoadMode.ADD);
@@ -283,26 +244,12 @@ public class SampleSetManager implements ISampleSetManager,
         return;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#removeAnchoredSample(com.
-     * vividsolutions.jts.geom.Coordinate)
-     */
     @Override
     public void removeAnchoredSample(final Coordinate sampleLocation) {
         removeAnchoredSample(sampleLocation,
                 ISampleSetManager.DEFAULT_THRESHOLD);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#removeAnchoredSample(com.
-     * vividsolutions.jts.geom.Coordinate, float)
-     */
     @Override
     public void removeAnchoredSample(final Coordinate sampleLocation,
             float threshold) {
@@ -313,12 +260,6 @@ public class SampleSetManager implements ISampleSetManager,
         return;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @seecom.raytheon.viz.gfe.core.ISampleSetManager#addAnchoredMarker(com.
-     * vividsolutions.jts.geom.Coordinate)
-     */
     @Override
     public void addAnchoredMarker(final Coordinate location, final GridID gid) {
         String set = activeMarkerSet(gid);
@@ -331,25 +272,11 @@ public class SampleSetManager implements ISampleSetManager,
         saveSampleSet(locations, new SampleId(set));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#removeAnchoredMarker(com.
-     * vividsolutions.jts.geom.Coordinate)
-     */
     @Override
     public void removeAnchoredMarker(final Coordinate location, final GridID gid) {
         removeAnchoredMarker(location, gid, ISampleSetManager.DEFAULT_THRESHOLD);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#removeAnchoredMarker(com.
-     * vividsolutions.jts.geom.Coordinate, float)
-     */
     @Override
     public void removeAnchoredMarker(final Coordinate location,
             final GridID gid, float threshold) {
@@ -375,13 +302,6 @@ public class SampleSetManager implements ISampleSetManager,
         fireSampleSetChangedListeners();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#anchoredMarkerAtLocation(
-     * com.vividsolutions.jts.geom.Coordinate, float)
-     */
     @Override
     public boolean anchoredMarkerAtLocation(final Coordinate location,
             final GridID gid, float threshold) {
@@ -403,90 +323,42 @@ public class SampleSetManager implements ISampleSetManager,
         return false;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#saveSampleSet(com.vividsolutions
-     * .jts.geom.Coordinate[], com.raytheon.edex.plugin.gfe.sample.SampleId)
-     */
     @Override
     public boolean saveSampleSet(final List<Coordinate> sampleLocations,
             final SampleId sampleId) {
-
         SampleData sd = new SampleData(sampleId, sampleLocations);
 
-        LocalizationContext lc = this.pathManager.getContext(
-                LocalizationType.COMMON_STATIC, LocalizationLevel.USER);
-
-        LocalizationFile file = this.pathManager.getLocalizationFile(lc,
-                FileUtil.join(SAMPLE_SETS_DIR, sampleId.getName() + ".xml"));
-
-        try {
-            SampleData.getJAXBManager().marshalToXmlFile(sd,
-                    file.getFile().getPath());
-            file.save();
-        } catch (LocalizationOpFailedException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error saving to localization server", e);
-        } catch (SerializationException e) {
-            statusHandler.handle(Priority.PROBLEM, "Error serializing to file",
-                    e);
+        ServerResponse<?> sr = ifpClient.saveSampleData(Arrays.asList(sd));
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Failure to save sample data to IFPServer for [%s]: %s",
+                    sampleId.getName(), sr.message()));
         }
 
         return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#saveActiveSampleSet(com.raytheon
-     * .edex.plugin.gfe.sample.SampleId)
-     */
     @Override
     public boolean saveActiveSampleSet(final SampleId sampleId) {
         this.loadedSet = sampleId;
         return saveSampleSet(this.locations, sampleId);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.ISampleSetManager#deleteSampleSet(com.raytheon
-     * .edex.plugin.gfe.sample.SampleId)
-     */
     @Override
     public boolean deleteSampleSet(final SampleId sampleId) {
-
-        LocalizationContext ctx = this.pathManager.getContext(
-                LocalizationType.COMMON_STATIC, LocalizationLevel.USER);
-        LocalizationFile lf = this.pathManager.getLocalizationFile(ctx,
-                FileUtil.join(SAMPLE_SETS_DIR, sampleId.getName() + ".xml"));
-
-        if ((lf != null)
-                && (AccessMgr.verifyDelete(lf.getName(),
-                        LocalizationType.COMMON_STATIC, false))) {
-            try {
-                lf.delete();
-                return true;
-            } catch (LocalizationException e) {
-                statusHandler.handle(Priority.PROBLEM, "Unable to sample set "
-                        + sampleId.getName() + " from server.", e);
-            }
+        ServerResponse<?> sr = ifpClient.deleteSampleData(Arrays
+                .asList(sampleId));
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Failure to delete sample set [%s]: %s",
+                    sampleId.getName(), sr.message()));
+        } else if (sampleId.getName().equals(loadedSet.getName())) {
+            loadedSet = new SampleId();
         }
 
-        return false;
+        return true;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.localization.ILocalizationFileObserver#fileUpdated
-     * (com.raytheon.uf.common.localization.FileUpdatedMessage)
-     */
     @Override
     public void fileUpdated(FileUpdatedMessage message) {
 
@@ -543,12 +415,6 @@ public class SampleSetManager implements ISampleSetManager,
         fireSampleSetChangedListeners();
     }
 
-    /**
-     * mergeSamples(...) with default threshold
-     * 
-     * @param mergeSet
-     * @param mergeMode
-     */
     private void mergeSamples(final List<Coordinate> mergeSet,
             SampleSetLoadMode mergeMode) {
         mergeSamples(mergeSet, mergeMode, ISampleSetManager.DEFAULT_THRESHOLD);
@@ -620,32 +486,17 @@ public class SampleSetManager implements ISampleSetManager,
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.ISampleSetManager#getLoadedSet()
-     */
     @Override
     public SampleId getLoadedSet() {
         return this.loadedSet;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.ISampleSetManager#getInventory()
-     */
     @Override
     public SampleId[] getInventory() {
         return this.inventory.values().toArray(
                 new SampleId[this.inventory.size()]);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.ISampleSetManager#getInventoryAsStrings()
-     */
     @Override
     public String[] getInventoryAsStrings() {
         String[] retVal = new String[this.inventory.size()];
@@ -668,41 +519,21 @@ public class SampleSetManager implements ISampleSetManager,
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.ISampleSetManager#getLocations()
-     */
     @Override
     public List<Coordinate> getLocations() {
         return new ArrayList<Coordinate>(this.locations);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.ISampleSetManager#getMarkerLocations()
-     */
     @Override
     public Map<String, List<Coordinate>> getMarkerLocations() {
         return this.markerLocations;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.ISampleSetManager#isShowLatLon()
-     */
     @Override
     public boolean isShowLatLon() {
         return showLatLon;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.ISampleSetManager#setShowLatLon(boolean)
-     */
     @Override
     public void setShowLatLon(boolean showLatLon) {
         this.showLatLon = showLatLon;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/SelectTimeRangeManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/SelectTimeRangeManager.java
index 5e0a862885..95c2e4d233 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/SelectTimeRangeManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/SelectTimeRangeManager.java
@@ -22,7 +22,6 @@ package com.raytheon.viz.gfe.core.internal;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
@@ -35,18 +34,19 @@ import java.util.TreeMap;
 import com.raytheon.uf.common.dataplugin.gfe.time.SelectTimeRange;
 import com.raytheon.uf.common.dataplugin.gfe.time.SelectTimeRange.Mode;
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.util.FileUtil;
-import com.raytheon.viz.gfe.GFEServerException;
-import com.raytheon.viz.gfe.core.DataManager;
 import com.raytheon.viz.gfe.core.ISelectTimeRangeManager;
 import com.raytheon.viz.gfe.core.msgs.SelectTimeRangesChangedMsg;
 
@@ -59,10 +59,12 @@ import com.raytheon.viz.gfe.core.msgs.SelectTimeRangesChangedMsg;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Dec 3, 2009       #3135 randerso    Initial creation
- * Aug 1, 2012       #965  dgilling    Change location of SelectTimeRange.
- * Aug 6, 2013       #1561 njensen     Use pm.listFiles() instead of pm.listStaticFiles()
- * Sep 8, 2104       #3592 randerso    Changed to use new pm listStaticFiles()
+ * Dec 03, 2009      #3135 randerso    Initial creation
+ * Aug 01, 2012      #965  dgilling    Change location of SelectTimeRange.
+ * Aug 06, 2013      #1561 njensen     Use pm.listFiles() instead of pm.listStaticFiles()
+ * Sep 08, 2014      #3592 randerso    Changed to use new pm listStaticFiles()
+ * Nov 18, 2015      #5129 dgilling    Support new IFPClient.
+ * Feb 05, 2016      #5242 dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -89,16 +91,9 @@ public class SelectTimeRangeManager implements ISelectTimeRangeManager,
 
     private LocalizationFile selectTRDir;
 
-    public SelectTimeRangeManager(DataManager dataManager) {
+    public SelectTimeRangeManager(TimeZone timeZone) {
         // Find the referenced time zone
-        timeZone = TimeZone.getTimeZone("GMT");
-        try {
-            timeZone = TimeZone.getTimeZone(dataManager.getClient()
-                    .getDBGridLocation().getTimeZone());
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Unable to retrieve GFE time zone, using GMT", e);
-        }
+        this.timeZone = timeZone;
 
         this.pathManager = PathManagerFactory.getPathManager();
         selectTRDir = pathManager.getLocalizationFile(pathManager.getContext(
@@ -123,12 +118,11 @@ public class SelectTimeRangeManager implements ISelectTimeRangeManager,
         return inventory;
     }
 
-    private SelectTimeRange loadTimeRange(LocalizationFile lf) {
-        String rangeName = rangeNameFromFileName(lf.getName());
+    private SelectTimeRange loadTimeRange(ILocalizationFile lf) {
+        String rangeName = rangeNameFromFileName(lf.getPath());
 
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new InputStreamReader(lf.openInputStream()));
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(
+                lf.openInputStream()))) {
             String[] s = in.readLine().split("\\s+");
             int start = Integer.parseInt(s[0]);
             int end = Integer.parseInt(s[1]);
@@ -143,19 +137,9 @@ public class SelectTimeRangeManager implements ISelectTimeRangeManager,
             return range;
         } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM,
-                    "Error reading SELECTTR file "
-                            + lf.getFile().getAbsolutePath(), e);
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    statusHandler.handle(Priority.PROBLEM,
-                            "Error closing file "
-                                    + lf.getFile().getAbsolutePath(), e);
-                }
-            }
+                    "Error reading SELECTTR file " + lf.toString(), e);
         }
+
         return null;
     }
 
@@ -166,47 +150,34 @@ public class SelectTimeRangeManager implements ISelectTimeRangeManager,
 
     @Override
     public void save(String name, int start, int end, Mode mode) {
-        LocalizationFile lf = pathManager.getLocalizationFile(pathManager
+        ILocalizationFile lf = pathManager.getLocalizationFile(pathManager
                 .getContext(LocalizationType.COMMON_STATIC,
                         LocalizationLevel.USER), FileUtil.join(FILE_PATH,
                 FileUtil.mangle(name) + FILE_EXT));
 
-        BufferedWriter out = null;
-        try {
-            out = new BufferedWriter(new OutputStreamWriter(
-                    lf.openOutputStream()));
+        try (SaveableOutputStream lfStream = lf.openOutputStream();
+                BufferedWriter out = new BufferedWriter(new OutputStreamWriter(
+                        lfStream))) {
             out.write(String.format("%d %d %d", start, end, mode.ordinal()));
             out.close();
-            out = null;
-            lf.save();
+            lfStream.save();
         } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM,
-                    "Error writing SELECTTR file "
-                            + lf.getFile().getAbsolutePath(), e);
-        } finally {
-            try {
-                if (out != null) {
-                    out.close();
-                }
-            } catch (IOException e) {
-                statusHandler.handle(Priority.PROBLEM, "Error closing file "
-                        + lf.getFile().getAbsolutePath(), e);
-            }
+                    "Error writing SELECTTR file " + lf.toString(), e);
         }
     }
 
     @Override
     public void remove(String name) {
-        LocalizationFile lf = pathManager.getLocalizationFile(pathManager
+        ILocalizationFile lf = pathManager.getLocalizationFile(pathManager
                 .getContext(LocalizationType.COMMON_STATIC,
                         LocalizationLevel.USER), FileUtil.join(FILE_PATH,
                 FileUtil.mangle(name) + FILE_EXT));
         try {
             lf.delete();
-        } catch (Exception e) {
+        } catch (LocalizationException e) {
             statusHandler.handle(Priority.PROBLEM,
-                    "Error deleting SELECTTR file "
-                            + lf.getFile().getAbsolutePath(), e);
+                    "Error deleting SELECTTR file " + lf.toString(), e);
         }
     }
 
@@ -287,4 +258,9 @@ public class SelectTimeRangeManager implements ISelectTimeRangeManager,
                 ""));
         return rangeName;
     }
+
+    @Override
+    public TimeZone getTimeZone() {
+        return timeZone;
+    }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/WEGroupManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/WEGroupManager.java
index 97ad8cd333..d63e943045 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/WEGroupManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/WEGroupManager.java
@@ -19,7 +19,8 @@
  **/
 package com.raytheon.viz.gfe.core.internal;
 
-import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -36,15 +37,17 @@ import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
 import com.raytheon.uf.common.dataplugin.gfe.weatherelement.WEGroup;
 import com.raytheon.uf.common.localization.FileUpdatedMessage;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.ILocalizationFileObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.LocalizationUtil;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -66,7 +69,9 @@ import com.raytheon.viz.gfe.core.IWEGroupManager;
  * ------------ ----------  ----------- --------------------------
  * Jun 05, 2008             chammack    Initial creation
  * Sep 30, 2013  2361       njensen     Use JAXBManager for XML
- * Aug 13, 2015  4749       njensen     Implemented dispose()     
+ * Aug 13, 2015  4749       njensen     Implemented dispose()
+ * Nov 12, 2015  4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 05, 2016  5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -145,32 +150,25 @@ public class WEGroupManager implements IWEGroupManager,
 
     private void loadGroups() {
         IPathManager pathManager = PathManagerFactory.getPathManager();
-
         LocalizationContext[] contexts = pathManager
                 .getLocalSearchHierarchy(LocalizationType.CAVE_STATIC);
-        LocalizationFile[] files = pathManager.listFiles(contexts, WEGROUP_DIR,
-                new String[] { ".xml" }, false, true);
+        ILocalizationFile[] files = pathManager.listFiles(contexts,
+                WEGROUP_DIR, new String[] { ".xml" }, false, true);
 
-        this.inventory = new LinkedHashMap<LocalizationLevel, Set<String>>();
-        for (LocalizationFile lf : files) {
-            try {
-                File file = lf.getFile(false);
-                String fn = file.getName();
-                LocalizationLevel levelType = lf.getContext()
-                        .getLocalizationLevel();
+        inventory = new LinkedHashMap<LocalizationLevel, Set<String>>();
+        for (ILocalizationFile lf : files) {
+            String fn = LocalizationUtil.extractName(lf.getPath());
+            LocalizationLevel levelType = lf.getContext()
+                    .getLocalizationLevel();
 
-                Set<String> inventoryList = this.inventory.get(levelType);
-                if (inventoryList == null) {
-                    inventoryList = new HashSet<String>();
-                    this.inventory.put(levelType, inventoryList);
-                }
-                String s = construct(fn);
-                if (s != null) {
-                    inventoryList.add(s);
-                }
-            } catch (LocalizationException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error retrieving WE Group inventory", e);
+            Set<String> inventoryList = inventory.get(levelType);
+            if (inventoryList == null) {
+                inventoryList = new HashSet<String>();
+                inventory.put(levelType, inventoryList);
+            }
+            String s = construct(fn);
+            if (s != null) {
+                inventoryList.add(s);
             }
         }
     }
@@ -195,41 +193,20 @@ public class WEGroupManager implements IWEGroupManager,
         return displayName + SUFFIX;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.IWEGroupManager#save(java.lang.String,
-     * com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID[],
-     * com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID[])
-     */
     @Override
     public void save(String name, ParmID[] parmIDs, ParmID[] availableParmIDs) {
         WEGroup group = new WEGroup(name, parmIDs, availableParmIDs);
         this.save(name, group);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.internal.IWEGroupManager#remove(java.lang.String
-     * )
-     */
     @Override
     public boolean remove(String name) {
         return this.delete(name);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.internal.IWEGroupManager#getParmIDs(java.lang
-     * .String, com.raytheon.edex.plugin.gfe.db.objects.ParmID[])
-     */
     @Override
     public ParmID[] getParmIDs(String name, ParmID[] availableParmIDs) {
-        LocalizationFile file = this.getLocalizationFile(name);
+        ILocalizationFile file = getLocalizationFile(name);
         if (file == null || !file.exists()) {
             statusHandler.handle(Priority.PROBLEM,
                     "Error loading weather element group \"" + name
@@ -238,25 +215,17 @@ public class WEGroupManager implements IWEGroupManager,
         }
 
         WEGroup weGroup = null;
-        try {
-            weGroup = jaxb.unmarshalFromXmlFile(file.getFile().getPath());
+        try (InputStream inStream = file.openInputStream()) {
+            weGroup = jaxb.unmarshalFromInputStream(inStream);
         } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM,
                     "Error getting weather element group", e);
+            return new ParmID[0];
         }
 
         return getParmIDs(weGroup, availableParmIDs);
-
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.internal.IWEGroupManager#getParmIDs(com.raytheon
-     * .edex.plugin.gfe.weatherElement.WEGroup,
-     * com.raytheon.edex.plugin.gfe.db.objects.ParmID[])
-     */
     @Override
     public ParmID[] getParmIDs(final WEGroup bundle,
             final ParmID[] availableParmIDs) {
@@ -288,13 +257,6 @@ public class WEGroupManager implements IWEGroupManager,
         return parmIDs.toArray(new ParmID[parmIDs.size()]);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.internal.AbstractFileBasedManager#getInventory
-     * ()
-     */
     @Override
     public List<String> getInventory() {
         List<String> completeList = new ArrayList<String>();
@@ -317,11 +279,6 @@ public class WEGroupManager implements IWEGroupManager,
         return Collections.unmodifiableList(completeList);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.IWEGroupManager#getDefaultGroup()
-     */
     @Override
     public String getDefaultGroup() {
         String defaultGroup = Activator.getDefault().getPreferenceStore()
@@ -332,12 +289,6 @@ public class WEGroupManager implements IWEGroupManager,
         return defaultGroup;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.IWEGroupManager#isProtected(java.lang.String )
-     */
     @Override
     public boolean isProtected(String name) {
         LocalizationFile file = getLocalizationFile(name);
@@ -365,7 +316,7 @@ public class WEGroupManager implements IWEGroupManager,
             file.delete();
             inventory.get(context.getLocalizationLevel()).remove(object);
             return true;
-        } catch (LocalizationOpFailedException e) {
+        } catch (LocalizationException e) {
             statusHandler.handle(Priority.PROBLEM,
                     "Error deleting from localization server", e);
         }
@@ -375,18 +326,19 @@ public class WEGroupManager implements IWEGroupManager,
     }
 
     private void save(String key, WEGroup objectToSave) {
-
         IPathManager pm = PathManagerFactory.getPathManager();
-
         LocalizationContext lc = pm.getContext(LocalizationType.CAVE_STATIC,
                 LocalizationLevel.USER);
-
-        LocalizationFile file = pm.getLocalizationFile(lc,
+        ILocalizationFile file = pm.getLocalizationFile(lc,
                 FileUtil.join(WEGROUP_DIR, getName(key)));
-        try {
-            jaxb.marshalToXmlFile(objectToSave, file.getFile().getPath());
-            file.save();
-        } catch (LocalizationOpFailedException e) {
+        try (SaveableOutputStream out = file.openOutputStream()) {
+            jaxb.marshalToStream(objectToSave, out);
+            out.save();
+        } catch (IOException e) {
+            String msg = String.format("Error writing to WEGroup file %s: %s",
+                    file, e.getLocalizedMessage());
+            statusHandler.error(msg);
+        } catch (LocalizationException e) {
             statusHandler.handle(Priority.PROBLEM,
                     "Error saving to localization server", e);
         } catch (SerializationException e) {
@@ -394,10 +346,10 @@ public class WEGroupManager implements IWEGroupManager,
                     e);
         }
 
-        Set<String> list = this.inventory.get(LocalizationLevel.USER);
+        Set<String> list = inventory.get(LocalizationLevel.USER);
         if (list == null) {
             list = new HashSet<String>();
-            this.inventory.put(LocalizationLevel.USER, list);
+            inventory.put(LocalizationLevel.USER, list);
         }
         list.add(key);
     }
@@ -426,13 +378,6 @@ public class WEGroupManager implements IWEGroupManager,
         return Collections.unmodifiableList(completeList);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.localization.ILocalizationFileObserver#fileUpdated
-     * (com.raytheon.uf.common.localization.FileUpdatedMessage)
-     */
     @Override
     public void fileUpdated(FileUpdatedMessage message) {
         loadGroups();
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ABVParmID.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ABVParmID.java
index f6918039b2..2a6660451c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ABVParmID.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ABVParmID.java
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.commons.lang.mutable.MutableInt;
+import org.apache.commons.lang3.mutable.MutableInt;
 
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
index eae2dd4356..bb897c5471 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
@@ -33,9 +33,9 @@ import org.eclipse.core.runtime.Status;
 
 import com.raytheon.uf.common.dataplugin.gfe.GridDataHistory;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GFERecord;
-import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo.GridType;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo.GridType;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
 import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteKey;
 import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable;
@@ -43,6 +43,7 @@ import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable.LockMode;
 import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable.LockStatus;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerMsg;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.GetGridRequest;
 import com.raytheon.uf.common.dataplugin.gfe.server.request.LockRequest;
 import com.raytheon.uf.common.dataplugin.gfe.server.request.SaveGridRequest;
 import com.raytheon.uf.common.dataplugin.gfe.slice.DiscreteGridSlice;
@@ -61,7 +62,6 @@ import com.raytheon.uf.common.time.util.ITimer;
 import com.raytheon.uf.common.time.util.TimeUtil;
 import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.GFEOperationFailedException;
-import com.raytheon.viz.gfe.GFEServerException;
 import com.raytheon.viz.gfe.core.DataManager;
 import com.raytheon.viz.gfe.core.GfeClientConfig;
 import com.raytheon.viz.gfe.core.griddata.AbstractGridData;
@@ -85,6 +85,7 @@ import com.raytheon.viz.gfe.core.griddata.IGridData;
  * 04/23/13     #1949      rjpeter     Added logging of number of records.
  * 06/26/13     #2044      randerso    Fixed error message priority
  * 04/03/2014   #2737      randerso    Moved clientSendStatus from SaveGridRequest to SaveGFEGridRequest
+ * 11/17/2015   #5129      dgilling    Support new IFPClient.
  * </pre>
  * 
  * @author chammack
@@ -99,8 +100,9 @@ public class DbParm extends Parm {
             .getHandler("GFE:");
 
     public DbParm(ParmID parmID, GridParmInfo gridInfo, boolean mutable,
-            boolean displayable, DataManager dataMgr) throws GFEServerException {
+            boolean displayable, DataManager dataMgr, LockTable lt) {
         super(parmID, gridInfo, mutable, displayable, dataMgr);
+        this.lockTable = lt;
 
         TimeRange tr = TimeRange.allTimes();
         try {
@@ -121,12 +123,6 @@ public class DbParm extends Parm {
                                 + " during loading");
             }
         }
-
-        if ((this.dataManager != null)
-                && (this.dataManager.getClient() != null)) {
-            this.lockTable = this.dataManager.getClient().getLockTable(
-                    this.getParmID());
-        }
     }
 
     /*
@@ -156,18 +152,17 @@ public class DbParm extends Parm {
     // ---------------------------------------------------------------------------
     private IGridData[] getGridsFromDb(final TimeRange timeRange,
             boolean populate) throws GFEOperationFailedException {
-
-        List<TimeRange> invTR;
-        try {
-            invTR = this.dataManager.getClient().getGridInventory(getParmID());
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Unable to retrieve gridded data [inventory] for "
-                            + getParmID(), e);
+        ServerResponse<List<TimeRange>> sr = dataManager.getClient()
+                .getGridInventory(getParmID());
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Unable to retrieve gridded data [inventory] for %s: %s",
+                    getParmID(), sr.message()));
             return new IGridData[0]; // empty sequence
         }
 
         // now filter out those grids which are not of interest
+        List<TimeRange> invTR = sr.getPayload();
         List<TimeRange> desiredTR = new ArrayList<TimeRange>();
         for (TimeRange tr : invTR) {
             if (tr.overlaps(timeRange)) {
@@ -195,47 +190,41 @@ public class DbParm extends Parm {
     // Makes a request for the data grids, converts the data slices into
     // GridData*.
     // ---------------------------------------------------------------------------
-    @SuppressWarnings("unchecked")
     private IGridData[] getGridsFromDb(List<TimeRange> gridTimes,
             boolean populate, Map<TimeRange, List<GridDataHistory>> histories) {
         // success = true;
         List<IGridSlice> dataSlices = null;
         // want populated
         if (populate) {
-            if (gridTimes.size() == 0) {
+            if (gridTimes.isEmpty()) {
                 return new IGridData[0]; // nothing to do
             }
 
-            try {
-                dataSlices = this.dataManager.getClient().getGridData(
-                        getParmID(), gridTimes);
-            } catch (Exception e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Unable to retrieve gridded data [get data] for "
-                                + getParmID(), e);
+            GetGridRequest ggr = new GetGridRequest(getParmID(), gridTimes);
+            ServerResponse<List<IGridSlice>> sr = dataManager.getClient()
+                    .getGridData(ggr);
+            if (!sr.isOkay()) {
+                statusHandler
+                        .error(String
+                                .format("Unable to retrieve gridded data [get data] for %s: %s",
+                                        getParmID(), sr.message()));
                 // success = false;
                 return new IGridData[0]; // empty sequence
             }
 
+            dataSlices = sr.getPayload();
+
             // want empty shell
         } else {
             if (histories == null) {
-                try {
-                    ServerResponse<?> sr = this.dataManager.getClient()
-                            .getGridHistory(getParmID(), gridTimes);
-                    histories = (Map<TimeRange, List<GridDataHistory>>) sr
-                            .getPayload();
-                    if (!sr.isOkay() || (histories.size() != gridTimes.size())) {
-                        statusHandler.handle(Priority.PROBLEM,
-                                "Unable to retrieve gridded data [history] for "
-                                        + getParmID() + sr);
-                        // success = false;
-                        return new IGridData[0]; // empty sequence
-                    }
-                } catch (Exception e) {
-                    statusHandler.handle(Priority.PROBLEM,
-                            "Unable to retrieve gridded data [history] for "
-                                    + getParmID(), e);
+                ServerResponse<Map<TimeRange, List<GridDataHistory>>> sr = dataManager
+                        .getClient().getGridHistory(getParmID(), gridTimes);
+                histories = sr.getPayload();
+                if ((!sr.isOkay()) || (histories.size() != gridTimes.size())) {
+                    statusHandler
+                            .error(String
+                                    .format("Unable to retrieve gridded data [history] for %s: %s",
+                                            getParmID(), sr.message()));
                     // success = false;
                     return new IGridData[0]; // empty sequence
                 }
@@ -481,46 +470,42 @@ public class DbParm extends Parm {
 
     @Override
     protected boolean requestLock(List<LockRequest> lreq) {
-
         if (ignoreLocks()) {
             return true;
         }
 
         ITimer timer = TimeUtil.getTimer();
         timer.start();
-        ServerResponse<List<LockTable>> sr;
-        try {
-            sr = this.dataManager.getClient().requestLockChange(lreq);
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error requesting lock change", e);
-            return false;
-        }
+        ServerResponse<List<LockTable>> sr = this.dataManager.getClient()
+                .requestLockChange(lreq);
         timer.stop();
         perfLog.logDuration("Server lock change for " + this.getParmID() + " "
                 + lreq.size() + " time ranges", timer.getElapsedTime());
 
-        timer.reset();
-        timer.start();
-        List<LockTable> lockTableList = sr.getPayload();
-        for (LockTable lt : lockTableList) {
-            // it is for our parm
-            if (lt.getParmId().equals(this.getParmID())) {
-                lockTableArrived(lt); // treat as a notification
-            }
-            // it is for another parm
-            else {
-                Parm otherParm = this.dataManager.getParmManager().getParm(
-                        lt.getParmId());
-                if (otherParm != null) {
-                    otherParm.lockTableArrived(lt);
+        if (sr.isOkay()) {
+            timer.reset();
+            timer.start();
+            List<LockTable> lockTableList = sr.getPayload();
+            for (LockTable lt : lockTableList) {
+                // it is for our parm
+                if (lt.getParmId().equals(getParmID())) {
+                    lockTableArrived(lt); // treat as a notification
+                }
+                // it is for another parm
+                else {
+                    Parm otherParm = dataManager.getParmManager().getParm(
+                            lt.getParmId());
+                    if (otherParm != null) {
+                        otherParm.lockTableArrived(lt);
+                    }
                 }
             }
-        }
-        timer.stop();
-        perfLog.logDuration("Processing lock tables", timer.getElapsedTime());
-        for (ServerMsg msg : sr.getMessages()) {
-            statusHandler.error(msg.getMessage());
+            timer.stop();
+            perfLog.logDuration("Processing lock tables",
+                    timer.getElapsedTime());
+        } else {
+            statusHandler.error(String.format(
+                    "Failed to process lock request: %s", sr.message()));
         }
 
         return sr.isOkay();
@@ -699,16 +684,9 @@ public class DbParm extends Parm {
 
     private boolean doSave(List<SaveGridRequest> sgr) {
         boolean success = true;
-        ServerResponse<?> sr = null;
-        try {
-            sr = dataManager.getClient().saveGrids(sgr);
-        } catch (GFEServerException e) {
-            statusHandler
-                    .handle(Priority.PROBLEM,
-                            "Save data request not granted for " + getParmID()
-                                    + ". \n", e);
-            return false;
-        }
+
+        ServerResponse<?> sr = dataManager.getClient().saveGridData(sgr,
+                dataManager.clientISCSendStatus());
         if (!sr.isOkay()) {
             StringBuilder sb = new StringBuilder();
             sb.append("Save data request not granted for ");
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmListeners.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmListeners.java
index 340b772e17..6b17fc033c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmListeners.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmListeners.java
@@ -19,7 +19,7 @@
  **/
 package com.raytheon.viz.gfe.core.parm;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.eclipse.core.runtime.ListenerList;
 
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmOp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmOp.java
index fd1f6351d7..4dff55fdac 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmOp.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/ParmOp.java
@@ -21,6 +21,7 @@ package com.raytheon.viz.gfe.core.parm;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -46,7 +47,9 @@ import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable.LockMode;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.dataplugin.gfe.server.request.CommitGridRequest;
 import com.raytheon.uf.common.dataplugin.gfe.server.request.LockRequest;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.LockTableRequest;
 import com.raytheon.uf.common.dataplugin.gfe.server.request.SendISCRequest;
+import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
 import com.raytheon.uf.common.status.IPerformanceStatusHandler;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.PerformanceStatus;
@@ -65,7 +68,6 @@ import com.raytheon.viz.gfe.PythonPreferenceStore;
 import com.raytheon.viz.gfe.core.DataManager;
 import com.raytheon.viz.gfe.core.IParmManager;
 import com.raytheon.viz.gfe.core.griddata.IGridData;
-import com.raytheon.viz.gfe.core.internal.IFPClient;
 import com.raytheon.viz.gfe.core.parm.Parm.InterpState;
 import com.raytheon.viz.gfe.core.parm.ParmState.InterpMode;
 import com.raytheon.viz.gfe.core.wxvalue.WxValue;
@@ -93,6 +95,7 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeProhibitedOpException;
  * 08/20/2014   #1664      randerso    Fixed invalid thread access
  * 09/15/2015   #4858      dgilling    Disable publish and ISC send when DRT
  *                                     mode is enabled.
+ * 11/18/2015   #5129      dgilling    Support new IFPClient.
  * 
  * </pre>
  * 
@@ -440,9 +443,9 @@ public class ParmOp {
      */
     public boolean breakLock(final ParmID parmId, final TimeRange... times) {
         // parm exists?
-        Parm p = this.dataManager.getParmManager().getParm(parmId);
+        Parm p = dataManager.getParmManager().getParm(parmId);
         if (p != null) {
-            p.breakLock(times);
+            return p.breakLock(times);
         }
 
         // parm not in existence
@@ -451,15 +454,16 @@ public class ParmOp {
             for (TimeRange tr : times) {
                 lreq.add(new LockRequest(parmId, tr, LockMode.BREAK_LOCK));
             }
-            try {
-                this.dataManager.getClient().requestLockChange(lreq);
-            } catch (GFEServerException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error attempting to break locks", e);
-                return false;
+
+            ServerResponse<List<LockTable>> sr = dataManager.getClient()
+                    .requestLockChange(lreq);
+            if (!sr.isOkay()) {
+                statusHandler.error(String.format(
+                        "Couldn't break locks for ParmID %s: %s", parmId,
+                        sr.message()));
             }
+            return sr.isOkay();
         }
-        return true;
     }
 
     /**
@@ -468,14 +472,24 @@ public class ParmOp {
      * @return the lock table
      * @throws GFEServerException
      */
-    public List<LockTable> mutableDbLockTable() throws GFEServerException {
-        if (!this.dataManager.getParmManager().getMutableDatabase().isValid()) {
-            return null;
+    public List<LockTable> mutableDbLockTable() {
+        DatabaseID mutableDb = dataManager.getParmManager()
+                .getMutableDatabase();
+        if (!mutableDb.isValid()) {
+            return Collections.emptyList();
         }
 
-        return this.dataManager.getClient().getLockTable(
-                this.dataManager.getParmManager().getMutableDatabase());
+        LockTableRequest ltr = new LockTableRequest(mutableDb);
+        ServerResponse<List<LockTable>> sr = dataManager.getClient()
+                .getLockTable(ltr);
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "Couldn't get lockTable for database %s: %s", mutableDb,
+                    sr.message()));
+            return Collections.emptyList();
+        }
 
+        return sr.getPayload();
     }
 
     /**
@@ -486,19 +500,18 @@ public class ParmOp {
      */
     public void publish(List<CommitGridRequest> req)
             throws SimulatedTimeProhibitedOpException {
-        CAVEMode mode = CAVEMode.getMode();
-
         if (!SimulatedTimeOperations.isTransmitAllowed()) {
             throw SimulatedTimeOperations
                     .constructProhibitedOpException("Publish GFE grids");
         }
 
+        CAVEMode mode = CAVEMode.getMode();
         if (mode.equals(CAVEMode.PRACTICE) || mode.equals(CAVEMode.TEST)) {
             statusHandler.handle(Priority.EVENTA, "PUBLISH Simulated. ");
             return;
         }
 
-        if (req.size() == 0) {
+        if (req.isEmpty()) {
             statusHandler
                     .handle(Priority.EVENTA, "PUBLISH: Nothing to publish");
             return;
@@ -513,7 +526,7 @@ public class ParmOp {
 
         final ConcurrentLinkedQueue<ServerResponse<?>> okSrs = new ConcurrentLinkedQueue<ServerResponse<?>>();
         final AtomicBoolean allOk = new AtomicBoolean(true);
-        final IFPClient client = this.dataManager.getClient();
+        final IFPClient client = dataManager.getClient();
 
         // spawn separate jobs
         final CountDownLatch latch = new CountDownLatch(MAX_CONCURRENT_JOBS);
@@ -524,23 +537,15 @@ public class ParmOp {
                     try {
                         CommitGridRequest req = null;
                         while ((req = requests.poll()) != null) {
-                            try {
-                                ServerResponse<?> sr = client
-                                        .commitGrid(Arrays
-                                                .asList(new CommitGridRequest[] { req }));
-                                if (sr.isOkay()) {
-                                    okSrs.add(sr);
-                                } else {
-                                    allOk.set(false);
-                                    statusHandler.handle(Priority.PROBLEM,
-                                            "PUBLISH problem: Unable to publish grid "
-                                                    + sr.toString());
-                                }
-                            } catch (GFEServerException e) {
+                            ServerResponse<?> sr = client.commitGrid(req);
+                            if (sr.isOkay()) {
+                                okSrs.add(sr);
+                            } else {
                                 allOk.set(false);
-                                statusHandler.handle(Priority.PROBLEM,
-                                        "PUBLISH problem: Unable to publish grids. "
-                                                + e.getLocalizedMessage(), e);
+                                statusHandler
+                                        .error(String
+                                                .format("PUBLISH problem: Unable to publish grid: %s",
+                                                        sr.message()));
                             }
                         }
                     } finally {
@@ -1073,13 +1078,12 @@ public class ParmOp {
      */
     public void sendISC(List<SendISCRequest> req)
             throws SimulatedTimeProhibitedOpException {
-        CAVEMode mode = CAVEMode.getMode();
-
         if (!SimulatedTimeOperations.isTransmitAllowed()) {
             throw SimulatedTimeOperations
                     .constructProhibitedOpException("Send ISC grids");
         }
 
+        CAVEMode mode = CAVEMode.getMode();
         if (mode.equals(CAVEMode.PRACTICE) || mode.equals(CAVEMode.TEST)) {
             statusHandler.handle(Priority.EVENTA, "SEND ISC Simulated. ");
             return;
@@ -1119,53 +1123,41 @@ public class ParmOp {
                     .getStringArray("ISC_neverSendParms"));
 
             // filter out some of the requests that are not desired
-            for (int i = 0; i < req.size(); i++) {
+            for (SendISCRequest r : req) {
                 // check parm name
-                if (skipParms.contains(req.get(i).getParmId().getParmName())) {
+                if (skipParms.contains(r.getParmId().getParmName())) {
                     continue;
                 }
 
                 // adjust time limits
-                TimeRange tr = req.get(i).getTimeRange()
-                        .intersection(limitTime);
-                if (tr.equals(new TimeRange())) {
+                TimeRange tr = r.getTimeRange().intersection(limitTime);
+                if (!tr.isValid()) {
                     continue;
                 }
 
-                // now adjust for server's grid inventory and expand tr to
-                // include the entire grid
-                List<TimeRange> inv = new ArrayList<TimeRange>();
-                try {
-                    inv = dataManager.serverParmInventory(req.get(i)
-                            .getParmId());
-                } catch (GFEServerException e) {
-                    statusHandler.handle(
-                            Priority.PROBLEM,
-                            "Unable to get server parm inventory: "
-                                    + e.getLocalizedMessage(), e);
-                }
-                for (int j = 0; j < inv.size(); j++) {
-                    if (inv.get(j).overlaps(tr)) {
-                        tr = tr.combineWith(inv.get(j));
-                    } else if (inv.get(j).getStart().after(tr.getEnd())) { // efficienty
+                /*
+                 * now adjust for server's grid inventory and expand tr to
+                 * include the entire grid
+                 */
+                List<TimeRange> inv = dataManager.serverParmInventory(r
+                        .getParmId());
+                for (TimeRange invTR : inv) {
+                    if (invTR.overlaps(tr)) {
+                        tr = tr.combineWith(invTR);
+                    } else if (invTR.getStart().after(tr.getEnd())) {
                         continue;
                     }
                 }
 
-                requests.add(new SendISCRequest(req.get(i).getParmId(), tr));
+                requests.add(new SendISCRequest(r.getParmId(), tr));
             }
-
         }
-        ServerResponse<?> sr = null;
-        try {
-            sr = dataManager.getClient().sendISC(requests);
-            if (!sr.isOkay()) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "SEND ISC problem: Unable to send ISC grids. " + sr);
-            }
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "SEND ISC problem: Unable to send ISC grids. " + sr);
+
+        ServerResponse<?> sr = dataManager.getClient().sendISC(requests);
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format(
+                    "SEND ISC problem: Unable to send ISC grids: %s",
+                    sr.message()));
         }
     }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/AbstractScriptUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/AbstractScriptUtil.java
index 9cd233ca9c..6828c7702c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/AbstractScriptUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/AbstractScriptUtil.java
@@ -17,16 +17,13 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-/**
- * 
- */
+
 package com.raytheon.viz.gfe.core.script;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.Properties;
-import java.util.regex.Pattern;
 
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
@@ -40,8 +37,8 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.python.PythonFileFilter;
-import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.viz.core.localization.LocalizationManager;
 import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.GFEException;
@@ -56,83 +53,31 @@ import com.raytheon.viz.gfe.smarttool.SmartToolConstants;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
+ * ???                     wldougher   Initial creation
  * Sep 09, 2013  #2033     dgilling    Use new templates directory.
+ * Jan 18, 2016   4834     njensen     Fix creating files, deleted dead code
  * 
  * </pre>
  * 
  * @author wldougher
  * 
  */
-public abstract class AbstractScriptUtil implements IScriptUtil {
+public abstract class AbstractScriptUtil implements PythonFileTemplate {
 
     protected IPathManager pathManager;
 
     /**
      * Constructor.
      */
-    public AbstractScriptUtil() {
+    protected AbstractScriptUtil() {
         pathManager = PathManagerFactory.getPathManager();
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#copy(java.lang.String,
-     *      java.lang.String,
-     *      com.raytheon.uf.common.localization.LocalizationContext.
-     *      LocalizationLevel,
-     *      com.raytheon.viz.gfe.core.script.IScriptUtil.Overwrite)
-     */
-    @Override
-    public LocalizationFile copy(String source, String dest,
-            LocalizationLevel toLevel, Overwrite mode) throws GFEException {
-        LocalizationFile src = find(source, null);
-        LocalizationFile dst = null;
-        String scriptType = getScriptType();
-        if (src == null || !src.exists()) {
-            throw new GFEException(String.format("%s %s does not exist.",
-                    scriptType, source));
-        } else {
-            LocalizationLevel srcLevel = src.getContext()
-                    .getLocalizationLevel();
-            if (source.equals(dest) && srcLevel.equals(toLevel)) {
-                String msg = String.format(
-                        "Attempt to copy %s %s at %s level to itself.",
-                        scriptType, source, srcLevel);
-                throw new GFEException(msg);
-            } else {
-                IPathManager pathManager = PathManagerFactory.getPathManager();
-                LocalizationContext ctx = pathManager.getContext(
-                        LocalizationType.CAVE_STATIC, toLevel);
-                String destPath = getScriptTypePathPrefix() + File.separator
-                        + scripted(dest);
-                dst = pathManager.getLocalizationFile(ctx, destPath);
-                if (mode == Overwrite.SAFE && dst.exists()) {
-                    dst = null;
-                } else {
-                    try {
-                        FileUtil.copyFile(src.getFile(), dst.getFile());
-                        dst.save();
-                    } catch (Exception e) {
-                        throw new GFEException(String.format(
-                                "Error copying %s %s to %s.", scriptType,
-                                source, dest), e);
-                    }
-                }
-            }
-        }
-        return dst;
-    }
-
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#createNew(java.lang.
-     *      String,
-     *      com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
-     *      , com.raytheon.viz.gfe.core.script.IScriptUtil.Overwrite)
-     */
     @Override
     public LocalizationFile createNew(String script, LocalizationLevel level,
             Overwrite mode) throws GFEException {
         String scriptFName;
-        scriptFName = scripted(script);
+        scriptFName = normalize(script);
         String path = getScriptTypePathPrefix() + File.separator + scriptFName;
         LocalizationContext context = pathManager.getContext(
                 LocalizationType.CAVE_STATIC, level);
@@ -146,19 +91,6 @@ public abstract class AbstractScriptUtil implements IScriptUtil {
             throw new GFEException(
                     "Attempt to create existing file in SAFE mode");
         } else {
-            File outFile = locFile.getFile();
-            File parentDir = outFile.getParentFile();
-            if (!parentDir.exists()) {
-                parentDir.mkdirs();
-            }
-            FileWriter fileWriter = null;
-            try {
-                fileWriter = new FileWriter(outFile);
-            } catch (IOException e) {
-                throw new GFEException("Error creating file writer for "
-                        + getScriptType() + " " + script, e);
-            }
-
             // Set up the velocity context and template
             initVelocity();
             VelocityContext vctx = new VelocityContext();
@@ -168,98 +100,28 @@ public abstract class AbstractScriptUtil implements IScriptUtil {
             Template template = getVelocityTemplate();
 
             // Generate the local file.
-            boolean throwing = false;
-            try {
-                template.merge(vctx, fileWriter);
+            try (SaveableOutputStream sos = locFile.openOutputStream();
+                    OutputStreamWriter writer = new OutputStreamWriter(sos)) {
+                template.merge(vctx, writer);
+                writer.close();
+                sos.save();
+                // refresh the reference in memory
+                locFile = pathManager.getLocalizationFile(context, path);
             } catch (Exception e) {
-                throwing = true;
-                throw new GFEException("Error in velocity merge for "
-                        + getScriptType() + " " + script, e);
-            } finally {
-                try {
-                    fileWriter.close();
-                } catch (IOException e) {
-                    if (!throwing) {
-                        throw new GFEException("Error closing file writer for "
-                                + getScriptType() + " " + script, e);
-                    }
-                }
-            }
-
-            // Propagate local file to the server.
-            try {
-                locFile.save();
-            } catch (Exception e) {
-                throw new GFEException("Error saving " + getScriptType() + " "
-                        + script, e);
+                throw new GFEException(
+                        "Error creating new file " + scriptFName, e);
             }
         }
         return locFile;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#delete(java.lang.String,
-     *      com
-     *      .raytheon.uf.common.localization.LocalizationContext.LocalizationLevel)
-     */
-    @Override
-    public void delete(String name, LocalizationLevel level)
-            throws GFEException {
-        String srcPath = scripted(name);
-        String pycPath = srcPath.replaceAll(Pattern.quote(".py") + "$", ".pyc");
-        String pyoPath = srcPath.replaceAll(Pattern.quote(".py") + "$", ".pyo");
-        LocalizationLevel fileLevel = LocalizationLevel.BASE;
-        LocalizationLevel pycLevel = LocalizationLevel.BASE;
-        LocalizationLevel pyoLevel = LocalizationLevel.BASE;
-
-        LocalizationFile file = find(srcPath, level);
-        LocalizationFile pycFile = find(pycPath, level);
-        LocalizationFile pyoFile = find(pyoPath, level);
-
-        // If level was null we may have source and bytecode files at multiple
-        // levels. Find the highest localization level.
-        LocalizationLevel highest = LocalizationLevel.BASE;
-        if (file != null) {
-            fileLevel = file.getContext().getLocalizationLevel();
-            highest = fileLevel;
-        }
-        if (pycFile != null) {
-            pycLevel = pycFile.getContext().getLocalizationLevel();
-            highest = pycLevel.compareTo(highest) > 0 ? pycLevel : highest;
-        }
-        if (pyoFile != null) {
-            pyoLevel = pyoFile.getContext().getLocalizationLevel();
-            highest = pyoLevel.compareTo(highest) > 0 ? pyoLevel : highest;
-        }
-
-        // Don't delete files less localized than highest.
-        if (fileLevel.compareTo(highest) < 0) {
-            file = null;
-        }
-        if (pycLevel.compareTo(highest) < 0) {
-            pycFile = null;
-        }
-        if (pyoLevel.compareTo(highest) < 0) {
-            pyoFile = null;
-        }
-
-        innerDelete(file, srcPath, fileLevel);
-        innerDelete(pycFile, pycPath, pycLevel);
-        innerDelete(pyoFile, pyoPath, pyoLevel);
-    }
-
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#find(java.lang.String,
-     *      com
-     *      .raytheon.uf.common.localization.LocalizationContext.LocalizationLevel)
-     */
     @Override
     public LocalizationFile find(String name, LocalizationLevel level)
             throws GFEException {
         LocalizationFile result = null;
 
         String path = getScriptTypePathPrefix() + File.separator + name;
-        path = scripted(path);
+        path = normalize(path);
         if (level == null) {
             result = pathManager.getStaticLocalizationFile(path);
         } else {
@@ -273,21 +135,6 @@ public abstract class AbstractScriptUtil implements IScriptUtil {
         return result;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getScriptType()
-     */
-    @Override
-    abstract public String getScriptType();
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.script.IScriptUtil#getScriptTypePathPrefix()
-     */
-    @Override
-    abstract public String getScriptTypePathPrefix();
-
     /**
      * Get the velocity template. This mostly serves to convert the many
      * exception types thrown by Velocity.getTemplate() to a GFEException.
@@ -341,54 +188,6 @@ public abstract class AbstractScriptUtil implements IScriptUtil {
         }
     }
 
-    /**
-     * Do the actual deletion of a localization file. If file is null, no action
-     * is taken. Otherwise, file is deleted locally, and on the server, if it
-     * exists there.
-     * 
-     * @param file
-     *            The file to delete. May be null.
-     * @param name
-     *            The name of file, for error reporting.
-     * @param level
-     *            The localization level of file
-     * @throws GFEException
-     */
-    protected void innerDelete(LocalizationFile file, String name,
-            LocalizationLevel level) throws GFEException {
-        if (file == null) {
-            ; // ignore deletion of non-existent file
-        } else if (file.isAvailableOnServer()) {
-            try {
-                file.delete();
-            } catch (Exception e) {
-                String msg = String.format("Error deleting %s %s at level %s",
-                        getScriptType(), name, level);
-                throw new GFEException(msg, e);
-            }
-        } else if (file.exists()) {
-            File jFile = file.getFile();
-            jFile.delete();
-        }
-    }
-
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#rename(java.lang.String,
-     *      java.lang.String,
-     *      com.raytheon.uf.common.localization.LocalizationContext.
-     *      LocalizationLevel,
-     *      com.raytheon.viz.gfe.core.script.IScriptUtil.Overwrite)
-     */
-    @Override
-    public LocalizationFile rename(String source, String dest,
-            LocalizationLevel toLevel, Overwrite mode) throws GFEException {
-        LocalizationFile dst;
-        LocalizationFile src = find(source, null);
-        dst = copy(source, dest, toLevel, mode);
-        delete(source, src.getContext().getLocalizationLevel());
-        return dst;
-    }
-
     /**
      * Add ".py" to name if it doesn't end with ".py", ".pyc", or ".pyo" and
      * return the result.
@@ -398,7 +197,7 @@ public abstract class AbstractScriptUtil implements IScriptUtil {
      * @return the decorated name.
      */
     @Override
-    public String scripted(String name) {
+    public String normalize(String name) {
         String result = null;
         if (name.endsWith(PythonFileFilter.EXTENSION) || name.endsWith(".pyo")
                 || name.endsWith(".pyc")) {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/CopyInputValidator.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/CopyInputValidator.java
index 2fc4c74ff3..e2127023c1 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/CopyInputValidator.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/CopyInputValidator.java
@@ -38,7 +38,7 @@ public class CopyInputValidator implements IInputValidator {
 
     protected String scriptf;
 
-    protected IScriptUtil util;
+    protected PythonFileTemplate util;
 
     private static final Pattern VALID_NAME = Pattern
             .compile("^[\\p{Alpha}_]+\\w*");
@@ -51,10 +51,10 @@ public class CopyInputValidator implements IInputValidator {
      * @param util
      *            The script utility object that will do the work.
      */
-    public CopyInputValidator(String script, IScriptUtil util) {
+    public CopyInputValidator(String script, PythonFileTemplate util) {
         this.script = script;
         this.util = util;
-        this.scriptf = util.scripted(script);
+        this.scriptf = util.normalize(script);
     }
 
     /**
@@ -72,7 +72,7 @@ public class CopyInputValidator implements IInputValidator {
         if (!VALID_NAME.matcher(newText.trim()).matches()) {
             return "Only letters, digits, and underscores are allowed.";
         }
-        String newfname = util.scripted(newText);
+        String newfname = util.normalize(newText);
         if (scriptf.equals(newfname)) {
             return script + " cannot be copied to itself.";
         }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/IScriptUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/PythonFileTemplate.java
similarity index 51%
rename from cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/IScriptUtil.java
rename to cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/PythonFileTemplate.java
index 4188b68484..4b250f1ef6 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/IScriptUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/PythonFileTemplate.java
@@ -22,47 +22,40 @@
  */
 package com.raytheon.viz.gfe.core.script;
 
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
+import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.viz.gfe.GFEException;
 
 /**
- * An interface describing several common actions on user-defined scripts.
+ * An interface for generating new python files based on a template.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * ???                     wldougher   Initial creation
+ * Jan 19, 2016   4834     njensen     Rename, refactor, clean up
+ * 
+ * </pre>
  * 
  * @author wldougher
  * 
  */
-public interface IScriptUtil {
+public interface PythonFileTemplate {
+
     public enum Overwrite {
         OVERWRITE, SAFE
-    };
-
-    /**
-     * Copy script to the new file toScript at localization level toLevel. If
-     * source and dest are the equal, toLevel must be different from the
-     * localization level of source. If dest already exists and mode is SAFE,
-     * dest will not be overwritten and the returned localization file will be
-     * null.
-     * 
-     * @param source
-     *            the simple name of the source script
-     * @param dest
-     *            the simple name of the destination script
-     * @param mode
-     *            Whether processing should proceed if dest already exists.
-     * @return A reference to toScript, which may be null if the copy fails.
-     * @throws GFEException
-     *             if script and toScript have the same name and level or if the
-     *             copy cannot complete due to file or network errors.
-     */
-    public LocalizationFile copy(String source, String dest,
-            LocalizationLevel toLevel, Overwrite mode) throws GFEException;
+    }
 
     /**
      * Create a new script at the designated localization level. Implementations
      * may initialize the contents of the new script however they desire.
      * 
      * @param script
+     * @param level
+     * @param mode
      * @return A reference to the newly created script, or null if the script
      *         could not be created.
      */
@@ -70,29 +63,7 @@ public interface IScriptUtil {
             Overwrite mode) throws GFEException;
 
     /**
-     * Delete the script with the designated name at the designated localization
-     * level.
-     * 
-     * @param name
-     *            The simple name of the script.
-     * @param level
-     *            the localization level at which the script should be deleted.
-     * @throws GFEException
-     *             if underlying file or network operations fail.
-     */
-    public void delete(String name, LocalizationLevel level)
-            throws GFEException;
-
-    /**
-     * The type of file to pass to PythonUtil.openPythonFile() when editing
-     * scripts of this type.
-     * 
-     * @return the file type string
-     */
-    public String getFileType();
-
-    /**
-     * The type of script this utility handles. Implementors should return this
+     * The type of script this utility handles. Implementers should return this
      * in capitalized case, i.e., "Procedure", for use in error messages.
      * 
      * @return the script type string
@@ -116,21 +87,6 @@ public interface IScriptUtil {
     public LocalizationFile find(String name, LocalizationLevel level)
             throws GFEException;
 
-    /**
-     * Rename source to dest. This should be equivalent to calling copy()
-     * followed by delete().
-     * 
-     * @param source
-     *            the simple name of the source script
-     * @param dest
-     *            the simple name of the destination script
-     * @param mode
-     *            Whether processing should proceed if dest already exists.
-     * @return A reference to the renamed file.
-     */
-    public LocalizationFile rename(String source, String dest,
-            LocalizationLevel toLevel, Overwrite mode) throws GFEException;
-
     /**
      * Convert a simple name to the name of a script file. For example,
      * "Extrapolate" might become "Extrapolate.py".
@@ -139,14 +95,14 @@ public interface IScriptUtil {
      *            The undecorated name
      * @return The name of the script file derived from name.
      */
-    public String scripted(String name);
+    public String normalize(String name);
 
-	/**
-	 * Get the path prefix used in building localization filenames. For example,
-	 * the path prefix for Procedures is "gfe/userPython/procedures", or
-	 * GfePyIncludeUtil.PROCEDURES.
-	 * 
-	 * @return The path prefix
-	 */
-	public abstract String getScriptTypePathPrefix();
+    /**
+     * Get the path prefix used in building localization filenames. For example,
+     * the path prefix for Procedures is "gfe/userPython/procedures", or
+     * GfePyIncludeUtil.PROCEDURES.
+     * 
+     * @return The path prefix
+     */
+    public abstract String getScriptTypePathPrefix();
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/action/NewAction.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/action/NewAction.java
index 2ee6e38ae5..89557f5862 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/action/NewAction.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/script/action/NewAction.java
@@ -23,8 +23,8 @@
 package com.raytheon.viz.gfe.core.script.action;
 
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IInputValidator;
+import org.eclipse.jface.window.Window;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
@@ -36,37 +36,43 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.viz.gfe.GFEException;
 import com.raytheon.viz.gfe.PythonUtil;
 import com.raytheon.viz.gfe.core.script.ExistMode;
-import com.raytheon.viz.gfe.core.script.IScriptUtil;
-import com.raytheon.viz.gfe.core.script.IScriptUtil.Overwrite;
 import com.raytheon.viz.gfe.core.script.NewInputValidator;
+import com.raytheon.viz.gfe.core.script.PythonFileTemplate;
+import com.raytheon.viz.gfe.core.script.PythonFileTemplate.Overwrite;
 import com.raytheon.viz.gfe.dialogs.ScriptNameInputDialog;
 
 /**
  * An Action for creating a new instance of a script.
  * 
+ * <pre>
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * ???                     wldougher   Initial creation
+ * Jan 19, 2016  4834      njensen     Cleaned up warnings
+ *
+ * </pre>
+ * 
  * @author wldougher
  * 
  */
 public class NewAction extends Action {
+
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(NewAction.class);
 
-    protected IScriptUtil util;
+    protected PythonFileTemplate util;
 
     /**
-     * @param selected
      * @param util
      */
-    public NewAction(IScriptUtil util) {
+    public NewAction(PythonFileTemplate util) {
         super("New...");
         this.util = util;
     }
 
-    /**
-     * 
-     * 
-     * @see org.eclipse.jface.action.Action#run()
-     */
     @Override
     public void run() {
         Shell parent = Display.getCurrent().getActiveShell();
@@ -76,7 +82,7 @@ public class NewAction extends Action {
                 + type, "Name", "My" + type, validator, util);
         dialog.setMode(ExistMode.ERR_EXISTS);
         int rtnCode = dialog.open();
-        if (rtnCode == Dialog.OK) {
+        if (rtnCode == Window.OK) {
             String script = dialog.getValue().trim();
             try {
                 // since createNew() will only return if a LocalizationFile is
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/BreakLockDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/BreakLockDialog.java
index 9b5b6e98a6..a6f05bbd6b 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/BreakLockDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/BreakLockDialog.java
@@ -21,6 +21,7 @@ package com.raytheon.viz.gfe.dialogs;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.TimeZone;
 
@@ -40,10 +41,10 @@ import org.eclipse.swt.widgets.Shell;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
 import com.raytheon.uf.common.dataplugin.gfe.server.lock.Lock;
 import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.viz.gfe.GFEServerException;
 import com.raytheon.viz.gfe.core.DataManager;
 import com.raytheon.viz.gfe.core.UIFormat;
 import com.raytheon.viz.gfe.core.UIFormat.FilterType;
@@ -61,6 +62,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * Feb 20, 2008            ebabin       Initial Creation
  * Jun 30, 2008            ebabin       Updates for status of break lock.
  * Sep 20, 2012  #1190     dgilling     Use new WsId.getHostName() method.
+ * Nov 17, 2015  #5129     dgilling     Support new IFPClient.
  * 
  * </pre>
  * 
@@ -106,8 +108,8 @@ public class BreakLockDialog extends CaveJFACEDialog {
         super(parent);
         this.dataManager = dataManager;
 
-        this.uiFormat = new UIFormat(DataManager.getCurrentInstance()
-                .getParmManager(), FilterType.MUTABLE, FilterType.MUTABLE);
+        this.uiFormat = new UIFormat(this.dataManager.getParmManager(),
+                FilterType.MUTABLE, FilterType.MUTABLE);
 
         this.setShellStyle(SWT.TITLE | SWT.MODELESS | SWT.CLOSE);
         try {
@@ -118,19 +120,21 @@ public class BreakLockDialog extends CaveJFACEDialog {
         }
     }
 
-    protected void initLockData() throws GFEServerException {
+    protected void initLockData() {
         List<LockTable> lockTables = dataManager.getParmOp()
                 .mutableDbLockTable();
 
+        ServerResponse<List<String>> sr = dataManager.getClient()
+                .getClientList();
         List<String> clients;
-        try {
-            clients = dataManager.getClient().getClients();
-        } catch (GFEServerException e) {
+        if (!sr.isOkay()) {
             statusHandler
-                    .handle(Priority.PROBLEM,
-                            "Unable to retrieve client info. All locks will appear as orphans",
-                            e);
-            clients = new ArrayList<String>();
+                    .error(String
+                            .format("Unable to retrieve client info: %s. All locks will appear as orphans",
+                                    sr.message()));
+            clients = Collections.emptyList();
+        } else {
+            clients = sr.getPayload();
         }
 
         this.clientLocks = new ArrayList<Lock>();
@@ -245,15 +249,10 @@ public class BreakLockDialog extends CaveJFACEDialog {
     }
 
     private void breakLocks(Object[] locks) {
-
-        DataManager dm = DataManager.getCurrentInstance();
-        if (dm == null) {
-            return;
-        }
-
         for (Object obj : locks) {
             Lock lock = (Lock) obj;
-            dm.getParmOp().breakLock(lock.getParmId(), lock.getTimeRange());
+            dataManager.getParmOp().breakLock(lock.getParmId(),
+                    lock.getTimeRange());
         }
     }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ConfigUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ConfigUtil.java
index f82a7a458a..cea76518fb 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ConfigUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ConfigUtil.java
@@ -23,7 +23,7 @@ import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.viz.gfe.core.script.AbstractScriptUtil;
 
 /**
- * TODO Add Description
+ * An implementation of PythonFileTemplate for making new Configs.
  * 
  * <pre>
  *
@@ -31,15 +31,17 @@ import com.raytheon.viz.gfe.core.script.AbstractScriptUtil;
  *
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 8, 2010            mpduff     Initial creation
+ * Oct 08, 2010            mpduff      Initial creation
+ * Jan 19, 2016  4834      njensen     Removed dead method
  *
  * </pre>
- *
+ * 
  * @author mpduff
- * @version 1.0	
+ * @version 1.0
  */
 
 public class ConfigUtil extends AbstractScriptUtil {
+
     private static final String TEMPLATE_FILENAME = "config.vm";
 
     private static final String scriptType = "Config";
@@ -51,39 +53,19 @@ public class ConfigUtil extends AbstractScriptUtil {
         super();
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getScriptType()
-     */
     @Override
     public String getScriptType() {
         return scriptType;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getScriptTypePathPrefix
-     *      ()
-     */
     @Override
     public String getScriptTypePathPrefix() {
         return GfePyIncludeUtil.CONFIG;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getVelocityTemplateName
-     *      ()
-     */
     @Override
     protected String getVelocityTemplateName() {
         return TEMPLATE_FILENAME;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getFileType()
-     */
-    @Override
-    public String getFileType() {
-        return "CONFIG";
-    }
 }
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/CreateFromScratchDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/CreateFromScratchDialog.java
index 6bb169e0b2..cc359d2214 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/CreateFromScratchDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/CreateFromScratchDialog.java
@@ -31,9 +31,10 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Scale;
 import org.eclipse.swt.widgets.Shell;
 
+import com.raytheon.uf.common.time.util.TimeUtil;
 import com.raytheon.viz.gfe.GFEOperationFailedException;
 import com.raytheon.viz.gfe.GFEPreference;
-import com.raytheon.viz.gfe.core.DataManager;
+import com.raytheon.viz.gfe.core.DataManagerUIFactory;
 import com.raytheon.viz.gfe.core.parm.Parm;
 import com.raytheon.viz.gfe.core.parm.Parm.CreateFromScratchMode;
 import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
@@ -45,8 +46,11 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 	Feb 26, 2008					Eric Babin Initial Creation
+ * Feb 26, 2008            Eric Babin  Initial Creation
  * Oct 24, 2012 1287       rferrel     Changes for non-blocking dialog.
+ * Nov 30, 2015 5133       kbisanz     In durationScaleChanged(), ensure
+ *                                     intervalScale is valid before
+ *                                     accessing it.
  * 
  * </pre>
  * 
@@ -116,7 +120,7 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
 
             intervalScale = new Scale(top, SWT.HORIZONTAL);
             intervalScale.setMinimum(quantum);
-            intervalScale.setMaximum(24);
+            intervalScale.setMaximum(TimeUtil.HOURS_PER_DAY);
             intervalScale.setIncrement(quantum);
             intervalScale.setPageIncrement(quantum);
             intervalScale.setSelection(this.createInterval);
@@ -145,7 +149,7 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
 
             durationScale = new Scale(top, SWT.HORIZONTAL);
             durationScale.setMinimum(quantum);
-            durationScale.setMaximum(24);
+            durationScale.setMaximum(TimeUtil.HOURS_PER_DAY);
             durationScale.setSelection(this.createDuration);
             data = new GridData(200, SWT.DEFAULT);
             durationScale.setLayoutData(data);
@@ -174,17 +178,19 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
     }
 
     private void durationScaleChanged() {
-        if (durationScale.getSelection() >= intervalScale.getSelection()) {
+        if (displayInterval
+                && durationScale.getSelection() >= intervalScale.getSelection()) {
             durationScale.setSelection(intervalScale.getSelection());
         }
         durationLabel.setText(Integer.toString(durationScale.getSelection()));
     }
 
     private void commonTC() {
-        Parm[] parms = DataManager.getCurrentInstance().getParmManager()
-                .getSelectedParms();
+        Parm[] parms = DataManagerUIFactory.getCurrentInstance()
+                .getParmManager().getSelectedParms();
 
-        int minRepeatInterval = 24 * 3600;
+        int minRepeatInterval = TimeUtil.HOURS_PER_DAY
+                * TimeUtil.SECONDS_PER_HOUR;
         this.displayInterval = true;
         this.displayDuration = true;
         int compositeRepeat = 0;
@@ -218,13 +224,14 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
         // lets the user select intervals up to 100 hours, but the dialog
         // ignores them and uses 24 hours.
         // It's better to not show the slider at all in this case.
-        if (minRepeatInterval >= 24 * 3600) {
+        if (minRepeatInterval >= TimeUtil.HOURS_PER_DAY
+                * TimeUtil.SECONDS_PER_HOUR) {
             displayInterval = false;
         }
 
-        this.quantum = minRepeatInterval / 3600;
-        this.createDuration = compositeDuration / 3600;
-        this.createInterval = compositeRepeat / 3600;
+        this.quantum = minRepeatInterval / TimeUtil.SECONDS_PER_HOUR;
+        this.createDuration = compositeDuration / TimeUtil.SECONDS_PER_HOUR;
+        this.createInterval = compositeRepeat / TimeUtil.SECONDS_PER_HOUR;
 
         int configInterval = GFEPreference
                 .getIntPreference("CreateScratchDefaultInterval");
@@ -233,7 +240,7 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
 
         // Sanity check config values.
         configInterval = Math.max(0, configInterval);
-        configInterval = Math.min(configInterval, 24);
+        configInterval = Math.min(configInterval, TimeUtil.HOURS_PER_DAY);
 
         configDuration = Math.max(0, configDuration);
         configDuration = Math.min(configDuration, configInterval);
@@ -273,11 +280,12 @@ public class CreateFromScratchDialog extends CaveJFACEDialog {
                 createDuration = durationScale.getSelection();
             }
 
-            DataManager
+            DataManagerUIFactory
                     .getCurrentInstance()
                     .getParmOp()
-                    .createFromScratchSelected(mode, createInterval * 3600,
-                            createDuration * 3600);
+                    .createFromScratchSelected(mode,
+                            createInterval * TimeUtil.SECONDS_PER_HOUR,
+                            createDuration * TimeUtil.SECONDS_PER_HOUR);
 
         } catch (GFEOperationFailedException e) {
             e.printStackTrace();
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
index 64da57feb2..2308d201f1 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
@@ -55,17 +55,14 @@ import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData.CoordinateType;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData.RefType;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
-import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
 import com.raytheon.uf.common.python.concurrent.IPythonExecutor;
 import com.raytheon.uf.common.python.concurrent.IPythonJobListener;
-import com.raytheon.uf.common.python.concurrent.PythonJobCoordinator;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.gfe.core.DataManagerUIFactory;
 import com.raytheon.viz.gfe.core.IParmManager;
 import com.raytheon.viz.gfe.core.IReferenceSetManager;
 import com.raytheon.viz.gfe.core.IReferenceSetManager.RefSetMode;
@@ -81,7 +78,6 @@ import com.raytheon.viz.gfe.core.wxvalue.WeatherWxValue;
 import com.raytheon.viz.gfe.core.wxvalue.WxValue;
 import com.raytheon.viz.gfe.query.QueryScript;
 import com.raytheon.viz.gfe.query.QueryScriptExecutor;
-import com.raytheon.viz.gfe.query.QueryScriptFactory;
 import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
 import com.raytheon.viz.ui.dialogs.ICloseCallback;
 import com.raytheon.viz.ui.widgets.ToggleSelectList;
@@ -106,7 +102,8 @@ import com.vividsolutions.jts.geom.MultiPolygon;
  * Feb 14, 2013            mnash       Move QueryScript to use new Python concurrency implementation
  * Jan 13, 2015 3955       randerso    Improve handling of Topo parm for Standard Terrain editing
  * Jun 24, 2015 14401      yteng       Check whether activeDisplay is disposed before update
- * Aug 27, 2015 4749       njensen     Reused reference to PythonJobCoordinator instance 
+ * Aug 27, 2015 4749       njensen     Reused reference to PythonJobCoordinator instance
+ * Dec 14, 2015 4816       dgilling    Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -853,12 +850,8 @@ public class DefineRefSetDialog extends CaveJFACEDialog implements
     }
 
     private void submit() {
+        Map<String, Object> argMap = new HashMap<String, Object>(1, 1f);
         final String s = this.queryField.getText().trim();
-        AbstractPythonScriptFactory<QueryScript> factory = new QueryScriptFactory(
-                DataManagerUIFactory.getCurrentInstance());
-        PythonJobCoordinator<QueryScript> coordinator = PythonJobCoordinator
-                .getInstance(factory.getName());
-        Map<String, Object> argMap = new HashMap<String, Object>();
         argMap.put("expression", s);
         IPythonExecutor<QueryScript, ReferenceData> executor = new QueryScriptExecutor(
                 "evaluate", argMap);
@@ -881,22 +874,21 @@ public class DefineRefSetDialog extends CaveJFACEDialog implements
                             addToHistory(s);
 
                             if (activeDisplay != null
-                                    || !activeDisplay.isDisposed())
+                                    || !activeDisplay.isDisposed()) {
                                 activeDisplay.setText(s);
+                            }
 
-                            if (queryField != null && !queryField.isDisposed())
+                            if (queryField != null && !queryField.isDisposed()) {
                                 queryField.setText("");
+                            }
                         }
                     };
                 });
             }
         };
-        try {
-            coordinator.submitAsyncJob(executor, listener);
-        } catch (Exception e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Unable to submit job to ExecutorService", e);
-        }
+
+        refSetMgr.getPythonThreadPool().submitJobWithCallback(executor,
+                listener);
     }
 
     /*
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
index 5b5c9336b7..4db84d84c8 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
@@ -56,7 +56,6 @@ import org.eclipse.ui.contexts.IContextService;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
-import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.dataplugin.gfe.textproduct.ProductDefinition;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -66,7 +65,6 @@ import com.raytheon.uf.viz.core.localization.LocalizationManager;
 import com.raytheon.viz.core.mode.CAVEMode;
 import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.GFEPreference;
-import com.raytheon.viz.gfe.GFEServerException;
 import com.raytheon.viz.gfe.core.DataManager;
 import com.raytheon.viz.gfe.dialogs.formatterlauncher.ConfigData;
 import com.raytheon.viz.gfe.dialogs.formatterlauncher.IProductTab;
@@ -101,6 +99,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * Feb 12, 2014 2801       randerso    Added prompting if formatter is run against non-normal database
  * Jul 29, 2015 4263       dgilling    Support changes to TextProductManager.
  * Aug 24, 2015 4749       dgilling    Reorganize dialog close and dispose.
+ * Nov 18, 2015 5129       dgilling    Support new IFPClient.
  * 
  * </pre>
  * 
@@ -1092,17 +1091,7 @@ public class FormatterLauncherDialog extends CaveJFACEDialog implements
      * @return The Official Data source
      */
     private DatabaseID getOfficialDataSource() {
-        DatabaseID source = null;
-        try {
-            ServerResponse<java.util.List<DatabaseID>> sr = dataMgr.getClient()
-                    .getOfficialDBName();
-            source = sr.getPayload().get(0);
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Unable to determine official db", e);
-        }
-
-        return source;
+        return dataMgr.getParmManager().getProductDB();
     }
 
     /**
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GFEConfigDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GFEConfigDialog.java
index 885b065b5e..9627bc22d0 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GFEConfigDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GFEConfigDialog.java
@@ -21,10 +21,11 @@ package com.raytheon.viz.gfe.dialogs;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -46,6 +47,7 @@ import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -53,21 +55,24 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Monitor;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.time.SimulatedTime;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.viz.gfe.Activator;
@@ -80,10 +85,14 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket//    Engineer    Description
+ * Date         Ticket     Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 30, 2009            randerso     Initial creation
+ * Apr 30, 2009            randerso    Initial creation
  * Oct 30, 2012 1298       rferrel     Code cleanup for non-blocking dialog.
+ * Oct 28, 2015 5054       randerso    Place GfeConfigDialog on current monitor if 
+ *                                     parent shell is not visible.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 05, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -174,6 +183,29 @@ public class GFEConfigDialog extends CaveJFACEDialog {
         newShell.setText("GFE Startup");
     }
 
+    @Override
+    protected Point getInitialLocation(Point initialSize) {
+        Point loc = super.getInitialLocation(initialSize);
+
+        if (!getParentShell().isVisible()) {
+            // center on current monitor
+            Display display = getShell().getDisplay();
+            Monitor[] monitors = display.getMonitors();
+
+            Point cursor = display.getCursorLocation();
+            for (Monitor m : monitors) {
+                Rectangle b = m.getBounds();
+                if (b.contains(cursor)) {
+                    loc.x = b.x + (b.width - initialSize.x) / 2;
+                    loc.y = b.y + (b.height - initialSize.y) / 2;
+                    break;
+                }
+            }
+        }
+
+        return loc;
+    }
+
     /*
      * (non-Javadoc)
      * 
@@ -302,7 +334,7 @@ public class GFEConfigDialog extends CaveJFACEDialog {
     private Image nextImage() {
         int imageNumber = randomSplash();
         String imageName = "SSa" + imageNumber + ".gif";
-        ImageDescriptor id = Activator.imageDescriptorFromPlugin(
+        ImageDescriptor id = AbstractUIPlugin.imageDescriptorFromPlugin(
                 Activator.PLUGIN_ID, FileUtil.join("images", imageName));
         return id.createImage();
     }
@@ -381,60 +413,38 @@ public class GFEConfigDialog extends CaveJFACEDialog {
         IPathManager pathMgr = PathManagerFactory.getPathManager();
         LocalizationContext context = pathMgr.getContext(
                 LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-        LocalizationFile lf = pathMgr.getLocalizationFile(context, LAST_CONFIG);
-        File file = lf.getFile();
+        ILocalizationFile lf = pathMgr
+                .getLocalizationFile(context, LAST_CONFIG);
 
-        BufferedWriter out = null;
-        try {
-            out = new BufferedWriter(new FileWriter(file));
+        try (SaveableOutputStream outStream = lf.openOutputStream();
+                Writer out = new BufferedWriter(new OutputStreamWriter(
+                        outStream))) {
             out.write(config);
+            out.close();
+            outStream.save();
         } catch (IOException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error saving config file selection", e);
-        } finally {
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException e) {
-                    // nothing to do
-                }
-            }
-        }
-
-        try {
-            lf.save();
-        } catch (LocalizationOpFailedException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error saving config file selection", e);
+            statusHandler.error("Error writing config file selection", e);
+        } catch (LocalizationException e) {
+            statusHandler.error("Error saving config file selection", e);
         }
     }
 
     private void loadLastConfig() {
-        config = null;
-
         IPathManager pathMgr = PathManagerFactory.getPathManager();
         LocalizationContext context = pathMgr.getContext(
                 LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-        LocalizationFile lf = pathMgr.getLocalizationFile(context, LAST_CONFIG);
-        File file = lf.getFile();
+        ILocalizationFile lf = pathMgr
+                .getLocalizationFile(context, LAST_CONFIG);
 
-        if (file.exists()) {
-            BufferedReader in = null;
-            try {
-                in = new BufferedReader(new FileReader(file));
+        config = null;
+        if (lf.exists()) {
+            try (InputStream inStream = lf.openInputStream();
+                    BufferedReader in = new BufferedReader(
+                            new InputStreamReader(inStream))) {
                 config = in.readLine();
-            } catch (IOException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error loading config file selection", e);
+            } catch (IOException | LocalizationException e) {
+                statusHandler.error("Error loading config file selection", e);
                 config = null;
-            } finally {
-                if (in != null) {
-                    try {
-                        in.close();
-                    } catch (IOException e) {
-                        // nothing to do
-                    }
-                }
             }
         }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java
index 2c6e799b11..c2aefb496c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java
@@ -38,8 +38,8 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.viz.gfe.GFEException;
 import com.raytheon.viz.gfe.PythonUtil;
-import com.raytheon.viz.gfe.core.script.IScriptUtil;
-import com.raytheon.viz.gfe.core.script.IScriptUtil.Overwrite;
+import com.raytheon.viz.gfe.core.script.PythonFileTemplate;
+import com.raytheon.viz.gfe.core.script.PythonFileTemplate.Overwrite;
 import com.raytheon.viz.gfe.textproduct.TextProductTableUtil;
 import com.raytheon.viz.gfe.textproduct.TextProductUtil;
 import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
@@ -126,7 +126,7 @@ public class NewTextProductDialog extends CaveJFACEDialog {
                 return;
             }
 
-            IScriptUtil util = null;
+            PythonFileTemplate util = null;
             if (isSmart) {
                 util = new TextProductUtil();
             } else {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewToolDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewToolDialog.java
index bdbb693174..eeaa14e077 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewToolDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewToolDialog.java
@@ -39,7 +39,8 @@ import org.eclipse.ui.PlatformUI;
 
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
 import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.viz.gfe.core.DataManager;
+import com.raytheon.viz.gfe.core.DataManagerUIFactory;
+import com.raytheon.viz.gfe.core.IParmManager;
 import com.raytheon.viz.gfe.core.parm.Parm;
 import com.raytheon.viz.gfe.smarttool.SmartToolEdit;
 import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
@@ -53,6 +54,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * ------------ ---------- ----------- --------------------------
  * Feb 20, 2008            njensen     Initial creation
  * Nov 12, 2012 1298       rferrel     Changes for non-blocking dialog.
+ * Jan 19, 2016 4834       njensen     Cleaned up warnings
  * 
  * </pre>
  * 
@@ -77,13 +79,6 @@ public class NewToolDialog extends CaveJFACEDialog {
         setShellStyle(SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets
-     * .Shell)
-     */
     @Override
     protected void configureShell(Shell shell) {
         super.configureShell(shell);
@@ -92,11 +87,6 @@ public class NewToolDialog extends CaveJFACEDialog {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.dialogs.Dialog#buttonPressed(int)
-     */
     @Override
     protected void buttonPressed(int buttonId) {
         if (buttonId == IDialogConstants.OK_ID) {
@@ -124,30 +114,14 @@ public class NewToolDialog extends CaveJFACEDialog {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.jface.dialogs.Dialog#createButtonsForButtonBar(org.eclipse
-     * .swt.widgets.Composite)
-     */
     @Override
     protected void createButtonsForButtonBar(Composite parent) {
-
         createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,
                 true);
-
         createButton(parent, IDialogConstants.CANCEL_ID,
                 IDialogConstants.CANCEL_LABEL, false);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets
-     * .Composite)
-     */
     @Override
     protected Control createDialogArea(final Composite parent) {
         Composite composite = (Composite) super.createDialogArea(parent);
@@ -180,8 +154,8 @@ public class NewToolDialog extends CaveJFACEDialog {
 
         // select the active parm if not null otherwise select the first parm in
         // the list
-        Parm parm = DataManager.getCurrentInstance().getSpatialDisplayManager()
-                .getActivatedParm();
+        Parm parm = DataManagerUIFactory.getCurrentInstance()
+                .getSpatialDisplayManager().getActivatedParm();
         if (parm != null) {
             parms.setSelection(new String[] { parm.getParmID().getParmName() });
         } else {
@@ -195,12 +169,9 @@ public class NewToolDialog extends CaveJFACEDialog {
     public String[] getParms() {
         IWorkbenchWindow window = PlatformUI.getWorkbench()
                 .getActiveWorkbenchWindow();
-        ParmID[] parms = DataManager
-                .getInstance(window)
-                .getParmManager()
-                .getAvailableParms(
-                        DataManager.getInstance(window).getParmManager()
-                                .getMutableDatabase());
+        IParmManager pm = DataManagerUIFactory.getInstance(window)
+                .getParmManager();
+        ParmID[] parms = pm.getAvailableParms(pm.getMutableDatabase());
         java.util.List<String> parmNames = new ArrayList<String>(
                 parms.length + 2);
         for (ParmID p : parms) {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProcessMonitorDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProcessMonitorDialog.java
index 0119ed590c..7f8b45a4ea 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProcessMonitorDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProcessMonitorDialog.java
@@ -35,6 +35,7 @@ import java.util.TimeZone;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.GC;
@@ -70,6 +71,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * Mar 7, 2008			   Eric Babin  Initial Creation
  * 02/12/2013       #1597  randerso    Modified TaskOutputDialog to support GFE Performance metrics
  * 05/28/2014       #2841  randerso    Fixed some NPEs and layout issues
+ * 11/12/2015       #5106  dgilling    Improve load times for large log files.
  * 
  * </pre>
  * 
@@ -373,7 +375,7 @@ public class ProcessMonitorDialog extends CaveJFACEDialog implements
 
         private AbstractGfeTask task;
 
-        private Text logText;
+        private StyledText logText;
 
         /**
          * @param parentShell
@@ -414,8 +416,8 @@ public class ProcessMonitorDialog extends CaveJFACEDialog implements
             cmdText.setLayoutData(layoutData);
             cmdText.setText(task.getCommand());
 
-            logText = new Text(comp, SWT.MULTI | SWT.BORDER | SWT.READ_ONLY
-                    | SWT.H_SCROLL | SWT.V_SCROLL);
+            logText = new StyledText(comp, SWT.BORDER | SWT.H_SCROLL
+                    | SWT.V_SCROLL);
             layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
             layoutData.widthHint = this.convertWidthInCharsToPixels(120);
             layoutData.heightHint = this.convertHeightInCharsToPixels(24);
@@ -424,7 +426,7 @@ public class ProcessMonitorDialog extends CaveJFACEDialog implements
                     SWT.COLOR_BLACK));
             logText.setForeground(logText.getDisplay().getSystemColor(
                     SWT.COLOR_WHITE));
-
+            logText.setEditable(false);
             logText.setText(getLogFileContents());
 
             Composite timeComp = new Composite(comp, SWT.NONE);
@@ -581,6 +583,7 @@ public class ProcessMonitorDialog extends CaveJFACEDialog implements
                     // do nothing
                 }
             }
+
             return s;
         }
     }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
index b2be2290ca..1abda98efb 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
@@ -77,6 +77,7 @@ import com.raytheon.viz.ui.widgets.ToggleSelectList;
  *                                     for Png Images... is rebuilt after
  *                                     return from the dialog.
  * Sep 15, 2015 4858       dgilling    Disable all features in DRT mode.
+ * Nov 18, 2015 5129       dgilling    Support new IFPClient.
  * 
  * </pre>
  * 
@@ -185,8 +186,9 @@ public class ProductScriptsDialog extends CaveJFACEDialog {
                 gmtTime.setTimeZone(TimeZone.getTimeZone("GMT"));
                 SimpleDateFormat localTime = new SimpleDateFormat(
                         TIME_FORMAT_STRING);
-                localTime.setTimeZone(TimeZone.getTimeZone(dataManager
-                        .getClient().getSiteTimeZone()));
+                localTime.setTimeZone(TimeZone
+                        .getTimeZone(dataManager.getParmManager()
+                                .compositeGridLocation().getTimeZone()));
                 String curLocalTime = localTime.format(curTime);
                 String curGMTTime = gmtTime.format(curTime);
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteEditAreaGroupDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteEditAreaGroupDialog.java
index 6689b505f8..16ef47a8da 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteEditAreaGroupDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteEditAreaGroupDialog.java
@@ -40,12 +40,18 @@ import org.eclipse.swt.widgets.Text;
 
 import com.raytheon.uf.common.dataplugin.gfe.reference.GroupID;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.IPathManager;
+import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
+import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.viz.gfe.core.IReferenceSetManager;
+import com.raytheon.viz.gfe.core.IReferenceSetManager.RefSetMode;
+import com.raytheon.viz.gfe.core.internal.ReferenceSetManager;
 import com.raytheon.viz.gfe.ui.AccessMgr;
 import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
 import com.raytheon.viz.ui.widgets.ToggleSelectList;
@@ -57,8 +63,10 @@ import com.raytheon.viz.ui.widgets.ToggleSelectList;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 	Mar 11, 2008					Eric Babin Initial Creation
+ * Mar 11, 2008            Eric Babin  Initial Creation
  * Oct 24, 2012 1287       rferrel     Code clean part of non-blocking dialog.
+ * Nov 18, 2015 5129       dgilling    Code cleanup to support ReferenceSetManager changes.
+ * Feb 05, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -344,13 +352,39 @@ public class SaveDeleteEditAreaGroupDialog extends CaveJFACEDialog {
      * @param withVerify
      */
     private void deleteArea(String areaName, boolean withVerify) {
-        // Note: Area will be deleted from all groups by
-        // UIReferenceSetMgr which processes deletions for
-        // incoming ReferenceSetInventoryChanged messages
+        /*
+         * Note: Area will be deleted from all groups by UIReferenceSetMgr which
+         * processes deletions for incoming ReferenceSetInventoryChanged
+         * messages
+         */
 
         ReferenceID id = new ReferenceID(areaName);
         if (id.isValid()) {
-            refSetManager.deleteRefSet(id, withVerify);
+            if (withVerify) {
+                IPathManager pm = PathManagerFactory.getPathManager();
+                LocalizationContext ctx = pm.getContext(
+                        LocalizationType.COMMON_STATIC, LocalizationLevel.USER);
+                ILocalizationFile lf = pm.getLocalizationFile(ctx,
+                        ReferenceSetManager.EDIT_AREAS_DIR
+                                + IPathManager.SEPARATOR + id.getName()
+                                + ".xml");
+                boolean verify = AccessMgr.verifyDelete(lf.getPath(), lf
+                        .getContext().getLocalizationType(), false);
+                if (!verify) {
+                    return;
+                }
+            }
+
+            /*
+             * Check to see if deleting active reference set. If so, clear the
+             * active reference set
+             */
+            ReferenceID activeId = refSetManager.getActiveRefSet().getId();
+            if (id.equals(activeId)) {
+                refSetManager.incomingRefSet(refSetManager.emptyRefSet(),
+                        RefSetMode.REPLACE);
+            }
+            refSetManager.deleteRefSet(id);
         }
     }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteRefDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteRefDialog.java
index 07a611f3a5..95bbba02b2 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteRefDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteRefDialog.java
@@ -44,11 +44,19 @@ import org.eclipse.swt.widgets.Text;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData.RefType;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.IPathManager;
+import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
+import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
+import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.viz.gfe.core.IReferenceSetManager;
+import com.raytheon.viz.gfe.core.IReferenceSetManager.RefSetMode;
+import com.raytheon.viz.gfe.core.internal.ReferenceSetManager;
+import com.raytheon.viz.gfe.ui.AccessMgr;
 import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
 import com.raytheon.viz.ui.widgets.ToggleSelectList;
 
@@ -62,6 +70,8 @@ import com.raytheon.viz.ui.widgets.ToggleSelectList;
  * ------------ ---------- ----------- --------------------------
  * Sep 10, 2010            randerso     Initial creation
  * Oct 24, 2012 1287       rferrel     Code clean up part of non-blocking dialog.
+ * Nov 18, 2015 5129       dgilling    Code cleanup to support ReferenceSetManager changes.
+ * Feb 05, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -328,17 +338,37 @@ public class SaveDeleteRefDialog extends CaveJFACEDialog {
     }
 
     private boolean deleteRef() {
-        // Note: Area will be deleted from all groups by
-        // UIReferenceSetMgr which processes deletions for
-        // incoming ReferenceSetInventoryChanged messages
+        /*
+         * Note: Area will be deleted from all groups by UIReferenceSetMgr which
+         * processes deletions for incoming ReferenceSetInventoryChanged
+         * messages
+         */
 
-        ReferenceID id = new ReferenceID(this.identifier.getText());
-        if (id.isValid() && !this.protectedSets.contains(id.getName())
-                && this.sets.contains(id.getName())) {
-            // Check to see if deleting active reference set
-            // If so, clear the active reference set
+        ReferenceID id = new ReferenceID(identifier.getText());
+        if ((id.isValid()) && (!protectedSets.contains(id.getName()))
+                && (sets.contains(id.getName()))) {
+            IPathManager pm = PathManagerFactory.getPathManager();
+            LocalizationContext ctx = pm.getContext(
+                    LocalizationType.COMMON_STATIC, LocalizationLevel.USER);
+            ILocalizationFile lf = pm.getLocalizationFile(ctx,
+                    ReferenceSetManager.EDIT_AREAS_DIR + IPathManager.SEPARATOR
+                            + id.getName() + ".xml");
+            boolean verify = AccessMgr.verifyDelete(lf.getPath(), lf
+                    .getContext().getLocalizationType(), false);
+            if (!verify) {
+                return false;
+            }
+            /*
+             * Check to see if deleting active reference set. If so, clear the
+             * active reference set
+             */
+            ReferenceID activeId = refSetMgr.getActiveRefSet().getId();
+            if (id.equals(activeId)) {
+                refSetMgr.incomingRefSet(refSetMgr.emptyRefSet(),
+                        RefSetMode.REPLACE);
+            }
             // LogStream.logUse("Delete", this.lbox.name())
-            return this.refSetMgr.deleteRefSet(id, true);
+            return refSetMgr.deleteRefSet(id);
 
         } else {
             String message = "Edit Area " + id.getName()
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteSampleSetDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteSampleSetDialog.java
index bbb9b17e6c..988bea1e8c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteSampleSetDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteSampleSetDialog.java
@@ -39,11 +39,18 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 import com.raytheon.uf.common.dataplugin.gfe.sample.SampleId;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.IPathManager;
+import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
+import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
+import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.viz.gfe.core.ISampleSetManager;
+import com.raytheon.viz.gfe.core.internal.SampleSetManager;
+import com.raytheon.viz.gfe.ui.AccessMgr;
 import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
 
 /**
@@ -56,6 +63,8 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * Mar 07, 2008            Eric Babin  Initial Creation
  * Oct 24, 2012 1287       rferrel     Code clean up for non-blocking dialog.
  * Sep 15, 2014 3592       randerso    Re-implemented to match A1
+ * Nov 19, 2014 5129       dgilling    Support SampleSetManager changes.
+ * Feb 05, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -224,10 +233,21 @@ public class SaveDeleteSampleSetDialog extends CaveJFACEDialog {
 
     private void deleteSample(String name) {
         SampleId id = new SampleId(name);
-        if (id.isValid() && !this.protectedSets.contains(name)
-                && this.sets.contains(name)) {
+        if ((id.isValid()) && (!protectedSets.contains(name))
+                && (sets.contains(name))) {
+            IPathManager pm = PathManagerFactory.getPathManager();
+            LocalizationContext ctx = pm.getContext(
+                    LocalizationType.COMMON_STATIC, LocalizationLevel.USER);
+            ILocalizationFile lf = pm.getLocalizationFile(ctx,
+                    SampleSetManager.SAMPLE_SETS_DIR + id.getName() + ".xml");
+            boolean verify = AccessMgr.verifyDelete(lf.getPath(), lf
+                    .getContext().getLocalizationType(), false);
+            if (!verify) {
+                return;
+            }
+
             // LogStream.logUse("Delete", name);
-            this.sampleSetMgr.deleteSampleSet(id);
+            sampleSetMgr.deleteSampleSet(id);
         } else {
             String message = "Sample Set " + name + " is protected "
                     + "or an invalid name. ";
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteSelectTRDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteSelectTRDialog.java
index 906cd408d1..7814e912c0 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteSelectTRDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteSelectTRDialog.java
@@ -48,8 +48,7 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.time.SimulatedTime;
-import com.raytheon.viz.gfe.GFEServerException;
-import com.raytheon.viz.gfe.core.DataManager;
+import com.raytheon.viz.gfe.core.ISelectTimeRangeManager;
 import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
 import com.raytheon.viz.ui.widgets.SpinScale;
 
@@ -64,6 +63,7 @@ import com.raytheon.viz.ui.widgets.SpinScale;
  * Dec 7, 2009            randerso     Initial creation
  * Aug 1, 2012   #965     dgilling     Change location of SelectTimeRange.
  * Oct 25, 2012  #1287     rferrel     Code cleanup part of non-blocking dialogs.
+ * Nov 18, 2015  #5129    dgilling     Support new IFPClient.
  * 
  * </pre>
  * 
@@ -75,12 +75,12 @@ public class SaveDeleteSelectTRDialog extends CaveJFACEDialog {
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(SaveDeleteSelectTRDialog.class);
 
-    private DataManager dataManager;
+    private final ISelectTimeRangeManager selectTRMgr;
+
+    private final TimeZone timeZone;
 
     private String optionStr;
 
-    private TimeZone timeZone;
-
     private List<String> ids = new ArrayList<String>();
 
     private List<String> protectedIds = new ArrayList<String>();
@@ -101,30 +101,23 @@ public class SaveDeleteSelectTRDialog extends CaveJFACEDialog {
 
     private boolean first = true;
 
-    public SaveDeleteSelectTRDialog(Shell parent, DataManager dataManager,
-            String optionStr) {
+    public SaveDeleteSelectTRDialog(Shell parent,
+            ISelectTimeRangeManager selectTRMgr, String optionStr) {
         super(parent);
-        this.dataManager = dataManager;
+        this.selectTRMgr = selectTRMgr;
         this.optionStr = optionStr;
 
         // Need to get them listed in order by time range
-        String[] names = dataManager.getSelectTimeRangeManager().inventory();
+        String[] names = this.selectTRMgr.inventory();
 
-        try {
-            timeZone = TimeZone.getTimeZone(dataManager.getClient()
-                    .getDBGridLocation().getTimeZone());
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error retrieving GFE time zone", e);
-            timeZone = TimeZone.getDefault();
-        }
+        this.timeZone = this.selectTRMgr.getTimeZone();
 
         if (optionStr.equals("Save")) {
             ids.addAll(Arrays.asList(names));
         } else {
             for (String name : names) {
-                if (dataManager.getSelectTimeRangeManager().getRange(name)
-                        .getLevel().equals(LocalizationLevel.USER)) {
+                if (this.selectTRMgr.getRange(name).getLevel()
+                        .equals(LocalizationLevel.USER)) {
                     ids.add(name);
                 } else {
                     protectedIds.add(name);
@@ -317,8 +310,7 @@ public class SaveDeleteSelectTRDialog extends CaveJFACEDialog {
         String[] items = timeRangeList.getSelection();
         for (String id : items) {
             if (optionStr.equals("Save")) {
-                SelectTimeRange range = dataManager.getSelectTimeRangeManager()
-                        .getRange(id);
+                SelectTimeRange range = selectTRMgr.getRange(id);
                 identifierField.setText(id);
                 stopScale.setSelection(range.getEnd());
                 startScale.setSelection(range.getStart());
@@ -339,9 +331,8 @@ public class SaveDeleteSelectTRDialog extends CaveJFACEDialog {
                 } else {
                     mode = Mode.ZULU;
                 }
-                dataManager.getSelectTimeRangeManager().save(id,
-                        startScale.getSelection(), stopScale.getSelection(),
-                        mode);
+                selectTRMgr.save(id, startScale.getSelection(),
+                        stopScale.getSelection(), mode);
                 super.okPressed();
             } else {
                 String message = "TimeRange " + id
@@ -365,7 +356,7 @@ public class SaveDeleteSelectTRDialog extends CaveJFACEDialog {
                 return;
             }
 
-            dataManager.getSelectTimeRangeManager().remove(id[0]);
+            selectTRMgr.remove(id[0]);
             super.okPressed();
         } else {
             String message = "TimeRange " + id[0]
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ScriptNameInputDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ScriptNameInputDialog.java
index b979dce414..8ae7055f57 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ScriptNameInputDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ScriptNameInputDialog.java
@@ -30,11 +30,9 @@ import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.Activator;
 import com.raytheon.viz.gfe.GFEException;
-import com.raytheon.viz.gfe.constants.StatusConstants;
 import com.raytheon.viz.gfe.core.script.ExistMode;
-import com.raytheon.viz.gfe.core.script.IScriptUtil;
+import com.raytheon.viz.gfe.core.script.PythonFileTemplate;
 
 /**
  * A dialog for the user to input the name of a script.
@@ -43,9 +41,10 @@ import com.raytheon.viz.gfe.core.script.IScriptUtil;
  * 
  */
 public class ScriptNameInputDialog extends InputDialog {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(ScriptNameInputDialog.class);
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(ScriptNameInputDialog.class);
 
-    protected IScriptUtil util;
+    protected PythonFileTemplate util;
 
     protected ExistMode mode;
 
@@ -63,10 +62,11 @@ public class ScriptNameInputDialog extends InputDialog {
      * @param validator
      *            The validator to apply to the input field. This is called for
      *            each character typed.
+     * @param util
      */
     public ScriptNameInputDialog(Shell parentShell, String dialogTitle,
             String dialogMessage, String initialValue,
-            IInputValidator validator, IScriptUtil util) {
+            IInputValidator validator, PythonFileTemplate util) {
         super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
         this.util = util;
         mode = ExistMode.NONE;
@@ -89,8 +89,7 @@ public class ScriptNameInputDialog extends InputDialog {
                 super.okPressed();
             }
         } catch (GFEException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error validating name", e);
+            statusHandler.handle(Priority.PROBLEM, "Error validating name", e);
         }
     }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/CallToActionsDlg.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/CallToActionsDlg.java
index 41f729df1a..e98b5107ff 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/CallToActionsDlg.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/CallToActionsDlg.java
@@ -22,7 +22,7 @@ package com.raytheon.viz.gfe.dialogs.formatterlauncher;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.WordUtils;
+import org.apache.commons.lang3.text.WordUtils;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.ScrolledComposite;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/OutputLogComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/OutputLogComp.java
index 9cb5d653f3..914df4fa78 100755
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/OutputLogComp.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/OutputLogComp.java
@@ -52,6 +52,8 @@ import com.raytheon.viz.gfe.tasks.TaskManager;
  * ------------ ---------- ----------- --------------------------
  * 18 APR 2008  ###        lvenable    Initial creation
  * 29 MAY 2014  #2841      randerso    Fix NPE when formatter fails to queue
+ * 12 NOV 2015  #5106      dgilling    Disable word-wrap to improve performance
+ *                                     for large log files.
  * 
  * </pre>
  * 
@@ -125,8 +127,7 @@ public class OutputLogComp extends Composite {
     private void initializeComponents() {
         GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
         outputLogST = new StyledText(this, SWT.BORDER | SWT.MULTI
-                | SWT.V_SCROLL);
-        outputLogST.setWordWrap(true);
+                | SWT.V_SCROLL | SWT.H_SCROLL);
         outputLogST.setFont(textFont);
         outputLogST.setEditable(false);
         outputLogST.setLayoutData(gd);
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
index 7fecf3b170..44934afc53 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
@@ -100,6 +100,7 @@ import com.raytheon.uf.common.jms.notification.INotificationObserver;
 import com.raytheon.uf.common.jms.notification.NotificationException;
 import com.raytheon.uf.common.jms.notification.NotificationMessage;
 import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -182,6 +183,9 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeOperations;
  *                                     match the current time
  * 01/21/2016  18505       lshi        Resent product should have same WMO, MND, and segment times
  *                                     as original product.
+ * 02/05/2016  5242        dgilling    Remove calls to deprecated Localization APIs.
+ * 02/10/2016   5337       dgilling    Prevent CAN products past VTEC end time 
+ *                                     from being transmitted.
  * </pre>
  * 
  * @author lvenable
@@ -1529,10 +1533,11 @@ public class ProductEditorComp extends Composite implements
                 throw new VizException(msg);
             }
 
-            // Give 30 minutes of slack to a couple of action codes
-            // check the ending time and transmission time
-            if ((action.equals("EXP") || action.equals("CAN"))
-                    && (vtecEnd != null)) {
+            /*
+             * Give 30 minutes of slack for EXP action code, check the ending
+             * time and transmission time
+             */
+            if ((action.equals("EXP")) && (vtecEnd != null)) {
                 vtecEnd.setTime(vtecEnd.getTime()
                         + (30 * TimeUtil.MILLIS_PER_MINUTE));
             }
@@ -2425,7 +2430,7 @@ public class ProductEditorComp extends Composite implements
         String product = null;
         try {
             product = readFile(file);
-        } catch (IOException ex) {
+        } catch (IOException | LocalizationException ex) {
             statusHandler.handle(Priority.PROBLEM, "Failed to load product "
                     + pil, ex);
             return;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/isc/ISCRequestReplyDlg.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/isc/ISCRequestReplyDlg.java
index 4aab706e08..4e6e14d96b 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/isc/ISCRequestReplyDlg.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/isc/ISCRequestReplyDlg.java
@@ -19,11 +19,23 @@
  **/
 package com.raytheon.viz.gfe.dialogs.isc;
 
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -33,11 +45,14 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
 
+import com.raytheon.uf.common.dataplugin.gfe.request.IscRequestQueryRequest.IscQueryResponse;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.viz.gfe.GFEServerException;
 import com.raytheon.viz.gfe.core.DataManager;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 
@@ -54,6 +69,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Oct 24. 2008  1287      rferrel      Made dialog non-blocking.
  * Dec 28, 2012  DR15587   jzeng        Query weather elements from fcst DB
  * Aug 14, 2015  4750      dgilling     Remove broken query.
+ * Nov 30, 2015  5129      dgilling     Support new IFPClient.
  * 
  * </pre>
  * 
@@ -65,6 +81,8 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
     private final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(ISCRequestReplyDlg.class);
 
+    private final DataManager dataManager;
+
     private ListManager domainList;
 
     private ListManager gridSrcList;
@@ -73,16 +91,12 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
 
     private Label gridSrcLbl;
 
-    private DataManager dataMgr;
-
     private List<String> weList;
 
     private Map<String, Map<String, List<Map<String, String>>>> domainDict;
 
     private Map<String, Map<String, String>> serverDictT2S;
 
-    private String xml;
-
     private boolean iscAvailable;
 
     /**
@@ -91,12 +105,12 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
      * @param parent
      *            Parent shell.
      */
-    public ISCRequestReplyDlg(Shell parent) {
+    public ISCRequestReplyDlg(DataManager dataManager, Shell parent) {
         super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.DO_NOT_BLOCK);
         setText("ISC Request/Reply");
 
-        dataMgr = DataManager.getCurrentInstance();
-        iscAvailable = dataMgr.requestISC();
+        this.dataManager = dataManager;
+        this.iscAvailable = this.dataManager.requestISC();
     }
 
     @Override
@@ -220,30 +234,30 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
         sepLbl.setLayoutData(gd);
     }
 
-    @SuppressWarnings("unchecked")
     private void initializeData() {
-        Object[] response = dataMgr.doIscRequestQuery();
-        this.xml = (String) response[0];
-        this.weList = (List<String>) response[1];
-        Collections.sort(this.weList);
+        IscQueryResponse response = dataManager.doIscRequestQuery();
 
-        domainDict = (Map<String, Map<String, List<Map<String, String>>>>) response[2];
-        serverDictT2S = (Map<String, Map<String, String>>) response[4];
+        weList = new ArrayList<>(response.getRequestedParms());
+        Collections.sort(weList);
+
+        domainDict = response.getDomainDict();
+        serverDictT2S = response.getServerDictT2S();
 
         // output the list of servers and their priority
-        String s = "\n";
-        for (String key : this.domainDict.keySet()) {
-            s += "DOMAIN=" + key + "\n";
-            ArrayList<Map<String, String>> servers = (ArrayList<Map<String, String>>) this.domainDict
+        StringBuilder s = new StringBuilder("\n");
+        for (String key : domainDict.keySet()) {
+            s.append("DOMAIN=").append(key).append('\n');
+            List<Map<String, String>> servers = (List<Map<String, String>>) domainDict
                     .get(key);
             for (Map<String, String> server : servers) {
-                s += "  mhs=" + server.get("mhsid") + " host="
-                        + server.get("host") + " port=" + server.get("port")
-                        + "\n";
+                s.append("  mhs=").append(server.get("mhsid")).append(" host=")
+                        .append(server.get("host")).append(" port=")
+                        .append(server.get("port")).append('\n');
             }
 
         }
-        statusHandler.info("DomainDict servers:" + s);
+        statusHandler.handle(Priority.EVENTB,
+                "DomainDict servers:" + s.toString());
     }
 
     private void populateDomainList() {
@@ -260,37 +274,166 @@ public class ISCRequestReplyDlg extends CaveSWTDialog {
 
     private void populateWEList() {
         this.weatherElemList.clearList();
-        this.weatherElemList.addItemToList(weList.toArray(new String[] {}));
+        this.weatherElemList.addItemToList(weList.toArray(new String[0]));
         this.weatherElemList.selectAll();
         this.weatherElemList.deselectAll();
     }
 
     public void makeRequest() {
         if (iscAvailable) {
-            try {
-                List<String> weatherElements = null;
-                if (this.domainList.getSelectedItems().isEmpty()) {
-                    statusHandler.handle(Priority.PROBLEM,
-                            "No Domain has been selected");
-                    return;
-                }
-                if (this.gridSrcList.getSelectedItems().isEmpty()) {
-                    statusHandler.handle(Priority.PROBLEM,
-                            "No Grid Source has been selected");
-                    return;
-                }
-                if (this.weatherElemList.getSelectedItems().isEmpty()) {
-                    weatherElements = this.weatherElemList.getItems();
-                } else {
-                    weatherElements = this.weatherElemList.getSelectedItems();
-                }
-                String response = dataMgr.getClient().iscGetRequestXML(xml,
-                        this.gridSrcList.getSelectedItems(), weatherElements);
-                dataMgr.makeISCRequest(response);
-            } catch (GFEServerException e) {
+            List<String> weatherElements = null;
+            if (domainList.getSelectedItems().isEmpty()) {
                 statusHandler.handle(Priority.PROBLEM,
-                        "Server Problem: Error making request", e);
+                        "No Domain has been selected");
+                return;
             }
+
+            List<String> selectedServers = gridSrcList.getSelectedItems();
+            if (selectedServers.isEmpty()) {
+                statusHandler.handle(Priority.PROBLEM,
+                        "No Grid Source has been selected");
+                return;
+            }
+            if (weatherElemList.getSelectedItems().isEmpty()) {
+                weatherElements = weatherElemList.getItems();
+            } else {
+                weatherElements = weatherElemList.getSelectedItems();
+            }
+
+            Document doc = null;
+            try {
+                doc = IrtAccess.getIscRequestXML(selectedServers,
+                        weatherElements, serverDictT2S);
+            } catch (DOMException | ParserConfigurationException e) {
+                statusHandler.error(
+                        "Unable to create XML document for request.", e);
+                return;
+            }
+
+            // output the list of servers and their priority
+            StringBuilder s = new StringBuilder("\n");
+            for (String key : domainDict.keySet()) {
+                s.append("DOMAIN=").append(key).append('\n');
+                for (String serverT : selectedServers) {
+                    Map<String, String> server = serverDictT2S.get(serverT);
+                    if (key.equals(server.get("site"))) {
+                        s.append("  mhs=").append(server.get("mhsid"))
+                                .append(" host=").append(server.get("host"))
+                                .append(" port=").append(server.get("port"))
+                                .append('\n');
+                    }
+                }
+            }
+            statusHandler.handle(Priority.EVENTB,
+                    "Chosen request servers:" + s.toString());
+
+            // send to ifpServer
+            String xmlreq = StringUtils.EMPTY;
+            try {
+                xmlreq = IrtAccess.convertXMLToString(doc);
+            } catch (TransformerException e) {
+                statusHandler.error(
+                        "Unable to write XML document for request.", e);
+                return;
+            }
+
+            dataManager.makeISCRequest(xmlreq);
+        }
+    }
+
+    private static class IrtAccess {
+
+        private IrtAccess() {
+            throw new AssertionError();
+        }
+
+        public static Document getIscRequestXML(List<String> selectedServers,
+                List<String> weatherElements,
+                Map<String, Map<String, String>> serverDictT2S)
+                throws DOMException, ParserConfigurationException {
+            DocumentBuilderFactory factory = DocumentBuilderFactory
+                    .newInstance();
+            DocumentBuilder builder = factory.newDocumentBuilder();
+
+            Document doc = builder.newDocument();
+            Element iscReqE = doc.createElement("iscrequest");
+            doc.appendChild(iscReqE);
+            List<Map<String, String>> destinations = new ArrayList<>();
+            for (String serverT : selectedServers) {
+                Map<String, String> server = serverDictT2S.get(serverT);
+                destinations.add(server);
+            }
+            addDestinationXML(iscReqE, destinations);
+            Element welistE = doc.createElement("welist");
+            iscReqE.appendChild(welistE);
+            for (String we : weatherElements) {
+                Element weE = doc.createElement("parm");
+                weE.appendChild(doc.createTextNode(we));
+                welistE.appendChild(weE);
+            }
+
+            return doc;
+        }
+
+        public static String convertXMLToString(Document doc)
+                throws TransformerException {
+            TransformerFactory tFactory = TransformerFactory.newInstance();
+            Transformer transformer = tFactory.newTransformer();
+
+            DOMSource source = new DOMSource(doc);
+            StringWriter writer = new StringWriter();
+            StreamResult result = new StreamResult(writer);
+            transformer.transform(source, result);
+            return writer.getBuffer().toString();
+        }
+
+        private static Element addDestinationXML(Element root,
+                List<Map<String, String>> serverInfos) {
+            Element destinationsE = root.getOwnerDocument().createElement(
+                    "destinations");
+            root.appendChild(destinationsE);
+            for (Map<String, String> serverInfo : serverInfos) {
+                addAddressXML(destinationsE, serverInfo);
+            }
+            return destinationsE;
+        }
+
+        private static Element addAddressXML(Element root,
+                Map<String, String> serverInfo) {
+            Element addressE = root.getOwnerDocument().createElement("address");
+            root.appendChild(addressE);
+
+            Element mhsidE = root.getOwnerDocument().createElement("mhsid");
+            String mhsidText = MapUtils.getString(serverInfo, "mhsid", "?");
+            mhsidE.appendChild(root.getOwnerDocument()
+                    .createTextNode(mhsidText));
+            addressE.appendChild(mhsidE);
+
+            Element serverE = root.getOwnerDocument().createElement("server");
+            String serverText = MapUtils.getString(serverInfo, "host", "?");
+            serverE.appendChild(root.getOwnerDocument().createTextNode(
+                    serverText));
+            addressE.appendChild(serverE);
+
+            Element portE = root.getOwnerDocument().createElement("port");
+            String portText = MapUtils.getString(serverInfo, "port", "?");
+            portE.appendChild(root.getOwnerDocument().createTextNode(portText));
+            addressE.appendChild(portE);
+
+            Element protocolE = root.getOwnerDocument().createElement(
+                    "protocol");
+            String protocolText = MapUtils.getString(serverInfo, "protocol",
+                    "?");
+            protocolE.appendChild(root.getOwnerDocument().createTextNode(
+                    protocolText));
+            addressE.appendChild(protocolE);
+
+            Element siteE = root.getOwnerDocument().createElement("site");
+            String siteText = MapUtils.getString(serverInfo, "site", "?");
+            siteE.appendChild(root.getOwnerDocument().createTextNode(siteText));
+            addressE.appendChild(siteE);
+
+            return addressE;
         }
     }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
index e6697c37e6..3e2ce9898e 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
@@ -33,7 +33,7 @@ import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/PencilTool.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/PencilTool.java
index b2e6e24bac..c29e316e28 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/PencilTool.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/edittool/PencilTool.java
@@ -59,6 +59,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * ------------ ---------- ----------- --------------------------
  * 05/01/2008              chammack    Added Pencil Influence
  * 04/16/2009   2262       rjpeter     Updated to handle mouse movements off the extent
+ * 01/28/2016   5295       dgilling    Fix handling of ISC grids with different
+ *                                     time constraints from Fcst grid.
  * </pre>
  * 
  * @author chammack
@@ -136,8 +138,8 @@ public class PencilTool extends AbstractFreeformTool {
 
         // isc mode, and fcst grid
         if (iscMode && fcstGrid) {
-            GridID gid = new GridID(grid.getParm(), grid.getGridTime()
-                    .getStart());
+            GridID gid = new GridID(grid.getParm(), dataManager
+                    .getSpatialDisplayManager().getSpatialEditorTime());
             return iscDataPoint(gid, new Point((int) gridCoord.x,
                     (int) gridCoord.y));
         }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
index 98f3813fd5..001f500b22 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
@@ -39,8 +39,6 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -53,7 +51,6 @@ import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Canvas;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Group;
@@ -85,6 +82,7 @@ import com.raytheon.uf.common.time.TimeRange;
 import com.raytheon.uf.viz.core.RGBColors;
 import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.zoneselector.AbstractZoneSelector.IZoneSelectionListener;
 import com.raytheon.viz.core.mode.CAVEMode;
 import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.PythonPreferenceStore;
@@ -96,29 +94,30 @@ import com.raytheon.viz.gfe.core.griddata.IGridData;
 import com.raytheon.viz.gfe.core.parm.Parm;
 import com.raytheon.viz.gfe.product.TextDBUtil;
 import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector;
-import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector.IZoneSelectionListener;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 import com.raytheon.viz.ui.statusline.StatusMessage.Importance;
 import com.raytheon.viz.ui.statusline.StatusStore;
 
 /**
  * Make Hazard Dialog
- *
+ * 
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer     Description
  * ------------ ---------- -----------  --------------------------
- * 	Jun 5, 2008				Eric Babin  Initial Creation
- *  Sep 27,2010 5813        gzhou       get etn from param pattern hazXXXnnn
- *  Feb 28,2012 14436		mli		    Add RP.S - Rip Current
- *  Apr 03,2012 436         randerso    Reworked dialog to be called by Python MakeHazard procedure
- *  Apr 09,2012 436         randerso    Merged RNK's MakeHazards_Elevation procedure
- *  May 30,2012 2028        randerso    Cleaned up dialog layout
- *  Nov 13,2014 646         lshi        Fixed hard coded endTimeSlider's Max value
- *  Jul 30,2015 17770       lshi        Add handling for AT, EP, CP and WP basins
- *
+ * Jun 05, 2008            Eric Babin   Initial Creation
+ * Sep 27, 2010 5813       gzhou        get etn from param pattern hazXXXnnn
+ * Feb 28, 2012 14436      mli          Add RP.S - Rip Current
+ * Apr 03, 2012 436        randerso     Reworked dialog to be called by Python MakeHazard procedure
+ * Apr 09, 2012 436        randerso     Merged RNK's MakeHazards_Elevation procedure
+ * May 30, 2012 2028       randerso     Cleaned up dialog layout
+ * Nov 13, 2014 646        lshi         Fixed hard coded endTimeSlider's Max value
+ * Jul 30, 2015 17770      lshi         Add handling for AT, EP, CP and WP basins
+ * Jan 14, 2016 5239       randerso     Fixed Zones included/not included labels not always visible
+ * Feb 05, 2016 5316       randerso     Moved AbstractZoneSelector to separate project
+ * 
  * </pre>
- *
+ * 
  * @author ebabin
  * @version 1.0
  */
@@ -130,8 +129,6 @@ public class MakeHazardDialog extends CaveSWTDialog implements
 
     private static final String DEFAULT_MAP_COLOR = "red";
 
-    private static final int LEGEND_HEIGHT = 16;
-
     private static final double DEFAULT_AREA_THRESHOLD = 0.10;
 
     private static final String ZONES_MSG = "USING MAP SELECTIONS";
@@ -167,7 +164,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
 
     /**
      * Used by hazard start and end Time.
-     *
+     * 
      */
     private int toHours = 96;
 
@@ -220,10 +217,6 @@ public class MakeHazardDialog extends CaveSWTDialog implements
 
     private Composite topComp;
 
-    private Canvas excluded;
-
-    private Canvas included;
-
     private Map<String, Integer> comboDict;
 
     private String currentHazardType;
@@ -234,13 +227,13 @@ public class MakeHazardDialog extends CaveSWTDialog implements
 
     private org.eclipse.swt.widgets.List hazardGroupList;
 
-    private static final String[] WMO_TITLES = {
-        "NATIONAL HURRICANE CENTER",        //NHC
-        "NATIONAL WEATHER SERVICE TIYAN",   //GUM
-        "CENTRAL PACIFIC HURRICANE CENTER"  //CPHC
+    private static final String[] WMO_TITLES = { "NATIONAL HURRICANE CENTER", // NHC
+            "NATIONAL WEATHER SERVICE TIYAN", // GUM
+            "CENTRAL PACIFIC HURRICANE CENTER" // CPHC
     };
 
-    private static final Map<String, String> BASINS = ImmutableMap.of("AT", "10", "EP", "20", "CP", "30", "WP", "40");
+    private static final Map<String, String> BASINS = ImmutableMap.of("AT",
+            "10", "EP", "20", "CP", "30", "WP", "40");
 
     public MakeHazardDialog(Shell parent, DataManager dataManager,
             String colorName, int defaultMapWidth, int timeScaleEndTime,
@@ -372,13 +365,13 @@ public class MakeHazardDialog extends CaveSWTDialog implements
         TimeRange timeRange = null;
         Parm parm = null;
         String parmName = null;
-        if (parms != null && parms.length == 1) {
+        if ((parms != null) && (parms.length == 1)) {
             parm = parms[0];
             parmName = parm.getParmID().getParmName();
         }
 
         // Check for an ETN or segment #
-        if (parmName != null && parmName.startsWith("haz")) {
+        if ((parmName != null) && parmName.startsWith("haz")) {
 
             // DR 5813
             // parmName example: hazXXXnnn
@@ -387,7 +380,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
             while (Character.isDigit(parmName.charAt(--index))) {
             }
 
-            if (index < parmName.length() - 1) {
+            if (index < (parmName.length() - 1)) {
                 String etn = parmName.substring(index + 1);
                 if (Integer.parseInt(etn) > 0) {
                     this.etnSegNumberField.setText(etn);
@@ -397,7 +390,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
 
         timeRange = determineTimeRange(parm);
 
-        if (parmName == null || !parmName.startsWith("haz")) {
+        if ((parmName == null) || !parmName.startsWith("haz")) {
             setTRSliders(timeRange);
             return;
         }
@@ -405,7 +398,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
         IGridData[] grids = null;
         if (timeRange != null) {
             grids = parm.getGridInventory(timeRange);
-            if (grids == null || grids.length != 1) {
+            if ((grids == null) || (grids.length != 1)) {
                 timeRange = null;
             } else {
                 timeRange = grids[0].getGridTime();
@@ -455,10 +448,10 @@ public class MakeHazardDialog extends CaveSWTDialog implements
                 updateTime(startHour, startTimeLabel);
 
                 int endHour = (int) (endLong - zeroLong) / (60 * 60 * 1000);
-                if (endHour < startHour + 1) {
+                if (endHour < (startHour + 1)) {
                     endHour = startHour + 1;
                 }
-                if (endHour > toHours + 1) {
+                if (endHour > (toHours + 1)) {
                     statusHandler.handle(Priority.VERBOSE,
                             "Hazard end time is beyond date slider limit");
                     endHour = toHours + 1;
@@ -475,7 +468,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
      * preview() process. Currently, we don't implement preview(), but we
      * probably will at some point in the future. When we do, we can get rid of
      * this method and let preview() do this for us like AWIPS I did.
-     *
+     * 
      * @param parm
      * @return
      */
@@ -484,7 +477,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
                 .getSpatialEditorTime();
 
         TimeRange timeRange = dataManager.getParmOp().getSelectionTimeRange();
-        if (timeRange != null && timeRange.isValid()) {
+        if ((timeRange != null) && timeRange.isValid()) {
             if (!timeRange.contains(seTime)) {
                 statusHandler
                         .handle(Priority.PROBLEM,
@@ -495,7 +488,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
             timeRange = null;
             if (parm != null) {
                 timeRange = parm.getParmState().getSelectedTimeRange();
-                if (timeRange != null && !timeRange.isValid()) {
+                if ((timeRange != null) && !timeRange.isValid()) {
                     timeRange = null;
                 }
             }
@@ -508,9 +501,9 @@ public class MakeHazardDialog extends CaveSWTDialog implements
             }
         }
 
-        if (timeRange != null && parm != null) {
+        if ((timeRange != null) && (parm != null)) {
             IGridData[] grids = parm.getGridInventory(timeRange);
-            if (grids != null && grids.length > 1) {
+            if ((grids != null) && (grids.length > 1)) {
                 // There should be a yes/no dialog pop up...
             }
         }
@@ -522,7 +515,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
      * Figure out the hazard type (i.e., "Winter Weather") and db tables to use,
      * based on phen_sig. The same phensig sometimes appears in multiple hazard
      * types, so pick the one that draws from the most db tables.
-     *
+     * 
      * @param phen_sig
      */
     protected void pickDefaultCategory(String phen_sig) {
@@ -531,11 +524,11 @@ public class MakeHazardDialog extends CaveSWTDialog implements
         Map<String, List<String>> hazDict = getHazardsDictionary();
         for (Map.Entry<String, List<String>> entry : hazDict.entrySet()) {
             List<String> phenSigsForType = entry.getValue();
-            if (phenSigsForType != null && phenSigsForType.contains(phen_sig)) {
+            if ((phenSigsForType != null) && phenSigsForType.contains(phen_sig)) {
                 String entryHazardType = entry.getKey();
                 List<String> entryHazTables = mapNames.get(entryHazardType);
-                if (hazTables == null
-                        || hazTables.size() < entryHazTables.size()) {
+                if ((hazTables == null)
+                        || (hazTables.size() < entryHazTables.size())) {
                     hazardType = entryHazardType;
                     hazTables = entryHazTables;
                 }
@@ -578,7 +571,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
      * Create the hazard in response to the run or run/dismiss button. Indicate
      * whether the run succeeded so run/dismiss knows whether it's OK to close
      * the dialog.
-     *
+     * 
      * @return true if the hazard was created, false otherwise.
      */
     private boolean doRunInternal(boolean dismiss) {
@@ -698,7 +691,8 @@ public class MakeHazardDialog extends CaveSWTDialog implements
                 if (baseEtnCode != null) {
                     nationalBase = baseEtnCode;
                 } else {
-                    statusHandler.warn("Undefined basin ID: " + baseETN + ", defaulting to AT");
+                    statusHandler.warn("Undefined basin ID: " + baseETN
+                            + ", defaulting to AT");
                 }
                 String stormNum = altFileName.substring(2, 4);
                 tropicalETN = nationalBase + stormNum;
@@ -869,37 +863,33 @@ public class MakeHazardDialog extends CaveSWTDialog implements
         showMapLabelsButton.setText("Map Labels");
 
         comp = new Composite(buttonComp, SWT.NONE);
-        layout = new GridLayout(1, false);
+        layout = new GridLayout(2, false);
         layout.marginHeight = 0;
         layout.marginWidth = 0;
         comp.setLayout(layout);
-        layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
+        layoutData = new GridData(SWT.RIGHT, SWT.FILL, true, true);
         comp.setLayoutData(layoutData);
 
-        excluded = new Canvas(comp, SWT.NONE);
-        gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
-        gd.heightHint = LEGEND_HEIGHT;
-        excluded.setLayoutData(gd);
-        excluded.addPaintListener(new PaintListener() {
+        GC gc = new GC(getDisplay());
+        int height = gc.getFontMetrics().getHeight();
+        gc.dispose();
 
-            @Override
-            public void paintControl(PaintEvent e) {
-                paintLegend(e.gc, zoneSelector.getNoZoneColor(),
-                        "Zones not included");
-            }
-        });
+        Label label = new Label(comp, SWT.NONE);
+        label.setBackground(new Color(getDisplay(), zoneSelector
+                .getNoZoneColor()));
+        gd = new GridData(height, height);
+        label.setLayoutData(gd);
 
-        included = new Canvas(comp, SWT.NONE);
-        gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
-        gd.heightHint = 16;
-        included.setLayoutData(gd);
-        included.addPaintListener(new PaintListener() {
+        label = new Label(comp, SWT.NONE);
+        label.setText("Zones not included");
 
-            @Override
-            public void paintControl(PaintEvent e) {
-                paintLegend(e.gc, mapColor, "Zones included");
-            }
-        });
+        label = new Label(comp, SWT.NONE);
+        label.setBackground(new Color(getDisplay(), mapColor));
+        gd = new GridData(height, height);
+        label.setLayoutData(gd);
+
+        label = new Label(comp, SWT.NONE);
+        label.setText("Zones included");
 
         showMapLabelsButton.addSelectionListener(new SelectionAdapter() {
             @Override
@@ -961,21 +951,6 @@ public class MakeHazardDialog extends CaveSWTDialog implements
         usingLabel.setText(EDIT_AREA_MSG);
     }
 
-    private void paintLegend(GC gc, RGB color, String text) {
-        Color bg = new Color(getDisplay(), color);
-        gc.setForeground(getDisplay().getSystemColor(SWT.COLOR_WHITE));
-        gc.setBackground(bg);
-        int height = gc.getFontMetrics().getHeight();
-        gc.fillRectangle(height, 0, height, height);
-        gc.drawRectangle(height, 0, height, height);
-
-        gc.setBackground(CAVEMode.getBackgroundColor());
-        gc.setForeground(CAVEMode.getForegroundColor());
-        gc.drawText(text, height * 2
-                + gc.getFontMetrics().getAverageCharWidth(), 0);
-        bg.dispose();
-    }
-
     private void createSelectHazardComponent(Composite hazardComp) {
         GridLayout gl = new GridLayout(2, false);
         gl.marginHeight = 0;
@@ -998,7 +973,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
         selectedHazardList = new org.eclipse.swt.widgets.List(hazardGroup,
                 SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE);
         gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
-        gd.heightHint = selectedHazardList.getItemHeight() * 16
+        gd.heightHint = (selectedHazardList.getItemHeight() * 16)
                 + selectedHazardList.getBorderWidth();
         selectedHazardList.setLayoutData(gd);
 
@@ -1035,8 +1010,8 @@ public class MakeHazardDialog extends CaveSWTDialog implements
         hazardGroupList = new org.eclipse.swt.widgets.List(hazardTypeGroup,
                 SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.SINGLE);
         gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
-        gd.heightHint = hazardGroupList.getItemHeight()
-                * Math.min(12, groups.size())
+        gd.heightHint = (hazardGroupList.getItemHeight() * Math.min(12,
+                groups.size()))
                 + hazardGroupList.getBorderWidth();
         hazardGroupList.setLayoutData(gd);
         hazardGroupList.addSelectionListener(selAdapt);
@@ -1133,7 +1108,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
              * Event handler for when the user moves the slider. This updates
              * the slider label and changes the end time slider if the end time
              * is before the start time.
-             *
+             * 
              * @param e
              *            The event that caused this handler to be called.
              */
@@ -1181,7 +1156,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
         gd.minimumWidth = 200;
         endTimeSlider.setLayoutData(gd);
 
-        toHours = this.timeScaleEndTime; //#646
+        toHours = this.timeScaleEndTime; // #646
         endTimeSlider.setMinimum(1);
         endTimeSlider.setMaximum(toHours + 1);
         endTimeSlider.setIncrement(1);
@@ -1198,7 +1173,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
              * Event handler for when the user moves the slider. This updates
              * the slider label and changes the start time slider if the end
              * time is before the start time.
-             *
+             * 
              * @param e
              *            The event that caused this handler to be called.
              */
@@ -1315,7 +1290,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
      * Add <code>selection</code> hours to <code>hazardStartTime</code> (that
      * is, the default starting time), and set the text of <code>label</code> to
      * the result, formatted by <code>dateFormatter</code>.
-     *
+     * 
      * @param selection
      *            The integer slider value selected by the user.
      * @param label
@@ -1348,7 +1323,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
      * Set the hazard type in the radio button control. If the hazard type is
      * changed, the radio button selection listener will fire, changing and
      * clearing selectedHazardList as a side effect.
-     *
+     * 
      * @param hazardType
      *            the hazard type to select.
      */
@@ -1368,7 +1343,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
                 if (laData != null) {
                     String label = eaName;
                     String display = (String) laData.get(1);
-                    if (display != null && !display.isEmpty()) {
+                    if ((display != null) && !display.isEmpty()) {
                         label = display;
                     }
                     leCombo.add(label);
@@ -1397,12 +1372,12 @@ public class MakeHazardDialog extends CaveSWTDialog implements
      * Set the selection in selectedHazardList to the first item that starts
      * with phen_sig. If phen_sig is null or an empty string, clears all
      * selections.
-     *
+     * 
      * @param phen_sig
      *            The phen_sig to select
      */
     public void setHazard(String phen_sig) {
-        if (phen_sig == null || phen_sig.length() == 0) {
+        if ((phen_sig == null) || (phen_sig.length() == 0)) {
             selectedHazardList.deselectAll();
             return;
         }
@@ -1443,7 +1418,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
 
             @SuppressWarnings("unchecked")
             List<String> zoneList = (List<String>) laData.get(2);
-            if (zoneList != null && !zoneList.isEmpty()) {
+            if ((zoneList != null) && !zoneList.isEmpty()) {
                 Map<String, Integer> comboDict = new HashMap<String, Integer>(
                         zoneList.size());
                 for (String z : zoneList) {
@@ -1481,7 +1456,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
             List<String> zoneIdsToShow = getAreaList(grid2DBit);
 
             // Select the zones
-            if (zoneIdsToShow != null && zoneIdsToShow.size() > 0) {
+            if ((zoneIdsToShow != null) && (zoneIdsToShow.size() > 0)) {
                 usingLabel.setText(ZONES_MSG);
                 for (String z : zoneIdsToShow) {
                     this.comboDict.put(z, 1);
@@ -1500,7 +1475,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
 
     /*
      * (non-Javadoc)
-     *
+     * 
      * @see
      * com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector.IZoneSelectionListener
      * #zonesSelected()
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureFactory.java
index 7050b39f34..3429eac9da 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureFactory.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureFactory.java
@@ -26,7 +26,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.python.PyUtil;
 import com.raytheon.uf.common.python.PythonIncludePathUtil;
-import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
+import com.raytheon.uf.common.python.concurrent.PythonInterpreterFactory;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.viz.gfe.core.DataManager;
 
@@ -41,21 +41,22 @@ import com.raytheon.viz.gfe.core.DataManager;
  * Feb 25, 2010  4108     ryu         Add user/site directories to include path
  * May 20, 2015  4509     njensen     Added time and dataaccess to include path
  * Jul 27, 2015  #4263    dgilling    Refactor and make abstract.
+ * Dec 14, 2015  4816     dgilling    Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
+ * `1
+ * 
  * @author njensen
  * @version 1.0
  */
 
-public abstract class ProcedureFactory<C extends ProcedureController> extends
-        AbstractPythonScriptFactory<C> {
+public abstract class ProcedureFactory<C extends ProcedureController>
+        implements PythonInterpreterFactory<C> {
 
     protected final DataManager dataMgr;
 
-    public ProcedureFactory(String name, int numThreads,
-            final DataManager dataMgr) {
-        super(name, numThreads);
+    public ProcedureFactory(final DataManager dataMgr) {
         this.dataMgr = dataMgr;
     }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureMetadataManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureMetadataManager.java
index 0d392d3acf..f78fe3b68e 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureMetadataManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureMetadataManager.java
@@ -53,6 +53,7 @@ import com.raytheon.viz.gfe.smartscript.FieldDefinition;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 24, 2015  #4263     dgilling     Initial creation
+ * Dec 14, 2015  #4816     dgilling     Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -66,6 +67,10 @@ public final class ProcedureMetadataManager implements
     private final IUFStatusHandler statusHandler = UFStatus
             .getHandler(getClass());
 
+    private static final String THREAD_POOL_NAME = "procedure-metadata";
+
+    private static final int NUM_POOL_THREADS = 1;
+
     private final PythonJobCoordinator<ProcedureMetadataController> jobCoordinator;
 
     private final Map<String, ProcedureMetadata> metadata;
@@ -79,7 +84,8 @@ public final class ProcedureMetadataManager implements
     public ProcedureMetadataManager(final DataManager dataMgr) {
         ProcedureMetadataScriptFactory scriptFactory = new ProcedureMetadataScriptFactory(
                 dataMgr);
-        this.jobCoordinator = PythonJobCoordinator.newInstance(scriptFactory);
+        this.jobCoordinator = new PythonJobCoordinator<>(NUM_POOL_THREADS,
+                THREAD_POOL_NAME, scriptFactory);
 
         this.metadata = new HashMap<>();
         this.accessLock = new Object();
@@ -109,7 +115,7 @@ public final class ProcedureMetadataManager implements
             }
         };
         try {
-            jobCoordinator.submitAsyncJob(executor, listener);
+            jobCoordinator.submitJobWithCallback(executor, listener);
         } catch (Exception e1) {
             statusHandler.error("Error initializing procedure metadata.", e1);
         }
@@ -199,7 +205,7 @@ public final class ProcedureMetadataManager implements
             }
         };
         try {
-            jobCoordinator.submitAsyncJob(executor, listener);
+            jobCoordinator.submitJobWithCallback(executor, listener);
         } catch (Exception e1) {
             statusHandler.error("Error updating procedure metadata.", e1);
         }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureMetadataScriptFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureMetadataScriptFactory.java
index 881673ab48..240aabe8ef 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureMetadataScriptFactory.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureMetadataScriptFactory.java
@@ -33,6 +33,7 @@ import com.raytheon.viz.gfe.core.DataManager;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 24, 2015  #4263     dgilling     Initial creation
+ * Dec 14, 2015  #4816     dgilling     Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -43,21 +44,10 @@ import com.raytheon.viz.gfe.core.DataManager;
 public final class ProcedureMetadataScriptFactory extends
         ProcedureFactory<ProcedureMetadataController> {
 
-    private static final String SCRIPT_EXECUTOR_NAME = "procedure-metadata";
-
-    private static final int EXECUTOR_NUM_THREADS = 1;
-
     public ProcedureMetadataScriptFactory(final DataManager dataMgr) {
-        super(SCRIPT_EXECUTOR_NAME, EXECUTOR_NUM_THREADS, dataMgr);
+        super(dataMgr);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory#
-     * createPythonScript()
-     */
     @Override
     public ProcedureMetadataController createPythonScript() throws JepException {
         return new ProcedureMetadataController(buildScriptPath(),
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureRunnerScriptFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureRunnerScriptFactory.java
index dbde3c6590..a7271861b6 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureRunnerScriptFactory.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureRunnerScriptFactory.java
@@ -33,6 +33,7 @@ import com.raytheon.viz.gfe.core.DataManager;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 25, 2015  #4263     dgilling     Initial creation
+ * Dec 14, 2015  #4816     dgilling     Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -43,17 +44,8 @@ import com.raytheon.viz.gfe.core.DataManager;
 public final class ProcedureRunnerScriptFactory extends
         ProcedureFactory<ProcedureRunnerController> {
 
-    /*
-     * These constants that are passed to the super constructor only matter if
-     * procedure execution gets hooked into our python concurrent execution
-     * framework. Since it isn't we use dummy values for now...
-     */
-    private static final String SCRIPT_EXECUTOR_NAME = "procedure-runner";
-
-    private static final int EXECUTOR_NUM_THREADS = 0;
-
     public ProcedureRunnerScriptFactory(final DataManager dataMgr) {
-        super(SCRIPT_EXECUTOR_NAME, EXECUTOR_NUM_THREADS, dataMgr);
+        super(dataMgr);
     }
 
     /*
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProceduresAdapter.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProceduresAdapter.java
index 5f0cc8a81a..67ef145baa 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProceduresAdapter.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProceduresAdapter.java
@@ -23,7 +23,7 @@ import org.eclipse.jface.action.IMenuManager;
 
 import com.raytheon.uf.viz.localization.adapter.LocalizationPerspectiveAdapter;
 import com.raytheon.uf.viz.localization.filetreeview.FileTreeEntryData;
-import com.raytheon.viz.gfe.core.script.IScriptUtil;
+import com.raytheon.viz.gfe.core.script.PythonFileTemplate;
 import com.raytheon.viz.gfe.core.script.action.NewAction;
 import com.raytheon.viz.gfe.procedures.util.ProcedureUtil;
 
@@ -55,7 +55,7 @@ public class ProceduresAdapter extends LocalizationPerspectiveAdapter {
     @Override
     public boolean addContextMenuItems(IMenuManager menuMgr,
             FileTreeEntryData[] selectedData) {
-        IScriptUtil util = new ProcedureUtil();
+        PythonFileTemplate util = new ProcedureUtil();
         NewAction newAction = new NewAction(util);
         menuMgr.add(newAction);
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/util/ProcedureUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/util/ProcedureUtil.java
index 2873dfcaae..740dfc5389 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/util/ProcedureUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/util/ProcedureUtil.java
@@ -26,7 +26,18 @@ import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.viz.gfe.core.script.AbstractScriptUtil;
 
 /**
- * A concrete implementation of IScriptUtil for working with Procedure scripts.
+ * An implementation of PythonFileTemplate for making new Procedures.
+ * 
+ * <pre>
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * ???                     wldougher   Initial creation
+ * Jan 19, 2016  4834      njensen     Removed dead method
+ *
+ * </pre>
  * 
  * @author wldougher
  * 
@@ -44,39 +55,19 @@ public class ProcedureUtil extends AbstractScriptUtil {
         super();
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getScriptType()
-     */
     @Override
     public String getScriptType() {
         return scriptType;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getScriptTypePathPrefix
-     *      ()
-     */
     @Override
     public String getScriptTypePathPrefix() {
         return GfePyIncludeUtil.PROCEDURES;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getVelocityTemplateName
-     *      ()
-     */
     @Override
     protected String getVelocityTemplateName() {
         return TEMPLATE_FILENAME;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getFileType()
-     */
-    @Override
-    public String getFileType() {
-        return "PROCEDURE";
-    }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/product/ProductFileUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/product/ProductFileUtil.java
index 00a3851eb4..82b7a381f6 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/product/ProductFileUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/product/ProductFileUtil.java
@@ -22,10 +22,14 @@ package com.raytheon.viz.gfe.product;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,8 +39,10 @@ import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.LocalizationUtil;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.time.SimulatedTime;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.viz.core.mode.CAVEMode;
@@ -49,6 +55,8 @@ import com.raytheon.viz.core.mode.CAVEMode;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 11 Feb 2010  4132       ryu         Initial creation
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 05, 2016 5242       dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -101,7 +109,7 @@ public class ProductFileUtil {
         ArrayList<String> names = new ArrayList<String>();
         String regex = "2\\d{7}_\\d{6}_" + pil;
         for (LocalizationFile f : files) {
-            String fname = f.getFile().getName();
+            String fname = LocalizationUtil.extractName(f.getPath());
             if (fname.matches(regex)) {
                 names.add(fname);
             }
@@ -132,54 +140,56 @@ public class ProductFileUtil {
     }
 
     static public void writeFile(String text, File file) throws IOException {
-        if (!file.exists()) {
-            if (file.getParentFile() != null) {
-                file.getParentFile().mkdirs();
-            }
-        }
+        Path filePath = file.toPath();
+        Files.createDirectories(filePath);
 
-        Writer out = null;
-        try {
-            out = new BufferedWriter(new FileWriter(file));
-            out.write(text);
-        } finally {
-            if (out != null) {
-                out.close();
-            }
+        try (Writer out = Files.newBufferedWriter(filePath,
+                StandardCharsets.UTF_8)) {
+            writeFile(text, out);
         }
     }
 
     static public String readFile(File file) throws IOException {
-        StringBuilder builder = new StringBuilder();
-        BufferedReader in = null;
-        try {
-            in = new BufferedReader(new FileReader(file));
-            String line;
-            while ((line = in.readLine()) != null) {
-                builder.append(line);
-                builder.append(System.getProperty("line.separator"));
-            }
-        } finally {
-            if (in != null) {
-                in.close();
-            }
+        try (BufferedReader in = Files.newBufferedReader(file.toPath(),
+                StandardCharsets.UTF_8)) {
+            return readFile(in);
         }
-
-        return builder.toString();
     }
 
     static public void writeFile(String text, LocalizationFile localizationFile)
-            throws IOException, LocalizationOpFailedException {
-        File file = localizationFile.getFile();
-        writeFile(text, file);
-
-        localizationFile.save();
+            throws IOException, LocalizationException {
+        try (SaveableOutputStream outStream = localizationFile
+                .openOutputStream();
+                Writer out = new BufferedWriter(new OutputStreamWriter(
+                        outStream))) {
+            writeFile(text, out);
+            out.close();
+            outStream.save();
+        }
     }
 
     static public String readFile(LocalizationFile localizationFile)
-            throws IOException {
-        File file = localizationFile.getFile();
-        return readFile(file);
+            throws IOException, LocalizationException {
+        try (InputStream inStream = localizationFile.openInputStream();
+                BufferedReader in = new BufferedReader(new InputStreamReader(
+                        inStream))) {
+            return readFile(in);
+        }
     }
 
+    private static String readFile(BufferedReader reader) throws IOException {
+        StringBuilder contents = new StringBuilder();
+        String line;
+        while ((line = reader.readLine()) != null) {
+            contents.append(line);
+            contents.append(System.getProperty("line.separator"));
+        }
+
+        return contents.toString();
+    }
+
+    private static void writeFile(String text, Writer writer)
+            throws IOException {
+        writer.write(text);
+    }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScriptFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScriptFactory.java
index a79dbfe509..2167b65740 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScriptFactory.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/query/QueryScriptFactory.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 
 import jep.JepException;
 
-import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
+import com.raytheon.uf.common.python.concurrent.PythonInterpreterFactory;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -38,7 +38,8 @@ import com.raytheon.viz.gfe.core.DataManager;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Feb 7, 2013            mnash     Initial creation
+ * Feb 07, 2013            mnash       Initial creation
+ * Dec 14, 2015  #4816     dgilling    Rewrite based on PythonInterpreterFactory.
  * 
  * </pre>
  * 
@@ -46,8 +47,8 @@ import com.raytheon.viz.gfe.core.DataManager;
  * @version 1.0
  */
 
-public class QueryScriptFactory extends
-        AbstractPythonScriptFactory<QueryScript> {
+public class QueryScriptFactory implements
+        PythonInterpreterFactory<QueryScript> {
     private static final IUFStatusHandler statusHandler = UFStatus
             .getHandler(QueryScriptFactory.class);
 
@@ -57,25 +58,9 @@ public class QueryScriptFactory extends
      * 
      */
     public QueryScriptFactory(DataManager dataMgr) {
-        this("gfequeryscript", 1);
         this.manager = dataMgr;
     }
 
-    /**
-     * @param name
-     * @param maxThreads
-     */
-    public QueryScriptFactory(String name, int maxThreads) {
-        super(name, maxThreads);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory#
-     * createPythonScript()
-     */
     @Override
     public QueryScript createPythonScript() {
         try {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEFonts.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEFonts.java
index b9029f1fc8..d7aa5e7cda 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEFonts.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEFonts.java
@@ -34,7 +34,7 @@ import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.GFEPreference;
 
 /**
- * TODO Add Description
+ * Get appropriate SWT or GL font based on GFE preferences
  * 
  * <pre>
  * 
@@ -42,11 +42,12 @@ import com.raytheon.viz.gfe.GFEPreference;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 14, 2010            randerso     Initial creation
- * Apr 27, 2011 #9250      bkowal       getStyle and getName are now used to
- *                                      get the style and name associated with
- *                                      a FontData object.
- * Nov 20, 2013 #2488      randerso     Changed to use DejaVu fonts
+ * Oct 14, 2010            randerso    Initial creation
+ * Apr 27, 2011 #9250      bkowal      getStyle and getName are now used to
+ *                                     get the style and name associated with
+ *                                     a FontData object.
+ * Nov 20, 2013 #2488      randerso    Changed to use DejaVu fonts
+ * Nov 05, 2015 #5070      randerso    Remove scale factor for GLFonts (was adjusting for DPI)
  * 
  * </pre>
  * 
@@ -151,8 +152,7 @@ public class GFEFonts {
             style = new IFont.Style[0];
         }
 
-        IFont font = target.initializeFont(fd.getName(), fd.height * 1.2f,
-                style);
+        IFont font = target.initializeFont(fd.getName(), fd.height, style);
         font.setSmoothing(false);
         font.setScaleFont(false);
         return font;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/ZoneDbResourceData.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/ZoneDbResourceData.java
deleted file mode 100644
index bfd53a188b..0000000000
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/ZoneDbResourceData.java
+++ /dev/null
@@ -1,539 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.gfe.rsc;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-import org.eclipse.swt.graphics.RGB;
-
-import com.raytheon.uf.viz.core.drawables.IDescriptor;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.rsc.AbstractNameGenerator;
-import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
-import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
-import com.raytheon.uf.viz.core.rsc.LoadProperties;
-import com.raytheon.viz.gfe.rsc.zones.ZoneDbResource;
-
-/**
- * 
- * Resource data for Zones in the database.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Oct 28, 2013  2491     bsteffen    Add @XmlTransient
- * 
- * </pre>
- * 
- * @author wldougher
- * @version 1.0
- */
-@XmlTransient
-public class ZoneDbResourceData extends AbstractResourceData {
-
-    public static final RGB DEFAULT_BACKGROUND_COLOR = new RGB(50, 50, 50);
-
-    public static final RGB DEFAULT_CWA_COLOR = new RGB(184, 134, 11);
-
-    public static final RGB DEFAULT_OUTLINE_COLOR = new RGB(0, 0, 0);
-
-    public static final RGB DEFAULT_LABEL_COLOR = new RGB(200, 200, 200);
-
-    public static final RGB DEFAULT_SELECTION_COLOR = new RGB(200, 0, 0);
-
-    public static final String LABEL_KEY = "LABEL";
-
-    public static final String CWA_KEY = "CWA";
-
-    public static final String OUTLINE_KEY = "OUTLINE";
-
-    public static final Integer NO_GROUP = Integer.valueOf(-1);
-
-    public static final Integer SELECTION_GROUP = Integer.valueOf(0);
-
-    /** The human readable name */
-    @XmlElement(required = true)
-    private String mapName = null;
-
-    /** All the maps DB table names to take data from */
-    @XmlElement(required = true)
-    private List<String> allTables;
-
-    /** The Maps DB table names for visible zones */
-    @XmlElement(required = true)
-    private List<String> tables;
-
-    /**
-     * Constraints (other than the bounding box) to apply to the queries. The
-     * constraints are tied to the table to which they apply.
-     */
-    @XmlElement
-    private Map<String, String[]> constraintsMap;
-
-    /**
-     * The columns (other than geometry) to query. The columns are tied to the
-     * table they come from. The query columns for all tables must be
-     * union-compatible.
-     */
-    @XmlElement
-    private Map<String, String[]> queryColumnsMap;
-
-    @XmlElement
-    private Map<Object, RGB> colorMap;
-
-    /**
-     * Constructor.
-     */
-    public ZoneDbResourceData() {
-        super();
-        colorMap = new HashMap<Object, RGB>();
-        this.setBackgroundColor(DEFAULT_BACKGROUND_COLOR);
-        this.setCwaColor(DEFAULT_CWA_COLOR);
-        this.setLabelColor(DEFAULT_LABEL_COLOR);
-        this.setOutlineColor(DEFAULT_OUTLINE_COLOR);
-        this.setSelectionColor(DEFAULT_SELECTION_COLOR);
-        this.nameGenerator = new AbstractNameGenerator() {
-
-            @Override
-            public String getName(AbstractVizResource<?, ?> resource) {
-                return mapName;
-            }
-
-        };
-        allTables = new ArrayList<String>();
-        tables = new ArrayList<String>();
-        constraintsMap = new HashMap<String, String[]>();
-        queryColumnsMap = new HashMap<String, String[]>();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.rsc.AbstractResourceData#construct(com.raytheon
-     * .uf.viz.core.comm.LoadProperties,
-     * com.raytheon.uf.viz.core.drawables.IDescriptor)
-     */
-    @Override
-    public ZoneDbResource construct(LoadProperties loadProperties,
-            IDescriptor descriptor) throws VizException {
-        return new ZoneDbResource(this, loadProperties);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.rsc.AbstractResourceData#update(java.lang.Object
-     * )
-     */
-    @Override
-    public void update(Object updateData) {
-        // TODO Auto-generated method stub
-
-    }
-
-    /**
-     * @return the mapName
-     */
-    public String getMapName() {
-        return mapName;
-    }
-
-    /**
-     * @param mapName
-     *            the mapName to set
-     */
-    public void setMapName(String mapName) {
-        this.mapName = mapName;
-    }
-
-    /**
-     * @return the mainTable
-     */
-    public String getMainTable() {
-        return tables.get(0);
-    }
-
-    /**
-     * @param mainTable
-     *            the mainTable to set
-     */
-    public void setMainTable(String mainTable) {
-        tables.clear();
-        addTable(mainTable);
-    }
-
-    /**
-     * @return the constraints
-     */
-    public String[] getConstraints() {
-        String mainTable = getMainTable();
-        return constraintsMap.get(mainTable);
-    }
-
-    /**
-     * @param table
-     * @return constraints
-     */
-    public String[] getConstraints(String table) {
-        return constraintsMap.get(table);
-    }
-
-    /**
-     * @param constraints
-     *            the constraints to set
-     */
-    public void setConstraints(String[] constraints) {
-        String mainTable = getMainTable();
-        constraintsMap.put(mainTable, constraints);
-    }
-
-    /**
-     * @param table
-     * @param constraints
-     */
-    public void setConstraints(String table, String[] constraints) {
-        constraintsMap.put(table, constraints);
-    }
-
-    /**
-     * @return the zoneEdgeColor
-     */
-    public RGB getOutlineColor() {
-        RGB outlineColor = colorMap.get(OUTLINE_KEY);
-        if (outlineColor == null) {
-            outlineColor = DEFAULT_OUTLINE_COLOR;
-            setOutlineColor(outlineColor);
-        }
-        return outlineColor;
-    }
-
-    /**
-     * @param outlineColor
-     *            the outlineColor to set
-     */
-    public void setOutlineColor(RGB outlineColor) {
-        colorMap.put(OUTLINE_KEY, outlineColor);
-    }
-
-    /**
-     * @return the cwaColor
-     */
-    public RGB getCwaColor() {
-        RGB cwaColor = colorMap.get(CWA_KEY);
-        if (cwaColor == null) {
-            cwaColor = DEFAULT_CWA_COLOR;
-            setCwaColor(cwaColor);
-        }
-        return cwaColor;
-    }
-
-    /**
-     * @param cwaColor
-     *            the cwaColor to set
-     */
-    public void setCwaColor(RGB cwaColor) {
-        colorMap.put(CWA_KEY, cwaColor);
-    }
-
-    /**
-     * @return the backgroundColor
-     */
-    public RGB getBackgroundColor() {
-        RGB backgroundColor = colorMap.get(NO_GROUP);
-        if (backgroundColor == null) {
-            backgroundColor = DEFAULT_BACKGROUND_COLOR;
-            setBackgroundColor(backgroundColor);
-        }
-        return backgroundColor;
-    }
-
-    /**
-     * @param backgroundColor
-     *            the backgroundColor to set
-     */
-    public void setBackgroundColor(RGB backgroundColor) {
-        colorMap.put(NO_GROUP, backgroundColor);
-    }
-
-    /**
-     * @return the labelColor
-     */
-    public RGB getLabelColor() {
-        RGB labelColor = colorMap.get(LABEL_KEY);
-        if (labelColor == null) {
-            labelColor = DEFAULT_LABEL_COLOR;
-            setLabelColor(labelColor);
-        }
-        return labelColor;
-    }
-
-    /**
-     * @param labelColor
-     *            the labelColor to set
-     */
-    public void setLabelColor(RGB labelColor) {
-        colorMap.put(LABEL_KEY, labelColor);
-    }
-
-    /**
-     * @return the selectionColor
-     */
-    public RGB getSelectionColor() {
-
-        RGB selectionColor = colorMap.get(SELECTION_GROUP);
-        if (selectionColor == null) {
-            selectionColor = DEFAULT_SELECTION_COLOR;
-            setSelectionColor(selectionColor);
-        }
-        return selectionColor;
-    }
-
-    /**
-     * @param selectionColor
-     *            the selectionColor to set
-     */
-    public void setSelectionColor(RGB selectionColor) {
-        colorMap.put(SELECTION_GROUP, selectionColor);
-    }
-
-    /**
-     * @return the tables
-     */
-    public List<String> getTables() {
-        return tables;
-    }
-
-    /**
-     * @param tables
-     *            the tables to set
-     */
-    public void setTables(List<String> tables) {
-        this.tables = tables;
-        for (String table : tables) {
-            if (!allTables.contains(table)) {
-                allTables.add(table);
-            }
-        }
-    }
-
-    /**
-     * Clear the entire list of visible tables
-     */
-    public void clearTables() {
-        tables.clear();
-    }
-
-    /**
-     * Clear all the queried tables, visible and hidden.
-     */
-    public void clearAllTables() {
-        allTables.clear();
-        clearTables();
-    }
-
-    /**
-     * Add a table to the list of visible tables.
-     * 
-     * @param table
-     *            The table to add
-     */
-    public void addTable(String table) {
-        tables.add(table);
-        if (!allTables.contains(table)) {
-            allTables.add(table);
-        }
-    }
-
-    /**
-     * Remove a table from the list of shown tables.
-     * 
-     * @param table
-     */
-    public void removeTable(String table) {
-        tables.remove(table);
-    }
-
-    /**
-     * @return the constraintsMap
-     */
-    public Map<String, String[]> getConstraintsMap() {
-        return constraintsMap;
-    }
-
-    /**
-     * @param constraintsMap
-     *            the constraintsMap to set
-     */
-    public void setConstraintsMap(Map<String, String[]> constraintsMap) {
-        this.constraintsMap = constraintsMap;
-    }
-
-    /**
-     * @param queryColumnsMap
-     *            the queryColumnsMap to set
-     */
-    public void setQueryColumnsMap(Map<String, String[]> queryColumnsMap) {
-        this.queryColumnsMap = queryColumnsMap;
-    }
-
-    /**
-     * @return the queryColumnsMap
-     */
-    public Map<String, String[]> getQueryColumnsMap() {
-        return queryColumnsMap;
-    }
-
-    /**
-     * @param table
-     * @return
-     */
-    public String[] getQueryColumns(String table) {
-        return queryColumnsMap.get(table);
-    }
-
-    /**
-     * @param table
-     * @param queryColumns
-     */
-    public void setQueryColumns(String table, String[] queryColumns) {
-        queryColumnsMap.put(table, queryColumns);
-    }
-
-    /**
-     * Some applications (GHG Monitor, for one) need to query the database for
-     * zone geometry from more tables than those shown on the map.
-     * 
-     * @return the allTables
-     */
-    public List<String> getAllTables() {
-        return allTables;
-    }
-
-    /**
-     * @param allTables
-     *            the allTables to set
-     */
-    public void setAllTables(List<String> allTables) {
-        this.allTables = allTables;
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public Map<Object, RGB> getColorMap() {
-        return colorMap;
-    }
-
-    /**
-     * Set the color map.
-     * 
-     * @param colorMap
-     *            The color map to set.
-     */
-    public void setColorMap(Map<Object, RGB> colorMap) {
-        this.colorMap = colorMap;
-        // Make sure hidden colors are present
-        getBackgroundColor();
-        getOutlineColor();
-        getCwaColor();
-        getLabelColor();
-        getSelectionColor();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null || obj instanceof ZoneDbResourceData == false) {
-            return false;
-        }
-        ZoneDbResourceData other = (ZoneDbResourceData) obj;
-
-        if (this.tables != null && other.tables == null) {
-            return false;
-        } else if (this.tables == null && other.tables != null) {
-            return false;
-        } else if (this.tables != null
-                && this.tables.equals(other.tables) == false) {
-            return false;
-        }
-
-        if (this.queryColumnsMap != null && other.queryColumnsMap == null) {
-            return false;
-        } else if (this.queryColumnsMap == null
-                && other.queryColumnsMap != null) {
-            return false;
-        } else if (this.queryColumnsMap != null
-                && this.queryColumnsMap.equals(other.queryColumnsMap) == false) {
-            return false;
-        }
-
-        if (this.mapName != null && other.mapName == null) {
-            return false;
-        } else if (this.mapName == null && other.mapName != null) {
-            return false;
-        } else if (this.mapName != null
-                && this.mapName.equals(other.mapName) == false) {
-            return false;
-        }
-
-        if (this.constraintsMap != null && other.constraintsMap == null) {
-            return false;
-        } else if (this.constraintsMap == null && other.constraintsMap != null) {
-            return false;
-        } else if (this.constraintsMap != null
-                && this.constraintsMap.equals(other.constraintsMap) == false) {
-            return false;
-        }
-
-        if (this.colorMap != null && other.colorMap == null) {
-            return false;
-        } else if (this.colorMap == null && other.colorMap != null) {
-            return false;
-        } else if (this.colorMap != null
-                && this.colorMap.equals(other.colorMap) == false) {
-            return false;
-        }
-
-        if (this.allTables != null && other.allTables == null) {
-            return false;
-        } else if (this.allTables == null && other.allTables != null) {
-            return false;
-        } else if (this.allTables != null
-                && this.allTables.equals(other.allTables) == false) {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ShapeBuilderJob.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ShapeBuilderJob.java
deleted file mode 100644
index f56c66ee74..0000000000
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ShapeBuilderJob.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-/**
- * 
- */
-package com.raytheon.viz.gfe.rsc.zones;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.ArrayBlockingQueue;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.graphics.RGB;
-
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.drawables.IDescriptor;
-import com.raytheon.uf.viz.core.drawables.IShadedShape;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.viz.core.rsc.jts.JTSCompiler;
-import com.raytheon.viz.core.rsc.jts.JTSCompiler.PointStyle;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKBReader;
-
-/**
- * TODO Add Description
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- *                         wldougher   Initial creation.
- * Aug 01, 2014 3471       mapeters    Updated deprecated createShadedShape() calls.
- * Aug 13, 2014 3492       mapeters    Updated deprecated createWireframeShape() calls.
- * 
- * </pre>
- * 
- * @author wldougher
- * 
- */
-public class ShapeBuilderJob extends Job {
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(ShapeBuilderJob.class);
-
-    private static final int QUEUE_SIZE = 1;
-
-    protected ArrayBlockingQueue<ShapeBuilderRequest> requestQueue;
-
-    protected ArrayBlockingQueue<ShapeBuilderResponse> responseQueue;
-
-    protected final WKBReader wkbReader;
-
-    protected String cwaID;
-
-    protected IDescriptor descriptor;
-
-    protected TabNameComp tabNameComp;
-
-    protected ZoneNameComp zoneNameComp;
-
-    protected Random rand;
-
-    public ShapeBuilderJob(String cwaID, IDescriptor descriptor) {
-        super("Building shapes...");
-        this.cwaID = cwaID;
-        this.descriptor = descriptor;
-        requestQueue = new ArrayBlockingQueue<ShapeBuilderRequest>(QUEUE_SIZE);
-        responseQueue = new ArrayBlockingQueue<ShapeBuilderResponse>(QUEUE_SIZE);
-        tabNameComp = new TabNameComp();
-        wkbReader = new WKBReader();
-        zoneNameComp = new ZoneNameComp();
-        rand = new Random();
-    }
-
-    /**
-     * 
-     * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-     */
-    @Override
-    protected IStatus run(IProgressMonitor monitor) {
-        if (monitor.isCanceled()) {
-            return Status.CANCEL_STATUS;
-        }
-        // long startTime = System.currentTimeMillis();
-
-        ShapeBuilderRequest request = requestQueue.poll();
-        if (request != null) {
-
-            ShapeBuilderResponse response = process(request);
-
-            // Put the response on the queue
-            long millis = 0L;
-            boolean interrupted = false;
-            while (!responseQueue.offer(response) && !interrupted
-                    && !monitor.isCanceled()) {
-                responseQueue.poll();
-                try {
-                    Thread.sleep(millis);
-                } catch (InterruptedException e) {
-                    interrupted = true;
-                }
-                millis = 100L;
-            }
-            // Trigger another paint() call; the original one probably
-            // finished long ago.
-            request.target.setNeedsRefresh(true);
-        }
-
-        // statusHandler.handle(Priority.VERBOSE,
-        // "ShapeBuilderJob completed in "
-        // + (System.currentTimeMillis() - startTime) + " ms");
-        return Status.OK_STATUS;
-    }
-
-    /**
-     * @param request
-     * @return
-     */
-    protected ShapeBuilderResponse process(ShapeBuilderRequest request) {
-        ShapeBuilderResponse response = new ShapeBuilderResponse();
-        response.id = request.id;
-        response.groups = request.groups;
-        // response.groupShapes = request.groupShapes;
-        response.colorMap = request.colorMap;
-        response.tables = request.tables;
-
-        // Nothing can be done if the first database query hasn't completed
-        if (request.dbData != null && (request.shaded || request.outlined)) {
-            // statusHandler.handle(Priority.VERBOSE,
-            // "Processing shapebuilder request " + request.id
-            // + " because " + request.reason);
-            buildBasicMap(request, response);
-            if (request.shaded) {
-                buildGroupShapes(request, response);
-            }
-        }
-        return response;
-    }
-
-    /**
-     * Build the background and wireframe shapes outline and cwaOutline.
-     * 
-     * @param request
-     *            The request for new shapes.
-     * @param response
-     *            The response to fill in.
-     * @return response, with modifications.
-     */
-    protected ShapeBuilderResponse buildBasicMap(ShapeBuilderRequest request,
-            ShapeBuilderResponse response) {
-
-        boolean needBackground = request.shaded
-                && (request.background == null || !request.background
-                        .isDrawable());
-        boolean needOutlines = request.outlined;
-        needOutlines &= (request.outline == null
-                || !request.outline.isDrawable() || request.cwaOutline == null || !request.cwaOutline
-                .isDrawable());
-        if (needBackground || needOutlines) {
-            // When request.shaded==false or request.outlined==false, this
-            // does more work than it needs to. Currently, all the users of this
-            // class are both shaded and outlined, so the extra logic has not
-            // been fully implemented.
-            response.background = request.target.createShadedShape(false,
-                    descriptor.getGridGeometry(), true);
-            response.outline = request.target.createWireframeShape(false,
-                    descriptor);
-            response.cwaOutline = request.target.createWireframeShape(false,
-                    descriptor);
-            JTSCompiler compiler = new JTSCompiler(response.background,
-                    response.outline, descriptor, PointStyle.CROSS);
-            JTSCompiler cwaCompiler = new JTSCompiler(null,
-                    response.cwaOutline, descriptor, PointStyle.CROSS);
-
-            RGB backgroundColor = getColor(request,
-                    Integer.valueOf(ZoneDbResource.NO_GROUP));
-            byte[] emptyByteArray = new byte[0];
-            for (String table : request.tables) {
-                // Use binary search to find the start and end indices for table
-                DbData key = new DbData(emptyByteArray, table, "", "");
-                DbData afterKey = new DbData(emptyByteArray, table + " ", "",
-                        "");
-                int tstart = Arrays.binarySearch(request.dbData, key,
-                        tabNameComp);
-                int tend = Arrays.binarySearch(request.dbData, afterKey,
-                        tabNameComp);
-                tstart = (tstart < 0) ? -(tstart + 1) : tstart;
-                tend = (tend < 0) ? -(tend + 1) : tend;
-
-                for (int dbIdx = tstart; dbIdx < tend; dbIdx++) {
-                    DbData rec = request.dbData[dbIdx];
-                    try {
-                        // add the zone geometry to outline
-                        Geometry geom = wkbReader.read(rec.wkb);
-                        compiler.handle(geom, backgroundColor);
-                        if (rec.cwa.startsWith(cwaID)) {
-                            // add the zone geometry to the cwa outline
-                            geom = wkbReader.read(rec.wkb);
-                            cwaCompiler.handle(geom);
-                        }
-                    } catch (ParseException e) {
-                        statusHandler.handle(Priority.PROBLEM,
-                                "Error parsing geometry for zone " + rec.zone,
-                                e);
-                    } catch (VizException e) {
-                        statusHandler.handle(Priority.PROBLEM,
-                                "Error handling geometry for zone " + rec.zone,
-                                e);
-                    }
-                }
-            }
-
-            if (request.shaded) {
-                response.background.compile();
-            } else {
-                response.background = null;
-            }
-
-            if (request.outlined) {
-                response.outline.compile();
-                response.cwaOutline.compile();
-            } else {
-                response.outline = null;
-                response.cwaOutline = null;
-            }
-        }
-
-        return response;
-    }
-
-    /**
-     * Build the shaded shapes for the colored groups.
-     * 
-     * @param request
-     *            The request for new shapes
-     * @param response
-     */
-    protected ShapeBuilderResponse buildGroupShapes(
-            ShapeBuilderRequest request, ShapeBuilderResponse response) {
-        int groupCount = request.groups.size();
-        if (request.dbData != null && request.shaded) {
-
-            // Make sure the response has enough room for the new shapes.
-            if (request.groupShapes == null) {
-                response.groupShapes = new ArrayList<IShadedShape>(groupCount);
-            } else {
-                // Keep known group shapes
-                response.groupShapes = request.groupShapes;
-                response.groupShapes.ensureCapacity(groupCount);
-            }
-
-            int groupNum = 0;
-            for (List<String> group : request.groups) {
-                RGB color = getColor(request, Integer.valueOf(groupNum));
-
-                IShadedShape groupShape = request.target.createShadedShape(
-                        false, descriptor.getGridGeometry(), true);
-                JTSCompiler groupCompiler = new JTSCompiler(groupShape, null,
-                        descriptor, PointStyle.CROSS);
-
-                if (group != null) {
-                    for (String groupZone : group) {
-                        DbData[] dataA = findZoneData(request, groupZone);
-                        for (DbData data : dataA) {
-                            // create a geometry from it
-                            try {
-                                Geometry geom = wkbReader.read(data.wkb);
-                                groupCompiler.handle(geom, color);
-                            } catch (ParseException e) {
-                                statusHandler.handle(Priority.PROBLEM,
-                                        "Error parsing geometry for zone "
-                                                + groupZone, e);
-                            } catch (VizException e) {
-                                statusHandler.handle(Priority.PROBLEM,
-                                        "Error handling geometry for zone "
-                                                + groupZone, e);
-                            }
-                        }
-                    }
-                }
-
-                groupShape.compile();
-                if (groupNum >= request.groupShapes.size()) {
-                    response.groupShapes.add(groupShape);
-                } else {
-                    response.groupShapes.set(groupNum, groupShape);
-                }
-                groupNum++;
-            }
-
-        }
-        return response;
-    }
-
-    /**
-     * Find the database records for the zone with the given ID. Uses the
-     * zoneData array, which must be sorted by zone.
-     * 
-     * 2010-11-18: Allow multiple records for the same zone ID.
-     * 
-     * @param zoneID
-     *            The ID of the zone to look up.
-     * @return the DbData for the zone
-     */
-    protected DbData[] findZoneData(ShapeBuilderRequest request, String zoneID) {
-        if (request.zoneData != null) {
-            int zdIndex = -1;
-            int from = -1;
-            int to = -1;
-            // If there are multiple records, binarySearch gives no guarantee
-            // it will find the first. Look for the first entry AFTER zoneID
-            DbData key = new DbData(new byte[0], "", "", zoneID + "\t");
-            zdIndex = Arrays.binarySearch(request.zoneData, key, zoneNameComp);
-            zdIndex = (zdIndex < 0) ? -(zdIndex + 1) : zdIndex;
-            from = zdIndex;
-            to = zdIndex;
-            // Now walk the list backwards starting at to-1 until we
-            // find an entry that doesn't have the right zoneID
-            // (there will usually only be one or two)
-            for (zdIndex--; zdIndex >= 0
-                    && zoneID.equals(request.zoneData[zdIndex].zone); zdIndex--) {
-                from = zdIndex;
-            }
-            return Arrays.copyOfRange(request.zoneData, from, to);
-        } else {
-            return new DbData[0];
-        }
-    }
-
-    /**
-     * Get the color that has been chosen for the designated object. If no color
-     * has been set, return a random color.
-     * 
-     * @param key
-     *            The object to look up
-     * @return The color in which the object should be drawn.
-     */
-    protected RGB getColor(ShapeBuilderRequest request, Object key) {
-        if (request.colorMap == null) {
-            request.colorMap = new HashMap<Object, RGB>();
-        }
-        RGB color = request.colorMap.get(key);
-        if (color == null) {
-            color = new RGB(rand.nextInt(206) + 50, rand.nextInt(206) + 50,
-                    rand.nextInt(206) + 50);
-            request.colorMap.put(key, color);
-        }
-
-        return color;
-    }
-
-    /**
-     * @return the cwaID
-     */
-    public String getCwaID() {
-        return cwaID;
-    }
-
-    /**
-     * @param cwaID
-     *            the cwaID to set
-     */
-    public void setCwaID(String cwaID) {
-        this.cwaID = cwaID;
-    }
-
-}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
deleted file mode 100644
index 92a1cd2f4a..0000000000
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ZoneDbResource.java
+++ /dev/null
@@ -1,2237 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-/**
- * 
- */
-package com.raytheon.viz.gfe.rsc.zones;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang.StringUtils;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.swt.graphics.RGB;
-import org.geotools.coverage.grid.GeneralGridGeometry;
-import org.geotools.geometry.jts.ReferencedEnvelope;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.TransformException;
-
-import com.raytheon.uf.common.dataplugin.gfe.grid.Grid2DBit;
-import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
-import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
-import com.raytheon.uf.common.geospatial.MapUtil;
-import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.DrawableString;
-import com.raytheon.uf.viz.core.IGraphicsTarget;
-import com.raytheon.uf.viz.core.IGraphicsTarget.HorizontalAlignment;
-import com.raytheon.uf.viz.core.IGraphicsTarget.LineStyle;
-import com.raytheon.uf.viz.core.IGraphicsTarget.TextStyle;
-import com.raytheon.uf.viz.core.IGraphicsTarget.VerticalAlignment;
-import com.raytheon.uf.viz.core.PixelExtent;
-import com.raytheon.uf.viz.core.catalog.DirectDbQuery;
-import com.raytheon.uf.viz.core.catalog.DirectDbQuery.QueryLanguage;
-import com.raytheon.uf.viz.core.drawables.IFont;
-import com.raytheon.uf.viz.core.drawables.IShadedShape;
-import com.raytheon.uf.viz.core.drawables.IWireframeShape;
-import com.raytheon.uf.viz.core.drawables.PaintProperties;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.map.MapDescriptor;
-import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
-import com.raytheon.uf.viz.core.rsc.LoadProperties;
-import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability;
-import com.raytheon.viz.gfe.GFEPreference;
-import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.gfe.rsc.GFEFonts;
-import com.raytheon.viz.gfe.rsc.ZoneDbResourceData;
-import com.raytheon.viz.gfe.rsc.ZoneGroupableCapability;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.Envelope;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.io.ParseException;
-import com.vividsolutions.jts.io.WKBReader;
-
-/**
- * This class use to obtain Zone's database resource. It associates mapping with
- * zone's name (ID) geomentry and maintains groupings of zones.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- *                         wldougher     Initial creation
- * Jul 11, 2011 9928       rferrel       moveGroup now takes list of groups.
- * Jun 24, 2013 2134       randerso      Fixed NullPointerException in fitToCWA.
- * Aug 14, 2014 3523       mapeters      Updated deprecated {@link DrawableString#textStyle} 
- *                                       assignments.
- * 
- * </pre>
- * 
- * @author wldougher
- * @version 1.0
- */
-public class ZoneDbResource extends
-        AbstractVizResource<ZoneDbResourceData, MapDescriptor> {
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(ZoneDbResource.class);
-
-    /** The name of the DB from which maps should be read */
-    private static final String MAP_DB = "maps";
-
-    private static final String MAP_SCHEMA = "mapdata";
-
-    public static final String PUBLIC_TABLE = "zone";
-
-    public static final String COUNTY_TABLE = "county";
-
-    public static final String FIREWX_TABLE = "firewxzones";
-
-    public static final String MARINE_TABLE = "marinezones";
-
-    public static final String OFFSHORE_TABLE = "offshore";
-
-    public static final String HIGHSEA_TABLE = "highsea";
-
-    public static final String[] PUBLIC_FIELDS = { "'" + PUBLIC_TABLE + "'",
-            "state || 'Z' || zone AS zonelabel", "CWA" };
-
-    public static final String[] FIPS_FIELDS = { "'" + COUNTY_TABLE + "'",
-            "state || 'C' || substr(fips,3) AS zonelabel", "CWA" };
-
-    public static final String[] FIREWX_FIELDS = { "'" + FIREWX_TABLE + "'",
-            "state || 'Z' || zone AS zonelabel", "CWA" };
-
-    public static final String[] MARINE_FIELDS = { "'" + MARINE_TABLE + "'",
-            "id as zonelabel", "wfo" };
-
-    public static final String[] OFFSHORE_FIELDS = {
-            "'" + OFFSHORE_TABLE + "'", "id as zonelabel", "wfo" };
-
-    public static final String[] HIGHSEA_FIELDS = { "'" + HIGHSEA_TABLE + "'",
-            "'HISEA'||gid as zonelabel", "wfo" };
-
-    private static final double EXPANSION_FACTOR = 0.5;
-
-    public static final int SELECTION_GROUP = 0;
-
-    /** Fraction used by fitToCWA() to calculate margin width */
-    private static final double BUFFER_MULT = 0.05;
-
-    public static final int NO_GROUP = -1;
-
-    private static final double MIN_LABEL_DISTANCE = 100;
-
-    /**
-     * FORMATTER_LAUNCHER, type. displays multiple zones, and multiple colors.
-     * GHG_MONITOR, displays "clickable zones" as one color, (related to
-     * hazards) MAKE_HAZARD type. displays 1 zone, all as same color.
-     */
-    public enum DisplayType {
-        FORMATTER_LAUNCHER, GHG_MONITOR, MAKE_HAZARD, SINGLE_ZONE_ALLOWABLE
-    }
-
-    private DisplayType displayType;
-
-    // Available simplification levels by table name
-    protected Map<String, List<Double>> availSimpLevMap;
-
-    // Previous simplification level by table name
-    protected Map<String, Double> simpLevMap;
-
-    // The site ID from the data manager
-    protected String siteID;
-
-    // The cwa ID set by callers
-    protected String cwaID;
-
-    // Whether this resource needs to be repainted.
-    protected boolean dirty;
-
-    // Like dirty, but stronger: database read needed during paint.
-    protected boolean filthy;
-
-    // The background area
-    protected IShadedShape background;
-
-    // The shapes for the colored groups
-    protected ArrayList<IShadedShape> groupShapes;
-
-    // The zone borders for all visible zones
-    protected IWireframeShape outline;
-
-    // The zone borders for zones in this site's CWA
-    protected IWireframeShape cwaOutline;
-
-    // A list of the current zone groups
-    protected List<List<String>> groups;
-
-    // A list of the zone groups on the previous call to paint()
-    protected List<List<String>> oldGroups;
-
-    // The current graphics target (only valid inside paint())
-    protected IGraphicsTarget target;
-
-    // The current paint properties (only valid inside paint())
-    protected PaintProperties paintProps;
-
-    // A reader to convert byte arrays to Geometries
-    protected WKBReader wkbReader;
-
-    // Instance of the comparator for sorting by table name
-    protected TabNameComp tabNameComp;
-
-    // Instance of the comparator for sorting by zone name
-    protected ZoneNameComp zoneNameComp;
-
-    // Records in the current query, sorted by table name
-    protected DbData[] dbData;
-
-    // Records in the current query, sorted by zone
-    protected DbData[] zoneData;
-
-    // tables visible when queryJob was last scheduled
-    protected List<String> oldQTables;
-
-    // tables visible when shapeBuilderJob was last scheduled
-    protected List<String> oldSTables;
-
-    // Map of colors to use
-    protected Map<Object, RGB> colorMap;
-
-    // For generating random colors
-    protected Random rand;
-
-    // The job that queries the database
-    protected QueryJob queryJob;
-
-    protected ShapeBuilderJob shapeBuilderJob;
-
-    // The pixel extent of the previous call to paint()
-    protected PixelExtent oldScreenExtent;
-
-    // The simplification levels of the previous call to paint()
-    protected List<String> oldSimpLevels;
-
-    protected boolean runShapeJob;
-
-    protected Envelope boundingEnvelope;
-
-    protected HashMap<Geometry, String> zoneMap;
-
-    protected int dbRqNum;
-
-    protected int shpRqNum;
-
-    // Map from zone IDs to geometry centroids
-    protected HashMap<String, List<ReferencedCoordinate>> labelMap;
-
-    protected String geometryType;
-
-    protected List<IZoneChangeListener> zoneChangeListeners;
-
-    private boolean labelZones;
-
-    private Double scaleX;
-
-    private Double scaleY;
-
-    private IFont labelFont;
-
-    /**
-     * Constructor.
-     * 
-     * @param resourceData
-     *            The ZoneDbResourceData that influence's this resource's
-     *            appearance.
-     * @param loadProperties
-     *            Data-loading options used by superclass ctor.
-     */
-    public ZoneDbResource(ZoneDbResourceData resourceData,
-            LoadProperties loadProperties) {
-        super(resourceData, loadProperties);
-        rand = new Random(System.currentTimeMillis());
-        availSimpLevMap = new HashMap<String, List<Double>>();
-        simpLevMap = new HashMap<String, Double>();
-        queryJob = new QueryJob("Querying Database...");
-        groups = new ArrayList<List<String>>(SELECTION_GROUP + 1);
-        groups.add(new ArrayList<String>());
-        groupShapes = new ArrayList<IShadedShape>();
-        colorMap = new HashMap<Object, RGB>();
-        Map<Object, RGB> rdColorMap = resourceData.getColorMap();
-        if (rdColorMap != null) {
-            colorMap.putAll(rdColorMap);
-        }
-        wkbReader = new WKBReader();
-        tabNameComp = new TabNameComp();
-        zoneNameComp = new ZoneNameComp();
-        runShapeJob = true;
-        displayType = DisplayType.FORMATTER_LAUNCHER;
-        getCapability(OutlineCapability.class).setOutlineOn(true);
-        getCapability(OutlineCapability.class).setLineStyle(LineStyle.SOLID);
-        dbRqNum = 0;
-        shpRqNum = 0;
-        zoneChangeListeners = new ArrayList<IZoneChangeListener>(1);
-    }
-
-    /**
-     * @see com.raytheon.uf.viz.core.rsc.AbstractVizResource#disposeInternal()
-     */
-    @Override
-    protected void disposeInternal() {
-        if (background != null) {
-            background.dispose();
-            background = null;
-        }
-
-        for (IShadedShape groupShape : groupShapes) {
-            if (groupShape != null) {
-                groupShape.dispose();
-            }
-        }
-        groupShapes.clear();
-
-        if (outline != null) {
-            outline.dispose();
-            outline = null;
-        }
-
-        if (cwaOutline != null) {
-            cwaOutline.dispose();
-            cwaOutline = null;
-        }
-
-        // dispose of labels and group labels?
-
-        if (labelFont != null) {
-            labelFont.dispose();
-            labelFont = null;
-        }
-    }
-
-    /**
-     * @see com.raytheon.uf.viz.core.rsc.AbstractVizResource#initInternal(com.raytheon.uf.viz.core.IGraphicsTarget)
-     */
-    @Override
-    protected void initInternal(IGraphicsTarget target) throws VizException {
-        siteID = DataManager.getCurrentInstance().getSiteID();
-        cwaID = siteID;
-        // find the available simplification levels
-        for (String table : resourceData.getAllTables()) {
-            List<Double> levels = querySimpLevels(table);
-            availSimpLevMap.put(table, levels);
-        }
-        shapeBuilderJob = new ShapeBuilderJob(cwaID, descriptor);
-    }
-
-    /**
-     * The paint routine.
-     * <p>
-     * Painting is a three-stage process: the database is queried to obtain a
-     * cache of geometries for the zones, the geometries are compiled into
-     * wireframes and shaded shapes, and the wireframes and shaded shapes are
-     * painted to the screen (by paintShapes()). The first two stages can take
-     * significant amounts of time, so they are done in separate threads to keep
-     * the GUI thread responsive.
-     * </p>
-     * <p>
-     * Not all stages are necessary for each repaint. If the map is only being
-     * repainted because it was hidden by another window, a call to
-     * paintShapes() is all that needs to be done. If zones have changed color
-     * due to zone selection or colormap changes, or if labels have been turned
-     * on or off, some shapes may need to be compiled but the database does not
-     * need to be queried.
-     * </p>
-     * <p>
-     * It is important to avoid excess database reads. The maps database
-     * typically resides on the EDEX server and is shared by all users. In the
-     * past, database reads were generated with every mouse move. This bogged
-     * down the server and the network with database requests, causing delays
-     * not only for users of this class, but also for other users in unrelated
-     * applications.
-     * </p>
-     * <p>
-     * Database reads should ONLY be needed when:
-     * <ul>
-     * <li>Initializing the resource.</li>
-     * <li>Changing tables (PUBLIC to FIREWX, for example).</li>
-     * <li>Displaying a different region.</li>
-     * <li>Changing zoom simplification levels (the geometries are read from a
-     * different column).</li>
-     * <li>The maps database has been updated.</li>
-     * </ul>
-     * Database reads are NOT needed when:
-     * <ul>
-     * <li>Selecting/deselecting zones.</li>
-     * <li>Showing/hiding zone names or group numbers.</li>
-     * <li>Changing zone colors.</li>
-     * </ul>
-     * </p>
-     * 
-     * @see com.raytheon.uf.viz.core.drawables.IRenderable#paintInternal(com.raytheon.uf.viz.core.IGraphicsTarget,
-     *      com.raytheon.uf.viz.core.drawables.PaintProperties)
-     */
-    @Override
-    protected void paintInternal(IGraphicsTarget target,
-            PaintProperties paintProps) throws VizException {
-        PixelExtent screenExtent = (PixelExtent) paintProps.getView()
-                .getExtent();
-        // compute an estimate of degrees per pixel
-        double yc = screenExtent.getCenter()[1];
-        double x1 = screenExtent.getMinX();
-        double x2 = screenExtent.getMaxX();
-        double[] c1 = descriptor.pixelToWorld(new double[] { x1, yc });
-        double[] c2 = descriptor.pixelToWorld(new double[] { x2, yc });
-        int screenHeight = paintProps.getCanvasBounds().height;
-        int screenWidth = paintProps.getCanvasBounds().width;
-
-        if (screenWidth == 0) {
-            return;
-        }
-        double dppX = Math.abs(c2[0] - c1[0]) / screenWidth;
-
-        this.target = target;
-        this.paintProps = paintProps;
-        this.scaleX = Double.valueOf(screenWidth / screenExtent.getWidth());
-        this.scaleY = Double.valueOf(screenHeight / screenExtent.getHeight());
-
-        Envelope screenEnv = screenExtent.getEnvelope();
-
-        // See if we've zoomed in or out enough to need to read again.
-        List<String> allTables = resourceData.getAllTables();
-        List<String> simpLevels = new ArrayList<String>(allTables.size());
-        for (String table : allTables) {
-            simpLevels.add(this.simpLvlSuffix(table, dppX));
-        }
-
-        if (paintProps.isZooming()) {
-            target.setNeedsRefresh(true);
-        } else {
-            if (oldScreenExtent == null || oldSimpLevels == null || isFilthy()
-                    || !oldScreenExtent.getEnvelope().covers(screenEnv)
-                    || !oldSimpLevels.equals(simpLevels)
-                    || !resourceData.getTables().equals(oldQTables)) {
-                String dbReadReason = "";
-                if (oldScreenExtent == null) {
-                    dbReadReason = "oldScreenExtent == null";
-                } else if (oldSimpLevels == null) {
-                    dbReadReason = "oldSimpLevels == null";
-                } else if (isFilthy()) {
-                    dbReadReason = "isFilthy()";
-                } else if (!oldScreenExtent.getEnvelope().covers(screenEnv)) {
-                    dbReadReason = "!oldScreenExtent.getEnvelope().covers(screenEnv)";
-                } else if (!oldSimpLevels.equals(simpLevels)) {
-                    dbReadReason = "!oldSimpLevels.equals(simpLevels)";
-                } else {
-                    List<?> rdgt = resourceData.getTables();
-                    dbReadReason = "!resourceData.getTables().equals(oldQTables))"
-                            + "\nresourceData.getTables().size():"
-                            + ((rdgt == null) ? null : rdgt.size())
-                            + "\noldQTables.size():"
-                            + ((oldQTables == null) ? null : oldQTables.size());
-                }
-                PixelExtent expandedExtent = getExpandedExtent(screenExtent);
-                oldScreenExtent = expandedExtent;
-                oldSimpLevels = simpLevels;
-                List<String> rdTables = resourceData.getTables();
-                if (rdTables == null) {
-                    oldQTables = null;
-                } else {
-                    oldQTables = new ArrayList<String>(rdTables);
-                }
-                String query = buildQuery(expandedExtent, dppX);
-                QueryRequest qreq = new QueryRequest();
-                qreq.query = query;
-                qreq.target = target;
-                queryJob.requestQueue.clear();
-                queryJob.requestQueue.offer(qreq);
-                queryJob.schedule();
-                dbRqNum = (dbRqNum + 1) % 10000;
-                // log(Priority.VERBOSE, "Database query " + dbRqNum
-                // + " scheduled." + "Reason: " + dbReadReason);
-                setFilthy(false);
-            }
-
-            DbData[] rspA = queryJob.responseQueue.poll();
-            if (rspA != null) {
-                // log(Priority.VERBOSE, "Database response received.");
-                dbData = rspA;
-                Arrays.sort(dbData, tabNameComp);
-                zoneData = new DbData[rspA.length];
-                System.arraycopy(rspA, 0, zoneData, 0, rspA.length);
-                Arrays.sort(zoneData, zoneNameComp);
-                createZoneMap();
-                createLabelMap();
-            }
-            buildShapes(rspA);
-            setDirty(false);
-        }
-
-        paintShapes();
-        this.target = null;
-        this.paintProps = null;
-        this.scaleX = null;
-        this.scaleY = null;
-    }
-
-    /**
-     * Get the state of the filthy flag.
-     * 
-     * @return the filthy state.
-     */
-    public boolean isFilthy() {
-        return filthy;
-    }
-
-    /**
-     * Set the filthy flag to <code>filthy</code>.
-     * <p>
-     * Filthy is a stronger version of dirty, indicating that new geometries
-     * need to be loaded before repainting. The flag is automatically cleared
-     * when paintInternal() kicks off a new query job.
-     * 
-     * @param filthy
-     *            the value to set
-     */
-    public void setFilthy(boolean filthy) {
-        this.filthy = filthy;
-    }
-
-    /**
-     * Send a status message at the given priority, usually Priority.VERBOSE.
-     * 
-     * @param priority
-     *            The priority of the message to log
-     * @param message
-     */
-    protected void log(Priority priority, String message) {
-        statusHandler.handle(priority, "ZoneDbResource: " + message);
-    }
-
-    /**
-     * Create the map from zone IDs to centroid coordinates
-     */
-    protected void createLabelMap() {
-        labelMap = new HashMap<String, List<ReferencedCoordinate>>();
-        int numGeometries;
-        Geometry geom;
-        Geometry poly;
-        List<ReferencedCoordinate> rcList;
-        ReferencedCoordinate rc;
-        for (DbData data : dbData) {
-            geom = null;
-            try {
-                geom = wkbReader.read(data.wkb);
-            } catch (ParseException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error parsing geometry for zone " + data.zone, e);
-            }
-
-            if (geom != null) {
-                rcList = labelMap.get(data.zone);
-                if (rcList == null) {
-                    rcList = new ArrayList<ReferencedCoordinate>(2);
-                    labelMap.put(data.zone, rcList);
-                }
-                numGeometries = geom.getNumGeometries();
-                for (int geomNum = 0; geomNum < numGeometries; geomNum++) {
-                    poly = geom.getGeometryN(geomNum);
-                    rc = new ReferencedCoordinate(poly.getCentroid()
-                            .getCoordinate());
-                    rcList.add(rc);
-                }
-            }
-        }
-    }
-
-    /**
-     * Create the map from geometries to zone IDs
-     */
-    protected void createZoneMap() {
-        zoneMap = new HashMap<Geometry, String>();
-        for (DbData item : dbData) {
-            try {
-                Geometry geom = wkbReader.read(item.wkb);
-                zoneMap.put(geom, item.zone);
-            } catch (ParseException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error parsing geometry for zone " + item.zone, e);
-            }
-        }
-    }
-
-    /**
-     * Build the query string to get information from the maps database.
-     * 
-     * @param extent
-     *            The PixelExtent over which the query applies
-     * @param dppX
-     *            Degrees (longitude) per pixel in the X direction
-     * @return An SQL query string
-     * @throws VizException
-     */
-    protected String buildQuery(PixelExtent extent, double dppX)
-            throws VizException {
-        // enter("buildQuery{PE}");
-
-        Envelope env = null;
-        try {
-            CoordinateReferenceSystem crs = descriptor.getCRS();
-            Envelope evl = descriptor.pixelToWorld(extent, crs);
-            ReferencedEnvelope ref = new ReferencedEnvelope(evl, crs);
-            env = ref.transform(MapUtil.LATLON_PROJECTION, true);
-        } catch (Exception e) {
-            throw new VizException("Error transforming extent", e);
-        }
-
-        // leave("buildQuery{PE}");
-        return buildQuery(env, dppX);
-    }
-
-    /**
-     * @param env
-     *            The Envelope over which the query applies
-     * @param dppX
-     *            Degrees (longitude) per pixel in the X direction
-     * @return An SQL query string
-     */
-    protected String buildQuery(Envelope env, double dppX) {
-        // enter("buildQuery");
-        StringBuilder sb = new StringBuilder();
-        String union = "";
-        List<String> allTables = null;
-        allTables = new ArrayList<String>(resourceData.getAllTables());
-        for (String table : allTables) {
-            String suffix = simpLvlSuffix(table, dppX);
-            String geometryField = "main.the_geom" + suffix;
-            String geoConstraint = String.format(
-                    "%s && ST_SetSrid('BOX3D(%f %f, %f %f)'::box3d,4326)",
-                    geometryField, env.getMinX(), env.getMinY(), env.getMaxX(),
-                    env.getMaxY());
-
-            sb.append(union);
-            sb.append("SELECT");
-            sb.append(" AsBinary(");
-            sb.append(geometryField);
-            sb.append(")");
-            String[] queryColumns = resourceData.getQueryColumns(table);
-            for (String queryCol : queryColumns) {
-                sb.append(", ");
-                sb.append(queryCol);
-            }
-            sb.append(" FROM ");
-            sb.append(MAP_SCHEMA).append(".").append(table);
-            sb.append(" AS main");
-            sb.append(" WHERE ");
-            sb.append(geoConstraint);
-            String[] constraints = resourceData.getConstraints(table);
-            if (constraints != null) {
-                for (String constraint : constraints) {
-                    sb.append(" AND ");
-                    sb.append(constraint);
-                }
-            }
-
-            union = " UNION ";
-        }
-        sb.append(";");
-        // leave("buildQuery");
-        return sb.toString();
-    }
-
-    /**
-     * @return
-     */
-    protected String buildEAQuery() {
-        StringBuilder sb = new StringBuilder();
-        String union = "";
-        List<String> allTables = null;
-        allTables = new ArrayList<String>(resourceData.getAllTables());
-        for (String table : allTables) {
-            sb.append(union);
-            sb.append("SELECT ");
-            String[] queryColumns = resourceData.getQueryColumns(table);
-            for (int i = 0; i < queryColumns.length; i++) {
-                sb.append(queryColumns[i]);
-                if (i < queryColumns.length - 1) {
-                    sb.append(", ");
-                }
-            }
-            sb.append(" FROM ");
-            sb.append(MAP_SCHEMA).append(".").append(table);
-            sb.append(" AS main");
-            sb.append(" WHERE ");
-            String[] constraints = resourceData.getConstraints(table);
-            if (constraints != null) {
-                for (int i = 0; i < constraints.length; i++) {
-                    sb.append(constraints[i]);
-                    if (i < constraints.length - 1) {
-                        sb.append(" AND ");
-                    }
-                }
-            }
-
-            union = " UNION ";
-        }
-        sb.append(";");
-        return sb.toString();
-    }
-
-    /**
-     * Figure out which shapes need to be rebuilt and destroy any shapes that
-     * are out of date, setting any pointers to them to null.
-     */
-    protected ShapeBuilderRequest dropObsoleteShapes(boolean newDbData) {
-        // enter("dropObsoleteShapes");
-        boolean killBackground = false;
-        boolean killOutline = false;
-        boolean killShapes = false;
-
-        ShapeBuilderRequest request = new ShapeBuilderRequest();
-
-        request.target = target;
-        request.dbData = dbData;
-        request.zoneData = zoneData;
-        // Copy groups into the request
-        request.groups = new ArrayList<List<String>>(groups.size());
-        for (List<String> group : groups) {
-            request.groups.add(new ArrayList<String>(group));
-        }
-        request.tables = new ArrayList<String>(resourceData.getTables());
-        request.background = background;
-        request.outline = outline;
-        request.cwaOutline = cwaOutline;
-        if (groupShapes != null) {
-            request.groupShapes = new ArrayList<IShadedShape>(groupShapes);
-        }
-
-        if (colorMap == null) {
-            colorMap = new HashMap<Object, RGB>();
-        }
-
-        Map<Object, RGB> rdColorMap = resourceData.getColorMap();
-        if (rdColorMap == null) {
-            request.colorMap = new HashMap<Object, RGB>();
-        } else {
-            request.colorMap = new HashMap<Object, RGB>(rdColorMap);
-        }
-
-        request.shaded = true;
-
-        OutlineCapability outCap = getCapability(OutlineCapability.class);
-        if ((outCap != null) && outCap.isOutlineOn()) {
-            request.outlined = true;
-        }
-
-        // if the database response has changed OR a redraw is being forced
-        // the background, outlines, and shapes all need rebuilt.
-        if (newDbData) {
-            killBackground = true;
-            killOutline = true;
-            killShapes = true;
-            runShapeJob = true;
-        }
-
-        // if the visible table has changed
-        List<String> chosenTables = resourceData.getTables();
-        if ((chosenTables == null) || !chosenTables.equals(oldSTables)) {
-            killBackground = true;
-            killOutline = true;
-            if (chosenTables != null) {
-                oldSTables = new ArrayList<String>(chosenTables);
-            }
-            runShapeJob = true;
-        }
-
-        // if the color map has changed
-        if (!colorMap.equals(request.colorMap)) {
-            colorMap = request.colorMap;
-            killShapes = true;
-            runShapeJob = true;
-        }
-
-        if (killBackground) {
-            request.background = null;
-        }
-        if (killOutline) {
-            request.outline = null;
-            request.cwaOutline = null;
-        }
-
-        if (killShapes) {
-            // Get rid of all the shapes
-            if (request.groupShapes != null) {
-                for (int idx = 0; idx < request.groupShapes.size(); idx++) {
-                    request.groupShapes.set(idx, null);
-                }
-            }
-            request.reason = newDbData ? "new database response"
-                    : "new color map";
-        } else {
-            // if the membership of any group has changed
-            int groupNum;
-            boolean kill;
-            StringBuilder reasonReason = new StringBuilder();
-            for (groupNum = 0; groupNum < request.groups.size(); groupNum++) {
-                kill = false;
-                if (oldGroups == null) {
-                    // Need to build shape for the new group
-                    reasonReason.append(" oldGroups is null");
-                    kill = true;
-                } else if (groupNum >= oldGroups.size()) {
-                    // Need to build shape for the new group
-                    reasonReason.append(" gn>").append(oldGroups.size());
-                    kill = true;
-                } else if (!(request.groups.get(groupNum).equals(oldGroups
-                        .get(groupNum)))) {
-                    // Need to build for changed zone membership
-                    reasonReason.append(String.format(" g[%d]!=old %s!=%s",
-                            groupNum, request.groups.get(groupNum).toString(),
-                            oldGroups.get(groupNum).toString()));
-                    kill = true;
-                }
-                if (kill) {
-                    if (groupNum < groupShapes.size()) {
-                        request.groupShapes.set(groupNum, null);
-                    } else {
-                        request.groupShapes.add(null);
-                    }
-                    request.reason = "Groups changed" + reasonReason;
-                    runShapeJob = true;
-                }
-            }
-            for (; groupNum < request.groupShapes.size(); groupNum++) {
-                if (request.groupShapes.get(groupNum) != null) {
-                    // Rebuild to remove shapes for groups that are gone
-                    request.groupShapes.set(groupNum, null);
-                    if (request.reason == null) {
-                        request.reason = "Extra group shapes";
-                    }
-                    runShapeJob = true;
-                }
-            }
-        }
-        // leave("dropObsoleteShapes");
-        return request;
-    }
-
-    /**
-     * Build the shapes that will be drawn to the screen.
-     */
-    protected void buildShapes(Object rspA) {
-        // enter("buildShapes");
-        if (dbData != null) {
-
-            ShapeBuilderRequest request = dropObsoleteShapes(rspA != null);
-
-            if (runShapeJob) {
-
-                oldGroups = new ArrayList<List<String>>(groups.size());
-                for (List<String> group : groups) {
-                    oldGroups.add(new ArrayList<String>(group));
-                }
-                groups.clear();
-                for (List<String> group : request.groups) {
-                    groups.add(new ArrayList<String>(group));
-                }
-                shpRqNum = (shpRqNum + 1) % 10000;
-                request.id = shpRqNum;
-                while (!shapeBuilderJob.requestQueue.offer(request)) {
-                    shapeBuilderJob.requestQueue.poll();
-                }
-                shapeBuilderJob.schedule();
-                runShapeJob = false;
-                // log(Priority.VERBOSE, "ShapeBuilderJob " + shpRqNum
-                // + " scheduled.");
-            }
-
-            // Get the shapes from shapeBuilderJob (request may have been sent
-            // in an earlier paint() call).
-            ShapeBuilderResponse rsp = shapeBuilderJob.responseQueue.poll();
-            if (rsp != null) {
-
-                // log(Priority.VERBOSE, "ShapeBuilderJob response " + rsp.id
-                // + " received.");
-                if (rsp.background != null) {
-                    if (background != null) {
-                        background.reset();
-                    }
-                    background = rsp.background;
-                    // log(Priority.VERBOSE, "background replaced.");
-                }
-                if (rsp.outline != null) {
-                    if (outline != null) {
-                        outline.reset();
-                    }
-                    outline = rsp.outline;
-                    // log(Priority.VERBOSE, "outline replaced.");
-                }
-                if (rsp.cwaOutline != null) {
-                    if (cwaOutline != null) {
-                        cwaOutline.reset();
-                    }
-                    cwaOutline = rsp.cwaOutline;
-                    // log(Priority.VERBOSE, "cwaOutline replaced.");
-                }
-                if (rsp.groupShapes != null) {
-                    if (groupShapes != null) {
-                        int dispCount = 0;
-                        int rspSize = (rsp.groupShapes == null) ? 0
-                                : rsp.groupShapes.size();
-                        // Dispose of any group shapes that have been
-                        // replaced
-                        for (int groupNum = 0; groupNum < groupShapes.size(); groupNum++) {
-                            IShadedShape shape = groupShapes.get(groupNum);
-                            if (shape != null) {
-                                if ((groupNum >= rspSize)
-                                        || (shape != rsp.groupShapes
-                                                .get(groupNum))) {
-                                    shape.dispose();
-                                    dispCount++;
-                                }
-                            }
-                        }
-                        if (dispCount > 0) {
-                            // log(Priority.VERBOSE, "" + dispCount
-                            // + " group shapes disposed.");
-                        }
-                    }
-                    groupShapes = rsp.groupShapes;
-                }
-                colorMap.putAll(rsp.colorMap);
-                Map<Object, RGB> rdColorMap = resourceData.getColorMap();
-                if (colorMap.size() > rdColorMap.size()) {
-                    for (Object obj : colorMap.keySet()) {
-                        if (!rdColorMap.containsKey(obj)) {
-                            rdColorMap.put(obj, colorMap.get(obj));
-                        }
-                    }
-                }
-            }
-        }
-        // leave("buildShapes");
-    }
-
-    /**
-     * Paint the shapes created by buildShapes(). This method should only be
-     * called from within paint().
-     * 
-     * @param target
-     *            The graphics target on which to paint the shapes
-     * @param paintProps
-     *            the paint properties supplied to paint()
-     * @throws VizException
-     *             if thrown by target.drawXXX() methods
-     */
-    protected void paintShapes() throws VizException {
-        float alpha = paintProps.getAlpha();
-
-        // Draw the colored areas
-        // draw the background
-        if ((background != null) && background.isDrawable()) {
-            target.drawShadedShape(background, alpha);
-        }
-
-        // Draw the zone outlines on top of the shaded shapes
-        OutlineCapability outCap = getCapability(OutlineCapability.class);
-        if ((outCap != null) && outCap.isOutlineOn()) {
-            if ((outline != null) && outline.isDrawable()
-                    && (cwaOutline != null) && cwaOutline.isDrawable()) {
-                // draw zones in group color
-                // (in single selection mode, selection is first group)
-                if (groupShapes != null) {
-                    for (IShadedShape groupShape : groupShapes) {
-                        if ((groupShape != null) && groupShape.isDrawable()) {
-                            target.drawShadedShape(groupShape, alpha);
-                        }
-                    }
-                }
-            }
-
-            int outlineWidth = outCap.getOutlineWidth();
-            LineStyle lineStyle = outCap.getLineStyle();
-
-            // Draw the zone outlines
-            if ((outline != null) && outline.isDrawable()) {
-                target.drawWireframeShape(outline,
-                        resourceData.getOutlineColor(), outlineWidth, lineStyle);
-            }
-
-            // Draw the highlighted zone outlines on top of the zone borders
-            // (for zones that are in this site's CWA)
-            if ((cwaOutline != null) && cwaOutline.isDrawable()) {
-                target.drawWireframeShape(cwaOutline,
-                        resourceData.getCwaColor(), outlineWidth, lineStyle);
-            }
-        }
-
-        // Draw the labels on top of everything else
-        if (labelMap != null) {
-            paintLabels();
-        }
-    }
-
-    /**
-     * Return the available simplification levels for the specified table.
-     * 
-     * @return the levels
-     */
-    protected List<Double> querySimpLevels(String table) {
-        List<Double> levels = null;
-        try {
-            StringBuilder query = new StringBuilder(
-                    "SELECT f_geometry_column FROM public.geometry_columns WHERE f_table_schema='");
-            query.append(MAP_SCHEMA);
-            query.append("' AND f_table_name='");
-            query.append(table);
-            query.append("' AND f_geometry_column LIKE 'the_geom_%' order by f_geometry_column asc;");
-            List<Object[]> results = DirectDbQuery.executeQuery(
-                    query.toString(), MAP_DB, QueryLanguage.SQL);
-
-            levels = new ArrayList<Double>(results.size());
-            for (Object[] obj : results) {
-                String s = ((String) obj[0]).substring(9).replace('_', '.');
-                levels.add(Double.parseDouble(s));
-            }
-        } catch (VizException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error querying available levels", e);
-        }
-
-        return levels;
-    }
-
-    /**
-     * Get the color that has been chosen for the designated object. If no color
-     * has been set, return a random color.
-     * 
-     * @param key
-     *            The object to look up
-     * @return The color in which the object should be drawn.
-     */
-    protected RGB getColor(Object key) {
-        if (colorMap == null) {
-            colorMap = new HashMap<Object, RGB>();
-        }
-        RGB color = colorMap.get(key);
-        if (color == null) {
-            color = new RGB(rand.nextInt(206) + 50, rand.nextInt(206) + 50,
-                    rand.nextInt(206) + 50);
-            colorMap.put(key, color);
-        }
-
-        return color;
-    }
-
-    /**
-     * @return the dirty flag
-     */
-    public boolean isDirty() {
-        return dirty;
-    }
-
-    /**
-     * @param dirty
-     *            the dirty flag value to set
-     */
-    public void setDirty(boolean dirty) {
-        this.dirty = dirty;
-    }
-
-    /**
-     * Expand the screen extent by EXPANSION_FACTOR.
-     * 
-     * @param screenExtent
-     *            The extent of the screen in pixel coordinates.
-     * 
-     * @return the expanded pixel extent
-     */
-    protected PixelExtent getExpandedExtent(PixelExtent screenExtent) {
-        PixelExtent expandedExtent = screenExtent.clone();
-        expandedExtent.getEnvelope().expandBy(
-                expandedExtent.getWidth() * EXPANSION_FACTOR,
-                expandedExtent.getHeight() * EXPANSION_FACTOR);
-        return expandedExtent;
-    }
-
-    /**
-     * Get the suffix for the_geom in queries against table based on the degrees
-     * per pixel estimate.
-     * 
-     * @param table
-     *            The name of the table in the query
-     * @param dpp
-     *            The degrees per pixel estimate
-     * @return The simplification level suffix.
-     */
-    protected String simpLvlSuffix(String table, double dpp) {
-        String suffix = "";
-        double simpLev = 0.0;
-        List<Double> levels = availSimpLevMap.get(table);
-        if (levels != null) {
-            for (double level : levels) {
-                if (dpp < level) {
-                    break;
-                }
-                simpLev = level;
-            }
-        }
-        if (simpLev > 0.0) {
-            DecimalFormat df = new DecimalFormat("0.######");
-            suffix = "_"
-                    + StringUtils.replaceChars(df.format(simpLev), '.', '_');
-        }
-        return suffix;
-    }
-
-    /**
-     * Returns a copy of the zoneGroupings list.
-     * <p>
-     * The original code in ZoneFileResource was much more complicated, but it
-     * seemed anxious to make certain that callers received a copy of a list of
-     * strings, not the original list. The calls to Collections.unmodifiableList
-     * generate warnings, so they are suppressed. It would be used on a per-line
-     * basis, but the compiler gets confused.
-     * 
-     * @return the list of zone groupings. Each zone grouping is a List of
-     *         Strings, the zone IDs of the zones in the group.
-     */
-    public List<List<String>> getZoneGroupings() {
-
-        List<List<String>> rtnVal = new ArrayList<List<String>>(groups.size());
-        for (List<String> zoneGrouping : groups) {
-            rtnVal.add(Collections.unmodifiableList(zoneGrouping));
-        }
-
-        rtnVal = Collections.unmodifiableList(rtnVal);
-
-        return rtnVal;
-    }
-
-    public void setLabelZones(boolean labelZones) {
-        this.labelZones = labelZones;
-        refreshSelections();
-    }
-
-    public void setLabelGroups(boolean labelGroups) {
-        getCapability(ZoneGroupableCapability.class).setZoneGrouping(
-                labelGroups);
-        refreshSelections();
-    }
-
-    /**
-     * Add missing zones into one or more groups.
-     * 
-     * @param includeAllZones
-     *            - True add zone labels
-     * @param addToOneGroup
-     *            - True add missing zones to first group otherwise put each
-     *            missing zone its own group
-     * @return msg - Message indicating what zones were added
-     */
-    public String setIncludeAllZones(boolean includeAllZones,
-            boolean addToOneGroup) {
-        StringBuilder sb = new StringBuilder();
-        if (includeAllZones && (zoneData != null)) {
-            List<String> missing = new ArrayList<String>();
-            for (DbData zoneRec : zoneData) {
-                boolean found = false;
-                for (List<String> group : groups) {
-                    if (group.contains(zoneRec.zone)) {
-                        found = true;
-                        break;
-                    }
-                }
-                if (!found && !missing.contains(zoneRec.zone)) {
-                    missing.add(zoneRec.zone);
-                    sb.append(zoneRec.zone).append(",");
-                }
-            }
-
-            List<String> group = null;
-            if (addToOneGroup) {
-                group = groups.get(0);
-                for (String zone : missing) {
-                    group.add(zone);
-                }
-            } else {
-                // When only an empty group remove so zone numbers start at one.
-                if (groups.size() == 1 && groups.get(0).size() == 0) {
-                    groups.clear();
-                }
-
-                for (String zone : missing) {
-                    group = new ArrayList<String>();
-                    group.add(zone);
-                    groups.add(group);
-                }
-            }
-
-            if (sb.length() > 0) {
-                signalZonesChanged();
-                sb.insert(0, "Missing zones have been added [");
-                sb.replace(sb.length() - 1, sb.length(), "]");
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Remove all zones from any group.
-     */
-    public void clearAllZones() {
-        groups.clear();
-        groups.add(new ArrayList<String>());
-        signalZonesChanged();
-    }
-
-    public Envelope getBoundingEnvelope() {
-        return this.boundingEnvelope;
-    }
-
-    public void setBoundingEnvelope(Envelope boundingEnvelope) {
-        this.boundingEnvelope = boundingEnvelope;
-        setFilthy(true);
-    }
-
-    public void setMakeHazardType() {
-        displayType = DisplayType.MAKE_HAZARD;
-    }
-
-    public void setGHGType() {
-        displayType = DisplayType.GHG_MONITOR;
-    }
-
-    public void setSingleAllowableType() {
-        displayType = DisplayType.SINGLE_ZONE_ALLOWABLE;
-    }
-
-    /**
-     * @return the colorMap
-     */
-    public Map<Object, RGB> getColorMap() {
-        return resourceData.getColorMap();
-    }
-
-    /**
-     * @param colorMap
-     *            the colorMap to set
-     */
-    public void setColorMap(Map<Object, RGB> colorMap) {
-        resourceData.setColorMap(colorMap);
-    }
-
-    /**
-     * Set the site ID of the CWA site.
-     * 
-     * @param cwaIdentifier
-     *            The site ID of the CWA site.
-     */
-    public void setCwaId(String cwaIdentifier) {
-        cwaID = cwaIdentifier;
-        if (shapeBuilderJob != null) {
-            shapeBuilderJob.setCwaID(cwaID);
-        }
-        setFilthy(true);
-    }
-
-    /**
-     * Re-calculate the bounding box to center the view around the CWA, with a
-     * "reasonable" margin. The CWA column and CWA ID must be set before this
-     * method is called, so that the database can be queried for the CWA
-     * geometry. Although it's somewhat redundant, setBoundingEnvelope() should
-     * be called before this method, since this method will not set a bounding
-     * geometry if there are database or geometry-parsing errors.
-     */
-    public void fitToCWA() {
-
-        if ((cwaID == null) || "".equals(cwaID)) {
-            throw new IllegalStateException("The CWA ID has not been set.");
-        }
-
-        // build a query
-        StringBuilder query = new StringBuilder();
-        query.append("SELECT");
-        query.append(" AsBinary(ST_Envelope(ST_Collect(ST_Envelope(main.the_geom))))");
-        query.append(" FROM");
-        query.append(" ").append(MAP_SCHEMA).append(".").append(PUBLIC_TABLE)
-                .append(" as main");
-        query.append(" WHERE");
-        query.append(" main.cwa LIKE '").append(cwaID).append("%'");
-        query.append(" UNION (");
-        query.append("SELECT");
-        query.append(" AsBinary(ST_Envelope(ST_Collect(ST_Envelope(main.the_geom))))");
-        query.append(" FROM");
-        query.append(" ").append(MAP_SCHEMA).append(".").append(MARINE_TABLE)
-                .append(" as main");
-        query.append(" WHERE");
-        query.append(" main.wfo LIKE '").append(cwaID).append("%'");
-        query.append(")");
-        query.append(" UNION (");
-        query.append("SELECT");
-        query.append(" AsBinary(ST_Envelope(ST_Collect(ST_Envelope(main.the_geom))))");
-        query.append(" FROM");
-        query.append(" ").append(MAP_SCHEMA).append(".").append(OFFSHORE_TABLE)
-                .append(" as main");
-        query.append(" WHERE");
-        query.append(" main.wfo LIKE '").append(cwaID).append("%'");
-        query.append(")");
-        query.append(";");
-
-        Exception failure = null;
-        Geometry cwaGeometry = null;
-        try {
-            // Get the geometries in the CWA
-            List<Object[]> result = DirectDbQuery.executeQuery(
-                    query.toString(), MAP_DB, QueryLanguage.SQL);
-            if ((result != null) && (result.size() > 0)) {
-                WKBReader wkbReader = new WKBReader();
-                Geometry geometry = null;
-                // Combine the geometries in the CWA into one geometry
-                for (Object[] row : result) {
-                    byte[] wkb = (byte[]) row[0];
-                    // areas w/o marine zones return a row containing null
-                    if (wkb != null) {
-                        geometry = wkbReader.read(wkb);
-                        if (cwaGeometry == null) {
-                            cwaGeometry = geometry;
-                        } else {
-                            cwaGeometry = cwaGeometry.union(geometry);
-                        }
-                    }
-                }
-            }
-        } catch (VizException e) {
-            failure = e;
-        } catch (ParseException e) {
-            failure = e;
-        }
-
-        if (failure == null) {
-            if (cwaGeometry == null) {
-                failure = new IllegalArgumentException(
-                        "The CWA query returned no records.");
-            } else if (cwaGeometry.isEmpty()) {
-                failure = new IllegalArgumentException(
-                        "The CWA geometry is empty.");
-            }
-        }
-
-        if (failure == null) {
-            // calculate a bounding geometry from cwaGeometry
-            Geometry cwaBBox = cwaGeometry.getEnvelope();
-            // double cwaDist = cwaBBox.getArea();
-            // cwaDist = Math.sqrt(cwaDist);
-            // cwaDist *= BUFFER_MULT;
-            // Geometry shrinkWrapGeometry = cwaBBox.buffer(cwaDist);
-            // setBoundingEnvelope(shrinkWrapGeometry.getEnvelopeInternal());
-            setBoundingEnvelope(cwaBBox.getEnvelopeInternal());
-        } else {
-            statusHandler
-                    .handle(Priority.PROBLEM,
-                            "Error fitting view to CWA - default bounding geometry will be used",
-                            failure);
-        }
-    }
-
-    /**
-     * Return the geometry to which the clicked point belongs.
-     * 
-     * @param aLatLon
-     *            Coordinates of a point in Latitude/Longitude space
-     * @return the Geometry (within this resource) in which aLatLon lies, or
-     *         null if the point lies outside all this resource's geometries.
-     */
-    public Geometry clickOnExistingGeometry(Coordinate aLatLon) {
-        Point p = new GeometryFactory().createPoint(aLatLon);
-        for (Geometry g : zoneMap.keySet()) {
-            if (g.contains(p)) {
-                return g;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @param zones
-     * @param groupNum
-     */
-    public void addZone(List<Geometry> zones, int groupNum) {
-        updateZones(zones, groupNum);
-    }
-
-    /**
-     * Add the specified geometries to the group indicated by zoneIndex
-     * 
-     * @param geoms
-     *            The geometries to add to the group
-     * @param zoneIndex
-     *            The group number to which the geometries should be added.
-     */
-    public void updateZones(List<Geometry> geoms, int zoneIndex) {
-        if (zoneIndex < NO_GROUP) {
-            throw new IllegalArgumentException("Illegal zone index "
-                    + zoneIndex);
-        }
-        for (Geometry geometry : geoms) {
-            // get the zone id for the geometry
-            String zoneId = zoneMap.get(geometry);
-            // remove that zone ID from all groups
-            updateZone(zoneId, zoneIndex);
-        }
-    }
-
-    /**
-     * Adds a single zone ID to the indicated group.
-     * 
-     * @param zoneId
-     *            The zone ID string, i.e., 'NEZ007'.
-     * @param zoneIndex
-     *            The group number to assign the group to.
-     */
-    public void updateZone(String zoneId, int zoneIndex) {
-
-        if (zoneId != null) {
-            for (List<String> zoneGroup : groups) {
-                zoneGroup.remove(zoneId);
-            }
-            if (zoneIndex >= 0) {
-                while (zoneIndex > groups.size() - 1) {
-                    groups.add(new ArrayList<String>());
-                }
-                Map<Object, RGB> rscCmap = resourceData.getColorMap();
-                if (rscCmap != null) {
-                    Integer ziInteger = Integer.valueOf(zoneIndex);
-                    RGB idxColor = rscCmap.get(ziInteger);
-                    if (idxColor == null) {
-                        idxColor = new RGB(rand.nextInt(206) + 50,
-                                rand.nextInt(206) + 50, rand.nextInt(206) + 50);
-                        rscCmap.put(ziInteger, idxColor);
-                    }
-                }
-                // add zoneId to zoneIndex'th group
-                List<String> zoneGroup = groups.get(zoneIndex);
-                // sort zones within group so trivial changes don't cause
-                // shaded shape generation
-                String[] zoneGroupA = zoneGroup.toArray(new String[0]);
-                int idx = Arrays.binarySearch(zoneGroupA, zoneId);
-                if (idx < 0) {
-                    idx = Math.abs(idx) - 1;
-                }
-                zoneGroup.add(idx, zoneId);
-            }
-        }
-        signalZonesChanged();
-    }
-
-    /**
-     * Get the group number for geom. If geom is not in a group, return -1.
-     * 
-     * @param geom
-     *            The geometry whose group # is to be determined.
-     * @return The group number for the geometry, or -1 if the geometry is not
-     *         in any group.
-     */
-    public int getZoneIndex(Geometry geom) {
-        String zoneId = zoneMap.get(geom);
-        return getZoneIndex(zoneId);
-    }
-
-    /**
-     * Get the zone ID from the geometry.
-     * 
-     * @param geom
-     *            - Geometry for the zone
-     * @return zoneId - when geom is associated with a zone otherwise null
-     */
-    public String getZoneId(Geometry geom) {
-        return zoneMap.get(geom);
-    }
-
-    /**
-     * Get the group number for the zone with the given ID. If zoneId is not in
-     * a group, return -1.
-     * 
-     * @param zoneId
-     *            the The zone ID whose group # is to be determined.
-     * @return The group number for the zone ID, or -1 if the zone ID is not in
-     *         any group.
-     */
-    public int getZoneIndex(String zoneId) {
-        for (int i = 0; i < groups.size(); i++) {
-            List<String> group = groups.get(i);
-            if ((group != null) && group.contains(zoneId)) {
-                return i;
-            }
-        }
-        return NO_GROUP;
-    }
-
-    /**
-     * 
-     */
-    public void refreshSelections() {
-        setDirty(true);
-    }
-
-    public void compactList() {
-        // remove empty groups
-        int i = 0;
-        while (i < groups.size()) {
-            if (groups.get(i).size() > 0) {
-                i++;
-            } else {
-                groups.remove(i);
-            }
-        }
-    }
-
-    /**
-     * Move or clear the list of groups based on the desired zone operation.
-     * 
-     * @param selectedGroups
-     *            - List of groups to move/clear
-     * @param operation
-     *            The zone operation to perform
-     */
-    // public void moveGroup(final List<List<String>> selectedGroups,
-    // final ZoneOperation operation) {
-    //
-    // // Nothing to do return without marking dirty.
-    // if (selectedGroups.size() == 0) {
-    // return;
-    // }
-    //
-    // // clean up the groups then get a sorted list of the indices.
-    // cleanup(groups);
-    // int selIdx = 0;
-    // int[] selectedIndices = new int[selectedGroups.size()];
-    // for (List<String> group : selectedGroups) {
-    // selectedIndices[selIdx++] = groups.indexOf(group);
-    // }
-    // Arrays.sort(selectedIndices);
-    //
-    // int idx = -1;
-    // List<String> temp;
-    // switch (operation) {
-    // case CLEAR:
-    // for (idx = 0; idx < selectedIndices.length; ++idx) {
-    // groups.get(selectedIndices[idx]).clear();
-    // }
-    // break;
-    // case MOVE_DOWN:
-    // selIdx = selectedIndices.length - 1;
-    // if (selectedIndices[selIdx] < groups.size() - 1) {
-    // for (selIdx = selectedIndices.length - 1; selIdx >= 0; --selIdx) {
-    // idx = selectedIndices[selIdx];
-    // temp = groups.get(idx + 1);
-    // groups.set(idx + 1, groups.get(idx));
-    // groups.set(idx, temp);
-    // }
-    // }
-    // break;
-    // case MOVE_UP:
-    // selIdx = 0;
-    // if (selectedIndices[selIdx] > 0) {
-    // for (selIdx = 0; selIdx < selectedIndices.length; ++selIdx) {
-    // idx = selectedIndices[selIdx];
-    // temp = groups.get(idx - 1);
-    // groups.set(idx - 1, groups.get(idx));
-    // groups.set(idx, temp);
-    // }
-    // }
-    // break;
-    // case MOVE_TO_BOTTOM:
-    // selIdx = selectedIndices.length - 1;
-    // if (selectedIndices[selIdx] < groups.size() - 1) {
-    // int delta = groups.size() - selectedIndices[selIdx] - 1;
-    // for (selIdx = selectedIndices.length - 1; selIdx >= 0; --selIdx) {
-    // idx = selectedIndices[selIdx];
-    // temp = groups.remove(idx);
-    // groups.add(idx + delta, temp);
-    // }
-    // }
-    // break;
-    // case MOVE_TO_TOP:
-    // selIdx = 0;
-    // if (selectedIndices[selIdx] > 0) {
-    // int delta = selectedIndices[selIdx];
-    // for (selIdx = 0; selIdx < selectedIndices.length; ++selIdx) {
-    // idx = selectedIndices[selIdx];
-    // temp = groups.remove(idx);
-    // groups.add(idx - delta, temp);
-    // }
-    // // cleanup(groups);
-    // }
-    // break;
-    // default:
-    // statusHandler.handle(Priority.PROBLEM, "Unknown move code "
-    // + operation);
-    // }
-    //
-    // setDirty(true);
-    // }
-
-    /**
-     * Remove nulls and empty lists from list.
-     * 
-     * @param list
-     *            a list of lists, possibly containing nulls
-     */
-    private void cleanup(List<List<String>> list) {
-        Iterator<List<String>> it = list.iterator();
-        while (it.hasNext()) {
-            List<? extends Object> litem = it.next();
-            if ((litem == null) || litem.isEmpty()) {
-                it.remove();
-            }
-        }
-    }
-
-    /**
-     * Get the geometry type string from the database metadata.
-     * 
-     * @return the geometry type string
-     */
-    protected String getGeometryType() {
-        if (geometryType == null) {
-            try {
-                String table = resourceData.getMainTable();
-                StringBuilder query = new StringBuilder(
-                        "SELECT type FROM public.geometry_columns WHERE f_table_schema='");
-                query.append(MAP_SCHEMA);
-                query.append("' AND f_table_name='");
-                query.append(table);
-                query.append("' LIMIT 1;");
-                List<Object[]> results = DirectDbQuery.executeQuery(
-                        query.toString(), MAP_DB, QueryLanguage.SQL);
-
-                geometryType = (String) results.get(0)[0];
-            } catch (Throwable e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error querying geometry type", e);
-            }
-        }
-
-        return geometryType;
-    }
-
-    /**
-     * @return true if the zones in the resource are described by lines.
-     */
-    protected boolean isLineal() {
-        return getGeometryType().endsWith("LINESTRING");
-    }
-
-    /**
-     * @return true if the zones in the resource are described by polygons.
-     */
-    protected boolean isPolygonal() {
-        return getGeometryType().endsWith("POLYGON");
-    }
-
-    /**
-     * @return true if the zones in the resource are described by points.
-     */
-    protected boolean isPuntal() {
-        return getGeometryType().endsWith("POINT");
-    }
-
-    public void setZoneIdsToShow(String[] zoneIdsToShow) {
-        groups.get(SELECTION_GROUP).clear();
-        List<String> selectedZones = expandZones(zoneIdsToShow);
-        for (String zoneId : selectedZones) {
-            updateZone(zoneId, SELECTION_GROUP);
-        }
-        refreshSelections();
-    }
-
-    /**
-     * The GeoID of a warning sometimes contains entries of the form NEZ001>003.
-     * This is a shorthand for NEZ001, NEZ002, NEZ003. This method takes the
-     * input array of strings and creates a List of strings consisting of the
-     * expanded zone entries.
-     * 
-     * @param zoneIdsToShow
-     *            A list of zone IDs, possibly containing consecutive-zone
-     *            shorthand.
-     * @return The input list, with zone shorthand expanded.
-     */
-    private List<String> expandZones(String[] zoneIdsToShow) {
-        List<String> selectedZones = null;
-        if (zoneIdsToShow == null) {
-            selectedZones = new ArrayList<String>(0);
-        } else {
-            // A pattern for multi-zone regions.
-            Pattern consecZonePat = Pattern
-                    .compile("\\s*(\\w{2})(\\w+)(\\d{3})>(\\d{3})\\s*");
-
-            // The number of selected zones will be at least the same length
-            // as zoneIdsToShow
-            selectedZones = new ArrayList<String>(zoneIdsToShow.length);
-
-            for (String zid : zoneIdsToShow) {
-
-                Matcher csecMatch = consecZonePat.matcher(zid);
-                if (csecMatch.matches()) {
-                    // Extract the pieces of the zones from the match
-                    String st = csecMatch.group(1);
-                    String ztype = csecMatch.group(2);
-                    String startDigits = csecMatch.group(3);
-                    String endDigits = csecMatch.group(4);
-
-                    // Convert the start and end strings to integers
-                    int startNum = Integer.valueOf(startDigits);
-                    int endNum = Integer.valueOf(endDigits);
-
-                    // Loop from start to end inclusive, generating expanded
-                    // zone IDs
-                    String expanded = null;
-                    for (int zoneNum = startNum; zoneNum <= endNum; zoneNum++) {
-                        expanded = String
-                                .format("%s%s%03d", st, ztype, zoneNum);
-                        selectedZones.add(expanded);
-                    }
-
-                } else {
-                    selectedZones.add(zid);
-                }
-
-            }
-        }
-
-        return selectedZones;
-    }
-
-    /**
-     * Find the list of zones (in allTables, not just the visible ones) that
-     * contain the specified coordinate.
-     * 
-     * @param aLatLon
-     *            a Coordinate
-     * @return An array of zone ID strings
-     */
-    public String[] getOverlappingZones(Coordinate aLatLon) {
-        Geometry coordGeom = new GeometryFactory().createPoint(aLatLon);
-        ArrayList<String> overlappingZones = new ArrayList<String>();
-        for (Geometry geom : zoneMap.keySet()) {
-            if (geom.contains(coordGeom)) {
-                overlappingZones.add(zoneMap.get(geom));
-            }
-        }
-        return overlappingZones.toArray(new String[0]);
-    }
-
-    /**
-     * Get the zone IDs of all zones that geom overlaps.
-     * <p>
-     * This method was written to help initialize the map in MakeHazardDialog
-     * from a temporary hazard grid. When it runs, paint() may not have been
-     * called and/or the database query in paint() may not have completed. We
-     * also can't use paint()'s method of setting a "try again" flag and letting
-     * the system re-invoke the method. Furthermore, paint() might actually be
-     * running, so it could steal our database response if we used the same
-     * query job.
-     * <p>
-     * The net result of the conditions listed above is that this method has to
-     * perform its own database query with a local QueryJob and wait for it to
-     * complete. A listener that notifies the main thread when the query job
-     * completes is attached to the query job, the query job is scheduled, and
-     * the main thread waits to be notified. The UI is frozen while we wait, so
-     * a timed wait is used. This may cause a null to be returned erroneously if
-     * the database connection is slow.
-     * <p>
-     * The listener is never removed from the job because both are local and go
-     * out of scope when the method ends.
-     * <p>
-     * This method is also used in MakeHazard to get the zones overlapped by the
-     * edit area when the user doesn't select any zones in the map.
-     * 
-     * @param geom
-     *            The geometry that defines the area.
-     * @param areaThreshold
-     *            A fraction (0.0<=threshold<=1.0) that describes how much of
-     *            the zone's area must be overlapped by the geometry for its ID
-     *            to be in the returned list.
-     * @return an array of zone IDs
-     */
-    public String[] getOverlappingZones(Geometry geom, double areaThreshold) {
-        String[] result = null;
-
-        Envelope env = getBoundingEnvelope();
-        QueryRequest queryRequest = new QueryRequest();
-        queryRequest.query = buildQuery(env, 0.0);
-        queryRequest.target = null;
-        QueryJob lqj = new QueryJob("Get overlapping zones");
-        lqj.requestQueue.clear();
-        lqj.requestQueue.add(queryRequest);
-        lqj.addJobChangeListener(new JobChangeAdapter() {
-            @Override
-            public void done(IJobChangeEvent event) {
-                synchronized (ZoneDbResource.this) {
-                    ZoneDbResource.this.notify();
-                }
-            }
-        });
-        synchronized (this) {
-            // calling schedule inside synch block ensures wait() sees notify()
-            lqj.schedule();
-            try {
-                wait(25L * 1000L);
-            } catch (InterruptedException e) {
-                statusHandler
-                        .handle(Priority.VERBOSE,
-                                "GetOverlappingZones(Geometry): Interrupted during wait().");
-            }
-        }
-        DbData[] rslt = lqj.responseQueue.poll();
-        if (rslt == null) {
-            // error or slow connection; not sure which
-            statusHandler
-                    .handle(Priority.VERBOSE,
-                            "GetOverlappingZones(Geometry): No database response was received.");
-        } else {
-            List<String> zoneIDs = new ArrayList<String>(rslt.length);
-            Geometry db_geom;
-            for (DbData data : rslt) {
-                db_geom = null;
-                try {
-                    db_geom = wkbReader.read(data.wkb);
-                    Geometry intersectGeom = db_geom.intersection(geom);
-                    if (intersectGeom.getArea() >= db_geom.getArea()
-                            * areaThreshold) {
-                        zoneIDs.add(data.zone);
-                    }
-                } catch (ParseException e) {
-                    statusHandler.handle(Priority.PROBLEM,
-                            "Error parsing database geometry.", e);
-                }
-            }
-            result = zoneIDs.toArray(new String[zoneIDs.size()]);
-        }
-
-        return result;
-    }
-
-    public String[] getAreaList(Grid2DBit mask, DataManager dm,
-            double areaThreshold) {
-        String[] result = null;
-
-        QueryRequest queryRequest = new QueryRequest();
-        queryRequest.query = buildEAQuery();
-        queryRequest.target = null;
-        MakeHazardQueryJob lqj = new MakeHazardQueryJob("Get overlapping zones");
-        lqj.requestQueue.clear();
-        lqj.requestQueue.add(queryRequest);
-        lqj.addJobChangeListener(new JobChangeAdapter() {
-            @Override
-            public void done(IJobChangeEvent event) {
-                synchronized (ZoneDbResource.this) {
-                    ZoneDbResource.this.notify();
-                }
-            }
-        });
-        synchronized (this) {
-            // calling schedule inside synch block ensures wait() sees notify()
-            lqj.schedule();
-            try {
-                wait(25L * 1000L);
-            } catch (InterruptedException e) {
-                statusHandler
-                        .handle(Priority.VERBOSE,
-                                "GetOverlappingZones(Geometry): Interrupted during wait().");
-            }
-        }
-        MakeHazardDbData[] rslt = lqj.responseQueue.poll();
-        if (rslt == null) {
-            // error or slow connection; not sure which
-            statusHandler
-                    .handle(Priority.VERBOSE,
-                            "GetOverlappingZones(Geometry): No database response was received.");
-        } else {
-            List<String> zoneIDs = new ArrayList<String>(rslt.length);
-            List<ReferenceID> refIds = new ArrayList<ReferenceID>(rslt.length);
-            for (MakeHazardDbData data : rslt) {
-                refIds.add(new ReferenceID(data.zone));
-            }
-
-            List<ReferenceData> refDataList = dm.getRefManager()
-                    .getReferenceData(refIds);
-            for (ReferenceData refData : refDataList) {
-                Grid2DBit editAreaMask = refData.getGrid();
-                Grid2DBit intersect = editAreaMask.and(mask);
-                float ratio = (float) intersect.numberOfBitsSet()
-                        / (float) editAreaMask.numberOfBitsSet();
-                if (ratio >= areaThreshold) {
-                    zoneIDs.add(refData.getId().getName());
-                }
-            }
-
-            result = zoneIDs.toArray(new String[zoneIDs.size()]);
-        }
-
-        return result;
-    }
-
-    /**
-     * Return the group # of the first group that contains no zone IDs, or 1 if
-     * no groups have zone IDs or the display type has been set to MAKE_HAZARD
-     * or SINGLE_ZONE_ALLOWABLE.
-     * 
-     * @return A group number
-     */
-    public int getNextIndex() {
-
-        int index = 0;
-        if (!groups.isEmpty()
-                && (displayType != DisplayType.SINGLE_ZONE_ALLOWABLE)
-                && (displayType != DisplayType.MAKE_HAZARD)) {
-            for (index = 0; index < groups.size(); index++) {
-                List<String> group = groups.get(index);
-                if (group.isEmpty()) {
-                    break;
-                }
-            }
-        }
-        return index;
-    }
-
-    /**
-     * Move a list of zone IDs to the group with the designated index.
-     * 
-     * @param zoneIds
-     *            A list of zone IDs to assign to the group.
-     * @param index
-     *            A group number.
-     */
-    public void setGroup(List<String> zoneIds, int index) {
-        if (index < NO_GROUP) {
-            throw new IllegalArgumentException("Illegal zone index " + index);
-        }
-        for (String zoneId : zoneIds) {
-            updateZone(zoneId, index);
-        }
-    }
-
-    /**
-     * Add the listener to the listeners that are called when zones change.
-     * 
-     * @param listener
-     */
-    public void addZoneChangeListener(IZoneChangeListener listener) {
-        if (!zoneChangeListeners.contains(listener)) {
-            zoneChangeListeners.add(listener);
-        }
-    }
-
-    /**
-     * Remove the specified listener from the list of zone change listeners, if
-     * it is in the list.
-     * 
-     * @param listener
-     */
-    public void removeZoneChangeListener(IZoneChangeListener listener) {
-        zoneChangeListeners.remove(listener);
-    }
-
-    /**
-     * Remove all the zone change listeners.
-     */
-    public void removeAllZoneChangeListeners() {
-        zoneChangeListeners.clear();
-    }
-
-    /**
-     * Notify listeners that zones have changed.
-     */
-    public void signalZonesChanged() {
-        for (IZoneChangeListener listener : zoneChangeListeners) {
-            listener.zoneChanged();
-        }
-    }
-
-    // public List<String> getEditAreaZones(Float areaThreshold) {
-    // IReferenceSetManager refMgr = DataManager.getCurrentInstance()
-    // .getRefManager();
-    // ReferenceData refData = refMgr.getActiveRefSet();
-    // Geometry geom = refData.getPolygons(CoordinateType.GRID);
-    // String[] zones = getOverlappingZones(geom, areaThreshold);
-    // return null;
-    // }
-
-    /**
-     * Paint the zone and/or group labels.
-     * 
-     * @throws VizException
-     *             if thrown by paintLabelSet()
-     */
-    protected void paintLabels() throws VizException {
-        // Draw the labels on top of everything else
-        if (labelFont == null) {
-            int fontNum = 2;
-            if (GFEPreference.contains("ZoneMapLabel_font")) {
-                fontNum = GFEPreference.getIntPreference("ZoneMapLabel_font");
-            }
-
-            labelFont = GFEFonts.getFont(target, fontNum);
-        }
-
-        if (labelZones) {
-            paintZoneLabels();
-        }
-
-        if (getCapability(ZoneGroupableCapability.class).isZoneGrouping()) {
-            paintGroupLabels();
-        }
-    }
-
-    /**
-     * Paint the labels for zones.
-     * 
-     * @throws VizException
-     *             if thrown by paintLabelSet()
-     */
-    protected void paintZoneLabels() throws VizException {
-        RGB color = resourceData.getLabelColor();
-        GeneralGridGeometry mapGeometry = descriptor.getGridGeometry();
-        List<ReferencedCoordinate> refCoordList;
-        HorizontalAlignment horiz = HorizontalAlignment.CENTER;
-        VerticalAlignment vert = VerticalAlignment.BOTTOM;
-
-        Collection<String> tables = resourceData.getTables();
-
-        if (isPuntal()) {
-            horiz = HorizontalAlignment.LEFT;
-            vert = VerticalAlignment.TOP;
-        }
-
-        // draw zone labels
-        List<LabelTuple> alreadyDrawn = new ArrayList<LabelTuple>(
-                labelMap.size());
-        for (DbData data : dbData) {
-            if (tables.contains(data.tableName)) {
-                refCoordList = labelMap.get(data.zone);
-                if (refCoordList != null) {
-                    paintLabelSet(" " + data.zone, labelFont, null, color,
-                            horiz, vert, refCoordList, mapGeometry, ""
-                                    + data.zone, alreadyDrawn);
-                }
-            }
-        }
-    }
-
-    /**
-     * Paint the labels for groups.
-     * 
-     * @throws VizException
-     *             if thrown by paintLabelSet()
-     */
-    protected void paintGroupLabels() throws VizException {
-        RGB color = resourceData.getLabelColor();
-        GeneralGridGeometry mapGeometry = descriptor.getGridGeometry();
-        List<ReferencedCoordinate> refCoordList;
-        HorizontalAlignment horiz = HorizontalAlignment.CENTER;
-        VerticalAlignment vert = VerticalAlignment.TOP;
-
-        if (isPuntal()) {
-            horiz = HorizontalAlignment.LEFT;
-            vert = VerticalAlignment.TOP;
-        }
-
-        // draw group labels
-        List<LabelTuple> alreadyDrawn = new ArrayList<LabelTuple>(
-                labelMap.size());
-        for (Collection<String> group : groups) {
-            int groupNum = groups.indexOf(group);
-            if (group != null) {
-                for (String zone : group) {
-                    refCoordList = labelMap.get(zone);
-                    if (refCoordList != null) {
-                        paintLabelSet(" " + (groupNum + 1), labelFont,
-                                IGraphicsTarget.TextStyle.DROP_SHADOW, color,
-                                horiz, vert, refCoordList, mapGeometry, ""
-                                        + zone, alreadyDrawn);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Paint text, with the specified appearance options, at the locations given
-     * by refCoordList. The referenced coordinates are converted to screen
-     * coordinates with mapGeometry. Labels are filtered according to a distance
-     * function; any label whose coordinates are too close to a label that has
-     * already been drawn is skipped. As each label is painted, its location is
-     * added to the list of labels that have already been drawn.
-     * <p>
-     * The distance function (abs(xdiff)+abs(ydiff)) is the same one used in
-     * AWIPS I.
-     * <p>
-     * The "too close" value is given by MIN_LABEL_DISTANCE.
-     * 
-     * @param text
-     *            The text to draw
-     * @param font
-     *            The font in which to draw the text
-     * @param style
-     *            The style in which to draw the text
-     * @param color
-     *            The color in which to draw the text
-     * @param horiz
-     *            The horizontal alignment of the text
-     * @param vert
-     *            The vertical alignment of the text
-     * @param refCoordList
-     *            The list of referenced coordinates at which to draw the text
-     * @param mapGeometry
-     *            The geometry used to convert referenced coordinates to pixel
-     *            coordinates
-     * @param alreadyDrawn
-     *            The pixel coordinates of labels that have already been drawn.
-     * @throws VizException
-     *             if thrown by target.drawString
-     */
-    protected void paintLabelSet(String text, IFont font,
-            IGraphicsTarget.TextStyle style, RGB color,
-            HorizontalAlignment horiz, VerticalAlignment vert,
-            List<ReferencedCoordinate> refCoordList,
-            GeneralGridGeometry mapGeometry, String zone,
-            List<LabelTuple> alreadyDrawn) throws VizException {
-
-        Coordinate coord;
-        DrawableString ds = new DrawableString("", color);
-        ds.font = font;
-        ds.addTextStyle(TextStyle.DROP_SHADOW);
-        ds.horizontalAlignment = horiz;
-        ds.verticallAlignment = vert;
-        refcLoop: for (ReferencedCoordinate refCoord : refCoordList) {
-            try {
-                coord = refCoord.asPixel(mapGeometry);
-                for (LabelTuple old : alreadyDrawn) {
-                    if (old.zone.equals(zone) && old.text.equals(text)) {
-                        double distance = scaleX * Math.abs(old.x - coord.x)
-                                + scaleY * Math.abs(old.y - coord.y);
-                        if (distance < MIN_LABEL_DISTANCE) {
-                            continue refcLoop;
-                        }
-                    }
-                }
-                ds.setText(text, color);
-                ds.setCoordinates(coord.x, coord.y);
-                target.drawStrings(ds);
-                alreadyDrawn.add(new LabelTuple(coord.x, coord.y, text, zone));
-            } catch (TransformException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error transforming geometry for " + text, e);
-            } catch (FactoryException e) {
-                statusHandler.handle(Priority.PROBLEM, "FactoryException for "
-                        + text, e);
-            }
-        }
-    }
-
-    /**
-     * A class for keeping track of which labels have been drawn.
-     * 
-     * <pre>
-     * 
-     * SOFTWARE HISTORY
-     * 
-     * Date         Ticket#    Engineer    Description
-     * ------------ ---------- ----------- --------------------------
-     * Oct 13, 2010            wldougher     Initial creation
-     * 
-     * </pre>
-     * 
-     * @author wldougher
-     * @version 1.0
-     */
-    private class LabelTuple {
-        public double x;
-
-        public double y;
-
-        public String text;
-
-        public String zone;
-
-        public LabelTuple(double x, double y, String text, String zone) {
-            this.x = x;
-            this.y = y;
-            this.text = text;
-            this.zone = zone;
-        }
-    }
-
-    // private LinkedList<String> methodNames = new LinkedList<String>();
-
-    // private LinkedList<Long> methodDates = new LinkedList<Long>();
-
-    // private void enter(String methodName) {
-    // methodNames.push(methodName);
-    // methodDates.push(new Long(System.currentTimeMillis()));
-    // log(Priority.VERBOSE, methodName + "() entered.");
-    // }
-
-    // private void leave(String methodName) {
-    // long now = System.currentTimeMillis();
-    // int idx = methodNames.indexOf(methodName);
-    // if (idx < 0) {
-    // log(Priority.VERBOSE,
-    // "leave() called without matching enter() for " + methodName
-    // + "().");
-    // return;
-    // }
-    // String name = null;
-    // Long stime = null;
-    // StringBuilder sb = new StringBuilder();
-    // long dur = 0;
-    // do {
-    // name = methodNames.pop();
-    // stime = methodDates.pop();
-    // dur = now - stime.longValue();
-    // sb.setLength(0);
-    // sb.append(name).append("() completed. duration=").append(dur)
-    // .append(" ms");
-    // if (!name.equals(methodName)) {
-    // sb.append(" (unmatched)");
-    // }
-    // log(Priority.VERBOSE, sb.toString());
-    // } while (!name.equals(methodName));
-    // }
-}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/HistoSampler.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/HistoSampler.java
index 8421dc68cf..a19b7ddb3d 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/HistoSampler.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/HistoSampler.java
@@ -28,29 +28,34 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
+import com.raytheon.uf.common.dataplugin.gfe.slice.ScalarGridSlice;
+import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.time.TimeRange;
-import com.raytheon.viz.gfe.GFEServerException;
-import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.gfe.core.internal.IFPClient;
 
 /**
  * Samples grid data and creates histogram
  * 
  * <pre>
+ * 
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	
- * ------------	----------	-----------	--------------------------
- * Jun 5, 2008	1167		mnash	     Initial creation
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jun 05, 2008 1167        mnash        Initial creation
  * Jul 11, 2008 1167        mnash        Fixed responses from IFPClient
- * Sep 3, 2008  1283        njensen      Fixed issues
+ * Sep 03, 2008 1283        njensen      Fixed issues
  * Aug 19, 2009 2899        njensen      Maps for performance boost on getParmHisto()
+ * Dec 09, 2015 5129        dgilling     Support new IFPClient.
+ * 
  * </pre>
  * 
  * @author mnash
@@ -98,10 +103,8 @@ public class HistoSampler {
      * 
      * @param client
      * @param requests
-     * @throws GFEServerException
      */
-    public HistoSampler(IFPClient client, ArrayList<SamplerRequest> requests)
-            throws GFEServerException {
+    public HistoSampler(IFPClient client, ArrayList<SamplerRequest> requests) {
         _valid = true;
         statusHandler.handle(Priority.DEBUG, "Requests " + requests);
         // convert ids to reference data objects
@@ -270,27 +273,26 @@ public class HistoSampler {
     private List<SamplerRequest> getReferenceData(IFPClient client,
             final List<SamplerRequest> requests) {
         // determine list of edit areas to retrieve
-        ArrayList<ReferenceID> need = new ArrayList<ReferenceID>(
-                requests.size());
-        for (int i = 0; i < requests.size(); i++) {
-            if (requests.get(i).isRefID()
-                    && (need.contains(requests.get(i).areaID()) == false)) {
-                need.add(requests.get(i).areaID());
+        List<ReferenceID> need = new ArrayList<ReferenceID>(requests.size());
+        for (SamplerRequest request : requests) {
+            if (request.isRefID() && (!need.contains(request.areaID()))) {
+                need.add(request.areaID());
             }
         }
+
         // retrieve them
-        List<ReferenceData> refAreas = client.getReferenceData(need);
-        for (int i = 0; i < refAreas.size(); i++) {
-            if (refAreas.get(i) == null) {
-                statusHandler.handle(Priority.PROBLEM, "Edit area : " + i
-                        + " not available in server");
-                _valid = false;
-            } else {
-                refAreas.get(i).getGrid();
-            }
-            if ((i == refAreas.size()) && (_valid == false)) {
-                return new ArrayList<SamplerRequest>(0);
-            }
+        ServerResponse<List<ReferenceData>> sr = client.getReferenceData(need);
+        if (!sr.isOkay()) {
+            statusHandler
+                    .error(String.format(
+                            "Some edit areas not available in server: %s",
+                            sr.message()));
+            _valid = false;
+            return Collections.emptyList();
+        }
+        List<ReferenceData> refAreas = sr.getPayload();
+        for (ReferenceData area : refAreas) {
+            area.getGrid();
         }
 
         // put in the reference data objects in place of the reference ids in
@@ -354,9 +356,17 @@ public class HistoSampler {
     }
 
     private List<TimeRange> requestedGrids(IFPClient client, ParmID parmID,
-            List<TimeRange> sampleTR) throws GFEServerException {
+            List<TimeRange> sampleTR) {
         // get the inventory for this parm
-        List<TimeRange> gridTimes = client.getGridInventory(parmID);
+        ServerResponse<List<TimeRange>> sr = client.getGridInventory(parmID);
+        if (!sr.isOkay()) {
+            _valid = false;
+            statusHandler.error(String.format(
+                    "Unable to get grid inventory for: %s %s", parmID,
+                    sr.message()));
+            return Collections.emptyList();
+        }
+        List<TimeRange> gridTimes = sr.getPayload();
 
         // create the needed grid list and return it
         List<TimeRange> ret = new ArrayList<TimeRange>(gridTimes.size());
@@ -396,18 +406,17 @@ public class HistoSampler {
 
     private List<IGridSlice> getGrids(IFPClient client, ParmID parmID,
             List<TimeRange> gridTimes) {
-
-        List<IGridSlice> data;
-        try {
-            data = SamplerGridSliceCache.getData(client, parmID, gridTimes);
-            // data = client.getGridData(parmID, gridTimes);
-        } catch (GFEServerException e) {
+        ServerResponse<List<IGridSlice>> sr = SamplerGridSliceCache.getData(
+                client, parmID, gridTimes);
+        if (!sr.isOkay()) {
             _valid = false;
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-            data = new ArrayList<IGridSlice>(0);
+            statusHandler.error(String.format(
+                    "Getting Grid Data problem for: %s %s", parmID,
+                    sr.message()));
+            return Collections.emptyList();
         }
 
-        return data;
+        return sr.getPayload();
     }
 
     /**
@@ -438,8 +447,26 @@ public class HistoSampler {
      * @return
      */
     private IGridSlice getTopoGrid(IFPClient client) {
-        return DataManager.getCurrentInstance().getTopoManager()
-                .getCompositeTopo();
+        // get the grid location
+        ServerResponse<GridLocation> sr = client.getDBGridLocation();
+        if (!sr.isOkay()) {
+            _valid = false;
+            statusHandler.error(String.format(
+                    "Problem obtaining dbGridLocation: %s", sr.message()));
+            return null;
+        }
+        GridLocation gloc = sr.getPayload();
+
+        // get the topography grid
+        ServerResponse<ScalarGridSlice> sr2 = client.getTopoData(gloc);
+        if (!sr.isOkay()) {
+            _valid = false;
+            statusHandler.error(String.format(
+                    "Problem obtaining topography grid: %s", sr2.message()));
+            return null;
+        }
+
+        return sr2.getPayload();
     }
 
     /**
@@ -449,20 +476,19 @@ public class HistoSampler {
      * @return the ISC ref data
      */
     public List<ReferenceData> getISCReferenceData(IFPClient client) {
-        ArrayList<ReferenceID> idsISC = new ArrayList<ReferenceID>();
-
-        List<ReferenceID> idsAll = client.getReferenceInventory();
-
-        if (idsAll.isEmpty()) {
+        ServerResponse<List<ReferenceID>> sr = client.getReferenceInventory();
+        if (!sr.isOkay()) {
             _valid = false;
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error getting ISC Edit Areas");
+            statusHandler.error(String.format(
+                    "Error getting ISC Edit Areas: %s", sr.message()));
         }
+        List<ReferenceID> idsAll = sr.getPayload();
 
         // Get the ISC ids
+        List<ReferenceID> idsISC = new ArrayList<ReferenceID>();
         for (ReferenceID id : idsAll) {
             String name = id.getName();
-            if ((name.length() > 4) && name.startsWith("ISC_")) {
+            if ((name.length() > 4) && (name.startsWith("ISC_"))) {
                 idsISC.add(id);
             }
         }
@@ -471,22 +497,20 @@ public class HistoSampler {
         // "ISC edit areas: " + idsISC.toString());
 
         // get the ReferenceData objects
-        List<ReferenceData> refAreas = client.getReferenceData(idsISC);
-        for (int i = 0; i < refAreas.size(); i++) {
-            if (refAreas.get(i) == null) {
-                statusHandler.handle(Priority.PROBLEM, "ISC edit area " + i
-                        + " not available in server");
-                _valid = false;
-                continue;
-            }
-
-            refAreas.get(i).getGrid();
-
-            if ((i == refAreas.size()) && (_valid == false)) {
-                return Collections.emptyList();
-            }
+        ServerResponse<List<ReferenceData>> sr2 = client
+                .getReferenceData(idsISC);
+        if (!sr2.isOkay()) {
+            statusHandler.error(String.format(
+                    "Some ISC edit areas not available in server: %s",
+                    sr.message()));
+            _valid = false;
+            return Collections.emptyList();
         }
 
+        List<ReferenceData> refAreas = sr2.getPayload();
+        for (ReferenceData refArea : refAreas) {
+            refArea.getGrid();
+        }
         return refAreas;
     }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/SamplerGridSliceCache.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/SamplerGridSliceCache.java
index ec4377101a..990cc81289 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/SamplerGridSliceCache.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/sampler/SamplerGridSliceCache.java
@@ -26,10 +26,11 @@ import java.util.List;
 import java.util.Map;
 
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.GetGridRequest;
 import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
+import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
 import com.raytheon.uf.common.time.TimeRange;
-import com.raytheon.viz.gfe.GFEServerException;
-import com.raytheon.viz.gfe.core.internal.IFPClient;
 
 /**
  * Caches the results of a call to IFPClient.getGridData(ParmID,
@@ -62,8 +63,8 @@ public class SamplerGridSliceCache {
 
     private static Map<Long, Map<ParmID, List<IGridSlice>>> cache = new HashMap<Long, Map<ParmID, List<IGridSlice>>>();
 
-    public static List<IGridSlice> getData(IFPClient client, ParmID parmId,
-            List<TimeRange> gridTimes) throws GFEServerException {
+    public static ServerResponse<List<IGridSlice>> getData(IFPClient client,
+            ParmID parmId, List<TimeRange> gridTimes) {
         List<IGridSlice> result = new ArrayList<IGridSlice>();
         List<TimeRange> needToRequest = new ArrayList<TimeRange>();
         long thread = Thread.currentThread().getId();
@@ -92,9 +93,12 @@ public class SamplerGridSliceCache {
             }
         }
 
-        if (needToRequest.size() > 0) {
-            List<IGridSlice> retrieved = client.getGridData(parmId,
-                    needToRequest);
+        ServerResponse<List<IGridSlice>> ssr = new ServerResponse<>();
+        if (!needToRequest.isEmpty()) {
+            ServerResponse<List<IGridSlice>> sr = client
+                    .getGridData(new GetGridRequest(parmId, needToRequest));
+            ssr.addMessages(sr);
+            List<IGridSlice> retrieved = sr.getPayload();
             // for (IGridSlice slice : retrieved) {
             // slice.setUseCache(true);
             // }
@@ -103,8 +107,8 @@ public class SamplerGridSliceCache {
         }
 
         Collections.sort(result);
-
-        return result;
+        ssr.setPayload(result);
+        return ssr;
     }
 
     public static void remove(long thread) {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolEdit.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolEdit.java
index 7d0c472f82..fc50cdef8c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolEdit.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartToolEdit.java
@@ -20,8 +20,8 @@
 package com.raytheon.viz.gfe.smarttool;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.util.Properties;
 
 import org.apache.velocity.Template;
@@ -40,6 +40,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.python.PythonFileFilter;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -53,11 +54,12 @@ import com.raytheon.viz.gfe.PythonUtil;
  * 
  * <pre>
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Mar 20, 2008				njensen	    Initial creation
- * Sep 25, 2008 1562        askripsky   Moved methods out to
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * Mar 20, 2008             njensen     Initial creation
+ * Sep 25, 2008  1562       askripsky   Moved methods out to
  * Sep 09, 2013 #2033       dgilling    Use new templates directory.
+ * Jan 18, 2016  4834       njensen     Fix creating new files, deleted dead code
  * 
  * </pre>
  * 
@@ -66,6 +68,15 @@ import com.raytheon.viz.gfe.PythonUtil;
  */
 
 public class SmartToolEdit {
+
+    /*
+     * TODO Functionality should be consolidated to an extension of
+     * AbstractScriptUtil to follow the same pattern as when creating other new
+     * python files for GFE. Currently AbstractScriptUtil does not support extra
+     * args to velocity like the parmToEdit so it will need to be further
+     * improved before that is possible.
+     */
+
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(SmartToolEdit.class);
 
@@ -102,23 +113,22 @@ public class SmartToolEdit {
                 IPathManager pathMgr = PathManagerFactory.getPathManager();
                 LocalizationContext cx = pathMgr.getContext(
                         LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-                localizationFile = PathManagerFactory.getPathManager()
-                        .getLocalizationFile(
-                                cx,
-                                GfePyIncludeUtil.SMART_TOOLS + File.separator
-                                        + toolFilename);
-                if (localizationFile != null) {
-                    File file = localizationFile.getFile();
-                    if (!file.getParentFile().exists()) {
-                        file.getParentFile().mkdirs();
+                String filename = GfePyIncludeUtil.SMART_TOOLS
+                        + IPathManager.SEPARATOR + toolFilename;
+                localizationFile = pathMgr.getLocalizationFile(cx, filename);
+                if (!localizationFile.isProtected()) {
+                    try (SaveableOutputStream sos = localizationFile
+                            .openOutputStream();
+                            OutputStreamWriter writer = new OutputStreamWriter(
+                                    sos)) {
+                        template.merge(context, writer);
+                        writer.close();
+                        sos.save();
+                        // refresh reference in memory
+                        localizationFile = pathMgr.getLocalizationFile(cx,
+                                filename);
+                        PythonUtil.openPythonFile(localizationFile);
                     }
-
-                    FileWriter fw = new FileWriter(localizationFile.getFile());
-
-                    template.merge(context, fw);
-                    fw.close();
-                    localizationFile.save();
-                    PythonUtil.openPythonFile(localizationFile);
                 } else {
                     // Display Protected file message
                     Shell shell = PlatformUI.getWorkbench()
@@ -140,66 +150,4 @@ public class SmartToolEdit {
         return localizationFile;
     }
 
-    public static LocalizationFile initializeNewUtility(String utilityName) {
-        LocalizationFile localizationFile = null;
-
-        String toolFilename = new String(utilityName);
-        if (!toolFilename.endsWith(PythonFileFilter.EXTENSION)) {
-            toolFilename += PythonFileFilter.EXTENSION;
-        }
-
-        try {
-            File templateFile = new File(FileLocator.resolve(
-                    FileLocator.find(Activator.getDefault().getBundle(),
-                            new Path(SmartToolConstants.TEMPLATES_DIR), null))
-                    .getPath());
-
-            try {
-                Properties p = new Properties();
-                p.setProperty("file.resource.loader.path",
-                        templateFile.getPath());
-                Velocity.init(p);
-                VelocityContext context = new VelocityContext();
-
-                context.put("itemName", utilityName);
-                String author = LocalizationManager.getInstance()
-                        .getCurrentUser();
-                context.put("author", author);
-
-                Template template = null;
-                template = Velocity.getTemplate("utility.vm");
-
-                IPathManager pathMgr = PathManagerFactory.getPathManager();
-                LocalizationContext cx = pathMgr.getContext(
-                        LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-                localizationFile = PathManagerFactory.getPathManager()
-                        .getLocalizationFile(
-                                cx,
-                                GfePyIncludeUtil.UTILITIES + File.separator
-                                        + toolFilename);
-                File file = localizationFile.getFile();
-                if (!file.getParentFile().exists()) {
-                    file.getParentFile().mkdirs();
-                }
-
-                FileWriter fw = new FileWriter(localizationFile.getFile());
-
-                template.merge(context, fw);
-                fw.close();
-
-                localizationFile.save();
-
-                PythonUtil.openPythonFile(localizationFile);
-            } catch (Exception e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error creating new utility", e);
-            }
-        } catch (IOException e) {
-            statusHandler.error(
-                    "Error retrieving templates directory for new utility.", e);
-        }
-
-        return localizationFile;
-    }
-
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/TextFileUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/TextFileUtil.java
index cc08bd2b7b..5e5f9b9311 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/TextFileUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/TextFileUtil.java
@@ -22,7 +22,6 @@ package com.raytheon.viz.gfe.smarttool;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
@@ -33,8 +32,8 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.python.PythonFileFilter;
 import com.raytheon.viz.gfe.GFEOperationFailedException;
 
@@ -48,6 +47,8 @@ import com.raytheon.viz.gfe.GFEOperationFailedException;
  * ------------ ---------- ----------- --------------------------
  * Apr 28, 2009            njensen     Initial creation
  * Apr 20, 2015   4027     randerso    Changes to support GFE formatter auto tests
+ * Nov 12, 2015   4834     njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 05, 2016   5242     dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -93,7 +94,7 @@ public class TextFileUtil {
         LocalizationContext ctx = PATH_MGR.getContext(source.getContext()
                 .getLocalizationType(), LocalizationLevel.USER);
 
-        LocalizationFile destLf = getTextFile(ctx, source.getName());
+        LocalizationFile destLf = getTextFile(ctx, source.getPath());
         return destLf;
     }
 
@@ -124,8 +125,7 @@ public class TextFileUtil {
     }
 
     public static void makeWritableCopy(String source, String fileType,
-            String dest, boolean deleteFlag) throws IOException,
-            GFEOperationFailedException {
+            String dest, boolean deleteFlag) throws GFEOperationFailedException {
         LocalizationFile srcLf = getTextFile(source, fileType);
         if ((srcLf.getContext().getLocalizationLevel() == LocalizationLevel.BASE)
                 || (srcLf.getContext().getLocalizationLevel() == LocalizationLevel.CONFIGURED)
@@ -139,7 +139,6 @@ public class TextFileUtil {
                     getPathFromType(dest, fileType));
             try {
                 copy(srcLf, destLf);
-                destLf.save();
             } catch (Exception e) {
                 throw new GFEOperationFailedException(
                         "Unable to save localization file", e);
@@ -169,7 +168,7 @@ public class TextFileUtil {
         Files.createDirectories(dir.toPath());
 
         try (InputStream in = srcLf.openInputStream();
-                OutputStream out = destLf.openOutputStream()) {
+                SaveableOutputStream out = destLf.openOutputStream()) {
 
             // Transfer bytes from in to out
             byte[] buf = new byte[1024];
@@ -177,11 +176,12 @@ public class TextFileUtil {
             while ((len = in.read(buf)) > 0) {
                 out.write(buf, 0, len);
             }
+            out.save();
         }
     }
 
     public static void deleteTextFile(LocalizationFile lf)
-            throws LocalizationOpFailedException, IOException {
+            throws LocalizationException, IOException {
         if (lf.getContext().getLocalizationLevel()
                 .equals(LocalizationLevel.USER)
                 && lf.getContext().getContextName().equals("GFETEST")) {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
index 0c9bce4441..d464e6ebd8 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
@@ -34,7 +34,6 @@ import org.eclipse.swt.widgets.Display;
 import com.raytheon.uf.common.dataplugin.gfe.GridDataHistory;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
-import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
 import com.raytheon.uf.common.python.concurrent.IPythonExecutor;
 import com.raytheon.uf.common.python.concurrent.PythonJobCoordinator;
 import com.raytheon.uf.common.status.IPerformanceStatusHandler;
@@ -56,7 +55,6 @@ import com.raytheon.viz.gfe.core.parm.Parm;
 import com.raytheon.viz.gfe.core.parm.ParmState;
 import com.raytheon.viz.gfe.query.QueryScript;
 import com.raytheon.viz.gfe.query.QueryScriptExecutor;
-import com.raytheon.viz.gfe.query.QueryScriptFactory;
 import com.raytheon.viz.gfe.smarttool.SmartToolException.ErrorType;
 import com.raytheon.viz.gfe.smarttool.script.SmartToolRunnerController;
 
@@ -77,6 +75,7 @@ import com.raytheon.viz.gfe.smarttool.script.SmartToolRunnerController;
  * Aug 27, 2015  4749      njensen     Call shutdown() on PythonJobCoordinator
  * Sep 16, 2015  4871      randerso    Return modified varDict from Tool
  * 10/08/2015    18125     bhunder     Modified CANCEL_MSG_START to work with Jep updates
+ * Dec 14, 2015  4816      dgilling    Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -127,22 +126,21 @@ public class Tool {
      * @throws SmartToolException
      */
     public Tool(IParmManager aParmMgr, Parm anInputParm, String aToolName,
+            PythonJobCoordinator<QueryScript> coordinator,
             SmartToolRunnerController aTool) throws SmartToolException {
-        parmMgr = aParmMgr;
-        inputParm = anInputParm;
-        toolName = aToolName;
-        tool = aTool;
+        this.parmMgr = aParmMgr;
+        this.inputParm = anInputParm;
+        this.toolName = aToolName;
+        this.tool = aTool;
+        this.coordinator = coordinator;
 
-        AbstractPythonScriptFactory<QueryScript> factory = new QueryScriptFactory(
-                DataManagerUIFactory.getCurrentInstance());
-        coordinator = PythonJobCoordinator.newInstance(factory);
         try {
-            if (!tool.isInstantiated(toolName)) {
-                tool.instantiatePythonScript(toolName);
+            if (!this.tool.isInstantiated(toolName)) {
+                this.tool.instantiatePythonScript(toolName);
             }
         } catch (JepException e) {
             throw new SmartToolException("Error instantiating python tool "
-                    + toolName + ": " + e.getMessage());
+                    + this.toolName + ": " + e.getMessage());
         }
     }
 
@@ -511,8 +509,8 @@ public class Tool {
                         IPythonExecutor<QueryScript, ReferenceData> executor = new QueryScriptExecutor(
                                 "evaluate", argMap);
                         try {
-                            Tool.this.trueEditArea = coordinator
-                                    .submitSyncJob(executor);
+                            Tool.this.trueEditArea = coordinator.submitJob(
+                                    executor).get();
                         } catch (Exception e) {
                             statusHandler.handle(Priority.PROBLEM,
                                     "Error re-evaluating edit area "
@@ -689,7 +687,6 @@ public class Tool {
             }
         }
         parmMgr.deleteTemporaryParms();
-        coordinator.shutdown();
 
         // Report Skipped or Created Grids
         String msg = "Tool: " + toolname + " -- ";
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/UtilitiesScriptUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/UtilitiesScriptUtil.java
index 4b242c3f75..9af22df4a7 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/UtilitiesScriptUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/UtilitiesScriptUtil.java
@@ -23,7 +23,7 @@ import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.viz.gfe.core.script.AbstractScriptUtil;
 
 /**
- * TODO Add Description
+ * An implementation of PythonFileTemplate for making new Utilities.
  * 
  * <pre>
  * 
@@ -31,7 +31,8 @@ import com.raytheon.viz.gfe.core.script.AbstractScriptUtil;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * May 3, 2011            dgilling     Initial creation
+ * May 03, 2011            dgilling    Initial creation
+ * Jan 19, 2016  4834      njensen     Removed dead method
  * 
  * </pre>
  * 
@@ -52,45 +53,16 @@ public class UtilitiesScriptUtil extends AbstractScriptUtil {
         super();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getFileType()
-     */
-    @Override
-    public String getFileType() {
-        return SCRIPT_TYPE.toUpperCase();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getScriptType()
-     */
     @Override
     public String getScriptType() {
         return SCRIPT_TYPE;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getScriptTypePathPrefix
-     * ()
-     */
     @Override
     public String getScriptTypePathPrefix() {
         return GfePyIncludeUtil.UTILITIES;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getVelocityTemplateName
-     * ()
-     */
     @Override
     protected String getVelocityTemplateName() {
         return TEMPLATE_FILENAME;
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolFactory.java
index 829ce0d678..572a04d7c0 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolFactory.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolFactory.java
@@ -26,7 +26,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.python.PyUtil;
 import com.raytheon.uf.common.python.PythonIncludePathUtil;
-import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
+import com.raytheon.uf.common.python.concurrent.PythonInterpreterFactory;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.viz.gfe.core.DataManager;
 
@@ -41,6 +41,7 @@ import com.raytheon.viz.gfe.core.DataManager;
  * Jul 9, 2009    2454      ryu         Put user and site's python scripts on path for import
  * May 20, 2015   4509      njensen     Added time and dataaccess to include path
  * Jul 23, 2015   4263      dgilling    Refactored to support changes to SmartToolController.
+ * Dec 14, 2015   4816      dgilling    Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -48,14 +49,12 @@ import com.raytheon.viz.gfe.core.DataManager;
  * @version 1.0
  */
 
-public abstract class SmartToolFactory<C extends SmartToolController> extends
-        AbstractPythonScriptFactory<C> {
+public abstract class SmartToolFactory<C extends SmartToolController>
+        implements PythonInterpreterFactory<C> {
 
     protected final DataManager dataMgr;
 
-    public SmartToolFactory(String name, int numThreads,
-            final DataManager dataMgr) {
-        super(name, numThreads);
+    public SmartToolFactory(final DataManager dataMgr) {
         this.dataMgr = dataMgr;
     }
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java
index 80ae1a63cd..5a4015d86d 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJobPool.java
@@ -358,7 +358,8 @@ public class SmartToolJobPool {
                     dataMgr.getParmOp().clearUndoParmList();
                 }
                 Tool tool = new Tool(dataMgr.getParmManager(), request
-                        .getPreview().getParm(), ea.getItemName(), controller);
+                        .getPreview().getParm(), ea.getItemName(), dataMgr
+                        .getRefManager().getPythonThreadPool(), controller);
                 tool.execute(ea.getItemName(), request.getPreview().getParm(),
                         ea.getRefSet(), ea.getTimeRange(),
                         request.getVarDict(), ea.getMissingDataMode(), monitor);
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolMetadataManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolMetadataManager.java
index 9176485503..ecef15d7e1 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolMetadataManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolMetadataManager.java
@@ -58,6 +58,7 @@ import com.raytheon.viz.gfe.smartscript.FieldDefinition;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 20, 2015  #4263     dgilling     Initial creation
+ * Dec 14, 2015  #4816     dgilling     Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -70,6 +71,10 @@ public class SmartToolMetadataManager implements ILocalizationFileObserver {
     private final IUFStatusHandler statusHandler = UFStatus
             .getHandler(getClass());
 
+    private static final String THREAD_POOL_NAME = "smart-tool-metadata";
+
+    private static final int NUM_POOL_THREADS = 1;
+
     private final PythonJobCoordinator<SmartToolMetadataController> jobCoordinator;
 
     private final Map<String, SmartToolMetadata> toolMetadata;
@@ -85,7 +90,8 @@ public class SmartToolMetadataManager implements ILocalizationFileObserver {
     public SmartToolMetadataManager(final DataManager dataMgr) {
         SmartToolMetadataScriptFactory scriptFactory = new SmartToolMetadataScriptFactory(
                 dataMgr);
-        this.jobCoordinator = PythonJobCoordinator.newInstance(scriptFactory);
+        this.jobCoordinator = new PythonJobCoordinator<>(NUM_POOL_THREADS,
+                THREAD_POOL_NAME, scriptFactory);
 
         this.toolMetadata = new HashMap<>();
         this.accessLock = new Object();
@@ -117,7 +123,7 @@ public class SmartToolMetadataManager implements ILocalizationFileObserver {
             }
         };
         try {
-            jobCoordinator.submitAsyncJob(executor, listener);
+            jobCoordinator.submitJobWithCallback(executor, listener);
         } catch (Exception e1) {
             statusHandler.error("Error initializing smart tool metadata.", e1);
         }
@@ -247,13 +253,6 @@ public class SmartToolMetadataManager implements ILocalizationFileObserver {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.localization.ILocalizationFileObserver#fileUpdated
-     * (com.raytheon.uf.common.localization.FileUpdatedMessage)
-     */
     @Override
     public void fileUpdated(FileUpdatedMessage message) {
         SmartToolMetadataExecutor executor = new SmartToolMetadataExecutor(
@@ -272,7 +271,7 @@ public class SmartToolMetadataManager implements ILocalizationFileObserver {
             }
         };
         try {
-            jobCoordinator.submitAsyncJob(executor, listener);
+            jobCoordinator.submitJobWithCallback(executor, listener);
         } catch (Exception e1) {
             statusHandler.error("Error updating smart tool metadata.", e1);
         }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolMetadataScriptFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolMetadataScriptFactory.java
index 22ca0751f2..9ada5da393 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolMetadataScriptFactory.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolMetadataScriptFactory.java
@@ -33,6 +33,7 @@ import com.raytheon.viz.gfe.core.DataManager;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 22, 2015  #4263     dgilling     Initial creation
+ * Dec 14, 2015  #4816     dgilling     Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -43,21 +44,10 @@ import com.raytheon.viz.gfe.core.DataManager;
 public final class SmartToolMetadataScriptFactory extends
         SmartToolFactory<SmartToolMetadataController> {
 
-    private static final String SCRIPT_EXECUTOR_NAME = "smart-tool-metadata";
-
-    private static final int EXECUTOR_NUM_THREADS = 1;
-
     public SmartToolMetadataScriptFactory(final DataManager dataMgr) {
-        super(SCRIPT_EXECUTOR_NAME, EXECUTOR_NUM_THREADS, dataMgr);
+        super(dataMgr);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory#
-     * createPythonScript()
-     */
     @Override
     public SmartToolMetadataController createPythonScript() throws JepException {
         return new SmartToolMetadataController(getScriptPath(),
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolRunnerScriptFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolRunnerScriptFactory.java
index 3bc4c9e027..932e396d08 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolRunnerScriptFactory.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolRunnerScriptFactory.java
@@ -33,6 +33,7 @@ import com.raytheon.viz.gfe.core.DataManager;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 25, 2015  #4263     dgilling     Initial creation
+ * Dec 14, 2015  #4816     dgilling     Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -43,26 +44,10 @@ import com.raytheon.viz.gfe.core.DataManager;
 public final class SmartToolRunnerScriptFactory extends
         SmartToolFactory<SmartToolRunnerController> {
 
-    /*
-     * These constants that are passed to the super constructor only matter if
-     * procedure execution gets hooked into our python concurrent execution
-     * framework. Since it isn't we use dummy values for now...
-     */
-    private static final String SCRIPT_EXECUTOR_NAME = "smart-tool-runner";
-
-    private static final int EXECUTOR_NUM_THREADS = 0;
-
     public SmartToolRunnerScriptFactory(final DataManager dataMgr) {
-        super(SCRIPT_EXECUTOR_NAME, EXECUTOR_NUM_THREADS, dataMgr);
+        super(dataMgr);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory#
-     * createPythonScript()
-     */
     @Override
     public SmartToolRunnerController createPythonScript() throws JepException {
         return new SmartToolRunnerController(getScriptPath(), getIncludePath(),
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
index 911b63c269..9483bb62ec 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
@@ -39,16 +39,19 @@ import jep.JepException;
 import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.uf.common.dataplugin.gfe.request.SaveCombinationsFileRequest;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.LocalizationUtil;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.python.PyUtil;
+import com.raytheon.uf.common.python.PythonIncludePathUtil;
 import com.raytheon.uf.common.python.PythonScript;
 import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
@@ -56,8 +59,8 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.util.FileUtil;
+import com.raytheon.viz.gfe.GFEException;
 import com.raytheon.viz.gfe.core.DataManagerUIFactory;
-import com.raytheon.viz.gfe.core.internal.IFPClient;
 import com.raytheon.viz.gfe.textformatter.CombinationsFileUtil.ComboData.Entry;
 
 /**
@@ -78,6 +81,9 @@ import com.raytheon.viz.gfe.textformatter.CombinationsFileUtil.ComboData.Entry;
  * Sep 08, 2014     #3592  randerso    Changed to use only list site level files as all 
  *                                     combo files are saved to the site level
  * Oct 07, 2015     #4695  dgilling    Code cleanup to remove compile warnings.
+ * Nov 12, 2015      4834  njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Nov 18, 2015     #5129  dgilling    Support new IFPClient.
+ * Feb 05, 2016      5242  dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -152,8 +158,8 @@ public class CombinationsFileUtil {
     }
 
     public static String fileToId(LocalizationFile file) {
-        File f = new File(file.getName());
-        String id = f.getName().replace(".xml", "");
+        String id = LocalizationUtil.extractName(file.getPath()).replace(
+                ".xml", "");
         id = FileUtil.unmangle(id);
 
         return id;
@@ -178,8 +184,7 @@ public class CombinationsFileUtil {
         }
     }
 
-    public static void deleteComboData(String id)
-            throws LocalizationOpFailedException {
+    public static void deleteComboData(String id) throws LocalizationException {
         LocalizationFile lf = idToFile(id);
         lf.delete();
     }
@@ -212,7 +217,7 @@ public class CombinationsFileUtil {
             throws SerializationException, IOException, LocalizationException {
         LocalizationFile lf = idToFile(id);
         try (InputStream in = lf.openInputStream()) {
-            ComboData comboData = (ComboData) jaxb.unmarshalFromInputStream(in);
+            ComboData comboData = jaxb.unmarshalFromInputStream(in);
 
             Map<String, Integer> comboDict = new HashMap<String, Integer>(
                     comboData.combos.size());
@@ -268,10 +273,11 @@ public class CombinationsFileUtil {
         HashMap<String, Object> map = new HashMap<String, Object>();
         map.put("comboName", comboName);
         for (int retryCount = 0; retryCount < MAX_TRIES; retryCount++) {
-            try (PythonScript python = new PythonScript(scriptPath,
+            try (PythonScript python = new PythonScript(
+                    scriptPath,
                     PyUtil.buildJepIncludePath(
                             GfePyIncludeUtil.getCombinationsIncludePath(),
-                            GfePyIncludeUtil.getCommonPythonIncludePath()),
+                            PythonIncludePathUtil.getCommonPythonIncludePath()),
                     CombinationsFileUtil.class.getClassLoader())) {
                 Object com = python.execute("getCombinations", map);
                 combos = (List<List<String>>) com;
@@ -304,24 +310,26 @@ public class CombinationsFileUtil {
      * 
      * @param zoneGroupList
      * @param filename
-     * @throws Exception
-     * @throws IOException
+     * @throws GFEException
      */
     public static void generateAutoCombinationsFile(
-            List<List<String>> zoneGroupList, String filename) throws Exception {
+            List<List<String>> zoneGroupList, String filename)
+            throws GFEException {
         IFPClient ifpc = DataManagerUIFactory.getCurrentInstance().getClient();
         SaveCombinationsFileRequest req = new SaveCombinationsFileRequest();
         req.setFileName(filename);
         req.setCombos(zoneGroupList);
-        try {
-            statusHandler.info("Saving combinations file: " + filename);
-            ifpc.makeRequest(req);
+
+        statusHandler.info("Saving combinations file: " + filename);
+        ServerResponse<?> sr = ifpc.makeRequest(req);
+        if (sr.isOkay()) {
             statusHandler.info("Successfully saved combinations file: "
                     + filename);
-        } catch (Exception e) {
-            statusHandler.error("Error saving combinations file: " + filename,
-                    e);
-            throw e;
+        } else {
+            String message = String.format(
+                    "Error saving combinations file %s: %s", filename,
+                    sr.message());
+            throw new GFEException(message);
         }
     }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java
index e623c76505..78ce5d334b 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java
@@ -28,8 +28,8 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.python.PyUtil;
-import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
 import com.raytheon.uf.common.python.PythonIncludePathUtil;
+import com.raytheon.uf.common.python.concurrent.PythonInterpreterFactory;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.viz.gfe.python.GfeCavePyIncludeUtil;
 
@@ -45,6 +45,7 @@ import com.raytheon.viz.gfe.python.GfeCavePyIncludeUtil;
  *                                     Tests path for GFE formatter auto tests
  * Jul 28, 2015  4263      dgilling    Refactor based on AbstractPythonScriptFactory.
  * Aug 21, 2015  4509      dgilling    Added time and dataaccess to include path.
+ * Dec 14, 2015  4816      dgilling    Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -52,16 +53,8 @@ import com.raytheon.viz.gfe.python.GfeCavePyIncludeUtil;
  * @version 1.0
  */
 
-public class FormatterScriptFactory extends
-        AbstractPythonScriptFactory<FormatterScript> {
-
-    private static final String SCRIPT_EXECUTOR_NAME = "text-product-metadata";
-
-    private static final int EXECUTOR_NUM_THREADS = 1;
-
-    public FormatterScriptFactory() {
-        super(SCRIPT_EXECUTOR_NAME, EXECUTOR_NUM_THREADS);
-    }
+public class FormatterScriptFactory implements
+        PythonInterpreterFactory<FormatterScript> {
 
     private static String buildScriptPath() {
         IPathManager pathMgr = PathManagerFactory.getPathManager();
@@ -88,13 +81,6 @@ public class FormatterScriptFactory extends
         return include;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory#
-     * createPythonScript()
-     */
     @Override
     public FormatterScript createPythonScript() throws JepException {
         return new FormatterScript(buildScriptPath(), buildIncludePath(),
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/TextFormatter.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/TextFormatter.java
index 9f6a6d6dd8..0fd4e97e0a 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/TextFormatter.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/TextFormatter.java
@@ -64,6 +64,7 @@ import com.raytheon.viz.gfe.tasks.AbstractGfeTask;
  * Aug 20, 2015  #4749     dgilling    Add cleanUp.
  * Aug 26, 2015  #4804     dgilling    Support ability to run TextFormatters 
  *                                     from SmartScript.
+ * Dec 08, 2015  #5129     dgilling    Pass IFPClient to getVarDict.
  * 
  * </pre>
  * 
@@ -289,6 +290,7 @@ public class TextFormatter extends AbstractGfeTask {
         map.put("dspName",
                 dataManager.getTextProductMgr().getDisplayName(productName));
         map.put("dataMgr", dataManager);
+        map.put("ifpClient", dataManager.getClient().getPythonClient());
         map.put("issuedBy", issuedBy);
         map.put("dataSource", new DatabaseID(dbId).getModelName());
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/TextProductManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/TextProductManager.java
index 1c4f0c8dc3..a6c422211a 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/TextProductManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/TextProductManager.java
@@ -61,6 +61,7 @@ import com.raytheon.viz.gfe.core.IAsyncStartupObjectListener;
  *                                     in a non-GUI environment like GFE formatter auto-tests
  * Jul 30, 2015  4263      dgilling    Major refactor so this object can be initialized off
  *                                     UI thread.
+ * Dec 14, 2015  4816      dgilling    Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -73,6 +74,10 @@ public class TextProductManager implements ILocalizationFileObserver {
     private final IUFStatusHandler statusHandler = UFStatus
             .getHandler(getClass());
 
+    private static final String METADATA_THREAD_POOL_NAME = "text-product-metadata";
+
+    private static final int NUM_METADATA_THREADS = 1;
+
     private String issuedBy;
 
     private final PythonJobCoordinator<FormatterScript> jobCoordinator;
@@ -95,8 +100,8 @@ public class TextProductManager implements ILocalizationFileObserver {
     public TextProductManager() {
         this.issuedBy = "";
 
-        FormatterScriptFactory factory = new FormatterScriptFactory();
-        this.jobCoordinator = PythonJobCoordinator.newInstance(factory);
+        this.jobCoordinator = new PythonJobCoordinator<>(NUM_METADATA_THREADS,
+                METADATA_THREAD_POOL_NAME, new FormatterScriptFactory());
 
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext baseContext = pm.getContext(
@@ -129,7 +134,7 @@ public class TextProductManager implements ILocalizationFileObserver {
             }
         };
         try {
-            jobCoordinator.submitAsyncJob(executor, listener);
+            jobCoordinator.submitJobWithCallback(executor, listener);
         } catch (Exception e) {
             statusHandler.error("Error building text product inventory.", e);
         }
@@ -270,9 +275,9 @@ public class TextProductManager implements ILocalizationFileObserver {
             String officeTimeZone) {
         Collection<String> timeZones = Collections.emptyList();
         try {
-            timeZones = jobCoordinator
-                    .submitSyncJob(new TextProductTimeZonesExecutor(zones,
-                            officeTimeZone));
+            timeZones = jobCoordinator.submitJob(
+                    new TextProductTimeZonesExecutor(zones, officeTimeZone))
+                    .get();
         } catch (Exception e) {
             statusHandler.error("Exception getting time zones.", e);
         }
@@ -338,7 +343,7 @@ public class TextProductManager implements ILocalizationFileObserver {
             }
         };
         try {
-            jobCoordinator.submitAsyncJob(executor, listener);
+            jobCoordinator.submitJobWithCallback(executor, listener);
         } catch (Exception e) {
             statusHandler.error("Error updating text product inventory.", e);
         }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtil.java
index 2030c9bfa0..d39cdb8000 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtil.java
@@ -26,7 +26,18 @@ import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.viz.gfe.core.script.AbstractScriptUtil;
 
 /**
- * A concrete implementation of IScriptUtil for working with Procedure scripts.
+ * An implementation of PythonFileTemplate for making new Text Products.
+ * 
+ * <pre>
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * ???                     wldougher   Initial creation
+ * Jan 19, 2016  4834      njensen     Removed dead method
+ *
+ * </pre>
  * 
  * @author wldougher
  * 
@@ -37,9 +48,6 @@ public class TextProductUtil extends AbstractScriptUtil {
 
     private static final String SCRIPT_TYPE = "Text Product";
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getScriptType()
-     */
     @Override
     public String getScriptType() {
         return SCRIPT_TYPE;
@@ -49,32 +57,14 @@ public class TextProductUtil extends AbstractScriptUtil {
         return SCRIPT_TYPE;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getScriptTypePathPrefix
-     *      ()
-     */
     @Override
     public String getScriptTypePathPrefix() {
         return GfePyIncludeUtil.TEXT_PRODUCTS;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getVelocityTemplateName
-     *      ()
-     */
     @Override
     protected String getVelocityTemplateName() {
         return TEMPLATE_FILENAME;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getFileType()
-     */
-    @Override
-    public String getFileType() {
-        return "TEXT_PRODUCT";
-    }
-
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtils.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtils.java
index c99893da4b..5844c2eec7 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtils.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextProductUtils.java
@@ -21,31 +21,16 @@ package com.raytheon.viz.gfe.textproduct;
 
 import java.io.File;
 
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.common.util.FileUtil;
-import com.raytheon.uf.viz.core.exception.VizException;
-
 /**
  * Utilities for text products
  * 
  * <pre>
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Sept 23, 2008			askripsky	Initial creation
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * Sept 23, 2008            askripsky   Initial creation
  * Sept 09, 2013  #2033     dgilling    Remove dead code.
+ * Feb  05, 2016  #5242     dgilling    Remove dead code.
  * 
  * </pre>
  * 
@@ -54,8 +39,6 @@ import com.raytheon.uf.viz.core.exception.VizException;
  */
 
 public class TextProductUtils {
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(TextProductUtils.class);
 
     // Extension of text products
     public static final String EXTENSION = ".py";
@@ -83,181 +66,4 @@ public class TextProductUtils {
     // Root path for Utilities
     public final static String UTILITIES_PATH = TEXT_PRODUCTS_ROOT_PATH
             + File.separator + "utilities";
-
-    /**
-     * Copies the source file
-     * 
-     * @param oldFileName
-     *            The file to be copied
-     * @param newFileName
-     *            The destination file
-     * @param type
-     *            Designates whether the file is a product or a utility
-     * @throws VizException
-     *             Exception if the file doesn't get copied correctly
-     */
-    public static void copyFile(String oldFileName, String newFileName,
-            String type) throws VizException {
-        // Make sure the new name has the correct extension
-        if (!newFileName.endsWith(EXTENSION)) {
-            newFileName += EXTENSION;
-        }
-
-        // Get file from catalogue
-        LocalizationFile oldFile = TextProductCatalogue.getInstance().getEntry(
-                oldFileName, type);
-
-        // Get new file for the Site
-        LocalizationFile newFile = newTextProductFile(newFileName, type);
-
-        // Make a copy to the Site location
-        try {
-            // Copy file
-            FileUtil.copyFile(oldFile.getFile(), newFile.getFile());
-
-            newFile.save();
-
-            // Add entry to catalogue
-            TextProductCatalogue.getInstance().addEntry(newFileName, newFile,
-                    type);
-
-        } catch (Exception e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error copying text product", e);
-        }
-    }
-
-    /**
-     * Deletes a text product or utility.
-     * 
-     * @param toolToDelete
-     *            the name of the tool
-     * @throws VizException
-     */
-    public static void deleteTextProduct(String textProductToDelete,
-            String textProductType) throws VizException {
-        // Retrieve a handle to the actual file
-        LocalizationFile file = TextProductCatalogue.getInstance().getEntry(
-                textProductToDelete, textProductType);
-
-        if (file.getContext().getLocalizationLevel() != LocalizationLevel.BASE) {
-            if ((file != null) && file.getFile().exists()) {
-                try {
-                    file.delete();
-
-                    TextProductCatalogue.getInstance().removeEntry(
-                            textProductToDelete, textProductType);
-                } catch (Exception e) {
-                    throw new VizException(e);
-                }
-            }
-        } else {
-            throw new VizException("Can't delete base text product "
-                    + textProductToDelete);
-        }
-    }
-
-    private static LocalizationFile newTextProductFile(String newName,
-            String type) throws VizException {
-
-        IPathManager pathMgr = PathManagerFactory.getPathManager();
-
-        // Get context for the Site
-        LocalizationContext cx = pathMgr.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
-
-        // Build the path to the new file
-        String path = (type.equals(PRODUCT) ? PRODUCTS_PATH : UTILITIES_PATH)
-                + File.separator + newName;
-
-        // Verify the extension is correct
-        if (!path.endsWith(EXTENSION)) {
-            path += EXTENSION;
-        }
-
-        // the created file
-        LocalizationFile rval = PathManagerFactory.getPathManager()
-                .getLocalizationFile(cx, path);
-
-        // Check to see if the file exists
-        // If not, create it
-        File file = rval.getFile();
-        if (!file.exists()) {
-            try {
-                // Check to see if the directory exists
-                File dir = file.getParentFile();
-
-                if (!dir.exists()) {
-                    dir.mkdirs();
-                }
-
-                file.createNewFile();
-
-            } catch (Exception e) {
-                throw new VizException(e);
-            }
-        }
-
-        return rval;
-    }
-
-    public static LocalizationLevel getLocalizationLevel(String entryName,
-            String entryType) {
-        return TextProductCatalogue.getInstance()
-                .getEntry(entryName, entryType).getContext()
-                .getLocalizationLevel();
-    }
-
-    public static void renameFile(String oldName, String newName, String type)
-            throws VizException {
-
-        // Verify the extension is correct
-        if (!newName.endsWith(EXTENSION)) {
-            newName += EXTENSION;
-        }
-
-        // Rename the localization file and entry
-        try {
-            copyFile(oldName, newName, type);
-            deleteTextProduct(oldName, type);
-        } catch (Exception e) {
-            throw new VizException(e);
-        }
-    }
-
-    public static boolean promptForOverwrite(String name, String type) {
-        boolean okToOverwrite = true;
-
-        if (!name.endsWith(EXTENSION)) {
-            name += EXTENSION;
-        }
-
-        LocalizationFile preexistingFile = TextProductCatalogue.getInstance()
-                .getEntry(name, type);
-
-        if (preexistingFile != null) {
-            // Initialize the confirmation prompt
-            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                    .getShell();
-
-            if (preexistingFile.getContext().getLocalizationLevel() == LocalizationLevel.BASE) {
-                // Do you want to create a site copy?
-                String prompt = name
-                        + " exists at the BASE Level and cannot be modified.\nDo you"
-                        + " want to make a copy that can be modified at the SITE Level?";
-
-                okToOverwrite = MessageDialog.openConfirm(shell,
-                        "Item Overwrite", prompt);
-            } else {
-                // A Site file
-                String prompt = name
-                        + " already exists.\nDo you want to overwrite it?";
-
-                okToOverwrite = MessageDialog.openConfirm(shell,
-                        "Item Overwrite", prompt);
-            }
-        }
-
-        return okToOverwrite;
-    }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextUtilityAdapter.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextUtilityAdapter.java
index 2854b3575e..3dfcb16ac5 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextUtilityAdapter.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextUtilityAdapter.java
@@ -23,7 +23,7 @@ import org.eclipse.jface.action.IMenuManager;
 
 import com.raytheon.uf.viz.localization.adapter.LocalizationPerspectiveAdapter;
 import com.raytheon.uf.viz.localization.filetreeview.FileTreeEntryData;
-import com.raytheon.viz.gfe.core.script.IScriptUtil;
+import com.raytheon.viz.gfe.core.script.PythonFileTemplate;
 import com.raytheon.viz.gfe.core.script.action.NewAction;
 
 /**
@@ -53,7 +53,7 @@ public class TextUtilityAdapter extends LocalizationPerspectiveAdapter {
     @Override
     public boolean addContextMenuItems(IMenuManager menuMgr,
             FileTreeEntryData[] selectedData) {
-        IScriptUtil util = new TextUtilityUtil();
+        PythonFileTemplate util = new TextUtilityUtil();
         NewAction newAction = new NewAction(util);
         menuMgr.add(newAction);
 
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextUtilityUtil.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextUtilityUtil.java
index 04041e4565..25394f855c 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextUtilityUtil.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/TextUtilityUtil.java
@@ -22,13 +22,23 @@
  */
 package com.raytheon.viz.gfe.textproduct;
 
-import java.io.File;
-
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
+import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.viz.gfe.core.script.AbstractScriptUtil;
 
 /**
- * A concrete implementation of IScriptUtil for working with Procedure scripts.
+ * An implementation of PythonFileTemplate for making new Text Utilities.
+ * 
+ * <pre>
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * ???                     wldougher   Initial creation
+ * Jan 19, 2016  4834      njensen     Removed dead method
+ *
+ * </pre>
  * 
  * @author wldougher
  * 
@@ -39,44 +49,22 @@ public class TextUtilityUtil extends AbstractScriptUtil {
 
     private static final String SCRIPT_TYPE = "Utility";
 
-    private static final String FILETYPE = "TEXT_PRODUCT";
-
     private static final String PATH_PREFIX = GfePyIncludeUtil.TEXT_UTILITIES
-            + File.separator + "regular";
+            + IPathManager.SEPARATOR + "regular";
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getScriptType()
-     */
     @Override
     public String getScriptType() {
         return SCRIPT_TYPE;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getScriptTypePathPrefix
-     *      ()
-     */
     @Override
     public String getScriptTypePathPrefix() {
         return PATH_PREFIX;
     }
 
-    /**
-     * @see com.raytheon.viz.gfe.core.script.AbstractScriptUtil#getVelocityTemplateName
-     *      ()
-     */
     @Override
     protected String getVelocityTemplateName() {
         return TEMPLATE_FILENAME;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.gfe.core.script.IScriptUtil#getFileType()
-     */
-    @Override
-    public String getFileType() {
-        return FILETYPE;
-    }
 }
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/action/TextProductDeleteAction.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/action/TextProductDeleteAction.java
deleted file mode 100644
index 6ac9b27001..0000000000
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/action/TextProductDeleteAction.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.gfe.textproduct.action;
-
-import org.eclipse.jface.action.Action;
-
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.viz.gfe.Activator;
-import com.raytheon.viz.gfe.GFEException;
-import com.raytheon.viz.gfe.constants.StatusConstants;
-import com.raytheon.viz.gfe.core.script.IScriptUtil;
-import com.raytheon.viz.gfe.ui.AccessMgr;
-
-/**
- * Action to delete a text product.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jul 30, 2010            dgilling     Initial creation
- * 
- * </pre>
- * 
- * @author dgilling
- * @version 1.0
- */
-
-public class TextProductDeleteAction extends Action {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(TextProductDeleteAction.class);
-    protected String scriptName;
-
-    protected IScriptUtil util;
-
-    /**
-     * Constructor
-     * 
-     * @param scriptName
-     *            The simple name of the script to be deleted.
-     * @param util
-     *            The utility object that will actually delete the script
-     */
-    public TextProductDeleteAction(String scriptName, IScriptUtil util) {
-        super("Delete");
-        this.scriptName = scriptName;
-        this.util = util;
-    }
-
-    /**
-     * Delete the procedure this action is tied to.
-     * 
-     * @see org.eclipse.jface.action.Action#run()
-     */
-    @Override
-    public void run() {
-        if (AccessMgr.verifyDelete(util.scripted(scriptName),
-                LocalizationType.CAVE_STATIC, false)) {
-            try {
-                // Delete the script
-                util.delete(scriptName, LocalizationLevel.USER);
-                statusHandler.handle(Priority.VERBOSE,
-                        "USER " + util.getScriptType() + " " + scriptName
-                                + " deleted.");
-            } catch (GFEException e) {
-                statusHandler.handle(Priority.PROBLEM,
-                        "Error deleting USER " + util.getScriptType() + " "
-                                + scriptName, e);
-            }
-        }
-    }
-}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/action/TextProductSiteAction.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/action/TextProductSiteAction.java
deleted file mode 100644
index 5df95fa1c0..0000000000
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/action/TextProductSiteAction.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.gfe.textproduct.action;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-
-import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.viz.gfe.Activator;
-import com.raytheon.viz.gfe.GFEException;
-import com.raytheon.viz.gfe.constants.StatusConstants;
-import com.raytheon.viz.gfe.core.script.IScriptUtil;
-import com.raytheon.viz.gfe.core.script.IScriptUtil.Overwrite;
-
-/**
- * An action to upgrade a text product to the SITE localization level.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jul 29, 2010            dgilling     Initial creation
- * 
- * </pre>
- * 
- * @author dgilling
- * @version 1.0
- */
-
-public class TextProductSiteAction extends Action {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(TextProductSiteAction.class);
-
-    private static final Pattern OVR_PATTERN = Pattern.compile(
-            "(.+?)_?overrides", Pattern.CASE_INSENSITIVE);
-
-    String script;
-
-    IScriptUtil util;
-
-    /**
-     * @param script
-     *            The simple name of the script, i.e., "OAX_APD"
-     * @param util
-     *            The script utility instance that provides low-level
-     *            script-manipulation methods
-     */
-    public TextProductSiteAction(String script, IScriptUtil util) {
-        super("Make SITE");
-        this.script = script;
-        this.util = util;
-    }
-
-    /**
-     * @see org.eclipse.jface.action.Action#run()
-     */
-    @Override
-    public void run() {
-        String scriptType = util.getScriptType();
-        LocalizationFile source = null;
-        try {
-            source = util.find(script, null);
-        } catch (GFEException e) {
-            String message = String.format(
-                    "An error occurred while finding '%s'", script);
-            statusHandler.handle(Priority.PROBLEM, message, e);
-            return;
-        }
-
-        // Make sure the source exists
-        if (source == null) {
-            String message = String.format("%s '%s' does not exist",
-                    util.getScriptType(), script);
-            MessageDialog.openError(Display.getCurrent().getActiveShell(),
-                    "Does Not Exist", message);
-            statusHandler.handle(Priority.PROBLEM, message);
-            return;
-        }
-
-        LocalizationLevel srcLevel = source.getContext().getLocalizationLevel();
-
-        String dest = script;
-        Matcher ovrMatch = OVR_PATTERN.matcher(script);
-        boolean isOverride = ovrMatch.matches();
-
-        if (isOverride) {
-            // strip "overrides" or "_overrides" from destination name
-            dest = ovrMatch.group(1);
-        }
-
-        if (LocalizationLevel.BASE == srcLevel) {
-            // source is BASE, we can't downgrade it
-            String message = String
-                    .format("%s '%s' is at BASE level and cannot be moved to SITE level.",
-                            scriptType, script);
-            MessageDialog.openInformation(
-                    Display.getCurrent().getActiveShell(), "Cannot Move Base",
-                    message);
-            return;
-        }
-
-        if (LocalizationLevel.SITE == srcLevel && !isOverride) {
-            // nothing to do
-            String message = String.format("%s '%s' is already at SITE level.",
-                    scriptType, script);
-            MessageDialog.openInformation(
-                    Display.getCurrent().getActiveShell(), message, message);
-            return;
-        }
-
-        LocalizationFile destlf = null;
-        try {
-            destlf = util.find(dest, LocalizationLevel.SITE);
-        } catch (GFEException e1) {
-            String message = String.format("Error during search for %s '%s'",
-                    scriptType, dest);
-            statusHandler.handle(Priority.PROBLEM, message);
-            return;
-        }
-
-        if (destlf != null
-                && destlf.getFile().getPath()
-                        .contains(GfePyIncludeUtil.TEXT_PRODUCTS)) {
-            // destination already exists. Confirm overwrite.
-            String message = String
-                    .format("%s '%s' already exists at SITE level!\n"
-                            + "Confirm that you want to overwrite it from %s at %s level:",
-                            scriptType, dest, script, srcLevel.toString());
-            boolean confirmed = MessageDialog.openConfirm(Display.getCurrent()
-                    .getActiveShell(), "Confirm Overwrite", message);
-            if (confirmed) {
-                try {
-                    destlf.delete();
-                } catch (Exception e) {
-                    String errMessage = String.format("Error deleting %s '%s'",
-                            scriptType, dest);
-                    statusHandler.handle(Priority.PROBLEM, errMessage, e);
-                }
-            } else {
-                return;
-            }
-        }
-
-        try {
-            util.copy(script, dest, LocalizationLevel.SITE, Overwrite.SAFE);
-            source.delete();
-            String message = String.format("%s '%s' set as SITE", scriptType,
-                    dest);
-            statusHandler.handle(Priority.VERBOSE, message);
-        } catch (Exception e) {
-            String message = String.format("Error moving %s to SITE", script);
-            statusHandler.handle(Priority.PROBLEM, message, e);
-        }
-    }
-}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/action/TextProductSiteOverrideAction.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/action/TextProductSiteOverrideAction.java
deleted file mode 100644
index 13b83ac110..0000000000
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textproduct/action/TextProductSiteOverrideAction.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package com.raytheon.viz.gfe.textproduct.action;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-
-import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
-import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.viz.gfe.Activator;
-import com.raytheon.viz.gfe.GFEException;
-import com.raytheon.viz.gfe.constants.StatusConstants;
-import com.raytheon.viz.gfe.core.script.IScriptUtil;
-import com.raytheon.viz.gfe.core.script.IScriptUtil.Overwrite;
-
-/**
- * An action to upgrade a a text product and make it the SITE override script.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jul 30, 2010            dgilling     Initial creation
- * 
- * </pre>
- * 
- * @author dgilling
- * @version 1.0
- */
-public class TextProductSiteOverrideAction extends Action {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(TextProductSiteOverrideAction.class);
-
-    private static final Pattern OVR_PATTERN = Pattern.compile(
-            "(.+?)_?overrides", Pattern.CASE_INSENSITIVE);
-
-    String script;
-
-    IScriptUtil util;
-
-    public TextProductSiteOverrideAction(String script, IScriptUtil util) {
-        super("Make SITE Override");
-        this.script = script;
-        this.util = util;
-    }
-
-    /**
-     * @see org.eclipse.jface.action.Action#run()
-     */
-    @Override
-    public void run() {
-        String scriptType = util.getScriptType();
-        LocalizationFile source = null;
-        try {
-            source = util.find(script, null);
-        } catch (GFEException e) {
-            String message = String.format(
-                    "An error occurred while finding '%s'", script);
-            statusHandler.handle(Priority.PROBLEM, message, e);
-            return;
-        }
-
-        // Make sure the source exists
-        if (source == null) {
-            String message = String.format("%s '%s' does not exist",
-                    util.getScriptType(), script);
-            MessageDialog.openError(Display.getCurrent().getActiveShell(),
-                    "Does Not Exist", message);
-            statusHandler.handle(Priority.PROBLEM, message);
-            return;
-        }
-
-        LocalizationLevel srcLevel = source.getContext().getLocalizationLevel();
-
-        String dest = script;
-        Matcher ovrMatch = OVR_PATTERN.matcher(script);
-        boolean isOverride = ovrMatch.matches();
-
-        if (isOverride) {
-            // strip "override" or "_override" from destination name
-            dest = ovrMatch.group(1);
-        }
-
-        if (srcLevel.isSystemLevel()) {
-            // source is BASE, we can't downgrade it
-            String message = String.format(
-                    "%s '%s' cannot be moved to SITE level.", scriptType,
-                    script);
-            MessageDialog.openInformation(
-                    Display.getCurrent().getActiveShell(), "Cannot Move Base",
-                    message);
-            return;
-        }
-
-        if (LocalizationLevel.SITE == srcLevel) {
-            // nothing to do, in two flavors:
-            String message = null;
-            if (isOverride) {
-                message = String.format(
-                        "%s '%s' is already the site override.", scriptType,
-                        script);
-
-            } else {
-                message = String.format("'%s' is the SITE %s.\n"
-                        + "It cannot be made the SITE override.", script,
-                        scriptType);
-            }
-            MessageDialog.openInformation(
-                    Display.getCurrent().getActiveShell(), message, message);
-            return;
-        }
-
-        dest = dest + "_OVERRIDE";
-        LocalizationFile destlf = null;
-        try {
-            destlf = util.find(dest, LocalizationLevel.SITE);
-        } catch (GFEException e1) {
-            String message = String.format("Error during search for %s '%s'",
-                    scriptType, dest);
-            statusHandler.handle(Priority.PROBLEM, message);
-            return;
-        }
-
-        if (destlf != null) {
-            // destination already exists. Confirm overwrite.
-            String message = String
-                    .format("%s '%s' already exists at SITE level!\n"
-                            + "Confirm that you want to overwrite it from %s at %s level:",
-                            scriptType, dest, script, srcLevel.toString());
-            boolean confirmed = MessageDialog.openConfirm(Display.getCurrent()
-                    .getActiveShell(), "Confirm Overwrite", message);
-            if (confirmed) {
-                try {
-                    destlf.delete();
-                } catch (Exception e) {
-                    String errMessage = String.format("Error deleting %s '%s'",
-                            scriptType, dest);
-                    statusHandler.handle(Priority.PROBLEM, errMessage, e);
-                }
-            } else {
-                return;
-            }
-        }
-
-        try {
-            util.copy(script, dest, LocalizationLevel.SITE, Overwrite.SAFE);
-            source.delete();
-            String message = String.format("%s '%s' set as SITE", scriptType,
-                    dest);
-            statusHandler.handle(Priority.VERBOSE, message);
-        } catch (Exception e) {
-            String message = String.format("Error ", script);
-            statusHandler.handle(Priority.PROBLEM, message, e);
-        }
-    }
-}
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/runtimeui/ValuesDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/runtimeui/ValuesDialog.java
index 91c713b680..a81f0804e1 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/runtimeui/ValuesDialog.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/runtimeui/ValuesDialog.java
@@ -27,6 +27,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
 
 import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.python.swt.ButtonConstant;
@@ -42,12 +43,13 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
  * 
  * <pre>
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Jun 3, 2008	1164		jelkins     Initial creation
- * Oct 15, 2008             njensen     Static methods to keep UI
- *                                      thread working
- * Mar 28, 2013 1790        rferrel     Make dialog modal except when the static openDialog is used.
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jun 03, 2008 1164       jelkins     Initial creation
+ * Oct 15, 2008            njensen     Static methods to keep UI
+ *                                     thread working
+ * Mar 28, 2013 1790       rferrel     Make dialog modal except when the static openDialog is used.
+ * Jan 15, 2015 5054       randerso    Remove unnecessary new Shell
  * 
  * </pre>
  * 
@@ -299,7 +301,9 @@ public class ValuesDialog extends CaveJFACEDialog {
 
             @Override
             public void run() {
-                syncedDialog = new ValuesDialog(new Shell(), title, fieldDefs,
+                Shell shell = PlatformUI.getWorkbench()
+                        .getActiveWorkbenchWindow().getShell();
+                syncedDialog = new ValuesDialog(shell, title, fieldDefs,
                         dataMgr);
                 syncedDialog.setShellStyle(SWT.MODELESS | SWT.TITLE
                         | SWT.RESIZE);
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelector.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelector.java
index 73d1705074..9e38dda64f 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelector.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelector.java
@@ -34,10 +34,11 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.viz.core.IDisplayPane;
 import com.raytheon.uf.viz.core.RGBColors;
 import com.raytheon.uf.viz.core.rsc.IInputHandler;
+import com.raytheon.uf.viz.zoneselector.AbstractZoneSelector;
+import com.raytheon.uf.viz.zoneselector.ZoneSelectorResource;
 import com.raytheon.viz.gfe.Activator;
 import com.raytheon.viz.gfe.PythonPreferenceStore;
 import com.raytheon.viz.gfe.dialogs.formatterlauncher.IZoneCombiner;
@@ -54,6 +55,8 @@ import com.raytheon.viz.ui.input.InputAdapter;
  * ------------ ---------- ----------- --------------------------
  * Aug 11, 2011            randerso    Initial creation
  * Aug 31, 2015  4749      njensen     Overrode dispose()
+ * Feb 05, 2016 5316       randerso    Moved AbstractZoneSelector to separate project
+ *                                     Code cleanup
  * 
  * </pre>
  * 
@@ -62,13 +65,6 @@ import com.raytheon.viz.ui.input.InputAdapter;
  */
 
 public class ZoneSelector extends AbstractZoneSelector {
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(ZoneSelector.class);
-
-    public static interface IZoneSelectionListener {
-        public void zoneSelected(String zone);
-    }
-
     private static final int NO_GROUP = -1;
 
     IInputHandler theMouseListener = new InputAdapter() {
@@ -83,23 +79,11 @@ public class ZoneSelector extends AbstractZoneSelector {
          */
         private static final int MB2 = 2;
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.raytheon.viz.ui.input.IInputHandler#handleDoubleClick(int,
-         * int)
-         */
         @Override
         public boolean handleDoubleClick(int x, int y, int button) {
             return false;
         }
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseDown(int,
-         * int, int)
-         */
         @Override
         public boolean handleMouseDown(int x, int y, int mouseButton) {
             switch (mouseButton) {
@@ -118,12 +102,6 @@ public class ZoneSelector extends AbstractZoneSelector {
             return true;
         }
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseDownMove(int,
-         * int, int)
-         */
         @Override
         public boolean handleMouseDownMove(int x, int y, int mouseButton) {
             switch (mouseButton) {
@@ -135,34 +113,16 @@ public class ZoneSelector extends AbstractZoneSelector {
             return true;
         }
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseHover(int,
-         * int)
-         */
         @Override
         public boolean handleMouseHover(int x, int y) {
             return false;
         }
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseMove(int,
-         * int)
-         */
         @Override
         public boolean handleMouseMove(int x, int y) {
             return false;
         }
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseUp(int, int,
-         * int)
-         */
         @Override
         public boolean handleMouseUp(int x, int y, int mouseButton) {
             switch (mouseButton) {
@@ -200,8 +160,6 @@ public class ZoneSelector extends AbstractZoneSelector {
     // current color map
     private List<RGB> colors;
 
-    private RGB noZoneColor;
-
     // state flag, whether to label the zone groups
     private boolean labelZoneGroups;
 
@@ -217,11 +175,22 @@ public class ZoneSelector extends AbstractZoneSelector {
 
     private String pressZone;
 
+    /**
+     * @param parent
+     * @param gloc
+     * @param lclFmtrDialog
+     */
     public ZoneSelector(Composite parent, GridLocation gloc,
             IZoneCombiner lclFmtrDialog) {
         this(parent, gloc, lclFmtrDialog, null);
     }
 
+    /**
+     * @param parent
+     * @param gloc
+     * @param lclFmtrDialog
+     * @param selectCB
+     */
     public ZoneSelector(Composite parent, GridLocation gloc,
             IZoneCombiner lclFmtrDialog, IZoneSelectionListener selectCB) {
         super(parent, gloc, selectCB);
@@ -236,8 +205,6 @@ public class ZoneSelector extends AbstractZoneSelector {
                 "black"));
         backColor = RGBColors.getRGBColor(config(
                 "ZoneCombiner_backgroundColor", "gray40"));
-
-        registerMouseHandler(theMouseListener);
     }
 
     @Override
@@ -246,8 +213,20 @@ public class ZoneSelector extends AbstractZoneSelector {
         super.dispose();
     }
 
-    // command to set the state of include all zones. If it has changed,
-    // redo the combo dictionary and redraw.
+    @Override
+    protected void registerHandlers(IDisplayPane pane) {
+        super.registerHandlers(pane);
+
+        registerMouseHandler(theMouseListener);
+    }
+
+    /**
+     * Command to set the state of include all zones.
+     * 
+     * If it has changed, redo the combo dictionary and redraw.
+     * 
+     * @param includeAllZones
+     */
     public void setIncludeAllZones(boolean includeAllZones) {
         if (this.includeAllZones != includeAllZones) {
             this.includeAllZones = includeAllZones;
@@ -257,7 +236,11 @@ public class ZoneSelector extends AbstractZoneSelector {
         }
     }
 
-    // command to limit combos to one group
+    /**
+     * Command to limit combos to one group
+     * 
+     * @param limitOneGroup
+     */
     public void setLimitToOneGroup(boolean limitOneGroup) {
         if (this.limitToOneGroup != limitOneGroup) {
             this.limitToOneGroup = limitOneGroup;
@@ -270,9 +253,14 @@ public class ZoneSelector extends AbstractZoneSelector {
         }
     }
 
+    /**
+     * @param mapNames
+     * @param comboDict
+     * @param colors
+     */
     public void setMap(List<String> mapNames, Map<String, Integer> comboDict,
             List<RGB> colors) {
-        super.setMap(mapNames);
+        super.setMap(mapNames, false);
         setMapInternal(mapRscList, comboDict, colors);
     }
 
@@ -307,23 +295,35 @@ public class ZoneSelector extends AbstractZoneSelector {
         cleanUpCombosOfUnknownZones();
     }
 
-    // get current list of colors
+    /**
+     * @return current list of colors
+     */
     public List<RGB> getColors() {
         return this.colors;
     }
 
-    // get current combinations
+    /**
+     * @return current combinations
+     */
     public Map<String, Integer> getCombos() {
         return this.comboDict;
     }
 
-    // update colors command
+    /**
+     * update colors command
+     * 
+     * @param colors
+     */
     public void updateColors(List<RGB> colors) {
         this.colors = colors;
         this.updateCombos(this.comboDict);
     }
 
-    // command to label the zone groups
+    /**
+     * command to label the zone groups
+     * 
+     * @param labelZoneGroups
+     */
     public void setLabelZoneGroups(boolean labelZoneGroups) {
         if (labelZoneGroups == this.labelZoneGroups) {
             return;
@@ -334,7 +334,11 @@ public class ZoneSelector extends AbstractZoneSelector {
         }
     }
 
-    // update combo dictionary with different combinations
+    /**
+     * update combo dictionary with different combinations
+     * 
+     * @param comboDict
+     */
     public void updateCombos(Map<String, Integer> comboDict) {
         if (this.limitToOneGroup) {
             comboDict = this.setOneGroup(comboDict);
@@ -370,7 +374,7 @@ public class ZoneSelector extends AbstractZoneSelector {
                 + Math.abs(y - this.pressLocation.y);
 
         // drag
-        if (diff >= 10 && this.pressZone != null) {
+        if ((diff >= 10) && (this.pressZone != null)) {
             // get the zones that were selected
             List<String> zones = this.selectedZones(x, y);
 
@@ -481,10 +485,10 @@ public class ZoneSelector extends AbstractZoneSelector {
         } else {
             // make some extra colors
             Random random = new Random();
-            while (groupNumber - this.colors.size() > 0) {
-                RGB rgb = new RGB(random.nextInt(210 - 30 + 1) + 30,
-                        random.nextInt(210 - 30 + 1) + 30,
-                        +random.nextInt(210 - 30 + 1) + 30);
+            while ((groupNumber - this.colors.size()) > 0) {
+                RGB rgb = new RGB(random.nextInt((210 - 30) + 1) + 30,
+                        random.nextInt((210 - 30) + 1) + 30,
+                        +random.nextInt((210 - 30) + 1) + 30);
                 this.colors.add(rgb);
             }
             return this.getGroupColor(groupNumber);
@@ -532,7 +536,7 @@ public class ZoneSelector extends AbstractZoneSelector {
         // deal with the group label
         this.setZoneGroupLabel(zone, group);
 
-        if (doCallback && this.selectCB != null) {
+        if (doCallback && (this.selectCB != null)) {
             this.selectCB.zoneSelected(zone);
         }
     }
@@ -550,7 +554,7 @@ public class ZoneSelector extends AbstractZoneSelector {
             }
         }
 
-        if (deletedEans.size() > 0 && this.lclFmtrDialog != null) {
+        if ((deletedEans.size() > 0) && (this.lclFmtrDialog != null)) {
             this.lclFmtrDialog.setStatusText("S",
                     "Removed Unknown Edit Areas: " + deletedEans);
         }
@@ -574,7 +578,7 @@ public class ZoneSelector extends AbstractZoneSelector {
     // sets the zone to the given color, does not affect the combinations
     private void setZone(String zoneName, RGB color) {
         for (ZoneSelectorResource mapRsc : this.mapRscList) {
-            mapRsc.setZone(zoneName, color);
+            mapRsc.setZone(color, zoneName);
         }
 
         // this.update_idletasks();
@@ -658,6 +662,9 @@ public class ZoneSelector extends AbstractZoneSelector {
         return groupings;
     }
 
+    /**
+     * @return the no zone color
+     */
     public RGB getNoZoneColor() {
         return this.noZoneColor;
     }
diff --git a/cave/com.raytheon.viz.ghg/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.ghg/META-INF/MANIFEST.MF
index 06291e71a4..ceb8daf19f 100644
--- a/cave/com.raytheon.viz.ghg/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.ghg/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GHG Plug-in
 Bundle-SymbolicName: com.raytheon.viz.ghg;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.16.0.qualifier
 Bundle-Activator: com.raytheon.viz.ghg.Activator
 Bundle-Vendor: Raytheon
 Require-Bundle: org.eclipse.ui,
@@ -10,19 +10,17 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.viz.ui,
  com.raytheon.viz.core,
  org.geotools,
- com.raytheon.viz.gfe,
  com.raytheon.viz.alerts,
  org.jep,
- com.raytheon.uf.common.message;bundle-version="1.11.31",
+ com.raytheon.uf.common.message,
  com.raytheon.uf.common.dataplugin.gfe,
+ com.raytheon.uf.common.gfe.ifpclient,
  com.raytheon.uf.common.site,
- com.raytheon.uf.viz.core.maps;bundle-version="1.12.1174"
+ com.raytheon.uf.viz.core.maps,
+ com.raytheon.uf.viz.zoneselector,
+ org.apache.commons.lang3;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.raytheon.uf.common.activetable,
- com.raytheon.uf.common.dataplugin.gfe,
- com.raytheon.uf.common.dataplugin.gfe.db.objects,
- com.raytheon.uf.common.dataplugin.gfe.reference,
- com.raytheon.uf.common.dataplugin.gfe.slice,
  com.raytheon.uf.common.python
 Bundle-ClassPath: com.raytheon.viz.ghg.jar
diff --git a/cave/com.raytheon.viz.ghg/plugin.xml b/cave/com.raytheon.viz.ghg/plugin.xml
index 839d35dd33..eb94da33e7 100644
--- a/cave/com.raytheon.viz.ghg/plugin.xml
+++ b/cave/com.raytheon.viz.ghg/plugin.xml
@@ -34,4 +34,15 @@
             commandId="com.raytheon.viz.ghg.openGhgMonitor">
       </handler>
    </extension>
+   <extension
+         point="org.eclipse.ui.menus">
+        <menuContribution
+           locationURI="menu:file.new">
+           <command
+                commandId="com.raytheon.viz.ghg.openGhgMonitor"
+                label="GHG Monitor..."
+                style="push">
+           </command>
+        </menuContribution>
+   </extension>
 </plugin>
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/GhgMonitorAction.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/GhgMonitorAction.java
index 8f773bbd8a..dfbdf01602 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/GhgMonitorAction.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/GhgMonitorAction.java
@@ -25,6 +25,7 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
+import com.raytheon.viz.ghg.exception.GhgMissingDataException;
 import com.raytheon.viz.ghg.monitor.GhgMonitorDlg;
 
 /**
@@ -32,11 +33,12 @@ import com.raytheon.viz.ghg.monitor.GhgMonitorDlg;
  * 
  * <pre>
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Mar 26, 2008 1033		lvenable	Initial creation
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * Mar 26, 2008 1033        lvenable    Initial creation
  * Nov 15, 2012 1298        rferrel     Changes for non-blocking GhgMonitorDlg.
  * Mar 28, 2013 1790        rferrel     Bug fix for non-blocking dialogs.
+ * Dec 16, 2015 5184        dgilling    Handle GhgMissingDataException.
  * 
  * </pre>
  * 
@@ -50,10 +52,15 @@ public class GhgMonitorAction extends AbstractHandler {
     @Override
     public Object execute(ExecutionEvent arg0) throws ExecutionException {
         if (monitorDlg == null || monitorDlg.isDisposed()) {
-            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                    .getShell();
-            monitorDlg = new GhgMonitorDlg(shell);
-            monitorDlg.open();
+            try {
+                Shell shell = PlatformUI.getWorkbench()
+                        .getActiveWorkbenchWindow().getShell();
+                monitorDlg = new GhgMonitorDlg(shell);
+                monitorDlg.open();
+            } catch (GhgMissingDataException e) {
+                throw new ExecutionException(
+                        "Could not retrieve data needed for GHG monitor.", e);
+            }
         } else {
             monitorDlg.bringToTop();
         }
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/exception/GhgMissingDataException.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/exception/GhgMissingDataException.java
new file mode 100644
index 0000000000..e24d201de1
--- /dev/null
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/exception/GhgMissingDataException.java
@@ -0,0 +1,44 @@
+package com.raytheon.viz.ghg.exception;
+
+/**
+ * Exception to throw if GHG Monitor can not load data it needs to initialize
+ * the application.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 16, 2015  #5184     dgilling     Initial creation
+ * 
+ * </pre>
+ * 
+ * @author dgilling
+ * @version 1.0
+ */
+public final class GhgMissingDataException extends Exception {
+
+    private static final long serialVersionUID = 9066782113765709566L;
+
+    public GhgMissingDataException() {
+        super();
+    }
+
+    public GhgMissingDataException(String message, Throwable cause,
+            boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+
+    public GhgMissingDataException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public GhgMissingDataException(String message) {
+        super(message);
+    }
+
+    public GhgMissingDataException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GHGSpatialViewer.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GHGSpatialViewer.java
index 9ed6acbfec..8faa0d4f1b 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GHGSpatialViewer.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GHGSpatialViewer.java
@@ -33,12 +33,15 @@ import org.eclipse.swt.widgets.Event;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.viz.core.IDisplayPane;
 import com.raytheon.uf.viz.core.RGBColors;
 import com.raytheon.uf.viz.core.rsc.IInputHandler;
-import com.raytheon.viz.gfe.ui.zoneselector.AbstractZoneSelector;
-import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelector.IZoneSelectionListener;
-import com.raytheon.viz.gfe.ui.zoneselector.ZoneSelectorResource;
+import com.raytheon.uf.viz.zoneselector.AbstractZoneSelector;
+import com.raytheon.uf.viz.zoneselector.ZoneSelectorResource;
+import com.raytheon.viz.ghg.monitor.event.AbstractGhgMonitorEvent.GhgEventListener;
+import com.raytheon.viz.ghg.monitor.event.GhgMonitorZoneSelectionEvent;
 import com.raytheon.viz.ui.input.InputAdapter;
+import com.raytheon.viz.ui.input.PanHandler;
 
 /**
  * GHG Spatial Viewer
@@ -49,7 +52,8 @@ import com.raytheon.viz.ui.input.InputAdapter;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Aug 23, 2011            randerso     Initial creation
+ * Aug 23, 2011            randerso    Initial creation
+ * Feb 05, 2016 #5316      randerso    Fleshed out implementation
  * 
  * </pre>
  * 
@@ -58,22 +62,62 @@ import com.raytheon.viz.ui.input.InputAdapter;
  */
 
 public class GHGSpatialViewer extends AbstractZoneSelector {
-    // TODO: This is a start at converting the GHGMonitor to use the classes
-    // created for the ZoneSelector. Unforturnately it will require significant
-    // refactoring of GHGMonitor to get this to work and we don't have time or a
-    // pressing need to do this now.
 
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(GHGSpatialViewer.class);
 
+    /**
+     * Enumeration defining the available zoom level.
+     */
+    public enum ZoomLevel {
+        /** 1x zoom (No Zoom) */
+        ZOOM_1("No Zoom", 1),
+
+        /** 2x zoom */
+        ZOOM_2("x2", 2),
+
+        /** 4x zoom */
+        ZOOM_4("x4", 4),
+
+        /** 6x zoom */
+        ZOOM_6("x6", 6),
+
+        /** 8x zoom */
+        ZOOM_8("x8", 8),
+
+        /** 12x zoom */
+        ZOOM_12("x12", 12),
+
+        /** 16x zoom */
+        ZOOM_16("x16", 16);
+
+        private String displayName;
+
+        private int level;
+
+        private ZoomLevel(String displayName, int level) {
+            this.displayName = displayName;
+            this.level = level;
+        }
+
+        @Override
+        public String toString() {
+            return displayName;
+        }
+
+        public int getZoomLevel() {
+            return level;
+        }
+    }
+
     private static final Map<String, List<String>> mapConfigure;
     static {
         mapConfigure = new LinkedHashMap<String, List<String>>();
         mapConfigure.put("FIPS", Arrays.asList("Counties", "Marine_Zones"));
         mapConfigure.put("Public", Arrays.asList("Zones"));
         mapConfigure.put("FireWx", Arrays.asList("FireWxZones"));
-        mapConfigure.put("Marine", Arrays.asList("Marine_Zones"
-        /* , "OffshoreMZones" */));
+        mapConfigure.put("Marine",
+                Arrays.asList("Marine_Zones", "Offshore_Marine_Zones"));
     }
 
     IInputHandler theMouseListener = new InputAdapter() {
@@ -188,6 +232,14 @@ public class GHGSpatialViewer extends AbstractZoneSelector {
 
     private Point pressInfo;
 
+    private List<GhgEventListener> zoneSelectionListenerList = new ArrayList<>();
+
+    /**
+     * @param parent
+     * @param myWfo
+     * @param gloc
+     * @param callback
+     */
     public GHGSpatialViewer(Composite parent, String myWfo, GridLocation gloc,
             IZoneSelectionListener callback) {
         super(parent, gloc, callback);
@@ -224,7 +276,7 @@ public class GHGSpatialViewer extends AbstractZoneSelector {
         // click?
         if (diff < 10) {
             List<String> zones = this.selectedZones(x, y);
-            if (this.selectCB != null && !zones.isEmpty()) {
+            if ((this.selectCB != null) && !zones.isEmpty()) {
                 this.selectCB.zoneSelected(zones.get(0));
             }
         }
@@ -234,7 +286,7 @@ public class GHGSpatialViewer extends AbstractZoneSelector {
     public void setMap(String mapName) {
         this.mapName = mapName;
         List<String> mapList = mapConfigure.get(mapName);
-        super.setMap(mapList);
+        super.setMap(mapList, true);
 
         for (ZoneSelectorResource rsc : mapRscList) {
             rsc.setMyWfo(this.myWfo);
@@ -246,11 +298,87 @@ public class GHGSpatialViewer extends AbstractZoneSelector {
         setMapInternal(mapRscList);
     }
 
-    public List<String> knownMaps() {
+    public static List<String> knownMaps() {
         return new ArrayList<String>(mapConfigure.keySet());
     }
 
     public String getCurrentMap() {
         return this.mapName;
     }
+
+    @Override
+    protected void registerHandlers(IDisplayPane pane) {
+        super.registerHandlers(pane);
+        registerMouseHandler(new PanHandler(this));
+
+        registerMouseHandler(new InputAdapter() {
+            private boolean drag = false;
+
+            @Override
+            public boolean handleMouseUp(int x, int y, int mouseButton) {
+                if (mouseButton == 1) {
+                    if (!drag) {
+                        List<String> zones = selectedZones(x, y);
+                        GhgMonitorZoneSelectionEvent evt = new GhgMonitorZoneSelectionEvent();
+                        evt.setHighlightedZones(zones);
+                        fireZoneSelectionEvent(evt);
+                    }
+                    this.drag = false;
+                }
+                return false;
+            }
+
+            @Override
+            public boolean handleMouseDownMove(int x, int y, int mouseButton) {
+                if (mouseButton == 1) {
+                    this.drag = true;
+                }
+                return false;
+            }
+        });
+    }
+
+    /**
+     * @param selectionColor
+     * @param highlightedZones
+     */
+    public void setHighlightedZones(RGB selectionColor,
+            String... highlightedZones) {
+        for (ZoneSelectorResource rsc : mapRscList) {
+            rsc.clearZones();
+            rsc.setZone(selectionColor, highlightedZones);
+        }
+    }
+
+    /**
+     * Add a listener to the list.
+     * 
+     * @param listener
+     */
+    public void addSelectionListener(GhgEventListener listener) {
+        if (!zoneSelectionListenerList.contains(listener)) {
+            zoneSelectionListenerList.add(listener);
+        }
+    }
+
+    /**
+     * Remove a listener from the list.
+     * 
+     * @param listener
+     */
+    public void removeSelectionListener(GhgEventListener listener) {
+        zoneSelectionListenerList.remove(listener);
+    }
+
+    /**
+     * Fire the map change event.
+     * 
+     * @param event
+     *            The GhgMonitorZoneSelectionEvent object
+     */
+    private void fireZoneSelectionEvent(GhgMonitorZoneSelectionEvent event) {
+        for (GhgEventListener listener : zoneSelectionListenerList) {
+            listener.notifyUpdate(event);
+        }
+    }
 }
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgAlertDlg.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgAlertDlg.java
index 40cb924411..cfc7cfc681 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgAlertDlg.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgAlertDlg.java
@@ -48,6 +48,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * ------------ ---------- ----------- --------------------------
  * 25 MAR 2008  N/A        lvenable    Initial creation
  * 15 NOV 2012  1298       rferrel     Changes for non-blocking dialog.
+ * 05 FEB 2016  5316       randerso    Code cleanup
  * 
  * </pre>
  * 
@@ -86,7 +87,7 @@ public class GhgAlertDlg extends CaveSWTDialog {
             GhgConfigData.AlertsFilterEnum.PhenSig,
             GhgConfigData.AlertsFilterEnum.Pil };
 
-    public static Map<GhgConfigData.AlertsFilterEnum, String[]> filterToEnumMap = new HashMap<GhgConfigData.AlertsFilterEnum, String[]>() {
+    private static Map<GhgConfigData.AlertsFilterEnum, String[]> filterToEnumMap = new HashMap<GhgConfigData.AlertsFilterEnum, String[]>() {
 
         private static final long serialVersionUID = 6183513849706287870L;
         {
@@ -323,6 +324,9 @@ public class GhgAlertDlg extends CaveSWTDialog {
         }
     }
 
+    /**
+     * @param alerts
+     */
     public void setAlerts(GhgAlertsConfigData alerts) {
         this.alerts = alerts.clone();
     }
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgColorDlg.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgColorDlg.java
index 0f5d2a620f..6200b8f570 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgColorDlg.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgColorDlg.java
@@ -47,8 +47,9 @@ import com.raytheon.viz.ui.dialogs.colordialog.IColorWheelChange;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 25 MAR 2008  N/A        lvenable    Initial creation
- * 28 NOV 2012  1353       rferrel     Changes for non-blocking dialog.
+ * 25 Mar 2008  N/A        lvenable    Initial creation
+ * 28 Nov 2012  1353       rferrel     Changes for non-blocking dialog.
+ * 08 Feb 2016  5316       randerso    Fix monitor selection background color
  * 
  * </pre>
  * 
@@ -365,6 +366,7 @@ public class GhgColorDlg extends CaveSWTDialog implements IColorWheelChange {
      * Change the color of the label foreground or background color based on the
      * selection in the color wheels.
      */
+    @Override
     public void colorChange(RGB rgb, String colorWheelTitle) {
         if (colorWheelTitle.compareTo(TEXT_COLOR) == 0) {
             labelForeGroundColor.dispose();
@@ -412,7 +414,7 @@ public class GhgColorDlg extends CaveSWTDialog implements IColorWheelChange {
 
         rgb = (RGB) monitorSelectionsRdo.getData(FOREGROUND_KEY);
         ghgConfigData.getMonitorSelectionsColors().setForegroundRgb(rgb);
-        rgb = (RGB) monitorSelectionsRdo.getData(FOREGROUND_KEY);
+        rgb = (RGB) monitorSelectionsRdo.getData(BACKGROUND_KEY);
         ghgConfigData.getMonitorSelectionsColors().setBackgroundRgb(rgb);
 
         rgb = (RGB) testProductRdo.getData(FOREGROUND_KEY);
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgDisplayManager.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgDisplayManager.java
deleted file mode 100644
index 79f1f41028..0000000000
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgDisplayManager.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.ghg.monitor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.raytheon.uf.common.activetable.ActiveTableRecord;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.ghg.Activator;
-import com.raytheon.viz.ghg.constants.StatusConstants;
-import com.raytheon.viz.ghg.monitor.constants.GhgMenuConstants;
-import com.raytheon.viz.ghg.monitor.data.GhgConfigData.DataEnum;
-import com.raytheon.viz.ghg.monitor.data.GhgConfigData;
-import com.raytheon.viz.ghg.monitor.data.GhgData;
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorFilterChangeEvent;
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorTableSelectionEvent;
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorZoneSelectionEvent;
-import com.raytheon.viz.ghg.monitor.listener.GhgMonitorFilterChangeListener;
-import com.raytheon.viz.ghg.monitor.listener.GhgMonitorTableSelectionListener;
-import com.raytheon.viz.ghg.monitor.listener.GhgMonitorZoneSelectionListener;
-
-/**
- * The GHG Monitor display manager.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * May 10, 2010            mpduff     Initial creation
- * Apr 9, 2014  15769      ryu        Moved attribute identifyTestData to configuration, as in A1.
- * 
- * </pre>
- * 
- * @author mpduff
- * @version 1.0
- */
-
-public class GhgDisplayManager {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(GhgDisplayManager.class);
-    /**
-     * Single instance of this class type.
-     */
-    private static GhgDisplayManager instance = null;
-
-    /**
-     * Zoom level of the map.
-     */
-    private int zoomLevel = 0;
-
-    /**
-     * Zone type to display.
-     */
-    private GhgMenuConstants.ShowMap zoneDisplay;
-
-    /**
-     * Show label flag.
-     */
-    private boolean showLabels = false;
-
-    /**
-     * List of GhgData records
-     */
-    private List<GhgData> dataList = new ArrayList<GhgData>();
-
-    private DataEnum sortColumn;
-
-    /**
-     * Flag for changes to filter
-     */
-    private boolean filterChanged = false;
-
-    /**
-     * Filter change listener list
-     */
-    private ArrayList<GhgMonitorFilterChangeListener> filterChangeListenerList = new ArrayList<GhgMonitorFilterChangeListener>();
-
-    /**
-     * Map zone selection listener list
-     */
-    private ArrayList<GhgMonitorZoneSelectionListener> zoneSelectionListenerList = new ArrayList<GhgMonitorZoneSelectionListener>();
-
-    /**
-     * Table selection listener list
-     */
-    private ArrayList<GhgMonitorTableSelectionListener> tableSelectionListenerList = new ArrayList<GhgMonitorTableSelectionListener>();
-
-    /**
-     * Private constructor for this singleton.
-     */
-    private GhgDisplayManager() {
-
-    }
-
-    /**
-     * Get the singleton instance of this class.
-     * 
-     * @return The one instance of this class
-     */
-    public static synchronized GhgDisplayManager getInstance() {
-        if (instance == null) {
-            instance = new GhgDisplayManager();
-        }
-
-        return instance;
-    }
-
-    /**
-     * Gets the ActiveTable records and returns them as a List<GhgData>. The
-     * list is based on the configuration selections.
-     * 
-     * @return List<GhgData> list of GhgData objects
-     */
-    public List<GhgData> getTableData() {
-        List<ActiveTableRecord> activeTableList = null;
-
-        dataList.clear();
-        try {
-            activeTableList = DataManager.getCurrentInstance().getActiveTable();
-            for (ActiveTableRecord rec : activeTableList) {
-                GhgData data = new GhgData(rec);
-                dataList.add(data);
-            }
-        } catch (VizException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error getting ActiveTable", e);
-            return new ArrayList<GhgData>();
-        }
-
-        return new ArrayList<GhgData>(dataList);
-    }
-
-    /**
-     * @return the zoomLevel
-     */
-    public int getZoomLevel() {
-        return zoomLevel;
-    }
-
-    /**
-     * @param zoomLevel
-     *            the zoomLevel to set
-     */
-    public void setZoomLevel(int zoomLevel) {
-        this.zoomLevel = zoomLevel;
-    }
-
-    /**
-     * @return the zoneDisplay
-     */
-    public GhgMenuConstants.ShowMap getZoneDisplay() {
-        return zoneDisplay;
-    }
-
-    /**
-     * @param zoneDisplay
-     *            the zoneDisplay to set
-     */
-    public void setZoneDisplay(GhgMenuConstants.ShowMap zoneDisplay) {
-        this.zoneDisplay = zoneDisplay;
-    }
-
-    /**
-     * @return the showLabels
-     */
-    public boolean isShowLabels() {
-        return showLabels;
-    }
-
-    /**
-     * @param showLabels
-     *            the showLabels to set
-     */
-    public void setShowLabels(boolean showLabels) {
-        this.showLabels = showLabels;
-    }
-
-    /**
-     * @return the sortColumn
-     */
-    public DataEnum getSortColumn() {
-        return sortColumn;
-    }
-
-    /**
-     * @param sortColumn
-     *            the sortColumn to set
-     */
-    public void setSortColumn(DataEnum sortColumn) {
-        this.sortColumn = sortColumn;
-    }
-
-    /**
-     * @return the filterChanged
-     */
-    public boolean isFilterChanged() {
-        return filterChanged;
-    }
-
-    /**
-     * @param filterChanged
-     *            the filterChanged to set
-     */
-    public void setFilterChanged(boolean filterChanged) {
-        this.filterChanged = filterChanged;
-        GhgMonitorFilterChangeEvent evt = new GhgMonitorFilterChangeEvent(
-                "Filter");
-        evt.setFilterChanged(filterChanged);
-        fireFilterChangeEvent(evt);
-    }
-
-    /**
-     * Fire event so listeners are aware of change.
-     * 
-     * @param evt
-     *            The GhgMonitorFilterChangeEvent
-     */
-    private void fireFilterChangeEvent(GhgMonitorFilterChangeEvent evt) {
-        for (GhgMonitorFilterChangeListener listener : filterChangeListenerList) {
-            listener.notifyUpdate(evt);
-        }
-    }
-
-    /**
-     * Add a listener to the list.
-     * 
-     * @param gmcl
-     */
-    public void addGhgMonitorFilterChangeListener(
-            GhgMonitorFilterChangeListener gmcl) {
-        filterChangeListenerList.add(gmcl);
-    }
-
-    /**
-     * Remove a listener from the list.
-     * 
-     * @param gmcl
-     */
-    public void removeGhgMonitorChangeListener(
-            GhgMonitorFilterChangeListener gmcl) {
-        if (filterChangeListenerList.contains(gmcl)) {
-            filterChangeListenerList.remove(gmcl);
-        }
-    }
-
-    /**
-     * Add a listener to the list.
-     * 
-     * @param gmzsl
-     */
-    public void addGhgMonitorZoneSelectionListener(
-            GhgMonitorZoneSelectionListener gmzsl) {
-        zoneSelectionListenerList.add(gmzsl);
-    }
-
-    /**
-     * Remove a listener from the list.
-     * 
-     * @param gmzsl
-     */
-    public void removeGhgMonitorZoneSelectionListener(
-            GhgMonitorZoneSelectionListener gmzsl) {
-        if (zoneSelectionListenerList.contains(gmzsl)) {
-            zoneSelectionListenerList.remove(gmzsl);
-        }
-    }
-
-    /**
-     * Add a listener to the list.
-     * 
-     * @param gmtsl
-     */
-    public void addGhgMonitorTableSelectionListener(
-            GhgMonitorTableSelectionListener gmtsl) {
-        tableSelectionListenerList.add(gmtsl);
-    }
-
-    /**
-     * Remove a listener from the list.
-     * 
-     * @param gmtsl
-     */
-    public void removeGhgMonitorTableSelectionListener(
-            GhgMonitorTableSelectionListener gmtsl) {
-        if (tableSelectionListenerList.contains(gmtsl)) {
-            tableSelectionListenerList.remove(gmtsl);
-        }
-    }
-
-    /**
-     * Fire the table change event.
-     * 
-     * @param evt
-     *            The GhgMonitorTableSelectionEvent object
-     */
-    public void fireTableSelectionEvent(GhgMonitorTableSelectionEvent evt) {
-        for (GhgMonitorTableSelectionListener listener : tableSelectionListenerList) {
-            listener.notifyUpdate(evt);
-        }
-    }
-
-    /**
-     * Fire the map change event.
-     * 
-     * @param evt
-     *            The GhgMonitorZoneSelectionEvent object
-     */
-    public void fireMapChangeEvent(GhgMonitorZoneSelectionEvent evt) {
-        for (GhgMonitorZoneSelectionListener listener : zoneSelectionListenerList) {
-            listener.notifyUpdate(evt);
-        }
-    }
-}
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgFilterDlg.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgFilterDlg.java
index d2810e83b0..6758eb7d8b 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgFilterDlg.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgFilterDlg.java
@@ -21,10 +21,8 @@ package com.raytheon.viz.ghg.monitor;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -39,16 +37,16 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Layout;
 import org.eclipse.swt.widgets.Shell;
 
+import com.raytheon.uf.common.activetable.ActiveTableMode;
 import com.raytheon.uf.common.activetable.ActiveTableRecord;
+import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteDefinition;
 import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
 import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.viz.gfe.GFEServerException;
-import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.gfe.core.IReferenceSetManager;
+import com.raytheon.viz.core.mode.CAVEMode;
 import com.raytheon.viz.ghg.monitor.data.GhgConfigData;
 import com.raytheon.viz.ghg.monitor.data.GhgConfigData.AlertsFilterEnum;
 import com.raytheon.viz.ghg.monitor.data.GhgData;
@@ -64,9 +62,11 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 25 MAR 2008  N/A        lvenable    Initial creation
- * 17Jun2008    1157       MW Fegan    Hooked in configuration.
+ * 17 Jun 2008  1157       MW Fegan    Hooked in configuration.
  * 28 Nov 2012  1353       rferrel     Changes for non-blocking dialog.
  * 28 Mar 2014  15769      ryu         Removed "include OrgPil" check button.
+ * 16 Dec 2015  5184       dgilling    Remove viz.gfe dependencies.
+ * 05 Feb 2016  5316       randerso    Code cleanup
  * 
  * </pre>
  * 
@@ -78,6 +78,12 @@ public class GhgFilterDlg extends CaveSWTDialog {
     private final IUFStatusHandler statusHandler = UFStatus
             .getHandler(GhgFilterDlg.class);
 
+    private final IFPClient ifpClient;
+
+    private final DiscreteDefinition ddef;
+
+    private final GhgFilterEngine filterEngine;
+
     /**
      * Composite containing the list controls.
      */
@@ -105,18 +111,6 @@ public class GhgFilterDlg extends CaveSWTDialog {
             GhgConfigData.AlertsFilterEnum.ETN,
             GhgConfigData.AlertsFilterEnum.Seg };
 
-    public static Map<GhgConfigData.AlertsFilterEnum, String[]> filterToEnumMap = new HashMap<GhgConfigData.AlertsFilterEnum, String[]>() {
-
-        private static final long serialVersionUID = 6183513849706287870L;
-        {
-            put(GhgConfigData.AlertsFilterEnum.Action,
-                    GhgConfigData.vtecActionNames);
-            put(GhgConfigData.AlertsFilterEnum.PhenSig, GhgConfigData
-                    .getInstance().getPhenSigCodes());
-            put(GhgConfigData.AlertsFilterEnum.Pil, GhgConfigData.vtecPILNames);
-        }
-    };
-
     /**
      * Array of filter group containers that contain the list controls.
      */
@@ -157,7 +151,7 @@ public class GhgFilterDlg extends CaveSWTDialog {
      */
     private Button incPastEventsChk;
 
-    //private Button incOrgPilEvents;
+    // private Button incOrgPilEvents;
 
     private GhgDataFilter filter = null;
 
@@ -186,12 +180,20 @@ public class GhgFilterDlg extends CaveSWTDialog {
      * 
      * @param parent
      *            Parent Shell.
+     * @param filter
+     * @param ifpClient
+     * @param ddef
+     * @param siteID4char
      */
-    public GhgFilterDlg(Shell parent, GhgDataFilter filter) {
+    public GhgFilterDlg(Shell parent, GhgDataFilter filter,
+            IFPClient ifpClient, DiscreteDefinition ddef, String siteID4char) {
         super(parent, SWT.DIALOG_TRIM, CAVE.DO_NOT_BLOCK);
         setText("GHG Monitor Filter Dialog");
 
         this.filter = filter;
+        this.ifpClient = ifpClient;
+        this.ddef = ddef;
+        this.filterEngine = new GhgFilterEngine(siteID4char);
     }
 
     @Override
@@ -239,7 +241,7 @@ public class GhgFilterDlg extends CaveSWTDialog {
         filter.includeAlerts = incAlertsChk.getSelection();
         filter.includeMapSelections = incMapSelectionsChk.getSelection();
         filter.includePastEvents = incPastEventsChk.getSelection();
-        //filter.includeOrgPilEvents = incOrgPilEvents.getSelection();
+        // filter.includeOrgPilEvents = incOrgPilEvents.getSelection();
 
         filter.name = "<Custom>";
 
@@ -270,7 +272,7 @@ public class GhgFilterDlg extends CaveSWTDialog {
         incAlertsChk.setSelection(filter.includeAlerts);
         incMapSelectionsChk.setSelection(filter.includeMapSelections);
         incPastEventsChk.setSelection(filter.includePastEvents);
-        //incOrgPilEvents.setSelection(filter.includeOrgPilEvents);
+        // incOrgPilEvents.setSelection(filter.includeOrgPilEvents);
     }
 
     /**
@@ -572,26 +574,23 @@ public class GhgFilterDlg extends CaveSWTDialog {
             }
         });
 
-        //incOrgPilEvents = new Button(filterOverrideGroup, SWT.CHECK);
-        //incOrgPilEvents.setText("Include OrgPil Events");
-        //incOrgPilEvents.setSelection(filter.includeOrgPilEvents);
-        //incOrgPilEvents.addSelectionListener(new SelectionAdapter() {
+        // incOrgPilEvents = new Button(filterOverrideGroup, SWT.CHECK);
+        // incOrgPilEvents.setText("Include OrgPil Events");
+        // incOrgPilEvents.setSelection(filter.includeOrgPilEvents);
+        // incOrgPilEvents.addSelectionListener(new SelectionAdapter() {
 
-            /*
-             * (non-Javadoc)
-             * 
-             * @see
-             * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
-             * .swt.events.SelectionEvent)
-             */
         /*
-            @Override
-            public void widgetSelected(SelectionEvent e) {
-                filter.includeOrgPilEvents = incOrgPilEvents.getSelection();
-                updateDisplay();
-            }
-        });
-        */
+         * (non-Javadoc)
+         * 
+         * @see
+         * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
+         * .swt.events.SelectionEvent)
+         */
+        /*
+         * @Override public void widgetSelected(SelectionEvent e) {
+         * filter.includeOrgPilEvents = incOrgPilEvents.getSelection();
+         * updateDisplay(); } });
+         */
     }
 
     /**
@@ -621,57 +620,78 @@ public class GhgFilterDlg extends CaveSWTDialog {
      */
     private void initListData() {
         // wfos (based on ISC edit areas)
-        DataManager dm = DataManager.getCurrentInstance();
-        IReferenceSetManager refSetManager = dm.getRefManager();
-        List<ReferenceID> rIdList = refSetManager.getAvailableSets();
-
-        try {
-            // get list of known sites (WFOs) and geoIds
-            List<String> knownSites = dm.knownSites();
-
-            for (int i = 0; i < rIdList.size(); i++) {
-                ReferenceID refId = rIdList.get(i);
-                String name = refId.getName();
-                if ((name.length() == 7) && name.startsWith("ISC_")
-                        && knownSites.contains(name.substring(4))) {
-                    String wfo4 = SiteMap.getInstance().getSite4LetterId(
-                            name.substring(4));
-                    wfoList.add(wfo4);
-                } else if ((name.length() == 6) && !name.contains("_")) {
-                    geoIdList.add(name);
-                }
-            }
-
-            if (wfoList.contains("KWNS") == false) {
-                wfoList.add("KWNS");
-            }
-            if (wfoList.contains("KNHC") == false) {
-                wfoList.add("KNHC");
-            }
-
-            // Get the VTEC active table
-            List<ActiveTableRecord> activeTableList = DataManager
-                    .getCurrentInstance().getActiveTable();
-
-            // Get the etn and seg values, these are based on actual data
-            Set<String> etnSet = new TreeSet<String>();
-            Set<String> segSet = new TreeSet<String>();
-            for (ActiveTableRecord rec : activeTableList) {
-                etnSet.add(rec.getEtn());
-                segSet.add(String.valueOf(rec.getSeg()));
-
-                etnArr = etnSet.toArray(new String[etnSet.size()]);
-                segArr = segSet.toArray(new String[segSet.size()]);
-            }
-
-            // Sort the lists
-            Collections.sort(wfoList);
-            Collections.sort(geoIdList);
-        } catch (GFEServerException e) {
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-        } catch (VizException e) {
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
+        ServerResponse<List<ReferenceID>> sr = ifpClient
+                .getReferenceInventory();
+        List<ReferenceID> rIdList;
+        if (sr.isOkay()) {
+            rIdList = sr.getPayload();
+        } else {
+            statusHandler.error(String.format(
+                    "Error retrieving reference set inventory: %s",
+                    sr.message()));
+            rIdList = Collections.emptyList();
         }
+
+        // get list of known sites (WFOs) and geoIds
+        ServerResponse<List<String>> sr2 = ifpClient.getKnownSites();
+        List<String> knownSites;
+        if (sr2.isOkay()) {
+            knownSites = sr2.getPayload();
+        } else {
+            statusHandler.error(String.format(
+                    "Error retrieving known sites: %s", sr2.message()));
+            knownSites = Collections.emptyList();
+        }
+
+        for (int i = 0; i < rIdList.size(); i++) {
+            ReferenceID refId = rIdList.get(i);
+            String name = refId.getName();
+            if ((name.length() == 7) && name.startsWith("ISC_")
+                    && knownSites.contains(name.substring(4))) {
+                String wfo4 = SiteMap.getInstance().getSite4LetterId(
+                        name.substring(4));
+                wfoList.add(wfo4);
+            } else if ((name.length() == 6) && !name.contains("_")) {
+                geoIdList.add(name);
+            }
+        }
+
+        if (wfoList.contains("KWNS") == false) {
+            wfoList.add("KWNS");
+        }
+        if (wfoList.contains("KNHC") == false) {
+            wfoList.add("KNHC");
+        }
+
+        // Get the VTEC active table
+        CAVEMode opMode = CAVEMode.getMode();
+        ActiveTableMode tableName = (opMode == CAVEMode.PRACTICE) ? ActiveTableMode.PRACTICE
+                : ActiveTableMode.OPERATIONAL;
+        ServerResponse<List<ActiveTableRecord>> sr3 = ifpClient
+                .getVTECActiveTable(tableName);
+        List<ActiveTableRecord> activeTableList;
+        if (sr3.isOkay()) {
+            activeTableList = sr3.getPayload();
+        } else {
+            statusHandler.error(String.format(
+                    "Error retrieving known sites: %s", sr3.message()));
+            activeTableList = Collections.emptyList();
+        }
+
+        // Get the etn and seg values, these are based on actual data
+        Set<String> etnSet = new TreeSet<String>();
+        Set<String> segSet = new TreeSet<String>();
+        for (ActiveTableRecord rec : activeTableList) {
+            etnSet.add(rec.getEtn());
+            segSet.add(String.valueOf(rec.getSeg()));
+
+            etnArr = etnSet.toArray(new String[etnSet.size()]);
+            segArr = segSet.toArray(new String[segSet.size()]);
+        }
+
+        // Sort the lists
+        Collections.sort(wfoList);
+        Collections.sort(geoIdList);
     }
 
     /**
@@ -682,68 +702,71 @@ public class GhgFilterDlg extends CaveSWTDialog {
         /* update the state of the filter boxes */
         if (showCurrentHazardsChk.getSelection()) {
             // Get data from the active table and update the lists accordingly
-            try {
-                List<ActiveTableRecord> tableDataList = DataManager
-                        .getCurrentInstance().getActiveTable();
+            CAVEMode opMode = CAVEMode.getMode();
+            ActiveTableMode tableName = (opMode == CAVEMode.PRACTICE) ? ActiveTableMode.PRACTICE
+                    : ActiveTableMode.OPERATIONAL;
+            ServerResponse<List<ActiveTableRecord>> sr = ifpClient
+                    .getVTECActiveTable(tableName);
+            List<ActiveTableRecord> tableDataList;
+            if (sr.isOkay()) {
+                tableDataList = sr.getPayload();
+            } else {
+                statusHandler.error(String.format(
+                        "Error retrieving active table: %s", sr.message()));
+                tableDataList = Collections.emptyList();
+            }
 
-                // compile the data for each list
-                Set<String> actionSet = new HashSet<String>();
-                Set<String> phenSigSet = new HashSet<String>();
-                Set<String> pilSet = new HashSet<String>();
-                Set<String> wfoSet = new HashSet<String>();
-                Set<String> geoIdSet = new HashSet<String>();
-                Set<String> etnSet = new HashSet<String>();
-                Set<String> segSet = new HashSet<String>();
+            // compile the data for each list
+            Set<String> actionSet = new HashSet<String>();
+            Set<String> phenSigSet = new HashSet<String>();
+            Set<String> pilSet = new HashSet<String>();
+            Set<String> wfoSet = new HashSet<String>();
+            Set<String> geoIdSet = new HashSet<String>();
+            Set<String> etnSet = new HashSet<String>();
+            Set<String> segSet = new HashSet<String>();
 
-                // Get the data from the activeTable
-                for (ActiveTableRecord rec : tableDataList) {
-                    GhgData data = new GhgData(rec);
+            // Get the data from the activeTable
+            for (ActiveTableRecord rec : tableDataList) {
+                GhgData data = new GhgData(rec, ddef.getHazardDescription(
+                        "Hazards_SFC", rec.getPhensig()));
 
-                    if (GhgFilterEngine.filterCheck(data)) {
-                        actionSet.add(data.getAction());
-                        phenSigSet.add(data.getPhenSig());
-                        pilSet.add(data.getPil());
-                        wfoSet.add(data.getWfo());
-                        geoIdSet.add(data.getGeoId());
-                        etnSet.add(data.getEtn());
-                        segSet.add(data.getSegNum());
-                    }
+                if (filterEngine.filterCheck(data)) {
+                    actionSet.add(data.getAction());
+                    phenSigSet.add(data.getPhenSig());
+                    pilSet.add(data.getPil());
+                    wfoSet.add(data.getWfo());
+                    geoIdSet.add(data.getGeoId());
+                    etnSet.add(data.getEtn());
+                    segSet.add(data.getSegNum());
                 }
+            }
 
-                for (int i = 0; i < filterArray.length - 2; i++) {
-                    GhgConfigData.AlertsFilterEnum type = filterArray[i];
-                    GhgFilterListGroup group = listGroupArray.get(i);
+            for (int i = 0; i < (filterArray.length - 2); i++) {
+                GhgConfigData.AlertsFilterEnum type = filterArray[i];
+                GhgFilterListGroup group = listGroupArray.get(i);
 
-                    if (type == AlertsFilterEnum.Action) {
-                        group.setListValues(actionSet
-                                .toArray(new String[actionSet.size()]));
-                    } else if (type == AlertsFilterEnum.PhenSig) {
-                        group.setListValues(phenSigSet
-                                .toArray(new String[phenSigSet.size()]));
-                    } else if (type == AlertsFilterEnum.Pil) {
-                        group.setListValues(pilSet.toArray(new String[pilSet
-                                .size()]));
-                    } else if (type == AlertsFilterEnum.WFO) {
-                        group.setListValues(wfoSet.toArray(new String[wfoSet
-                                .size()]));
-                    } else if (type == AlertsFilterEnum.GeoId) {
-                        group.setListValues(geoIdSet
-                                .toArray(new String[geoIdSet.size()]));
-                    } else if (type == AlertsFilterEnum.ETN) {
-                        group.setListValues(etnSet.toArray(new String[etnSet
-                                .size()]));
-                    } else if (type == AlertsFilterEnum.Seg) {
-                        group.setListValues(segSet.toArray(new String[segSet
-                                .size()]));
-                    }
+                if (type == AlertsFilterEnum.Action) {
+                    group.setListValues(actionSet.toArray(new String[actionSet
+                            .size()]));
+                } else if (type == AlertsFilterEnum.PhenSig) {
+                    group.setListValues(phenSigSet
+                            .toArray(new String[phenSigSet.size()]));
+                } else if (type == AlertsFilterEnum.Pil) {
+                    group.setListValues(pilSet.toArray(new String[pilSet.size()]));
+                } else if (type == AlertsFilterEnum.WFO) {
+                    group.setListValues(wfoSet.toArray(new String[wfoSet.size()]));
+                } else if (type == AlertsFilterEnum.GeoId) {
+                    group.setListValues(geoIdSet.toArray(new String[geoIdSet
+                            .size()]));
+                } else if (type == AlertsFilterEnum.ETN) {
+                    group.setListValues(etnSet.toArray(new String[etnSet.size()]));
+                } else if (type == AlertsFilterEnum.Seg) {
+                    group.setListValues(segSet.toArray(new String[segSet.size()]));
                 }
-            } catch (VizException e) {
-                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
-                        e);
             }
         } else {
             // reset the list data
-            for (int i = 0; i < filterArray.length - 2; i++) {
+            for (int i = 0; i < (filterArray.length - 2); i++) {
                 GhgConfigData.AlertsFilterEnum type = filterArray[i];
                 GhgFilterListGroup group = listGroupArray.get(i);
                 switch (type) {
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgFontDlg.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgFontDlg.java
index 197b8a7b4a..1ab41a2ea6 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgFontDlg.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgFontDlg.java
@@ -44,8 +44,9 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 25 MAR 2008  N/A        lvenable    Initial creation 
- * 17Jun2008    1157       MW Fegan    Added interaction with GHG Configuration.
+ * 17 JUN 2008  1157       MW Fegan    Added interaction with GHG Configuration.
  * 28 NOV 2012  1353       rferrel     Changes for non-blocking dialog.
+ * 05 Feb 2016 #5316       randerso    Code cleanup
  * 
  * </pre>
  * 
@@ -125,6 +126,7 @@ public class GhgFontDlg extends CaveSWTDialog {
      * 
      * @param parent
      *            Parent Shell.
+     * @param config
      */
     public GhgFontDlg(Shell parent, GhgConfigData config) {
         super(parent, SWT.DIALOG_TRIM, CAVE.DO_NOT_BLOCK);
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMapComp.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMapComp.java
deleted file mode 100644
index c770f8fc0b..0000000000
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMapComp.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.ghg.monitor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.opengis.referencing.FactoryException;
-import org.opengis.referencing.operation.TransformException;
-
-import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
-import com.raytheon.uf.common.geospatial.MapUtil;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.core.IDisplayPane;
-import com.raytheon.uf.viz.core.drawables.IRenderableDisplay;
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.localization.LocalizationManager;
-import com.raytheon.uf.viz.core.map.MapDescriptor;
-import com.raytheon.uf.viz.core.maps.display.PlainMapRenderableDisplay;
-import com.raytheon.uf.viz.core.rsc.LoadProperties;
-import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.gfe.rsc.ZoneDbResourceData;
-import com.raytheon.viz.gfe.rsc.zones.ZoneDbResource;
-import com.raytheon.viz.ghg.Activator;
-import com.raytheon.viz.ghg.constants.StatusConstants;
-import com.raytheon.viz.ghg.monitor.constants.GhgMenuConstants;
-import com.raytheon.viz.ghg.monitor.data.GhgConfigData;
-import com.raytheon.viz.ui.panes.VizDisplayPane;
-import com.vividsolutions.jts.geom.Envelope;
-
-/**
- * Contains the GHG Monitor Map and handles all interactions with the map.
- * 
- * <pre>
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 30May2008    1157       MW Fegan    Initial Creation.
- * 17Nov2008               wdougherty  Extra refresh() in paint handler removed.
- * 
- * </pre>
- * 
- * @author mfegan
- * @version 1.0
- */
-
-public class GhgMapComp extends Composite implements IMenuSelectionClient {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(GhgMapComp.class);
-    /**
-     * The zoom level.
-     */
-    private int zoomLevel = 0;
-
-    /**
-     * The Zone File resource.
-     */
-    private ZoneDbResource zoneDbResource;
-
-    /** Map Action Handler */
-    private GhgMapManager mapManager;
-
-    /**
-     * Constructor.
-     * 
-     * @param parent
-     *            parent of this component.
-     */
-    public GhgMapComp(Composite parent) {
-        super(parent, SWT.NONE);
-        init();
-    }
-
-    /**
-     * Performs steps needed to create the widget.
-     */
-    private void init() {
-        GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-        GridLayout gl = new GridLayout(1, false);
-        gl.verticalSpacing = 1;
-        gl.marginHeight = 1;
-        setLayout(gl);
-        setLayoutData(gd);
-
-        try {
-            initializeComponents();
-        } catch (Exception e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    e.getLocalizedMessage(), e);
-        }
-
-        this.pack();
-
-        addDisposeListener(new DisposeListener() {
-            public void widgetDisposed(DisposeEvent e) {
-
-            }
-        });
-    }
-
-    /**
-     * Performs steps needed to initialize components.
-     * 
-     * @throws FactoryException
-     * @throws TransformException
-     * @throws VizException
-     */
-    private void initializeComponents() throws TransformException,
-            FactoryException, VizException {
-        // First thing, give the zone resource a bounding geometry.
-        GridLocation gloc = DataManager.getCurrentInstance().getParmManager()
-                .compositeGridLocation();
-        Envelope env = MapUtil.getBoundingEnvelope(gloc);
-
-        // Create a plain map renderable display
-        IRenderableDisplay renderableDisplay = new PlainMapRenderableDisplay(
-                new MapDescriptor(MapUtil.getGridGeometry(gloc)));
-
-        // Create resource data for the zone resource
-        ZoneDbResourceData resourceData = new ZoneDbResourceData();
-        List<String> allTables = new ArrayList<String>(4);
-        allTables.add(ZoneDbResource.COUNTY_TABLE);
-        allTables.add(ZoneDbResource.FIREWX_TABLE);
-        allTables.add(ZoneDbResource.MARINE_TABLE);
-        allTables.add(ZoneDbResource.PUBLIC_TABLE);
-        allTables.add(ZoneDbResource.OFFSHORE_TABLE);
-        resourceData.setQueryColumns(ZoneDbResource.COUNTY_TABLE,
-                ZoneDbResource.FIPS_FIELDS);
-        resourceData.setQueryColumns(ZoneDbResource.FIREWX_TABLE,
-                ZoneDbResource.FIREWX_FIELDS);
-        resourceData.setQueryColumns(ZoneDbResource.MARINE_TABLE,
-                ZoneDbResource.MARINE_FIELDS);
-        resourceData.setQueryColumns(ZoneDbResource.PUBLIC_TABLE,
-                ZoneDbResource.PUBLIC_FIELDS);
-        resourceData.setQueryColumns(ZoneDbResource.OFFSHORE_TABLE,
-                ZoneDbResource.OFFSHORE_FIELDS);
-        resourceData.setAllTables(allTables);
-        resourceData.setMainTable(ZoneDbResource.PUBLIC_TABLE);
-
-        RGB selectionColor = GhgConfigData.getInstance()
-                .getMapSelectionsColors().getBackgroundRgb();
-        resourceData.setSelectionColor(selectionColor);
-        resourceData.setMapName("GHG Monitor Map");
-
-        // Create the zone resource
-        zoneDbResource = resourceData.construct(new LoadProperties(),
-                renderableDisplay.getDescriptor());
-        zoneDbResource.setBoundingEnvelope(env);
-        // Tell the zone resource which value is the local CWA/site id
-        zoneDbResource.setCwaId(LocalizationManager.getInstance()
-                .getCurrentSite());
-        zoneDbResource.fitToCWA();
-        zoneDbResource.setGHGType();
-
-        // Create the map manager
-        mapManager = new GhgMapManager(this);
-        mapManager.createComponent(this);
-
-        // Add the zone resource to the display
-        renderableDisplay.getDescriptor().getResourceList().add(zoneDbResource);
-
-        // Add the renderable display
-        mapManager.addPane(renderableDisplay);
-    }
-
-    @Override
-    public void notifyMenuSelection(String menu, Object event, Object data) {
-        ZoneDbResourceData zdrd = zoneDbResource.getResourceData();
-        switch ((GhgMenuConstants.MapMenuActions) event) {
-        case SHOW_LABELS:
-            zoneDbResource.setLabelZones((Boolean) data);
-            break;
-        case SHOW_MAP:
-            switch ((GhgMenuConstants.ShowMap) data) {
-            case SHOW_FIPS:
-                // FIPS shows both counties and marine zones
-                List<String> tables = new ArrayList<String>(2);
-                tables.add(ZoneDbResource.COUNTY_TABLE);
-                tables.add(ZoneDbResource.MARINE_TABLE);
-                zdrd.setTables(tables);
-                zdrd.setQueryColumns(ZoneDbResource.COUNTY_TABLE,
-                        ZoneDbResource.FIPS_FIELDS);
-                zdrd.setQueryColumns(ZoneDbResource.MARINE_TABLE,
-                        ZoneDbResource.MARINE_FIELDS);
-                break;
-            case SHOW_FIRE:
-                zoneDbResource.getResourceData().setMainTable(
-                        ZoneDbResource.FIREWX_TABLE);
-                zdrd.setQueryColumns(ZoneDbResource.FIREWX_TABLE,
-                        ZoneDbResource.FIREWX_FIELDS);
-                break;
-            case SHOW_MARINE:
-                zoneDbResource.getResourceData().setMainTable(
-                        ZoneDbResource.MARINE_TABLE);
-                zdrd.setQueryColumns(ZoneDbResource.MARINE_TABLE,
-                        ZoneDbResource.MARINE_FIELDS);
-                break;
-            case SHOW_PUBLIC:
-                zoneDbResource.getResourceData().setMainTable(
-                        ZoneDbResource.PUBLIC_TABLE);
-                zdrd.setQueryColumns(ZoneDbResource.PUBLIC_TABLE,
-                        ZoneDbResource.PUBLIC_FIELDS);
-                break;
-            }
-            zoneDbResource.setDirty(true);
-            break;
-        case ZOOM_MAP:
-            zoomLevel = ((GhgMenuConstants.ZoomLevel) data).getZoomLevel();
-            GhgDisplayManager.getInstance().setZoomLevel(zoomLevel);
-        }
-    }
-
-    /**
-     * Update the selected zoom.
-     */
-    public void updateZoom() {
-        double zLev = GhgDisplayManager.getInstance().getZoomLevel();
-        for (IDisplayPane dspPane : mapManager.getDisplayPanes()) {
-            // Reset the zoom
-            dspPane.setZoomLevel(1.0f);
-            dspPane.scaleToClientArea();
-
-            // Zoom into selected zoom level
-            ((VizDisplayPane) dspPane).zoom(1 / zLev);
-        }
-
-        mapManager.refresh();
-    }
-
-    public void updateZone() {
-        GhgMenuConstants.ShowMap zoneType = GhgDisplayManager.getInstance()
-                .getZoneDisplay();
-        ZoneDbResourceData zdrd = zoneDbResource.getResourceData();
-
-        switch (zoneType) {
-        case SHOW_FIPS:
-            // FIPS shows both counties and marine zones
-            List<String> tables = new ArrayList<String>(2);
-            tables.add(ZoneDbResource.COUNTY_TABLE);
-            tables.add(ZoneDbResource.MARINE_TABLE);
-            zdrd.setTables(tables);
-            zdrd.setQueryColumns(ZoneDbResource.COUNTY_TABLE,
-                    ZoneDbResource.FIPS_FIELDS);
-            zdrd.setQueryColumns(ZoneDbResource.MARINE_TABLE,
-                    ZoneDbResource.MARINE_FIELDS);
-            break;
-        case SHOW_FIRE:
-            zdrd.setMainTable(ZoneDbResource.FIREWX_TABLE);
-            zdrd.setQueryColumns(ZoneDbResource.FIREWX_TABLE,
-                    ZoneDbResource.FIREWX_FIELDS);
-            break;
-        case SHOW_MARINE:
-            zdrd.setMainTable(ZoneDbResource.MARINE_TABLE);
-            zdrd.setQueryColumns(ZoneDbResource.MARINE_TABLE,
-                    ZoneDbResource.MARINE_FIELDS);
-            break;
-        case SHOW_PUBLIC:
-            zdrd.setMainTable(ZoneDbResource.PUBLIC_TABLE);
-            zdrd.setQueryColumns(ZoneDbResource.PUBLIC_TABLE,
-                    ZoneDbResource.PUBLIC_FIELDS);
-            break;
-        }
-
-        zoneDbResource.setFilthy(true);
-    }
-
-    public void updateLabels() {
-        zoneDbResource.setLabelZones(GhgDisplayManager.getInstance()
-                .isShowLabels());
-        zoneDbResource.setDirty(true);
-    }
-
-    public void updateMapColors() {
-        GhgConfigData config = GhgConfigData.getInstance();
-        ZoneDbResourceData rData = zoneDbResource.getResourceData();
-        rData.setSelectionColor(config.getMapSelectionsColors()
-                .getBackgroundRgb());
-    }
-
-    public void refresh() {
-        mapManager.refresh();
-    }
-
-    @Override
-    public void dispose() {
-        super.dispose();
-        mapManager.dispose();
-    }
-
-    @Override
-    public boolean setFocus() {
-        mapManager.setFocus();
-        return super.setFocus();
-    }
-}
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMapManager.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMapManager.java
deleted file mode 100644
index a5edae980b..0000000000
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMapManager.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.ghg.monitor;
-
-import java.util.List;
-
-import org.eclipse.swt.widgets.Composite;
-
-import com.raytheon.uf.viz.core.IDisplayPane;
-import com.raytheon.uf.viz.core.datastructure.LoopProperties;
-import com.raytheon.viz.gfe.rsc.zones.ZoneDbResource;
-import com.raytheon.viz.ghg.monitor.data.GhgConfigData;
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorTableSelectionEvent;
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorZoneSelectionEvent;
-import com.raytheon.viz.ghg.monitor.listener.GhgMonitorTableSelectionListener;
-import com.raytheon.viz.ghg.utilities.GhgDragDetector;
-import com.raytheon.viz.ui.input.InputAdapter;
-import com.raytheon.viz.ui.input.PanHandler;
-import com.raytheon.viz.ui.panes.PaneManager;
-import com.vividsolutions.jts.geom.Coordinate;
-
-/**
- * GHG Monitor Map Manager is an interface between the map and the Monitoring
- * dialog.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * May 11, 2010            mpduff     Initial creation
- * Aug 27, 2013  #2301     dgilling   Fix mouse handler registration so they
- *                                    can't trigger events until map is loaded.
- * 
- * </pre>
- * 
- * @author mpduff
- * @version 1.0
- */
-
-public class GhgMapManager extends PaneManager implements
-        GhgMonitorTableSelectionListener {
-
-    private class GhgMapInputAdapter extends InputAdapter {
-        /*
-         * (non-Javadoc)
-         * 
-         * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseUp(int, int,
-         * int)
-         */
-        @Override
-        public boolean handleMouseUp(int x, int y, int mouseButton) {
-            if (mouseButton == 1) {
-                if (!dragDetector.isDrag()) {
-                    GhgConfigData config = GhgConfigData.getInstance();
-                    Coordinate c = translateClick(x, y);
-
-                    ZoneDbResource zdbr = getZoneResource();
-
-                    if (c != null) {
-                        selectedZones = zdbr.getOverlappingZones(c);
-                    } else {
-                        selectedZones = new String[0];
-                    }
-
-                    setHighlightedZones(selectedZones);
-                    GhgMonitorZoneSelectionEvent evt = new GhgMonitorZoneSelectionEvent(
-                            this);
-                    evt.setHighlightedZones(selectedZones);
-                    GhgDisplayManager.getInstance().fireMapChangeEvent(evt);
-
-                    // Set color to map selection color
-                    getZoneResource().getResourceData().setSelectionColor(
-                            config.getMapSelectionsColors().getBackgroundRgb());
-                    getZoneResource().setDirty(true);
-                    refresh();
-                }
-            }
-
-            dragDetector.setDrag(false);
-
-            return false;
-        }
-    }
-
-    /**
-     * Zones that the user has selected (with the mouse).
-     */
-    private String[] selectedZones;
-
-    /** The looping properties */
-    private LoopProperties loopProperties;
-
-    /** The drag detector */
-    private GhgDragDetector dragDetector;
-
-    /**
-     * Constructor
-     */
-    GhgMapManager(Composite parent) {
-        selectedZones = new String[0];
-        loopProperties = new LoopProperties();
-        GhgDisplayManager.getInstance().addGhgMonitorTableSelectionListener(
-                this);
-    }
-
-    /**
-     * Create the dialog
-     * 
-     * @param parent
-     *            The parent composite
-     */
-    public void createComponent(Composite parent) {
-        initializeComponents(this, parent);
-    }
-
-    /**
-     * Get the display resource
-     * 
-     * @return The ZoneDbResource
-     */
-    public ZoneDbResource getZoneResource() {
-        IDisplayPane activePane = getActiveDisplayPane();
-        List<ZoneDbResource> zoneRscs = activePane.getDescriptor()
-                .getResourceList()
-                .getResourcesByTypeAsType(ZoneDbResource.class);
-        if (zoneRscs.size() > 0) {
-            return zoneRscs.get(0);
-        }
-        return null;
-    }
-
-    /**
-     * Set Label Zones flag.
-     * 
-     * @param labelZones
-     *            true to label, false to not label
-     */
-    public void setLabelZones(boolean labelZones) {
-        if (getZoneResource() != null) {
-            getZoneResource().setLabelZones(labelZones);
-        }
-    }
-
-    @Override
-    public void dispose() {
-        super.dispose();
-        GhgDisplayManager.getInstance().removeGhgMonitorTableSelectionListener(
-                this);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ghg.monitor.listener.GhgMonitorTableSelectionListener
-     * #notifyUpdate
-     * (com.raytheon.viz.ghg.monitor.event.GhgMonitorTableSelectionEvent)
-     */
-    @Override
-    public void notifyUpdate(GhgMonitorTableSelectionEvent evt) {
-        String[] highlightedZones = evt.getHighlightedZones();
-        setHighlightedZones(highlightedZones);
-        ZoneDbResource zoneRsc = getZoneResource();
-        if (zoneRsc != null) {
-            zoneRsc.getResourceData()
-                    .setSelectionColor(evt.getSelectionColor());
-            zoneRsc.setDirty(true);
-        }
-        refresh();
-    }
-
-    /**
-     * Set the zone IDs to highlight. This will cause the zones listed to be
-     * drawn in the highlighted color the next time the zone resource is
-     * painted.
-     * 
-     * @param highlightedZones
-     *            the highlightedZones to set
-     */
-    public void setHighlightedZones(String[] highlightedZones) {
-        if (getZoneResource() != null) {
-            getZoneResource().setZoneIdsToShow(highlightedZones);
-            refresh();
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.uf.viz.core.IDisplayPaneContainer#getLoopProperties()
-     */
-    @Override
-    public LoopProperties getLoopProperties() {
-        return loopProperties;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.IDisplayPaneContainer#setLoopProperties(com.
-     * raytheon.uf.viz.core.datastructure.LoopProperties)
-     */
-    @Override
-    public void setLoopProperties(LoopProperties loopProperties) {
-        this.loopProperties = loopProperties;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.uf.viz.core.IDisplayPaneContainer#refresh()
-     */
-    @Override
-    public void refresh() {
-        if (getZoneResource() != null) {
-            getZoneResource().refreshSelections();
-            super.refresh();
-        }
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ui.panes.PaneManager#registerHandlers(com.raytheon.uf
-     * .viz.core.IDisplayPane)
-     */
-    @Override
-    protected void registerHandlers(IDisplayPane pane) {
-        super.registerHandlers(pane);
-        registerMouseHandler(new GhgMapInputAdapter());
-        registerMouseHandler(new PanHandler(this));
-        dragDetector = new GhgDragDetector();
-        registerMouseHandler(dragDetector);
-    }
-}
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
index e0377cc6a3..651fd2282b 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgMonitorDlg.java
@@ -27,6 +27,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -37,6 +38,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.TreeSet;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.SashForm;
@@ -57,11 +59,18 @@ import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
 import org.eclipse.swt.widgets.Table;
 
+import com.raytheon.uf.common.activetable.ActiveTableMode;
+import com.raytheon.uf.common.activetable.ActiveTableRecord;
 import com.raytheon.uf.common.activetable.VTECChange;
 import com.raytheon.uf.common.activetable.VTECTableChangeNotification;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
+import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteDefinition;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.gfe.ifpclient.IFPClient;
 import com.raytheon.uf.common.jms.notification.INotificationObserver;
 import com.raytheon.uf.common.jms.notification.NotificationException;
 import com.raytheon.uf.common.jms.notification.NotificationMessage;
+import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -69,11 +78,11 @@ import com.raytheon.uf.common.time.SimulatedTime;
 import com.raytheon.uf.viz.core.RGBColors;
 import com.raytheon.uf.viz.core.VizApp;
 import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.core.localization.LocalizationManager;
 import com.raytheon.uf.viz.core.notification.jobs.NotificationManagerJob;
 import com.raytheon.viz.core.mode.CAVEMode;
-import com.raytheon.viz.gfe.GFEServerException;
-import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.ghg.monitor.constants.GhgMenuConstants;
+import com.raytheon.viz.ghg.exception.GhgMissingDataException;
+import com.raytheon.viz.ghg.monitor.GHGSpatialViewer.ZoomLevel;
 import com.raytheon.viz.ghg.monitor.data.GhgAlertCheckData;
 import com.raytheon.viz.ghg.monitor.data.GhgAlertData;
 import com.raytheon.viz.ghg.monitor.data.GhgAlertsConfigData;
@@ -85,12 +94,12 @@ import com.raytheon.viz.ghg.monitor.data.GhgConfigData.FeatureEnum;
 import com.raytheon.viz.ghg.monitor.data.GhgConfigData.SelectionEnum;
 import com.raytheon.viz.ghg.monitor.data.GhgData;
 import com.raytheon.viz.ghg.monitor.data.GhgDataFilter;
+import com.raytheon.viz.ghg.monitor.event.AbstractGhgMonitorEvent;
+import com.raytheon.viz.ghg.monitor.event.AbstractGhgMonitorEvent.GhgEventListener;
 import com.raytheon.viz.ghg.monitor.event.GhgMonitorFilterChangeEvent;
 import com.raytheon.viz.ghg.monitor.event.GhgMonitorTableSelectionEvent;
 import com.raytheon.viz.ghg.monitor.event.GhgMonitorZoneSelectionEvent;
 import com.raytheon.viz.ghg.monitor.filter.GhgFilterEngine;
-import com.raytheon.viz.ghg.monitor.listener.GhgMonitorFilterChangeListener;
-import com.raytheon.viz.ghg.monitor.listener.GhgMonitorZoneSelectionListener;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 import com.raytheon.viz.ui.dialogs.ICloseCallback;
 import com.raytheon.viz.ui.statusline.EdgeLayout;
@@ -120,6 +129,10 @@ import com.raytheon.viz.ui.statusline.StatusStore;
  * 10 Apr 2014  15769      ryu         Modify default configuration and menus to match A1.
  *                                     Bring monitor to front before sending alert.
  *                                     Adjusted delay for timer so it fires at the top of a minute.
+ * Dec 16, 2015  #5184     dgilling    Remove viz.gfe dependencies.
+ * Feb 05, 2016 #5316      randerso    Moved notification registration into GHGMonitorDlg
+ *                                     Switched to use GhgSpatialViewer
+ * 
  * </pre>
  * 
  * @author lvenable
@@ -127,13 +140,32 @@ import com.raytheon.viz.ui.statusline.StatusStore;
  * 
  */
 public class GhgMonitorDlg extends CaveSWTDialog implements
-        GhgMonitorFilterChangeListener, GhgMonitorZoneSelectionListener,
-        INotificationObserver {
+        INotificationObserver, GhgEventListener {
+    private static final String HAZARDS_PARM_NAME = "Hazards_SFC";
+
+    private static final String DEFAULT_MAP = "Public";
+
+    private static final ZoomLevel DEFAULT_ZOOM = GHGSpatialViewer.ZoomLevel.ZOOM_1;
+
     private final IUFStatusHandler statusHandler = UFStatus
             .getHandler(GhgMonitorDlg.class);
 
     private static final Map<String, GhgConfigData.DataEnum> labelToEnumMap;
 
+    private ActiveTableMode activeTableName;
+
+    private final IFPClient ifpClient;
+
+    private DiscreteDefinition discreteDef;
+
+    private String myWFO;
+
+    private String my4WFO;
+
+    private GridLocation gridLocation;
+
+    private GhgFilterEngine filterEngine;
+
     private GhgAlertDlg alertDlg;
 
     private GhgColorDlg colorDlg;
@@ -200,7 +232,7 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
     /**
      * Composite class containing the GHG Map Display
      */
-    protected GhgMapComp ghgMapComponent;
+    protected GHGSpatialViewer ghgSpatialViewer;
 
     /**
      * Sash Form used to adjust the area a composite takes up.
@@ -210,7 +242,7 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
     private FilterDisplay filterDisplay;
 
     private Menu columnsMenu;
-    
+
     private MenuItem identifyTestMI;
 
     /**
@@ -252,23 +284,70 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
      * 
      * @param parent
      *            Parent Shell.
+     * @throws GhgMissingDataException
      */
-    public GhgMonitorDlg(Shell parent) {
+    public GhgMonitorDlg(Shell parent) throws GhgMissingDataException {
         super(parent, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.INDEPENDENT_SHELL
-                | CAVE.DO_NOT_BLOCK);
+                | CAVE.PERSPECTIVE_INDEPENDENT | CAVE.DO_NOT_BLOCK);
 
-        // Register as a listener to the display manager and VTECActiveTable
-        GhgDisplayManager.getInstance().addGhgMonitorFilterChangeListener(this);
+        CAVEMode opMode = CAVEMode.getMode();
+        activeTableName = (opMode == CAVEMode.PRACTICE) ? ActiveTableMode.PRACTICE
+                : ActiveTableMode.OPERATIONAL;
+
+        // connection to ifpServer
+        this.ifpClient = connectToIFPServer(LocalizationManager.getInstance()
+                .getSite());
+
+        /*
+         * Using DiscreteDefinition in place of access to VTECTable to get
+         * Hazard Description
+         */
+        ServerResponse<DiscreteDefinition> sr = this.ifpClient
+                .getDiscreteDefinition();
+        if (sr.isOkay()) {
+            this.discreteDef = sr.getPayload();
+        } else {
+            throw new GhgMissingDataException(String.format(
+                    "Unable to retrieve DiscreteDefinition: %s", sr.message()));
+        }
+
+        this.filterEngine = new GhgFilterEngine(my4WFO);
+
+        // setup for receiving notification messages from ifpServer
         NotificationManagerJob.addObserver("edex.alerts.vtec", this);
     }
 
+    private IFPClient connectToIFPServer(String site)
+            throws GhgMissingDataException {
+        IFPClient ifpClient = new IFPClient(VizApp.getWsId(), site);
+
+        ServerResponse<String> sr2 = ifpClient.getSiteID();
+        if (sr2.isOkay()) {
+            this.myWFO = sr2.getPayload();
+            this.my4WFO = SiteMap.getInstance().getSite4LetterId(this.myWFO);
+        } else {
+            throw new GhgMissingDataException(String.format(
+                    "Unable to retrieve site ID: %s", sr2.message()));
+        }
+
+        ServerResponse<GridLocation> sr3 = ifpClient.getDBGridLocation();
+        if (sr3.isOkay()) {
+            this.gridLocation = sr3.getPayload();
+        } else {
+            throw new GhgMissingDataException(String.format(
+                    "Unable to retrieve GridLocation: %s", sr3.message()));
+        }
+
+        return ifpClient;
+    }
+
     /**
      * Initialize the dialog's configuration
      */
     private void initializeConfiguration() {
         // Load the default configuration file.
         // If this fails, fall back to the hardcoded defaults.
-        GhgConfigData configuration = GhgConfigData.getInstance();
+        GhgConfigData configuration = GhgConfigData.buildInstance();
 
         try {
             // Try and read a saved config file
@@ -284,9 +363,11 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
     @Override
     protected void disposed() {
         // Remove the listener from the list
-        GhgDisplayManager.getInstance().removeGhgMonitorChangeListener(this);
-        GhgDisplayManager.getInstance().removeGhgMonitorZoneSelectionListener(
-                this);
+
+        ghgTableComp.removeSelectionListener(this);
+        ghgSpatialViewer.removeSelectionListener(this);
+        GhgConfigData.getInstance().removeFilterChangeListener(this);
+
         NotificationManagerJob.removeObserver("edex.alerts.vtec", this);
 
         if (timer != null) {
@@ -310,15 +391,11 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         // Read in config files
         initializeConfiguration();
 
-        String activeTableName = "active";
-        String practiceText = "";
-        DataManager dm = DataManager.getCurrentInstance();
-
-        CAVEMode mode = dm.getOpMode();
-        if (mode.equals(CAVEMode.PRACTICE)) {
-            activeTableName = "PRACTICE";
-            practiceText = "     [PRACTICE MODE]";
-        }
+        CAVEMode mode = CAVEMode.getMode();
+        String activeTableName = (!mode.equals(CAVEMode.PRACTICE)) ? "active"
+                : "PRACTICE";
+        String practiceText = (!mode.equals(CAVEMode.PRACTICE)) ? ""
+                : "     [PRACTICE MODE]";
 
         // Set up the title bar text
         String userId = System.getProperty("user.name");
@@ -592,147 +669,41 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         // -----------------------------------------------------
         // Create all the items in the Map dropdown menu
         // -----------------------------------------------------
+        for (String map : GHGSpatialViewer.knownMaps()) {
+            MenuItem item = new MenuItem(mapMenu, SWT.RADIO);
+            item.setData(map);
+            item.setText("Show " + map);
+            item.setSelection(DEFAULT_MAP.equals(map));
+            item.addSelectionListener(new SelectionAdapter() {
 
-        // Show Marine menu item
-        MenuItem showMarineMI = new MenuItem(mapMenu, SWT.RADIO);
-        showMarineMI.setText("Show Marine");
-        showMarineMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoneDisplay(
-                        GhgMenuConstants.ShowMap.SHOW_MARINE);
-                ghgMapComponent.updateZone();
-                clearSelections();
-            }
-        });
-
-        // Show FIPS menu item
-        MenuItem showFipsMI = new MenuItem(mapMenu, SWT.RADIO);
-        showFipsMI.setText("Show FIPS");
-        showFipsMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoneDisplay(
-                        GhgMenuConstants.ShowMap.SHOW_FIPS);
-                ghgMapComponent.updateZone();
-                clearSelections();
-            }
-        });
-
-        // Show Public menu item
-        MenuItem showPublicMI = new MenuItem(mapMenu, SWT.RADIO);
-        showPublicMI.setText("Show Public");
-        showPublicMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoneDisplay(
-                        GhgMenuConstants.ShowMap.SHOW_PUBLIC);
-                ghgMapComponent.updateZone();
-                clearSelections();
-            }
-        });
-        showPublicMI.setSelection(true);
-
-        // Show Fire Wx menu item
-        MenuItem showFireWxMI = new MenuItem(mapMenu, SWT.RADIO);
-        showFireWxMI.setText("Show FireWx");
-        showFireWxMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoneDisplay(
-                        GhgMenuConstants.ShowMap.SHOW_FIRE);
-                ghgMapComponent.updateZone();
-                clearSelections();
-            }
-        });
+                @Override
+                public void widgetSelected(SelectionEvent e) {
+                    MenuItem item = (MenuItem) e.widget;
+                    if (item.getSelection()) {
+                        showMap((String) item.getData());
+                    }
+                }
+            });
+        }
 
         // Menu Separator
         new MenuItem(mapMenu, SWT.SEPARATOR);
 
-        // No Zoom menu item
-        MenuItem noZoomMI = new MenuItem(mapMenu, SWT.RADIO);
-        noZoomMI.setText("No Zoom");
-        noZoomMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoomLevel(
-                        GhgMenuConstants.ZoomLevel.ZOOM_NO_ZOOM.getZoomLevel());
-                ghgMapComponent.updateZoom();
-            }
-        });
-        noZoomMI.setSelection(true);
-
-        // x2 Zoom menu item
-        MenuItem x2ZoomMI = new MenuItem(mapMenu, SWT.RADIO);
-        x2ZoomMI.setText("x2");
-        x2ZoomMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoomLevel(
-                        GhgMenuConstants.ZoomLevel.ZOOM_2.getZoomLevel());
-                ghgMapComponent.updateZoom();
-            }
-        });
-
-        // x4 Zoom menu item
-        MenuItem x4ZoomMI = new MenuItem(mapMenu, SWT.RADIO);
-        x4ZoomMI.setText("x4");
-        x4ZoomMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoomLevel(
-                        GhgMenuConstants.ZoomLevel.ZOOM_4.getZoomLevel());
-                ghgMapComponent.updateZoom();
-            }
-        });
-
-        // x6 Zoom menu item
-        MenuItem x6ZoomMI = new MenuItem(mapMenu, SWT.RADIO);
-        x6ZoomMI.setText("x6");
-        x6ZoomMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoomLevel(
-                        GhgMenuConstants.ZoomLevel.ZOOM_6.getZoomLevel());
-                ghgMapComponent.updateZoom();
-            }
-        });
-
-        // x8 Zoom menu item
-        MenuItem x8ZoomMI = new MenuItem(mapMenu, SWT.RADIO);
-        x8ZoomMI.setText("x8");
-        x8ZoomMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoomLevel(
-                        GhgMenuConstants.ZoomLevel.ZOOM_8.getZoomLevel());
-                ghgMapComponent.updateZoom();
-            }
-        });
-
-        // x12 Zoom menu item
-        MenuItem x12ZoomMI = new MenuItem(mapMenu, SWT.RADIO);
-        x12ZoomMI.setText("x12");
-        x12ZoomMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoomLevel(
-                        GhgMenuConstants.ZoomLevel.ZOOM_12.getZoomLevel());
-                ghgMapComponent.updateZoom();
-            }
-        });
-
-        // x16 Zoom menu item
-        MenuItem x16ZoomMI = new MenuItem(mapMenu, SWT.RADIO);
-        x16ZoomMI.setText("x16");
-        x16ZoomMI.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setZoomLevel(
-                        GhgMenuConstants.ZoomLevel.ZOOM_16.getZoomLevel());
-                ghgMapComponent.updateZoom();
-            }
-        });
+        for (ZoomLevel zoom : ZoomLevel.values()) {
+            MenuItem item = new MenuItem(mapMenu, SWT.RADIO);
+            item.setText(zoom.toString());
+            item.setData(zoom);
+            item.setSelection(DEFAULT_ZOOM.equals(zoom));
+            item.addSelectionListener(new SelectionAdapter() {
+                @Override
+                public void widgetSelected(SelectionEvent e) {
+                    MenuItem item = (MenuItem) e.widget;
+                    if (item.getSelection()) {
+                        zoomMap((ZoomLevel) item.getData());
+                    }
+                }
+            });
+        }
 
         // Menu Separator
         new MenuItem(mapMenu, SWT.SEPARATOR);
@@ -742,14 +713,22 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         showLabelsMI.setText("Show Labels");
         showLabelsMI.addSelectionListener(new SelectionAdapter() {
             @Override
-            public void widgetSelected(SelectionEvent event) {
-                GhgDisplayManager.getInstance().setShowLabels(
-                        showLabelsMI.getSelection());
-                ghgMapComponent.updateLabels();
+            public void widgetSelected(SelectionEvent e) {
+                MenuItem item = (MenuItem) e.widget;
+                ghgSpatialViewer.setLabelZones(item.getSelection());
             }
         });
     }
 
+    private void showMap(String mapName) {
+        ghgSpatialViewer.setMap(mapName);
+        clearSelections();
+    }
+
+    private void zoomMap(ZoomLevel zoom) {
+        ghgSpatialViewer.setZoomLevel(1.0 / zoom.getZoomLevel());
+    }
+
     /**
      * Create the Appearance menu.
      * 
@@ -794,7 +773,8 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         // Identify TEST Events menu item
         identifyTestMI = new MenuItem(appearanceMenu, SWT.CHECK);
         identifyTestMI.setText("Identify TEST Events");
-        identifyTestMI.setSelection(GhgConfigData.getInstance().isIdentifyTestEvents());
+        identifyTestMI.setSelection(GhgConfigData.getInstance()
+                .isIdentifyTestEvents());
         identifyTestMI.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
@@ -822,7 +802,7 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
             @Override
             public void widgetSelected(SelectionEvent event) {
                 showFilterDialog();
-                ghgMapComponent.refresh();
+                ghgSpatialViewer.refresh();
             }
         });
 
@@ -1035,6 +1015,10 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         createTextMapTabs();
         createDataTable();
         createStatusBar(shell);
+
+        ghgTableComp.addSelectionListener(this);
+        ghgSpatialViewer.addSelectionListener(this);
+        GhgConfigData.getInstance().addFilterChangeListener(this);
     }
 
     private void createStatusBar(Shell shell) {
@@ -1080,15 +1064,25 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
 
         TabItem textTab = new TabItem(tabFolder, SWT.NONE);
         textTab.setText("Text");
-        ghgTextComp = new GhgTextComp(tabFolder); // , controller);
+        ghgTextComp = new GhgTextComp(tabFolder);
         textTab.setControl(ghgTextComp);
 
         TabItem mapTab = new TabItem(tabFolder, SWT.NONE);
         mapTab.setText("Map");
-        ghgMapComponent = new GhgMapComp(tabFolder);
-        mapTab.setControl(ghgMapComponent);
-        GhgDisplayManager.getInstance()
-                .addGhgMonitorZoneSelectionListener(this);
+
+        Composite mapComp = new Composite(tabFolder, SWT.None);
+        gd = new GridData(SWT.FILL, SWT.FILL, true, true);
+        gl = new GridLayout(1, false);
+        gl.marginHeight = 0;
+        gl.marginWidth = 0;
+        mapComp.setLayout(gl);
+        mapComp.setLayoutData(gd);
+
+        ghgSpatialViewer = new GHGSpatialViewer(mapComp, myWFO, gridLocation,
+                null);
+        ghgSpatialViewer.setMap(DEFAULT_MAP);
+        ghgSpatialViewer.setZoomLevel(DEFAULT_ZOOM.getZoomLevel());
+        mapTab.setControl(mapComp);
 
         tabFolder.setSelection(1);
     }
@@ -1114,7 +1108,8 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
             GhgConfigData configuration = GhgConfigData.getInstance();
 
             filterDlg = new GhgFilterDlg(getShell(),
-                    configuration.getCurrentFilter());
+                    configuration.getCurrentFilter(), ifpClient, discreteDef,
+                    my4WFO);
             filterDlg.setCloseCallback(new ICloseCallback() {
 
                 @Override
@@ -1193,7 +1188,43 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
                         // Update the alert colors in the table
                         if (changeColor == true) {
                             ghgTableComp.updateDataColors();
-                            ghgMapComponent.updateMapColors();
+
+                            Set<String> mapZones = new HashSet<>();
+                            Set<String> monitorZones = new HashSet<>();
+                            for (GhgData data : GhgMonitorDlg.this.dataList) {
+                                switch (data.getSelection()) {
+                                case MapSelection:
+                                    mapZones.add(data.getGeoId());
+                                    break;
+                                case MonitorSelection:
+                                    monitorZones.add(data.getGeoId());
+                                    break;
+                                default:
+                                    break;
+
+                                }
+                            }
+
+                            if (!mapZones.isEmpty()) {
+                                ghgSpatialViewer.setHighlightedZones(
+                                        GhgConfigData.getInstance()
+                                                .getMapSelectionsColors()
+                                                .getBackgroundRgb(), mapZones
+                                                .toArray(new String[mapZones
+                                                        .size()]));
+                            }
+
+                            if (!monitorZones.isEmpty()) {
+                                ghgSpatialViewer
+                                        .setHighlightedZones(
+                                                GhgConfigData
+                                                        .getInstance()
+                                                        .getMonitorSelectionsColors()
+                                                        .getBackgroundRgb(),
+                                                monitorZones
+                                                        .toArray(new String[monitorZones
+                                                                .size()]));
+                            }
                         }
                     }
                     colorDlg = null;
@@ -1203,7 +1234,33 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         colorDlg.open();
     }
 
-    public void refresh(boolean getData) {
+    /**
+     * Gets the ActiveTable records and returns them as a List<GhgData>. The
+     * list is based on the configuration selections.
+     * 
+     * @return List<GhgData> list of GhgData objects
+     */
+    private List<GhgData> getTableData() {
+        ServerResponse<List<ActiveTableRecord>> sr = ifpClient
+                .getVTECActiveTable(activeTableName);
+        if (!sr.isOkay()) {
+            statusHandler.error(String.format("Error getting ActiveTable: %s",
+                    sr.message()));
+            return Collections.emptyList();
+        }
+
+        List<ActiveTableRecord> activeTableList = sr.getPayload();
+        dataList.clear();
+        for (ActiveTableRecord rec : activeTableList) {
+            GhgData data = new GhgData(rec, discreteDef.getHazardDescription(
+                    HAZARDS_PARM_NAME, rec.getPhensig()));
+            dataList.add(data);
+        }
+
+        return new ArrayList<GhgData>(dataList);
+    }
+
+    private void refresh(boolean getData) {
 
         if (refreshing) {
             return;
@@ -1211,14 +1268,16 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
 
         try {
             refreshing = true;
-            GhgDisplayManager dispMan = GhgDisplayManager.getInstance();
             List<GhgData> newList = new ArrayList<GhgData>();
 
             if (getData) {
-                newList = dispMan.getTableData();
-                // dataList.retainAll() replaces "retained" entries from
-                // newList,
-                // which messes up alert level flags, popping up extra banners.
+                newList = getTableData();
+                /*
+                 * dataList.retainAll() replaces "retained" entries from
+                 * newList, which messes up alert level flags, popping up extra
+                 * banners.
+                 */
+
                 // Remove dead entries from dataList.
                 Iterator<GhgData> dlit = dataList.iterator();
                 while (dlit.hasNext()) {
@@ -1249,12 +1308,7 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
             tableData = calculateMonitorData();
 
             // Check for alerts
-            try {
-                doAlerting(tableData);
-            } catch (GFEServerException e) {
-                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
-                        e);
-            }
+            doAlerting(tableData);
 
             filteredTable = doFiltering(tableData);
 
@@ -1293,13 +1347,12 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
      * 
      * @param dataList
      *            List<GhgData> list of data records
-     * @throws GFEServerException
      */
-    private void doAlerting(List<GhgData> dataList) throws GFEServerException {
+    private void doAlerting(List<GhgData> dataList) {
         GhgAlertsConfigData alertsConfig = GhgConfigData.getInstance()
                 .getAlerts();
         for (GhgData data : dataList) {
-            GhgAlertCheckData alertCheckData = GhgFilterEngine.alertCheck(data);
+            GhgAlertCheckData alertCheckData = filterEngine.alertCheck(data);
             AlertsEnum alertType = alertCheckData.getAlertType();
             GhgAlertData alertData = alertsConfig.getAlert(alertType);
             if (alertData.isBanner()) {
@@ -1388,7 +1441,7 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         List<GhgData> tableList = new ArrayList<GhgData>();
         for (GhgData gd : consolidatedList) {
             // Check if the data are filtered out
-            if (GhgFilterEngine.filterCheck(gd) == true) {
+            if (filterEngine.filterCheck(gd)) {
                 tableList.add(gd);
             }
         }
@@ -1403,12 +1456,8 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
      */
     private void addPhenSigDescription(List<GhgData> list) {
         for (GhgData rec : list) {
-            try {
-                rec.setHazard(GhgData.getHazardDescription(rec.getPhenSig()));
-            } catch (GFEServerException e) {
-                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
-                        e);
-            }
+            rec.setHazard(discreteDef.getHazardDescription(HAZARDS_PARM_NAME,
+                    rec.getPhenSig()));
         }
     }
 
@@ -1742,9 +1791,8 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         synchColumnsWithConfig();
         refresh(false);
         ghgTableComp.packColumns();
-        
-        identifyTestMI.setSelection(
-                configuration.isIdentifyTestEvents());
+
+        identifyTestMI.setSelection(configuration.isIdentifyTestEvents());
     }
 
     /**
@@ -1785,26 +1833,6 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         configuration.setDescending(sortDir == SWT.DOWN);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ghg.monitor.listener.GhgMonitorFilterChangeListener#
-     * notifyUpdate
-     * (com.raytheon.viz.ghg.monitor.event.GhgMonitorFilterChangeEvent)
-     */
-    @Override
-    public void notifyUpdate(GhgMonitorFilterChangeEvent evt) {
-        boolean filterChanged = evt.isFilterChanged();
-        boolean refreshData = false;
-        if (filterChanged == true) {
-            filterDisplay.updateFilter(GhgConfigData.CUSTOM_FILTER_NAME);
-            refreshData = true;
-        }
-
-        refresh(refreshData);
-    }
-
     private void calcStatusImportanceMap() {
         statusImportanceMap = new HashMap<Importance, MessageImportance>();
         GhgConfigData config = GhgConfigData.getInstance();
@@ -1868,9 +1896,9 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
                 .setImportanceDict(statusImportanceMap);
     }
 
-    private void sendAlert(GhgAlertCheckData alertData, GhgData rec)
-            throws GFEServerException {
-        String headline = GhgData.getHazardDescription(rec.getPhenSig());
+    private void sendAlert(GhgAlertCheckData alertData, GhgData rec) {
+        String headline = discreteDef.getHazardDescription(HAZARDS_PARM_NAME,
+                rec.getPhenSig());
         String action = rec.getAction();
         String[] cancelExpire = new String[] { "CAN", "EXP" };
         StringBuilder buffer = new StringBuilder();
@@ -1929,7 +1957,7 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
 
             // Within 30 minutes of purge/end time?
             boolean within30 = false;
-            if (later > -30 * 60) {
+            if (later > (-30 * 60)) {
                 within30 = true;
             }
 
@@ -1971,17 +1999,14 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
             needRefresh = true;
         } else {
             for (VTECChange change : msg.getChanges()) {
-                if (filter.wfos == null
-                        || filter.wfos.length == 0
-                        || Arrays.binarySearch(filter.wfos, change.getSite()) >= 0) {
-                    if (filter.phenSigs == null
-                            || filter.phenSigs.length == 0
-                            || Arrays.binarySearch(filter.phenSigs,
-                                    change.getPhensig()) >= 0) {
-                        if (filter.pils == null
-                                || filter.pils.length == 0
-                                || Arrays.binarySearch(filter.pils,
-                                        change.getPil()) >= 0) {
+                if (ArrayUtils.isEmpty(filter.wfos)
+                        || (Arrays.binarySearch(filter.wfos, change.getSite()) >= 0)) {
+                    if (ArrayUtils.isEmpty(filter.phenSigs)
+                            || (Arrays.binarySearch(filter.phenSigs,
+                                    change.getPhensig()) >= 0)) {
+                        if (ArrayUtils.isEmpty(filter.pils)
+                                || (Arrays.binarySearch(filter.pils,
+                                        change.getPil()) >= 0)) {
                             needRefresh = true;
                             break;
                         }
@@ -1994,13 +2019,6 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.uf.common.jms.notification.INotificationObserver#
-     * notificationArrived
-     * (com.raytheon.uf.common.jms.notification.NotificationMessage[])
-     */
     @Override
     public void notificationArrived(NotificationMessage[] messages) {
         statusHandler.handle(Priority.VERBOSE, "Received " + messages.length
@@ -2034,17 +2052,15 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
      */
     private void clearSelections() {
         // Clear map selections
-        GhgDisplayManager dMan = GhgDisplayManager.getInstance();
-        GhgMonitorTableSelectionEvent evt = new GhgMonitorTableSelectionEvent(
-                this);
-        evt.setHighlightedZones(new String[0]);
-        dMan.fireTableSelectionEvent(evt);
+        List<String> highlightedZones = Collections.emptyList();
+        GhgMonitorTableSelectionEvent tableEvent = new GhgMonitorTableSelectionEvent();
+        tableEvent.setHighlightedZones(highlightedZones);
+        notifyUpdate(tableEvent);
 
         // Clear spreadsheet selections
-        GhgMonitorZoneSelectionEvent evt2 = new GhgMonitorZoneSelectionEvent(
-                this);
-        evt2.setHighlightedZones(new String[0]);
-        dMan.fireMapChangeEvent(evt2);
+        GhgMonitorZoneSelectionEvent zoneEvent = new GhgMonitorZoneSelectionEvent();
+        zoneEvent.setHighlightedZones(highlightedZones);
+        notifyUpdate(zoneEvent);
     }
 
     /*
@@ -2079,12 +2095,7 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
                     @Override
                     public void run() {
                         // Check for alerts
-                        try {
-                            doAlerting(tableData);
-                        } catch (GFEServerException e) {
-                            statusHandler.handle(Priority.PROBLEM,
-                                    e.getLocalizedMessage(), e);
-                        }
+                        doAlerting(tableData);
 
                         // Records can be added to or removed from the display
                         // as they age.
@@ -2121,34 +2132,50 @@ public class GhgMonitorDlg extends CaveSWTDialog implements
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ghg.monitor.listener.GhgMonitorZoneSelectionListener
-     * #notifyUpdate
-     * (com.raytheon.viz.ghg.monitor.event.GhgMonitorZoneSelectionEvent)
-     */
     @Override
-    public void notifyUpdate(GhgMonitorZoneSelectionEvent evt) {
-        String[] highlightedZones = evt.getHighlightedZones();
-        // Be polite. Other handlers get the event, too. Sort a copy.
-        String[] sortHlZones = Arrays.copyOf(highlightedZones,
-                highlightedZones.length);
-        Arrays.sort(sortHlZones);
-        for (GhgData data : dataList) {
-            if (Arrays.binarySearch(sortHlZones, data.getGeoId()) >= 0) {
-                data.setSelection(SelectionEnum.MapSelection);
-            } else if (SelectionEnum.MapSelection == data.getSelection()
-                    || highlightedZones.length > 0) {
-                // We may(?) get a zero-length map selection in response to
-                // selecting table records. In that case, we need to clear the
-                // map selections without interfering with the table (aka
-                // monitor) selection. However, if map zones are really being
-                // selected, then the table selection should be cleared, too.
-                data.setSelection(SelectionEnum.NoSelection);
+    public void notifyUpdate(AbstractGhgMonitorEvent event) {
+        if (event instanceof GhgMonitorTableSelectionEvent) {
+            GhgMonitorTableSelectionEvent tableEvent = (GhgMonitorTableSelectionEvent) event;
+            ghgTextComp.update(tableEvent.getGhgData());
+
+            Collection<String> highlightedZones = tableEvent
+                    .getHighlightedZones();
+            ghgSpatialViewer.setHighlightedZones(
+                    tableEvent.getSelectionColor(), highlightedZones
+                            .toArray(new String[highlightedZones.size()]));
+
+        } else if (event instanceof GhgMonitorZoneSelectionEvent) {
+            GhgMonitorZoneSelectionEvent zoneEvent = (GhgMonitorZoneSelectionEvent) event;
+            Collection<String> highlightedZones = zoneEvent
+                    .getHighlightedZones();
+            for (GhgData data : dataList) {
+                if (highlightedZones.contains(data.getGeoId())) {
+                    data.setSelection(SelectionEnum.MapSelection);
+                } else if (SelectionEnum.MapSelection.equals(data
+                        .getSelection()) || (highlightedZones.size() > 0)) {
+                    /*
+                     * We may(?) get a zero-length map selection in response to
+                     * selecting table records. In that case, we need to clear
+                     * the map selections without interfering with the table
+                     * (aka monitor) selection. However, if map zones are really
+                     * being selected, then the table selection should be
+                     * cleared, too.
+                     */
+                    data.setSelection(SelectionEnum.NoSelection);
+                }
             }
+            refresh(false);
+
+            ghgTableComp.update(highlightedZones);
+
+        } else if (event instanceof GhgMonitorFilterChangeEvent) {
+            filterDisplay.updateFilter(GhgConfigData.CUSTOM_FILTER_NAME);
+            refresh(true);
+
+        } else {
+            statusHandler.error("Received unexpected notification of type "
+                    + event.getClass().getName());
         }
-        refresh(false);
+
     }
 }
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgTableComp.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgTableComp.java
index 2a4ea5f0d0..7f7c2d4cdd 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgTableComp.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgTableComp.java
@@ -20,6 +20,8 @@
 package com.raytheon.viz.ghg.monitor;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -53,9 +55,8 @@ import com.raytheon.viz.ghg.monitor.data.GhgConfigData.DataEnum;
 import com.raytheon.viz.ghg.monitor.data.GhgConfigData.SelectionEnum;
 import com.raytheon.viz.ghg.monitor.data.GhgData;
 import com.raytheon.viz.ghg.monitor.data.GhgTableRowData;
+import com.raytheon.viz.ghg.monitor.event.AbstractGhgMonitorEvent.GhgEventListener;
 import com.raytheon.viz.ghg.monitor.event.GhgMonitorTableSelectionEvent;
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorZoneSelectionEvent;
-import com.raytheon.viz.ghg.monitor.listener.GhgMonitorZoneSelectionListener;
 
 /**
  * This class contains the GHG table and handle all of the table interactions.
@@ -68,6 +69,8 @@ import com.raytheon.viz.ghg.monitor.listener.GhgMonitorZoneSelectionListener;
  * 19Jun2008    1157       MW Fegan    Added banner popup for alerts.
  * 27Mar2009    1881       wldougher   Enhance performance
  * 27Aug2013    2301       dgilling    Fix Image loading for icons.
+ * Dec 16, 2015 5184       dgilling    Remove viz.gfe dependencies.
+ * Feb 05, 2016 #5316      randerso    Moved notification registration into GHGMonitorDlg
  * 
  * </pre>
  * 
@@ -75,8 +78,8 @@ import com.raytheon.viz.ghg.monitor.listener.GhgMonitorZoneSelectionListener;
  * @version 1.0
  * 
  */
-public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
-        GhgMonitorZoneSelectionListener {
+public class GhgTableComp extends Composite implements IGhgSelectedTableColumn {
+
     /**
      * Font used for editors.
      */
@@ -133,6 +136,11 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
      */
     private TableColumn lastSelectedColumn;
 
+    /**
+     * Table selection listener list
+     */
+    private List<GhgEventListener> tableSelectionListenerList = new ArrayList<>();
+
     /**
      * Constructor.
      * 
@@ -141,12 +149,11 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
      * @param columnsMap
      *            Map of the visible/hidden table columns.
      */
-    public GhgTableComp(Composite parent, Map<String, Boolean> columnsMap) {
+    public GhgTableComp(Composite parent, /* GhgDisplayManager displayMgr, */
+            Map<String, Boolean> columnsMap) {
         super(parent, SWT.NONE);
 
         this.columnsMap = columnsMap;
-        GhgDisplayManager.getInstance()
-                .addGhgMonitorZoneSelectionListener(this);
 
         init();
     }
@@ -195,8 +202,6 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
         upImage.dispose();
         downImage.dispose();
         ghgTable.dispose();
-        GhgDisplayManager.getInstance().removeGhgMonitorZoneSelectionListener(
-                this);
 
         for (GhgTableRowData row : ghgTableRowArray) {
             if (row != null) {
@@ -573,9 +578,8 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
                 String geoIds = row.getGhgData().getGeoId();
                 String[] geoIdArray = geoIds.split(",");
 
-                GhgMonitorTableSelectionEvent evt = new GhgMonitorTableSelectionEvent(
-                        this);
-                evt.setHighlightedZones(geoIdArray);
+                GhgMonitorTableSelectionEvent evt = new GhgMonitorTableSelectionEvent();
+                evt.setHighlightedZones(Arrays.asList(geoIdArray));
                 List<GhgData> dataList = new ArrayList<GhgData>(1);
                 GhgData rowData = row.getGhgData();
                 rowData.setSelection(SelectionEnum.MonitorSelection);
@@ -583,7 +587,7 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
                 evt.setGhgData(dataList);
                 evt.setSelectionColor(GhgConfigData.getInstance()
                         .getMonitorSelectionsColors().getBackgroundRgb());
-                GhgDisplayManager.getInstance().fireTableSelectionEvent(evt);
+                fireTableSelectionEvent(evt);
             } else {
                 row.setSelected(false);
             }
@@ -593,7 +597,7 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
         packColumns();
     }
 
-    private void setSelection(String[] highlightedZones) {
+    private void setSelection(Collection<String> highlightedZones) {
         ghgTable.deselectAll();
         Set<String> idSet = new HashSet<String>();
         List<GhgData> dataList = new ArrayList<GhgData>();
@@ -635,36 +639,18 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
 
             dataList.add(row.getGhgData());
         }
-        Iterator<String> iter = idSet.iterator();
-        String[] zones = new String[idSet.size()];
-        int index = 0;
-        while (iter.hasNext()) {
-            zones[index] = iter.next();
-            index++;
-        }
 
         // build the event object
-        GhgMonitorTableSelectionEvent evt = new GhgMonitorTableSelectionEvent(
-                this);
-        evt.setHighlightedZones(zones);
+        GhgMonitorTableSelectionEvent evt = new GhgMonitorTableSelectionEvent();
+        evt.setHighlightedZones(idSet);
         evt.setGhgData(dataList);
         evt.setSelectionColor(GhgConfigData.getInstance()
-                .getMonitorSelectionsColors().getBackgroundRgb());
-        GhgDisplayManager.getInstance().fireTableSelectionEvent(evt);
+                .getMapSelectionsColors().getBackgroundRgb());
 
+        fireTableSelectionEvent(evt);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ghg.monitor.listener.GhgMonitorZoneSelectionListener
-     * #notifyUpdate
-     * (com.raytheon.viz.ghg.monitor.event.GhgMonitorZoneSelectionEvent)
-     */
-    @Override
-    public void notifyUpdate(GhgMonitorZoneSelectionEvent evt) {
-        String[] highlightedZones = evt.getHighlightedZones();
+    public void update(Collection<String> highlightedZones) {
         setSelection(highlightedZones);
     }
 
@@ -676,8 +662,7 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
      */
     public void setHighlight() {
 
-        GhgMonitorTableSelectionEvent evt = new GhgMonitorTableSelectionEvent(
-                this);
+        GhgMonitorTableSelectionEvent evt = new GhgMonitorTableSelectionEvent();
         List<GhgData> dataList = new ArrayList<GhgData>(1);
         StringBuilder geoIdBuffer = new StringBuilder();
         String sep = "";
@@ -707,9 +692,9 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
             // update the map to highlight this selection
             String geoIds = geoIdBuffer.toString();
             String[] geoIdArray = geoIds.split(",");
-            evt.setHighlightedZones(geoIdArray);
+            evt.setHighlightedZones(Arrays.asList(geoIdArray));
             evt.setGhgData(dataList);
-            GhgDisplayManager.getInstance().fireTableSelectionEvent(evt);
+            fireTableSelectionEvent(evt);
         }
 
         sortTableData(lastSelectedColumn);
@@ -733,4 +718,36 @@ public class GhgTableComp extends Composite implements IGhgSelectedTableColumn,
         return selectionData;
     }
 
+    /**
+     * Add a listener to the list.
+     * 
+     * @param listener
+     */
+    public void addSelectionListener(GhgEventListener listener) {
+        if (!tableSelectionListenerList.contains(listener)) {
+            tableSelectionListenerList.add(listener);
+        }
+    }
+
+    /**
+     * Remove a listener from the list.
+     * 
+     * @param listener
+     */
+    public void removeSelectionListener(GhgEventListener listener) {
+        tableSelectionListenerList.remove(listener);
+    }
+
+    /**
+     * Fire the table change event.
+     * 
+     * @param evt
+     *            The GhgMonitorTableSelectionEvent object
+     */
+    private void fireTableSelectionEvent(GhgMonitorTableSelectionEvent evt) {
+        for (GhgEventListener listener : tableSelectionListenerList) {
+            listener.notifyUpdate(evt);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgTextComp.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgTextComp.java
index 68dff4f93e..9c9fe7b785 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgTextComp.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/GhgTextComp.java
@@ -20,6 +20,7 @@
 package com.raytheon.viz.ghg.monitor;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.SortedSet;
@@ -37,10 +38,8 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
-import com.raytheon.viz.ghg.monitor.data.GhgData;
 import com.raytheon.viz.ghg.monitor.data.GhgConfigData.DataEnum;
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorTableSelectionEvent;
-import com.raytheon.viz.ghg.monitor.listener.GhgMonitorTableSelectionListener;
+import com.raytheon.viz.ghg.monitor.data.GhgData;
 
 /**
  * This class displays the GHG text component.
@@ -50,6 +49,8 @@ import com.raytheon.viz.ghg.monitor.listener.GhgMonitorTableSelectionListener;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 25 MAR 2008  N/A        lvenable    Initial creation
+ * Dec 16, 2015 #5184      dgilling    Remove viz.gfe dependencies.
+ * Feb 05, 2016 #5316      randerso    Moved notification registration into GHGMonitorDlg
  * 
  * </pre>
  * 
@@ -57,7 +58,7 @@ import com.raytheon.viz.ghg.monitor.listener.GhgMonitorTableSelectionListener;
  * @version 1.0
  * 
  */
-public class GhgTextComp extends Composite implements GhgMonitorTableSelectionListener {
+public class GhgTextComp extends Composite {
     private static final int PIL_INDEX = DataEnum.PIL.ordinal();
 
     private static final int ISSUE_INDEX = DataEnum.ISSUE_TIME.ordinal();
@@ -86,11 +87,11 @@ public class GhgTextComp extends Composite implements GhgMonitorTableSelectionLi
      * Editor background color in header sections
      */
     private Color headerColor;
-    
+
     /**
      * List of GhgData objects
      */
-    private List<GhgData> dataList;
+    private Collection<GhgData> dataList;
 
     /**
      * Constructor.
@@ -102,7 +103,6 @@ public class GhgTextComp extends Composite implements GhgMonitorTableSelectionLi
         super(parent, SWT.NONE);
 
         this.parent = parent;
-        GhgDisplayManager.getInstance().addGhgMonitorTableSelectionListener(this);
 
         init();
     }
@@ -127,14 +127,14 @@ public class GhgTextComp extends Composite implements GhgMonitorTableSelectionLi
         this.pack();
 
         addDisposeListener(new DisposeListener() {
+            @Override
             public void widgetDisposed(DisposeEvent arg0) {
                 disposeItems();
             }
         });
     }
-    
+
     private void disposeItems() {
-        GhgDisplayManager.getInstance().removeGhgMonitorTableSelectionListener(this);
         editorFont.dispose();
         editorColor.dispose();
         headerColor.dispose();
@@ -175,11 +175,11 @@ public class GhgTextComp extends Composite implements GhgMonitorTableSelectionLi
      */
     public void refresh() {
         styledText.setText("");
-        
+
         if (dataList != null) {
             // combine text where adjacent records are compatible
             List<GhgData> combined = new ArrayList<GhgData>(dataList);
-    
+
             for (GhgData data : combined) {
                 showGhgText(data);
             }
@@ -203,24 +203,25 @@ public class GhgTextComp extends Composite implements GhgMonitorTableSelectionLi
             styledText.setStyleRange(range);
             styledText.append(overviewText);
             styledText.append("\n");
-            
+
         }
-        
+
         // Segment text
         int start = styledText.getCharCount();
         int startLine = styledText.getLineCount() - 1;
         String segHdr = String.format(
-                  "Segment Text:   Pil: %s    IssueTime: %s\n",
-                  dataCellNames[PIL_INDEX], dataCellNames[ISSUE_INDEX]);
+                "Segment Text:   Pil: %s    IssueTime: %s\n",
+                dataCellNames[PIL_INDEX], dataCellNames[ISSUE_INDEX]);
         styledText.append(segHdr);
-        
+
         styledText.append("[");
         String sep = "";
 
         // Get a sorted list of geoIds
-        SortedSet<String> sortedSet= new TreeSet<String>(data.getSegmentTextMap().keySet());
+        SortedSet<String> sortedSet = new TreeSet<String>(data
+                .getSegmentTextMap().keySet());
         String geoId = null;
-        
+
         Iterator<String> iter = sortedSet.iterator();
         while (iter.hasNext()) {
             geoId = iter.next();
@@ -231,23 +232,18 @@ public class GhgTextComp extends Composite implements GhgMonitorTableSelectionLi
         int lineLen = styledText.getLineCount() - startLine - 1;
         int len = styledText.getCharCount() - start;
         styledText.setLineBackground(startLine, lineLen, headerColor);
-        StyleRange range = new StyleRange(start, len, editorColor,
-                headerColor);
+        StyleRange range = new StyleRange(start, len, editorColor, headerColor);
         styledText.setStyleRange(range);
-        
+
         String segText = data.getSegmentText(geoId);
         if (segText != null) {
             styledText.append(segText);
         }
-        styledText.append("\n");        
+        styledText.append("\n");
     }
 
-    /* (non-Javadoc)
-     * @see com.raytheon.viz.ghg.monitor.listener.GhgMonitorTableSelectionListener#notifyUpdate(com.raytheon.viz.ghg.monitor.event.GhgMonitorTableSelectionEvent)
-     */
-    @Override
-    public void notifyUpdate(GhgMonitorTableSelectionEvent evt) {
-        dataList = evt.getGhgData();
+    public void update(Collection<GhgData> data) {
+        dataList = data;
         refresh();
     }
 }
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/constants/GhgMenuConstants.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/constants/GhgMenuConstants.java
deleted file mode 100644
index b1d3d2aff1..0000000000
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/constants/GhgMenuConstants.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.ghg.monitor.constants;
-
-
-/**
- * Contains constant values that describe the various menu actions.
- * <pre>
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 30May2008    1157       MW Fegan    Initial Creation
- * 
- * </pre>
- *
- * @author mfegan
- * @version 1.0 
- */
-
-public class GhgMenuConstants {
-    /**
-     * Constructor.
-     */
-    public GhgMenuConstants() {
-        // intentionally empty.
-    }
-    /**
-     * Enumeration defining the segments of the map menu.
-     */
-    public enum MapMenuActions {
-        SHOW_MAP,
-        ZOOM_MAP,
-        SHOW_LABELS;
-    }
-    /**
-     * Enumeration defining the available zoom level.
-     */
-    public enum ZoomLevel {
-        ZOOM_NO_ZOOM(1),
-        ZOOM_2(2),
-        ZOOM_4(4),
-        ZOOM_6(6),
-        ZOOM_8(8),
-        ZOOM_12(12),
-        ZOOM_16(16);
-        private int level;
-        
-        private ZoomLevel(int level) {
-            this.level = level;
-        }
-        
-        public int getZoomLevel() {
-            return level;
-        }
-    }
-    /**
-     * Enumeration defining the available maps.
-     */
-    public enum ShowMap {
-        SHOW_FIPS("counties/counties.shp"),
-        SHOW_PUBLIC("zones/zones.shp"),
-        SHOW_FIRE("FireWx"),
-        SHOW_MARINE("Marine");
-        
-        private String map;
-        
-        private ShowMap(String map) {
-            this.map = map;
-        }
-        
-        public String getMap() {
-            return map;
-        }
-    }
-}
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgColorData.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgColorData.java
index 53b1b5aaca..fa7ac919a5 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgColorData.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgColorData.java
@@ -7,6 +7,8 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 import org.eclipse.swt.graphics.RGB;
 
+import com.raytheon.uf.viz.core.RGBColors;
+
 /**
  * This class containing RGB foreground and background colors.
  * 
@@ -14,7 +16,9 @@ import org.eclipse.swt.graphics.RGB;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 25 MAR 2008  1033       lvenable    Initial creation
+ * Mar 25, 2008 1033       lvenable    Initial creation
+ * Feb 05, 2016 5316       randerso    Changed to use RGBColors to allow use of 
+ *                                     color names not just hex representations
  * 
  * </pre>
  * 
@@ -96,27 +100,19 @@ public class GhgColorData {
 
     @XmlAttribute
     public String getForegroundRgbAsString() {
-        String result = String.format("#%02x%02x%02x", foregroundRgb.red,
-                foregroundRgb.green, foregroundRgb.blue);
-        return result;
+        return RGBColors.getColorName(foregroundRgb);
     }
 
-    public void setForegroundRgbAsString(String stringRep) {
-        foregroundRgb.red = Integer.parseInt(stringRep.substring(1, 3), 16);
-        foregroundRgb.green = Integer.parseInt(stringRep.substring(3, 5), 16);
-        foregroundRgb.blue = Integer.parseInt(stringRep.substring(5), 16);
+    public void setForegroundRgbAsString(String colorName) {
+        foregroundRgb = RGBColors.getRGBColor(colorName);
     }
 
     @XmlAttribute
     public String getBackgroundRgbAsString() {
-        String result = String.format("#%02x%02x%02x", backgroundRgb.red,
-                backgroundRgb.green, backgroundRgb.blue);
-        return result;
+        return RGBColors.getColorName(backgroundRgb);
     }
 
-    public void setBackgroundRgbAsString(String stringRep) {
-        backgroundRgb.red = Integer.parseInt(stringRep.substring(1, 3), 16);
-        backgroundRgb.green = Integer.parseInt(stringRep.substring(3, 5), 16);
-        backgroundRgb.blue = Integer.parseInt(stringRep.substring(5), 16);
+    public void setBackgroundRgbAsString(String colorName) {
+        backgroundRgb = RGBColors.getRGBColor(colorName);
     }
 }
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgConfigData.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgConfigData.java
index 97102abcf5..90f7e16848 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgConfigData.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgConfigData.java
@@ -20,6 +20,7 @@
 package com.raytheon.viz.ghg.monitor.data;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -31,7 +32,6 @@ import java.util.Set;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
 import jep.JepException;
@@ -44,25 +44,29 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Listener;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.python.PyUtil;
 import com.raytheon.uf.common.python.PythonScript;
+import com.raytheon.uf.common.serialization.SerializationException;
+import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
 import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.util.StringUtil;
 import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.viz.gfe.constants.StatusConstants;
-import com.raytheon.viz.gfe.core.DataManager;
-import com.raytheon.viz.ghg.monitor.GhgDisplayManager;
+import com.raytheon.uf.viz.core.localization.LocalizationManager;
+import com.raytheon.viz.ghg.constants.StatusConstants;
 import com.raytheon.viz.ghg.monitor.config.GhgConfigXml;
+import com.raytheon.viz.ghg.monitor.event.AbstractGhgMonitorEvent.GhgEventListener;
+import com.raytheon.viz.ghg.monitor.event.GhgMonitorFilterChangeEvent;
 import com.raytheon.viz.ui.statusline.StatusMessage;
 import com.raytheon.viz.ui.statusline.StatusStore;
 
@@ -84,7 +88,11 @@ import com.raytheon.viz.ui.statusline.StatusStore;
  * 28Nov2012    1353       rferrel     Sort the list of filter names for dialog display.
  * 10Apr2014    15769      ryu         Modified default config and GUI items to match A1.
  *                                     Default config changed to hard coding instead of reading
- *                                     from config file. 
+ *                                     from config file.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Dec 16, 2015 5184       dgilling    Remove viz.gfe dependencies.
+ * Feb 05, 2016 5316       randerso    Moved notification of filter change into this class
+ * Feb 05, 2016 #5242      dgilling    Remove calls to deprecated Localization APIs.
  * </pre>
  * 
  * @author lvenable
@@ -106,8 +114,8 @@ public final class GhgConfigData {
     /**
      * The VTEC Action Names
      */
-    public static final String[] vtecActionNames = { "CAN", "CON", 
-            "EXA", "EXB", "EXP", "EXT", "NEW", "UPG"};
+    public static final String[] vtecActionNames = { "CAN", "CON", "EXA",
+            "EXB", "EXP", "EXT", "NEW", "UPG" };
 
     /**
      * The VTEC Afos Product (PIL) Names
@@ -203,6 +211,11 @@ public final class GhgConfigData {
 
     private boolean identifyTestEvents;
 
+    /**
+     * Filter change listener list
+     */
+    private List<GhgEventListener> filterChangeListenerList = new ArrayList<>();
+
     /**
      * Alerts enumeration. Contains the available alerts. {@code display}
      * attribute contains the text to display in the Alert Dialog.
@@ -340,6 +353,7 @@ public final class GhgConfigData {
                 // Fonts are system resources. We have to dispose of them
                 // properly.
                 display.addListener(SWT.Dispose, new Listener() {
+                    @Override
                     public void handleEvent(Event e) {
                         Font font = fontMap.get(e.display);
                         font.dispose();
@@ -362,17 +376,21 @@ public final class GhgConfigData {
 
     /**
      * Private constructor.
+     * 
+     * @param displayMgr
      */
     private GhgConfigData() {
         init();
     }
 
     /**
-     * Get an instance of the GHG configuration data.
+     * Constructs an instance of the GHG configuration data. Used to build the
+     * initial instance and should only ever be called from the top-level GHG
+     * Monitor dialog.
      * 
      * @return An instance of the GHG configuration data.
      */
-    public static synchronized GhgConfigData getInstance() {
+    public static synchronized GhgConfigData buildInstance() {
         // If the GHG configuration data has not been created
         // then create a new instance.
         if (classInstance == null) {
@@ -382,16 +400,27 @@ public final class GhgConfigData {
         return classInstance;
     }
 
+    /**
+     * Returns the instance of the GHG configuration data. Should be used to
+     * retrieve the config data instance by all other parts of the GHG Monitor
+     * code.
+     * 
+     * @return An instance of the GHG configuration data.
+     */
+    public static synchronized GhgConfigData getInstance() {
+        return classInstance;
+    }
+
     /**
      * Initialize the configuration data.
      */
     private void init() {
         loadDefault();
-        
+
         defaultFilter = currentFilter.clone();
         defaultAlerts = currentAlerts.clone();
         defaultColumns = new ArrayList<DataEnum>(visibleColumns);
-        
+
         // Get the VTECTable
         initializePython();
     }
@@ -600,7 +629,8 @@ public final class GhgConfigData {
      */
     public void setCurrentFilter(GhgDataFilter filter) {
         currentFilter = filter;
-        GhgDisplayManager.getInstance().setFilterChanged(true);
+        GhgMonitorFilterChangeEvent evt = new GhgMonitorFilterChangeEvent();
+        fireFilterChangeEvent(evt);
     }
 
     /**
@@ -757,24 +787,19 @@ public final class GhgConfigData {
         IPathManager pathMgr = PathManagerFactory.getPathManager();
         LocalizationContext locCtx = pathMgr.getContext(
                 LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
-        LocalizationFile localizationFile = pathMgr.getLocalizationFile(locCtx,
-                CONFIG_PATH);
-        File configFile = localizationFile.getFile();
+        ILocalizationFile localizationFile = pathMgr.getLocalizationFile(
+                locCtx, CONFIG_PATH);
 
-        try {
-            JAXBContext ctx = JAXBContext.newInstance(GhgConfigXml.class);
-            Marshaller marshaller = ctx.createMarshaller();
-            marshaller.marshal(config, configFile);
-            localizationFile.save();
-            StatusStore.updateStatus(StatusConstants.SUBCATEGORY_GHG,
+        try (SaveableOutputStream outStream = localizationFile
+                .openOutputStream()) {
+            SingleTypeJAXBManager<GhgConfigXml> jaxb = SingleTypeJAXBManager
+                    .createWithoutException(GhgConfigXml.class);
+            jaxb.marshalToStream(config, outStream);
+            outStream.save();
+            StatusStore.updateStatus(StatusConstants.CATEGORY_GHG,
                     "Saved configuration", StatusMessage.Importance.REGULAR);
-
-        } catch (JAXBException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error saving GHG Monitor configuration", e);
-        } catch (LocalizationOpFailedException e) {
-            statusHandler.handle(Priority.PROBLEM,
-                    "Error saving GHG Monitor configuration", e);
+        } catch (IOException | LocalizationException | SerializationException e) {
+            statusHandler.error("Error saving GHG Monitor configuration", e);
         }
     }
 
@@ -798,20 +823,17 @@ public final class GhgConfigData {
         GhgAlertsConfigData alerts = new GhgAlertsConfigData();
         alerts.setLocal(true);
         alerts.setTest(true);
-        alerts.addAlert(new GhgAlertData(true, true, 30,
-                AlertsEnum.AlertLvl1));
-        alerts.addAlert(new GhgAlertData(true, true, 10,
-                AlertsEnum.AlertLvl2));
-        alerts.addAlert(new GhgAlertData(true, true, 0,
-                AlertsEnum.ExpiredAlert));
-        alerts.setActions(new String[] { "NEW", "CON", "COR", "EXT",
-                "EXA", "EXB" });
+        alerts.addAlert(new GhgAlertData(true, true, 30, AlertsEnum.AlertLvl1));
+        alerts.addAlert(new GhgAlertData(true, true, 10, AlertsEnum.AlertLvl2));
+        alerts.addAlert(new GhgAlertData(true, true, 0, AlertsEnum.ExpiredAlert));
+        alerts.setActions(new String[] { "NEW", "CON", "COR", "EXT", "EXA",
+                "EXB" });
         alerts.setPhenSigs(new String[] {});
         alerts.setPils(new String[] {});
         currentAlerts = alerts;
 
         final String siteId = SiteMap.getInstance().getSite4LetterId(
-                DataManager.getCurrentInstance().getSiteID());
+                LocalizationManager.getInstance().getSite());
 
         /* generate some hardcoded default filter data */
         currentFilter = new GhgDataFilter() {
@@ -844,16 +866,16 @@ public final class GhgConfigData {
         visibleColumns = new ArrayList<DataEnum>(DataEnum.values().length);
         // The initial columns visible. These need to match the ones set up by
         // GhgMonitorDlg.
-        visibleColumns.addAll(Arrays.asList(DataEnum.ACTION, DataEnum.ETN,
-                DataEnum.PHEN_SIG, DataEnum.START, DataEnum.END,
-                DataEnum.PURGE, DataEnum.ISSUE_TIME, DataEnum.PIL,
-                DataEnum.WFO));
+        visibleColumns.addAll(Arrays
+                .asList(DataEnum.ACTION, DataEnum.ETN, DataEnum.PHEN_SIG,
+                        DataEnum.START, DataEnum.END, DataEnum.PURGE,
+                        DataEnum.ISSUE_TIME, DataEnum.PIL, DataEnum.WFO));
         sortColumn = DataEnum.PURGE;
-        
+
         descending = false;
         identifyTestEvents = true;
-        
-        //loadFrom(DEFAULT_PATH, true);
+
+        // loadFrom(DEFAULT_PATH, true);
     }
 
     public void load(boolean reportMissing) {
@@ -1044,4 +1066,37 @@ public final class GhgConfigData {
             }
         }
     }
+
+    /**
+     * Add a listener to the list.
+     * 
+     * @param listener
+     */
+    public void addFilterChangeListener(GhgEventListener listener) {
+        filterChangeListenerList.add(listener);
+    }
+
+    /**
+     * Remove a listener from the list.
+     * 
+     * @param listener
+     */
+    public void removeFilterChangeListener(GhgEventListener listener) {
+        if (filterChangeListenerList.contains(listener)) {
+            filterChangeListenerList.remove(listener);
+        }
+    }
+
+    /**
+     * Fire event so listeners are aware of change.
+     * 
+     * @param event
+     *            The GhgMonitorFilterChangeEvent
+     */
+    private void fireFilterChangeEvent(GhgMonitorFilterChangeEvent event) {
+        for (GhgEventListener listener : filterChangeListenerList) {
+            listener.notifyUpdate(event);
+        }
+    }
+
 }
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgData.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgData.java
index a991e4ecf9..06c56edc02 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgData.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/data/GhgData.java
@@ -31,11 +31,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import com.raytheon.uf.common.activetable.ActiveTableRecord;
-import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteDefinition;
-import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteKey;
 import com.raytheon.uf.common.time.SimulatedTime;
-import com.raytheon.uf.viz.core.localization.LocalizationManager;
-import com.raytheon.viz.gfe.GFEServerException;
 import com.raytheon.viz.ghg.monitor.data.GhgConfigData.AlertsEnum;
 import com.raytheon.viz.ghg.monitor.data.GhgConfigData.SelectionEnum;
 
@@ -49,6 +45,8 @@ import com.raytheon.viz.ghg.monitor.data.GhgConfigData.SelectionEnum;
  * 25 MAR 2008  N/A        lvenable    Initial creation
  * 30 JUL 2010  6721       mpduff      WFO now from officeid column.
  * 28 APR 2015  4027       randerso    Expunged Calendar from ActiveTableRecord
+ * 05 JAN 2016  5184       dgilling    Refactor constructor.
+ * 05 FEB 2016  5316       randerso    Removed unnecessary exception handler
  * 
  * </pre>
  * 
@@ -183,62 +181,24 @@ public class GhgData implements Comparable<GhgData> {
      */
     SimpleDateFormat dateFormatter = new SimpleDateFormat("HH:mm'Z' dd-MMM-yy");
 
-    /**
-     * Get a hazard description for a phen.sig value. This code was essentially
-     * copied from MakeHazardDialog.
-     * 
-     * @param phenSig
-     *            The phensig whose description is needed.
-     * 
-     * @return the description for the phensig.
-     * @throws GFEServerException
-     */
-    public static String getHazardDescription(String phenSig)
-            throws GFEServerException {
-        String siteId = LocalizationManager.getInstance().getSite();
-        DiscreteDefinition discreteDef = DiscreteKey.discreteDefinition(siteId);
-
-        String sdesc = discreteDef.keyDesc("Hazards_SFC", phenSig);
-
-        if (sdesc.isEmpty()) {
-            if ("CF.S".equals(phenSig)) {
-                sdesc = "COASTAL FLOOD STATEMENT";
-            } else if ("LS.S".equals(phenSig)) {
-                sdesc = "LAKESHORE FLOOD STATEMENT";
-            } else if ("MA.S".equals(phenSig)) {
-                sdesc = "MARINE WEATHER STATEMENT";
-            } else if ("HU.S".equals(phenSig)) {
-                sdesc = "HURRICANE LOCAL STATEMENT";
-            } else {
-                sdesc = "UNKNOWN PHENOMENON.SIGNIFICANCE";
-            }
-        }
-
-        return sdesc;
-    }
-
     /**
      * Constructor. Uses the warning to create the data record.
      * 
      * @param warning
      *            the warning to convert
-     * @throws GFEServerException
+     * @param hazardDesc
+     *            Headline-like description of the warning
      * 
      */
-    public GhgData(ActiveTableRecord warning) throws GFEServerException {
-        Date now = SimulatedTime.getSystemTime().getTime();
+    public GhgData(ActiveTableRecord warning, String hazardDesc) {
         if (warning != null) {
             action = warning.getAct();
             vtecString = warning.getVtecstr();
             etn = warning.getEtn();
             phen = warning.getPhen();
             sig = warning.getSig();
-            hazard = getHazardDescription(getPhenSig());
-            try {
-                startDate = warning.getStartTime();
-            } catch (Exception e) {
-                startDate = now;
-            }
+            hazard = hazardDesc;
+            startDate = warning.getStartTime();
             endDate = warning.getEndTime();
             purgeDate = warning.getPurgeTime();
             issueTime = warning.getIssueTime();
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/listener/GhgMonitorZoneSelectionListener.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/AbstractGhgMonitorEvent.java
similarity index 64%
rename from cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/listener/GhgMonitorZoneSelectionListener.java
rename to cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/AbstractGhgMonitorEvent.java
index cf0dbdf14b..3c78948096 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/listener/GhgMonitorZoneSelectionListener.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/AbstractGhgMonitorEvent.java
@@ -17,27 +17,35 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.viz.ghg.monitor.listener;
-
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorZoneSelectionEvent;
+package com.raytheon.viz.ghg.monitor.event;
 
 /**
- * Map zone selection listener interface.
+ * Base class for all GHG Monitor events
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jun 2, 2010            mpduff     Initial creation
- *
+ * Feb 04, 2016  #5316     randerso     Initial creation
+ * 
  * </pre>
- *
- * @author mpduff
- * @version 1.0	
+ * 
+ * @author randerso
+ * @version 1.0
  */
 
-public interface GhgMonitorZoneSelectionListener {
-    public void notifyUpdate(GhgMonitorZoneSelectionEvent evt);
+public abstract class AbstractGhgMonitorEvent {
+    /**
+     * Interface for GHG Monitor event listeners
+     */
+    public interface GhgEventListener {
+        /**
+         * Method called when evnet occurs
+         * 
+         * @param event
+         */
+        public void notifyUpdate(AbstractGhgMonitorEvent event);
+    }
 }
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorFilterChangeEvent.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorFilterChangeEvent.java
index b3236b301e..df44ea0463 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorFilterChangeEvent.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorFilterChangeEvent.java
@@ -19,49 +19,30 @@
  **/
 package com.raytheon.viz.ghg.monitor.event;
 
-import java.util.EventObject;
-
 /**
  * GHG Monitor data change event.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * May 24, 2010            mpduff     Initial creation
- *
+ * May 24, 2010            mpduff      Initial creation
+ * Feb 05, 2016   #5316    randerso    Changed to extend AbstractGhgMonitorEvent
+ * 
  * </pre>
- *
+ * 
  * @author mpduff
- * @version 1.0	
+ * @version 1.0
  */
 
-public class GhgMonitorFilterChangeEvent extends EventObject {
-
-    private static final long serialVersionUID = -4455895822255108354L;
-    
-    private boolean filterChanged = false;
+public class GhgMonitorFilterChangeEvent extends AbstractGhgMonitorEvent {
 
     /**
      * @param source
      */
-    public GhgMonitorFilterChangeEvent(Object source) {
-        super(source);
+    public GhgMonitorFilterChangeEvent() {
+        super();
     }
-
-    /**
-     * @return the filterChanged
-     */
-    public boolean isFilterChanged() {
-        return filterChanged;
-    }
-
-    /**
-     * @param filterChanged the filterChanged to set
-     */
-    public void setFilterChanged(boolean filterChanged) {
-        this.filterChanged = filterChanged;
-    }    
 }
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorTableSelectionEvent.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorTableSelectionEvent.java
index 1cc03eb5a6..3e4deb15e1 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorTableSelectionEvent.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorTableSelectionEvent.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.viz.ghg.monitor.event;
 
-import java.util.EventObject;
-import java.util.List;
+import java.util.Collection;
+import java.util.Collections;
 
 import org.eclipse.swt.graphics.RGB;
 
@@ -30,61 +30,62 @@ import com.raytheon.viz.ghg.monitor.data.GhgData;
  * Ghg Monitor table(spreadsheet) selection event object.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jun 2, 2010            mpduff     Initial creation
- *
+ * Jun 02, 2010            mpduff      Initial creation
+ * Feb 05, 2016   #5316    randerso    Changed to extend AbstractGhgMonitorEvent
+ * 
  * </pre>
- *
+ * 
  * @author mpduff
- * @version 1.0	
+ * @version 1.0
  */
 
-public class GhgMonitorTableSelectionEvent extends EventObject {
+public class GhgMonitorTableSelectionEvent extends AbstractGhgMonitorEvent {
 
-    private static final long serialVersionUID = 3679672253157750734L;
-    
-    private List<GhgData> ghgData;
+    private Collection<GhgData> ghgData;
+
+    private Collection<String> highlightedZones = Collections.emptyList();
 
-    private String[] highlightedZones = null;
-    
     private RGB selectionColor = null;
-    
+
     /**
      * @param source
      */
-    public GhgMonitorTableSelectionEvent(Object source) {
-        super(source);
+    public GhgMonitorTableSelectionEvent() {
+        super();
     }
-    
+
     /**
-     * @param highlightedZones the highlightedZones to set
+     * @param highlightedZones
+     *            the highlightedZones to set
      */
-    public void setHighlightedZones(String[] highlightedZones) {
+    public void setHighlightedZones(Collection<String> highlightedZones) {
         this.highlightedZones = highlightedZones;
     }
-    
+
     /**
      * @return the highlightedZones
      */
-    public String[] getHighlightedZones() {
+    public Collection<String> getHighlightedZones() {
         return highlightedZones;
     }
 
     /**
      * @return the ghgData
      */
-    public List<GhgData> getGhgData() {
+    public Collection<GhgData> getGhgData() {
         return ghgData;
     }
 
     /**
-     * @param ghgData the ghgData to set
+     * @param ghgData
+     *            the ghgData to set
      */
-    public void setGhgData(List<GhgData> ghgData) {
+    public void setGhgData(Collection<GhgData> ghgData) {
         this.ghgData = ghgData;
     }
 
@@ -96,7 +97,8 @@ public class GhgMonitorTableSelectionEvent extends EventObject {
     }
 
     /**
-     * @param selectionColor the selectionColor to set
+     * @param selectionColor
+     *            the selectionColor to set
      */
     public void setSelectionColor(RGB selectionColor) {
         this.selectionColor = selectionColor;
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorZoneSelectionEvent.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorZoneSelectionEvent.java
index b3bcac0728..d7bd026767 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorZoneSelectionEvent.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/event/GhgMonitorZoneSelectionEvent.java
@@ -19,49 +19,51 @@
  **/
 package com.raytheon.viz.ghg.monitor.event;
 
-import java.util.EventObject;
+import java.util.Collection;
+import java.util.Collections;
 
 /**
  * Ghg Monitor map selection event object.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jun 2, 2010            mpduff     Initial creation
- *
+ * Jun 02, 2010            mpduff      Initial creation
+ * Feb 05, 2016   #5316    randerso    Changed to extend AbstractGhgMonitorEvent
+ *                                     removed unnecessary field
+ * 
  * </pre>
- *
+ * 
  * @author mpduff
- * @version 1.0	
+ * @version 1.0
  */
 
-public class GhgMonitorZoneSelectionEvent extends EventObject {
+public class GhgMonitorZoneSelectionEvent extends AbstractGhgMonitorEvent {
 
-    private static final long serialVersionUID = 7240901206407383480L;
-    
-    private String[] highlightedZones = null;
+    private Collection<String> highlightedZones = Collections.emptyList();
 
     /**
      * @param source
      */
-    public GhgMonitorZoneSelectionEvent(Object source) {
-        super(source);
+    public GhgMonitorZoneSelectionEvent() {
+        super();
     }
 
     /**
      * @return the highlightedZones
      */
-    public String[] getHighlightedZones() {
+    public Collection<String> getHighlightedZones() {
         return highlightedZones;
     }
 
     /**
-     * @param highlightedZones the highlightedZones to set
+     * @param highlightedZones
+     *            the highlightedZones to set
      */
-    public void setHighlightedZones(String[] highlightedZones) {
+    public void setHighlightedZones(Collection<String> highlightedZones) {
         this.highlightedZones = highlightedZones;
     }
 }
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/filter/GhgFilterEngine.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/filter/GhgFilterEngine.java
index 8f7ec20311..ae2fe9af2e 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/filter/GhgFilterEngine.java
+++ b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/filter/GhgFilterEngine.java
@@ -20,12 +20,10 @@
 package com.raytheon.viz.ghg.monitor.filter;
 
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.List;
 
-import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.time.SimulatedTime;
-import com.raytheon.viz.gfe.core.DataManager;
+import com.raytheon.uf.common.time.util.TimeUtil;
 import com.raytheon.viz.ghg.monitor.data.GhgAlertCheckData;
 import com.raytheon.viz.ghg.monitor.data.GhgAlertData;
 import com.raytheon.viz.ghg.monitor.data.GhgAlertsConfigData;
@@ -41,10 +39,12 @@ import com.raytheon.viz.ghg.monitor.data.GhgDataFilter;
  * <pre>
  * 
  * SOFTWARE HISTORY
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 26May2010               mpduff      Initial creation.
- * 11Apr2014    15769      ryu         Promote delta minutes if within a few seconds.
+ * May 26, 2010            mpduff      Initial creation.
+ * Apr 11, 2014  15769     ryu         Promote delta minutes if within a few seconds.
+ * Jan 05, 2016  #5184     dgilling    Re-factor to remove statics.
  * 
  * </pre>
  * 
@@ -53,8 +53,16 @@ import com.raytheon.viz.ghg.monitor.data.GhgDataFilter;
  */
 
 public class GhgFilterEngine {
-    /** Milliseconds per minute */
-    private static final int MILLIS_PER_MINUTE = 60 * 1000;
+
+    private final String siteID;
+
+    /**
+     * @param siteID
+     *            4-character site identifier.
+     */
+    public GhgFilterEngine(String siteID) {
+        this.siteID = siteID;
+    }
 
     /**
      * Compare this record to the filter and see if it should be included or
@@ -64,7 +72,7 @@ public class GhgFilterEngine {
      *            The GhgData object to check
      * @return true if included, false if filtered out
      */
-    public static boolean filterCheck(GhgData gd) {
+    public boolean filterCheck(GhgData gd) {
         boolean include = true;
 
         GhgConfigData config = GhgConfigData.getInstance();
@@ -75,7 +83,7 @@ public class GhgFilterEngine {
         // settings
         boolean includeAlerts = filter.includeAlerts;
         if (includeAlerts
-                && (GhgFilterEngine.alertCheck(gd).getAlertType() != AlertsEnum.NoAlerts)) {
+                && (alertCheck(gd).getAlertType() != AlertsEnum.NoAlerts)) {
             return true;
         }
 
@@ -154,14 +162,12 @@ public class GhgFilterEngine {
         return include;
     }
 
-    public static GhgAlertCheckData alertCheck(GhgData gd) {
-        String wfo = DataManager.getCurrentInstance().getSiteID();
-        wfo = SiteMap.getInstance().getSite4LetterId(wfo);
+    public GhgAlertCheckData alertCheck(GhgData gd) {
         GhgConfigData config = GhgConfigData.getInstance();
         GhgAlertsConfigData alertFilter = config.getAlerts();
 
         // Alerts for my WFO
-        if (alertFilter.isLocal() && !gd.getWfo().equals(wfo)) {
+        if (alertFilter.isLocal() && !gd.getWfo().equals(siteID)) {
             return new GhgAlertCheckData(AlertsEnum.NoAlerts);
         }
 
@@ -216,10 +222,10 @@ public class GhgFilterEngine {
 
         // minutes until purge time
         int margin = 4999; // promote the deltas if within 5 seconds
-        int deltaP = (int) ((gd.getPurgeDate().getTime() - now + margin) / MILLIS_PER_MINUTE);
+        int deltaP = (int) ((gd.getPurgeDate().getTime() - now + margin) / TimeUtil.MILLIS_PER_MINUTE);
 
         // minutes until end time
-        int deltaE = (int) ((gd.getEndDate().getTime() - now + margin) / MILLIS_PER_MINUTE);
+        int deltaE = (int) ((gd.getEndDate().getTime() - now + margin) / TimeUtil.MILLIS_PER_MINUTE);
 
         long earlierT = Math.min(gd.getPurgeDate().getTime(), gd.getEndDate()
                 .getTime());
@@ -233,7 +239,7 @@ public class GhgFilterEngine {
         GhgAlertData expiredAlert = config.getAlerts().getAlert(
                 AlertsEnum.ExpiredAlert);
         int tval = expiredAlert.getTime();
-        long triggerTime = earlierT - (tval * MILLIS_PER_MINUTE);
+        long triggerTime = earlierT - (tval * TimeUtil.MILLIS_PER_MINUTE);
 
         if (expiredAlert.isEnabled() && (now >= triggerTime)) {
             return new GhgAlertCheckData(AlertsEnum.ExpiredAlert, deltaP,
@@ -243,7 +249,7 @@ public class GhgFilterEngine {
         // time limit for non-Expired alerts
         GhgAlertData alert2 = config.getAlerts().getAlert(AlertsEnum.AlertLvl2);
         tval = alert2.getTime();
-        triggerTime = earlierT - (tval * MILLIS_PER_MINUTE);
+        triggerTime = earlierT - (tval * TimeUtil.MILLIS_PER_MINUTE);
 
         if (alert2.isEnabled() && (now >= triggerTime)) {
             return new GhgAlertCheckData(AlertsEnum.AlertLvl2, deltaP, deltaE);
@@ -251,7 +257,7 @@ public class GhgFilterEngine {
 
         GhgAlertData alert1 = config.getAlerts().getAlert(AlertsEnum.AlertLvl1);
         tval = alert1.getTime();
-        triggerTime = earlierT - (tval * MILLIS_PER_MINUTE);
+        triggerTime = earlierT - (tval * TimeUtil.MILLIS_PER_MINUTE);
 
         if (alert1.isEnabled() && (now >= triggerTime)) {
             return new GhgAlertCheckData(AlertsEnum.AlertLvl1, deltaP, deltaE);
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/listener/GhgMonitorFilterChangeListener.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/listener/GhgMonitorFilterChangeListener.java
deleted file mode 100644
index ab92eec900..0000000000
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/listener/GhgMonitorFilterChangeListener.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.ghg.monitor.listener;
-
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorFilterChangeEvent;
-
-/**
- * GHG Monitor change listener.
- * 
- * <pre>
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * May 24, 2010            mpduff     Initial creation
- *
- * </pre>
- *
- * @author mpduff
- * @version 1.0	
- */
-
-public interface GhgMonitorFilterChangeListener {
-    public void notifyUpdate(GhgMonitorFilterChangeEvent evt);
-}
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/utilities/GhgDragDetector.java b/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/utilities/GhgDragDetector.java
deleted file mode 100644
index fac5e96f22..0000000000
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/utilities/GhgDragDetector.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-/**
- * 
- */
-package com.raytheon.viz.ghg.utilities;
-
-import com.raytheon.viz.ui.input.InputAdapter;
-
-/**
- * A class created to capture MB1 drags for GHGLauncher before PanHandler eats
- * the event. The basic idea is that this input handler is put into the chain
- * where it will receive mouseDownMove events before PanHandler. It sets an
- * internal flag to remember the drag. When
- * GhgLauncher.theMouseListener.handleMouseUp() is called, it checks and clears
- * the flag and can skip its "click" behavior if a the action was a drag. Note
- * that since this object will receive mouseUp events before
- * GhgLauncher.theMouseListener, it cannot clear its own wasDrag flag.
- * 
- * @author wdougherty
- * 
- */
-public class GhgDragDetector extends InputAdapter {
-    private boolean drag;
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseDownMove(int,
-     * int, int)
-     */
-    @Override
-    public boolean handleMouseDownMove(int x, int y, int mouseButton) {
-        if (mouseButton == 1) {
-            setDrag(true);
-        }
-        return false;
-    }
-
-    /**
-     * @return the wasDrag
-     */
-    public boolean isDrag() {
-        return drag;
-    }
-
-    /**
-     * @param drag
-     *            the drag to set
-     */
-    public void setDrag(boolean drag) {
-        this.drag = drag;
-    }
-
-}
diff --git a/cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF
index 71cd3955a6..d74e2f699a 100644
--- a/cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF
@@ -21,7 +21,8 @@ Require-Bundle: org.eclipse.core.runtime,
  com.raytheon.uf.common.dataplugin.shef;bundle-version="1.12.1174",
  com.raytheon.uf.viz.core.point;bundle-version="1.15.0",
  com.raytheon.uf.common.auth;bundle-version="1.12.1174",
- com.google.guava;bundle-version="18.0.0"
+ com.google.guava;bundle-version="18.0.0",
+ org.slf4j;bundle-version="1.7.12"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.viz.hydro,
  com.raytheon.viz.hydro.perspective,
diff --git a/cave/com.raytheon.viz.hydro/plugin.xml b/cave/com.raytheon.viz.hydro/plugin.xml
index 85be1165d6..f40110b602 100644
--- a/cave/com.raytheon.viz.hydro/plugin.xml
+++ b/cave/com.raytheon.viz.hydro/plugin.xml
@@ -390,7 +390,7 @@
                   style="radio">
                <parameter
                      name="size"
-                     value="7">
+                     value="6">
                </parameter>
                <parameter
                      name="org.eclipse.ui.commands.radioStateParameter"
@@ -404,7 +404,7 @@
                   style="radio">
                <parameter
                      name="size"
-                     value="8">
+                     value="7">
                </parameter>
                <parameter
                      name="org.eclipse.ui.commands.radioStateParameter"
@@ -418,7 +418,7 @@
                   style="radio">
                <parameter
                      name="size"
-                     value="9">
+                     value="8">
                </parameter>
                <parameter
                      name="org.eclipse.ui.commands.radioStateParameter"
@@ -432,7 +432,7 @@
                   style="radio">
                <parameter
                      name="size"
-                     value="10">
+                     value="9">
                </parameter>
                <parameter
                      name="org.eclipse.ui.commands.radioStateParameter"
@@ -446,7 +446,7 @@
                   style="radio">
                <parameter
                      name="size"
-                     value="12">
+                     value="10">
                </parameter>
                <parameter
                      name="org.eclipse.ui.commands.radioStateParameter"
@@ -460,7 +460,7 @@
                   style="radio">
                <parameter
                      name="size"
-                     value="16">
+                     value="14">
                </parameter>
                <parameter
                      name="org.eclipse.ui.commands.radioStateParameter"
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/CaveHydroSWTDialog.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/CaveHydroSWTDialog.java
index ab511ea171..acb526d2e8 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/CaveHydroSWTDialog.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/CaveHydroSWTDialog.java
@@ -21,6 +21,7 @@ package com.raytheon.viz.hydro;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.hydrocommon.HydroDisplayManager;
@@ -34,9 +35,9 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 24, 2008            mpduff     Initial creation
+ * Oct 24, 2008            mpduff      Initial creation
  * Feb 05, 2013 1578       rferrel     Made dialog non-blocking.
- * 
+ * Jan 26, 2016 5054       randerso    Allow dialog to be parented to display
  * 
  * </pre>
  * 
@@ -79,6 +80,17 @@ public abstract class CaveHydroSWTDialog extends CaveSWTDialog {
         super(parentShell, SWT.DIALOG_TRIM, caveStyle | CAVE.DO_NOT_BLOCK);
     }
 
+    /**
+     * Construct top level dialog specifying cave style and make it
+     * non-blocking.
+     * 
+     * @param display
+     * @param caveStyle
+     */
+    protected CaveHydroSWTDialog(Display display, int caveStyle) {
+        super(display, SWT.DIALOG_TRIM, caveStyle | CAVE.DO_NOT_BLOCK);
+    }
+
     /**
      * Determine if there is a currently selected LID.
      * 
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
index 73deb90953..f5626aa0a0 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
@@ -54,6 +54,9 @@ import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue;
 import com.raytheon.uf.common.ohd.AppsDefaults;
+import com.raytheon.uf.common.ohd.AppsDefaultsDirKeys;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.viz.core.IDisplayPane;
 import com.raytheon.uf.viz.core.IDisplayPaneContainer;
 import com.raytheon.uf.viz.core.drawables.ResourcePair;
@@ -77,6 +80,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 07 Feb 2013  1578       rferrel     Changes for non-blocking dialog.
  * Jul 21, 2015 4500       rjpeter     Use Number in blind cast.
  * Aug 05, 2015 4486       rjpeter     Changed Timestamp to Date.
+ * Jan 26, 2016 5264       bkowal      Eliminate use of System println.
  * </pre>
  * 
  * @author lvenable
@@ -84,6 +88,9 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 
  */
 public class FlashFloodGuidanceDlg extends CaveSWTDialog {
+    private final IUFStatusHandler statusHandler = UFStatus
+            .getHandler(getClass());
+
     /** Date format for the dates */
     private static SimpleDateFormat sdf = null;
 
@@ -877,20 +884,17 @@ public class FlashFloodGuidanceDlg extends CaveSWTDialog {
                 dataList.add(sortedMap.get(s));
             }
         } else {
-            // WFO Grided data, read xmrg directory
-            String ffgDirToken = "gaff_mosaic_dir";
-
             /*
              * Retrieve the path of the WFO ffg_product file from the
              * "apps defaults" file.
              */
-            String ffgDirPath = AppsDefaults.getInstance()
-                    .getToken(ffgDirToken);
+            String ffgDirPath = AppsDefaults.getInstance().getToken(
+                    AppsDefaultsDirKeys.GAFF_MOSAIC_DIR);
             if (ffgDirPath == null) {
-                // TODO error handling
-                System.err
-                        .println("Error getting WFO FFG directory from token "
-                                + ffgDirToken);
+                statusHandler
+                        .error("Error getting WFO FFG directory from token: "
+                                + AppsDefaultsDirKeys.GAFF_MOSAIC_DIR + ".");
+                return;
             }
 
             File ffgDir = new File(ffgDirPath);
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/gagedisplay/GageColorLegendAction.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/gagedisplay/GageColorLegendAction.java
index 2249820e77..54c09a1f3f 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/gagedisplay/GageColorLegendAction.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/gagedisplay/GageColorLegendAction.java
@@ -20,6 +20,7 @@
 package com.raytheon.viz.hydro.gagedisplay;
 
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
 
 import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
 
@@ -30,11 +31,12 @@ import com.raytheon.viz.ui.cmenu.AbstractRightClickAction;
  * 
  * SOFTWARE HISTORY
  * 
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Jul 2, 2008	1194     	mpduff	Initial creation
- * Feb 07, 2013 1578        rferre      Changes for non-blocking GageLegend.
- * Feb 27, 2013 1790        rferrel     Bug fix for non-blocking dialogs.
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jul 02, 2008  1194      mpduff      Initial creation
+ * Feb 07, 2013 1578       rferrel     Changes for non-blocking GageLegend.
+ * Feb 27, 2013 1790       rferrel     Bug fix for non-blocking dialogs.
+ * Jan 15, 2015 5054       randerso    Remove unnecessary new Shell
  * 
  * </pre>
  * 
@@ -68,7 +70,9 @@ public class GageColorLegendAction extends AbstractRightClickAction {
     @Override
     public void run() {
         if (dialog == null || dialog.isDisposed()) {
-            dialog = new GageLegend(new Shell());
+            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+                    .getShell();
+            dialog = new GageLegend(shell);
             dialog.open();
         } else {
             dialog.bringToTop();
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/pointdatacontrol/engine/PointDataControlDerive.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/pointdatacontrol/engine/PointDataControlDerive.java
old mode 100644
new mode 100755
index f63da140bc..681897b781
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/pointdatacontrol/engine/PointDataControlDerive.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/pointdatacontrol/engine/PointDataControlDerive.java
@@ -51,13 +51,15 @@ import com.raytheon.viz.hydrocommon.pdc.PDCOptionData;
 import com.raytheon.viz.hydrocommon.pdc.PDCOptions;
 
 /**
- * TODO Add Description
+ * PointData Control Derive.
  * 
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 15, 2008            mpduff     Initial creation
+ * Nov 24, 2015 5142       skorolev   Fixed time window issue for precipitation.
+ * 
  * </pre>
  * 
  * @author mpduff
@@ -71,17 +73,17 @@ public class PointDataControlDerive {
 
     private static final int PRECIP_TS_BEST = 64;
 
-    private ArrayList<Observation> heightList;
+    private List<Observation> heightList;
 
-    private ArrayList<Observation> qList;
+    private List<Observation> qList;
 
-    private ArrayList<Riverstatus> riverStatusList;
+    private List<Riverstatus> riverStatusList;
 
-    private ArrayList<Observation> obsList;
+    private List<Observation> obsList;
 
-    private ArrayList<GageData> dataList = new ArrayList<GageData>();
+    private final List<GageData> dataList = new ArrayList<GageData>();
 
-    Map<String, List<IngestFilter>> tsRankingMap = null;
+    private Map<String, List<IngestFilter>> tsRankingMap = null;
 
     private double change = PDCConstants.MISSING_VALUE;
 
@@ -99,23 +101,22 @@ public class PointDataControlDerive {
      * lid. It eliminates these multiple reports by using type source ranking
      * from the Ingest table.
      * 
-     * @param  isOneTime  Is this being run via the runOneTime method?
-     * @return ArrayList<GageData> The list of data with a single entry per lid,
-     *         or null if no data
+     * @param isOneTime
+     *            Is this being run via the runOneTime method?
+     * @param pcOptions
+     * 
      */
     public void deriveRiverReports(boolean isOneTime, PDCOptions pcOptions) {
-        PointDataControlManager pdcManager = PointDataControlManager.getInstance();
+        PointDataControlManager pdcManager = PointDataControlManager
+                .getInstance();
         HydroDisplayManager displayManager = HydroDisplayManager.getInstance();
-        heightList = (ArrayList<Observation>) pdcManager.getObsHeightList();
-        qList = (ArrayList<Observation>) pdcManager.getObsDischargeList();
-        riverStatusList = (ArrayList<Riverstatus>) pdcManager
-                .getRiverStatusList();
+        heightList = pdcManager.getObsHeightList();
+        qList = pdcManager.getObsDischargeList();
+        riverStatusList = pdcManager.getRiverStatusList();
 
         List<GageData> repObsPtr = null;
         List<GageData> repFcstPtr = null;
 
-//        PDCOptionData pcOptions = pdcManager.getPCOptionData();
-
         String currentLid = null;
         int startRecord = 0;
         int changeWindow = 0;
@@ -207,8 +208,11 @@ public class PointDataControlDerive {
                 changeWindow /= 2;
             }
 
-            heightList.trimToSize();
-            if ((heightList != null) && (heightList.size() > 0)) {
+            if ((heightList != null) && !heightList.isEmpty()) {
+                List<Observation> tmpList = heightList;
+                heightList = new ArrayList<>(tmpList.size());
+                heightList.addAll(tmpList);
+                tmpList = null;
                 repObsPtr = processList(heightList, changeWindow);
             }
 
@@ -216,16 +220,15 @@ public class PointDataControlDerive {
                 repObsPtr = processList(qList, changeWindow);
             }
         }
-        
+
         if (isOneTime) {
             pdcManager.setFcst2ReportList(repFcstPtr);
             pdcManager.setObs2ReportList(repObsPtr);
         } else {
             pdcManager.setFcstReportList(repFcstPtr);
-            
+
             /*
-             *  We don't want to trigger a draw here so set 
-             * flag to false.
+             * We don't want to trigger a draw here so set flag to false.
              */
             displayManager.setDrawStation(false);
             pdcManager.setObsReportList(repObsPtr);
@@ -241,14 +244,14 @@ public class PointDataControlDerive {
      * 
      * @return
      */
-    public ArrayList<GageData> deriveOtherReports() {
-        PointDataControlManager pdcManager = PointDataControlManager.getInstance();
+    public List<GageData> deriveOtherReports() {
+        PointDataControlManager pdcManager = PointDataControlManager
+                .getInstance();
         /* This list is one of obs or latestobsvalue */
-        obsList = (ArrayList<Observation>) pdcManager.getObservationList();
+        obsList = pdcManager.getObservationList();
 
         int changeWindow = 0;
         String currentLid = null;
-        int startRecord = 0;
 
         if ((obsList == null) || (obsList.size() == 0)) {
             return null;
@@ -266,11 +269,10 @@ public class PointDataControlDerive {
             changeWindow /= 2;
         }
 
-        ArrayList<Observation> tempObsList = new ArrayList<Observation>();
+        List<Observation> tempObsList = new ArrayList<Observation>();
 
         for (int i = 0; i < obsList.size(); i++) {
             if (!currentLid.equals(obsList.get(i).getLid())) {
-//                startRecord = i;
                 processLidObs(tempObsList, changeWindow);
 
                 /*
@@ -294,12 +296,13 @@ public class PointDataControlDerive {
         return dataList;
     }
 
-    private List<GageData> processList(ArrayList<Observation> obsList, int changeWindow) {
+    private List<GageData> processList(List<Observation> obsList,
+            int changeWindow) {
         /* loop thru the list and process each lid. */
         String currentLid = obsList.get(0).getLid();
         int startRecord = 0;
-        ArrayList<Observation> tempObsList = new ArrayList<Observation>();
-        ArrayList<GageData> returnList = new ArrayList<GageData>();
+        List<Observation> tempObsList = new ArrayList<Observation>();
+        List<GageData> returnList = new ArrayList<GageData>();
 
         for (int i = 0; i < obsList.size(); i++) {
             /*
@@ -318,8 +321,8 @@ public class PointDataControlDerive {
                  * ingestfilter type source rank to determine which one to use.
                  */
 
-                returnList = processLidObsRiver(tempObsList, 0,//startRecord,
-                        changeWindow, returnList);
+                returnList = processLidObsRiver(tempObsList, 0, changeWindow,
+                        returnList);
 
                 /*
                  * set up data for next pass through the input linked list
@@ -339,7 +342,7 @@ public class PointDataControlDerive {
             returnList = processLidObsRiver(tempObsList, startRecord,
                     changeWindow, returnList);
         }
-        
+
         return returnList;
     }
 
@@ -390,15 +393,16 @@ public class PointDataControlDerive {
      * 
      * @param startRecord
      *            Starting record
-     * @param endRecord
-     *            Ending record
      * @param lidCount
      *            Number of lids
      * @param changeWindow
      *            Number of hours
+     * @param obsList
+     * @param inputList
+     * @return
      */
-    private ArrayList<GageData> processLidObsRiver(ArrayList<Observation> obsList,
-            int startRecord, int changeWindow, ArrayList<GageData> inputList) {
+    private List<GageData> processLidObsRiver(List<Observation> obsList,
+            int startRecord, int changeWindow, List<GageData> inputList) {
         Observation bestObs = null;
         GageData oneRpt = new GageData();
         List<GageData> outputList = new ArrayList<GageData>();
@@ -413,7 +417,7 @@ public class PointDataControlDerive {
         bestObs = deriveReportObsRiver(obsList, startRecord, changeWindow);
 
         if (bestObs != null) {
-            oneRpt.setLid(bestObs.getLid());;
+            oneRpt.setLid(bestObs.getLid());
             oneRpt.setPe(bestObs.getPe());
             oneRpt.setDur(bestObs.getDur());
             oneRpt.setTs(bestObs.getTs());
@@ -423,7 +427,6 @@ public class PointDataControlDerive {
             oneRpt.setQuality_code(PDCConstants.DEFAULT_QC_VALUE);
             oneRpt.setValue(bestObs.getValue());
             oneRpt.setValidtime(bestObs.getObstime());
-//            oneRpt.setBasistime(bestObs.getBasistime());
 
             /* initialize the list */
             if (inputList != null) {
@@ -436,7 +439,7 @@ public class PointDataControlDerive {
             outputList = inputList;
         }
 
-        return (ArrayList<GageData>) outputList;
+        return outputList;
     }
 
     /**
@@ -450,9 +453,15 @@ public class PointDataControlDerive {
      *            Type Source
      * @param rsList
      *            Riverstatus list
+     * @param startRecord
+     * @param inputList
+     *            GageData list
+     * @param pcOptions
+     * @return
      */
-    private ArrayList<GageData> processLidRS(String[] useTs,
-            List<Riverstatus> rsList, int startRecord, List<GageData> inputList, PDCOptions pcOptions) {
+    private List<GageData> processLidRS(String[] useTs,
+            List<Riverstatus> rsList, int startRecord,
+            List<GageData> inputList, PDCOptions pcOptions) {
         Riverstatus best = null;
         GageData oneRpt = new GageData();
         List<GageData> outputList = new ArrayList<GageData>();
@@ -496,11 +505,16 @@ public class PointDataControlDerive {
             outputList = inputList;
         }
 
-        return (ArrayList<GageData>) outputList;
+        return outputList;
     }
 
-    private void processLidObs(ArrayList<Observation> tempObsList,
-            int changeWindow) {
+    /**
+     * Process Lid Obs
+     * 
+     * @param tempObsList
+     * @param changeWindow
+     */
+    private void processLidObs(List<Observation> tempObsList, int changeWindow) {
         GageData oneRpt = new GageData();
         PDCOptionData pcOptions = PDCOptionData.getInstance();
 
@@ -509,7 +523,6 @@ public class PointDataControlDerive {
          * pointer returned is of the type Observation.
          */
         Observation best = deriveReportObs(tempObsList, changeWindow);
-//        Observation best = deriveReportObs(obsList, startRecord, changeWindow);
 
         /* copy the best report into the linked list of Reports */
         if (best != null) {
@@ -550,7 +563,7 @@ public class PointDataControlDerive {
      *            Number of hours
      * @return
      */
-    private Observation deriveReportObs(ArrayList<Observation> obsList,
+    private Observation deriveReportObs(List<Observation> obsList,
             int changeWindow) {
         PDCOptionData pcOptions = PDCOptionData.getInstance();
         PDCDataManager manager = PDCDataManager.getInstance();
@@ -558,7 +571,6 @@ public class PointDataControlDerive {
         Observation bestObs2 = null;
         String currentTS = null;
         String bestTS = null;
-        boolean recordFound = false;
         long currentDiff;
         long bestDiff;
         int firstObsFound = 0;
@@ -576,8 +588,6 @@ public class PointDataControlDerive {
          * physical element.
          */
 
-        recordFound = false;
-
         tsRankingMap = manager.getIngestFilterData();
 
         for (int i = 0; i < obsList.size(); i++) {
@@ -596,7 +606,8 @@ public class PointDataControlDerive {
                  * best ts if it has a higher rank
                  */
                 int result = compareTSRank(obsList.get(i).getTs(), bestTS,
-                        tsRankingMap.get(obsList.get(i).getLid()), obsList.get(i).getPe());
+                        tsRankingMap.get(obsList.get(i).getLid()),
+                        obsList.get(i).getPe());
                 if (result < 0) {
                     bestTS = obsList.get(i).getTs();
                 }
@@ -734,11 +745,11 @@ public class PointDataControlDerive {
      *            Number of hours
      * @return
      */
-    private Observation deriveReportObsRiver(ArrayList<Observation> obsList,
+    private Observation deriveReportObsRiver(List<Observation> obsList,
             int startRecord, int changeWindow) {
         PDCOptionData pcOptions = PDCOptionData.getInstance();
         PDCDataManager manager = PDCDataManager.getInstance();
-        Observation obs = null;
+
         Observation bestObs = null;
         Observation bestObs2 = null;
         String currentTS = null;
@@ -749,22 +760,16 @@ public class PointDataControlDerive {
         int firstObsFound = 0;
         int lastObsFound = 0;
 
-        // if (riverStatusList.size() == 0) {
-        // return null;
-        // }
-
         /* determine which physical element to use for this location */
         if (pcOptions.getPrimary() == 1) {
             usePE = "HG";
             if (startRecord >= obsList.size()) {
                 return bestObs;
             }
-            
+
             /* try and find the pe specified for this location */
-            RiverStat rsInfo = manager.getRiverStatus(obsList.get(
-                    startRecord).getLid());
-//            RiverStat rsInfo = manager.getRiverStatus(riverStatusList.get(
-//                    startRecord).getId().getLid());
+            RiverStat rsInfo = manager.getRiverStatus(obsList.get(startRecord)
+                    .getLid());
 
             if (rsInfo != null) {
                 usePE = rsInfo.getPe();
@@ -810,7 +815,8 @@ public class PointDataControlDerive {
                      */
 
                     int result = compareTSRank(obsList.get(i).getTs(), bestTS,
-                            tsRankingMap.get(obsList.get(i).getLid()), obsList.get(i).getPe());
+                            tsRankingMap.get(obsList.get(i).getLid()), obsList
+                                    .get(i).getPe());
                     if (result < 0) {
                         bestTS = obsList.get(i).getTs();
                     }
@@ -849,8 +855,10 @@ public class PointDataControlDerive {
                     return obsList.get(i);
                 } else if (pcOptions.getTimeMode() == PDCConstants.TimeModeType.SETTIME
                         .getTimeMode()) {
-                    currentDiff = Math.abs(pcOptions.getValidTime().getTime()
-                            - SimulatedTime.getSystemTime().getTime().getTime());
+                    currentDiff = Math
+                            .abs(pcOptions.getValidTime().getTime()
+                                    - SimulatedTime.getSystemTime().getTime()
+                                            .getTime());
 
                     /*
                      * Is the observation the closest to the center time so far?
@@ -871,7 +879,8 @@ public class PointDataControlDerive {
                     if (firstObsFound == 0) {
                         currentDiff = Math.abs(pcOptions.getValidTime()
                                 .getTime()
-                                - SimulatedTime.getSystemTime().getTime().getTime());
+                                - SimulatedTime.getSystemTime().getTime()
+                                        .getTime());
 
                         /* Is the observation inside the window? */
                         if (currentDiff / (PDCConstants.MILLIS_PER_MINUTE * 60) <= changeWindow) {
@@ -912,7 +921,8 @@ public class PointDataControlDerive {
                     } else if (lastObsFound == 0) {
                         currentDiff = Math.abs(pcOptions.getValidTime()
                                 .getTime()
-                                - SimulatedTime.getSystemTime().getTime().getTime());
+                                - SimulatedTime.getSystemTime().getTime()
+                                        .getTime());
 
                         /* Find the best observation in the lower time window. */
 
@@ -935,12 +945,13 @@ public class PointDataControlDerive {
                             }
                         }
                     } else {
-                        /*
-                         * Both observations necessary to compute the change
-                         * have been found.
-                         */
-                        change = bestObs.getValue() - bestObs2.getValue();
-
+                        if (bestObs != null && bestObs2 != null) {
+                            /*
+                             * Both observations necessary to compute the change
+                             * have been found.
+                             */
+                            change = bestObs.getValue() - bestObs2.getValue();
+                        }
                         return bestObs;
                     }
                     break;
@@ -968,11 +979,13 @@ public class PointDataControlDerive {
      *            Type Source
      * @param rsList
      *            Riverstatus list
+     * @param startRecord
+     * @param pcOptions
      * @return
      */
     private Riverstatus deriveReportRS(String[] useTs,
             List<Riverstatus> rsList, int startRecord, PDCOptions pcOptions) {
-//        PDCOptionData pcOptions = pdcManager.getPCOptionData();
+
         PDCDataManager manager = PDCDataManager.getInstance();
         Riverstatus best = null;
         String usePE = null;
@@ -1037,8 +1050,9 @@ public class PointDataControlDerive {
                      */
 
                     int result = compareTSRank(rsList.get(i).getId().getTs(),
-                            bestTs, tsRankingMap.get(rsList.get(i).getId()
-                                    .getLid()), rsList.get(i).getId().getPe());
+                            bestTs,
+                            tsRankingMap.get(rsList.get(i).getId().getLid()),
+                            rsList.get(i).getId().getPe());
                     if (result < 0) {
                         bestTs = rsList.get(i).getId().getTs();
                     }
@@ -1075,9 +1089,10 @@ public class PointDataControlDerive {
         return best;
     }
 
-    public ArrayList<GageData> deriveRainReports() {
+    public List<GageData> deriveRainReports() {
         PDCOptionData pcOptions = PDCOptionData.getInstance();
-        PointDataControlManager pdcManager = PointDataControlManager.getInstance();
+        PointDataControlManager pdcManager = PointDataControlManager
+                .getInstance();
         ArrayList<GageData> reportList = new ArrayList<GageData>();
         long beginTime;
         long endTime;
@@ -1123,11 +1138,12 @@ public class PointDataControlDerive {
         } else {
             beginTime = pcOptions.getValidTime().getTime()
                     - (pcOptions.getDurHours() * PDCConstants.MILLIS_PER_HOUR);
-            endTime = pcOptions.getValidTime().getTime();
+            endTime = pcOptions.getValidTime().getTime()
+                    + (pcOptions.getDurHours() * PDCConstants.MILLIS_PER_HOUR);
         }
 
-        List<Rawpc> rawPcList = new ArrayList<Rawpc>();
-        List<Rawpp> rawPpList = new ArrayList<Rawpp>();
+        ArrayList<Rawpc> rawPcList = new ArrayList<Rawpc>();
+        ArrayList<Rawpp> rawPpList = new ArrayList<Rawpp>();
         if (pcList != null) {
             for (Curpc cp : pcList) {
                 rawPcList.add(convertCurpc2Rawpc(cp));
@@ -1146,10 +1162,8 @@ public class PointDataControlDerive {
         endDate.setTime(endTime);
 
         GetTotalPrecip gtp = new GetTotalPrecip();
-        reportList = gtp.getTotalRawPrecip((ArrayList<Rawpc>) rawPcList,
-                (ArrayList<Rawpp>) rawPpList,
-                beginDate, endDate,
-                endingTimeMatch, minPercent, precipSettings);
+        reportList = gtp.getTotalRawPrecip(rawPcList, rawPpList, beginDate,
+                endDate, endingTimeMatch, minPercent, precipSettings);
 
         return reportList;
     }
@@ -1220,7 +1234,7 @@ public class PointDataControlDerive {
     /**
      * @return the heightList
      */
-    public ArrayList<Observation> getHeightList() {
+    public List<Observation> getHeightList() {
         return heightList;
     }
 
@@ -1228,14 +1242,14 @@ public class PointDataControlDerive {
      * @param heightList
      *            the heightList to set
      */
-    public void setHeightList(ArrayList<Observation> heightList) {
+    public void setHeightList(List<Observation> heightList) {
         this.heightList = heightList;
     }
 
     /**
      * @return the qList
      */
-    public ArrayList<Observation> getQList() {
+    public List<Observation> getQList() {
         return qList;
     }
 
@@ -1243,14 +1257,14 @@ public class PointDataControlDerive {
      * @param list
      *            the qList to set
      */
-    public void setQList(ArrayList<Observation> list) {
+    public void setQList(List<Observation> list) {
         qList = list;
     }
 
     /**
      * @return the riverStatusList
      */
-    public ArrayList<Riverstatus> getRiverStatusList() {
+    public List<Riverstatus> getRiverStatusList() {
         return riverStatusList;
     }
 
@@ -1258,7 +1272,7 @@ public class PointDataControlDerive {
      * @param riverStatusList
      *            the riverStatusList to set
      */
-    public void setRiverStatusList(ArrayList<Riverstatus> riverStatusList) {
+    public void setRiverStatusList(List<Riverstatus> riverStatusList) {
         this.riverStatusList = riverStatusList;
     }
 }
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/DamLocationResource.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/DamLocationResource.java
index 6962838d38..13e6b94b9f 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/DamLocationResource.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/DamLocationResource.java
@@ -67,9 +67,11 @@ import com.vividsolutions.jts.index.strtree.STRtree;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 20, 2009            mpduff     Initial creation
+ * Apr 20, 2009            mpduff      Initial creation
  * Sep 23, 2009 3069       mpduff      Changed the parent class to HydroPointResource.
  * Jan 22, 2013 15553      wkwock      Correct DamCrest selection algorithm
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author mpduff
@@ -122,7 +124,7 @@ public class DamLocationResource extends
                 return HydroImageMaker.getDamIcon();
             }
         });
-        fontSize = 10;
+        fontSize = 8;
         font = target.initializeFont("Dialog", fontSize, null);
         font.setSmoothing(false);
 
@@ -310,24 +312,26 @@ public class DamLocationResource extends
                 Coordinate coord = container.translateClick(x, y);
                 Envelope env = new Envelope(coord);
                 List<?> elements = damStrTree.query(env);
-                double curDist=Double.MAX_VALUE;
+                double curDist = Double.MAX_VALUE;
                 DamMaster foundDam = null;
                 if (elements.size() > 0) {
-                	//find the closest one
-                	for (Object obj : elements) {
+                    // find the closest one
+                    for (Object obj : elements) {
                         DamMaster dam = (DamMaster) obj;
-                        double distance=Math.pow((dam.getLatitudeDam()-coord.y),2) + Math.pow((dam.getLongitudeDam()-coord.x), 2);
-                        if (distance<curDist) {
-                        	curDist=distance;
-                        	foundDam=dam;
+                        double distance = Math.pow(
+                                (dam.getLatitudeDam() - coord.y), 2)
+                                + Math.pow((dam.getLongitudeDam() - coord.x), 2);
+                        if (distance < curDist) {
+                            curDist = distance;
+                            foundDam = dam;
                         }
-                	}
-                    
-                	try {
+                    }
+
+                    try {
                         AppLauncherHandler alh = new AppLauncherHandler();
                         alh.execute(DC_BUNDLE_LOC, foundDam.getNidid());
                     } catch (ExecutionException e) {
-                         e.printStackTrace();
+                        e.printStackTrace();
                     }
                 } else {
                     Shell shell = PlatformUI.getWorkbench()
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
index e5abdf3387..fb9e1bb7a0 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
@@ -136,6 +136,7 @@ import com.vividsolutions.jts.index.strtree.STRtree;
  * Jun 26, 2015 17386       xwei        Fixed : HydroView crashes in when Refresh Data after loading saved display files
  * Jul 06, 2015 4215        mpduff      Correct the fact that user's cannot click and view time series.
  * Oct 05, 2015 17978       lbousaidi   Enable TimeStep GUI to display multiple values and Parameter Codes for a given lid
+ * Nov 05, 2015 5070        randerso    Adjust font sizes for dpi scaling
  * Dec 05, 2015 18357       xwei        Fixed error in opening Timeseries for Timesteps
  * 
  * </pre>
@@ -194,23 +195,30 @@ public class MultiPointResource extends
          */
         @Override
         public boolean equals(Object obj) {
-            if (this == obj)
+            if (this == obj) {
                 return true;
-            if (obj == null)
+            }
+            if (obj == null) {
                 return false;
-            if (getClass() != obj.getClass())
+            }
+            if (getClass() != obj.getClass()) {
                 return false;
+            }
             HydroImageMakerCallback other = (HydroImageMakerCallback) obj;
             if (color == null) {
-                if (other.color != null)
+                if (other.color != null) {
                     return false;
-            } else if (!color.equals(other.color))
+                }
+            } else if (!color.equals(other.color)) {
                 return false;
+            }
             if (dispClass == null) {
-                if (other.dispClass != null)
+                if (other.dispClass != null) {
                     return false;
-            } else if (!dispClass.equals(other.dispClass))
+                }
+            } else if (!dispClass.equals(other.dispClass)) {
                 return false;
+            }
             return true;
         }
 
@@ -225,7 +233,7 @@ public class MultiPointResource extends
     private final Map<String, GageDataTimeStep> dataMapTimeStep = new HashMap<String, GageDataTimeStep>();
 
     private STRtree strTree = new STRtree();
-    
+
     private IFont font;
 
     private int fontSize;
@@ -324,7 +332,7 @@ public class MultiPointResource extends
             container.registerMouseHandler(inputManager);
         }
 
-        fontSize = 10;
+        fontSize = 8;
         font = target.initializeFont("Dialog", fontSize, null);
         font.setSmoothing(false);
 
@@ -338,10 +346,10 @@ public class MultiPointResource extends
             for (GageData gage : data) {
                 /* Get the point color for this location */
                 if ((gage.getLid() != null) && gage.isUse()) {
-                    if ( pcOptions.getQueryMode() == 1 ){
-                    	addPointTimeStep(gage);	
-                    }else{
-                    	addPoint(gage);
+                    if (pcOptions.getQueryMode() == 1) {
+                        addPointTimeStep(gage);
+                    } else {
+                        addPoint(gage);
                     }
                 }
             }
@@ -353,28 +361,29 @@ public class MultiPointResource extends
      * 
      * @param gage
      *            GageData object
-     */                                                    
-     private synchronized void addPointTimeStep(GageData gage) {
+     */
+    private synchronized void addPointTimeStep(GageData gage) {
         String lid = gage.getLid();
-                
-        if ( !dataMapTimeStep.containsKey(lid) ) {
-            
-        	Coordinate xy = new Coordinate(gage.getLon(), gage.getLat());
+
+        if (!dataMapTimeStep.containsKey(lid)) {
+
+            Coordinate xy = new Coordinate(gage.getLon(), gage.getLat());
             gage.setCoordinate(xy);
 
             /* Create a small envelope around the point */
-            PixelExtent pe = getPixelExtent( gage, getShiftWidth(gage), getShiftHeight(gage) );
-            Envelope newEnv = descriptor.pixelToWorld( pe );
+            PixelExtent pe = getPixelExtent(gage, getShiftWidth(gage),
+                    getShiftHeight(gage));
+            Envelope newEnv = descriptor.pixelToWorld(pe);
+
+            GageDataTimeStep newGageTS = new GageDataTimeStep(gage);
 
-            GageDataTimeStep newGageTS = new GageDataTimeStep( gage );
-            
             strTree.insert(newEnv, newGageTS);
-            dataMapTimeStep.put(lid, newGageTS);         
-            
-        } else{
-        	dataMapTimeStep.get(lid).Update(gage);
+            dataMapTimeStep.put(lid, newGageTS);
+
+        } else {
+            dataMapTimeStep.get(lid).Update(gage);
         }
-        
+
     }
 
     private synchronized void addPoint(GageData gage) {
@@ -455,7 +464,6 @@ public class MultiPointResource extends
         return new PixelExtent(coors);
     }
 
-    
     /**
      * Draws the plot information for TimeStep
      * 
@@ -470,89 +478,90 @@ public class MultiPointResource extends
      * @param target
      *            the graphics target
      * @throws VizException
-     */                                               
-    private Collection<DrawableString> drawPlotInfoTimeStep(GageDataTimeStep gageTimeStep,
-            double shiftWidth, double shiftHeight, PaintProperties paintProps,
+     */
+    private Collection<DrawableString> drawPlotInfoTimeStep(
+            GageDataTimeStep gageTimeStep, double shiftWidth,
+            double shiftHeight, PaintProperties paintProps,
             IGraphicsTarget target) throws VizException {
         List<DrawableString> strings = new ArrayList<DrawableString>();
         Coordinate c = gageTimeStep.getCoordinate();
 
-        
-        
         /* Logic for determining how the data values are displayed. */
         boolean showValue1 = pdcManager.isValue();
-        
 
         double[] centerpixels = descriptor
                 .worldToPixel(new double[] { c.x, c.y });
 
         if (showValue1) {
-        	
-        	String [] valueStrings;
-        	
-        	if ( pcOptions.getElementType() == 1 ){
-        		valueStrings = gageTimeStep.getRainValue( pcOptions.getPrecipPeFilter() ).split("\n");  
-        	}else{
-        		valueStrings = gageTimeStep.getOtherValue().split("\n");
-        	}
-        	
-        	int strSize = valueStrings.length;
-        	
-        	RGB[] strColor = new RGB[strSize];
-        	
-        	if ( strSize > 0){
-                for (int i=0; i<strSize; i++){
-                    if (valueStrings[i]!=""){
-                        if ( valueStrings[i].equalsIgnoreCase("M") ){
+
+            String[] valueStrings;
+
+            if (pcOptions.getElementType() == 1) {
+                valueStrings = gageTimeStep.getRainValue(
+                        pcOptions.getPrecipPeFilter()).split("\n");
+            } else {
+                valueStrings = gageTimeStep.getOtherValue().split("\n");
+            }
+
+            int strSize = valueStrings.length;
+
+            RGB[] strColor = new RGB[strSize];
+
+            if (strSize > 0) {
+                for (int i = 0; i < strSize; i++) {
+                    if (valueStrings[i] != "") {
+                        if (valueStrings[i].equalsIgnoreCase("M")) {
                             strColor[i] = RGBColors.getRGBColor("White");
-                        }else{
-                            strColor[i] = getValueLabelColorTimeStep( gageTimeStep.getLid(), Double.parseDouble( valueStrings[i] ) );
+                        } else {
+                            strColor[i] = getValueLabelColorTimeStep(
+                                    gageTimeStep.getLid(),
+                                    Double.parseDouble(valueStrings[i]));
                         }
                     }
                 }
             }
-            
+
             Coordinate valueCoor = new Coordinate(
                     (centerpixels[0] + shiftWidth) - getScaleWidth(),
                     (centerpixels[1] + shiftHeight) - getScaleHeight() / 2);
-            
+
             /*
-             * If in timestep mode and icon drawing off, draw a circle
-             * matching the color of the text
+             * If in timestep mode and icon drawing off, draw a circle matching
+             * the color of the text
              */
             if (pcOptions.getIcon() == 0) {
-                    Coordinate cd = gageTimeStep.getCoordinate();
-                    centerpixels = descriptor.worldToPixel(new double[] { cd.x,
-                            cd.y });
-                    Coordinate[] coors = new Coordinate[4];
-                    coors[0] = new Coordinate((centerpixels[0] + shiftWidth)
-                            - getScaleWidth(), (centerpixels[1] + shiftHeight)
-                            - getScaleHeight());
-                    coors[1] = new Coordinate((centerpixels[0] + shiftWidth)
-                            + getScaleWidth(), (centerpixels[1] + shiftHeight)
-                            - getScaleHeight());
-                    coors[2] = new Coordinate((centerpixels[0] + shiftWidth)
-                            + getScaleWidth(), (centerpixels[1] + shiftHeight)
-                            + getScaleHeight());
-                    coors[3] = new Coordinate((centerpixels[0] + shiftWidth)
-                            - getScaleWidth(), (centerpixels[1] + shiftHeight)
-                            + getScaleHeight());
+                Coordinate cd = gageTimeStep.getCoordinate();
+                centerpixels = descriptor.worldToPixel(new double[] { cd.x,
+                        cd.y });
+                Coordinate[] coors = new Coordinate[4];
+                coors[0] = new Coordinate((centerpixels[0] + shiftWidth)
+                        - getScaleWidth(), (centerpixels[1] + shiftHeight)
+                        - getScaleHeight());
+                coors[1] = new Coordinate((centerpixels[0] + shiftWidth)
+                        + getScaleWidth(), (centerpixels[1] + shiftHeight)
+                        - getScaleHeight());
+                coors[2] = new Coordinate((centerpixels[0] + shiftWidth)
+                        + getScaleWidth(), (centerpixels[1] + shiftHeight)
+                        + getScaleHeight());
+                coors[3] = new Coordinate((centerpixels[0] + shiftWidth)
+                        - getScaleWidth(), (centerpixels[1] + shiftHeight)
+                        + getScaleHeight());
 
-                    PixelExtent pe = new PixelExtent(coors);
-                    pe.scale(.07);
+                PixelExtent pe = new PixelExtent(coors);
+                pe.scale(.07);
+
+                target.drawShadedRect(pe, RGBColors.getRGBColor("White"), 1,
+                        null);
+            }
 
-                    target.drawShadedRect(pe, RGBColors.getRGBColor("White"), 1, null);
-            }            
-            
             DrawableString string = new DrawableString(valueStrings, strColor);
-            
+
             string.font = font;
             string.horizontalAlignment = HorizontalAlignment.RIGHT;
 
-            
             string.setCoordinates(valueCoor.x, valueCoor.y);
             strings.add(string);
-            
+
         }
 
         if (pdcManager.isTime()) {
@@ -568,7 +577,6 @@ public class MultiPointResource extends
             string.font = font;
             string.setCoordinates(dateCoor1.x, dateCoor1.y);
             strings.add(string);
-           
 
             string = new DrawableString(sdf2.format(gageTimeStep.getValidtime()
                     .getTime()), LABEL_COLOR);
@@ -603,16 +611,16 @@ public class MultiPointResource extends
         }
 
         if (pdcManager.isPE()) {
-        	
-        	String pe = "";
-        	if ( pcOptions.getElementType() == 1 ){
-        		
-        		 pe = gageTimeStep.getRainParam(pcOptions.getPrecipPeFilter());
-        	}else{
-        		
-        		 pe = gageTimeStep.getOtherParam();
-        	}
-        	
+
+            String pe = "";
+            if (pcOptions.getElementType() == 1) {
+
+                pe = gageTimeStep.getRainParam(pcOptions.getPrecipPeFilter());
+            } else {
+
+                pe = gageTimeStep.getOtherParam();
+            }
+
             Coordinate peCoor = new Coordinate(centerpixels[0] + shiftWidth
                     + getScaleWidth(), centerpixels[1] + shiftHeight
                     - getScaleHeight() / 2);
@@ -620,8 +628,7 @@ public class MultiPointResource extends
             string.font = font;
             string.setCoordinates(peCoor.x, peCoor.y);
             strings.add(string);
-            
-            
+
         }
 
         if (pdcManager.isElevation()) {
@@ -630,41 +637,43 @@ public class MultiPointResource extends
                     + getScaleWidth(), centerpixels[1] + shiftHeight
                     - getScaleHeight() / 2);
 
-            DrawableString string = new DrawableString(df.format(gageTimeStep.getElevation()), LABEL_COLOR);
+            DrawableString string = new DrawableString(df.format(gageTimeStep
+                    .getElevation()), LABEL_COLOR);
             string.font = font;
             string.setCoordinates(elCoor.x, elCoor.y);
             strings.add(string);
         }
         return strings;
     }
-    
-   
+
     /**
-     * Gets the color for value label in TimeStep mode 
+     * Gets the color for value label in TimeStep mode
+     * 
+     * @param plid
+     *            lid string
+     * 
+     * @param pValue
+     *            value
      * 
-     * @param plid   lid string
-     *
-     * @param pValue value
-     *
      * @throws VizException
-     */                                                            
-    private RGB getValueLabelColorTimeStep( String pLid, double pValue ){
-    	
-    	RGB textColor = RGBColors.getRGBColor("White");
-        
+     */
+    private RGB getValueLabelColorTimeStep(String pLid, double pValue) {
+
+        RGB textColor = RGBColors.getRGBColor("White");
+
         if ((pcOptions.getTsDataElement() == HydroConstants.TimeStepDataElement.STAGE_POOL_TSDE
-                    .getElementType())
-                    || (pcOptions.getTsDataElement() == HydroConstants.TimeStepDataElement.FLOW_STORAGE_TSDE
-                            .getElementType())) {
-                textColor = getRiverValueColorForTimeStepMode( pLid, pValue );
+                .getElementType())
+                || (pcOptions.getTsDataElement() == HydroConstants.TimeStepDataElement.FLOW_STORAGE_TSDE
+                        .getElementType())) {
+            textColor = getRiverValueColorForTimeStepMode(pLid, pValue);
         } else {
-                // textColor = new RGB(255, 255, 255);
-                textColor = determineValueColor( pValue );
+            // textColor = new RGB(255, 255, 255);
+            textColor = determineValueColor(pValue);
         }
 
         return textColor;
     }
-    
+
     /**
      * Draws the plot information
      * 
@@ -689,7 +698,6 @@ public class MultiPointResource extends
         int floodLevel = pcOptions.getFloodLevel();
         int deriveStageFlow = pcOptions.getDeriveStageFlow();
 
-        
         String valueLabel = null;
         String formatStr = null;
 
@@ -705,7 +713,7 @@ public class MultiPointResource extends
                     && (pcOptions.getElementType() == HydroConstants.AdHocDataElementType.RIVER_AD_HOC_TYPE
                             .getAdHocDataElementType())) {
                 showValue2 = true;
-                
+
             }
         }
 
@@ -725,7 +733,7 @@ public class MultiPointResource extends
                     (centerpixels[1] + shiftHeight) - getScaleHeight() / 2);
 
             textColor = RGBColors.getRGBColor("white");
-            
+
             DrawableString string = new DrawableString(valueLabel, textColor);
             string.font = font;
             string.horizontalAlignment = HorizontalAlignment.RIGHT;
@@ -979,16 +987,15 @@ public class MultiPointResource extends
         pdcManager.setColorUseName(colorUseName);
         pdcManager.setMultiPointResource(this);
         setScaleValues(paintProps);
-        
+
         resetDataMap();
-        
-                                                           
-        if ( pcOptions.getQueryMode() == 1 ){                          
-        	paintInternalHelperTimeStep( target, paintProps );	       
-        }else{                                                         
-        	paintInternalHelper( target, paintProps );                 
-        }                                                              
-        
+
+        if (pcOptions.getQueryMode() == 1) {
+            paintInternalHelperTimeStep(target, paintProps);
+        } else {
+            paintInternalHelper(target, paintProps);
+        }
+
         GageData currentData = manager.getCurrentData();
         if (currentData != null) {
             List<GageData> siteList = pdcManager.getObsReportList();
@@ -1003,7 +1010,7 @@ public class MultiPointResource extends
         }
 
     }
- 
+
     /**
      * Paint method called to display this resource in TimeStep mode.
      * 
@@ -1012,69 +1019,73 @@ public class MultiPointResource extends
      * @param paintProps
      *            The Paint Properties
      * @throws VizException
-     */                                                          
-    private void paintInternalHelperTimeStep(IGraphicsTarget target, PaintProperties paintProps) throws VizException {
-    	
-    	List<GageData> data = pdcManager.getObsReportList();
-    	
-    	if (data == null) {
-    		return;
-    	}
-    	
-    	for (GageData gage : data) {
-    		/* Get the point color for this location */
-    		if ((gage.getLid() != null) && gage.isUse()) {
-    	
-    			addPointTimeStep(gage);
-    			
-    		}
-    		
-    	}
-    	
-    	IExtent extent = paintProps.getView().getExtent();
-    	     
-    	List<PointImage> images = new ArrayList<PointImage>( dataMapTimeStep.size() );
-    	List<DrawableString> strings = new ArrayList<DrawableString>( dataMapTimeStep.size() * 3 );
-    	
-    	Iterator<Entry<String, GageDataTimeStep>> it = dataMapTimeStep.entrySet().iterator();
-    	Map.Entry<String, GageDataTimeStep> gageTS = null;
-    	while ( it.hasNext() ) {
-    			gageTS = it.next();
-    		
-    			Coordinate c = gageTS.getValue().getCoordinate();
-    			double[] pixel = descriptor.worldToPixel(new double[] { c.x, c.y });
-    			
-    			if (pixel != null && extent.contains(pixel)) {
-    				double shiftHeightValue = getShiftHeight(gageTS.getValue());
-    				double shiftWidthValue = getShiftWidth(gageTS.getValue());
-    				/* Draw the icons */
-    				if (pcOptions.getIcon() == 1) {
-    					RGB color = null;
-    					if (pcOptions.getRiverStatus() == 1) {
-    						color = gageTS.getValue().getColor();
-    					} else {
-    						color = RGBColors.getRGBColor(colorSet.get(0)
-                            .getColorname().getColorName());
-    					}    
-    					PointImage image = new PointImage( 
-    								getIcon(target, gageTS.getValue(), color), pixel[0], pixel[1] 
-    							);
-    				    					
-    					image.setSiteId(gageTS.getValue().getLid());
-    					images.add(image);
-    				}
-    				strings.addAll( drawPlotInfoTimeStep( gageTS.getValue(), shiftWidthValue, shiftHeightValue, paintProps, target ) );
-    			}
-    		
-    	}
+     */
+    private void paintInternalHelperTimeStep(IGraphicsTarget target,
+            PaintProperties paintProps) throws VizException {
 
-    	if (images.size() > 0) {
-    		target.getExtension(IPointImageExtension.class)
-            .drawPointImages(paintProps, images);
-    	}
-    	if (strings.size() > 0) {
-    		target.drawStrings(strings);
-    	}
+        List<GageData> data = pdcManager.getObsReportList();
+
+        if (data == null) {
+            return;
+        }
+
+        for (GageData gage : data) {
+            /* Get the point color for this location */
+            if ((gage.getLid() != null) && gage.isUse()) {
+
+                addPointTimeStep(gage);
+
+            }
+
+        }
+
+        IExtent extent = paintProps.getView().getExtent();
+
+        List<PointImage> images = new ArrayList<PointImage>(
+                dataMapTimeStep.size());
+        List<DrawableString> strings = new ArrayList<DrawableString>(
+                dataMapTimeStep.size() * 3);
+
+        Iterator<Entry<String, GageDataTimeStep>> it = dataMapTimeStep
+                .entrySet().iterator();
+        Map.Entry<String, GageDataTimeStep> gageTS = null;
+        while (it.hasNext()) {
+            gageTS = it.next();
+
+            Coordinate c = gageTS.getValue().getCoordinate();
+            double[] pixel = descriptor.worldToPixel(new double[] { c.x, c.y });
+
+            if (pixel != null && extent.contains(pixel)) {
+                double shiftHeightValue = getShiftHeight(gageTS.getValue());
+                double shiftWidthValue = getShiftWidth(gageTS.getValue());
+                /* Draw the icons */
+                if (pcOptions.getIcon() == 1) {
+                    RGB color = null;
+                    if (pcOptions.getRiverStatus() == 1) {
+                        color = gageTS.getValue().getColor();
+                    } else {
+                        color = RGBColors.getRGBColor(colorSet.get(0)
+                                .getColorname().getColorName());
+                    }
+                    PointImage image = new PointImage(getIcon(target,
+                            gageTS.getValue(), color), pixel[0], pixel[1]);
+
+                    image.setSiteId(gageTS.getValue().getLid());
+                    images.add(image);
+                }
+                strings.addAll(drawPlotInfoTimeStep(gageTS.getValue(),
+                        shiftWidthValue, shiftHeightValue, paintProps, target));
+            }
+
+        }
+
+        if (images.size() > 0) {
+            target.getExtension(IPointImageExtension.class).drawPointImages(
+                    paintProps, images);
+        }
+        if (strings.size() > 0) {
+            target.drawStrings(strings);
+        }
     }
 
     /**
@@ -1086,58 +1097,62 @@ public class MultiPointResource extends
      *            The Paint Properties
      * @throws VizException
      */
-    private void paintInternalHelper(IGraphicsTarget target, PaintProperties paintProps) throws VizException {
-    	
-    	List<GageData> data = pdcManager.getObsReportList();
-    	
-    	if (data == null) {
-    		return;
-    	}
-    	
-    	IExtent extent = paintProps.getView().getExtent();
-    	     
-    	List<PointImage> images = new ArrayList<PointImage>( data.size() );
-    	List<DrawableString> strings = new ArrayList<DrawableString>( data.size() * 3 );
-    	for (GageData gage : data) {
-    		/* Get the point color for this location */
-    		if ((gage.getLid() != null) && gage.isUse()) {
-    	
-    			addPoint(gage);
-        
-    			Coordinate c = gage.getCoordinate();
-    			double[] pixel = descriptor.worldToPixel(new double[] { c.x, c.y });
-    			
-    			if (pixel != null && extent.contains(pixel)) {
-    				double shiftHeightValue = getShiftHeight(gage);
-    				double shiftWidthValue = getShiftWidth(gage);
-    				/* Draw the icons */
-    				if (pcOptions.getIcon() == 1) {
-    					RGB color = null;
-    					if (pcOptions.getRiverStatus() == 1) {
-    						color = gage.getColor();
-    					} else {
-    						color = RGBColors.getRGBColor(colorSet.get(0)
-                            .getColorname().getColorName());
-    					}
-    					PointImage image = new PointImage(getIcon(target,
-                        gage, color), pixel[0], pixel[1]);
-    					image.setSiteId(gage.getLid());
-    					images.add(image);
-    				}
-    				strings.addAll( drawPlotInfo(gage, shiftWidthValue, shiftHeightValue, paintProps, target) );
-    			}
-    		}
-    	}
+    private void paintInternalHelper(IGraphicsTarget target,
+            PaintProperties paintProps) throws VizException {
 
-    	if (images.size() > 0) {
-    		target.getExtension(IPointImageExtension.class)
-            .drawPointImages(paintProps, images);
-    	}
-    	if (strings.size() > 0) {
-    		target.drawStrings(strings);
-    	}
+        List<GageData> data = pdcManager.getObsReportList();
+
+        if (data == null) {
+            return;
+        }
+
+        IExtent extent = paintProps.getView().getExtent();
+
+        List<PointImage> images = new ArrayList<PointImage>(data.size());
+        List<DrawableString> strings = new ArrayList<DrawableString>(
+                data.size() * 3);
+        for (GageData gage : data) {
+            /* Get the point color for this location */
+            if ((gage.getLid() != null) && gage.isUse()) {
+
+                addPoint(gage);
+
+                Coordinate c = gage.getCoordinate();
+                double[] pixel = descriptor.worldToPixel(new double[] { c.x,
+                        c.y });
+
+                if (pixel != null && extent.contains(pixel)) {
+                    double shiftHeightValue = getShiftHeight(gage);
+                    double shiftWidthValue = getShiftWidth(gage);
+                    /* Draw the icons */
+                    if (pcOptions.getIcon() == 1) {
+                        RGB color = null;
+                        if (pcOptions.getRiverStatus() == 1) {
+                            color = gage.getColor();
+                        } else {
+                            color = RGBColors.getRGBColor(colorSet.get(0)
+                                    .getColorname().getColorName());
+                        }
+                        PointImage image = new PointImage(getIcon(target, gage,
+                                color), pixel[0], pixel[1]);
+                        image.setSiteId(gage.getLid());
+                        images.add(image);
+                    }
+                    strings.addAll(drawPlotInfo(gage, shiftWidthValue,
+                            shiftHeightValue, paintProps, target));
+                }
+            }
+        }
+
+        if (images.size() > 0) {
+            target.getExtension(IPointImageExtension.class).drawPointImages(
+                    paintProps, images);
+        }
+        if (strings.size() > 0) {
+            target.drawStrings(strings);
+        }
     }
-    
+
     /**
      * Set the selected coordinate
      * 
@@ -1228,9 +1243,8 @@ public class MultiPointResource extends
         }
         return null;
     }
-  
 
-    private RGB getRiverValueColorForTimeStepMode( String pLid, double pValue ) {
+    private RGB getRiverValueColorForTimeStepMode(String pLid, double pValue) {
         RGB color = null;
         String threatIndex = ThreatIndex.THREAT_MISSING_DATA.getThreatIndex();
 
@@ -1259,12 +1273,12 @@ public class MultiPointResource extends
         }
 
         // determine the threat level
-        if (( pValue ) != PDCConstants.MISSING_VALUE) {
+        if ((pValue) != PDCConstants.MISSING_VALUE) {
             threatIndex = ThreatIndex.THREAT_MISSING_STAGE.getThreatIndex();
 
             if ((actionLevel != PDCConstants.MISSING_VALUE)
                     && (actionLevel != 0)) {
-                if ( pValue >= actionLevel) {
+                if (pValue >= actionLevel) {
                     threatIndex = ThreatIndex.THREAT_ACTION.getThreatIndex();
                 } else {
                     threatIndex = ThreatIndex.THREAT_NONE.getThreatIndex();
@@ -1272,7 +1286,7 @@ public class MultiPointResource extends
             }
 
             if ((floodLevel != PDCConstants.MISSING_VALUE) && (floodLevel != 0)) {
-                if ( pValue >= floodLevel) {
+                if (pValue >= floodLevel) {
                     threatIndex = ThreatIndex.THREAT_FLOOD.getThreatIndex();
                 } else if (actionLevel == PDCConstants.MISSING_VALUE) {
                     threatIndex = ThreatIndex.THREAT_NONE.getThreatIndex();
@@ -1491,19 +1505,19 @@ public class MultiPointResource extends
 
     /**
      * Clear the data map.
-     */  
+     */
     public void resetDataMap() {
-    	
-    	if (pcOptions.getQueryMode() == 1){
-    		
-    		dataMapTimeStep.clear();
+
+        if (pcOptions.getQueryMode() == 1) {
+
+            dataMapTimeStep.clear();
             
-    	}else{
+        } else {
+
+            dataMap.clear();
     		
-    		dataMap.clear();
-    		
-    	}
-    	
+        }
+
     	strTree = new STRtree();
     }
 
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
index e1733db37a..d186f51b60 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDataManager.java
@@ -30,6 +30,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 
+import org.apache.commons.lang.time.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
 import com.raytheon.uf.common.dataplugin.shef.tables.Fcstheight;
 import com.raytheon.uf.common.dataplugin.shef.tables.FcstheightId;
@@ -77,6 +81,8 @@ import com.raytheon.viz.hydrocommon.util.DbUtils;
  * Aug 18, 2015 4793       rjpeter     Use Number in blind cast.
  * Nov 06, 2015 17846      lbousaidi   modify edit and insertRejectedData so that quality_code.
  *                                     is reset from Bad to Good after data QC.
+ * Feb 16, 2016 5342       bkowal      Ensure two rejected records with the same key values are
+ *                                     not inserted at the same second.
  * </pre>
  * 
  * @author dhladky
@@ -85,6 +91,8 @@ import com.raytheon.viz.hydrocommon.util.DbUtils;
 
 public class TimeSeriesDataManager extends HydroDataManager {
 
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
     private static final String TIME_SERIES_DATA_QUERY = "select lid,obstime,lid,product_id from latestobsvalue";
 
     private final String INGEST_FILTER_QUERY = "select lid,pe,ts,extremum,dur from ingestfilter where lid=':lid' and ingest = 'T' order by pe asc,ts_rank asc,ts asc,dur asc,extremum asc";
@@ -104,9 +112,6 @@ public class TimeSeriesDataManager extends HydroDataManager {
     /** Quality control value for manual "Good" */
     private final int QC_MANUAL_PASSED = 121;
 
-    /** Quality control value for manual "Bad". */
-    private final int QC_MANUAL_FAILED = 123;
-
     /**
      * Map holding the location id and display class.
      */
@@ -553,16 +558,21 @@ public class TimeSeriesDataManager extends HydroDataManager {
         boolean debug = ad.getBoolean(HydroConstants.DEBUG_HYDRO_DB_TOKEN,
                 false);
         if (debug) {
-            System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+            /*
+             * Since debug is set by Apps Defaults and not via logger
+             * configuration, these message will be logged as info messages to
+             * ensure that they are output even if debug messages have been
+             * disabled at the logger level.
+             */
+            logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                     + ad.getToken(HydroConstants.PGPORT) + ":"
                     + ad.getToken(HydroConstants.DB_NAME));
-            System.out.println("Query: " + sql.toString());
+            logger.info("Query: " + sql.toString());
         }
 
         ArrayList<TabularData> tabularData = new ArrayList<TabularData>();
-        ArrayList<Object[]> results = (ArrayList<Object[]>) DirectDbQuery
-                .executeQuery(sql.toString(), HydroConstants.IHFS,
-                        QueryLanguage.SQL);
+        List<Object[]> results = DirectDbQuery.executeQuery(sql.toString(),
+                HydroConstants.IHFS, QueryLanguage.SQL);
 
         for (int i = 0; i < results.size(); i++) {
             Object[] oa = results.get(i);
@@ -608,10 +618,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 false);
 
         if (debug) {
-            System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+            logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                     + ad.getToken(HydroConstants.PGPORT) + ":"
                     + ad.getToken(HydroConstants.DB_NAME));
-            System.out.println("Query: " + sql);
+            logger.info("Query: " + sql);
         }
 
         List<Object[]> results = DirectDbQuery.executeQuery(sql.toString(),
@@ -642,10 +652,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 false);
 
         if (debug) {
-            System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+            logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                     + ad.getToken(HydroConstants.PGPORT) + ":"
                     + ad.getToken(HydroConstants.DB_NAME));
-            System.out.println("Query: " + sql);
+            logger.info("Query: " + sql);
         }
         DirectDbQuery.executeStatement(sql, HydroConstants.IHFS,
                 QueryLanguage.SQL);
@@ -725,10 +735,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 false);
 
         if (debug) {
-            System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+            logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                     + ad.getToken(HydroConstants.PGPORT) + ":"
                     + ad.getToken(HydroConstants.DB_NAME));
-            System.out.println("Query: " + sb.toString());
+            logger.info("Query: " + sb.toString());
         }
 
         return DirectDbQuery.executeStatement(sb.toString(),
@@ -749,10 +759,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 false);
 
         if (debug) {
-            System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+            logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                     + ad.getToken(HydroConstants.PGPORT) + ":"
                     + ad.getToken(HydroConstants.DB_NAME));
-            System.out.println("Query: " + sql);
+            logger.info("Query: " + sql);
         }
 
         return DirectDbQuery.executeStatement(sql, HydroConstants.IHFS,
@@ -889,10 +899,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 false);
 
         if (debug) {
-            System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+            logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                     + ad.getToken(HydroConstants.PGPORT) + ":"
                     + ad.getToken(HydroConstants.DB_NAME));
-            System.out.println("Query: " + sb.toString());
+            logger.info("Query: " + sb.toString());
         }
 
         return DirectDbQuery.executeStatement(sb.toString(),
@@ -924,20 +934,58 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 return sqlResult.get(0)[0];
             }
         } catch (VizException e) {
-            e.printStackTrace();
-            return null;
+            logger.error("Failed to retrieve data from table: " + tablename
+                    + ".", e);
         }
 
         return null;
     }
 
-    public int insertRejectedData(List<ForecastData> deleteList)
-            throws VizException {
+    public int insertRejectedData(List<ForecastData> deleteList,
+            Map<RejecteddataId, Integer> rejectedSecondsMap,
+            Date insertStartTime) throws VizException {
         StringBuilder sb = new StringBuilder();
 
-        Date currentTime = Calendar.getInstance(TimeZone.getTimeZone("GMT"))
-                .getTime();
+        /*
+         * part of the primary key. So, should be unique with each record
+         * insert.
+         */
         for (ForecastData dr : deleteList) {
+            /*
+             * This will ensure that records that would normally have the same
+             * id will at least be offset by a second. This is needed because
+             * the dynamic time field that is part of the primary key only has a
+             * resolution out to the seconds field. The insert of a record does
+             * not take an entire second. This implementation is limited by the
+             * fact that only sixty of a particular record can be inserted
+             * without conflicting with a potential future insert less than a
+             * minute later. The inserts are mapped by id to reduce the amount
+             * of data manipulation that would occur when there is a lack of
+             * duplicate records. The ideal scenario would be to alter the data
+             * record so that it would not be necessary to offset the posting
+             * time by a second to ensure uniqueness; however, a changeset that
+             * large is far outside the scope of DR #5342.
+             */
+            RejecteddataId id = new RejecteddataId();
+            id.setLid(dr.getLid());
+            id.setPe(dr.getPe());
+            id.setDur((short) dr.getDur());
+            id.setTs(dr.getTs());
+            id.setExtremum(dr.getExtremum());
+            id.setProbability((float) dr.getProbability());
+            id.setValidtime(dr.getValidTime());
+            id.setBasistime(dr.getBasisTime());
+            id.setPostingtime(insertStartTime);
+            Integer offsetSeconds = rejectedSecondsMap.get(id);
+            if (offsetSeconds == null) {
+                offsetSeconds = 0;
+            } else {
+                offsetSeconds += 1;
+            }
+            rejectedSecondsMap.put(id, offsetSeconds);
+
+            final Date postingTime = DateUtils.addSeconds(insertStartTime,
+                    offsetSeconds);
 
             int probability = -1;
             int revision = 1;
@@ -957,7 +1005,8 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 productID = dr.getProductID();
             }
 
-            Integer qualityCode = ((Number) getDataFromDB(dr, "quality_code")).intValue();
+            Integer qualityCode = ((Number) getDataFromDB(dr, "quality_code"))
+                    .intValue();
             if (qualityCode == null) {
                 qualityCode = new Integer(dr.getQualityCode());
             }
@@ -996,7 +1045,7 @@ public class TimeSeriesDataManager extends HydroDataManager {
                         + "', ");
             }
 
-            sb.append("'" + HydroConstants.DATE_FORMAT.format(currentTime)
+            sb.append("'" + HydroConstants.DATE_FORMAT.format(postingTime)
                     + "', ");
             sb.append(dr.getValue() + ", ");
             sb.append(revision + ", ");
@@ -1015,10 +1064,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 false);
 
         if (debug) {
-            System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+            logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                     + ad.getToken(HydroConstants.PGPORT) + ":"
                     + ad.getToken(HydroConstants.DB_NAME));
-            System.out.println("Query: " + sb.toString());
+            logger.info("Query: " + sb.toString());
         }
 
         return DirectDbQuery.executeStatement(sb.toString(),
@@ -1063,10 +1112,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                     false);
 
             if (debug) {
-                System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+                logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                         + ad.getToken(HydroConstants.PGPORT) + ":"
                         + ad.getToken(HydroConstants.DB_NAME));
-                System.out.println("Query: " + sql);
+                logger.info("Query: " + sql);
             }
 
             status = DirectDbQuery.executeStatement(sql.toString(),
@@ -1133,10 +1182,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                     false);
 
             if (debug) {
-                System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+                logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                         + ad.getToken(HydroConstants.PGPORT) + ":"
                         + ad.getToken(HydroConstants.DB_NAME));
-                System.out.println("Query: " + sql.toString());
+                logger.info("Query: " + sql.toString());
             }
 
             status = DirectDbQuery.executeStatement(sql.toString(),
@@ -1161,7 +1210,7 @@ public class TimeSeriesDataManager extends HydroDataManager {
         for (int i = 0; i < editList.size(); i++) {
             ForecastData data = editList.get(i);
             String tablename = DbUtils.getTableName(data.getPe(), data.getTs());
-            //set the QC to GOOD when you set data to missing.
+            // set the QC to GOOD when you set data to missing.
             data.setQualityCode(TimeSeriesUtil.setQcCode(QC_MANUAL_PASSED,
                     data.getQualityCode()));
             SqlBuilder sql = new SqlBuilder(tablename);
@@ -1201,10 +1250,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                     false);
 
             if (debug) {
-                System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+                logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                         + ad.getToken(HydroConstants.PGPORT) + ":"
                         + ad.getToken(HydroConstants.DB_NAME));
-                System.out.println("Query: " + sql);
+                logger.info("Query: " + sql);
             }
 
             DirectDbQuery.executeStatement(sql.toString(), HydroConstants.IHFS,
@@ -1236,10 +1285,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 false);
 
         if (debug) {
-            System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+            logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                     + ad.getToken(HydroConstants.PGPORT) + ":"
                     + ad.getToken(HydroConstants.DB_NAME));
-            System.out.println("Query: " + sql);
+            logger.info("Query: " + sql);
         }
 
         List<Object[]> rs = DirectDbQuery.executeQuery(sql.toString(),
@@ -1281,10 +1330,10 @@ public class TimeSeriesDataManager extends HydroDataManager {
                 false);
 
         if (debug) {
-            System.out.println(ad.getToken(HydroConstants.PGHOST) + ":"
+            logger.info(ad.getToken(HydroConstants.PGHOST) + ":"
                     + ad.getToken(HydroConstants.PGPORT) + ":"
                     + ad.getToken(HydroConstants.DB_NAME));
-            System.out.println("Query: " + query.toString());
+            logger.info("Query: " + query.toString());
         }
 
         List<Object[]> results = DirectDbQuery.executeQuery(query.toString(),
@@ -1332,7 +1381,8 @@ public class TimeSeriesDataManager extends HydroDataManager {
      * @return The number of objects inserted/updated
      * @throws VizException
      */
-    public int putForecast(PersistableDataObject dataObj) throws VizException {
+    public int putForecast(PersistableDataObject<?> dataObj)
+            throws VizException {
         int rv = 0;
 
         rv = DirectDbQuery.saveOrUpdate(dataObj, HydroConstants.IHFS);
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
index 132d3432a5..46d6368803 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
@@ -142,6 +142,8 @@ import com.raytheon.viz.hydrocommon.util.DbUtils;
  * 05 Sep   2013 #2332   lvenable     Fixed memory leaks.       
  * 24 Jan   2013  15959  lbousaidi    Swap the corner points of the bounding box when zooming.    
  * 22 Oct   2015  13736  xwei         Fixed missing data after zoom, edit, & reset problem
+ * Nov 18   2015  5073   skorolev     Fixed drawing PP time series.
+ *     
  * @author lvenable
  * @version 1.0
  * 
@@ -842,7 +844,8 @@ public class TimeSeriesDisplayCanvas extends TimeSeriesGraphCanvas implements
                 }
 
                 /* Precipitation physical element */
-                if (td.getPe().equalsIgnoreCase(HydroConstants.PP)) {
+                if (td.getPe().equalsIgnoreCase(HydroConstants.PP)
+                        && td.isTraceOn()) {
                     precipPE = true;
                     setBackgroundColor(td, j, gc);
                     int[] ia = new int[8];
@@ -1265,12 +1268,12 @@ public class TimeSeriesDisplayCanvas extends TimeSeriesGraphCanvas implements
                 }
                 Date xMin = pixel2x(gd, rubberBandX1 - GRAPHBORDER_LEFT);
                 Date xMax = pixel2x(gd, rubberBandX2 - GRAPHBORDER_LEFT);
-                //Swap the corner points of the bounding box when zooming
+                // Swap the corner points of the bounding box when zooming
                 if (xMin.after(xMax)) {
-                	Date xtmp;
-                	xtmp= xMin;
-                	xMin=xMax;
-                	xMax=xtmp;                	
+                    Date xtmp;
+                    xtmp = xMin;
+                    xMin = xMax;
+                    xMax = xtmp;
                 }
                 gd.setXMin(xMin);
                 gd.setXMax(xMax);
@@ -1286,12 +1289,12 @@ public class TimeSeriesDisplayCanvas extends TimeSeriesGraphCanvas implements
                 if (ymin < gd.getYmin()) {
                     ymin = gd.getYmin();
                 }
-                //Swap the corner points of the bounding box when zooming
+                // Swap the corner points of the bounding box when zooming
                 if (ymin > ymax) {
-                	double ytmp;
-                	ytmp= ymin;
-                	ymin=ymax;
-                	ymax=ytmp;
+                    double ytmp;
+                    ytmp = ymin;
+                    ymin = ymax;
+                    ymax = ytmp;
                 }
                 gd.setYmin(ymin);
                 gd.setYmax(ymax);
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
index 6dc06100b8..0455cbd0dd 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
@@ -21,8 +21,12 @@ package com.raytheon.viz.hydro.timeseries;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.TimeZone;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
@@ -50,6 +54,7 @@ import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.swt.widgets.Shell;
 
+import com.raytheon.uf.common.dataplugin.shef.tables.RejecteddataId;
 import com.raytheon.uf.common.ohd.AppsDefaults;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -94,7 +99,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 30 Jan 2012 15459     mpduff        Redmine 1560 - Make graph canvases redraw on page up/down.
  * 06 Feb 2013 1578      rferrel       Code cleanup for non-blocking dialogs.
  * 24 Apr 2013  1921     mpduff        Fix zoom reset to only reset the "active" graph
- * 14 May 2014 16388     xwei          updated the insertion of rejecteddata table. 
+ * 14 May 2014 16388     xwei          updated the insertion of rejecteddata table.
+ * 16 Feb 2016 5342      bkowal        Ensure rejected data keys are unique.
  * 
  * </pre>
  * 
@@ -328,10 +334,10 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
     /**
      * Display Canvas List.
      */
-    private final ArrayList<TimeSeriesDisplayCanvas> canvasList = new ArrayList<TimeSeriesDisplayCanvas>();
+    private final List<TimeSeriesDisplayCanvas> canvasList = new ArrayList<TimeSeriesDisplayCanvas>();
 
     /** List of page composites */
-    private final ArrayList<Composite> pageCompList = new ArrayList<Composite>();
+    private final List<Composite> pageCompList = new ArrayList<Composite>();
 
     /**
      * The page currently displayed.
@@ -413,11 +419,6 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
         this.parentDialog = parentDialog;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.ui.dialogs.CaveSWTDialogBase#constructShellLayout()
-     */
     @Override
     protected Layout constructShellLayout() {
         // Create the main layout for the shell.
@@ -428,24 +429,11 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
         return mainLayout;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ui.dialogs.CaveSWTDialogBase#constructShellLayoutData()
-     */
     @Override
     protected Object constructShellLayoutData() {
         return new GridData(SWT.FILL, SWT.FILL, true, true);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.ui.dialogs.CaveSWTDialogBase#initializeComponents(org
-     * .eclipse.swt.widgets.Shell)
-     */
     @Override
     protected void initializeComponents(final Shell shell) {
         // Get default values from Apps Defaults
@@ -476,11 +464,6 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
         shell.setMinimumSize(new Point(900, 900));
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.ui.dialogs.CaveSWTDialog#preOpened()
-     */
     @Override
     protected void preOpened() {
         super.preOpened();
@@ -857,9 +840,20 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
                     setSelectTrace(false);
                     TimeSeriesDataManager dataManager = TimeSeriesDataManager
                             .getInstance();
+                    Map<RejecteddataId, Integer> rejectedSecondsMap = new HashMap<>(
+                            deleteList.size(), 1.0f);
+                    /*
+                     * The insertion start time is remembered prior to any
+                     * inserts into the rejected data table. This will ensure
+                     * that insertion times will remain unique across both
+                     * potential inserts into the rejected data table below.
+                     */
+                    Date insertStartTime = Calendar.getInstance(
+                            TimeZone.getTimeZone("GMT")).getTime();
                     if (deleteList.size() > 0) {
                         try {
-                            dataManager.insertRejectedData(deleteList);
+                            dataManager.insertRejectedData(deleteList,
+                                    rejectedSecondsMap, insertStartTime);
                             dataManager.delete(deleteList);
                             updateMaxFcst(deleteList);
                         } catch (VizException e) {
@@ -889,7 +883,8 @@ public class TimeSeriesDisplayDlg extends CaveSWTDialog {
 
                     if (editList.size() > 0) {
                         try {
-                        	dataManager.insertRejectedData(editList);
+                            dataManager.insertRejectedData(editList,
+                                    rejectedSecondsMap, insertStartTime);
                             dataManager.edit(editList);
                             updateMaxFcst(editList);
                         } catch (VizException e) {
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
index 12df601a22..06bec79380 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
@@ -53,6 +53,7 @@ import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
@@ -61,7 +62,6 @@ import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
 
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.PathManagerFactory;
@@ -128,6 +128,7 @@ import com.raytheon.viz.hydrocommon.util.StnClassSyncUtil;
  * Oct 13, 2015 4933       rferrel     Log error if unable to find group definition file
  *                                      Fixed formatter resource leaks.
  * 30 Oct, 2015 15102      wkwock      Implements preferred order for PE-D-TS-EXT list
+ * Jan 26, 2016 5054       randerso    Allow dialog to be parented to display
  * 
  * </pre>
  * 
@@ -497,9 +498,7 @@ public class TimeSeriesDlg extends CaveHydroSWTDialog {
     public final static TimeSeriesDlg getInstance() {
         // Independent shell must be recreated after closing.
         if ((instance == null) || !instance.isOpen()) {
-            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                    .getShell();
-            instance = new TimeSeriesDlg(shell);
+            instance = new TimeSeriesDlg(Display.getCurrent());
         }
         return instance;
     }
@@ -507,11 +506,10 @@ public class TimeSeriesDlg extends CaveHydroSWTDialog {
     /**
      * Constructor.
      * 
-     * @param parent
-     *            Parent shell.
+     * @param display
      */
-    private TimeSeriesDlg(Shell parent) {
-        super(parent, CAVE.INDEPENDENT_SHELL);
+    private TimeSeriesDlg(Display display) {
+        super(display, CAVE.INDEPENDENT_SHELL);
         setText("Time Series Control");
 
         displayManager = HydroDisplayManager.getInstance();
@@ -523,14 +521,13 @@ public class TimeSeriesDlg extends CaveHydroSWTDialog {
     /**
      * Constructor for stand alone dialog.
      * 
-     * @param parent
-     *            the Parent shell.
+     * @param display
      * 
      * @param groupConfigFile
      *            the user-specified file with group configuration information.
      */
-    public TimeSeriesDlg(Shell parent, File groupConfigFile) {
-        this(parent);
+    public TimeSeriesDlg(Display display, File groupConfigFile) {
+        this(display);
 
         this.standaloneMode = true;
         // Ensure That The Group Configuration File Exists.
@@ -1541,12 +1538,12 @@ public class TimeSeriesDlg extends CaveHydroSWTDialog {
                 si.setDur(((Number) row[4]).intValue());
 
                 boolean preferredLstFlg = false;
-                if (peMap!=null){
+                if (peMap != null) {
                     String[] typeSrcLst = peMap.get(si.getPe());
 
                     if (typeSrcLst != null) {
                         for (String typesrc : typeSrcLst) {
-                            
+
                             if (typesrc.equalsIgnoreCase(si.getTs())) {
                                 preferredLstFlg = true;
                                 break;
@@ -1621,7 +1618,7 @@ public class TimeSeriesDlg extends CaveHydroSWTDialog {
                 tsSelected = false;
             }
 
-            populatePreferredDataInOrder(preferredMap,peMap);
+            populatePreferredDataInOrder(preferredMap, peMap);
             processDataList(hMap, tsSelected);
             processDataList(qMap, tsSelected);
             processDataList(pMap, tsSelected);
@@ -1632,33 +1629,37 @@ public class TimeSeriesDlg extends CaveHydroSWTDialog {
             selectedDataLbl.setText(selectedLid);
             bottomDataList.setSelection(0);
         } catch (VizException e) {
-            statusHandler.error("Failed to populate time series list",e);
+            statusHandler.error("Failed to populate time series list", e);
         }
     }
 
     /**
      * populate data to bottomDataList base on preferred predefined order
+     * 
      * @param preferredMap
      * @param peMap
      */
-    private void populatePreferredDataInOrder (LinkedHashMap<String, ArrayList<SiteInfo>>preferredMap, Map<String, String[]> peMap) {
-        if (peMap!=null && preferredMap!=null ){
-            for (String pe:peMap.keySet()){
+    private void populatePreferredDataInOrder(
+            LinkedHashMap<String, ArrayList<SiteInfo>> preferredMap,
+            Map<String, String[]> peMap) {
+        if ((peMap != null) && (preferredMap != null)) {
+            for (String pe : peMap.keySet()) {
                 java.util.List<SiteInfo> siList = preferredMap.get(pe);
-                
+
                 if (siList == null) {
                     continue;
                 }
-                
-                String[] tsList =  peMap.get(pe);
-                if (tsList==null) { //There's PE but no TS in preffered_order.txt
-                    for(SiteInfo si : siList) {
+
+                String[] tsList = peMap.get(pe);
+                if (tsList == null) { // There's PE but no TS in
+                                      // preffered_order.txt
+                    for (SiteInfo si : siList) {
                         bottomDataList.add(formatDataLine(si));
                         siteInfoList.add(si);
                     }
-                } else { //There's both PE and TS in preferred_order.txt
-                    for (String ts: tsList){
-                        for(SiteInfo si : siList) {
+                } else { // There's both PE and TS in preferred_order.txt
+                    for (String ts : tsList) {
+                        for (SiteInfo si : siList) {
                             if (ts.equalsIgnoreCase(si.getTs())) {
                                 bottomDataList.add(formatDataLine(si));
                                 siteInfoList.add(si);
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigComponent.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigComponent.java
index 72c7766f0b..6d182f7324 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigComponent.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigComponent.java
@@ -22,7 +22,6 @@ package com.raytheon.viz.hydro.timeseries;
 import java.io.File;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
 
@@ -35,8 +34,9 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 28, 2011            mschenke     Initial creation
+ * Apr 28, 2011            mschenke    Initial creation
  * Feb 05, 2013 1578       rferrel     Changes for non-blocking singleton TimeSeriesDlg.
+ * Jan 26, 2016 5054       randerso    Make dialog parented to display
  * 
  * </pre>
  * 
@@ -59,8 +59,8 @@ public class TimeSeriesconfigComponent extends AbstractCAVEDialogComponent {
      */
     @Override
     protected void startInternal(String componentName) throws Exception {
-        TimeSeriesDlg timeSeriesDialog = new TimeSeriesDlg(new Shell(
-                Display.getCurrent()),
+        TimeSeriesDlg timeSeriesDialog = new TimeSeriesDlg(
+                Display.getCurrent(),
                 TimeSeriesconfigComponent.locateGroupDefinitionFile());
         timeSeriesDialog.open();
         blockUntilClosed(timeSeriesDialog);
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/graph/TimeSeriesGraphCanvas.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/graph/TimeSeriesGraphCanvas.java
index 860f762da3..0ccaba3663 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/graph/TimeSeriesGraphCanvas.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/graph/TimeSeriesGraphCanvas.java
@@ -70,6 +70,7 @@ import com.raytheon.viz.hydrocommon.HydroConstants;
  * 06 Nov  2012 15399      wkwock      Fix refine the plot algorithm and sampling algorithm
  * May 06, 2013 1976       mpduff      Code cleanup
  * 05Sep2013    #2332      lvenable    Fixed memory leaks.
+ * Nov 18, 2015 5073       skorolev    Fixed y2pixel.
  * </pre>
  * 
  * @author mpduff
@@ -624,8 +625,11 @@ public class TimeSeriesGraphCanvas extends Canvas {
         }
         double yDiff = gd.getYmax() - gd.getYmin();
         double yValue = (graphAreaHeight / yDiff) * (y - gd.getYmin());
-
-        return (int) (graphAreaHeight - Math.round(yValue));
+        if (yValue < 0) {
+            return graphAreaHeight;
+        } else {
+            return (int) (graphAreaHeight - Math.round(yValue));
+        }
     }
 
     /**
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/util/TimeSeriesUtil.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/util/TimeSeriesUtil.java
index 99eb8f091d..26b7a26092 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/util/TimeSeriesUtil.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/util/TimeSeriesUtil.java
@@ -46,6 +46,8 @@ import com.raytheon.viz.hydrocommon.util.QualityCodeUtil;
  * June 1, 2011 9499       djingtao    convertDurNameToValue()
  * July 12, 2011 9709      djingtao    modify tsAccumToInc3()
  * Aug 25, 2015 4794       mpduff      Added 5 min duration.
+ * Jan 13, 2015 5243       tgurney     Fix convertDur2Short() handling of
+ *                                     numeric characters
  * </pre>
  * 
  * @author mpduff
@@ -144,7 +146,7 @@ public class TimeSeriesUtil {
     public static final int ALL_ONES = 2147483647;
 
     private static final HashBiMap<Integer, Character> durationMap = HashBiMap
-            .create(21);
+            .create(23);
     static {
         durationMap.put(0, 'I');
         durationMap.put(1, 'U');
@@ -172,6 +174,13 @@ public class TimeSeriesUtil {
     }
 
     public static short convertDur2Short(char dur) {
+        int durAsInt = Character.getNumericValue(dur);
+        if (durAsInt >= 0) {
+            if (!durationMap.containsKey(durAsInt)) {
+                return 0;
+            }
+            return (short) durAsInt;
+        }
         if (!durationMap.containsValue(dur)) {
             return 0;
         }
diff --git a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/util/TraceData.java b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/util/TraceData.java
index 5bf8cc1435..157a222b9d 100644
--- a/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/util/TraceData.java
+++ b/cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/util/TraceData.java
@@ -31,14 +31,16 @@ import com.raytheon.viz.hydrocommon.HydroConstants;
  * 
  * SOFTWARE HISTORY
  * 
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Jun 25, 2008	1194		mpduff	Initial creation
- * Mar 04, 2011 7758        Jingtao added isSelectionCheckOn flag for 
- * 							pop up menu
- * Apr 05, 2011 8732        jpiatt  Added product_id.
- * June,1, 2011 9499        djingtao change setDur()
- * 22 Oct  2015 13736       xwei         Added getZoomIndexOffset() method
+ * Date            Ticket#       Engineer       Description
+ * ------------    ----------    -----------    --------------------------
+ * Jun 25, 2008    1194          mpduff         Initial creation
+ * Mar 04, 2011    7758          Jingtao        added isSelectionCheckOn flag for
+ *                                              pop up menu
+ * Apr 05, 2011    8732          jpiatt         Added product_id.
+ * June,1, 2011    9499          djingtao       change setDur()
+ * 22 Oct  2015    13736         xwei           Added getZoomIndexOffset() method
+ * Jan 13, 2016    5243          tgurney        Added duration codes E (5 min.)
+ *                                              and G (10 min.)
  * 
  * </pre>
  * 
@@ -47,584 +49,601 @@ import com.raytheon.viz.hydrocommon.HydroConstants;
  */
 
 public class TraceData implements Serializable {
-	private static final long serialVersionUID = -4345330013536912094L;
-	private static final String CODES = "IUCJHBTFQAKLDWMYZSRPX";
-	private static final int[] INT_CODE_ARRAY = { 0, 1, 15, 30, 1001, 1002,
-			1003, 1004, 1006, 1008, 1012, 1018, 2001, 2007, 3001, 4001, 5000,
-			5001, 5002, 5004, 5005 };
-
-	private int npts = 0;
-	private int traceColor;
-
-	private double ymin;
-	private double ymax;
-	private double value_ymin;
-	private double value_ymax;
-
-	private Date xmin;
-	private Date xmax;
-	private Date basistime;
-	private Date productTime;
-
-	private TimeSeriesPoint[] tsData = new TimeSeriesPoint[HydroConstants.MAX_POINTS];
-	private TimeSeriesPoint[] previousTsData;
-	private TimeSeriesPoint[] zoomedTsData;
-
-	private int[] lineData;
-
-	private String name = null;
-	private String lid = null;
-	private String pe = null;
-	private String dur = "0";
-	private String ts = null;
-	private String extremum = null;
-	private String cdur = null;
-	private String product_id = null;
-
-	private String colorName = null;
-
-	private boolean isForecast = false;
-
-	private String label = null;
-
-	private boolean isSelected = false;
-
-	private boolean traceOn = true;
-
-	private boolean traceValid = true;
-
-	private boolean selectionCheckOn = true;
-
-	public TraceData() {
-
-	}
-
-	/**
-	 * Copy constructor.
-	 * 
-	 * @param data
-	 */
-	public TraceData(TraceData data) {
-		basistime = data.basistime;
-		cdur = data.cdur;
-		product_id = data.product_id;
-		colorName = data.colorName;
-		dur = data.dur;
-		extremum = data.extremum;
-		isForecast = data.isForecast;
-		isSelected = data.isSelected;
-		label = data.label;
-		lid = data.lid;
-		lineData = data.lineData;
-		name = data.name;
-		npts = data.npts;
-		pe = data.pe;
-		previousTsData = data.previousTsData;
-		productTime = data.productTime;
-		traceColor = data.traceColor;
-		traceOn = data.traceOn;
-		ts = data.ts;
-		tsData = data.tsData;
-		value_ymax = data.value_ymax;
-		value_ymin = data.value_ymin;
-		xmax = data.xmax;
-		xmin = data.xmin;
-		ymax = data.ymax;
-		ymin = data.ymin;
-		zoomedTsData = data.zoomedTsData;
-		selectionCheckOn = data.selectionCheckOn;
-	}
-
-	/**
-	 * 
-	 * @return pop up check box selection
-	 */
-	public boolean isSelectionCheckOn() {
-		return selectionCheckOn;
-	}
-
-	/**
-	 * 
-	 * @param selectionCheckOn
-	 */
-	public void setSelectionCheckOn(boolean selectionCheckOn) {
-		this.selectionCheckOn = selectionCheckOn;
-	}
-
-	/**
-	 * @return the npts
-	 */
-	public int getNpts() {
-		if ((npts == 0) || (npts == -9999)) {
-			return tsData.length;
-		}
-		return npts;
-		// return tsData.length;
-	}
-
-	/**
-	 * @param npts
-	 *            the npts to set
-	 */
-	public void setNpts(int npts) {
-		this.npts = npts;
-	}
-
-	/**
-	 * @return the traceColor
-	 */
-	public int getTraceColor() {
-		return traceColor;
-	}
-
-	/**
-	 * @param traceColor
-	 *            the traceColor to set
-	 */
-	public void setTraceColor(int traceColor) {
-		this.traceColor = traceColor;
-	}
-
-	/**
-	 * @return the ymin
-	 */
-	public double getYmin() {
-		return ymin;
-	}
-
-	/**
-	 * @param ymin
-	 *            the ymin to set
-	 */
-	public void setYmin(double ymin) {
-		this.ymin = ymin;
-	}
-
-	/**
-	 * @return the ymax
-	 */
-	public double getYmax() {
-		return ymax;
-	}
-
-	/**
-	 * @param ymax
-	 *            the ymax to set
-	 */
-	public void setYmax(double ymax) {
-		this.ymax = ymax;
-	}
-
-	/**
-	 * @return the value_ymin
-	 */
-	public double getValue_ymin() {
-		return value_ymin;
-	}
-
-	/**
-	 * @param value_ymin
-	 *            the value_ymin to set
-	 */
-	public void setValue_ymin(double value_ymin) {
-		this.value_ymin = value_ymin;
-	}
-
-	/**
-	 * @return the value_ymax
-	 */
-	public double getValue_ymax() {
-		return value_ymax;
-	}
-
-	/**
-	 * @param value_ymax
-	 *            the value_ymax to set
-	 */
-	public void setValue_ymax(double value_ymax) {
-		this.value_ymax = value_ymax;
-	}
-
-	/**
-	 * @return the xmin
-	 */
-	public Date getXmin() {
-		return xmin;
-	}
-
-	/**
-	 * @param xmin
-	 *            the xmin to set
-	 */
-	public void setXmin(Date xmin) {
-		this.xmin = xmin;
-	}
-
-	/**
-	 * @return the xmax
-	 */
-	public Date getXmax() {
-		return xmax;
-	}
-
-	/**
-	 * @param xmax
-	 *            the xmax to set
-	 */
-	public void setXmax(Date xmax) {
-		this.xmax = xmax;
-	}
-
-	/**
-	 * @return the basistime
-	 */
-	public Date getBasistime() {
-		return basistime;
-	}
-
-	/**
-	 * @param basistime
-	 *            the basistime to set
-	 */
-	public void setBasistime(Date basistime) {
-		this.basistime = basistime;
-	}
-
-	/**
-	 * @return the tsData
-	 */
-	public TimeSeriesPoint[] getTsData() {
-		return tsData;
-	}
-
-	/**
-	 * @param tsData
-	 *            the tsData to set
-	 */
-	public void setTsData(TimeSeriesPoint[] tsData) {
-		this.tsData = tsData;
-	}
-
-	/**
-	 * @return the name
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * @param name
-	 *            the name to set
-	 */
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	/**
-	 * @return the lid
-	 */
-	public String getLid() {
-		return lid;
-	}
-
-	/**
-	 * @param lid
-	 *            the lid to set
-	 */
-	public void setLid(String lid) {
-		this.lid = lid;
-	}
-
-	/**
-	 * @return the pe
-	 */
-	public String getPe() {
-		return pe;
-	}
-
-	/**
-	 * @param pe
-	 *            the pe to set
-	 */
-	public void setPe(String pe) {
-		this.pe = pe;
-	}
-
-	/**
-	 * @return the dur
-	 */
-	public String getDur() {
-		return dur;
-	}
-
-	/**
-	 * @param dur
-	 *            the dur to set
-	 */
-	public void setDur(String dur) {
-		if (dur.matches("\\d*")) {
-			this.dur = dur;
-		} else {
-			// 21 characters that I care about
-			char[] charCodeArray = CODES.toCharArray();
-
-			for (int i = 0; i < charCodeArray.length; i++) {
-				if (dur.equalsIgnoreCase(String.valueOf(charCodeArray[i]))) {
-					dur = String.valueOf(INT_CODE_ARRAY[i]);
-					this.dur = dur;
-					break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * @return the ts
-	 */
-	public String getTs() {
-		return ts;
-	}
-
-	/**
-	 * @param ts
-	 *            the ts to set
-	 */
-	public void setTs(String ts) {
-		this.ts = ts;
-	}
-
-	/**
-	 * @return the product_id
-	 */
-	public String getProductId() {
-		return product_id;
-	}
-
-	/**
-	 * @param product_id
-	 *            the product_id to set
-	 */
-	public void setProductId(String product_id) {
-		this.product_id = product_id;
-	}
-
-	/**
-	 * @return the extremum
-	 */
-	public String getExtremum() {
-		return extremum;
-	}
-
-	/**
-	 * @param extremum
-	 *            the extremum to set
-	 */
-	public void setExtremum(String extremum) {
-		this.extremum = extremum;
-	}
-
-	/**
-	 * @return the cdur
-	 */
-	public String getCdur() {
-		return cdur;
-	}
-
-	/**
-	 * @param cdur
-	 *            the cdur to set
-	 */
-	public void setCdur(String cdur) {
-		this.cdur = cdur;
-	}
-
-	/**
-	 * @return the colorName
-	 */
-	public String getColorName() {
-		return colorName;
-	}
-
-	/**
-	 * @param colorName
-	 *            the colorName to set
-	 */
-	public void setColorName(String colorName) {
-		this.colorName = colorName.trim();
-	}
-
-	/**
-	 * @return the isForecast
-	 */
-	public boolean isForecast() {
-		return isForecast;
-	}
-
-	/**
-	 * @param isForecast
-	 *            the isForecast to set
-	 */
-	public void setForecast(boolean isForecast) {
-		this.isForecast = isForecast;
-	}
-
-	/**
-	 * Set the PEDTSE values from a single string
-	 * 
-	 * @param pc
-	 *            the PEDTSE values as a String
-	 */
-	public void setPc(String pc) {
-		setPe(pc.substring(0, 2));
-		setDur(pc.substring(2, 3));
-		setTs(pc.substring(3, 5));
-		setExtremum(pc.substring(5));
-
-		// Set forecast if ts is F or C
-		this.setForecast(false);
-		if (getTs().startsWith("F") || getTs().startsWith("f")
-				|| getTs().startsWith("C") || getTs().startsWith("c")) {
-			this.setForecast(true);
-		}
-	}
-
-	/**
-	 * @return the label
-	 */
-	public String getLabel() {
-		return label;
-	}
-
-	/**
-	 * @param label
-	 *            the label to set
-	 */
-	public void setLabel(String label) {
-		this.label = label;
-	}
-
-	/**
-	 * @return the isSelected
-	 */
-	public boolean isSelected() {
-		return isSelected;
-	}
-
-	/**
-	 * @param isSelected
-	 *            the isSelected to set
-	 */
-	public void setSelected(boolean isSelected) {
-		this.isSelected = isSelected;
-	}
-
-	/**
-	 * @return the lineData
-	 */
-	public int[] getLineData() {
-		return lineData;
-	}
-
-	/**
-	 * @param lineData
-	 *            the lineData to set
-	 */
-	public void setLineData(int[] lineData) {
-		this.lineData = lineData;
-	}
-
-	/**
-	 * @return the previousLineData
-	 */
-	public TimeSeriesPoint[] getPreviousTsData() {
-		return previousTsData;
-	}
-
-	/**
-	 * @param previousLineData
-	 *            the previousLineData to set
-	 */
-	public void setPreviousTsData(TimeSeriesPoint[] previousTsData) {
-		this.previousTsData = previousTsData;
-	}
-
-	/**
-	 * @return the zoomedTsData
-	 */
-	public TimeSeriesPoint[] getZoomedTsData() {
-		return zoomedTsData;
-	}
-
-	/**
-	 * @param zoomedTsData
-	 *            the zoomedTsData to set
-	 */
-	public void setZoomedTsData(TimeSeriesPoint[] zoomedTsData) {
-		this.zoomedTsData = zoomedTsData;
-	}
-
-	/**
-	 * @return the traceOn
-	 */
-	public boolean isTraceOn() {
-		return traceOn;
-	}
-
-	/**
-	 * @param traceOn
-	 *            the traceOn to set
-	 */
-	public void setTraceOn(boolean traceOn) {
-		this.traceOn = traceOn;
-	}
-
-	/**
-	 * @return the traceValid
-	 */
-	public boolean isTraceValid() {
-		return traceValid;
-	}
-
-	/**
-	 * @param traceValid
-	 *            the traceValid to set
-	 */
-	public void setTraceValid(boolean traceValid) {
-		this.traceValid = traceValid;
-	}
-
-	/**
-	 * @return the productTime
-	 */
-	public Date getProductTime() {
-		return productTime;
-	}
-
-	/**
-	 * @param productTime
-	 *            the productTime to set
-	 */
-	public void setProductTime(Date productTime) {
-		this.productTime = productTime;
-	}
-	
-	/**
-	 * @return zoom index offset
-	 */
-	public int getZoomIndexOffset() {
-		
-		if (this.zoomedTsData != null && this.zoomedTsData.length > 0 ){
-			for (int i = 0; i < this.tsData.length; i++) {
-				if ( tsData[i].getX().equals(zoomedTsData[0].getX()) && 
-				     tsData[i].getY() == zoomedTsData[0].getY() 
-				     ){
-					return i;					
-				}
-			}
-			
-		}
-		
-		return 0;
-	}
-	
+    private static final long serialVersionUID = -4345330013536912094L;
+
+    private static final String CODES = "IUEGCJHBTFQAKLDWMYZSRPX";
+
+    private static final int[] INT_CODE_ARRAY = { 0, 1, 5, 10, 15, 30, 1001,
+            1002, 1003, 1004, 1006, 1008, 1012, 1018, 2001, 2007, 3001, 4001,
+            5000, 5001, 5002, 5004, 5005 };
+
+    private int npts = 0;
+
+    private int traceColor;
+
+    private double ymin;
+
+    private double ymax;
+
+    private double value_ymin;
+
+    private double value_ymax;
+
+    private Date xmin;
+
+    private Date xmax;
+
+    private Date basistime;
+
+    private Date productTime;
+
+    private TimeSeriesPoint[] tsData = new TimeSeriesPoint[HydroConstants.MAX_POINTS];
+
+    private TimeSeriesPoint[] previousTsData;
+
+    private TimeSeriesPoint[] zoomedTsData;
+
+    private int[] lineData;
+
+    private String name = null;
+
+    private String lid = null;
+
+    private String pe = null;
+
+    private String dur = "0";
+
+    private String ts = null;
+
+    private String extremum = null;
+
+    private String cdur = null;
+
+    private String product_id = null;
+
+    private String colorName = null;
+
+    private boolean isForecast = false;
+
+    private String label = null;
+
+    private boolean isSelected = false;
+
+    private boolean traceOn = true;
+
+    private boolean traceValid = true;
+
+    private boolean selectionCheckOn = true;
+
+    public TraceData() {
+
+    }
+
+    /**
+     * Copy constructor.
+     * 
+     * @param data
+     */
+    public TraceData(TraceData data) {
+        basistime = data.basistime;
+        cdur = data.cdur;
+        product_id = data.product_id;
+        colorName = data.colorName;
+        dur = data.dur;
+        extremum = data.extremum;
+        isForecast = data.isForecast;
+        isSelected = data.isSelected;
+        label = data.label;
+        lid = data.lid;
+        lineData = data.lineData;
+        name = data.name;
+        npts = data.npts;
+        pe = data.pe;
+        previousTsData = data.previousTsData;
+        productTime = data.productTime;
+        traceColor = data.traceColor;
+        traceOn = data.traceOn;
+        ts = data.ts;
+        tsData = data.tsData;
+        value_ymax = data.value_ymax;
+        value_ymin = data.value_ymin;
+        xmax = data.xmax;
+        xmin = data.xmin;
+        ymax = data.ymax;
+        ymin = data.ymin;
+        zoomedTsData = data.zoomedTsData;
+        selectionCheckOn = data.selectionCheckOn;
+    }
+
+    /**
+     * 
+     * @return pop up check box selection
+     */
+    public boolean isSelectionCheckOn() {
+        return selectionCheckOn;
+    }
+
+    /**
+     * 
+     * @param selectionCheckOn
+     */
+    public void setSelectionCheckOn(boolean selectionCheckOn) {
+        this.selectionCheckOn = selectionCheckOn;
+    }
+
+    /**
+     * @return the npts
+     */
+    public int getNpts() {
+        if ((npts == 0) || (npts == -9999)) {
+            return tsData.length;
+        }
+        return npts;
+        // return tsData.length;
+    }
+
+    /**
+     * @param npts
+     *            the npts to set
+     */
+    public void setNpts(int npts) {
+        this.npts = npts;
+    }
+
+    /**
+     * @return the traceColor
+     */
+    public int getTraceColor() {
+        return traceColor;
+    }
+
+    /**
+     * @param traceColor
+     *            the traceColor to set
+     */
+    public void setTraceColor(int traceColor) {
+        this.traceColor = traceColor;
+    }
+
+    /**
+     * @return the ymin
+     */
+    public double getYmin() {
+        return ymin;
+    }
+
+    /**
+     * @param ymin
+     *            the ymin to set
+     */
+    public void setYmin(double ymin) {
+        this.ymin = ymin;
+    }
+
+    /**
+     * @return the ymax
+     */
+    public double getYmax() {
+        return ymax;
+    }
+
+    /**
+     * @param ymax
+     *            the ymax to set
+     */
+    public void setYmax(double ymax) {
+        this.ymax = ymax;
+    }
+
+    /**
+     * @return the value_ymin
+     */
+    public double getValue_ymin() {
+        return value_ymin;
+    }
+
+    /**
+     * @param value_ymin
+     *            the value_ymin to set
+     */
+    public void setValue_ymin(double value_ymin) {
+        this.value_ymin = value_ymin;
+    }
+
+    /**
+     * @return the value_ymax
+     */
+    public double getValue_ymax() {
+        return value_ymax;
+    }
+
+    /**
+     * @param value_ymax
+     *            the value_ymax to set
+     */
+    public void setValue_ymax(double value_ymax) {
+        this.value_ymax = value_ymax;
+    }
+
+    /**
+     * @return the xmin
+     */
+    public Date getXmin() {
+        return xmin;
+    }
+
+    /**
+     * @param xmin
+     *            the xmin to set
+     */
+    public void setXmin(Date xmin) {
+        this.xmin = xmin;
+    }
+
+    /**
+     * @return the xmax
+     */
+    public Date getXmax() {
+        return xmax;
+    }
+
+    /**
+     * @param xmax
+     *            the xmax to set
+     */
+    public void setXmax(Date xmax) {
+        this.xmax = xmax;
+    }
+
+    /**
+     * @return the basistime
+     */
+    public Date getBasistime() {
+        return basistime;
+    }
+
+    /**
+     * @param basistime
+     *            the basistime to set
+     */
+    public void setBasistime(Date basistime) {
+        this.basistime = basistime;
+    }
+
+    /**
+     * @return the tsData
+     */
+    public TimeSeriesPoint[] getTsData() {
+        return tsData;
+    }
+
+    /**
+     * @param tsData
+     *            the tsData to set
+     */
+    public void setTsData(TimeSeriesPoint[] tsData) {
+        this.tsData = tsData;
+    }
+
+    /**
+     * @return the name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     *            the name to set
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return the lid
+     */
+    public String getLid() {
+        return lid;
+    }
+
+    /**
+     * @param lid
+     *            the lid to set
+     */
+    public void setLid(String lid) {
+        this.lid = lid;
+    }
+
+    /**
+     * @return the pe
+     */
+    public String getPe() {
+        return pe;
+    }
+
+    /**
+     * @param pe
+     *            the pe to set
+     */
+    public void setPe(String pe) {
+        this.pe = pe;
+    }
+
+    /**
+     * @return the dur
+     */
+    public String getDur() {
+        return dur;
+    }
+
+    /**
+     * @param dur
+     *            the dur to set
+     */
+    public void setDur(String dur) {
+        if (dur.matches("\\d*")) {
+            this.dur = dur;
+        } else {
+            // 21 characters that I care about
+            char[] charCodeArray = CODES.toCharArray();
+
+            for (int i = 0; i < charCodeArray.length; i++) {
+                if (dur.equalsIgnoreCase(String.valueOf(charCodeArray[i]))) {
+                    dur = String.valueOf(INT_CODE_ARRAY[i]);
+                    this.dur = dur;
+                    break;
+                }
+            }
+        }
+    }
+
+    /**
+     * @return the ts
+     */
+    public String getTs() {
+        return ts;
+    }
+
+    /**
+     * @param ts
+     *            the ts to set
+     */
+    public void setTs(String ts) {
+        this.ts = ts;
+    }
+
+    /**
+     * @return the product_id
+     */
+    public String getProductId() {
+        return product_id;
+    }
+
+    /**
+     * @param product_id
+     *            the product_id to set
+     */
+    public void setProductId(String product_id) {
+        this.product_id = product_id;
+    }
+
+    /**
+     * @return the extremum
+     */
+    public String getExtremum() {
+        return extremum;
+    }
+
+    /**
+     * @param extremum
+     *            the extremum to set
+     */
+    public void setExtremum(String extremum) {
+        this.extremum = extremum;
+    }
+
+    /**
+     * @return the cdur
+     */
+    public String getCdur() {
+        return cdur;
+    }
+
+    /**
+     * @param cdur
+     *            the cdur to set
+     */
+    public void setCdur(String cdur) {
+        this.cdur = cdur;
+    }
+
+    /**
+     * @return the colorName
+     */
+    public String getColorName() {
+        return colorName;
+    }
+
+    /**
+     * @param colorName
+     *            the colorName to set
+     */
+    public void setColorName(String colorName) {
+        this.colorName = colorName.trim();
+    }
+
+    /**
+     * @return the isForecast
+     */
+    public boolean isForecast() {
+        return isForecast;
+    }
+
+    /**
+     * @param isForecast
+     *            the isForecast to set
+     */
+    public void setForecast(boolean isForecast) {
+        this.isForecast = isForecast;
+    }
+
+    /**
+     * Set the PEDTSE values from a single string
+     * 
+     * @param pc
+     *            the PEDTSE values as a String
+     */
+    public void setPc(String pc) {
+        setPe(pc.substring(0, 2));
+        setDur(pc.substring(2, 3));
+        setTs(pc.substring(3, 5));
+        setExtremum(pc.substring(5));
+
+        // Set forecast if ts is F or C
+        this.setForecast(false);
+        if (getTs().startsWith("F") || getTs().startsWith("f")
+                || getTs().startsWith("C") || getTs().startsWith("c")) {
+            this.setForecast(true);
+        }
+    }
+
+    /**
+     * @return the label
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * @param label
+     *            the label to set
+     */
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    /**
+     * @return the isSelected
+     */
+    public boolean isSelected() {
+        return isSelected;
+    }
+
+    /**
+     * @param isSelected
+     *            the isSelected to set
+     */
+    public void setSelected(boolean isSelected) {
+        this.isSelected = isSelected;
+    }
+
+    /**
+     * @return the lineData
+     */
+    public int[] getLineData() {
+        return lineData;
+    }
+
+    /**
+     * @param lineData
+     *            the lineData to set
+     */
+    public void setLineData(int[] lineData) {
+        this.lineData = lineData;
+    }
+
+    /**
+     * @return the previousLineData
+     */
+    public TimeSeriesPoint[] getPreviousTsData() {
+        return previousTsData;
+    }
+
+    /**
+     * @param previousLineData
+     *            the previousLineData to set
+     */
+    public void setPreviousTsData(TimeSeriesPoint[] previousTsData) {
+        this.previousTsData = previousTsData;
+    }
+
+    /**
+     * @return the zoomedTsData
+     */
+    public TimeSeriesPoint[] getZoomedTsData() {
+        return zoomedTsData;
+    }
+
+    /**
+     * @param zoomedTsData
+     *            the zoomedTsData to set
+     */
+    public void setZoomedTsData(TimeSeriesPoint[] zoomedTsData) {
+        this.zoomedTsData = zoomedTsData;
+    }
+
+    /**
+     * @return the traceOn
+     */
+    public boolean isTraceOn() {
+        return traceOn;
+    }
+
+    /**
+     * @param traceOn
+     *            the traceOn to set
+     */
+    public void setTraceOn(boolean traceOn) {
+        this.traceOn = traceOn;
+    }
+
+    /**
+     * @return the traceValid
+     */
+    public boolean isTraceValid() {
+        return traceValid;
+    }
+
+    /**
+     * @param traceValid
+     *            the traceValid to set
+     */
+    public void setTraceValid(boolean traceValid) {
+        this.traceValid = traceValid;
+    }
+
+    /**
+     * @return the productTime
+     */
+    public Date getProductTime() {
+        return productTime;
+    }
+
+    /**
+     * @param productTime
+     *            the productTime to set
+     */
+    public void setProductTime(Date productTime) {
+        this.productTime = productTime;
+    }
+
+    /**
+     * @return zoom index offset
+     */
+    public int getZoomIndexOffset() {
+
+        if (this.zoomedTsData != null && this.zoomedTsData.length > 0) {
+            for (int i = 0; i < this.tsData.length; i++) {
+                if (tsData[i].getX().equals(zoomedTsData[0].getX())
+                        && tsData[i].getY() == zoomedTsData[0].getY()) {
+                    return i;
+                }
+            }
+
+        }
+
+        return 0;
+    }
+
 }
diff --git a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
index d117c0b462..cc6ccd30d4 100644
--- a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
+++ b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
@@ -167,6 +167,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  *                                      Changes for non-blocking LowWaterStatementDlg.
  *                                      Changes for non-blocking RatingCurveDlg.
  *                                      Changes for non-blocking TextReportDlg.
+ * 02/16/2016    5354       bkowal      Prevent the closure of the password dialog from
+ *                                      closing all of CAVE.
  * 
  * </pre>
  * 
@@ -1494,17 +1496,6 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
             }
         });
 
-        /* Removed per Mr. Glaudemans at 16-17 April TIM in Omaha */
-        // Cities menu item
-        // MenuItem citiesMI = new MenuItem(setupMenu, SWT.NONE);
-        // citiesMI.setText("&Cities...");
-        // citiesMI.addSelectionListener(new SelectionAdapter() {
-        // @Override
-        // public void widgetSelected(SelectionEvent event) {
-        // CitiesDlg citiesDlg = new CitiesDlg(shell);
-        // citiesDlg.open();
-        // }
-        // });
         // Reference Fields menu item
         MenuItem referenceFieldsMI = new MenuItem(setupMenu, SWT.NONE);
         referenceFieldsMI.setText("R&eference Fields...");
@@ -1698,21 +1689,16 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
 
             @Override
             public void mouseDoubleClick(MouseEvent e) {
-                // TODO Auto-generated method stub
                 // open Modify Location window on double click
                 openModifyDlg();
             }
 
             @Override
             public void mouseDown(MouseEvent e) {
-                // TODO Auto-generated method stub
-
             }
 
             @Override
             public void mouseUp(MouseEvent e) {
-                // TODO Auto-generated method stub
-
             }
         });
 
@@ -1780,11 +1766,6 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
         stationCountLbl.setText("( " + size + " Stations )");
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.hydrocommon.IGetSortType#getSortType()
-     */
     @Override
     public String getSortType() {
         return sortByCbo.getItem(sortByCbo.getSelectionIndex());
@@ -1907,12 +1888,6 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
         sortAndUpdateListControl();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.hydrobase.listeners.IPreferencesListener#notifyUpdate()
-     */
     @Override
     public void notifyUpdate() {
         applyPreferences();
@@ -1954,24 +1929,10 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
         sortAndUpdateListControl();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.swt.events.KeyListener#keyPressed(org.eclipse.swt.events.
-     * KeyEvent)
-     */
     @Override
     public void keyPressed(KeyEvent e) {
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.eclipse.swt.events.KeyListener#keyReleased(org.eclipse.swt.events
-     * .KeyEvent)
-     */
     @Override
     public void keyReleased(KeyEvent e) {
         String stationSearch = stationSearchTF.getText().toUpperCase();
@@ -1992,12 +1953,6 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.viz.hydrobase.listeners.IStationFilterListener#
-     * notifyFilterChange()
-     */
     @Override
     public void notifyFilterChange() {
         populateListControl();
@@ -2023,13 +1978,6 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.hydrobase.listeners.IStationListener#notifyStationUpdate
-     * (java.lang.String)
-     */
     @Override
     public void notifyStationUpdate(String lid) {
         populateListControl();
@@ -2204,8 +2152,9 @@ public class HydroBaseDlg extends CaveSWTDialog implements IGetSortType,
             cancel.addSelectionListener(new SelectionAdapter() {
                 @Override
                 public void widgetSelected(SelectionEvent e) {
-                    // Close password dialog
-                    dialog.close();
+                    // Dispose the dialog instead of closing it. Otherwise, all
+                    // of CAVE is closed.
+                    dialog.dispose();
                 }
             });
 
diff --git a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydrobaseAction.java b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydrobaseAction.java
index a2b1e78878..a36107ff8c 100644
--- a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydrobaseAction.java
+++ b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydrobaseAction.java
@@ -26,7 +26,7 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
 
 import com.raytheon.uf.common.ohd.AppsDefaults;
 import com.raytheon.viz.hydrocommon.HydroDisplayManager;
@@ -39,14 +39,15 @@ import com.raytheon.viz.hydrocommon.HydroDisplayManager;
  * 
  * SOFTWARE HISTORY
  * 
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
  * 6/27/06                  lvenable    Initial Creation.
- * 6/21/2010	#5412		lbousaid    Added database name	
+ * 6/21/2010   #5412        lbousaid    Added database name
  * 07/03/2010   6586        mduff       Fixed problem introduced from the 
  *                                      CaveSWTDialog refactor and added
  *                                      a pre-selected lid.
  * 06/27/2013   2088        rferrel     Changes for non-blocking HydroBaseDlg.
+ * 15/01/2015   5054        randerso    Remove unnecessary new Shell
  * 
  * </pre>
  * 
@@ -57,17 +58,13 @@ public class HydrobaseAction extends AbstractHandler {
     private HydroBaseDlg hydrobaseDlg;
 
     @Override
-    public Object execute(ExecutionEvent arg0) throws ExecutionException {
+    public Object execute(ExecutionEvent event) throws ExecutionException {
         if (hydrobaseDlg == null || hydrobaseDlg.isDisposed()) {
-            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                    .getShell();
-
+            Shell shell = HandlerUtil.getActiveShell(event);
             String lid = HydroDisplayManager.getInstance().getCurrentLid();
             String dbName = AppsDefaults.getInstance().getToken("db_name");
             hydrobaseDlg = new HydroBaseDlg(shell, dbName, lid);
-            Shell passwdShell = new Shell();
-            boolean verified = hydrobaseDlg.promptForPassword(passwdShell);
-            passwdShell.dispose();
+            boolean verified = hydrobaseDlg.promptForPassword(shell);
 
             if (verified) {
                 hydrobaseDlg.open();
diff --git a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AdministrationDlg.java b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AdministrationDlg.java
index 089c7d7def..a722833379 100644
--- a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AdministrationDlg.java
+++ b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AdministrationDlg.java
@@ -54,6 +54,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 02 Sep 2008             lvenable    Initial creation.
  * 14 Nov 2008  1697       askripsky   Connect to DB
  * 16 Apr 2013  1790       rferrel     Made dialog non-blocking.
+ * 15 Jan 2015  5054       randerso    Remove unnecessary new Shell
  * 
  * </pre>
  * 
@@ -322,6 +323,7 @@ public class AdministrationDlg extends CaveSWTDialog {
         applyBtn.setText("Apply");
         applyBtn.setLayoutData(gd);
         applyBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 saveRecord();
             }
@@ -333,6 +335,7 @@ public class AdministrationDlg extends CaveSWTDialog {
         closeBtn.setText("Close");
         closeBtn.setLayoutData(gd);
         closeBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 close();
             }
@@ -404,8 +407,8 @@ public class AdministrationDlg extends CaveSWTDialog {
         // Make sure the LID, aka Station ID, is set since it is the primary key
         // for the DB
         if (stationIdTF.getText().compareTo("") == 0) {
-            MessageBox messageBox = new MessageBox(new Shell(),
-                    SWT.ICON_WARNING | SWT.OK);
+            MessageBox messageBox = new MessageBox(getShell(), SWT.ICON_WARNING
+                    | SWT.OK);
             messageBox.setText("Station ID Missing");
             messageBox.setMessage("Please enter a Station ID");
             messageBox.open();
@@ -418,7 +421,7 @@ public class AdministrationDlg extends CaveSWTDialog {
                     .parseInt(hsaNoTF.getText()) : HydroConstants.MISSING_VALUE;
 
             if (noTF.getText().length() > 1) {
-                MessageBox messageBox = new MessageBox(new Shell(),
+                MessageBox messageBox = new MessageBox(getShell(),
                         SWT.ICON_WARNING | SWT.OK);
                 messageBox.setText("Invalid Region Number");
                 messageBox
@@ -444,7 +447,7 @@ public class AdministrationDlg extends CaveSWTDialog {
                 currData.setOneYearDate((oneYearTF.getText().compareTo("") == 0) ? (Date) null
                         : adminFormat.parse(oneYearTF.getText()));
             } catch (ParseException e) {
-                MessageBox messageBox = new MessageBox(new Shell(),
+                MessageBox messageBox = new MessageBox(getShell(),
                         SWT.ICON_WARNING | SWT.OK);
                 messageBox.setText("Invalid One Year Date");
                 messageBox
@@ -457,7 +460,7 @@ public class AdministrationDlg extends CaveSWTDialog {
                 currData.setTenYearDate((tenYearTF.getText().compareTo("") == 0) ? (Date) null
                         : adminFormat.parse(tenYearTF.getText()));
             } catch (ParseException e) {
-                MessageBox messageBox = new MessageBox(new Shell(),
+                MessageBox messageBox = new MessageBox(getShell(),
                         SWT.ICON_WARNING | SWT.OK);
                 messageBox.setText("Invalid Ten Year Date");
                 messageBox
@@ -467,8 +470,8 @@ public class AdministrationDlg extends CaveSWTDialog {
                 return currData;
             }
         } catch (NumberFormatException e) {
-            MessageBox messageBox = new MessageBox(new Shell(),
-                    SWT.ICON_WARNING | SWT.OK);
+            MessageBox messageBox = new MessageBox(getShell(), SWT.ICON_WARNING
+                    | SWT.OK);
             messageBox.setText("Invalid HSA Number");
             messageBox
                     .setMessage("Please enter a numeric value for HSA Number");
diff --git a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/CoopAgencyOfficeDlg.java b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/CoopAgencyOfficeDlg.java
index 822eb6f5ac..f8539aa4df 100644
--- a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/CoopAgencyOfficeDlg.java
+++ b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/CoopAgencyOfficeDlg.java
@@ -51,6 +51,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 02 Sep 2008             lvenable    Initial creation.
  * 05 Dec 2008  1744       askripsky   Connected data
  * 17 Apr 2013  1790       rferrel     Make dialog non-blocking.
+ * 15 Jan 2015  5054       randerso    Remove unnecessary new Shell
  * 
  * </pre>
  * 
@@ -218,6 +219,7 @@ public class CoopAgencyOfficeDlg extends CaveSWTDialog {
         availList.setLayoutData(gd);
         availList.setFont(controlFont);
         availList.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 updateDisplay();
             }
@@ -236,6 +238,7 @@ public class CoopAgencyOfficeDlg extends CaveSWTDialog {
         addBtn.setText("Add -->");
         addBtn.setLayoutData(gd);
         addBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 saveData();
             }
@@ -246,6 +249,7 @@ public class CoopAgencyOfficeDlg extends CaveSWTDialog {
         deleteBtn.setText("Delete >");
         deleteBtn.setLayoutData(gd);
         deleteBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 deleteData();
             }
@@ -302,6 +306,7 @@ public class CoopAgencyOfficeDlg extends CaveSWTDialog {
         closeBtn.setText("Close");
         closeBtn.setLayoutData(gd);
         closeBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 close();
             }
@@ -363,16 +368,16 @@ public class CoopAgencyOfficeDlg extends CaveSWTDialog {
     private void saveData() {
         // Check to see if the values are valid
         if (agencyTF.getText().length() > 8) {
-            MessageBox messageBox = new MessageBox(new Shell(),
-                    SWT.ICON_WARNING | SWT.OK);
+            MessageBox messageBox = new MessageBox(getShell(), SWT.ICON_WARNING
+                    | SWT.OK);
             messageBox.setText("Agency too long");
             messageBox.setMessage("Agency cannot be longer than 8 characters");
             messageBox.open();
 
             return;
         } else if (officeTF.getText().length() > 20) {
-            MessageBox messageBox = new MessageBox(new Shell(),
-                    SWT.ICON_WARNING | SWT.OK);
+            MessageBox messageBox = new MessageBox(getShell(), SWT.ICON_WARNING
+                    | SWT.OK);
             messageBox.setText("Office too long");
             messageBox.setMessage("Office cannot be longer than 20 characters");
             messageBox.open();
@@ -414,8 +419,8 @@ public class CoopAgencyOfficeDlg extends CaveSWTDialog {
             // Refresh the data
             populateListControl();
         } else {
-            MessageBox messageBox = new MessageBox(new Shell(),
-                    SWT.ICON_WARNING | SWT.OK);
+            MessageBox messageBox = new MessageBox(getShell(), SWT.ICON_WARNING
+                    | SWT.OK);
             messageBox.setText("No Agency/Office Selected");
             messageBox
                     .setMessage("Please select an Agency/Office from the Selected list to delete");
diff --git a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
index 12136a893b..3b378632e6 100644
--- a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
+++ b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
@@ -60,6 +60,7 @@ import com.raytheon.viz.hydrocommon.data.DataIngestFilterData;
 import com.raytheon.viz.hydrocommon.datamanager.DataIngestFilterDataManager;
 import com.raytheon.viz.hydrocommon.datamanager.DataTrashCanDataManager;
 import com.raytheon.viz.hydrocommon.datamanager.HydroDBDataManager;
+import com.raytheon.viz.hydrocommon.datamanager.LocationDataManager;
 import com.raytheon.viz.hydrocommon.util.StnClassSyncUtil;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 
@@ -77,7 +78,9 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Mar 31, 2014 #2970       lvenable    Put dispose checks in the runAsync calls.
  * May 1,  2014 17096       xwei        By default the first item of the data 
  *                                      list is selected
- *
+ * Feb 16, 2016 5354        bkowal      Only update the stnclass table after an ingest
+ *                                      filter removal if there is an associated location.                                     
+ * 
  * 
  * </pre>
  * 
@@ -1372,8 +1375,28 @@ public class DataIngestFilterDlg extends CaveSWTDialog {
                 try {
                     HydroDBDataManager.getInstance().deleteRecord(selectedData);
 
-                    // Synchronize StnClass table
-                    StnClassSyncUtil.setStnClass(selectedData.getLid());
+                    /*
+                     * If there is not a location associated with the lid of the
+                     * ingest filter record that was just deleted, there is no
+                     * reason to sync the changes to the stnclass table because
+                     * the stnclass table defines a foreign key in which the lid
+                     * must map to a location in the location table. The ingest
+                     * filter table does not define a similar foreign key. So,
+                     * if there is not a location associated with the lid, an
+                     * associated record could never exist in the stnclass table
+                     * and any attempt to insert a record into the stnclass
+                     * table will fail.
+                     */
+
+                    if (!LocationDataManager.getInstance()
+                            .getLocationName(selectedData.getLid()).isEmpty()) {
+                        /*
+                         * an associated location exists, so the stnclass table
+                         * can be updated.
+                         */
+                        // Synchronize StnClass table
+                        StnClassSyncUtil.setStnClass(selectedData.getLid());
+                    }
                 } catch (VizException e) {
                     statusHandler.handle(Priority.PROBLEM,
                             "Problem deleting record ", e);
diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
index f45dda2145..95edc99ecf 100644
--- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
+++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/whfslib/colorthreshold/GetColorValues.java
@@ -45,6 +45,9 @@ import com.raytheon.viz.hydrocommon.whfslib.IHFSDbGenerated;
  * Nov 10, 2008            randerso    Initial creation
  * May 27, 2014  3133      njensen     Organized imports, fixed == to equals
  * Jul 21, 2015 4500       rjpeter     Use Number in blind cast.
+ * Feb 12, 2016 5356       bsteffen    Fall back to using the provided
+ *                                     colorsets when no values are found.
+ * 
  * </pre>
  * 
  * @author randerso
@@ -135,7 +138,7 @@ public class GetColorValues {
         if ("hydroview".equals(application_name)
                 && "HEIGHT".equals(coloruse_name)) {
             cvHead = getDefaultColorSet(application_name, coloruse_name,
-                    threshold_unit);
+                    threshold_unit, null);
         } else {
             // Try to find a user defined color set.
             cvHead = getUserColorSet(user_id, application_name, coloruse_name,
@@ -152,8 +155,11 @@ public class GetColorValues {
 
                 // Try to find a default color set.
                 cvHead = getDefaultColorSet(application_name, coloruse_name,
-                        threshold_unit);// , pColorSetGroup);
-
+                        threshold_unit, null);
+                if ((cvHead == null) || (cvHead.size() == 0)) {
+                    cvHead = getDefaultColorSet(application_name,
+                            coloruse_name, threshold_unit, pColorSetGroup);
+                }
                 if ((cvHead == null) || (cvHead.size() == 0)) {
                     statusHandler.handle(Priority.PROBLEM, "ERROR in " + method
                             + " Colors/levels not defined for application "
@@ -224,13 +230,11 @@ public class GetColorValues {
      */
     private static List<Colorvalue> getDefaultColorSet(
             final String application_name, final String coloruse_name,
-            String threshold_unit) {// , final List<NamedColorUseSet>
-                                    // pColorSetGroup) {
+            String threshold_unit, List<NamedColorUseSet> pColorSetGroup) {
 
-        List<NamedColorUseSet> pColorSetGroup = null;
         if (application_name.equals("hmapmpe")) {
             pColorSetGroup = MPEColors.build_mpe_colors();
-        } else {
+        } else if (pColorSetGroup == null) {
             pColorSetGroup = HydroDisplayManager.getInstance()
                     .getDefaultNamedColorUseSetList();
         }
diff --git a/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java b/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
index 7fc3009e5e..009f7edc3e 100644
--- a/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
+++ b/cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
@@ -95,6 +95,7 @@ import com.raytheon.viz.lightning.cache.LightningFrameRetriever;
  * Jul 01, 2015  4597       bclement    reworked resource name using DisplayType
  * Sep 10, 2015  4856       njensen     synchronize in remove(DataTime)
  * Sep 25, 2015  4605       bsteffen    repeat binning
+ * Nov 05, 2015  5070       randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -153,7 +154,7 @@ public class LightningResource extends
 
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
-        font = target.initializeFont(Font.MONOSPACED, 11,
+        font = target.initializeFont(Font.MONOSPACED, 9,
                 new Style[] { Style.BOLD });
 
         VizApp.runSync(new Runnable() {
@@ -248,8 +249,9 @@ public class LightningResource extends
         int cloudCount = 0;
         int pulseCount = 0;
 
-        if (magnification == 0.0)
+        if (magnification == 0.0) {
             magnification = (float) 0.01;
+        }
 
         /*
          * we only want strikes that are visible so we have to filter any
diff --git a/cave/com.raytheon.viz.lpi/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.lpi/META-INF/MANIFEST.MF
index c3c1d0cc12..51ca6ecbcc 100644
--- a/cave/com.raytheon.viz.lpi/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.lpi/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.viz.core,
  com.raytheon.viz.ui,
  org.geotools,
- org.apache.commons.lang,
  com.raytheon.uf.viz.core.maps;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.viz.lpi
diff --git a/cave/com.raytheon.viz.lpi/localization/basemaps/us_county.lpi b/cave/com.raytheon.viz.lpi/localization/basemaps/us_county.lpi
deleted file mode 100644
index 2a1be03f4c..0000000000
--- a/cave/com.raytheon.viz.lpi/localization/basemaps/us_county.lpi
+++ /dev/null
@@ -1,3142 +0,0 @@
-3141
-32.542  -86.641 70 Autauga
-30.655  -87.755 70 Baldwin
-31.863  -85.389 70 Barbour
-32.997  -87.127 70 Bibb
-33.980  -86.566 70 Blount
-32.102  -85.718 70 Bullock
-31.752  -86.682 70 Butler
-33.775  -85.826 70 Calhoun
-32.915  -85.390 70 Chambers
-34.187  -85.606 70 Cherokee
-32.845  -86.719 70 Chilton
-32.025  -88.266 70 Choctaw
-31.678  -87.836 70 Clarke
-33.269  -85.860 70 Clay
-33.671  -85.517 70 Cleburne
-31.403  -85.989 70 Coffee
-34.707  -87.797 70 Colbert
-31.428  -86.993 70 Conecuh
-32.936  -86.239 70 Coosa
-31.248  -86.453 70 Covington
-31.731  -86.312 70 Crenshaw
-34.132  -86.867 70 Cullman
-31.426  -85.612 70 Dale
-32.330  -87.110 70 Dallas
-34.460  -85.799 70 DeKalb
-32.600  -86.138 70 Elmore
-31.137  -87.163 70 Escambia
-34.048  -86.038 70 Etowah
-33.730  -87.735 70 Fayette
-34.436  -87.844 70 Franklin
-31.094  -85.837 70 Geneva
-32.855  -87.951 70 Greene
-32.756  -87.625 70 Hale
-31.516  -85.240 70 Henry
-31.151  -85.305 70 Houston
-34.776  -86.002 70 Jackson
-33.552  -86.897 70 Jefferson
-33.775  -88.096 70 Lamar
-34.904  -87.648 70 Lauderdale
-34.520  -87.310 70 Lawrence
-32.597  -85.356 70 Lee
-34.810  -86.981 70 Limestone
-32.158  -86.643 70 Lowndes
-32.385  -85.693 70 Macon
-34.760  -86.549 70 Madison
-32.249  -87.790 70 Marengo
-34.134  -87.887 70 Marion
-34.365  -86.313 70 Marshall
-30.684  -88.199 70 Mobile
-31.563  -87.353 70 Monroe
-32.224  -86.204 70 Montgomery
-34.453  -86.857 70 Morgan
-32.639  -87.294 70 Perry
-33.284  -88.084 70 Pickens
-31.806  -85.939 70 Pike
-33.291  -85.456 70 Randolph
-32.287  -85.184 70 Russell
-33.713  -86.318 70 St Clair
-33.267  -86.655 70 Shelby
-32.593  -88.194 70 Sumter
-33.384  -86.169 70 Talladega
-32.861  -85.798 70 Tallapoosa
-33.288  -87.524 70 Tuscaloosa
-33.807  -87.296 70 Walker
-31.403  -88.203 70 Washington
-31.991  -87.309 70 Wilcox
-34.155  -87.373 70 Winston
-55.229 -161.915 70 Aleutians East
-52.243 -175.130 70 Aleutians West
-61.178 -149.186 70 Anchorage
-60.939 -160.147 70 Bethel
-58.745 -156.988 70 Bristol Bay
-59.950 -158.430 70 Dillingham
-64.846 -146.643 70 Fairbanks North Star
-59.156 -135.444 70 Haines
-58.389 -134.133 70 Juneau
-60.202 -151.630 70 Kenai Peninsula
-55.541 -131.408 70 Ketchikan Gateway
-57.707 -153.783 70 Kodiak Island
-58.401 -156.185 70 Lake and Peninsula
-62.395 -149.575 70 Matanuska-Susitna
-64.735 -164.187 70 Nome
-69.297 -153.448 70 North Slope
-67.001 -159.998 70 Northwest Arctic
-55.454 -132.050 70 Prince of Wales-Outer Ketchikan
-57.214 -135.447 70 Sitka
-58.811 -136.622 70 Skagway-Yakutat-Angoon
-63.765 -143.598 70 Southeast Fairbanks
-61.400 -144.503 70 Valdez-Cordova
-62.088 -163.529 70 Wade Hampton
-56.518 -132.962 70 Wrangell-Petersburg
-65.286 -151.647 70 Yukon-Koyukuk
-35.384 -109.488 70 Apache
-31.891 -109.737 70 Cochise
-35.836 -111.768 70 Coconino
-33.797 -110.818 70 Gila
-32.937 -109.891 70 Graham
-33.185 -109.233 70 Greenlee
-33.728 -113.979 70 La Paz
-33.343 -112.491 70 Maricopa
-35.708 -113.753 70 Mohave
-35.388 -110.320 70 Navajo
-32.104 -111.815 70 Pima
-32.909 -111.347 70 Pinal
-31.524 -110.836 70 Santa Cruz
-34.595 -112.554 70 Yavapai
-32.765 -113.897 70 Yuma
-34.289  -91.376 70 Arkansas
-33.191  -91.772 70 Ashley
-36.286  -92.340 70 Baxter
-36.338  -94.258 70 Benton
-36.314  -93.093 70 Boone
-33.463  -92.168 70 Bradley
-33.554  -92.497 70 Calhoun
-36.337  -93.542 70 Carroll
-33.266  -91.298 70 Chicot
-34.054  -93.177 70 Clark
-36.376  -90.421 70 Clay
-35.542  -92.029 70 Cleburne
-33.894  -92.188 70 Cleveland
-33.215  -93.227 70 Columbia
-35.263  -92.695 70 Conway
-35.828  -90.632 70 Craighead
-35.579  -94.246 70 Crawford
-35.213  -90.314 70 Crittenden
-35.300  -90.771 70 Cross
-33.967  -92.657 70 Dallas
-33.831  -91.259 70 Desha
-33.590  -91.717 70 Drew
-35.147  -92.335 70 Faulkner
-35.512  -93.892 70 Franklin
-36.383  -91.819 70 Fulton
-34.573  -93.154 70 Garland
-34.287  -92.423 70 Grant
-36.119  -90.562 70 Greene
-33.731  -93.665 70 Hempstead
-34.320  -92.945 70 Hot Spring
-34.090  -93.990 70 Howard
-35.744  -91.566 70 Independence
-36.095  -91.911 70 Izard
-35.600  -91.214 70 Jackson
-34.269  -91.929 70 Jefferson
-35.569  -93.461 70 Johnson
-33.236  -93.611 70 Lafayette
-36.043  -91.115 70 Lawrence
-34.780  -90.780 70 Lee
-33.953  -91.734 70 Lincoln
-33.700  -94.236 70 Little River
-35.215  -93.713 70 Logan
-34.755  -91.883 70 Lonoke
-36.012  -93.723 70 Madison
-36.263  -92.680 70 Marion
-33.311  -93.881 70 Miller
-35.764  -90.054 70 Mississippi
-34.680  -91.203 70 Monroe
-34.546  -93.660 70 Montgomery
-33.667  -93.303 70 Nevada
-35.918  -93.223 70 Newton
-33.591  -92.879 70 Ouachita
-34.947  -92.934 70 Perry
-34.426  -90.852 70 Phillips
-34.166  -93.655 70 Pike
-35.577  -90.663 70 Poinsett
-34.475  -94.224 70 Polk
-35.446  -93.036 70 Pope
-34.828  -91.557 70 Prairie
-34.770  -92.311 70 Pulaski
-36.342  -91.028 70 Randolph
-35.022  -90.747 70 St Francis
-34.648  -92.675 70 Saline
-34.859  -94.063 70 Scott
-35.918  -92.703 70 Searcy
-35.199  -94.275 70 Sebastian
-33.999  -94.238 70 Sevier
-36.154  -91.482 70 Sharp
-35.863  -92.153 70 Stone
-33.170  -92.594 70 Union
-35.581  -92.519 70 Van Buren
-35.986  -94.214 70 Washington
-35.255  -91.746 70 White
-35.188  -91.241 70 Woodruff
-34.998  -93.407 70 Yell
-37.654 -121.914 70 Alameda
-38.579 -119.804 70 Alpine
-38.444 -120.655 70 Amador
-39.662 -121.596 70 Butte
-38.208 -120.552 70 Calaveras
-39.176 -122.235 70 Colusa
-37.933 -121.949 70 Contra Costa
-41.737 -123.957 70 Del Norte
-38.775 -120.528 70 El Dorado
-36.754 -119.648 70 Fresno
-39.595 -122.392 70 Glenn
-40.700 -123.912 70 Humboldt
-33.039 -115.353 70 Imperial
-36.589 -117.483 70 Inyo
-35.338 -118.725 70 Kern
-36.073 -119.815 70 Kings
-39.091 -122.762 70 Lake
-40.652 -120.578 70 Lassen
-34.185 -118.262 70 Los Angeles
-37.220 -119.765 70 Madera
-38.035 -122.743 70 Marin
-37.578 -119.910 70 Mariposa
-39.431 -123.432 70 Mendocino
-37.189 -120.711 70 Merced
-41.595 -120.719 70 Modoc
-37.911 -118.874 70 Mono
-36.239 -121.311 70 Monterey
-38.503 -122.323 70 Napa
-39.304 -120.766 70 Nevada
-33.675 -117.777 70 Orange
-39.065 -120.728 70 Placer
-40.011 -120.834 70 Plumas
-33.728 -115.977 70 Riverside
-38.445 -121.349 70 Sacramento
-36.612 -121.084 70 San Benito
-34.828 -116.191 70 San Bernardino
-33.021 -116.772 70 San Diego
-37.793 -122.555 70 San Francisco
-37.933 -121.271 70 San Joaquin
-35.382 -120.446 70 San Luis Obispo
-37.437 -122.356 70 San Mateo
-34.537 -120.026 70 Santa Barbara
-37.233 -121.686 70 Santa Clara
-37.026 -122.007 70 Santa Cruz
-40.760 -122.038 70 Shasta
-39.591 -120.499 70 Sierra
-41.589 -122.533 70 Siskiyou
-38.267 -121.938 70 Solano
-38.512 -122.929 70 Sonoma
-37.562 -120.994 70 Stanislaus
-39.040 -121.689 70 Sutter
-40.129 -122.233 70 Tehama
-40.657 -123.118 70 Trinity
-36.228 -118.797 70 Tulare
-38.019 -119.945 70 Tuolumne
-34.356 -119.146 70 Ventura
-38.701 -121.883 70 Yolo
-39.271 -121.353 70 Yuba
-39.871 -104.350 70 Adams                                   |NE
-37.572 -105.785 70 Alamosa                                 |SC
-39.644 -104.332 70 Arapahoe                                |NE
-37.187 -107.052 70 Archuleta                               |SC
-37.321 -102.557 70 Baca                                    |SE
-37.955 -103.077 70 Bent                                    |SE
-40.088 -105.357 70 Boulder                                 |NE
-38.737 -106.176 70 Chaffee                                 |CC
-38.820 -102.588 70 Cheyenne                                |EC
-39.688 -105.636 70 Clear Creek                             |CC
-37.206 -106.194 70 Conejos                                 |SC
-37.276 -105.428 70 Costilla                                |SC
-38.327 -103.785 70 Crowley                                 |SE
-38.093 -105.361 70 Custer                                  |SE
-38.862 -107.861 70 Delta                                   |WC
-39.768 -104.873 70 Denver                                  |NE
-37.755 -108.522 70 Dolores                                 |SW
-39.346 -104.930 70 Douglas                                 |NE
-39.624 -106.704 70 Eagle                                   |CC
-39.282 -104.128 70 Elbert                                  |EC
-38.838 -104.521 70 El Paso                                 |EC
-38.476 -105.438 70 Fremont                                 |CC
-39.603 -107.897 70 Garfield                                |WC
-39.859 -105.520 70 Gilpin                                  |CC
-40.102 -106.118 70 Grand                                   |NC
-38.669 -107.014 70 Gunnison                                |CC
-37.821 -107.280 70 Hinsdale                                |SW
-37.687 -104.959 70 Huerfano                                |SE
-40.662 -106.339 70 Jackson                                 |NC
-39.587 -105.247 70 Jefferson                               |NE
-38.434 -102.741 70 Kiowa                                   |SE
-39.305 -102.602 70 Kit Carson                              |EC
-39.190 -106.358 70 Lake                                    |CC
-37.286 -107.846 70 La Plata                                |SW
-40.649 -105.456 70 Larimer                                 |NC
-37.320 -104.043 70 Las Animas                              |SE
-38.979 -103.523 70 Lincoln                                 |EC
-40.729 -103.105 70 Logan                                   |NE
-39.022 -108.468 70 Mesa                                    |WC
-37.693 -106.927 70 Mineral                                 |SC
-40.608 -108.202 70 Moffat                                  |NW
-37.336 -108.596 70 Montezuma                               |SW
-38.406 -108.269 70 Montrose                                |WC
-40.263 -103.807 70 Morgan                                  |NE
-37.896 -103.711 70 Otero                                   |SE
-38.157 -107.766 70 Ouray                                   |SW
-39.117 -105.714 70 Park                                    |CC
-40.594 -102.349 70 Phillips                                |NE
-39.221 -106.921 70 Pitkin                                  |CC
-37.956 -102.395 70 Prowers                                 |SE
-38.153 -104.506 70 Pueblo                                  |SE
-39.975 -108.199 70 Rio Blanco                              |NW
-37.606 -106.388 70 Rio Grande                              |SC
-40.484 -106.987 70 Routt                                   |NW
-38.079 -106.299 70 Saguache                                |CC
-37.770 -107.667 70 San Juan                                |SW
-38.013 -108.426 70 San Miguel                              |WC
-40.877 -102.353 70 Sedgwick                                |NE
-39.619 -106.108 70 Summit                                  |CC
-38.881 -105.154 70 Teller                                  |CC
-39.976 -103.201 70 Washington                              |NE
-40.545 -104.403 70 Weld                                    |NE
-40.000 -102.422 70 Yuma                                    |NE
-41.221  -73.370 70 Fairfield
-41.807  -72.731 70 Hartford
-41.791  -73.248 70 Litchfield
-41.435  -72.526 70 Middlesex
-41.364  -72.906 70 New Haven
-41.477  -72.120 70 New London
-41.848  -72.337 70 Tolland
-41.832  -71.988 70 Windham
-39.097  -75.503 70 Kent
-39.581  -75.638 70 New Castle
-38.683  -75.342 70 Sussex
-38.905  -77.016 70 District of Columbia
-29.676  -82.358 70 Alachua
-30.324  -82.274 70 Baker
-30.236  -85.632 70 Bay
-29.950  -82.168 70 Bradford
-28.299  -80.701 70 Brevard
-26.146  -80.453 70 Broward
-30.410  -85.197 70 Calhoun
-26.898  -81.954 70 Charlotte
-28.849  -82.516 70 Citrus
-29.977  -81.858 70 Clay
-26.083  -81.401 70 Collier
-30.225  -82.625 70 Columbia
-25.606  -80.502 70 Dade
-27.191  -81.806 70 DeSoto
-29.586  -83.194 70 Dixie
-30.334  -81.649 70 Duval
-30.607  -87.333 70 Escambia
-29.470  -81.297 70 Flagler
-29.802  -84.817 70 Franklin
-30.582  -84.612 70 Gadsden
-29.734  -82.803 70 Gilchrist
-26.954  -81.186 70 Glades
-29.900  -85.242 70 Gulf
-30.492  -82.949 70 Hamilton
-27.494  -81.809 70 Hardee
-26.554  -81.173 70 Hendry
-28.553  -82.468 70 Hernando
-27.341  -81.343 70 Highlands
-27.906  -82.346 70 Hillsborough
-30.867  -85.812 70 Holmes
-27.698  -80.579 70 Indian River
-30.797  -85.213 70 Jackson
-30.421  -83.896 70 Jefferson
-29.988  -83.180 70 Lafayette
-28.766  -81.717 70 Lake
-26.578  -81.921 70 Lee
-30.457  -84.279 70 Leon
-29.277  -82.790 70 Levy
-30.233  -84.887 70 Liberty
-30.452  -83.467 70 Madison
-27.481  -82.360 70 Manatee
-29.212  -82.059 70 Marion
-27.080  -80.397 70 Martin
-25.117  -81.150 70 Monroe
-30.611  -81.768 70 Nassau
-30.668  -86.593 70 Okaloosa
-27.385  -80.890 70 Okeechobee
-28.514  -81.322 70 Orange
-28.058  -81.147 70 Osceola
-26.641  -80.437 70 Palm Beach
-28.301  -82.439 70 Pasco
-27.903  -82.739 70 Pinellas
-27.960  -81.700 70 Polk
-29.605  -81.740 70 Putnam
-29.908  -81.407 70 St Johns
-27.378  -80.444 70 St Lucie
-30.696  -87.016 70 Santa Rosa
-27.195  -82.369 70 Sarasota
-28.709  -81.227 70 Seminole
-28.708  -82.079 70 Sumter
-30.187  -82.993 70 Suwannee
-30.019  -83.616 70 Taylor
-30.043  -82.374 70 Union
-29.068  -81.138 70 Volusia
-30.153  -84.381 70 Wakulla
-30.615  -86.171 70 Walton
-30.613  -85.671 70 Washington
-31.753  -82.286 70 Appling
-31.295  -82.875 70 Atkinson
-31.557  -82.451 70 Bacon
-31.331  -84.454 70 Baker
-33.072  -83.251 70 Baldwin
-34.353  -83.501 70 Banks
-33.993  -83.712 70 Barrow
-34.238  -84.839 70 Bartow
-31.759  -83.220 70 Ben Hill
-31.274  -83.232 70 Berrien
-32.805  -83.699 70 Bibb
-32.436  -83.331 70 Bleckley
-31.197  -81.983 70 Brantley
-30.847  -83.577 70 Brooks
-32.020  -81.438 70 Bryan
-32.391  -81.744 70 Bulloch
-33.058  -81.999 70 Burke
-33.288  -83.957 70 Butts
-31.528  -84.619 70 Calhoun
-30.919  -81.638 70 Camden
-32.401  -82.075 70 Candler
-33.583  -85.079 70 Carroll
-34.902  -85.136 70 Catoosa
-30.779  -82.140 70 Charlton
-31.968  -81.085 70 Chatham
-32.348  -84.788 70 Chattahoochee
-34.477  -85.346 70 Chattooga
-34.245  -84.474 70 Cherokee
-33.952  -83.366 70 Clarke
-31.621  -84.993 70 Clay
-33.543  -84.357 70 Clayton
-30.918  -82.703 70 Clinch
-33.942  -84.577 70 Cobb
-31.547  -82.851 70 Coffee
-31.186  -83.768 70 Colquitt
-33.549  -82.261 70 Columbia
-31.155  -83.431 70 Cook
-33.353  -84.763 70 Coweta
-32.710  -83.980 70 Crawford
-31.925  -83.772 70 Crisp
-34.855  -85.505 70 Dade
-34.440  -84.171 70 Dawson
-30.879  -84.580 70 Decatur
-33.771  -84.227 70 DeKalb
-32.173  -83.166 70 Dodge
-32.161  -83.798 70 Dooly
-31.538  -84.216 70 Dougherty
-33.700  -84.767 70 Douglas
-31.330  -84.909 70 Early
-30.717  -82.899 70 Echols
-32.370  -81.343 70 Effingham
-34.115  -82.840 70 Elbert
-32.587  -82.304 70 Emanuel
-32.158  -81.891 70 Evans
-34.864  -84.319 70 Fannin
-33.415  -84.493 70 Fayette
-34.263  -85.215 70 Floyd
-34.224  -84.127 70 Forsyth
-34.373  -83.228 70 Franklin
-33.789  -84.467 70 Fulton
-34.688  -84.458 70 Gilmer
-33.231  -82.607 70 Glascock
-31.217  -81.494 70 Glynn
-34.504  -84.872 70 Gordon
-30.875  -84.233 70 Grady
-33.581  -83.168 70 Greene
-33.959  -84.025 70 Gwinnett
-34.630  -83.529 70 Habersham
-34.316  -83.821 70 Hall
-33.270  -83.001 70 Hancock
-33.791  -85.209 70 Haralson
-32.741  -84.906 70 Harris
-34.353  -82.959 70 Hart
-33.300  -85.129 70 Heard
-33.456  -84.155 70 Henry
-32.458  -83.668 70 Houston
-31.602  -83.274 70 Irwin
-34.133  -83.563 70 Jackson
-33.316  -83.687 70 Jasper
-31.802  -82.636 70 Jeff Davis
-33.054  -82.415 70 Jefferson
-32.789  -81.960 70 Jenkins
-32.702  -82.656 70 Johnson
-33.026  -83.566 70 Jones
-33.073  -84.135 70 Lamar
-31.037  -83.063 70 Lanier
-32.463  -82.930 70 Laurens
-31.777  -84.137 70 Lee
-31.800  -81.462 70 Liberty
-33.793  -82.452 70 Lincoln
-31.759  -81.747 70 Long
-30.835  -83.268 70 Lowndes
-34.574  -84.002 70 Lumpkin
-33.478  -82.482 70 McDuffie
-31.480  -81.372 70 McIntosh
-32.354  -84.038 70 Macon
-34.128  -83.210 70 Madison
-32.353  -84.526 70 Marion
-33.043  -84.685 70 Meriwether
-31.164  -84.729 70 Miller
-31.224  -84.195 70 Mitchell
-33.013  -83.913 70 Monroe
-32.168  -82.530 70 Montgomery
-33.593  -83.493 70 Morgan
-34.782  -84.748 70 Murray
-32.511  -84.875 70 Muscogee
-33.553  -83.844 70 Newton
-33.837  -83.437 70 Oconee
-33.881  -83.082 70 Oglethorpe
-33.923  -84.866 70 Paulding
-32.564  -83.828 70 Peach
-34.465  -84.465 70 Pickens
-31.356  -82.215 70 Pierce
-33.091  -84.386 70 Pike
-33.999  -85.182 70 Polk
-32.237  -83.474 70 Pulaski
-33.321  -83.373 70 Putnam
-31.859  -85.012 70 Quitman
-34.881  -83.401 70 Rabun
-31.763  -84.758 70 Randolph
-33.359  -82.074 70 Richmond
-33.650  -84.027 70 Rockdale
-32.263  -84.320 70 Schley
-32.749  -81.614 70 Screven
-30.933  -84.867 70 Seminole
-33.262  -84.285 70 Spalding
-34.556  -83.294 70 Stephens
-32.078  -84.837 70 Stewart
-32.042  -84.196 70 Sumter
-32.708  -84.528 70 Talbot
-33.567  -82.883 70 Taliaferro
-32.043  -82.061 70 Tattnall
-32.554  -84.251 70 Taylor
-31.935  -82.941 70 Telfair
-31.776  -84.436 70 Terrell
-30.865  -83.919 70 Thomas
-31.457  -83.526 70 Tift
-32.123  -82.335 70 Toombs
-34.919  -83.739 70 Towns
-32.405  -82.565 70 Treutlen
-33.033  -85.028 70 Troup
-31.716  -83.627 70 Turner
-32.666  -83.426 70 Twiggs
-34.834  -83.991 70 Union
-32.879  -84.298 70 Upson
-34.731  -85.296 70 Walker
-33.783  -83.738 70 Walton
-31.052  -82.422 70 Ware
-33.408  -82.676 70 Warren
-32.968  -82.795 70 Washington
-31.548  -81.913 70 Wayne
-32.049  -84.550 70 Webster
-32.122  -82.717 70 Wheeler
-34.645  -83.753 70 White
-34.805  -84.966 70 Whitfield
-31.970  -83.436 70 Wilcox
-33.787  -82.744 70 Wilkes
-32.799  -83.168 70 Wilkinson
-31.553  -83.848 70 Worth
-19.597 -155.499 70 Hawaii
-23.573 -164.701 70 Honolulu
-21.226 -156.948 70 Kalawao
-22.013 -159.705 70 Kauai
-20.868 -156.622 70 Maui
-43.448 -116.243 70 Ada
-44.896 -116.455 70 Adams
-42.668 -112.222 70 Bannock
-42.290 -111.333 70 Bear Lake
-47.222 -116.655 70 Benewah
-43.216 -112.398 70 Bingham
-43.394 -113.978 70 Blaine
-44.006 -115.739 70 Boise
-48.295 -116.598 70 Bonner
-43.380 -111.602 70 Bonneville
-48.793 -116.449 70 Boundary
-43.725 -113.174 70 Butte
-43.469 -114.811 70 Camas
-43.626 -116.707 70 Canyon
-42.759 -111.551 70 Caribou
-42.272 -113.611 70 Cassia
-44.285 -112.376 70 Clark
-46.668 -115.658 70 Clearwater
-44.232 -114.294 70 Custer
-43.343 -115.465 70 Elmore
-42.183 -111.810 70 Franklin
-44.217 -111.484 70 Fremont
-44.061 -116.405 70 Gem
-42.965 -114.800 70 Gooding
-45.847 -115.459 70 Idaho
-43.822 -112.305 70 Jefferson
-42.692 -114.263 70 Jerome
-47.677 -116.697 70 Kootenai
-46.816 -116.706 70 Latah
-44.956 -113.949 70 Lemhi
-46.239 -116.430 70 Lewis
-42.978 -114.130 70 Lincoln
-43.788 -111.657 70 Madison
-42.848 -113.643 70 Minidoka
-46.331 -116.746 70 Nez Perce
-42.208 -112.522 70 Oneida
-42.563 -116.168 70 Owyhee
-44.010 -116.758 70 Payette
-42.688 -112.838 70 Power
-47.348 -115.885 70 Shoshone
-43.755 -111.213 70 Teton
-42.353 -114.662 70 Twin Falls
-44.744 -115.560 70 Valley
-44.449 -116.779 70 Washington
-39.986  -91.195 70 Adams
-37.194  -89.340 70 Alexander
-38.881  -89.436 70 Bond
-42.326  -88.813 70 Boone
-39.954  -90.750 70 Brown
-41.409  -89.529 70 Bureau
-39.165  -90.667 70 Calhoun
-42.061  -89.924 70 Carroll
-39.977  -90.247 70 Cass
-40.140  -88.196 70 Champaign
-39.547  -89.278 70 Christian
-39.333  -87.792 70 Clark
-38.755  -88.488 70 Clay
-38.607  -89.424 70 Clinton
-39.513  -88.221 70 Coles
-41.898  -87.650 70 Cook
-39.003  -87.760 70 Crawford
-39.274  -88.240 70 Cumberland
-41.894  -88.769 70 DeKalb
-40.170  -88.905 70 De Witt
-39.766  -88.223 70 Douglas
-41.852  -88.086 70 DuPage
-39.679  -87.747 70 Edgar
-38.417  -88.058 70 Edwards
-39.064  -88.588 70 Effingham
-39.001  -89.018 70 Fayette
-40.595  -88.225 70 Ford
-37.992  -88.923 70 Franklin
-40.479  -90.213 70 Fulton
-37.758  -88.229 70 Gallatin
-39.352  -90.386 70 Greene
-41.289  -88.428 70 Grundy
-38.081  -88.541 70 Hamilton
-40.402  -91.169 70 Hancock
-37.522  -88.266 70 Hardin
-40.810  -90.926 70 Henderson
-41.355  -90.136 70 Henry
-40.742  -87.824 70 Iroquois
-37.788  -89.381 70 Jackson
-39.006  -88.149 70 Jasper
-38.301  -88.924 70 Jefferson
-39.088  -90.358 70 Jersey
-42.364  -90.210 70 Jo Daviess
-37.459  -88.874 70 Johnson
-41.936  -88.432 70 Kane
-41.138  -87.863 70 Kankakee
-41.588  -88.431 70 Kendall
-40.931  -90.214 70 Knox
-42.433  -87.777 70 Lake
-41.341  -88.885 70 La Salle
-38.720  -87.731 70 Lawrence
-41.740  -89.300 70 Lee
-40.888  -88.557 70 Livingston
-40.127  -89.363 70 Logan
-40.456  -90.678 70 McDonough
-42.324  -88.452 70 McHenry
-40.495  -88.845 70 McLean
-39.860  -88.961 70 Macon
-39.257  -89.921 70 Macoupin
-38.832  -89.908 70 Madison
-38.649  -88.919 70 Marion
-41.031  -89.342 70 Marshall
-40.238  -89.914 70 Mason
-37.219  -88.710 70 Massac
-40.034  -89.800 70 Menard
-41.204  -90.742 70 Mercer
-38.277  -90.178 70 Monroe
-39.228  -89.478 70 Montgomery
-39.715  -90.198 70 Morgan
-39.638  -88.617 70 Moultrie
-42.042  -89.320 70 Ogle
-40.790  -89.759 70 Peoria
-38.085  -89.368 70 Perry
-40.007  -88.593 70 Piatt
-39.620  -90.886 70 Pike
-37.411  -88.573 70 Pope
-37.228  -89.131 70 Pulaski
-41.203  -89.282 70 Putnam
-38.049  -89.821 70 Randolph
-38.713  -88.085 70 Richland
-41.469  -90.566 70 Rock Island
-38.471  -89.931 70 St Clair
-37.754  -88.541 70 Saline
-39.758  -89.658 70 Sangamon
-40.158  -90.609 70 Schuyler
-39.648  -90.478 70 Scott
-39.395  -88.809 70 Shelby
-41.089  -89.795 70 Stark
-42.350  -89.666 70 Stephenson
-40.513  -89.513 70 Tazewell
-37.469  -89.256 70 Union
-40.182  -87.738 70 Vermilion
-38.444  -87.840 70 Wabash
-40.853  -90.615 70 Warren
-38.351  -89.417 70 Washington
-38.432  -88.423 70 Wayne
-38.087  -88.178 70 White
-41.751  -89.911 70 Whiteside
-41.439  -87.982 70 Will
-37.730  -88.930 70 Williamson
-42.332  -89.161 70 Winnebago
-40.786  -89.212 70 Woodford
-40.745  -84.936 70 Adams
-41.091  -85.064 70 Allen
-39.205  -85.898 70 Bartholomew
-40.606  -87.308 70 Benton
-40.473  -85.323 70 Blackford
-40.051  -86.469 70 Boone
-39.196  -86.229 70 Brown
-40.584  -86.565 70 Carroll
-40.761  -86.347 70 Cass
-38.477  -85.716 70 Clark
-39.396  -87.115 70 Clay
-40.300  -86.476 70 Clinton
-38.285  -86.456 70 Crawford
-38.702  -87.076 70 Daviess
-39.150  -84.977 70 Dearborn
-39.304  -85.502 70 Decatur
-41.396  -85.000 70 De Kalb
-40.226  -85.398 70 Delaware
-38.364  -86.881 70 Dubois
-41.596  -85.859 70 Elkhart
-39.644  -85.176 70 Fayette
-38.319  -85.903 70 Floyd
-40.123  -87.244 70 Fountain
-39.422  -85.056 70 Franklin
-41.044  -86.261 70 Fulton
-38.309  -87.580 70 Gibson
-40.516  -85.654 70 Grant
-39.037  -86.966 70 Greene
-40.071  -86.052 70 Hamilton
-39.823  -85.771 70 Hancock
-38.199  -86.116 70 Harrison
-39.769  -86.509 70 Hendricks
-39.931  -85.397 70 Henry
-40.481  -86.116 70 Howard
-40.829  -85.494 70 Huntington
-38.907  -86.043 70 Jackson
-41.025  -87.120 70 Jasper
-40.434  -85.009 70 Jay
-38.786  -85.437 70 Jefferson
-38.996  -85.628 70 Jennings
-39.490  -86.096 70 Johnson
-38.691  -87.419 70 Knox
-41.244  -85.861 70 Kosciusko
-41.642  -85.426 70 Lagrange
-41.476  -87.379 70 Lake
-41.549  -86.745 70 La Porte
-38.840  -86.485 70 Lawrence
-40.163  -85.721 70 Madison
-39.782  -86.138 70 Marion
-41.331  -86.263 70 Marshall
-38.711  -86.802 70 Martin
-40.769  -86.048 70 Miami
-39.161  -86.523 70 Monroe
-40.041  -86.893 70 Montgomery
-39.482  -86.447 70 Morgan
-40.951  -87.402 70 Newton
-41.396  -85.417 70 Noble
-38.954  -84.968 70 Ohio
-38.535  -86.495 70 Orange
-39.312  -86.839 70 Owen
-39.775  -87.207 70 Parke
-38.082  -86.644 70 Perry
-38.398  -87.233 70 Pike
-41.508  -87.071 70 Porter
-38.024  -87.861 70 Posey
-41.037  -86.695 70 Pulaski
-39.667  -86.844 70 Putnam
-40.150  -85.006 70 Randolph
-39.102  -85.260 70 Ripley
-39.617  -85.469 70 Rush
-41.618  -86.288 70 St Joseph
-38.687  -85.744 70 Scott
-39.523  -85.791 70 Shelby
-38.011  -87.011 70 Spencer
-41.282  -86.648 70 Starke
-41.644  -85.000 70 Steuben
-39.089  -87.414 70 Sullivan
-38.824  -85.027 70 Switzerland
-40.388  -86.894 70 Tippecanoe
-40.310  -86.052 70 Tipton
-39.623  -84.923 70 Union
-38.023  -87.584 70 Vanderburgh
-39.854  -87.462 70 Vermillion
-39.429  -87.390 70 Vigo
-40.847  -85.790 70 Wabash
-40.345  -87.356 70 Warren
-38.098  -87.271 70 Warrick
-38.599  -86.106 70 Washington
-39.862  -85.006 70 Wayne
-40.727  -85.220 70 Wells
-40.748  -86.865 70 White
-41.135  -85.504 70 Whitley
-41.327  -94.466 70 Adair
-41.033  -94.702 70 Adams
-43.280  -91.373 70 Allamakee
-40.741  -92.869 70 Appanoose
-41.685  -94.905 70 Audubon
-42.080  -92.066 70 Benton
-42.473  -92.307 70 Black Hawk
-42.036  -93.933 70 Boone
-42.776  -92.308 70 Bremer
-42.469  -91.839 70 Buchanan
-42.742  -95.161 70 Buena Vista
-42.728  -92.795 70 Butler
-42.388  -94.637 70 Calhoun
-42.035  -94.859 70 Carroll
-41.330  -94.933 70 Cass
-41.773  -91.132 70 Cedar
-43.083  -93.261 70 Cerro Gordo
-42.735  -95.623 70 Cherokee
-43.060  -92.317 70 Chickasaw
-41.029  -93.784 70 Clarke
-43.085  -95.155 70 Clay
-42.854  -91.341 70 Clayton
-41.897  -90.534 70 Clinton
-42.039  -95.384 70 Crawford
-41.688  -94.038 70 Dallas
-40.748  -92.410 70 Davis
-40.738  -93.784 70 Decatur
-42.470  -91.367 70 Delaware
-40.921  -91.175 70 Des Moines
-43.377  -95.152 70 Dickinson
-42.473  -90.886 70 Dubuque
-43.378  -94.669 70 Emmet
-42.858  -91.845 70 Fayette
-43.058  -92.790 70 Floyd
-42.731  -93.260 70 Franklin
-40.743  -95.600 70 Fremont
-42.038  -94.391 70 Greene
-42.401  -92.791 70 Grundy
-41.684  -94.501 70 Guthrie
-42.381  -93.709 70 Hamilton
-43.086  -93.743 70 Hancock
-42.380  -93.242 70 Hardin
-41.687  -95.810 70 Harrison
-40.989  -91.544 70 Henry
-43.352  -92.315 70 Howard
-42.782  -94.203 70 Humboldt
-42.381  -95.513 70 Ida
-41.688  -92.066 70 Iowa
-42.165  -90.576 70 Jackson
-41.686  -93.053 70 Jasper
-41.033  -91.948 70 Jefferson
-41.666  -91.590 70 Johnson
-42.120  -91.131 70 Jones
-41.337  -92.181 70 Keokuk
-43.205  -94.197 70 Kossuth
-40.645  -91.478 70 Lee
-42.079  -91.595 70 Linn
-41.217  -91.262 70 Louisa
-41.027  -93.327 70 Lucas
-43.373  -96.209 70 Lyon
-41.331  -94.015 70 Madison
-41.334  -92.645 70 Mahaska
-41.335  -93.101 70 Marion
-42.033  -93.002 70 Marshall
-41.034  -95.618 70 Mills
-43.359  -92.786 70 Mitchell
-42.050  -95.953 70 Monona
-41.029  -92.870 70 Monroe
-41.031  -95.156 70 Montgomery
-41.487  -91.113 70 Muscatine
-43.084  -95.626 70 O'Brien
-43.377  -95.619 70 Osceola
-40.738  -95.150 70 Page
-43.091  -94.680 70 Palo Alto
-42.737  -96.216 70 Plymouth
-42.733  -94.678 70 Pocahontas
-41.681  -93.569 70 Polk
-41.340  -95.546 70 Pottawattamie
-41.694  -92.532 70 Poweshiek
-40.735  -94.244 70 Ringgold
-42.387  -95.104 70 Sac
-41.642  -90.622 70 Scott
-41.679  -95.309 70 Shelby
-43.083  -96.177 70 Sioux
-42.037  -93.466 70 Story
-42.081  -92.532 70 Tama
-40.734  -94.692 70 Taylor
-41.028  -94.242 70 Union
-40.755  -91.953 70 Van Buren
-41.030  -92.409 70 Wapello
-41.333  -93.560 70 Warren
-41.337  -91.717 70 Washington
-40.738  -93.326 70 Wayne
-42.434  -94.179 70 Webster
-43.378  -93.725 70 Winnebago
-43.291  -91.843 70 Winneshiek
-42.388  -96.037 70 Woodbury
-43.376  -93.266 70 Worth
-42.733  -93.735 70 Wright
-37.888  -95.300 70 Allen
-38.216  -95.292 70 Anderson
-39.531  -95.314 70 Atchison
-37.224  -98.684 70 Barber
-38.480  -98.755 70 Barton
-37.856  -94.851 70 Bourbon
-39.823  -95.562 70 Brown
-37.774  -96.834 70 Butler
-38.302  -96.593 70 Chase
-37.155  -96.245 70 Chautauqua
-37.169  -94.846 70 Cherokee
-39.781 -101.730 70 Cheyenne
-37.236  -99.818 70 Clark
-39.351  -97.164 70 Clay
-39.483  -97.656 70 Cloud
-38.237  -95.735 70 Coffey
-37.186  -99.282 70 Comanche
-37.231  -96.837 70 Cowley
-37.508  -94.851 70 Crawford
-39.785 -100.460 70 Decatur
-38.864  -97.158 70 Dickinson
-39.789  -95.148 70 Doniphan
-38.884  -95.287 70 Douglas
-37.883  -99.304 70 Edwards
-37.457  -96.245 70 Elk
-38.916  -99.315 70 Ellis
-38.696  -98.205 70 Ellsworth
-38.047 -100.746 70 Finney
-37.692  -99.883 70 Ford
-38.567  -95.288 70 Franklin
-38.996  -96.749 70 Geary
-38.921 -100.491 70 Gove
-39.349  -99.880 70 Graham
-37.563 -101.309 70 Grant
-37.745 -100.424 70 Gray
-38.473 -101.804 70 Greeley
-37.878  -96.228 70 Greenwood
-37.993 -101.793 70 Hamilton
-37.198  -98.078 70 Harper
-38.044  -97.425 70 Harvey
-37.563 -100.873 70 Haskell
-38.088  -99.898 70 Hodgeman
-39.421  -95.798 70 Jackson
-39.229  -95.382 70 Jefferson
-39.786  -98.218 70 Jewell
-38.884  -94.822 70 Johnson
-37.995 -101.313 70 Kearny
-37.560  -98.135 70 Kingman
-37.559  -99.287 70 Kiowa
-37.191  -95.298 70 Labette
-38.481 -100.466 70 Lane
-39.202  -95.038 70 Leavenworth
-39.044  -98.211 70 Lincoln
-38.207  -94.841 70 Linn
-38.916 -101.147 70 Logan
-38.462  -96.150 70 Lyon
-38.388  -97.648 70 McPherson
-38.362  -97.098 70 Marion
-39.779  -96.529 70 Marshall
-37.240 -100.359 70 Meade
-38.565  -94.834 70 Miami
-39.393  -98.207 70 Mitchell
-37.189  -95.742 70 Montgomery
-38.687  -96.643 70 Morris
-37.198 -101.808 70 Morton
-39.776  -96.019 70 Nemaha
-37.557  -95.301 70 Neosho
-38.475  -99.916 70 Ness
-39.784  -99.899 70 Norton
-38.650  -95.727 70 Osage
-39.349  -98.767 70 Osborne
-39.132  -97.653 70 Ottawa
-38.181  -99.232 70 Pawnee
-39.784  -99.347 70 Phillips
-39.380  -96.334 70 Pottawatomie
-37.648  -98.740 70 Pratt
-39.790 -101.074 70 Rawlins
-37.961  -98.090 70 Reno
-39.828  -97.650 70 Republic
-38.347  -98.200 70 Rice
-39.293  -96.727 70 Riley
-39.351  -99.326 70 Rooks
-38.523  -99.309 70 Rush
-38.922  -98.766 70 Russell
-38.781  -97.648 70 Saline
-38.482 -100.906 70 Scott
-37.683  -97.462 70 Sedgwick
-37.191 -100.852 70 Seward
-39.043  -95.758 70 Shawnee
-39.351 -100.441 70 Sheridan
-39.351 -101.719 70 Sherman
-39.785  -98.785 70 Smith
-38.036  -98.720 70 Stafford
-37.559 -101.784 70 Stanton
-37.203 -101.318 70 Stevens
-37.230  -97.475 70 Sumner
-39.359 -101.055 70 Thomas
-38.921  -99.865 70 Trego
-38.955  -96.200 70 Wabaunsee
-38.909 -101.754 70 Wallace
-39.784  -97.086 70 Washington
-38.482 -101.347 70 Wichita
-37.559  -95.742 70 Wilson
-37.887  -95.739 70 Woodson
-39.114  -94.766 70 Wyandotte
-37.105  -85.282 70 Adair
-36.752  -86.190 70 Allen
-38.004  -84.988 70 Anderson
-37.064  -89.002 70 Ballard
-36.960  -85.928 70 Barren
-38.140  -83.741 70 Bath
-36.736  -83.673 70 Bell
-38.974  -84.730 70 Boone
-38.203  -84.211 70 Bourbon
-38.359  -82.689 70 Boyd
-37.619  -84.866 70 Boyle
-38.693  -84.083 70 Bracken
-37.519  -83.322 70 Breathitt
-37.773  -86.431 70 Breckinridge
-37.971  -85.695 70 Bullitt
-37.209  -86.681 70 Butler
-37.148  -87.871 70 Caldwell
-36.621  -88.274 70 Calloway
-38.945  -84.379 70 Campbell
-36.854  -88.977 70 Carlisle
-38.670  -85.128 70 Carroll
-38.326  -83.051 70 Carter
-37.322  -84.928 70 Casey
-36.895  -87.492 70 Christian
-37.971  -84.146 70 Clark
-37.157  -83.709 70 Clay
-36.719  -85.135 70 Clinton
-37.357  -88.090 70 Crittenden
-36.782  -85.389 70 Cumberland
-37.732  -87.088 70 Daviess
-37.213  -86.246 70 Edmonson
-38.120  -83.098 70 Elliott
-37.693  -83.965 70 Estill
-38.043  -84.459 70 Fayette
-38.374  -83.695 70 Fleming
-37.556  -82.748 70 Floyd
-38.235  -84.879 70 Franklin
-36.553  -89.185 70 Fulton
-38.757  -84.862 70 Gallatin
-37.645  -84.535 70 Garrard
-38.639  -84.613 70 Grant
-36.723  -88.650 70 Graves
-37.460  -86.346 70 Grayson
-37.259  -85.554 70 Green
-38.542  -82.921 70 Greenup
-37.842  -86.779 70 Hancock
-37.696  -85.963 70 Hardin
-36.856  -83.215 70 Harlan
-38.444  -84.332 70 Harrison
-37.293  -85.888 70 Hart
-37.799  -87.573 70 Henderson
-38.456  -85.123 70 Henry
-36.678  -88.976 70 Hickman
-37.307  -87.538 70 Hopkins
-37.417  -84.008 70 Jackson
-38.188  -85.662 70 Jefferson
-37.872  -84.582 70 Jessamine
-37.844  -82.830 70 Johnson
-38.933  -84.536 70 Kenton
-37.347  -82.954 70 Knott
-36.890  -83.852 70 Knox
-37.553  -85.698 70 Larue
-37.111  -84.120 70 Laurel
-38.061  -82.732 70 Lawrence
-37.590  -83.718 70 Lee
-37.094  -83.384 70 Leslie
-37.117  -82.855 70 Letcher
-38.531  -83.385 70 Lewis
-37.456  -84.659 70 Lincoln
-37.212  -88.347 70 Livingston
-36.858  -86.879 70 Logan
-37.015  -88.079 70 Lyon
-37.056  -88.717 70 McCracken
-36.739  -84.482 70 McCreary
-37.528  -87.261 70 McLean
-37.723  -84.277 70 Madison
-37.699  -83.065 70 Magoffin
-37.554  -85.270 70 Marion
-36.881  -88.335 70 Marshall
-37.799  -82.520 70 Martin
-38.596  -83.826 70 Mason
-37.979  -86.218 70 Meade
-37.948  -83.604 70 Menifee
-37.805  -84.876 70 Mercer
-36.989  -85.630 70 Metcalfe
-36.710  -85.718 70 Monroe
-38.030  -83.906 70 Montgomery
-37.923  -83.259 70 Morgan
-37.213  -87.146 70 Muhlenberg
-37.805  -85.466 70 Nelson
-38.341  -84.014 70 Nicholas
-37.473  -86.845 70 Ohio
-38.397  -85.444 70 Oldham
-38.527  -84.830 70 Owen
-37.414  -83.689 70 Owsley
-38.693  -84.356 70 Pendleton
-37.245  -83.225 70 Perry
-37.468  -82.394 70 Pike
-37.830  -83.826 70 Powell
-37.103  -84.576 70 Pulaski
-38.508  -84.052 70 Robertson
-37.362  -84.316 70 Rockcastle
-38.194  -83.420 70 Rowan
-36.989  -85.064 70 Russell
-38.296  -84.580 70 Scott
-38.218  -85.194 70 Shelby
-36.740  -86.582 70 Simpson
-38.030  -85.323 70 Spencer
-37.366  -85.330 70 Taylor
-36.840  -87.185 70 Todd
-36.806  -87.875 70 Trigg
-38.598  -85.339 70 Trimble
-37.656  -87.954 70 Union
-36.992  -86.424 70 Warren
-37.753  -85.174 70 Washington
-36.811  -84.831 70 Wayne
-37.516  -87.682 70 Webster
-36.763  -84.147 70 Whitley
-37.742  -83.490 70 Wolfe
-38.039  -84.741 70 Woodford
-30.291  -92.411 70 Acadia
-30.656  -92.828 70 Allen
-30.203  -90.909 70 Ascension
-29.899  -91.064 70 Assumption
-31.071  -92.003 70 Avoyelles
-30.653  -93.341 70 Beauregard
-32.349  -93.056 70 Bienville
-32.681  -93.603 70 Bossier
-32.579  -93.880 70 Caddo
-30.228  -93.358 70 Calcasieu
-32.087  -92.120 70 Caldwell
-29.847  -93.200 70 Cameron
-31.666  -91.846 70 Catahoula
-32.816  -92.994 70 Claiborne
-31.441  -91.640 70 Concordia
-32.062  -93.736 70 De Soto
-30.544  -91.094 70 East Baton Rouge
-32.734  -91.235 70 East Carroll
-30.850  -91.049 70 East Feliciana
-30.733  -92.412 70 Evangeline
-32.138  -91.673 70 Franklin
-31.593  -92.560 70 Grant
-29.794  -91.785 70 Iberia
-30.263  -91.349 70 Iberville
-32.296  -92.554 70 Jackson
-29.718  -90.102 70 Jefferson
-30.269  -92.816 70 Jefferson Davis
-30.206  -92.064 70 Lafayette
-29.494  -90.399 70 Lafourche
-31.676  -92.158 70 La Salle
-32.604  -92.663 70 Lincoln
-30.444  -90.731 70 Livingston
-32.371  -91.243 70 Madison
-32.818  -91.800 70 Morehouse
-31.726  -93.095 70 Natchitoches
-30.066  -89.931 70 Orleans
-32.478  -92.156 70 Ouachita
-29.391  -89.481 70 Plaquemines
-30.708  -91.600 70 Pointe Coupee
-31.197  -92.536 70 Rapides
-32.094  -93.331 70 Red River
-32.417  -91.764 70 Richland
-31.560  -93.558 70 Sabine
-29.895  -89.346 70 St Bernard
-29.912  -90.357 70 St Charles
-30.820  -90.710 70 St Helena
-30.026  -90.796 70 St James
-30.118  -90.502 70 St John the Baptist
-30.598  -92.004 70 St Landry
-30.130  -91.612 70 St Martin
-29.635  -91.468 70 St Mary
-30.399  -89.964 70 St Tammany
-30.634  -90.402 70 Tangipahoa
-32.003  -91.330 70 Tensas
-29.335  -90.838 70 Terrebonne
-32.827  -92.378 70 Union
-29.814  -92.309 70 Vermilion
-31.108  -93.186 70 Vernon
-30.852  -90.042 70 Washington
-32.704  -93.331 70 Webster
-30.463  -91.313 70 West Baton Rouge
-32.786  -91.453 70 West Carroll
-30.873  -91.423 70 West Feliciana
-31.945  -92.637 70 Winn
-44.158  -70.217 70 Androscoggin
-46.648  -68.591 70 Aroostook
-43.827  -70.316 70 Cumberland
-44.977  -70.444 70 Franklin
-44.566  -68.368 70 Hancock
-44.413  -69.766 70 Kennebec
-44.032  -69.035 70 Knox
-44.000  -69.526 70 Lincoln
-44.486  -70.760 70 Oxford
-45.399  -68.643 70 Penobscot
-45.843  -69.295 70 Piscataquis
-43.908  -69.838 70 Sagadahoc
-45.506  -69.954 70 Somerset
-44.484  -69.125 70 Waldo
-44.969  -67.610 70 Washington
-43.407  -70.682 70 York
-39.631  -78.690 70 Allegany
-38.992  -76.569 70 Anne Arundel
-39.442  -76.617 70 Baltimore
-38.531  -76.529 70 Calvert
-38.871  -75.832 70 Caroline
-39.565  -77.024 70 Carroll
-39.567  -75.950 70 Cecil
-38.482  -77.012 70 Charles
-38.419  -76.081 70 Dorchester
-39.472  -77.397 70 Frederick
-39.530  -79.270 70 Garrett
-39.537  -76.300 70 Harford
-39.249  -76.934 70 Howard
-39.231  -76.095 70 Kent
-39.137  -77.205 70 Montgomery
-38.830  -76.849 70 Prince George's
-39.033  -76.083 70 Queen Anne's
-38.215  -76.530 70 St Mary's
-38.082  -75.859 70 Somerset
-38.751  -76.179 70 Talbot
-39.604  -77.814 70 Washington
-38.369  -75.629 70 Wicomico
-38.226  -75.283 70 Worcester
-39.301  -76.611 70 Baltimore
-41.720  -70.251 70 Barnstable
-42.369  -73.205 70 Berkshire
-41.787  -71.096 70 Bristol
-41.374  -70.703 70 Dukes
-42.626  -70.872 70 Essex
-42.583  -72.591 70 Franklin
-42.122  -72.670 70 Hampden
-42.341  -72.662 70 Hampshire
-42.484  -71.394 70 Middlesex
-41.253  -70.127 70 Nantucket
-42.172  -71.184 70 Norfolk
-41.996  -70.730 70 Plymouth
-42.357  -70.978 70 Suffolk
-42.354  -71.916 70 Worcester
-44.712  -83.273 70 Alcona
-47.160  -86.484 70 Alger
-42.565  -86.250 70 Allegan
-45.037  -83.198 70 Alpena
-45.006  -85.177 70 Antrim
-44.045  -83.752 70 Arenac
-46.715  -88.342 70 Baraga
-42.598  -85.311 70 Barry
-43.721  -83.943 70 Bay
-44.630  -86.248 70 Benzie
-41.943  -86.592 70 Berrien
-41.915  -85.054 70 Branch
-42.253  -85.003 70 Calhoun
-41.914  -85.993 70 Cass
-45.466  -85.458 70 Charlevoix
-45.476  -84.496 70 Cheboygan
-46.318  -84.519 70 Chippewa
-43.991  -84.838 70 Clare
-42.941  -84.612 70 Clinton
-44.680  -84.611 70 Crawford
-45.775  -86.873 70 Delta
-45.997  -87.872 70 Dickinson
-42.588  -84.846 70 Eaton
-45.583  -84.981 70 Emmet
-43.021  -83.707 70 Genesee
-43.989  -84.388 70 Gladwin
-46.484  -89.791 70 Gogebic
-44.733  -85.552 70 Grand Traverse
-43.292  -84.605 70 Gratiot
-41.888  -84.594 70 Hillsdale
-46.984  -88.647 70 Houghton
-43.959  -82.836 70 Huron
-42.604  -84.374 70 Ingham
-42.944  -85.073 70 Ionia
-44.276  -83.337 70 Iosco
-46.205  -88.514 70 Iron
-43.648  -84.838 70 Isabella
-42.248  -84.425 70 Jackson
-42.245  -85.530 70 Kalamazoo
-44.692  -85.084 70 Kalkaska
-43.033  -85.547 70 Kent
-47.477  -88.155 70 Keweenaw
-43.988  -85.812 70 Lake
-43.091  -83.224 70 Lapeer
-45.133  -86.030 70 Leelanau
-41.892  -84.069 70 Lenawee
-42.602  -83.912 70 Livingston
-46.747  -85.590 70 Luce
-46.009  -85.008 70 Mackinac
-42.668  -82.910 70 Macomb
-44.301  -86.312 70 Manistee
-46.664  -87.604 70 Marquette
-44.022  -86.500 70 Mason
-43.643  -85.323 70 Mecosta
-45.522  -87.525 70 Menominee
-43.643  -84.386 70 Midland
-44.339  -85.096 70 Missaukee
-41.915  -83.500 70 Monroe
-43.313  -85.149 70 Montcalm
-45.027  -84.129 70 Montmorency
-43.287  -86.446 70 Muskegon
-43.551  -85.797 70 Newaygo
-42.660  -83.384 70 Oakland
-43.657  -86.531 70 Oceana
-44.334  -84.131 70 Ogemaw
-46.979  -89.271 70 Ontonagon
-43.985  -85.330 70 Osceola
-44.683  -84.125 70 Oscoda
-45.017  -84.607 70 Otsego
-42.922  -86.233 70 Ottawa
-45.322  -83.459 70 Presque Isle
-44.331  -84.611 70 Roscommon
-43.335  -84.052 70 Saginaw
-42.934  -82.668 70 St Clair
-41.915  -85.530 70 St Joseph
-43.457  -82.640 70 Sanilac
-46.024  -86.187 70 Schoolcraft
-42.950  -84.144 70 Shiawassee
-43.488  -83.437 70 Tuscola
-42.271  -86.309 70 Van Buren
-42.253  -83.842 70 Washtenaw
-42.285  -83.260 70 Wayne
-44.338  -85.580 70 Wexford
-46.607  -93.414 70 Aitkin
-45.274  -93.241 70 Anoka
-46.932  -95.668 70 Becker
-48.018  -94.923 70 Beltrami
-45.703  -94.000 70 Benton
-45.427  -96.413 70 Big Stone
-44.033  -94.064 70 Blue Earth
-44.235  -94.721 70 Brown
-46.590  -92.680 70 Carlton
-44.821  -93.798 70 Carver
-46.946  -94.322 70 Cass
-45.029  -95.564 70 Chippewa
-45.502  -92.909 70 Chisago
-46.899  -96.495 70 Clay
-47.573  -95.380 70 Clearwater
-47.726  -90.442 70 Cook
-44.009  -95.183 70 Cottonwood
-46.487  -94.072 70 Crow Wing
-44.685  -93.065 70 Dakota
-44.027  -92.862 70 Dodge
-45.936  -95.454 70 Douglas
-43.677  -93.948 70 Faribault
-43.675  -92.089 70 Fillmore
-43.671  -93.350 70 Freeborn
-44.415  -92.722 70 Goodhue
-45.932  -96.011 70 Grant
-45.003  -93.475 70 Hennepin
-43.674  -91.491 70 Houston
-47.101  -94.914 70 Hubbard
-45.565  -93.293 70 Isanti
-47.508  -93.626 70 Itasca
-43.675  -95.157 70 Jackson
-45.948  -93.298 70 Kanabec
-45.152  -95.008 70 Kandiyohi
-48.776  -96.780 70 Kittson
-48.259  -93.769 70 Koochiching
-45.001  -96.175 70 Lac qui Parle
-47.526  -91.388 70 Lake
-48.768  -94.904 70 Lake of the Woods
-44.374  -93.732 70 Le Sueur
-44.408  -96.272 70 Lincoln
-44.414  -95.840 70 Lyon
-44.826  -94.271 70 McLeod
-47.326  -95.810 70 Mahnomen
-48.354  -96.377 70 Marshall
-43.677  -94.557 70 Martin
-45.123  -94.527 70 Meeker
-45.930  -93.633 70 Mille Lacs
-46.012  -94.268 70 Morrison
-43.672  -92.751 70 Mower
-44.020  -95.761 70 Murray
-44.342  -94.245 70 Nicollet
-43.673  -95.757 70 Nobles
-47.331  -96.463 70 Norman
-44.002  -92.399 70 Olmsted
-46.408  -95.714 70 Otter Tail
-48.065  -96.036 70 Pennington
-46.140  -92.736 70 Pine
-44.025  -96.254 70 Pipestone
-47.775  -96.400 70 Polk
-45.593  -95.447 70 Pope
-45.015  -93.100 70 Ramsey
-47.877  -96.096 70 Red Lake
-44.404  -95.254 70 Redwood
-44.724  -94.955 70 Renville
-44.357  -93.297 70 Rice
-43.673  -96.248 70 Rock
-48.770  -95.799 70 Roseau
-47.578  -92.462 70 St Louis
-44.655  -93.535 70 Scott
-45.440  -93.768 70 Sherburne
-44.579  -94.229 70 Sibley
-45.555  -94.610 70 Stearns
-44.023  -93.224 70 Steele
-45.585  -96.001 70 Stevens
-45.287  -95.682 70 Swift
-46.071  -94.899 70 Todd
-45.772  -96.470 70 Traverse
-44.282  -92.239 70 Wabasha
-46.577  -94.959 70 Wadena
-44.019  -93.590 70 Waseca
-45.038  -92.889 70 Washington
-43.979  -94.615 70 Watonwan
-46.355  -96.471 70 Wilkin
-43.985  -91.775 70 Winona
-45.175  -93.968 70 Wright
-44.719  -95.863 70 Yellow Medicine
-31.480  -91.351 70 Adams
-34.877  -88.576 70 Alcorn
-31.173  -90.801 70 Amite
-33.089  -89.580 70 Attala
-34.817  -89.187 70 Benton
-33.795  -90.882 70 Bolivar
-33.936  -89.337 70 Calhoun
-33.450  -89.920 70 Carroll
-33.922  -88.948 70 Chickasaw
-33.345  -89.252 70 Choctaw
-31.973  -90.914 70 Claiborne
-32.040  -88.691 70 Clarke
-33.652  -88.774 70 Clay
-34.225  -90.597 70 Coahoma
-31.865  -90.445 70 Copiah
-31.632  -89.552 70 Covington
-34.875  -89.992 70 DeSoto
-31.187  -89.259 70 Forrest
-31.478  -90.898 70 Franklin
-30.866  -88.643 70 George
-31.217  -88.640 70 Greene
-33.771  -89.801 70 Grenada
-30.389  -89.472 70 Hancock
-30.419  -89.090 70 Harrison
-32.263  -90.444 70 Hinds
-33.121  -90.088 70 Holmes
-33.132  -90.524 70 Humphreys
-32.738  -90.988 70 Issaquena
-34.278  -88.359 70 Itawamba
-30.463  -88.622 70 Jackson
-32.019  -89.120 70 Jasper
-31.730  -91.035 70 Jefferson
-31.564  -89.823 70 Jefferson Davis
-31.624  -89.168 70 Jones
-32.756  -88.645 70 Kemper
-34.359  -89.485 70 Lafayette
-31.210  -89.505 70 Lamar
-32.404  -88.661 70 Lauderdale
-31.550  -90.107 70 Lawrence
-32.753  -89.523 70 Leake
-34.289  -88.681 70 Lee
-33.548  -90.298 70 Leflore
-31.536  -90.452 70 Lincoln
-33.471  -88.444 70 Lowndes
-32.634  -90.034 70 Madison
-31.231  -89.822 70 Marion
-34.770  -89.509 70 Marshall
-33.890  -88.485 70 Monroe
-33.498  -89.609 70 Montgomery
-32.752  -89.119 70 Neshoba
-32.405  -89.118 70 Newton
-33.111  -88.570 70 Noxubee
-33.426  -88.880 70 Oktibbeha
-34.363  -89.947 70 Panola
-30.770  -89.592 70 Pearl River
-31.172  -88.987 70 Perry
-31.176  -90.400 70 Pike
-34.228  -89.037 70 Pontotoc
-34.613  -88.519 70 Prentiss
-34.255  -90.287 70 Quitman
-32.263  -89.946 70 Rankin
-32.405  -89.545 70 Scott
-32.879  -90.812 70 Sharkey
-31.915  -89.921 70 Simpson
-32.016  -89.501 70 Smith
-30.789  -89.123 70 Stone
-33.607  -90.595 70 Sunflower
-33.946  -90.172 70 Tallahatchie
-34.653  -89.940 70 Tate
-34.770  -88.908 70 Tippah
-34.741  -88.243 70 Tishomingo
-34.656  -90.376 70 Tunica
-34.490  -89.004 70 Union
-31.145  -90.103 70 Walthall
-32.357  -90.852 70 Warren
-33.286  -90.948 70 Washington
-31.644  -88.702 70 Wayne
-33.613  -89.282 70 Webster
-31.164  -91.319 70 Wilkinson
-33.093  -89.035 70 Winston
-34.032  -89.715 70 Yalobusha
-32.781  -90.405 70 Yazoo
-40.188  -92.599 70 Adair
-39.988  -94.801 70 Andrew
-40.425  -95.434 70 Atchison
-39.214  -91.843 70 Audrain
-36.713  -93.831 70 Barry
-37.501  -94.344 70 Barton
-38.258  -94.339 70 Bates
-38.299  -93.288 70 Benton
-37.321  -90.028 70 Bollinger
-38.987  -92.308 70 Boone
-39.666  -94.806 70 Buchanan
-36.715  -90.403 70 Butler
-39.659  -93.979 70 Caldwell
-38.836  -91.925 70 Callaway
-38.029  -92.772 70 Camden
-37.383  -89.684 70 Cape Girardeau
-39.428  -93.501 70 Carroll
-36.942  -90.966 70 Carter
-38.647  -94.354 70 Cass
-37.722  -93.865 70 Cedar
-39.519  -92.960 70 Chariton
-36.970  -93.187 70 Christian
-40.411  -91.742 70 Clark
-39.313  -94.423 70 Clay
-39.604  -94.402 70 Clinton
-38.507  -92.282 70 Cole
-38.846  -92.813 70 Cooper
-37.977  -91.303 70 Crawford
-37.430  -93.853 70 Dade
-37.672  -93.020 70 Dallas
-39.961  -93.986 70 Daviess
-39.899  -94.405 70 DeKalb
-37.609  -91.498 70 Dent
-36.928  -92.497 70 Douglas
-36.271  -90.090 70 Dunklin
-38.408  -91.076 70 Franklin
-38.442  -91.506 70 Gasconade
-40.218  -94.411 70 Gentry
-37.257  -93.337 70 Greene
-40.112  -93.567 70 Grundy
-40.354  -93.982 70 Harrison
-38.387  -93.791 70 Henry
-37.942  -93.319 70 Hickory
-40.095  -95.213 70 Holt
-39.144  -92.695 70 Howard
-36.774  -91.887 70 Howell
-37.546  -90.757 70 Iron
-39.010  -94.344 70 Jackson
-37.202  -94.336 70 Jasper
-38.256  -90.537 70 Jefferson
-38.749  -93.809 70 Johnson
-40.125  -92.150 70 Knox
-37.660  -92.595 70 Laclede
-39.059  -93.784 70 Lafayette
-37.108  -93.830 70 Lawrence
-40.094  -91.726 70 Lewis
-39.061  -90.962 70 Lincoln
-39.868  -93.111 70 Linn
-39.783  -93.547 70 Livingston
-36.622  -94.354 70 McDonald
-39.830  -92.560 70 Macon
-37.481  -90.343 70 Madison
-38.175  -91.919 70 Maries
-39.813  -91.624 70 Marion
-40.424  -93.566 70 Mercer
-38.217  -92.432 70 Miller
-36.827  -89.295 70 Mississippi
-38.633  -92.584 70 Moniteau
-39.495  -91.998 70 Monroe
-38.942  -91.473 70 Montgomery
-38.426  -92.886 70 Morgan
-36.595  -89.656 70 New Madrid
-36.907  -94.332 70 Newton
-40.360  -94.883 70 Nodaway
-36.688  -91.402 70 Oregon
-38.465  -91.859 70 Osage
-36.651  -92.444 70 Ozark
-36.215  -89.783 70 Pemiscot
-37.709  -89.829 70 Perry
-38.726  -93.284 70 Pettis
-37.878  -91.793 70 Phelps
-39.341  -91.171 70 Pike
-39.378  -94.771 70 Platte
-37.617  -93.401 70 Polk
-37.825  -92.209 70 Pulaski
-40.479  -93.017 70 Putnam
-39.525  -91.528 70 Ralls
-39.433  -92.497 70 Randolph
-39.350  -93.991 70 Ray
-37.358  -90.971 70 Reynolds
-36.659  -90.866 70 Ripley
-38.779  -90.675 70 St Charles
-38.040  -93.774 70 St Clair
-37.894  -90.185 70 Ste. Genevieve
-37.810  -90.465 70 St Francois
-38.639  -90.443 70 St Louis
-39.136  -93.204 70 Saline
-40.471  -92.518 70 Schuyler
-40.454  -92.149 70 Scotland
-37.054  -89.572 70 Scott
-37.160  -91.403 70 Shannon
-39.791  -92.069 70 Shelby
-36.856  -89.946 70 Stoddard
-36.740  -93.465 70 Stone
-40.212  -93.112 70 Sullivan
-36.655  -93.036 70 Taney
-37.317  -91.964 70 Texas
-37.850  -94.342 70 Vernon
-38.768  -91.164 70 Warren
-37.969  -90.877 70 Washington
-37.113  -90.461 70 Wayne
-37.284  -92.875 70 Webster
-40.481  -94.420 70 Worth
-37.266  -92.462 70 Wright
-38.636  -90.244 40 St Louis city
-45.116 -112.896 70 Beaverhead
-45.429 -107.490 70 Big Horn
-48.436 -108.962 70 Blaine
-46.332 -111.495 70 Broadwater
-45.232 -109.022 70 Carbon
-45.502 -104.538 70 Carter
-47.311 -111.351 70 Cascade
-47.876 -110.439 70 Chouteau
-46.265 -105.580 70 Custer
-48.786 -105.547 70 Daniels
-47.273 -104.901 70 Dawson
-46.066 -113.084 70 Deer Lodge
-46.354 -104.411 70 Fallon
-47.262 -109.222 70 Fergus
-48.291 -114.019 70 Flathead
-45.558 -111.174 70 Gallatin
-47.282 -106.989 70 Garfield
-48.700 -113.019 70 Glacier
-46.383 -109.167 70 Golden Valley
-46.420 -113.447 70 Granite
-48.628 -110.106 70 Hill
-46.177 -112.105 70 Jefferson
-47.040 -110.265 70 Judith Basin
-47.650 -114.089 70 Lake
-47.114 -112.377 70 Lewis and Clark
-48.549 -111.025 70 Liberty
-48.536 -115.409 70 Lincoln
-47.649 -105.802 70 McCone
-45.296 -111.922 70 Madison
-46.592 -110.864 70 Meagher
-47.145 -114.981 70 Mineral
-47.041 -113.925 70 Missoula
-46.486 -108.400 70 Musselshell
-45.498 -110.521 70 Park
-47.107 -108.262 70 Petroleum
-48.262 -107.923 70 Phillips
-48.235 -112.219 70 Pondera
-45.382 -105.636 70 Powder River
-46.850 -112.941 70 Powell
-46.853 -105.373 70 Prairie
-46.085 -114.123 70 Ravalli
-47.785 -104.561 70 Richland
-48.295 -105.029 70 Roosevelt
-46.226 -106.724 70 Rosebud
-47.662 -115.131 70 Sanders
-48.727 -104.500 70 Sheridan
-45.896 -112.658 70 Silver Bow
-45.674 -109.389 70 Stillwater
-45.814 -109.943 70 Sweet Grass
-47.848 -112.233 70 Teton
-48.651 -111.689 70 Toole
-46.203 -107.266 70 Treasure
-48.356 -106.663 70 Valley
-46.471 -109.844 70 Wheatland
-46.962 -104.247 70 Wibaux
-45.935 -108.272 70 Yellowstone
-45.004 -110.801 70 Yellowstone National Park
-40.523  -98.500 70 Adams
-42.178  -98.072 70 Antelope
-41.572 -101.696 70 Arthur
-41.543 -103.715 70 Banner
-41.926  -99.983 70 Blaine
-41.705  -98.063 70 Boone
-42.213 -103.082 70 Box Butte
-42.896  -98.772 70 Boyd
-42.445  -99.934 70 Brown
-40.855  -99.074 70 Buffalo
-41.854  -96.321 70 Burt
-41.222  -97.133 70 Butler
-40.913  -96.139 70 Cass
-42.598  -97.249 70 Cedar
-40.530 -101.694 70 Chase
-42.543 -101.119 70 Cherry
-41.219 -102.987 70 Cheyenne
-40.524  -98.051 70 Clay
-41.576  -97.088 70 Colfax
-41.916  -96.788 70 Cuming
-41.394  -99.727 70 Custer
-42.387  -96.563 70 Dakota
-42.709 -103.136 70 Dawes
-40.866  -99.815 70 Dawson
-41.113 -102.332 70 Deuel
-42.499  -96.868 70 Dixon
-41.576  -96.645 70 Dodge
-41.299  -96.147 70 Douglas
-40.182 -101.690 70 Dundy
-40.525  -97.596 70 Fillmore
-40.183  -98.947 70 Franklin
-40.527 -100.388 70 Frontier
-40.173  -99.915 70 Furnas
-40.265  -96.693 70 Gage
-41.622 -102.344 70 Garden
-41.894  -98.982 70 Garfield
-40.504  -99.823 70 Gosper
-41.917 -101.743 70 Grant
-41.563  -98.515 70 Greeley
-40.866  -98.502 70 Hall
-40.877  -98.021 70 Hamilton
-40.174  -99.399 70 Harlan
-40.527 -101.060 70 Hayes
-40.176 -101.040 70 Hitchcock
-42.460  -98.784 70 Holt
-41.888 -101.141 70 Hooker
-41.219  -98.518 70 Howard
-40.168  -97.146 70 Jefferson
-40.396  -96.266 70 Johnson
-40.506  -98.946 70 Kearney
-41.197 -101.662 70 Keith
-42.878  -99.719 70 Keya Paha
-41.199 -103.711 70 Kimball
-42.634  -97.881 70 Knox
-40.784  -96.689 70 Lancaster
-41.052 -100.745 70 Lincoln
-41.556 -100.476 70 Logan
-41.933  -99.447 70 Loup
-41.570 -101.060 70 McPherson
-41.922  -97.600 70 Madison
-41.169  -98.030 70 Merrick
-41.694 -103.013 70 Morrill
-41.394  -97.994 70 Nance
-40.387  -95.847 70 Nemaha
-40.177  -98.046 70 Nuckolls
-40.652  -96.136 70 Otoe
-40.130  -96.240 70 Pawnee
-40.842 -101.656 70 Perkins
-40.509  -99.410 70 Phelps
-42.271  -97.611 70 Pierce
-41.568  -97.525 70 Platte
-41.188  -97.571 70 Polk
-40.176 -100.479 70 Red Willow
-40.124  -95.718 70 Richardson
-42.418  -99.454 70 Rock
-40.531  -97.142 70 Saline
-41.114  -96.110 70 Sarpy
-41.226  -96.634 70 Saunders
-41.850 -103.709 70 Scotts Bluff
-40.872  -97.140 70 Seward
-42.497 -102.434 70 Sheridan
-41.222  -98.973 70 Sherman
-42.481 -103.771 70 Sioux
-41.922  -97.190 70 Stanton
-40.176  -97.594 70 Thayer
-41.918 -100.582 70 Thomas
-42.157  -96.550 70 Thurston
-41.570  -98.977 70 Valley
-41.527  -96.223 70 Washington
-42.214  -97.125 70 Wayne
-40.178  -98.498 70 Webster
-41.918  -98.525 70 Wheeler
-40.872  -97.597 70 York
-39.602 -118.341 70 Churchill
-36.202 -115.023 70 Clark
-38.916 -119.614 70 Douglas
-41.131 -115.354 70 Elko
-37.786 -117.632 70 Esmeralda
-39.979 -116.270 70 Eureka
-41.411 -118.117 70 Humboldt
-39.946 -117.026 70 Lander
-37.642 -114.875 70 Lincoln
-39.013 -119.192 70 Lyon
-38.542 -118.428 70 Mineral
-38.050 -116.451 70 Nye
-40.446 -118.403 70 Pershing
-39.447 -119.535 70 Storey
-40.634 -119.685 70 Washoe
-39.435 -114.896 70 White Pine
-39.148 -119.743 70 Carson City
-43.519  -71.425 70 Belknap
-43.870  -71.211 70 Carroll
-42.921  -72.253 70 Cheshire
-44.687  -71.302 70 Coos
-43.933  -71.843 70 Grafton
-42.915  -71.716 70 Hillsborough
-43.290  -71.677 70 Merrimack
-42.984  -71.089 70 Rockingham
-43.296  -71.027 70 Strafford
-43.361  -72.225 70 Sullivan
-39.465  -74.637 70 Atlantic
-40.959  -74.074 70 Bergen
-39.876  -74.669 70 Burlington
-39.801  -74.960 70 Camden
-39.077  -74.859 70 Cape May
-39.330  -75.133 70 Cumberland
-40.787  -74.246 70 Essex
-39.715  -75.140 70 Gloucester
-40.732  -74.075 70 Hudson
-40.570  -74.917 70 Hunterdon
-40.282  -74.699 70 Mercer
-40.439  -74.409 70 Middlesex
-40.288  -74.154 70 Monmouth
-40.865  -74.547 70 Morris
-39.872  -74.250 70 Ocean
-41.032  -74.300 70 Passaic
-39.580  -75.362 70 Salem
-40.564  -74.615 70 Somerset
-41.142  -74.691 70 Sussex
-40.660  -74.308 70 Union
-40.855  -74.994 70 Warren
-35.053 -106.670 70 Bernalillo
-33.924 -108.417 70 Catron
-33.363 -104.469 70 Chaves
-34.920 -107.989 70 Cibola
-36.606 -104.638 70 Colfax
-34.572 -103.346 70 Curry
-34.336 -104.416 70 DeBaca
-32.345 -106.832 70 Dona Ana
-32.466 -104.298 70 Eddy
-32.729 -108.379 70 Grant
-34.862 -104.785 70 Guadalupe
-35.858 -103.817 70 Harding
-31.916 -108.712 70 Hidalgo
-32.796 -103.415 70 Lea
-33.740 -105.456 70 Lincoln
-35.865 -106.309 70 Los Alamos
-32.181 -107.749 70 Luna
-35.583 -108.260 70 McKinley
-36.018 -104.940 70 Mora
-32.623 -105.726 70 Otero
-35.106 -103.552 70 Quay
-36.509 -106.697 70 Rio Arriba
-34.019 -103.480 70 Roosevelt
-35.688 -106.848 70 Sandoval
-36.513 -108.323 70 San Juan
-35.470 -104.827 70 San Miguel
-35.508 -105.978 70 Santa Fe
-33.136 -107.186 70 Sierra
-34.016 -106.934 70 Socorro
-36.570 -105.630 70 Taos
-34.640 -105.854 70 Torrance
-36.476 -103.471 70 Union
-34.717 -106.805 70 Valencia
-42.603  -73.972 70 Albany
-42.255  -78.022 70 Allegany
-40.849  -73.853 70 Bronx
-42.164  -75.820 70 Broome
-42.241  -78.679 70 Cattaraugus
-42.945  -76.561 70 Cayuga
-42.302  -79.412 70 Chautauqua
-42.141  -76.760 70 Chemung
-42.495  -75.615 70 Chenango
-44.740  -73.679 70 Clinton
-42.251  -73.630 70 Columbia
-42.599  -76.073 70 Cortland
-42.201  -74.965 70 Delaware
-41.764  -73.747 70 Dutchess
-42.755  -78.785 70 Erie
-44.113  -73.768 70 Essex
-44.600  -74.309 70 Franklin
-43.115  -74.424 70 Fulton
-43.001  -78.195 70 Genesee
-42.292  -74.129 70 Greene
-43.655  -74.501 70 Hamilton
-43.412  -74.959 70 Herkimer
-43.994  -76.054 70 Jefferson
-40.636  -73.951 70 Kings
-43.786  -75.449 70 Lewis
-42.727  -77.770 70 Livingston
-42.912  -75.668 70 Madison
-43.295  -77.689 70 Monroe
-42.906  -74.437 70 Montgomery
-40.733  -73.588 70 Nassau
-40.774  -73.972 70 New York
-43.324  -78.794 70 Niagara
-43.241  -75.438 70 Oneida
-43.007  -76.196 70 Onondaga
-42.853  -77.295 70 Ontario
-41.402  -74.306 70 Orange
-43.368  -78.229 70 Orleans
-43.466  -76.204 70 Oswego
-42.634  -75.035 70 Otsego
-41.431  -73.746 70 Putnam
-40.656  -73.840 70 Queens
-42.710  -73.514 70 Rensselaer
-40.562  -74.140 70 Richmond
-41.150  -74.027 70 Rockland
-44.497  -75.073 70 St Lawrence
-43.106  -73.868 70 Saratoga
-42.815  -74.066 70 Schenectady
-42.591  -74.439 70 Schoharie
-42.390  -76.877 70 Schuyler
-42.786  -76.829 70 Seneca
-42.264  -77.385 70 Steuben
-40.941  -72.679 70 Suffolk
-41.715  -74.765 70 Sullivan
-42.167  -76.303 70 Tioga
-42.451  -76.475 70 Tompkins
-41.889  -74.258 70 Ulster
-43.563  -73.844 70 Warren
-43.320  -73.431 70 Washington
-43.283  -77.054 70 Wayne
-41.154  -73.754 70 Westchester
-42.699  -78.228 70 Wyoming
-42.639  -77.105 70 Yates
-36.044  -79.398 70 Alamance
-35.922  -81.177 70 Alexander
-36.494  -81.130 70 Alleghany
-34.975  -80.102 70 Anson
-36.433  -81.502 70 Ashe
-36.079  -81.923 70 Avery
-35.483  -76.845 70 Beaufort
-36.059  -76.963 70 Bertie
-34.619  -78.556 70 Bladen
-34.039  -78.221 70 Brunswick
-35.609  -82.530 70 Buncombe
-35.747  -81.706 70 Burke
-35.388  -80.551 70 Cabarrus
-35.954  -81.547 70 Caldwell
-36.337  -76.163 70 Camden
-34.876  -76.504 70 Carteret
-36.396  -79.335 70 Caswell
-35.663  -81.214 70 Catawba
-35.702  -79.258 70 Chatham
-35.137  -84.064 70 Cherokee
-36.131  -76.602 70 Chowan
-35.058  -83.756 70 Clay
-35.336  -81.556 70 Cleveland
-34.260  -78.665 70 Columbus
-35.120  -77.082 70 Craven
-35.046  -78.829 70 Cumberland
-36.364  -75.944 70 Currituck
-35.690  -75.727 70 Dare
-35.794  -80.212 70 Davidson
-35.930  -80.543 70 Davie
-34.936  -77.935 70 Duplin
-36.038  -78.875 70 Durham
-35.914  -77.596 70 Edgecombe
-36.130  -80.257 70 Forsyth
-36.079  -78.284 70 Franklin
-35.296  -81.181 70 Gaston
-36.442  -76.703 70 Gates
-35.349  -83.833 70 Graham
-36.305  -78.656 70 Granville
-35.486  -77.684 70 Greene
-36.079  -79.789 70 Guilford
-36.256  -77.656 70 Halifax
-35.371  -78.864 70 Harnett
-35.553  -82.978 70 Haywood
-35.337  -82.481 70 Henderson
-36.358  -76.984 70 Hertford
-35.021  -79.234 70 Hoke
-35.406  -76.153 70 Hyde
-35.809  -80.873 70 Iredell
-35.288  -83.144 70 Jackson
-35.519  -78.365 70 Johnston
-35.012  -77.366 70 Jones
-35.476  -79.172 70 Lee
-35.242  -77.643 70 Lenoir
-35.484  -81.223 70 Lincoln
-35.682  -82.048 70 McDowell
-35.150  -83.421 70 Macon
-35.858  -82.712 70 Madison
-35.843  -77.103 70 Martin
-35.248  -80.833 70 Mecklenburg
-36.014  -82.164 70 Mitchell
-35.330  -79.903 70 Montgomery
-35.309  -79.485 70 Moore
-35.968  -77.988 70 Nash
-34.182  -77.865 70 New Hanover
-36.419  -77.398 70 Northampton
-34.715  -77.413 70 Onslow
-36.059  -79.118 70 Orange
-35.150  -76.668 70 Pamlico
-36.265  -76.262 70 Pasquotank
-34.510  -77.887 70 Pender
-36.181  -76.414 70 Perquimans
-36.392  -78.977 70 Person
-35.591  -77.377 70 Pitt
-35.277  -82.166 70 Polk
-35.711  -79.806 70 Randolph
-35.003  -79.747 70 Richmond
-34.640  -79.107 70 Robeson
-36.395  -79.777 70 Rockingham
-35.636  -80.523 70 Rowan
-35.399  -81.920 70 Rutherford
-34.991  -78.369 70 Sampson
-34.841  -79.480 70 Scotland
-35.312  -80.253 70 Stanly
-36.409  -80.230 70 Stokes
-36.415  -80.687 70 Surry
-35.492  -83.492 70 Swain
-35.198  -82.797 70 Transylvania
-35.870  -76.165 70 Tyrrell
-34.988  -80.533 70 Union
-36.365  -78.405 70 Vance
-35.790  -78.650 70 Wake
-36.398  -78.097 70 Warren
-35.837  -76.565 70 Washington
-36.234  -81.697 70 Watauga
-35.362  -78.005 70 Wayne
-36.203  -81.166 70 Wilkes
-35.705  -77.919 70 Wilson
-36.158  -80.665 70 Yadkin
-35.903  -82.310 70 Yancey
-46.093 -102.534 70 Adams
-46.932  -98.070 70 Barnes
-48.072  -99.362 70 Benson
-47.035 -103.367 70 Billings
-48.792 -100.841 70 Bottineau
-46.113 -103.519 70 Bowman
-48.790 -102.519 70 Burke
-46.977 -100.472 70 Burleigh
-46.927  -97.252 70 Cass
-48.768  -98.463 70 Cavalier
-46.109  -98.494 70 Dickey
-48.809 -103.487 70 Divide
-47.358 -102.615 70 Dunn
-47.723  -98.900 70 Eddy
-46.285 -100.237 70 Emmons
-47.460  -98.885 70 Foster
-46.939 -103.844 70 Golden Valley
-47.919  -97.454 70 Grand Forks
-46.358 -101.639 70 Grant
-47.464  -98.232 70 Griggs
-46.431 -102.456 70 Hettinger
-46.977  -99.779 70 Kidder
-46.466  -98.530 70 LaMoure
-46.450  -99.477 70 Logan
-48.232 -100.637 70 McHenry
-46.119  -99.439 70 McIntosh
-47.733 -103.389 70 McKenzie
-47.605 -101.315 70 McLean
-47.302 -101.817 70 Mercer
-46.720 -101.278 70 Morton
-48.202 -102.366 70 Mountrail
-47.922  -98.186 70 Nelson
-47.113 -101.345 70 Oliver
-48.768  -97.546 70 Pembina
-48.249  -99.979 70 Pierce
-48.252  -98.716 70 Ramsey
-46.459  -97.664 70 Ransom
-48.713 -101.658 70 Renville
-46.265  -96.951 70 Richland
-48.772  -99.839 70 Rolette
-46.107  -97.629 70 Sargent
-47.581 -100.341 70 Sheridan
-46.108 -101.049 70 Sioux
-46.453 -103.458 70 Slope
-46.813 -102.664 70 Stark
-47.458  -97.719 70 Steele
-46.979  -98.955 70 Stutsman
-48.688  -99.247 70 Towner
-47.447  -97.166 70 Traill
-48.373  -97.723 70 Walsh
-48.224 -101.545 70 Ward
-47.581  -99.671 70 Wells
-48.347 -103.477 70 Williams
-38.843  -83.478 70 Adams
-40.770  -84.106 70 Allen
-40.843  -82.272 70 Ashland
-41.890  -80.756 70 Ashtabula
-39.334  -82.046 70 Athens
-40.561  -84.224 70 Auglaize
-40.018  -80.987 70 Belmont
-38.933  -83.867 70 Brown
-39.438  -84.577 70 Butler
-40.580  -81.091 70 Carroll
-40.141  -83.768 70 Champaign
-39.917  -83.784 70 Clark
-39.052  -84.150 70 Clermont
-39.411  -83.808 70 Clinton
-40.769  -80.777 70 Columbiana
-40.302  -81.915 70 Coshocton
-40.849  -82.924 70 Crawford
-41.536  -81.660 70 Cuyahoga
-40.134  -84.622 70 Darke
-41.321  -84.488 70 Defiance
-40.278  -83.007 70 Delaware
-41.513  -82.614 70 Erie
-39.746  -82.628 70 Fairfield
-39.565  -83.451 70 Fayette
-39.970  -83.010 70 Franklin
-41.597  -84.125 70 Fulton
-38.825  -82.320 70 Gallia
-41.499  -81.173 70 Geauga
-39.695  -83.886 70 Greene
-40.049  -81.496 70 Guernsey
-39.196  -84.542 70 Hamilton
-40.998  -83.665 70 Hancock
-40.661  -83.664 70 Hardin
-40.293  -81.093 70 Harrison
-41.333  -84.069 70 Henry
-39.184  -83.604 70 Highland
-39.497  -82.476 70 Hocking
-40.561  -81.929 70 Holmes
-41.150  -82.602 70 Huron
-39.021  -82.622 70 Jackson
-40.383  -80.762 70 Jefferson
-40.399  -82.422 70 Knox
-41.816  -81.241 70 Lake
-38.594  -82.536 70 Lawrence
-40.091  -82.482 70 Licking
-40.387  -83.770 70 Logan
-41.466  -82.154 70 Lorain
-41.678  -83.497 70 Lucas
-39.897  -83.401 70 Madison
-41.017  -80.773 70 Mahoning
-40.586  -83.161 70 Marion
-41.118  -81.901 70 Medina
-39.076  -82.019 70 Meigs
-40.542  -84.629 70 Mercer
-40.054  -84.228 70 Miami
-39.729  -81.080 70 Monroe
-39.752  -84.290 70 Montgomery
-39.613  -81.851 70 Morgan
-40.526  -82.798 70 Morrow
-39.966  -81.947 70 Muskingum
-39.767  -81.453 70 Noble
-41.593  -83.057 70 Ottawa
-41.118  -84.577 70 Paulding
-39.735  -82.236 70 Perry
-39.640  -83.032 70 Pickaway
-39.084  -83.072 70 Pike
-41.171  -81.198 70 Portage
-39.742  -84.652 70 Preble
-41.022  -84.128 70 Putnam
-40.775  -82.536 70 Richland
-39.329  -83.060 70 Ross
-41.357  -83.145 70 Sandusky
-38.806  -82.987 70 Scioto
-41.127  -83.126 70 Seneca
-40.329  -84.205 70 Shelby
-40.814  -81.366 70 Stark
-41.130  -81.532 70 Summit
-41.315  -80.755 70 Trumbull
-40.446  -81.474 70 Tuscarawas
-40.305  -83.375 70 Union
-40.856  -84.586 70 Van Wert
-39.250  -82.486 70 Vinton
-39.430  -84.167 70 Warren
-39.460  -81.494 70 Washington
-40.830  -81.890 70 Wayne
-41.565  -84.585 70 Williams
-41.361  -83.622 70 Wood
-40.848  -83.303 70 Wyandot
-35.878  -94.658 70 Adair
-36.731  -98.323 70 Alfalfa
-34.379  -96.046 70 Atoka
-36.753 -100.481 70 Beaver
-35.265  -99.689 70 Beckham
-35.877  -98.428 70 Blaine
-33.970  -96.255 70 Bryan
-35.182  -98.381 70 Caddo
-35.539  -97.981 70 Canadian
-34.249  -97.287 70 Carter
-35.906  -94.999 70 Cherokee
-34.027  -95.553 70 Choctaw
-36.744 -102.516 70 Cimarron
-35.201  -97.328 70 Cleveland
-34.596  -96.301 70 Coal
-34.656  -98.464 70 Comanche
-34.285  -98.374 70 Cotton
-36.760  -95.218 70 Craig
-35.902  -96.372 70 Creek
-35.636  -99.005 70 Custer
-36.415  -94.802 70 Delaware
-35.993  -98.996 70 Dewey
-36.215  -99.750 70 Ellis
-36.379  -97.785 70 Garfield
-34.709  -97.311 70 Garvin
-35.020  -97.887 70 Grady
-36.799  -97.789 70 Grant
-34.931  -99.558 70 Greer
-34.742  -99.844 70 Harmon
-36.783  -99.652 70 Harper
-35.225  -95.111 70 Haskell
-35.036  -96.256 70 Hughes
-34.587  -99.410 70 Jackson
-34.099  -97.840 70 Jefferson
-34.315  -96.655 70 Johnston
-36.815  -97.144 70 Kay
-35.942  -97.943 70 Kingfisher
-34.921  -98.981 70 Kiowa
-34.870  -95.242 70 Latimer
-34.903  -94.701 70 Le Flore
-35.703  -96.881 70 Lincoln
-35.912  -97.453 70 Logan
-33.953  -97.249 70 Love
-35.000  -97.440 70 McClain
-34.113  -94.766 70 McCurtain
-35.376  -95.666 70 McIntosh
-36.311  -98.542 70 Major
-34.025  -96.769 70 Marshall
-36.300  -95.237 70 Mayes
-34.486  -97.073 70 Murray
-35.609  -95.379 70 Muskogee
-36.389  -97.238 70 Noble
-36.793  -95.620 70 Nowata
-35.471  -96.326 70 Okfuskee
-35.549  -97.415 70 Oklahoma
-35.644  -95.966 70 Okmulgee
-36.631  -96.396 70 Osage
-36.844  -94.811 70 Ottawa
-36.314  -96.697 70 Pawnee
-36.078  -96.974 70 Payne
-34.925  -95.749 70 Pittsburg
-34.724  -96.694 70 Pontotoc
-35.202  -96.945 70 Pottawatomie
-34.415  -95.364 70 Pushmataha
-35.687  -99.703 70 Roger Mills
-36.366  -95.603 70 Rogers
-35.173  -96.608 70 Seminole
-35.498  -94.755 70 Sequoyah
-34.478  -97.856 70 Stephens
-36.752 -101.484 70 Texas
-34.377  -98.920 70 Tillman
-36.120  -95.941 70 Tulsa
-35.959  -95.523 70 Wagoner
-36.722  -95.904 70 Washington
-35.290  -98.992 70 Washita
-36.765  -98.861 70 Woods
-36.421  -99.260 70 Woodward
-44.712 -117.674 70 Baker
-44.497 -123.428 70 Benton
-45.193 -122.210 70 Clackamas
-46.006 -123.711 70 Clatsop
-45.946 -123.084 70 Columbia
-43.184 -124.092 70 Coos
-44.132 -120.359 70 Crook
-42.473 -124.230 70 Curry
-43.915 -121.224 70 Deschutes
-43.287 -123.181 70 Douglas
-45.383 -120.208 70 Gilliam
-44.498 -119.003 70 Grant
-43.071 -118.971 70 Harney
-45.523 -121.640 70 Hood River
-42.421 -122.737 70 Jackson
-44.633 -121.171 70 Jefferson
-42.362 -123.561 70 Josephine
-42.685 -121.647 70 Klamath
-42.792 -120.386 70 Lake
-43.948 -122.876 70 Lane
-44.642 -123.908 70 Lincoln
-44.492 -122.527 70 Linn
-43.206 -117.634 70 Malheur
-44.909 -122.578 70 Marion
-45.422 -119.567 70 Morrow
-45.544 -122.414 70 Multnomah
-44.906 -123.417 70 Polk
-45.409 -120.687 70 Sherman
-45.456 -123.758 70 Tillamook
-45.594 -118.734 70 Umatilla
-45.315 -118.011 70 Union
-45.577 -117.173 70 Wallowa
-45.163 -121.163 70 Wasco
-45.555 -123.095 70 Washington
-44.726 -120.023 70 Wheeler
-45.227 -123.308 70 Yamhill
-39.870  -77.218 70 Adams
-40.469  -79.981 70 Allegheny
-40.812  -79.464 70 Armstrong
-40.686  -80.352 70 Beaver
-40.010  -78.490 70 Bedford
-40.416  -75.928 70 Berks
-40.471  -78.351 70 Blair
-41.793  -76.518 70 Bradford
-40.338  -75.105 70 Bucks
-40.909  -79.912 70 Butler
-40.494  -78.715 70 Cambria
-41.442  -78.205 70 Cameron
-40.923  -75.702 70 Carbon
-40.914  -77.818 70 Centre
-39.967  -75.752 70 Chester
-41.191  -79.423 70 Clarion
-41.000  -78.474 70 Clearfield
-41.241  -77.637 70 Clinton
-41.051  -76.403 70 Columbia
-41.684  -80.108 70 Crawford
-40.170  -77.265 70 Cumberland
-40.413  -76.787 70 Dauphin
-39.917  -75.399 70 Delaware
-41.419  -78.651 70 Elk
-42.103  -80.104 70 Erie
-39.921  -79.649 70 Fayette
-41.521  -79.236 70 Forest
-39.927  -77.724 70 Franklin
-39.920  -78.109 70 Fulton
-39.855  -80.222 70 Greene
-40.414  -77.978 70 Huntingdon
-40.652  -79.087 70 Indiana
-41.127  -79.000 70 Jefferson
-40.531  -77.402 70 Juniata
-41.440  -75.610 70 Lackawanna
-40.042  -76.250 70 Lancaster
-40.992  -80.335 70 Lawrence
-40.367  -76.457 70 Lebanon
-40.614  -75.590 70 Lehigh
-41.176  -75.991 70 Luzerne
-41.346  -77.060 70 Lycoming
-41.801  -78.566 70 Mc Kean
-41.305  -80.253 70 Mercer
-40.609  -77.618 70 Mifflin
-41.057  -75.336 70 Monroe
-40.209  -75.370 70 Montgomery
-41.025  -76.662 70 Montour
-40.753  -75.308 70 Northampton
-40.850  -76.708 70 Northumberland
-40.398  -77.266 70 Perry
-40.007  -75.135 70 Philadelphia
-41.330  -75.034 70 Pike
-41.744  -77.900 70 Potter
-40.705  -76.214 70 Schuylkill
-40.771  -77.076 70 Snyder
-39.974  -79.033 70 Somerset
-41.447  -76.505 70 Sullivan
-41.823  -75.800 70 Susquehanna
-41.774  -77.254 70 Tioga
-40.962  -77.065 70 Union
-41.402  -79.763 70 Venango
-41.815  -79.272 70 Warren
-40.189  -80.248 70 Washington
-41.650  -75.306 70 Wayne
-40.309  -79.465 70 Westmoreland
-41.520  -76.020 70 Wyoming
-39.922  -76.727 70 York
-41.705  -71.284 70 Bristol
-41.673  -71.578 70 Kent
-41.507  -71.267 70 Newport
-41.867  -71.580 70 Providence
-41.381  -71.614 70 Washington
-34.227  -82.453 70 Abbeville
-33.546  -81.639 70 Aiken
-32.991  -81.355 70 Allendale
-34.520  -82.638 70 Anderson
-33.219  -81.051 70 Bamberg
-33.264  -81.437 70 Barnwell
-32.353  -80.694 70 Beaufort
-33.195  -79.950 70 Berkeley
-33.675  -80.781 70 Calhoun
-32.820  -79.896 70 Charleston
-35.048  -81.623 70 Cherokee
-34.692  -81.159 70 Chester
-34.638  -80.159 70 Chesterfield
-33.665  -80.218 70 Clarendon
-32.844  -80.652 70 Colleton
-34.332  -79.955 70 Darlington
-34.390  -79.376 70 Dillon
-33.081  -80.404 70 Dorchester
-33.770  -81.971 70 Edgefield
-34.396  -81.126 70 Fairfield
-34.024  -79.707 70 Florence
-33.414  -79.296 70 Georgetown
-34.893  -82.371 70 Greenville
-34.156  -82.129 70 Greenwood
-32.779  -81.143 70 Hampton
-33.910  -78.976 70 Horry
-32.435  -81.024 70 Jasper
-34.339  -80.588 70 Kershaw
-34.687  -80.704 70 Lancaster
-34.484  -82.005 70 Laurens
-34.158  -80.253 70 Lee
-33.899  -81.270 70 Lexington
-33.899  -82.305 70 McCormick
-34.081  -79.362 70 Marion
-34.602  -79.678 70 Marlboro
-34.289  -81.600 70 Newberry
-34.754  -83.067 70 Oconee
-33.442  -80.799 70 Orangeburg
-34.889  -82.724 70 Pickens
-34.031  -80.907 70 Richland
-34.005  -81.728 70 Saluda
-34.932  -81.991 70 Spartanburg
-33.916  -80.382 70 Sumter
-34.693  -81.617 70 Union
-33.617  -79.728 70 Williamsburg
-34.970  -81.183 70 York
-43.717  -98.567 70 Aurora
-44.412  -98.278 70 Beadle
-43.184 -101.660 70 Bennett
-42.993  -97.883 70 Bon Homme
-44.366  -96.793 70 Brookings
-45.597  -98.353 70 Brown
-43.718  -99.065 70 Brule
-44.084  -99.201 70 Buffalo
-44.909 -103.491 70 Butte
-45.761 -100.048 70 Campbell
-43.206  -98.595 70 Charles Mix
-44.860  -97.727 70 Clark
-42.917  -96.974 70 Clay
-44.976  -97.179 70 Codington
-45.721 -101.184 70 Corson
-43.680 -103.457 70 Custer
-43.681  -98.156 70 Davison
-45.369  -97.605 70 Day
-44.761  -96.669 70 Deuel
-45.159 -100.875 70 Dewey
-43.391  -98.358 70 Douglas
-45.413  -99.210 70 Edmunds
-43.245 -103.516 70 Fall River
-45.069  -99.150 70 Faulk
-45.173  -96.772 70 Grant
-43.198  -99.178 70 Gregory
-44.302 -101.532 70 Haakon
-44.681  -97.195 70 Hamlin
-44.547  -99.004 70 Hand
-43.665  -97.789 70 Hanson
-45.591 -103.498 70 Harding
-44.393  -99.987 70 Hughes
-43.335  -97.748 70 Hutchinson
-44.555  -99.482 70 Hyde
-43.697 -101.636 70 Jackson
-44.062  -98.622 70 Jerauld
-43.952 -100.686 70 Jones
-44.369  -97.490 70 Kingsbury
-44.020  -97.122 70 Lake
-44.364 -103.791 70 Lawrence
-43.279  -96.722 70 Lincoln
-43.900  -99.850 70 Lyman
-43.670  -97.362 70 McCook
-45.765  -99.224 70 McPherson
-45.763  -97.602 70 Marshall
-44.566 -102.713 70 Meade
-43.580 -100.761 70 Mellette
-44.023  -97.610 70 Miner
-43.681  -96.786 70 Minnehaha
-44.023  -96.672 70 Moody
-44.007 -102.820 70 Pennington
-45.496 -102.483 70 Perkins
-45.064  -99.950 70 Potter
-45.624  -96.948 70 Roberts
-44.025  -98.090 70 Sanborn
-43.332 -102.547 70 Shannon
-44.940  -98.347 70 Spink
-44.400 -100.748 70 Stanley
-44.715 -100.131 70 Sully
-43.180 -100.729 70 Todd
-43.342  -99.884 70 Tripp
-43.310  -97.151 70 Turner
-42.832  -96.652 70 Union
-45.428 -100.027 70 Walworth
-43.009  -97.387 70 Yankton
-44.982 -101.669 70 Ziebach
-36.113  -84.197 70 Anderson
-35.514  -86.458 70 Bedford
-36.069  -88.072 70 Benton
-35.599  -85.207 70 Bledsoe
-35.687  -83.926 70 Blount
-35.154  -84.860 70 Bradley
-36.406  -84.146 70 Campbell
-35.810  -86.063 70 Cannon
-35.976  -88.452 70 Carroll
-36.296  -82.129 70 Carter
-36.267  -87.080 70 Cheatham
-35.425  -88.609 70 Chester
-36.484  -83.662 70 Claiborne
-36.554  -85.543 70 Clay
-35.926  -83.120 70 Cocke
-35.492  -86.075 70 Coffee
-35.810  -89.133 70 Crockett
-35.951  -84.997 70 Cumberland
-36.169  -86.785 70 Davidson
-35.605  -88.106 70 Decatur
-35.979  -85.833 70 DeKalb
-36.154  -87.362 70 Dickson
-36.057  -89.412 70 Dyer
-35.189  -89.413 70 Fayette
-36.384  -84.928 70 Fentress
-35.152  -86.097 70 Franklin
-35.999  -88.930 70 Gibson
-35.202  -87.036 70 Giles
-36.277  -83.511 70 Grainger
-36.173  -82.846 70 Greene
-35.392  -85.720 70 Grundy
-36.218  -83.266 70 Hamblen
-35.182  -85.168 70 Hamilton
-36.526  -83.220 70 Hancock
-35.203  -88.997 70 Hardeman
-35.195  -88.186 70 Hardin
-36.436  -82.949 70 Hawkins
-35.580  -89.286 70 Haywood
-35.655  -88.386 70 Henderson
-36.327  -88.299 70 Henry
-35.800  -87.474 70 Hickman
-36.283  -87.714 70 Houston
-36.033  -87.773 70 Humphreys
-36.355  -85.670 70 Jackson
-36.050  -83.447 70 Jefferson
-36.458  -81.859 70 Johnson
-35.993  -83.937 70 Knox
-36.341  -89.492 70 Lake
-35.757  -89.635 70 Lauderdale
-35.224  -87.393 70 Lawrence
-35.522  -87.495 70 Lewis
-35.141  -86.588 70 Lincoln
-35.734  -84.312 70 Loudon
-35.425  -84.618 70 McMinn
-35.175  -88.564 70 McNairy
-36.529  -86.005 70 Macon
-35.608  -88.839 70 Madison
-35.128  -85.610 70 Marion
-35.467  -86.767 70 Marshall
-35.616  -87.076 70 Maury
-35.515  -84.810 70 Meigs
-35.448  -84.251 70 Monroe
-36.495  -87.382 70 Montgomery
-35.284  -86.357 70 Moore
-36.131  -84.642 70 Morgan
-36.361  -89.147 70 Obion
-36.344  -85.285 70 Overton
-35.636  -87.868 70 Perry
-36.558  -85.079 70 Pickett
-35.126  -84.516 70 Polk
-36.140  -85.496 70 Putnam
-35.609  -84.918 70 Rhea
-35.847  -84.523 70 Roane
-36.525  -86.870 70 Robertson
-35.843  -86.417 70 Rutherford
-36.433  -84.514 70 Scott
-35.370  -85.412 70 Sequatchie
-35.783  -83.521 70 Sevier
-35.184  -89.892 70 Shelby
-36.249  -85.957 70 Smith
-36.500  -87.838 70 Stewart
-36.515  -82.300 70 Sullivan
-36.468  -86.456 70 Sumner
-35.492  -89.757 70 Tipton
-36.393  -86.156 70 Trousdale
-36.103  -82.428 70 Unicoi
-36.282  -83.839 70 Union
-35.693  -85.462 70 Van Buren
-35.678  -85.777 70 Warren
-36.294  -82.497 70 Washington
-35.236  -87.787 70 Wayne
-36.295  -88.717 70 Weakley
-35.927  -85.455 70 White
-35.894  -86.899 70 Williamson
-36.158  -86.299 70 Wilson
-31.812  -95.647 70 Anderson
-32.299 -102.639 70 Andrews
-31.256  -94.607 70 Angelina
-28.096  -96.988 70 Aransas
-33.614  -98.691 70 Archer
-34.966 -101.353 70 Armstrong
-28.890  -98.528 70 Atascosa
-29.883  -96.277 70 Austin
-34.067 -102.830 70 Bailey
-29.736  -99.231 70 Bandera
-30.104  -97.312 70 Bastrop
-33.627  -99.216 70 Baylor
-28.417  -97.740 70 Bee
-31.037  -97.476 70 Bell
-29.449  -98.520 70 Bexar
-30.267  -98.399 70 Blanco
-32.739 -101.426 70 Borden
-31.902  -97.629 70 Bosque
-33.446  -94.423 70 Bowie
-29.169  -95.435 70 Brazoria
-30.662  -96.301 70 Brazos
-29.807 -103.246 70 Brewster
-34.526 -101.207 70 Briscoe
-27.042  -98.212 70 Brooks
-31.772  -98.998 70 Brown
-30.493  -96.621 70 Burleson
-30.784  -98.185 70 Burnet
-29.837  -97.614 70 Caldwell
-28.436  -96.605 70 Calhoun
-32.292  -99.371 70 Callahan
-26.149  -97.449 70 Cameron
-32.973  -94.979 70 Camp
-35.405 -101.355 70 Carson
-33.071  -94.346 70 Cass
-34.534 -102.257 70 Castro
-29.704  -94.679 70 Chambers
-31.835  -95.167 70 Cherokee
-34.536 -100.202 70 Childress
-33.790  -98.205 70 Clay
-33.604 -102.831 70 Cochran
-31.884 -100.531 70 Coke
-31.773  -99.454 70 Coleman
-33.185  -96.578 70 Collin
-34.967 -100.270 70 Collingsworth
-29.622  -96.519 70 Colorado
-29.811  -98.284 70 Comal
-31.951  -98.558 70 Comanche
-31.332  -99.864 70 Concho
-33.638  -97.213 70 Cooke
-31.391  -97.798 70 Coryell
-34.081 -100.275 70 Cottle
-31.411 -102.521 70 Crane
-30.732 -101.409 70 Crockett
-33.613 -101.298 70 Crosby
-31.445 -104.524 70 Culberson
-36.287 -102.594 70 Dallam
-32.767  -96.778 70 Dallas
-32.742 -101.947 70 Dawson
-34.973 -102.602 70 Deaf Smith
-33.387  -95.674 70 Delta
-33.204  -97.118 70 Denton
-29.081  -97.355 70 DeWitt
-33.620 -100.779 70 Dickens
-28.424  -99.749 70 Dimmit
-34.962 -100.811 70 Donley
-27.683  -98.524 70 Duval
-32.331  -98.828 70 Eastland
-31.865 -102.542 70 Ector
-29.971 -100.300 70 Edwards
-32.350  -96.793 70 Ellis
-31.769 -106.241 70 El Paso
-32.234  -98.216 70 Erath
-31.258  -96.932 70 Falls
-33.588  -96.105 70 Fannin
-29.865  -96.926 70 Fayette
-32.741 -100.399 70 Fisher
-34.074 -101.303 70 Floyd
-33.981  -99.778 70 Foard
-29.533  -95.774 70 Fort Bend
-33.176  -95.219 70 Franklin
-31.702  -96.148 70 Freestone
-28.865  -99.108 70 Frio
-32.740 -102.640 70 Gaines
-29.380  -94.858 70 Galveston
-33.181 -101.300 70 Garza
-30.313  -98.950 70 Gillespie
-31.867 -101.532 70 Glasscock
-28.652  -97.425 70 Goliad
-29.451  -97.494 70 Gonzales
-35.409 -100.815 70 Gray
-33.624  -96.676 70 Grayson
-32.485  -94.811 70 Gregg
-30.549  -95.979 70 Grimes
-29.583  -97.948 70 Guadalupe
-34.074 -101.826 70 Hale
-34.521 -100.693 70 Hall
-31.703  -98.110 70 Hamilton
-36.279 -101.352 70 Hansford
-34.290  -99.745 70 Hardeman
-30.336  -94.393 70 Hardin
-29.857  -95.393 70 Harris
-32.548  -94.371 70 Harrison
-35.841 -102.608 70 Hartley
-33.179  -99.730 70 Haskell
-30.058  -98.030 70 Hays
-35.834 -100.280 70 Hemphill
-32.210  -95.852 70 Henderson
-26.396  -98.185 70 Hidalgo
-31.993  -97.132 70 Hill
-33.606 -102.343 70 Hockley
-32.434  -97.835 70 Hood
-33.149  -95.562 70 Hopkins
-31.318  -95.429 70 Houston
-32.309 -101.439 70 Howard
-31.452 -105.374 70 Hudspeth
-33.123  -96.085 70 Hunt
-35.837 -101.361 70 Hutchinson
-31.303 -100.980 70 Irion
-33.236  -98.176 70 Jack
-28.944  -96.576 70 Jackson
-30.741  -94.027 70 Jasper
-30.716 -104.135 70 Jeff Davis
-29.860  -94.140 70 Jefferson
-27.049  -98.678 70 Jim Hogg
-27.733  -98.090 70 Jim Wells
-32.378  -97.365 70 Johnson
-32.739  -99.882 70 Jones
-28.905  -97.864 70 Karnes
-32.597  -96.284 70 Kaufman
-29.950  -98.704 70 Kendall
-26.926  -97.616 70 Kenedy
-33.186 -100.771 70 Kent
-30.062  -99.349 70 Kerr
-30.491  -99.750 70 Kimble
-33.614 -100.252 70 King
-29.352 -100.418 70 Kinney
-27.427  -97.662 70 Kleberg
-33.609  -99.743 70 Knox
-33.667  -95.570 70 Lamar
-34.069 -102.348 70 Lamb
-31.194  -98.240 70 Lampasas
-28.344  -99.100 70 La Salle
-29.384  -96.938 70 Lavaca
-30.307  -96.956 70 Lee
-31.300  -96.000 70 Leon
-30.149  -94.812 70 Liberty
-31.545  -96.583 70 Limestone
-36.276 -100.272 70 Lipscomb
-28.351  -98.127 70 Live Oak
-30.705  -98.685 70 Llano
-31.845 -103.567 70 Loving
-33.612 -101.820 70 Lubbock
-33.178 -101.816 70 Lynn
-31.197  -99.347 70 McCulloch
-31.551  -97.201 70 McLennan
-28.346  -98.567 70 McMullen
-30.967  -95.930 70 Madison
-32.798  -94.357 70 Marion
-32.303 -101.961 70 Martin
-30.718  -99.220 70 Mason
-28.784  -95.998 70 Matagorda
-28.747 -100.321 70 Maverick
-29.354  -99.110 70 Medina
-30.898  -99.823 70 Menard
-31.889 -102.020 70 Midland
-30.789  -96.975 70 Milam
-31.496  -98.594 70 Mills
-32.302 -100.923 70 Mitchell
-33.672  -97.725 70 Montague
-30.300  -95.502 70 Montgomery
-35.836 -101.890 70 Moore
-33.118  -94.731 70 Morris
-34.085 -100.789 70 Motley
-31.612  -94.614 70 Nacogdoches
-32.049  -96.474 70 Navarro
-30.782  -93.747 70 Newton
-32.308 -100.399 70 Nolan
-27.737  -97.521 70 Nueces
-36.279 -100.815 70 Ochiltree
-35.399 -102.596 70 Oldham
-30.126  -93.894 70 Orange
-32.748  -98.306 70 Palo Pinto
-32.163  -94.307 70 Panola
-32.778  -97.806 70 Parker
-34.528 -102.779 70 Parmer
-30.781 -102.723 70 Pecos
-30.798  -94.830 70 Polk
-35.397 -101.895 70 Potter
-29.998 -104.229 70 Presidio
-32.870  -95.796 70 Rains
-34.968 -101.900 70 Randall
-31.359 -101.524 70 Reagan
-29.841  -99.807 70 Real
-33.618  -95.051 70 Red River
-31.321 -103.683 70 Reeves
-28.321  -97.169 70 Refugio
-35.833 -100.806 70 Roberts
-31.027  -96.514 70 Robertson
-32.893  -96.409 70 Rockwall
-31.833  -99.968 70 Runnels
-32.105  -94.757 70 Rusk
-31.343  -93.850 70 Sabine
-31.397  -94.180 70 San Augustine
-30.575  -95.163 70 San Jacinto
-28.005  -97.522 70 San Patricio
-31.155  -98.815 70 San Saba
-30.900 -100.539 70 Schleicher
-32.746 -100.917 70 Scurry
-32.730  -99.355 70 Shackelford
-31.792  -94.142 70 Shelby
-36.280 -101.893 70 Sherman
-32.375  -95.271 70 Smith
-32.222  -97.771 70 Somervell
-26.575  -98.733 70 Starr
-32.738  -98.839 70 Stephens
-31.824 -101.045 70 Sterling
-33.178 -100.252 70 Stonewall
-30.496 -100.541 70 Sutton
-34.530 -101.732 70 Swisher
-32.770  -97.293 70 Tarrant
-32.311  -99.881 70 Taylor
-30.226 -102.067 70 Terrell
-33.171 -102.339 70 Terry
-33.184  -99.215 70 Throckmorton
-33.218  -94.968 70 Titus
-31.410 -100.457 70 Tom Green
-30.333  -97.779 70 Travis
-31.093  -95.125 70 Trinity
-30.769  -94.379 70 Tyler
-32.735  -94.941 70 Upshur
-31.364 -102.042 70 Upton
-29.350  -99.761 70 Uvalde
-29.894 -101.151 70 Val Verde
-32.558  -95.835 70 Van Zandt
-28.796  -96.971 70 Victoria
-30.738  -95.574 70 Walker
-30.013  -95.982 70 Waller
-31.511 -103.102 70 Ward
-30.214  -96.405 70 Washington
-27.770  -99.327 70 Webb
-29.277  -96.217 70 Wharton
-35.397 -100.267 70 Wheeler
-33.990  -98.708 70 Wichita
-34.084  -99.242 70 Wilbarger
-26.494  -97.598 70 Willacy
-30.644  -97.598 70 Williamson
-29.174  -98.086 70 Wilson
-31.860 -103.047 70 Winkler
-33.215  -97.653 70 Wise
-32.782  -95.382 70 Wood
-33.175 -102.824 70 Yoakum
-33.177  -98.698 70 Young
-27.000  -99.183 70 Zapata
-28.864  -99.760 70 Zavala
-38.341 -113.229 70 Beaver
-41.515 -113.097 70 Box Elder
-41.691 -111.749 70 Cache
-39.644 -110.583 70 Carbon
-40.890 -109.505 70 Daggett
-41.015 -112.123 70 Davis
-40.282 -110.435 70 Duchesne
-38.990 -110.690 70 Emery
-37.874 -111.439 70 Garfield
-38.994 -109.559 70 Grand
-37.857 -113.277 70 Iron
-39.711 -112.796 70 Juab
-37.293 -111.894 70 Kane
-39.047 -113.105 70 Millard
-41.081 -111.579 70 Morgan
-38.336 -112.130 70 Piute
-41.619 -111.239 70 Rich
-40.671 -111.925 70 Salt Lake
-37.631 -109.805 70 San Juan
-39.373 -111.575 70 Sanpete
-38.747 -111.797 70 Sevier
-40.884 -110.966 70 Summit
-40.445 -113.182 70 Tooele
-40.126 -109.518 70 Uintah
-40.117 -111.670 70 Utah
-40.333 -111.159 70 Wasatch
-37.278 -113.517 70 Washington
-38.364 -110.897 70 Wayne
-41.296 -111.917 70 Weber
-44.031  -73.143 70 Addison
-43.029  -73.108 70 Bennington
-44.460  -72.099 70 Caledonia
-44.467  -73.078 70 Chittenden
-44.732  -71.721 70 Essex
-44.856  -72.923 70 Franklin
-44.797  -73.291 70 Grand Isle
-44.607  -72.646 70 Lamoille
-44.008  -72.382 70 Orange
-44.829  -72.251 70 Orleans
-43.574  -73.035 70 Rutland
-44.270  -72.621 70 Washington
-42.986  -72.718 70 Windham
-43.571  -72.570 70 Windsor
-37.762  -75.764 70 Accomack
-38.026  -78.556 70 Albemarle
-37.784  -80.013 70 Alleghany
-37.337  -77.977 70 Amelia
-37.611  -79.142 70 Amherst
-37.370  -78.810 70 Appomattox
-38.879  -77.102 70 Arlington
-38.172  -79.133 70 Augusta
-38.059  -79.736 70 Bath
-37.312  -79.529 70 Bedford
-37.132  -81.127 70 Bland
-37.552  -79.805 70 Botetourt
-36.764  -77.859 70 Brunswick
-37.267  -82.036 70 Buchanan
-37.569  -78.525 70 Buckingham
-37.212  -79.091 70 Campbell
-38.026  -77.348 70 Caroline
-36.735  -80.734 70 Carroll
-37.352  -77.061 40 Charles City
-37.008  -78.662 70 Charlotte
-37.378  -77.588 70 Chesterfield
-39.116  -77.997 70 Clarke
-37.487  -80.216 70 Craig
-38.486  -77.957 70 Culpeper
-37.515  -78.239 70 Cumberland
-37.117  -82.351 70 Dickenson
-37.076  -77.630 70 Dinwiddie
-37.944  -76.951 70 Essex
-38.834  -77.276 70 Fairfax
-38.741  -77.809 70 Fauquier
-36.936  -80.363 70 Floyd
-37.844  -78.279 70 Fluvanna
-36.993  -79.881 70 Franklin
-39.206  -78.263 70 Frederick
-37.319  -80.698 70 Giles
-37.403  -76.523 70 Gloucester
-37.718  -77.926 70 Goochland
-36.653  -81.229 70 Grayson
-38.298  -78.471 70 Greene
-36.675  -77.562 70 Greensville
-36.767  -78.938 70 Halifax
-37.760  -77.491 70 Hanover
-37.551  -77.404 70 Henrico
-36.671  -79.884 70 Henry
-38.350  -79.556 70 Highland
-36.907  -76.711 70 Isle of Wight
-37.312  -76.771 40 James City
-37.720  -76.902 70 King and Queen
-38.265  -77.155 70 King George
-37.703  -77.097 70 King William
-37.708  -76.411 70 Lancaster
-36.707  -83.129 70 Lee
-39.093  -77.637 70 Loudoun
-37.987  -77.957 70 Louisa
-36.947  -78.241 70 Lunenburg
-38.409  -78.281 70 Madison
-37.419  -76.279 70 Mathews
-36.684  -78.365 70 Mecklenburg
-37.611  -76.507 70 Middlesex
-37.171  -80.394 70 Montgomery
-37.792  -78.884 70 Nelson
-37.506  -76.998 70 New Kent
-37.301  -75.926 70 Northampton
-37.858  -76.379 70 Northumberland
-37.141  -78.055 70 Nottoway
-38.240  -78.012 70 Orange
-38.614  -78.482 70 Page
-36.682  -80.285 70 Patrick
-36.820  -79.397 70 Pittsylvania
-37.546  -77.916 70 Powhatan
-37.218  -78.443 70 Prince Edward
-37.187  -77.221 70 Prince George
-38.704  -77.478 70 Prince William
-37.063  -80.714 70 Pulaski
-38.687  -78.169 70 Rappahannock
-37.939  -76.724 70 Richmond
-37.269  -80.079 70 Roanoke
-37.815  -79.446 70 Rockbridge
-38.515  -78.876 70 Rockingham
-36.938  -82.095 70 Russell
-36.719  -82.601 70 Scott
-38.862  -78.568 70 Shenandoah
-36.845  -81.534 70 Smyth
-36.724  -77.107 70 Southampton
-38.180  -77.651 70 Spotsylvania
-38.413  -77.453 70 Stafford
-37.120  -76.891 70 Surry
-36.926  -77.259 70 Sussex
-37.126  -81.563 70 Tazewell
-38.908  -78.207 70 Warren
-36.724  -81.961 70 Washington
-38.114  -76.804 70 Westmoreland
-36.975  -82.622 70 Wise
-36.921  -81.085 70 Wythe
-37.224  -76.439 70 York
-38.821  -77.086 40 Alexandria city
-37.338  -79.521 40 Bedford city
-36.613  -82.168 40 Bristol city
-37.732  -79.357 40 Buena Vista city
-38.037  -78.486 40 Charlottesville city
-36.679  -76.309 40 Chesapeake city
-37.823  -79.826 40 Clifton Forge city
-37.264  -77.399 40 Colonial Heights city
-37.778  -79.990 40 Covington city
-36.583  -79.408 40 Danville city
-36.695  -77.537 40 Emporia city
-38.854  -77.298 40 Fairfax city
-38.885  -77.175 40 Falls Church city
-36.681  -76.936 40 Franklin city
-38.299  -77.487 40 Fredericksburg city
-36.665  -80.918 40 Galax city
-37.050  -76.295 40 Hampton city
-38.437  -78.874 40 Harrisonburg city
-37.291  -77.298 40 Hopewell city
-37.782  -79.445 40 Lexington city
-37.401  -79.191 40 Lynchburg city
-38.747  -77.485 40 Manassas city
-38.773  -77.452 40 Manassas Park city
-36.683  -79.864 40 Martinsville city
-37.076  -76.514 40 Newport News city
-36.923  -76.245 40 Norfolk city
-36.931  -82.626 40 Norton city
-37.204  -77.393 40 Petersburg city
-37.153  -76.290 40 Poquoson city
-36.856  -76.356 40 Portsmouth city
-37.124  -80.559 40 Radford city
-37.531  -77.475 40 Richmond city
-37.278  -79.958 40 Roanoke city
-37.287  -80.056 40 Salem city
-36.708  -78.906 40 South Boston city
-38.159  -79.062 40 Staunton city
-36.703  -76.638 40 Suffolk city
-36.770  -76.015 40 Virginia Beach city
-38.070  -78.903 40 Waynesboro city
-37.270  -76.707 40 Williamsburg city
-39.174  -78.175 40 Winchester city
-46.989 -118.557 70 Adams
-46.182 -117.185 70 Asotin
-46.248 -119.502 70 Benton
-47.877 -120.641 70 Chelan
-48.110 -123.931 70 Clallam
-45.774 -122.484 70 Clark
-46.302 -117.915 70 Columbia
-46.191 -122.682 70 Cowlitz
-47.740 -119.695 70 Douglas
-48.470 -118.509 70 Ferry
-46.537 -118.905 70 Franklin
-46.434 -117.535 70 Garfield
-47.208 -119.466 70 Grant
-47.147 -123.829 70 Grays Harbor
-48.154 -122.576 70 Island
-47.844 -123.576 70 Jefferson
-47.475 -121.844 70 King
-47.640 -122.647 70 Kitsap
-47.124 -120.676 70 Kittitas
-45.874 -120.789 70 Klickitat
-46.578 -122.398 70 Lewis
-47.572 -118.414 70 Lincoln
-47.351 -123.185 70 Mason
-48.550 -119.746 70 Okanogan
-46.561 -123.781 70 Pacific
-48.535 -117.282 70 Pend Oreille
-47.048 -122.113 70 Pierce
-48.570 -122.973 70 San Juan
-48.477 -121.782 70 Skagit
-46.026 -121.914 70 Skamania
-48.044 -121.714 70 Snohomish
-47.620 -117.403 70 Spokane
-48.397 -117.853 70 Stevens
-46.925 -122.828 70 Thurston
-46.293 -123.428 70 Wahkiakum
-46.226 -118.478 70 Walla Walla
-48.834 -121.900 70 Whatcom
-46.887 -117.519 70 Whitman
-46.456 -120.739 70 Yakima
-39.130  -79.998 70 Barbour
-39.467  -78.026 70 Berkeley
-38.021  -81.720 70 Boone
-38.703  -80.731 70 Braxton
-40.270  -80.584 70 Brooke
-38.418  -82.242 70 Cabell
-38.844  -81.118 70 Calhoun
-38.460  -81.075 70 Clay
-39.260  -80.701 70 Doddridge
-38.031  -81.087 70 Fayette
-38.918  -80.854 70 Gilmer
-39.102  -79.197 70 Grant
-37.950  -80.450 70 Greenbrier
-39.314  -78.613 70 Hampshire
-40.521  -80.581 70 Hancock
-39.005  -78.863 70 Hardy
-39.287  -80.383 70 Harrison
-38.833  -81.672 70 Jackson
-39.307  -77.864 70 Jefferson
-38.342  -81.526 70 Kanawha
-38.996  -80.506 70 Lewis
-38.178  -82.071 70 Lincoln
-37.826  -81.939 70 Logan
-37.372  -81.648 70 McDowell
-39.512  -80.243 70 Marion
-39.872  -80.672 70 Marshall
-38.773  -82.022 70 Mason
-37.406  -81.114 70 Mercer
-39.415  -78.942 70 Mineral
-37.728  -82.136 70 Mingo
-39.626  -80.051 70 Monongalia
-37.561  -80.544 70 Monroe
-39.562  -78.261 70 Morgan
-38.290  -80.796 70 Nicholas
-40.097  -80.617 70 Ohio
-38.684  -79.356 70 Pendleton
-39.371  -81.163 70 Pleasants
-38.322  -80.008 70 Pocahontas
-39.469  -79.668 70 Preston
-38.509  -81.906 70 Putnam
-37.776  -81.256 70 Raleigh
-38.780  -79.868 70 Randolph
-39.178  -81.066 70 Ritchie
-38.715  -81.358 70 Roane
-37.657  -80.857 70 Summers
-39.340  -80.048 70 Taylor
-39.104  -79.567 70 Tucker
-39.465  -80.879 70 Tyler
-38.901  -80.232 70 Upshur
-38.150  -82.433 70 Wayne
-38.495  -80.435 70 Webster
-39.610  -80.641 70 Wetzel
-39.019  -81.385 70 Wirt
-39.213  -81.514 70 Wood
-37.610  -81.541 70 Wyoming
-43.967  -89.773 70 Adams
-46.708  -90.558 70 Ashland
-45.418  -91.853 70 Barron
-46.631  -91.183 70 Bayfield
-44.475  -87.994 70 Brown
-44.379  -91.752 70 Buffalo
-45.866  -92.368 70 Burnett
-44.078  -88.222 70 Calumet
-45.068  -91.282 70 Chippewa
-44.731  -90.610 70 Clark
-43.471  -89.330 70 Columbia
-43.233  -90.931 70 Crawford
-43.067  -89.418 70 Dane
-43.416  -88.708 70 Dodge
-45.021  -87.010 70 Door
-46.451  -91.906 70 Douglas
-44.948  -91.898 70 Dunn
-44.727  -91.287 70 Eau Claire
-45.851  -88.399 70 Florence
-43.755  -88.491 70 Fond du Lac
-45.668  -88.777 70 Forest
-42.863  -90.708 70 Grant
-42.682  -89.602 70 Green
-43.808  -89.044 70 Green Lake
-42.998  -90.134 70 Iowa
-46.326  -90.262 70 Iron
-44.315  -90.808 70 Jackson
-43.020  -88.780 70 Jefferson
-43.923  -90.112 70 Juneau
-42.582  -87.806 70 Kenosha
-44.589  -87.440 70 Kewaunee
-43.908  -91.110 70 La Crosse
-42.659  -90.135 70 Lafayette
-45.256  -89.071 70 Langlade
-45.330  -89.732 70 Lincoln
-44.145  -87.553 70 Manitowoc
-44.898  -89.758 70 Marathon
-45.343  -88.001 70 Marinette
-43.818  -89.394 70 Marquette
-45.019  -88.700 70 Menominee
-42.976  -87.671 70 Milwaukee
-43.945  -90.620 70 Monroe
-44.994  -88.229 70 Oconto
-45.705  -89.524 70 Oneida
-44.412  -88.462 70 Outagamie
-43.250  -87.502 70 Ozaukee
-44.597  -92.001 70 Pepin
-44.716  -92.423 70 Pierce
-45.460  -92.443 70 Polk
-44.476  -89.498 70 Portage
-45.680  -90.361 70 Price
-42.785  -87.755 70 Racine
-43.377  -90.427 70 Richland
-42.672  -89.068 70 Rock
-45.475  -91.135 70 Rusk
-45.039  -92.447 70 St Croix
-43.427  -89.944 70 Sauk
-45.899  -91.142 70 Sawyer
-44.790  -88.756 70 Shawano
-43.716  -87.663 70 Sheboygan
-45.211  -90.505 70 Taylor
-44.305  -91.352 70 Trempealeau
-43.593  -90.833 70 Vernon
-46.053  -89.513 70 Vilas
-42.668  -88.542 70 Walworth
-45.900  -91.791 70 Washburn
-43.367  -88.231 70 Washington
-43.018  -88.306 70 Waukesha
-44.479  -88.966 70 Waupaca
-44.113  -89.238 70 Waushara
-44.062  -88.643 70 Winnebago
-44.451  -90.042 70 Wood
-41.649 -105.744 70 Albany
-44.526 -107.987 70 Big Horn
-44.240 -105.549 70 Campbell
-41.691 -106.930 70 Carbon
-42.975 -105.504 70 Converse
-44.590 -104.564 70 Crook
-43.028 -108.629 70 Fremont
-42.089 -104.355 70 Goshen
-43.714 -108.444 70 Hot Springs
-44.040 -106.587 70 Johnson
-41.315 -104.686 70 Laramie
-42.260 -110.703 70 Lincoln
-42.965 -106.805 70 Natrona
-43.051 -104.473 70 Niobrara
-44.493 -109.563 70 Park
-42.129 -104.961 70 Platte
-44.794 -106.882 70 Sheridan
-42.761 -109.920 70 Sublette
-41.658 -108.894 70 Sweetwater
-43.923 -110.574 70 Teton
-41.286 -110.547 70 Uinta
-43.907 -107.684 70 Washakie
-43.836 -104.563 70 Weston
diff --git a/cave/com.raytheon.viz.lpi/localization/bundles/maps/county_names.xml b/cave/com.raytheon.viz.lpi/localization/bundles/maps/county_names.xml
deleted file mode 100644
index 8d78ebd578..0000000000
--- a/cave/com.raytheon.viz.lpi/localization/bundles/maps/county_names.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-    <displayList>
-        <displays xsi:type="mapRenderableDisplay" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <descriptor xsi:type="mapDescriptor">
-                <resource>
-                    <loadProperties>
-                        <capabilities>
-                            <capability xsi:type="colorableCapability" colorAsString="#9b9b9b" />
-                            <capability xsi:type="outlineCapability" lineStyle="SOLID" outlineOn="true"
-                                outlineWidth="1" />
-                            <capability xsi:type="pointCapability" pointStyle="NONE"/>
-                        </capabilities>
-                        <resourceType>PLAN_VIEW</resourceType>
-                    </loadProperties>
-                    <properties isSystemResource="false" isBlinking="false" isMapLayer="true" isHoverOn="false"
-                        isVisible="true">
-                        <pdProps maxDisplayWidth="100000000" minDisplayWidth="0" />
-                    </properties>
-                    <resourceData xsi:type="lpiResourceData">
-                        <filename>us_county.lpi</filename>
-                        <mapName>County Names</mapName>
-                    </resourceData>
-                </resource>
-            </descriptor>
-        </displays>
-    </displayList>
-</bundle>
diff --git a/cave/com.raytheon.viz.lpi/src/com/raytheon/viz/lpi/LPIResource.java b/cave/com.raytheon.viz.lpi/src/com/raytheon/viz/lpi/LPIResource.java
index 3c82b791ce..03e986590a 100644
--- a/cave/com.raytheon.viz.lpi/src/com/raytheon/viz/lpi/LPIResource.java
+++ b/cave/com.raytheon.viz.lpi/src/com/raytheon/viz/lpi/LPIResource.java
@@ -41,12 +41,10 @@ import com.raytheon.uf.viz.core.IGraphicsTarget.HorizontalAlignment;
 import com.raytheon.uf.viz.core.IGraphicsTarget.PointStyle;
 import com.raytheon.uf.viz.core.IGraphicsTarget.VerticalAlignment;
 import com.raytheon.uf.viz.core.VizApp;
-import com.raytheon.uf.viz.core.drawables.IFont;
 import com.raytheon.uf.viz.core.drawables.PaintProperties;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.IMapDescriptor;
 import com.raytheon.uf.viz.core.maps.rsc.StyledMapResource;
-import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
 import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
 import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
@@ -68,6 +66,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * May 16, 2014  3163     bsteffen    Remove WORD_WRAP TextStyle and handle
  *                                    wrapping locally.
  * Aug 21, 2014 #3459     randerso    Restructured Map resource class hierarchy
+ * Nov 05, 2015 #5070     randerso    Moved label font management up to AbstractMapResource
  * 
  * </pre>
  * 
@@ -75,8 +74,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 
  */
 public class LPIResource extends
-        StyledMapResource<LPIResourceData, IMapDescriptor> implements
-        IResourceDataChanged {
+        StyledMapResource<LPIResourceData, IMapDescriptor> {
 
     /** Whether the resource is ready to be drawn */
     private boolean ready = false;
@@ -87,8 +85,6 @@ public class LPIResource extends
 
     private int pixelSizeHint = 90;
 
-    private IFont font;
-
     private class LPIPoint {
         public Coordinate latLon;
 
@@ -106,20 +102,6 @@ public class LPIResource extends
     protected LPIResource(LPIResourceData resourceData,
             LoadProperties loadProperties) {
         super(resourceData, loadProperties);
-        resourceData.addChangeListener(this);
-    }
-
-    @Override
-    public void resourceChanged(ChangeType type, Object object) {
-        if (type == ChangeType.CAPABILITY) {
-            if (object instanceof MagnificationCapability) {
-                if (font != null) {
-                    font.dispose();
-                    font = null;
-                }
-            }
-        }
-        this.issueRefresh();
     }
 
     /*
@@ -215,6 +197,7 @@ public class LPIResource extends
     @Override
     protected void paintInternal(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
+
         if (ready) {
             int displayWidth = (int) (this.descriptor.getMapWidth() * paintProps
                     .getZoomLevel());
@@ -225,17 +208,12 @@ public class LPIResource extends
             double magnification = getCapability(MagnificationCapability.class)
                     .getMagnification();
 
-            if (this.font == null) {
-                font = target.initializeFont(target.getDefaultFont()
-                        .getFontName(), (float) (10 * magnification), null);
-            }
-
             double displayHintSize = this.pixelSizeHint * magnification;
             double minSepDist = (displayHintSize * (metersPerPixel / 1000.0))
                     / getCapability(DensityCapability.class).getDensity();
 
             DrawableString test = new DrawableString("N", null);
-            test.font = font;
+            test.font = getFont(target);
             Rectangle2D charSize = target.getStringsBounds(test);
             double charWidth = charSize.getWidth();
             double charHeight = charSize.getHeight();
@@ -279,7 +257,7 @@ public class LPIResource extends
                         String label = p.label;
                         label = label.replaceAll("([^\n]{3}\\S*)\\s+", "$1\n");
                         DrawableString string = new DrawableString(label, color);
-                        string.font = font;
+                        string.font = getFont(target);
                         string.setCoordinates(p.pixel[0] + offsetX, p.pixel[1]
                                 + offsetY);
                         string.horizontalAlignment = align;
@@ -294,20 +272,6 @@ public class LPIResource extends
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.uf.viz.core.rsc.AbstractVizResource#dispose()
-     */
-    @Override
-    protected void disposeInternal() {
-        resourceData.removeChangeListener(this);
-        if (font != null) {
-            font.dispose();
-            font = null;
-        }
-    }
-
     /*
      * (non-Javadoc)
      * 
diff --git a/cave/com.raytheon.viz.mpe.ui/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.mpe.ui/META-INF/MANIFEST.MF
index 690867eccb..cd70fd8f8d 100644
--- a/cave/com.raytheon.viz.mpe.ui/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.mpe.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MPE Ui Plug-in
 Bundle-SymbolicName: com.raytheon.viz.mpe.ui;singleton:=true
-Bundle-Version: 1.15.0.qualifier
+Bundle-Version: 1.15.1.qualifier
 Bundle-Activator: com.raytheon.viz.mpe.ui.Activator
 Bundle-Vendor: Raytheon
 Require-Bundle: org.eclipse.core.runtime,
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
  com.raytheon.viz.mpe,
  com.raytheon.viz.core.contours,
  javax.measure,
- org.apache.commons.lang,
+ org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.viz.app.launcher,
  com.raytheon.uf.common.mpe,
  com.raytheon.uf.common.hydro,
diff --git a/cave/com.raytheon.viz.mpe.ui/plugin.xml b/cave/com.raytheon.viz.mpe.ui/plugin.xml
index e28a5c64c8..671ee96da4 100644
--- a/cave/com.raytheon.viz.mpe.ui/plugin.xml
+++ b/cave/com.raytheon.viz.mpe.ui/plugin.xml
@@ -1890,7 +1890,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.legend"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPELegendResource.miniscule"
 	        label="Miniscule"
-	        value="Monospace-bold-10">
+	        value="Monospace-bold-8">
 	        <description>
 	            This is the definition for the "Miniscule" font for the MPE Legend. 
 	            This font definition will be used when the "Miniscule" option is selected.
@@ -1900,7 +1900,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.legend"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPELegendResource.verysmall"
 	        label="Very Small"
-	        value="Monospace-bold-11">
+	        value="Monospace-bold-9">
 	        <description>
 	            This is the definition for the "Very Small" font for the MPE Legend. 
 	            This font definition will be used when the "Very Small" option is selected.
@@ -1910,7 +1910,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.legend"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPELegendResource.small"
 	        label="Small"
-	        value="Monospace-bold-12">
+	        value="Monospace-bold-10">
 	        <description>
 	            This is the definition for the "Small" font for the MPE Legend. 
 	            This font definition will be used when the "Small" option is selected.
@@ -1920,7 +1920,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.legend"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPELegendResource.normal"
 	        label="Normal"
-	        value="Monospace-bold-14">
+	        value="Monospace-bold-12">
 	        <description>
 	            This is the definition for the "Normal" font for the MPE Legend. 
 	            This font definition will be used when the "Normal" option is selected.
@@ -1930,7 +1930,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.legend"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPELegendResource.large"
 	        label="Large"
-	        value="Monospace-bold-17">
+	        value="Monospace-bold-14">
 	        <description>
 	            This is the definition for the "Large" font for the MPE Legend. 
 	            This font definition will be used when the "Large" option is selected.
@@ -1940,7 +1940,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.legend"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPELegendResource.verylarge"
 	        label="Very Large"
-	        value="Monospace-bold-22">
+	        value="Monospace-bold-18">
 	        <description>
 	            This is the definition for the "Very Large" font for the MPE Legend. 
 	            This font definition will be used when the "Very Large" option is selected.
@@ -1952,7 +1952,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.gage"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPEGageResource.miniscule"
 	        label="Miniscule"
-	        value="Dialog-bold-7">
+	        value="Dialog-bold-6">
 	        <description>
 	            This is the definition for the "Miniscule" font for the Gage Plots. 
 	            This font definition will be used when the "Miniscule" option is selected.
@@ -1962,7 +1962,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.gage"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPEGageResource.verysmall"
 	        label="Very Small"
-	        value="Dialog-bold-8">
+	        value="Dialog-bold-7">
 	        <description>
 	            This is the definition for the "Very Small" font for the Gage Plots. 
 	            This font definition will be used when the "Very Small" option is selected.
@@ -1972,7 +1972,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.gage"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPEGageResource.small"
 	        label="Small"
-	        value="Dialog-bold-9">
+	        value="Dialog-bold-8">
 	        <description>
 	            This is the definition for the "Small" font for the Gage Plots. 
 	            This font definition will be used when the "Small" option is selected.
@@ -1982,7 +1982,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.gage"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPEGageResource.normal"
 	        label="Normal"
-	        value="Dialog-bold-10">
+	        value="Dialog-bold-9">
 	        <description>
 	            This is the definition for the "Normal" font for the Gage Plots. 
 	            This font definition will be used when the "Normal" option is selected.
@@ -1992,7 +1992,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.gage"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPEGageResource.large"
 	        label="Large"
-	        value="Dialog-bold-12">
+	        value="Dialog-bold-10">
 	        <description>
 	            This is the definition for the "Large" font for the Gage Plots. 
 	            This font definition will be used when the "Large" option is selected.
@@ -2002,7 +2002,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.gage"
 	        id="com.raytheon.viz.mpe.ui.rsc.MPEGageResource.verylarge"
 	        label="Very Large"
-	        value="Dialog-bold-16">
+	        value="Dialog-bold-14">
 	        <description>
 	            This is the definition for the "Very Large" font for the Gage Plots. 
 	            This font definition will be used when the "Very Large" option is selected.
@@ -2014,7 +2014,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.default"
 	        id="com.raytheon.viz.mpe.ui.defaultFont.miniscule"
 	        label="Miniscule"
-	        value="Monospace-regular-7">
+	        value="Monospace-regular-6">
 	        <description>
 	            This is the default definition for the "Miniscule" font. 
 	            This font definition will be used when the "Miniscule" option is selected.
@@ -2024,7 +2024,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.default"
 	        id="com.raytheon.viz.mpe.ui.defaultFont.verysmall"
 	        label="Very Small"
-	        value="Monospace-regular-8">
+	        value="Monospace-regular-7">
 	        <description>
 	            This is the default definition for the "Very Small" font. 
 	            This font definition will be used when the "Very Small" option is selected.
@@ -2034,7 +2034,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.default"
 	        id="com.raytheon.viz.mpe.ui.defaultFont.small"
 	        label="Small"
-	        value="Monospace-regular-9">
+	        value="Monospace-regular-8">
 	        <description>
 	            This is the default definition for the "Small" font. 
 	            This font definition will be used when the "Small" option is selected.
@@ -2044,7 +2044,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.default"
 	        id="com.raytheon.viz.mpe.ui.defaultFont.normal"
 	        label="Normal"
-	        value="Monospace-regular-10">
+	        value="Monospace-regular-9">
 	        <description>
 	            This is the default definition for the "Normal" font. 
 	            This font definition will be used when the "Normal" option is selected.
@@ -2054,7 +2054,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.default"
 	        id="com.raytheon.viz.mpe.ui.defaultFont.large"
 	        label="Large"
-	        value="Monospace-regular-12">
+	        value="Monospace-regular-10">
 	        <description>
 	            This is the default definition for the "Large" font. 
 	            This font definition will be used when the "Large" option is selected.
@@ -2064,7 +2064,7 @@
 	        categoryId="com.raytheon.viz.mpe.ui.theme.default"
 	        id="com.raytheon.viz.mpe.ui.defaultFont.verylarge"
 	        label="Very Large"
-	        value="Monospace-regular-16">
+	        value="Monospace-regular-14">
 	        <description>
 	            This is the default definition for the "Very Large" font. 
 	            This font definition will be used when the "Very Large" option is selected.
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2DQCData.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2DQCData.java
index 8ca6d85701..7f8c5297e9 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2DQCData.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2DQCData.java
@@ -22,6 +22,9 @@ package com.raytheon.viz.mpe.ui.actions;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
 
 /**
  * TODO Add Description
@@ -31,6 +34,7 @@ import org.eclipse.core.commands.ExecutionException;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 27, 2009            snaples     Initial creation
+ * Jan 15, 2016 5054       randerso    Use proper parent shell
  * </pre>
  * 
  * @author randerso
@@ -47,8 +51,9 @@ public class SaveLevel2DQCData extends AbstractHandler {
      * .ExecutionEvent)
      */
     @Override
-    public Object execute(ExecutionEvent arg0) throws ExecutionException {
-        SaveLevel2Data s2 = new SaveLevel2Data();
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        Shell shell = HandlerUtil.getActiveShell(event);
+        SaveLevel2Data s2 = new SaveLevel2Data(shell);
         s2.send_dbase_new_area();
         return null;
     }
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
index c0a065619e..d7869b1ddc 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
@@ -80,6 +80,7 @@ import com.raytheon.viz.mpe.util.WriteQPFGrids;
  * Mar 10, 2015 14575      snaples     Added status check to make sure that we close everything before exiting.
  * Jun 25, 2015 17462      snaples     Fixed loop of basins for temp and freezing.
  * Dec 07, 2015 5172       bkowal      Prevent NPE on close. Cleanup all warnings and e print stack trace usage.
+ * Jan 15, 2016 5054       randerso    Added proper constructor with parent shell parameter
  * 
  * </pre>
  * 
@@ -110,17 +111,25 @@ public class SaveLevel2Data {
 
     public static int[] qctype_flag = new int[NUM_QCTYPE];
 
-    private Shell shell = new Shell();
+    private final Shell shell;
 
     DailyQcUtils dqc = DailyQcUtils.getInstance();
 
+    /**
+     * @param shell
+     *            parent shell for dialogs
+     */
+    public SaveLevel2Data(Shell shell) {
+        this.shell = shell;
+    }
+
     public int check_new_area(Date curDate, String area, int days) {
         int j, m;
         currntDate = curDate;
         qarea = area;
         qdays = days;
 
-        if (DailyQcUtils.pdata == null || DailyQcUtils.pdata.length < 10) {
+        if ((DailyQcUtils.pdata == null) || (DailyQcUtils.pdata.length < 10)) {
             return 0;
         }
         /* Check if any of the GageQC datasets have not been QC'd. */
@@ -132,8 +141,8 @@ public class SaveLevel2Data {
                 if (DailyQcUtils.pdata[j] == null) {
                     return 0;
                 }
-                if (DailyQcUtils.pdata[j].used[m] != 1
-                        || DailyQcUtils.pdata[j].level != 1) {
+                if ((DailyQcUtils.pdata[j].used[m] != 1)
+                        || (DailyQcUtils.pdata[j].level != 1)) {
                     continue;
                 }
 
@@ -152,8 +161,8 @@ public class SaveLevel2Data {
         for (j = 0; j < MAX_GAGEQC_DAYS; j++) {
             for (m = 0; m < 5; m++) {
                 /* not databased */
-                if (DailyQcUtils.zdata[j].used[m] != 1
-                        || DailyQcUtils.zdata[j].level[m] != 1) {
+                if ((DailyQcUtils.zdata[j].used[m] != 1)
+                        || (DailyQcUtils.zdata[j].level[m] != 1)) {
                     continue;
                 }
 
@@ -167,8 +176,8 @@ public class SaveLevel2Data {
         for (j = 0; j < MAX_GAGEQC_DAYS; j++) {
             for (m = 0; m < 5; m++) {
                 /* not databased */
-                if (DailyQcUtils.tdata[j].used[m] != 1
-                        || DailyQcUtils.tdata[j].level[m] != 1) {
+                if ((DailyQcUtils.tdata[j].used[m] != 1)
+                        || (DailyQcUtils.tdata[j].level[m] != 1)) {
                     continue;
                 }
 
@@ -201,8 +210,8 @@ public class SaveLevel2Data {
 
             for (m = 0; m < 5; m++) {
 
-                if (DailyQcUtils.pdata[j].used[m] != 1
-                        || DailyQcUtils.pdata[j].level != 1) {
+                if ((DailyQcUtils.pdata[j].used[m] != 1)
+                        || (DailyQcUtils.pdata[j].level != 1)) {
                     continue;
                 }
 
@@ -231,8 +240,8 @@ public class SaveLevel2Data {
 
             for (m = 0; m < 5; m++) {
 
-                if (DailyQcUtils.zdata[j].used[m] != 1
-                        || DailyQcUtils.zdata[j].level[m] != 1) {
+                if ((DailyQcUtils.zdata[j].used[m] != 1)
+                        || (DailyQcUtils.zdata[j].level[m] != 1)) {
                     continue;
                 }
 
@@ -260,8 +269,8 @@ public class SaveLevel2Data {
 
             for (m = 0; m < 6; m++) {
 
-                if (DailyQcUtils.tdata[j].used[m] != 1
-                        || DailyQcUtils.tdata[j].level[m] != 1) {
+                if ((DailyQcUtils.tdata[j].used[m] != 1)
+                        || (DailyQcUtils.tdata[j].level[m] != 1)) {
                     continue;
                 }
 
@@ -289,8 +298,8 @@ public class SaveLevel2Data {
             for (m = 0; m < 5; m++) {
 
                 /* not databased */
-                if (DailyQcUtils.pdata[j].used[m] != 3
-                        && DailyQcUtils.pdata[j].used[m] != 2) {
+                if ((DailyQcUtils.pdata[j].used[m] != 3)
+                        && (DailyQcUtils.pdata[j].used[m] != 2)) {
                     continue;
                 }
 
@@ -337,8 +346,9 @@ public class SaveLevel2Data {
         if (DailyQcUtils.pdata == null) {
             return;
         }
-        if (DailyQcUtils.pdata.length == 0 && DailyQcUtils.tdata.length == 0
-                && DailyQcUtils.zdata.length == 0) {
+        if ((DailyQcUtils.pdata.length == 0)
+                && (DailyQcUtils.tdata.length == 0)
+                && (DailyQcUtils.zdata.length == 0)) {
             return;
         }
         for (j = 0; j < MAX_GAGEQC_DAYS; j++) {
@@ -350,14 +360,14 @@ public class SaveLevel2Data {
 
             for (m = 0; m < 5; m++) {
 
-                if (DailyQcUtils.pdata[j].used[m] != 3
-                        && DailyQcUtils.pdata[j].used[m] != 2) {
+                if ((DailyQcUtils.pdata[j].used[m] != 3)
+                        && (DailyQcUtils.pdata[j].used[m] != 2)) {
 
-                    if (DailyQcUtils.zdata[j].used[m] != 3
-                            && DailyQcUtils.zdata[j].used[m] != 2) {
+                    if ((DailyQcUtils.zdata[j].used[m] != 3)
+                            && (DailyQcUtils.zdata[j].used[m] != 2)) {
 
-                        if (DailyQcUtils.tdata[j].used[m] != 3
-                                && DailyQcUtils.tdata[j].used[m] != 2) {
+                        if ((DailyQcUtils.tdata[j].used[m] != 3)
+                                && (DailyQcUtils.tdata[j].used[m] != 2)) {
                             continue;
                         }
 
@@ -405,7 +415,7 @@ public class SaveLevel2Data {
             String tokenName = "mpe_map_one_zone";
             String tokenValue = apps_defaults.getToken(tokenName);
 
-            if (tokenValue != null && tokenValue.length() > 0) {
+            if ((tokenValue != null) && (tokenValue.length() > 0)) {
                 /* we use the token ON and OFF */
                 if (tokenValue.equalsIgnoreCase(ON)) {
                     token_of_mpe_map_one_zone = 1;
@@ -451,7 +461,8 @@ public class SaveLevel2Data {
         int num_period_qc = 0;
         String fname_nc = "";
         float[][] datavals = new float[hrap_grid.maxi][hrap_grid.maxj];
-        if (dqc.mpe_dqc_save_grib == true || dqc.mpe_dqc_save_netcdf == true) {
+        if ((dqc.mpe_dqc_save_grib == true)
+                || (dqc.mpe_dqc_save_netcdf == true)) {
             for (int h = 0; h < hrap_grid.maxj; h++) {
                 for (int i = 0; i < hrap_grid.maxi; i++) {
                     datavals[i][h] = (DailyQcUtils.pcp.value[i][h] / 100.f);
@@ -468,7 +479,7 @@ public class SaveLevel2Data {
         if (first == 0) {
             String l2Type = apps_defaults.getToken("mpe_level2_type_value");
 
-            if (l2Type != null && l2Type.length() > 0) {
+            if ((l2Type != null) && (l2Type.length() > 0)) {
                 type = l2Type.trim();
             } else {
                 type = "2";
@@ -482,9 +493,10 @@ public class SaveLevel2Data {
         }
         save_isom = DailyQcUtils.isom;
 
-        if ((DailyQcUtils.qpf_flag == true || DailyQcUtils.maxmin_flag == true || DailyQcUtils.z_flag == true)
-                && DailyQcUtils.pcpn_day == 0
-                && (dqc.curHr18_00 == 1 || dqc.curHr00_06 == 1 || dqc.curHr06_12 == 1)) {
+        if (((DailyQcUtils.qpf_flag == true)
+                || (DailyQcUtils.maxmin_flag == true) || (DailyQcUtils.z_flag == true))
+                && (DailyQcUtils.pcpn_day == 0)
+                && ((dqc.curHr18_00 == 1) || (dqc.curHr00_06 == 1) || (dqc.curHr06_12 == 1))) {
             /*
              * if run DQC at the time frames such as curHr18_00 or curHr00_06 or
              * curHr06_12, for precipitation, do not display the 24 hr
@@ -555,7 +567,8 @@ public class SaveLevel2Data {
              */
 
             // Sanity check
-            if (DailyQcUtils.pdata == null || DailyQcUtils.pdata.length <= 0) {
+            if ((DailyQcUtils.pdata == null)
+                    || (DailyQcUtils.pdata.length <= 0)) {
                 return;
             }
 
@@ -570,8 +583,8 @@ public class SaveLevel2Data {
                  * saved.
                  */
 
-                if ((DailyQcUtils.pdata[j].used[m] == 3 || DailyQcUtils.pdata[j].used[m] == 2)
-                        && qctype_flag[0] == 1) {
+                if (((DailyQcUtils.pdata[j].used[m] == 3) || (DailyQcUtils.pdata[j].used[m] == 2))
+                        && (qctype_flag[0] == 1)) {
                     break;
                 }
             }
@@ -588,8 +601,8 @@ public class SaveLevel2Data {
              * other if run DQC on partial time frame and j=0
              */
 
-            if (j == 0
-                    && (dqc.curHr00_06 == 1 || dqc.curHr06_12 == 1 || dqc.curHr18_00 == 1)) {
+            if ((j == 0)
+                    && ((dqc.curHr00_06 == 1) || (dqc.curHr06_12 == 1) || (dqc.curHr18_00 == 1))) {
             } else {
                 EstDailyStations eds = new EstDailyStations();
                 eds.estimate_daily_stations(j, DailyQcUtils.precip_stations,
@@ -637,7 +650,8 @@ public class SaveLevel2Data {
             // save for each 6 hour periods
             for (l = 0; l < 5; l++) {
 
-                if (DailyQcUtils.pdata[j].used[l] == 0 || qctype_flag[0] == -1) {
+                if ((DailyQcUtils.pdata[j].used[l] == 0)
+                        || (qctype_flag[0] == -1)) {
                     continue;
                 }
 
@@ -704,7 +718,7 @@ public class SaveLevel2Data {
                 }
 
                 if (l < 4) {
-                    num = j * 4 + 3 - l;
+                    num = ((j * 4) + 3) - l;
                 } else {
                     num = 40 + j;
                 }
@@ -718,7 +732,8 @@ public class SaveLevel2Data {
             // save the whole days
             for (l = 0; l < 5; l++) {
 
-                if (DailyQcUtils.pdata[j].used[l] == 0 || qctype_flag[0] == -1) {
+                if ((DailyQcUtils.pdata[j].used[l] == 0)
+                        || (qctype_flag[0] == -1)) {
                     continue;
                 }
 
@@ -773,7 +788,7 @@ public class SaveLevel2Data {
                 }
 
                 if (l < 4) {
-                    num = j * 4 + 3 - l;
+                    num = ((j * 4) + 3) - l;
                 } else {
                     num = 40 + j;
                 }
@@ -994,7 +1009,7 @@ public class SaveLevel2Data {
             /* write_qc_file(type); */
             for (l = 0; l < 4; l++) {
 
-                int jj = j * 4 + 3 - l;
+                int jj = ((j * 4) + 3) - l;
 
                 if (pcp_in_use[jj] != 1) {
                     continue;
@@ -1016,7 +1031,7 @@ public class SaveLevel2Data {
             found: for (m = 0; mean_areal_precip_global[m] != null; m++) {
                 for (k = 0; k < 4; k++) {
 
-                    num = j * 4 + 3 - k;
+                    num = ((j * 4) + 3) - k;
 
                     if (mean_areal_precip_global[m].maps_done != null) {
                         if (mean_areal_precip_global[m].maps_done[num] == 1) {
@@ -1091,7 +1106,7 @@ public class SaveLevel2Data {
 
                         /* fix for polygon basins */
                         if (dqc.mpe_rfc_name.equalsIgnoreCase("cbrfc")
-                                && mean_areal_precip_global[m].hb5.length() == 7) {
+                                && (mean_areal_precip_global[m].hb5.length() == 7)) {
 
                             xbuf.append(mean_areal_precip_global[m].bchar
                                     .charAt(0));
@@ -1100,15 +1115,16 @@ public class SaveLevel2Data {
 
                         else {
 
-                            if (l == 0 && numzones != 1 && one_zone_flag != 1) {
+                            if ((l == 0) && (numzones != 1)
+                                    && (one_zone_flag != 1)) {
                                 xbuf.append("L");
                                 xbuf.append(mean_areal_precip_global[m].bchar
                                         .charAt(0));
 
                             }
 
-                            else if (l == 0 && numzones == 1
-                                    && one_zone_flag != 1) {
+                            else if ((l == 0) && (numzones == 1)
+                                    && (one_zone_flag != 1)) {
                                 xbuf.append("O");
                                 xbuf.append(mean_areal_precip_global[m].bchar
                                         .charAt(0));
@@ -1146,12 +1162,13 @@ public class SaveLevel2Data {
 
                         for (k = 0; k < 4; k++) {
 
-                            int h = j * 4 + (3 - k);
+                            int h = (j * 4) + (3 - k);
 
                             /* fix for polygon basins */
 
                             if (dqc.mpe_rfc_name.equalsIgnoreCase("cbrfc")
-                                    && mean_areal_precip_global[m].hb5.length() == 7) {
+                                    && (mean_areal_precip_global[m].hb5
+                                            .length() == 7)) {
                                 temp = mean_areal_precip_global[m].lz[h];
                             } else if (l == 0) {
                                 temp = mean_areal_precip_global[m].lz[h];
@@ -1181,7 +1198,7 @@ public class SaveLevel2Data {
                         if (one_zone_flag == 0) {
                             fp.write(xbuf.toString());
                             fp.newLine();
-                        } else if (one_zone_flag == 1 && l == 0) {
+                        } else if ((one_zone_flag == 1) && (l == 0)) {
                             fp.write(xbuf.toString());
                             statusHandler
                                     .info("Writing out record to One Zone MAP file: "
@@ -1337,9 +1354,9 @@ public class SaveLevel2Data {
                  * level 1 pass through here to the save data question
                  */
 
-                if ((DailyQcUtils.zdata[j].used[m] == 3
-                        || DailyQcUtils.zdata[j].used[m] == 2 || DailyQcUtils.zdata[j].used[m] == 1)
-                        && qctype_flag[2] == 1) {
+                if (((DailyQcUtils.zdata[j].used[m] == 3)
+                        || (DailyQcUtils.zdata[j].used[m] == 2) || (DailyQcUtils.zdata[j].used[m] == 1))
+                        && (qctype_flag[2] == 1)) {
                     break;
                 }
 
@@ -1372,7 +1389,8 @@ public class SaveLevel2Data {
 
             for (l = 0; l < 4; l++) {
 
-                if (DailyQcUtils.zdata[j].used[l] == 0 || qctype_flag[2] == -1) {
+                if ((DailyQcUtils.zdata[j].used[l] == 0)
+                        || (qctype_flag[2] == -1)) {
                     continue;
                 }
                 /*
@@ -1420,7 +1438,7 @@ public class SaveLevel2Data {
                 wqg.write_qpf_grids(dbuf);
 
                 /* output grid to file in netCDF format */
-                if (l + 1 <= num_period_qc) {
+                if ((l + 1) <= num_period_qc) {
                     if (dqc.mpe_dqc_save_netcdf == true) {
                         WriteDQCNetCDFGrids wng = new WriteDQCNetCDFGrids();
                         wng.write_dqc_netcdf_grids(fname_nc, l, num_period_qc,
@@ -1446,7 +1464,7 @@ public class SaveLevel2Data {
                     }
                 }
 
-                num = 100 + j * 4 + 3 - l;
+                num = (100 + (j * 4) + 3) - l;
 
                 MakeRsel mr = new MakeRsel();
                 mr.make_rsel(num, num - 100);
@@ -1566,7 +1584,7 @@ public class SaveLevel2Data {
 
                 for (k = 0; k < 4; k++) {
 
-                    num = j * 4 + 3 - k;
+                    num = ((j * 4) + 3) - k;
 
                     if (mean_areal_precip_global[m].zmaps_done[num] == 1) {
                         break foundz;
@@ -1630,7 +1648,7 @@ public class SaveLevel2Data {
 
                         /* fix for polygon basins */
                         if (dqc.mpe_rfc_name.equalsIgnoreCase("cbrfc")
-                                && mean_areal_precip_global[m].hb5.length() == 7) {
+                                && (mean_areal_precip_global[m].hb5.length() == 7)) {
 
                             // logMessage ("polygon write\n");
                             xbuf.append(mean_areal_precip_global[m].bchar
@@ -1640,7 +1658,7 @@ public class SaveLevel2Data {
 
                         else {
 
-                            if (l == 0 && numzones != 1) {
+                            if ((l == 0) && (numzones != 1)) {
 
                                 xbuf.append("L");
                                 xbuf.append(mean_areal_precip_global[m].bchar
@@ -1648,7 +1666,7 @@ public class SaveLevel2Data {
 
                             }
 
-                            else if (l == 0 && numzones == 1) {
+                            else if ((l == 0) && (numzones == 1)) {
 
                                 xbuf.append("O");
                                 xbuf.append(mean_areal_precip_global[m].bchar
@@ -1701,10 +1719,11 @@ public class SaveLevel2Data {
 
                         for (k = 0; k < 4; k++) {
 
-                            int h = j * 4 + (3 - k);
+                            int h = (j * 4) + (3 - k);
 
                             if (dqc.mpe_rfc_name.equalsIgnoreCase("cbrfc")
-                                    && mean_areal_precip_global[m].hb5.length() == 7) {
+                                    && (mean_areal_precip_global[m].hb5
+                                            .length() == 7)) {
                                 temp = mean_areal_precip_global[m].zlz[h];
 
                             } else if (l == 0) {
@@ -1787,8 +1806,8 @@ public class SaveLevel2Data {
 
             for (m = 0; m < 6; m++) {
 
-                if ((DailyQcUtils.tdata[j].used[m] == 3 || DailyQcUtils.tdata[j].used[m] == 2)
-                        && qctype_flag[1] == 1) {
+                if (((DailyQcUtils.tdata[j].used[m] == 3) || (DailyQcUtils.tdata[j].used[m] == 2))
+                        && (qctype_flag[1] == 1)) {
                     break;
                 }
 
@@ -1800,8 +1819,8 @@ public class SaveLevel2Data {
 
             /* re-create all pcpn and maps if necessary */
 
-            if (j == 0
-                    && (dqc.curHr00_06 == 1 || dqc.curHr06_12 == 1 || dqc.curHr18_00 == 1)) {
+            if ((j == 0)
+                    && ((dqc.curHr00_06 == 1) || (dqc.curHr06_12 == 1) || (dqc.curHr18_00 == 1))) {
                 // do not estimate
             } else {
 
@@ -1842,7 +1861,8 @@ public class SaveLevel2Data {
 
             for (l = 5; l >= 0; l--) {
 
-                if (DailyQcUtils.tdata[j].used[l] == 0 || qctype_flag[1] == -1) {
+                if ((DailyQcUtils.tdata[j].used[l] == 0)
+                        || (qctype_flag[1] == -1)) {
                     continue;
                 }
 
@@ -1905,7 +1925,7 @@ public class SaveLevel2Data {
                 wqg.write_qpf_grids(dbuf);
 
                 /* output grid to file in netCDF format */
-                if (l + 1 <= num_period_qc) {
+                if ((l + 1) <= num_period_qc) {
                     if (dqc.mpe_dqc_save_netcdf == true) {
                         WriteDQCNetCDFGrids wng = new WriteDQCNetCDFGrids();
                         wng.write_dqc_netcdf_grids(fname_nc, l, num_period_qc,
@@ -1933,7 +1953,7 @@ public class SaveLevel2Data {
                     }
                 }
 
-                num = 150 + j * 4 + 3 - l;
+                num = (150 + (j * 4) + 3) - l;
 
                 if (l < 4) {
                     MakeMat mmt = new MakeMat();
@@ -2179,7 +2199,7 @@ public class SaveLevel2Data {
 
                 for (k = 0; k < 4; k++) {
 
-                    num = j * 4 + 3 - k;
+                    num = ((j * 4) + 3) - k;
 
                     if (mean_areal_precip_global[m].tmaps_done[num] == 1) {
                         break foundt;
@@ -2245,7 +2265,7 @@ public class SaveLevel2Data {
                         /* fix for polygon basins */
 
                         if (dqc.mpe_rfc_name.equalsIgnoreCase("cbrfc")
-                                && mean_areal_precip_global[m].hb5.length() == 7) {
+                                && (mean_areal_precip_global[m].hb5.length() == 7)) {
                             // logMessage ("polygon write\n");
                             xbuf.append(mean_areal_precip_global[m].bchar
                                     .charAt(0));
@@ -2253,12 +2273,12 @@ public class SaveLevel2Data {
                         }
 
                         else {
-                            if (l == 0 && numzones != 1) {
+                            if ((l == 0) && (numzones != 1)) {
                                 xbuf.append("L");
                                 xbuf.append(mean_areal_precip_global[m].bchar
                                         .charAt(0));
 
-                            } else if (l == 0 && numzones == 1) {
+                            } else if ((l == 0) && (numzones == 1)) {
                                 xbuf.append("O");
                                 xbuf.append(mean_areal_precip_global[m].bchar
                                         .charAt(0));
@@ -2304,10 +2324,11 @@ public class SaveLevel2Data {
 
                         for (k = 0; k < 4; k++) {
 
-                            int h = j * 4 + (3 - k);
+                            int h = (j * 4) + (3 - k);
 
                             if (dqc.mpe_rfc_name.equalsIgnoreCase("cbrfc")
-                                    && mean_areal_precip_global[m].hb5.length() == 7) {
+                                    && (mean_areal_precip_global[m].hb5
+                                            .length() == 7)) {
 
                                 temp = mean_areal_precip_global[m].tlz[h];
 
@@ -2392,8 +2413,8 @@ public class SaveLevel2Data {
 
         int pcpn_day = DailyQcUtils.pcpn_day;
 
-        if (DailyQcUtils.qpf_flag == true || DailyQcUtils.z_flag == true
-                || DailyQcUtils.maxmin_flag == true) {
+        if ((DailyQcUtils.qpf_flag == true) || (DailyQcUtils.z_flag == true)
+                || (DailyQcUtils.maxmin_flag == true)) {
 
             if (DailyQcUtils.qpf_flag == true) {
                 QcPrecipOptionsDialog.dataSet.clear();
@@ -2437,36 +2458,42 @@ public class SaveLevel2Data {
             int grids_flag = DailyQcUtils.grids_flag;
             int map_flag = DailyQcUtils.map_flag;
 
-            if (points_flag == 1 && pcp_in_use[time_pos] == -1) {
+            if ((points_flag == 1) && (pcp_in_use[time_pos] == -1)) {
                 k = 0;
             }
 
-            else if (points_flag == 1 && grids_flag == -1 && map_flag == -1) {
+            else if ((points_flag == 1) && (grids_flag == -1)
+                    && (map_flag == -1)) {
                 k = 0;
             }
 
-            else if (points_flag == -1 && grids_flag == 1 && map_flag == -1) {
+            else if ((points_flag == -1) && (grids_flag == 1)
+                    && (map_flag == -1)) {
                 k = 1;
             }
 
-            else if (points_flag == -1 && grids_flag == -1 && map_flag == 1) {
+            else if ((points_flag == -1) && (grids_flag == -1)
+                    && (map_flag == 1)) {
                 k = 2;
             }
 
-            else if (points_flag == 1 && grids_flag == 1 && map_flag == -1) {
+            else if ((points_flag == 1) && (grids_flag == 1)
+                    && (map_flag == -1)) {
                 k = 3;
             }
 
-            else if (points_flag == 1 && grids_flag == -1 && map_flag == 1) {
+            else if ((points_flag == 1) && (grids_flag == -1)
+                    && (map_flag == 1)) {
                 k = 4;
             }
 
-            else if (points_flag == -1 && grids_flag == -1 && map_flag == -1) {
+            else if ((points_flag == -1) && (grids_flag == -1)
+                    && (map_flag == -1)) {
                 k = 5;
             }
 
-            if (DailyQcUtils.qpf_flag == true
-                    && QcPrecipOptionsDialog.isOpen == true) {
+            if ((DailyQcUtils.qpf_flag == true)
+                    && (QcPrecipOptionsDialog.isOpen == true)) {
                 QcPrecipOptionsDialog.selectDataSetVal(k);
             }
         }
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
index 22e8e2875d..ed7171e5b6 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
@@ -66,6 +66,7 @@ import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
  * Jul, 7 2009             snaples     Initial creation
  * Sep 11, 2013 #2353      lvenable    Fixed cursor memory leak.
  * Mar 10, 2015  14575     snaples     Added addtional status flag.
+ * Jan 15, 2016 5054       randerso    Use proper parent shell
  * 
  * </pre>
  * 
@@ -113,7 +114,7 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
     private int dqc_good = 0;
 
     public static DrawDQCStations ddq;
-    
+
     private DailyQcUtils dqc;
 
     public static ArrayList<String> dataType = new ArrayList<String>();
@@ -124,9 +125,9 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
 
     OtherFreezeOptions ozo = new OtherFreezeOptions();
 
-//    Zdata[] zdata = new Zdata[0];
+    // Zdata[] zdata = new Zdata[0];
 
-//    Ts[] ts;
+    // Ts[] ts;
 
     private int time_pos;
 
@@ -156,33 +157,29 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
 
     private int getOpts() {
         int ik = 0;
-        if (dqc.points_flag == 1
-                && dqc.pcp_in_use[time_pos] == -1) {
+        if (dqc.points_flag == 1 && dqc.pcp_in_use[time_pos] == -1) {
             ik = 0;
-        } else if (dqc.points_flag == 1
-                && dqc.grids_flag == -1 && dqc.map_flag == -1
-                && dqc.contour_flag == -1) {
+        } else if (dqc.points_flag == 1 && dqc.grids_flag == -1
+                && dqc.map_flag == -1 && dqc.contour_flag == -1) {
             ik = 0;
-        } else if (dqc.points_flag == -1
-                && dqc.grids_flag == 1 && dqc.map_flag == -1) {
+        } else if (dqc.points_flag == -1 && dqc.grids_flag == 1
+                && dqc.map_flag == -1) {
             ik = 1;
-        } else if (dqc.points_flag == -1
-                && dqc.grids_flag == -1 && dqc.map_flag == 1) {
+        } else if (dqc.points_flag == -1 && dqc.grids_flag == -1
+                && dqc.map_flag == 1) {
             ik = 2;
-        } else if (dqc.points_flag == 1
-                && dqc.grids_flag == 1 && dqc.map_flag == -1) {
+        } else if (dqc.points_flag == 1 && dqc.grids_flag == 1
+                && dqc.map_flag == -1) {
             ik = 3;
-        } else if (dqc.points_flag == 1
-                && dqc.grids_flag == -1 && dqc.map_flag == 1) {
+        } else if (dqc.points_flag == 1 && dqc.grids_flag == -1
+                && dqc.map_flag == 1) {
             ik = 4;
-        } else if (dqc.points_flag == -1
-                && dqc.contour_flag == 1) {
+        } else if (dqc.points_flag == -1 && dqc.contour_flag == 1) {
             ik = 5;
-        } else if (dqc.points_flag == 1
-                && dqc.contour_flag == 1) {
+        } else if (dqc.points_flag == 1 && dqc.contour_flag == 1) {
             ik = 6;
-        } else if (dqc.points_flag == -1
-                && dqc.grids_flag == -1 && dqc.map_flag == -1) {
+        } else if (dqc.points_flag == -1 && dqc.grids_flag == -1
+                && dqc.map_flag == -1) {
             ik = 7;
         }
         return ik;
@@ -216,7 +213,7 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
         dqc_good = dqc.qcDataHasChanged(prevDate, currDate, QcArea, qcDays,
                 false);
         if (dqc_good == 1) {
-            SaveLevel2Data s2 = new SaveLevel2Data();
+            SaveLevel2Data s2 = new SaveLevel2Data(getShell());
             dqc_good = s2.check_new_area(currDate, QcArea, qcDays);
             if (dqc_good == 0) {
                 dqc_good = dqc.qcDataReload(currDate, QcArea, qcDays, false);
@@ -308,13 +305,14 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
         isfinished = true;
         isOpen = false;
         font.dispose();
-        SaveLevel2Data s2 = new SaveLevel2Data();
+        SaveLevel2Data s2 = new SaveLevel2Data(getShell());
         s2.send_dbase_new_area();
         dqc.clearData();
         displayMgr.displayFieldData(df);
         removePerspectiveListener();
         if (MPEDisplayManager.getCurrent() != null) {
             display.asyncExec(new Runnable() {
+                @Override
                 public void run() {
                     ChooseDataPeriodDialog dialog = new ChooseDataPeriodDialog(
                             getParent().getShell());
@@ -330,7 +328,7 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
      * Initialize the dialog components.
      */
     private void initializeComponents() {
-//        zdata = DailyQcUtils.zdata;
+        // zdata = DailyQcUtils.zdata;
         dqc.points_flag = 1;
         dqc.grids_flag = -1;
         dqc.map_flag = -1;
@@ -342,7 +340,7 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
             // checks to see if area or date has changed since last data load
             DailyQcUtils dqcu = new DailyQcUtils();
             dqc_good = dqcu.qcDataReload(currDate, QcArea, qcDays, false);
-//            dqc.zdata = DailyQcUtils.zdata;
+            // dqc.zdata = DailyQcUtils.zdata;
             if (MPEDisplayManager.pcpn_time_step != 0) {
                 MPEDisplayManager.pcpn_time_step = 0;
                 dqc.pcpn_time = 0;
@@ -366,7 +364,7 @@ public class QcFreezeOptionsDialog extends AbstractMPEDialog {
             }
         }
 
-//        ts = DailyQcUtils.ts;
+        // ts = DailyQcUtils.ts;
         this.createDataOptionsGroup();
         this.createPointSetComp();
         this.createPointControlComp();
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
index 34d9047d91..acbf229362 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
@@ -70,6 +70,8 @@ import com.raytheon.viz.mpe.util.DailyQcUtils;
  * Sep 11, 2015 17988      snaples     Fixed issue with wait cursor not showing when Rendering Grids.
  * Nov 18, 2015 18093      snaples     Fixed problem with arrows being disabled when new
  *                                     day rollover >18Z occurs.
+ * Jan 15, 2016 5054       randerso    Use proper parent shell
+ * 
  * </pre>
  * 
  * @author snaples
@@ -132,9 +134,9 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
     private static boolean isfinished = true;
 
     private static int dqc_good = 0;
-    
+
     public static DrawDQCStations ddq;
-    
+
     private DailyQcUtils dqc;
 
     public static ArrayList<String> dataType = new ArrayList<String>();
@@ -143,11 +145,11 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
 
     OtherPrecipOptions opo = new OtherPrecipOptions();
 
-//    int[] pcp_in_use;
+    // int[] pcp_in_use;
 
-//    Pdata[] pdata = new Pdata[0];
+    // Pdata[] pdata = new Pdata[0];
 
-//    Ts[] ts;
+    // Ts[] ts;
 
     private int time_pos;
 
@@ -158,7 +160,7 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
     final GageQcSelect gq = new GageQcSelect();
 
     int i = 0;
-    
+
     /**
      * Constructor.
      * 
@@ -169,12 +171,13 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
         super(parent);
         MPEDisplayManager.getCurrent().setQpf(true);
         dqc = DailyQcUtils.getInstance();
-        
+
     }
 
     private int getOpts() {
         int ik = 0;
-        if (DailyQcUtils.points_flag == 1 && DailyQcUtils.pcp_in_use[time_pos] == -1) {
+        if (DailyQcUtils.points_flag == 1
+                && DailyQcUtils.pcp_in_use[time_pos] == -1) {
             ik = 0;
         } else if (DailyQcUtils.points_flag == 1
                 && DailyQcUtils.grids_flag == -1 && DailyQcUtils.map_flag == -1
@@ -220,7 +223,7 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
         String QcArea = ChooseDataPeriodDialog.prevArea;
         AppsDefaults appDefaults = AppsDefaults.getInstance();
         DisplayFieldData df = displayMgr.getDisplayFieldType();
-        
+
         if (currDate == null) {
             currDate = prevDate;
         }
@@ -234,7 +237,7 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
         dqc_good = dqc.qcDataHasChanged(prevDate, currDate, QcArea, qcDays,
                 false);
         if (dqc_good == 1) {
-            SaveLevel2Data s2 = new SaveLevel2Data();
+            SaveLevel2Data s2 = new SaveLevel2Data(getShell());
             dqc_good = s2.check_new_area(currDate, QcArea, qcDays);
             if (dqc_good == 0) {
                 dqc_good = dqc.qcDataReload(currDate, QcArea, qcDays, false);
@@ -312,14 +315,15 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
         isfinished = true;
         isOpen = false;
         font.dispose();
-        SaveLevel2Data s2 = new SaveLevel2Data();
+        SaveLevel2Data s2 = new SaveLevel2Data(getShell());
         s2.send_dbase_new_area();
-//        DailyQcUtils dc = new DailyQcUtils();
+        // DailyQcUtils dc = new DailyQcUtils();
         dqc.clearData();
         displayMgr.displayFieldData(df);
         removePerspectiveListener();
         if (MPEDisplayManager.getCurrent() != null) {
             display.asyncExec(new Runnable() {
+                @Override
                 public void run() {
                     ChooseDataPeriodDialog dialog = new ChooseDataPeriodDialog(
                             getParent().getShell());
@@ -365,7 +369,7 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
             }
         }
 
-//        ts = DailyQcUtils.ts;
+        // ts = DailyQcUtils.ts;
         this.createDataOptionsGroup();
         this.createPointTypeGroup();
         this.createPointQualityGroup();
@@ -418,8 +422,7 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
             }
         });
         if (DailyQcUtils.qcDays == 1
-                && (dqc.curHr18_00 == 1
-                        || dqc.curHr00_06 == 1 || dqc.curHr06_12 == 1)) {
+                && (dqc.curHr18_00 == 1 || dqc.curHr00_06 == 1 || dqc.curHr06_12 == 1)) {
             selsix24Cbo.setEnabled(false);
         } else {
             selsix24Cbo.setEnabled(true);
@@ -499,7 +502,8 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
         renderGridsBtn = new Button(renderComp, SWT.PUSH);
         renderGridsBtn.setText("Render Grids+MAPs");
         renderGridsBtn.setLayoutData(gd);
-        if (DailyQcUtils.pcp_in_use[time_pos] == -1 && DailyQcUtils.pdata[i].used[4] != 0) {
+        if (DailyQcUtils.pcp_in_use[time_pos] == -1
+                && DailyQcUtils.pdata[i].used[4] != 0) {
             renderGridsBtn.setEnabled(true);
         } else {
             renderGridsBtn.setEnabled(false);
@@ -669,8 +673,7 @@ public class QcPrecipOptionsDialog extends AbstractMPEDialog {
         boolean mpe_show_missing_gage_set = false;
         if (dqc.mpe_show_missing_gage.length() > 0) {
             if ((dqc.mpe_show_missing_gage.equalsIgnoreCase("All"))
-                    || (dqc.mpe_show_missing_gage
-                            .equalsIgnoreCase("Reported"))) {
+                    || (dqc.mpe_show_missing_gage.equalsIgnoreCase("Reported"))) {
                 mpe_show_missing_gage_set = true;
             } else {
                 mpe_show_missing_gage_set = false;
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
index c93c64d75c..9d52cec446 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
@@ -63,6 +63,7 @@ import com.raytheon.viz.mpe.util.DailyQcUtils;
  * Nov 12, 2008            snaples     Initial creation
  * Sep 11, 2013 #2353      lvenable    Fixed cursor memory leak.
  * Mar 10, 2015 14575      snaples     Added status flag.
+ * Jan 15, 2016 5054       randerso    Use proper parent shell
  * 
  * </pre>
  * 
@@ -118,7 +119,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
     private int dqc_good = 0;
 
     public static DrawDQCStations ddq;
-    
+
     private DailyQcUtils dqc;
 
     public static ArrayList<String> dataType = new ArrayList<String>();
@@ -129,9 +130,9 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
 
     OtherTempOptions oto = new OtherTempOptions();
 
-//    Tdata[] tdata = new Tdata[0];
+    // Tdata[] tdata = new Tdata[0];
 
-//    Ts[] ts;
+    // Ts[] ts;
 
     private int time_pos;
 
@@ -157,33 +158,29 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
 
     private int getOpts() {
         int ik = 0;
-        if (dqc.points_flag == 1
-                && dqc.pcp_in_use[time_pos] == -1) {
+        if (dqc.points_flag == 1 && dqc.pcp_in_use[time_pos] == -1) {
             ik = 0;
-        } else if (dqc.points_flag == 1
-                && dqc.grids_flag == -1 && dqc.map_flag == -1
-                && dqc.contour_flag == -1) {
+        } else if (dqc.points_flag == 1 && dqc.grids_flag == -1
+                && dqc.map_flag == -1 && dqc.contour_flag == -1) {
             ik = 0;
-        } else if (dqc.points_flag == -1
-                && dqc.grids_flag == 1 && dqc.map_flag == -1) {
+        } else if (dqc.points_flag == -1 && dqc.grids_flag == 1
+                && dqc.map_flag == -1) {
             ik = 1;
-        } else if (dqc.points_flag == -1
-                && dqc.grids_flag == -1 && dqc.map_flag == 1) {
+        } else if (dqc.points_flag == -1 && dqc.grids_flag == -1
+                && dqc.map_flag == 1) {
             ik = 2;
-        } else if (dqc.points_flag == 1
-                && dqc.grids_flag == 1 && dqc.map_flag == -1) {
+        } else if (dqc.points_flag == 1 && dqc.grids_flag == 1
+                && dqc.map_flag == -1) {
             ik = 3;
-        } else if (dqc.points_flag == 1
-                && dqc.grids_flag == -1 && dqc.map_flag == 1) {
+        } else if (dqc.points_flag == 1 && dqc.grids_flag == -1
+                && dqc.map_flag == 1) {
             ik = 4;
-        } else if (dqc.points_flag == -1
-                && dqc.contour_flag == 1) {
+        } else if (dqc.points_flag == -1 && dqc.contour_flag == 1) {
             ik = 5;
-        } else if (dqc.points_flag == 1
-                && dqc.contour_flag == 1) {
+        } else if (dqc.points_flag == 1 && dqc.contour_flag == 1) {
             ik = 6;
-        } else if (dqc.points_flag == -1
-                && dqc.grids_flag == -1 && dqc.map_flag == -1) {
+        } else if (dqc.points_flag == -1 && dqc.grids_flag == -1
+                && dqc.map_flag == -1) {
             ik = 7;
         }
         return ik;
@@ -217,7 +214,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
         dqc_good = dqc.qcDataHasChanged(prevDate, currDate, QcArea, qcDays,
                 false);
         if (dqc_good == 1) {
-            SaveLevel2Data s2 = new SaveLevel2Data();
+            SaveLevel2Data s2 = new SaveLevel2Data(getShell());
             dqc_good = s2.check_new_area(currDate, QcArea, qcDays);
             if (dqc_good == 0) {
                 dqc_good = dqc.qcDataReload(currDate, QcArea, qcDays, false);
@@ -295,7 +292,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
         isfinished = true;
         isOpen = false;
         font.dispose();
-        SaveLevel2Data s2 = new SaveLevel2Data();
+        SaveLevel2Data s2 = new SaveLevel2Data(getShell());
         s2.send_dbase_new_area();
         DailyQcUtils dc = new DailyQcUtils();
         dc.clearData();
@@ -303,6 +300,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
         removePerspectiveListener();
         if (MPEDisplayManager.getCurrent() != null) {
             display.asyncExec(new Runnable() {
+                @Override
                 public void run() {
                     ChooseDataPeriodDialog dialog = new ChooseDataPeriodDialog(
                             getParent().getShell());
@@ -318,7 +316,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
      * Initialize the dialog components.
      */
     private void initializeComponents() {
-//        tdata = DailyQcUtils.tdata;
+        // tdata = DailyQcUtils.tdata;
         dqc.points_flag = 1;
         dqc.grids_flag = -1;
         dqc.map_flag = -1;
@@ -332,7 +330,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
             int qcDays = MPEDisplayManager.getCurrent().getDqcDays();
             // checks to see if area or date has changed since last data load
             dqc_good = dqc.qcDataReload(currDate, QcArea, qcDays, false);
-//            tdata = DailyQcUtils.tdata;
+            // tdata = DailyQcUtils.tdata;
 
         }
         dataSet.clear();
@@ -357,7 +355,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
             }
         }
 
-//        ts = DailyQcUtils.ts;
+        // ts = DailyQcUtils.ts;
         this.createDataOptionsGroup();
         this.createPointTypeGroup();
         this.createPointQualityGroup();
@@ -407,8 +405,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
             }
         });
         if (dqc.qcDays == 1
-                && (dqc.curHr18_00 == 1
-                        || dqc.curHr00_06 == 1 || dqc.curHr06_12 == 1)) {
+                && (dqc.curHr18_00 == 1 || dqc.curHr00_06 == 1 || dqc.curHr06_12 == 1)) {
             maxminTimeCbo.setEnabled(false);
         } else {
             maxminTimeCbo.setEnabled(true);
@@ -471,8 +468,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
         renderGridsBtn = new Button(renderComp, SWT.PUSH);
         renderGridsBtn.setText("Render Grids+MATs");
         renderGridsBtn.setLayoutData(gd);
-        if (dqc.pcp_in_use[time_pos] == -1
-                && dqc.tdata[i].used[4] != 0) {
+        if (dqc.pcp_in_use[time_pos] == -1 && dqc.tdata[i].used[4] != 0) {
             renderGridsBtn.setEnabled(true);
         } else {
             renderGridsBtn.setEnabled(false);
@@ -607,10 +603,10 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
         pointQualGroup.setLayoutData(gd);
 
         int i;
-//        int qflag[] = dqc.qflag;
+        // int qflag[] = dqc.qflag;
 
         for (i = 0; i < 10; i++) {
-           dqc.qflag[i] = 1;
+            dqc.qflag[i] = 1;
         }
 
         // qflag[5] = -1;
@@ -618,8 +614,7 @@ public class QcTempOptionsDialog extends AbstractMPEDialog {
         boolean mpe_show_missing_gage_set = false;
         if (dqc.mpe_show_missing_gage.length() > 0) {
             if ((dqc.mpe_show_missing_gage.equalsIgnoreCase("All"))
-                    || (dqc.mpe_show_missing_gage
-                            .equalsIgnoreCase("Reported"))) {
+                    || (dqc.mpe_show_missing_gage.equalsIgnoreCase("Reported"))) {
                 mpe_show_missing_gage_set = true;
             } else {
                 mpe_show_missing_gage_set = false;
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
index 7df54c8c8b..a0d9e62d9c 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
@@ -57,6 +57,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  *                                     displayed for polygons with
  *                                     the "sub" action.
  * Jan 7, 2015  16954      cgobs       Fix for cv_use issue - using getFieldName() in certain parts.
+ * Feb 15, 2016 5338       bkowal      Keep track of any persistent polygons that are deleted.
  * </pre>
  * 
  * @author mpduff
@@ -287,7 +288,7 @@ public class DeletePolygonDlg extends CaveSWTDialog {
         polygonListBox.removeAll();
 
         String type = displayManager.getDisplayFieldType().getFieldName();
-        
+
         productTF.setText(type);
         polygonList = PolygonEditManager.getPolygonEdits(fieldData, editDate);
         recreatePolygonListBox();
@@ -348,8 +349,9 @@ public class DeletePolygonDlg extends CaveSWTDialog {
             return;
         }
         // Remove selected from list and apply
-        polygonList.remove(polygonListBox.getSelectionIndex());
-        applyPolygonList();
+        RubberPolyData polygon = polygonList.remove(polygonListBox
+                .getSelectionIndex());
+        applyPolygonList(polygon.isPersistent());
     }
 
     /**
@@ -357,8 +359,15 @@ public class DeletePolygonDlg extends CaveSWTDialog {
      */
     private void deleteAll() {
         // Clear the list and apply
+        boolean persistentRemoved = false;
+        for (RubberPolyData polygon : polygonList) {
+            if (polygon.isPersistent()) {
+                persistentRemoved = true;
+                break;
+            }
+        }
         polygonList.clear();
-        applyPolygonList();
+        applyPolygonList(persistentRemoved);
     }
 
     /**
@@ -374,15 +383,16 @@ public class DeletePolygonDlg extends CaveSWTDialog {
         if (polygon >= 0 && polygon < polygonList.size()) {
             RubberPolyData data = polygonList.get(polygon);
             data.setVisible(display);
-            applyPolygonList();
+            applyPolygonList(false);
         }
     }
 
-    private void applyPolygonList() {
+    private void applyPolygonList(boolean persistentRemoved) {
         MPEDisplayManager displayManager = MPEDisplayManager.getCurrent();
         DisplayFieldData fieldData = displayManager.getDisplayFieldType();
         Date editDate = displayManager.getCurrentEditDate();
-        PolygonEditManager.writePolygonEdits(fieldData, editDate, polygonList);
+        PolygonEditManager.writePolygonEdits(fieldData, editDate, polygonList,
+                persistentRemoved);
         recreatePolygonListBox();
     }
 
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
index 094dcb01f1..5865a67e36 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
@@ -66,6 +66,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * Apr 28, 2014 16707      snaples     Added code to save and set location of dialog box when moved.
  * Jan 12, 2015 16993      snaples     Restored code for Substitute Field Combo box.
  * Feb 26, 2015 17209      cgobs       Ensured that there is an initial selection of Substitution field, prevents empty selection.
+ * Feb 15, 2016 5338       bkowal      Remove commented code. Cleanup.
  * 
  * </pre>
  * 
@@ -80,9 +81,10 @@ public class DrawPolygonDlg extends CaveSWTDialog {
 
     private static final String MAKE_PERSISTENT = "Make Persistent";
 
-	private DisplayFieldData[] displayFieldDataArray;
+    private DisplayFieldData[] displayFieldDataArray;
+
     private String[] displayTypeNameArray;
-	
+
     /**
      * Bold Font.
      */
@@ -96,8 +98,8 @@ public class DrawPolygonDlg extends CaveSWTDialog {
     /**
      * The field type selection Combo control.
      */
-	private Combo fieldTypeCombo = null;
-    
+    private Combo fieldTypeCombo = null;
+
     /**
      * The precip value spinner control.
      */
@@ -126,12 +128,12 @@ public class DrawPolygonDlg extends CaveSWTDialog {
 
     /** The polygon resource */
     private final MPEPolygonResource resource;
-    
+
     /** Point to hold location of dialog */
-    private static org.eclipse.swt.graphics.Point dlgLoc = null; 
+    private static org.eclipse.swt.graphics.Point dlgLoc = null;
 
     /** Status of dialog opened or not */
-    private boolean dialogOpened = false; 
+    private boolean dialogOpened = false;
 
     /**
      * Constructor.
@@ -170,21 +172,21 @@ public class DrawPolygonDlg extends CaveSWTDialog {
         font = new Font(shell.getDisplay(), "Monospace", 10, SWT.NORMAL);
         // Initialize all of the controls and layoutsendCal
         initializeComponents();
-        shell.addControlListener(new ControlAdapter() { 
-            @Override 
-            public void controlMoved(ControlEvent e) { 
-                if (!dialogOpened) { 
-                   return; 
-                } 
+        shell.addControlListener(new ControlAdapter() {
+            @Override
+            public void controlMoved(ControlEvent e) {
+                if (!dialogOpened) {
+                    return;
+                }
 
-                if (dlgLoc == null) { 
-                    return; 
-                } 
+                if (dlgLoc == null) {
+                    return;
+                }
 
-                dlgLoc.x = shell.getBounds().x; 
-                dlgLoc.y = shell.getBounds().y; 
-            } 
-        }); 
+                dlgLoc.x = shell.getBounds().x;
+                dlgLoc.y = shell.getBounds().y;
+            }
+        });
     }
 
     /**
@@ -196,17 +198,16 @@ public class DrawPolygonDlg extends CaveSWTDialog {
         createCloseBtn();
     }
 
-    @Override 
-    protected void opened() { 
-        if (dlgLoc == null) { 
-            dlgLoc = new org.eclipse.swt.graphics.Point(shell.getBounds().x, shell.getBounds().y); 
-        } 
-        else { 
-            shell.setLocation(dlgLoc); 
-        } 
-        dialogOpened = true; 
-    } 
-
+    @Override
+    protected void opened() {
+        if (dlgLoc == null) {
+            dlgLoc = new org.eclipse.swt.graphics.Point(shell.getBounds().x,
+                    shell.getBounds().y);
+        } else {
+            shell.setLocation(dlgLoc);
+        }
+        dialogOpened = true;
+    }
 
     /**
      * Create the persistent group.
@@ -361,7 +362,7 @@ public class DrawPolygonDlg extends CaveSWTDialog {
      */
     private void createFieldCombo(Group groupComp) {
         // Spacer
-    	
+
         // Create a container to hold the label and the combo box.
         GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
         Composite prodListComp = new Composite(shell, SWT.NONE);
@@ -377,83 +378,58 @@ public class DrawPolygonDlg extends CaveSWTDialog {
         gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
         fieldTypeCombo = new Combo(groupComp, SWT.LEFT | SWT.DROP_DOWN
                 | SWT.READ_ONLY);
-        
-        if (displayFieldDataArray == null)
-        {
-        	  displayFieldDataArray = MPEDisplayManager.mpe_qpe_fields;
+
+        if (displayFieldDataArray == null) {
+            displayFieldDataArray = MPEDisplayManager.mpe_qpe_fields;
         }
-         	
-  //      Label spaceLabel = new Label(groupComp, SWT.NONE);
-  //      spaceLabel.setText("*****  ");
-        
+
         int selectedFieldIndex = 0;
         boolean found = false;
-        //find the index of the selected field
-        for (selectedFieldIndex = 0; selectedFieldIndex < displayFieldDataArray.length; selectedFieldIndex++)
-        {
-            if (displayFieldDataArray[selectedFieldIndex] == subType)
-            {
+        // find the index of the selected field
+        for (selectedFieldIndex = 0; selectedFieldIndex < displayFieldDataArray.length; selectedFieldIndex++) {
+            if (displayFieldDataArray[selectedFieldIndex] == subType) {
                 found = true;
                 break;
             }
         }
-        
-        if (!found)
-        {
+
+        if (!found) {
             selectedFieldIndex = 0;
         }
-        
-        //create and initialize the display field type name array
+
+        // create and initialize the display field type name array
         displayTypeNameArray = new String[displayFieldDataArray.length];
-        
+
         for (int i = 0; i < displayFieldDataArray.length; i++) {
-        	
-        	String fieldName = displayFieldDataArray[i].toString();
-       // 	System.out.println("DrawPolygon.createFieldCombo():  FieldName = :" + fieldName + ":");       	
+
+            String fieldName = displayFieldDataArray[i].toString();
             displayTypeNameArray[i] = fieldName;
         }
-        
-        //select the field
+
+        // select the field
         fieldTypeCombo.setTextLimit(35);
         fieldTypeCombo.setLayoutData(gd);
         fieldTypeCombo.setItems(displayTypeNameArray);
-       // fieldTypeCombo.select(selectedFieldIndex);
-        
+
         fieldTypeCombo.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent event) {
-                
                 setSubstitutionField();
-                
-//            	String selectedFieldString = fieldTypeCombo.getText();
- 
- //           	System.out.println("DrawPolygon.createFieldCombo(): selectedFieldString =  " +
- //           						selectedFieldString);
-            	
- //           	subType = DisplayFieldData.fromDisplayNameString(selectedFieldString);
-            	
- //           	if (subType != null)
- //          	{
- //          		System.out.println("DrawPolygon.createFieldCombo(): subType =  " +
- //          			subType.toString());
- //          	}
-          }
+            }
         });
-        
-        //select the substitution field
-        
+
+        // select the substitution field
+
         fieldTypeCombo.select(selectedFieldIndex);
         setSubstitutionField();
-       
+
     }
-    
-    private void setSubstitutionField()
-    {
+
+    private void setSubstitutionField() {
         String selectedFieldString = fieldTypeCombo.getText();
         subType = DisplayFieldData.fromDisplayNameString(selectedFieldString);
-        
+
     }
-    
 
     /**
      * Process the selection.
@@ -490,7 +466,7 @@ public class DrawPolygonDlg extends CaveSWTDialog {
                     .getPolygonEdits(displayedField, editDate);
             polygonEdits.add(newEdit);
             PolygonEditManager.writePolygonEdits(displayedField, editDate,
-                    polygonEdits);
+                    polygonEdits, false);
             resource.clearPolygons();
             dispMgr.setSavedData(false);
         } finally {
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/IPolygonEditsChangedListener.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/IPolygonEditsChangedListener.java
index e96855ae42..533c2af6e7 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/IPolygonEditsChangedListener.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/IPolygonEditsChangedListener.java
@@ -34,6 +34,8 @@ import com.raytheon.viz.mpe.ui.DisplayFieldData;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jan 2, 2013            mschenke     Initial creation
+ * Feb 15, 2016 5338      bkowal       Updated to provide information about which
+ *                                     persistent polygons remain after the edit.
  * 
  * </pre>
  * 
@@ -44,6 +46,7 @@ import com.raytheon.viz.mpe.ui.DisplayFieldData;
 public interface IPolygonEditsChangedListener {
 
     public void polygonEditsChanged(DisplayFieldData field, Date date,
-            List<RubberPolyData> polygonEdits);
+            List<RubberPolyData> polygonEdits,
+            List<RubberPolyData> persistentRemaining);
 
 }
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/PolygonEditManager.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/PolygonEditManager.java
index e755ddf582..b5dc835027 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/PolygonEditManager.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/PolygonEditManager.java
@@ -69,6 +69,8 @@ import com.raytheon.viz.mpe.ui.dialogs.polygon.RubberPolyData.PolygonEditAction;
  *                                     files are written.
  * Jul 15, 2013  15963     snaples     Removed polygon edit flag, and 
  *                                     removed unneeded Constant for Backward compatibility.
+ * Feb 15, 2016  5338      bkowal      Keep track of the remaining persistent polygons just
+ *                                     in case a refresh is required.
  * 
  * 
  * </pre>
@@ -209,11 +211,12 @@ public class PolygonEditManager {
     }
 
     public static void writePolygonEdits(DisplayFieldData fieldData, Date date,
-            List<RubberPolyData> polygonEdits) {
+            List<RubberPolyData> polygonEdits, boolean persistentRemoved) {
         orderPolygonEdits(polygonEdits);
         File hourlyFile = getHourlyEditFile(fieldData, date);
         StringBuilder hourlyBuffer = new StringBuilder();
 
+        List<RubberPolyData> persistentRemaining = new ArrayList<>();
         File persistentFile = getPersistentEditFile(fieldData, date);
         StringBuilder persistentBuffer = new StringBuilder();
 
@@ -225,6 +228,7 @@ public class PolygonEditManager {
                 StringBuilder toUse = null;
                 int idx = 0;
                 if (polyEdit.isPersistent()) {
+                    persistentRemaining.add(polyEdit);
                     persistOrder++;
                     toUse = persistentBuffer;
                     idx = persistOrder;
@@ -290,9 +294,13 @@ public class PolygonEditManager {
             toNotify = new LinkedHashSet<IPolygonEditsChangedListener>(
                     listeners);
         }
+        if (!persistentRemoved) {
+            persistentRemaining = null;
+        }
         for (IPolygonEditsChangedListener listener : toNotify) {
             listener.polygonEditsChanged(fieldData, date,
-                    new ArrayList<RubberPolyData>(polygonEdits));
+                    new ArrayList<RubberPolyData>(polygonEdits),
+                    persistentRemaining);
         }
     }
 
@@ -354,8 +362,8 @@ public class PolygonEditManager {
                         DisplayFieldData subData = null;
                         for (DisplayFieldData fieldData : DisplayFieldData
                                 .values()) {
-                            if (fieldData.getFieldName()
-                                    .equalsIgnoreCase(subCvUse)) {
+                            if (fieldData.getFieldName().equalsIgnoreCase(
+                                    subCvUse)) {
                                 subData = fieldData;
                                 break;
                             }
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/DPAResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/DPAResource.java
index d122737526..da647e4936 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/DPAResource.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/DPAResource.java
@@ -78,8 +78,9 @@ import com.vividsolutions.jts.geom.Coordinate;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jul 28, 2009 2675       mpduff     Initial creation
- * Aug 13, 2009 2675       mpduff     TIM Changes added
+ * Jul 28, 2009 2675       mpduff      Initial creation
+ * Aug 13, 2009 2675       mpduff      TIM Changes added
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -96,13 +97,12 @@ public class DPAResource extends
     private static final String RADAR_IGNORED = "Radar Data Ignored";
 
     private static final String ALL_ZERO = "Radar Data All Zero";
-    
+
     /** Radar types */
     public static enum SingleSiteRadarType {
-        RAW_SP_RADAR("Raw SP Radar"),
-        RAW_DP_RADAR("Raw DP Radar"), 
-        MEAN_FIELD_BIAS_CORRECTED_SP_RADAR("Mean Field Bias Corrected SP Radar"),
-        RADAR_COVERAGE_MAP("Radar Coverage Map");
+        RAW_SP_RADAR("Raw SP Radar"), RAW_DP_RADAR("Raw DP Radar"), MEAN_FIELD_BIAS_CORRECTED_SP_RADAR(
+                "Mean Field Bias Corrected SP Radar"), RADAR_COVERAGE_MAP(
+                "Radar Coverage Map");
 
         private String text;
 
@@ -112,7 +112,7 @@ public class DPAResource extends
     }
 
     private DPAFile dpaFile;
-    
+
     /** The HRAP subgrid */
     private HRAPSubGrid subGrid;
 
@@ -150,15 +150,15 @@ public class DPAResource extends
     private DrawableString mainString;
 
     private DrawableString ignoredStr;
-    
+
     private DrawableString allZeroStr;
-    
+
     private int available = 0;
 
-    //private SingleSiteRadarType radarType = SingleSiteRadarType.RAW_SP_RADAR;
-    
+    // private SingleSiteRadarType radarType = SingleSiteRadarType.RAW_SP_RADAR;
+
     private SingleSiteRadarType radarType;
-    
+
     private boolean ignored = false;
 
     private Date lastDate = null;
@@ -190,7 +190,7 @@ public class DPAResource extends
         getCapability(ColorableCapability.class).setColor(
                 RGBColors.getRGBColor("Yellow"));
     }
-    
+
     /*
      * (non-Javadoc)
      * 
@@ -226,9 +226,9 @@ public class DPAResource extends
 
         return dpaFile.getFile().getAbsolutePath();
     }
-    
-//-------------------------------------------------------------------
-    
+
+    // -------------------------------------------------------------------
+
     /*
      * (non-Javadoc)
      * 
@@ -284,146 +284,131 @@ public class DPAResource extends
         parameters.setDataMin(0);
 
         UnitConverter cvt = parameters.getDataToImageConverter();
-        
-        try
-        {
-        	buf = FloatBuffer.allocate(17161);
-        	Date dtg = MPEDisplayManager.getCurrent().getCurrentEditDate();
 
-        	// available = radar availability flag read from
-        	//   RWRadarResult or DAARadarResult table
-        	// = 0 -- field available (some values > 0.0)
-        	// = 1 -- field not available
-        	// = 2 -- field available (all values = 0.0)
+        try {
+            buf = FloatBuffer.allocate(17161);
+            Date dtg = MPEDisplayManager.getCurrent().getCurrentEditDate();
 
-        	available = 0;
-        	if (radarType == SingleSiteRadarType.RAW_DP_RADAR)
-        	{
-        		available = RadarDataManager.getInstance()
-        				.getAvailableRadarDP(radId, dtg);
-        	}
-        	else
-        	{
-        		available = RadarDataManager.getInstance()
-        				.getAvailableRadarSP(radId, dtg);
+            // available = radar availability flag read from
+            // RWRadarResult or DAARadarResult table
+            // = 0 -- field available (some values > 0.0)
+            // = 1 -- field not available
+            // = 2 -- field available (all values = 0.0)
 
-        		// check for special case of ignored radar
-        		// this behavior is different than A1
-        		ignored = RadarDataManager.getInstance()
-        				.getIgnoreRadarSP(radId, dtg);
-        		if(ignored) available = 0;
-        	}
+            available = 0;
+            if (radarType == SingleSiteRadarType.RAW_DP_RADAR) {
+                available = RadarDataManager.getInstance().getAvailableRadarDP(
+                        radId, dtg);
+            } else {
+                available = RadarDataManager.getInstance().getAvailableRadarSP(
+                        radId, dtg);
 
-        	if (available == 0)
-        	{
-        		
-        		dpaFile.load();
-                if (radarType == SingleSiteRadarType.RAW_SP_RADAR)
-                {
-                	System.out.println("DPAResource: Reading SP Radar Data ");
+                // check for special case of ignored radar
+                // this behavior is different than A1
+                ignored = RadarDataManager.getInstance().getIgnoreRadarSP(
+                        radId, dtg);
+                if (ignored) {
+                    available = 0;
+                }
+            }
+
+            if (available == 0) {
+
+                dpaFile.load();
+                if (radarType == SingleSiteRadarType.RAW_SP_RADAR) {
+                    System.out.println("DPAResource: Reading SP Radar Data ");
                     data = dpaFile.getStage1i();
-                }
-                else if (radarType == SingleSiteRadarType.RAW_DP_RADAR)
-                {
-                	System.out.println("DPAResource: Reading DP Radar Data ");
-                	 data = dpaFile.getStage1i();
-                }
-                else if (radarType == SingleSiteRadarType.MEAN_FIELD_BIAS_CORRECTED_SP_RADAR)
-                {
-                	System.out.println("DPAResource: Reading MFB Corrected SP Radar Data ");
+                } else if (radarType == SingleSiteRadarType.RAW_DP_RADAR) {
+                    System.out.println("DPAResource: Reading DP Radar Data ");
+                    data = dpaFile.getStage1i();
+                } else if (radarType == SingleSiteRadarType.MEAN_FIELD_BIAS_CORRECTED_SP_RADAR) {
+                    System.out
+                            .println("DPAResource: Reading MFB Corrected SP Radar Data ");
                     data = dpaFile.getStage1u();
-                } 
-                else
-                {
+                } else {
                     data = dpaFile.getZeroData();
                 }
-                
-        		for (int i = 0; i < 131; i++) {
-        			for (int j = 0; j < 131; j++) {
-        				float f = -9999;
-        				if (data[i][j] != -9999) {
-        					f = (float) Math.floor(cvt.convert(data[i][j]));
-        				}
 
-        				int dx = i - 66;
-        				int dy = j - 66;
-        				double dist = Math.sqrt(dx * dx + dy * dy);
+                for (int i = 0; i < 131; i++) {
+                    for (int j = 0; j < 131; j++) {
+                        float f = -9999;
+                        if (data[i][j] != -9999) {
+                            f = (float) Math.floor(cvt.convert(data[i][j]));
+                        }
 
-        				// If grid cell outside radius then set missing
-        				if (dist > ngrd) {
-        					f = -9999;
-        				}
-        				buf.put(f);
-        			}
-        		}
-        		buf.rewind();
-        		missingData = false;
-        	}
-        	else if (available == 2)
-        	{
-        		for (int i = 0; i < 131; i++) {
-        			for (int j = 0; j < 131; j++) {
-        				buf.put(0.0f);
-        			}
-        		}
-        		buf.rewind();
-        		missingData = false;
-        	}
-        	else
-        	{
-        		for (int i = 0; i < 131; i++) {
-        			for (int j = 0; j < 131; j++) {
-        				buf.put(-1f);
-        			}
-        		}
-        		buf.rewind();
-        		missingData = true;
-        	}
+                        int dx = i - 66;
+                        int dy = j - 66;
+                        double dist = Math.sqrt(dx * dx + dy * dy);
 
-        	/* Retrieve the Latitude/Longitude of the radars */
-        	Coordinate latLon;
-        	List<MPERadarLoc> radarList = MPEDataManager.getInstance()
-        			.getRadars();
-        	for (MPERadarLoc radarLoc : radarList) {
-        		if (radarLoc.getId().equalsIgnoreCase(radId)) {
-        			latLon = radarLoc.getLatLon();
-        			if (latLon == null) {
-        				continue;
-        			}
-        			if ((latLon.x == 0.) || (latLon.y == 0.)) {
-        				continue;
-        			}
+                        // If grid cell outside radius then set missing
+                        if (dist > ngrd) {
+                            f = -9999;
+                        }
+                        buf.put(f);
+                    }
+                }
+                buf.rewind();
+                missingData = false;
+            } else if (available == 2) {
+                for (int i = 0; i < 131; i++) {
+                    for (int j = 0; j < 131; j++) {
+                        buf.put(0.0f);
+                    }
+                }
+                buf.rewind();
+                missingData = false;
+            } else {
+                for (int i = 0; i < 131; i++) {
+                    for (int j = 0; j < 131; j++) {
+                        buf.put(-1f);
+                    }
+                }
+                buf.rewind();
+                missingData = true;
+            }
 
-        			/* calculate HRAP coordinates from lat,lon */
-        			Coordinate hp = new Coordinate(0, 0);
-        			hp = HRAP.getInstance().latLonToGridCoordinate(latLon,
-        					PixelOrientation.UPPER_LEFT);
-        			int minx = (int) hp.x - 65;
-        			int miny = (int) hp.y - 65;
+            /* Retrieve the Latitude/Longitude of the radars */
+            Coordinate latLon;
+            List<MPERadarLoc> radarList = MPEDataManager.getInstance()
+                    .getRadars();
+            for (MPERadarLoc radarLoc : radarList) {
+                if (radarLoc.getId().equalsIgnoreCase(radId)) {
+                    latLon = radarLoc.getLatLon();
+                    if (latLon == null) {
+                        continue;
+                    }
+                    if ((latLon.x == 0.) || (latLon.y == 0.)) {
+                        continue;
+                    }
 
-        			extent = new Rectangle(minx, miny, 131, 131);
-        			break;
-        		}
-        	}
+                    /* calculate HRAP coordinates from lat,lon */
+                    Coordinate hp = new Coordinate(0, 0);
+                    hp = HRAP.getInstance().latLonToGridCoordinate(latLon,
+                            PixelOrientation.UPPER_LEFT);
+                    int minx = (int) hp.x - 65;
+                    int miny = (int) hp.y - 65;
 
-        	if ((extent.x == 0) && (extent.y == 0)) {
-        		Rectangle coord = HRAPCoordinates.getHRAPCoordinates();
-        		if ((extent.width == coord.width)
-        				&& (extent.height == coord.height)) {
-        			extent = coord;
-        		} else {
-        			dpaFile = null;
-        			return;
-        		}
-        	}
-        	subGrid = new HRAPSubGrid(extent);
+                    extent = new Rectangle(minx, miny, 131, 131);
+                    break;
+                }
+            }
 
-        	gridGeometry = MapUtil.getGridGeometry(subGrid);
+            if ((extent.x == 0) && (extent.y == 0)) {
+                Rectangle coord = HRAPCoordinates.getHRAPCoordinates();
+                if ((extent.width == coord.width)
+                        && (extent.height == coord.height)) {
+                    extent = coord;
+                } else {
+                    dpaFile = null;
+                    return;
+                }
+            }
+            subGrid = new HRAPSubGrid(extent);
 
-        	project(gridGeometry.getCoordinateReferenceSystem());   
-        }
-        catch (Exception e)
-        {
+            gridGeometry = MapUtil.getGridGeometry(subGrid);
+
+            project(gridGeometry.getCoordinateReferenceSystem());
+        } catch (Exception e) {
             dpaFile = null;
             e.printStackTrace();
         }
@@ -433,26 +418,25 @@ public class DPAResource extends
         ignoredStr = new DrawableString(RADAR_IGNORED,
                 RGBColors.getRGBColor("Red"));
         allZeroStr = new DrawableString(ALL_ZERO,
-                 RGBColors.getRGBColor("Green"));
+                RGBColors.getRGBColor("Green"));
 
         if (missingData
                 && (radarType == SingleSiteRadarType.MEAN_FIELD_BIAS_CORRECTED_SP_RADAR
-                || radarType == SingleSiteRadarType.RAW_SP_RADAR
-                || radarType == SingleSiteRadarType.RAW_DP_RADAR))
-        {
+                        || radarType == SingleSiteRadarType.RAW_SP_RADAR || radarType == SingleSiteRadarType.RAW_DP_RADAR)) {
             missingString = new DrawableString(MISSING_DATA, getCapability(
                     ColorableCapability.class).getColor());
         }
 
-        ignoredStr.font = allZeroStr.font = mainString.font = target.initializeFont("Dialog", 12, null);
+        ignoredStr.font = allZeroStr.font = mainString.font = target
+                .initializeFont("Dialog", 10, null);
 
         if (missingString != null) {
             missingString.font = mainString.font;
         }
-        
+
     }
 
-//---------------------------------------------------------------
+    // ---------------------------------------------------------------
     /*
      * (non-Javadoc)
      * 
@@ -503,19 +487,17 @@ public class DPAResource extends
         Date date = MPEDisplayManager.getCurrent().getCurrentEditDate();
         if (date.equals(lastDate) == false) {
             // Check for ignored Radar
-        	if (radarType.equals(SingleSiteRadarType.RAW_SP_RADAR) || 
-        			radarType.equals(SingleSiteRadarType.MEAN_FIELD_BIAS_CORRECTED_SP_RADAR))
-        	{
-        		ignored = RadarDataManager.getInstance()
-        				.getIgnoreRadarSP(radId, date);
-        		lastDate = date;
-        	}
-        	else if (radarType.equals(SingleSiteRadarType.RAW_DP_RADAR))
-        	{
-        		ignored = RadarDataManager.getInstance()
-        				.getIgnoreRadarDP(radId, date);
-        		lastDate = date;
-        	}
+            if (radarType.equals(SingleSiteRadarType.RAW_SP_RADAR)
+                    || radarType
+                            .equals(SingleSiteRadarType.MEAN_FIELD_BIAS_CORRECTED_SP_RADAR)) {
+                ignored = RadarDataManager.getInstance().getIgnoreRadarSP(
+                        radId, date);
+                lastDate = date;
+            } else if (radarType.equals(SingleSiteRadarType.RAW_DP_RADAR)) {
+                ignored = RadarDataManager.getInstance().getIgnoreRadarDP(
+                        radId, date);
+                lastDate = date;
+            }
         }
 
         if (missingString != null) {
@@ -530,18 +512,17 @@ public class DPAResource extends
                     screenExtent.getMaxY() - 25, 0.0);
             target.drawStrings(ignoredStr);
         }
-        
-        else if (ignored && (radarType == SingleSiteRadarType.RAW_DP_RADAR))
-        {
-        	 ignoredStr.setCoordinates(screenExtent.getMinX() + 50,
-                     screenExtent.getMaxY() - 25, 0.0);
-             target.drawStrings(ignoredStr);
+
+        else if (ignored && (radarType == SingleSiteRadarType.RAW_DP_RADAR)) {
+            ignoredStr.setCoordinates(screenExtent.getMinX() + 50,
+                    screenExtent.getMaxY() - 25, 0.0);
+            target.drawStrings(ignoredStr);
         }
-        if (available == 2 && (radarType == SingleSiteRadarType.RAW_DP_RADAR || radarType == SingleSiteRadarType.RAW_SP_RADAR))
-        {
-       	     allZeroStr.setCoordinates(screenExtent.getMinX() + 600,
-                  screenExtent.getMaxY() - 25, 0.0);
-             target.drawStrings(allZeroStr);
+        if (available == 2
+                && (radarType == SingleSiteRadarType.RAW_DP_RADAR || radarType == SingleSiteRadarType.RAW_SP_RADAR)) {
+            allZeroStr.setCoordinates(screenExtent.getMinX() + 600,
+                    screenExtent.getMaxY() - 25, 0.0);
+            target.drawStrings(allZeroStr);
         }
     }
 
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
index 56f7128954..83cc7e7619 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
@@ -30,11 +30,13 @@ import java.util.Calendar;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
 import javax.measure.converter.UnitConverter;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.eclipse.swt.graphics.RGB;
 
 import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
@@ -86,6 +88,8 @@ import com.raytheon.viz.mpe.ui.rsc.MPEFieldResourceData.MPEFieldFrame;
  * Nov 05, 2015 18095      lbousaidi    Fixed hour substitued for satellite field precip when drawing polygon.
  * Dec 04, 2015 5165/14513 mduff        Set this resource on the display manager if not set in the display manager.
  * Dec 08, 2015 5180       bkowal       Made the hour substitution special case precise.
+ * Feb 15, 2016 5338       bkowal       Update the persistent set of polygons for an existing frame after one or
+ *                                      all are deleted.
  * 
  * </pre>
  * 
@@ -455,8 +459,6 @@ public class MPEFieldResource extends
                         timeToLoad.getTime());
                 try {
                     long fileLength = file.getFile().length();
-                    // System.out.printf("FileName = %s, length = %d\n",
-                    // file.getFile().getPath(), fileLength);
                     if (fileLength > 0) {
                         file.load();
                     } else // can't read the file since it is empty
@@ -557,13 +559,6 @@ public class MPEFieldResource extends
 
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.mpe.ui.rsc.AbstractGriddedMPEResource#createFrameContour
-     * (com.raytheon.viz.mpe.ui.rsc.AbstractMPEGriddedResourceData.Frame)
-     */
     @Override
     protected GriddedContourDisplay createFrameContour(MPEFieldFrame frame)
             throws VizException {
@@ -582,13 +577,6 @@ public class MPEFieldResource extends
         return display;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.mpe.ui.rsc.AbstractGriddedMPEResource#createFrameImage
-     * (com.raytheon.viz.mpe.ui.rsc.AbstractMPEGriddedResourceData.Frame)
-     */
     @Override
     protected GriddedImageDisplay2 createFrameImage(MPEFieldFrame frame)
             throws VizException {
@@ -680,23 +668,59 @@ public class MPEFieldResource extends
         return preferences;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.viz.mpe.ui.dialogs.polygon.IPolygonEditsChangedListener#
-     * polygonEditsChanged(com.raytheon.viz.mpe.ui.DisplayFieldData,
-     * java.util.Date, java.util.List)
-     */
     @Override
     public void polygonEditsChanged(DisplayFieldData field, Date date,
-            List<RubberPolyData> polygonEdits) {
+            List<RubberPolyData> polygonEdits,
+            List<RubberPolyData> persistentRemaining) {
         if (field == resourceData.getFieldData()) {
             MPEFieldFrame frame = frames.get(new DataTime(date));
             if (frame != null) {
                 frame.setPolygonEdits(polygonEdits);
                 issueRefresh();
             }
+
+            if (persistentRemaining == null) {
+                /*
+                 * A persistent polygon has been removed. So, the lists of
+                 * polygons for any existing frames will need to be rebuilt. The
+                 * polygons are stored in a text file without any unique
+                 * identifier and polygons with duplicate fields are allowed to
+                 * exist. The polygons must currently remain stored in this
+                 * format to maintain compatibility with legacy C++ mpe code.
+                 * So, the only option (with the current implementation) is to
+                 * remove any persistent polygons from the existing list and
+                 * re-add the remaining set of persistent polygons. The lists of
+                 * polygons cannot be replaced across all frames because the
+                 * list of polygon edits passed to this method also contains
+                 * frame/time specific polygons.
+                 */
+                return;
+            }
+            for (MPEFieldFrame otherFrame : frames.values()) {
+                if (otherFrame.getDate().equals(date)) {
+                    // already updated this frame.
+                    continue;
+                }
+                List<RubberPolyData> currentPolygonEdits = otherFrame
+                        .getPolygonEdits();
+                if (CollectionUtils.isEmpty(currentPolygonEdits)) {
+                    continue;
+                }
+                boolean persistentRemoved = false;
+                Iterator<RubberPolyData> persistentIter = currentPolygonEdits
+                        .iterator();
+                while (persistentIter.hasNext()) {
+                    if (persistentIter.next().isPersistent()) {
+                        persistentIter.remove();
+                        persistentRemoved = true;
+                    }
+                }
+                if (!persistentRemoved) {
+                    continue;
+                }
+                currentPolygonEdits.addAll(persistentRemaining);
+                otherFrame.setPolygonEdits(currentPolygonEdits);
+            }
         }
     }
 }
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedFreezeResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedFreezeResource.java
index 850e2adff9..109b671f1a 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedFreezeResource.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedFreezeResource.java
@@ -32,7 +32,7 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.unit.NonSI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.swt.graphics.RGB;
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -97,9 +97,9 @@ public class PlotGriddedFreezeResource extends
         IMpeResource {
 
     MPEDisplayManager displayMgr = null;
-    
+
     private DailyQcUtils dqc = DailyQcUtils.getInstance();
-    
+
     private DrawDQCStations ddq = DrawDQCStations.getInstance();
 
     private GriddedImageDisplay gridDisplay;
@@ -130,9 +130,9 @@ public class PlotGriddedFreezeResource extends
 
     private List<Colorvalue> colorSet;
 
-//    Hrap_Grid hrap_grid = DailyQcUtils.getHrap_grid();
+    // Hrap_Grid hrap_grid = DailyQcUtils.getHrap_grid();
 
-//    Pcp pcp = DailyQcUtils.pcp;
+    // Pcp pcp = DailyQcUtils.pcp;
 
     public PlotGriddedFreezeResource(MPEDisplayManager displayMgr,
             LoadProperties loadProperties, List<Colorvalue> colorSet) {
@@ -213,7 +213,8 @@ public class PlotGriddedFreezeResource extends
 
         cm.read_file(file, num, dqc.pcp);
 
-        buf = FloatBuffer.allocate(dqc.getHrap_grid().maxi * dqc.getHrap_grid().maxj);
+        buf = FloatBuffer.allocate(dqc.getHrap_grid().maxi
+                * dqc.getHrap_grid().maxj);
 
         /* Get value in the HRAP grid bins. */
         for (j = dqc.getHrap_grid().maxj - 1; j >= 0; j--) {
@@ -264,7 +265,8 @@ public class PlotGriddedFreezeResource extends
         buf.rewind();
 
         Rectangle extent = new Rectangle(dqc.getHrap_grid().hrap_minx,
-                dqc.getHrap_grid().hrap_miny, dqc.getHrap_grid().maxi, dqc.getHrap_grid().maxj);
+                dqc.getHrap_grid().hrap_miny, dqc.getHrap_grid().maxi,
+                dqc.getHrap_grid().maxj);
 
         if (extent.x == 0 && extent.y == 0) {
             Rectangle coord = null;
@@ -433,8 +435,7 @@ public class PlotGriddedFreezeResource extends
     @Override
     protected void paintInternal(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
-        if (buf == null || dqc.grids_flag != 1
-                || displayMgr.isZflag() != true) {
+        if (buf == null || dqc.grids_flag != 1 || displayMgr.isZflag() != true) {
             return;
         }
 
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedPrecipResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedPrecipResource.java
index 22bc92509e..76a5bc6f24 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedPrecipResource.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedPrecipResource.java
@@ -32,7 +32,7 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.unit.NonSI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.swt.graphics.RGB;
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -470,13 +470,14 @@ public class PlotGriddedPrecipResource extends
     @Override
     protected void paintInternal(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
-        if (buf == null || (DailyQcUtils.grids_flag != 1 && DailyQcUtils.contour_flag != 1)
+        if (buf == null
+                || (DailyQcUtils.grids_flag != 1 && DailyQcUtils.contour_flag != 1)
                 || displayMgr.isQpf() != true) {
             return;
         }
 
         Set<DisplayMode> mode = displayMgr.getDisplayMode();
-        System.out.println("Mode is: "+mode.toString());
+        System.out.println("Mode is: " + mode.toString());
 
         if (mode.contains(DisplayMode.Image)) {
             if (gridDisplay == null) {
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedTempResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedTempResource.java
index 62a37e7c7e..09fcaf5e49 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedTempResource.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotGriddedTempResource.java
@@ -32,7 +32,7 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.unit.NonSI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.swt.graphics.RGB;
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -100,9 +100,9 @@ public class PlotGriddedTempResource extends
         IMpeResource {
 
     private DailyQcUtils dqc = DailyQcUtils.getInstance();
-    
+
     private DrawDQCStations ddq = DrawDQCStations.getInstance();
-    
+
     MPEDisplayManager displayMgr = null;
 
     private GriddedImageDisplay2 gridDisplay;
@@ -133,9 +133,9 @@ public class PlotGriddedTempResource extends
 
     private final List<Colorvalue> colorSet;
 
-//    Hrap_Grid hrap_grid = DailyQcUtils.getHrap_grid();
+    // Hrap_Grid hrap_grid = DailyQcUtils.getHrap_grid();
 
-//    Pcp pcp = DailyQcUtils.pcp;
+    // Pcp pcp = DailyQcUtils.pcp;
 
     public PlotGriddedTempResource(MPEDisplayManager displayMgr,
             LoadProperties loadProperties, List<Colorvalue> colorSet) {
@@ -223,7 +223,8 @@ public class PlotGriddedTempResource extends
 
         cm.read_file(file, num, dqc.pcp);
 
-        buf = FloatBuffer.allocate(dqc.getHrap_grid().maxi * dqc.getHrap_grid().maxj);
+        buf = FloatBuffer.allocate(dqc.getHrap_grid().maxi
+                * dqc.getHrap_grid().maxj);
 
         /* Get value in the HRAP grid bins. */
         for (j = dqc.getHrap_grid().maxj - 1; j >= 0; j--) {
@@ -276,7 +277,8 @@ public class PlotGriddedTempResource extends
         buf.rewind();
 
         Rectangle extent = new Rectangle(dqc.getHrap_grid().hrap_minx,
-                dqc.getHrap_grid().hrap_miny, dqc.getHrap_grid().maxi, dqc.getHrap_grid().maxj);
+                dqc.getHrap_grid().hrap_miny, dqc.getHrap_grid().maxi,
+                dqc.getHrap_grid().maxj);
 
         if (extent.x == 0 && extent.y == 0) {
             Rectangle coord = null;
@@ -446,8 +448,7 @@ public class PlotGriddedTempResource extends
     protected void paintInternal(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
 
-        if (buf == null || dqc.grids_flag != 1
-                || displayMgr.isMaxmin() != true) {
+        if (buf == null || dqc.grids_flag != 1 || displayMgr.isMaxmin() != true) {
             return;
         }
 
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/RadarCoverageResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/RadarCoverageResource.java
index 6b8ac55757..612053557f 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/RadarCoverageResource.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/RadarCoverageResource.java
@@ -77,7 +77,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Aug 10, 2009 2675       mpduff     Initial creation
+ * Aug 10, 2009 2675       mpduff      Initial creation
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -282,8 +283,8 @@ public class RadarCoverageResource extends
             for (int i = 0; i < 131; i++) {
                 for (int j = 0; j < 131; j++) {
                     float f = -9999;
-                    if (data[130-i][j] != -9999) {
-                        f = (float) Math.floor(cvt.convert(data[130-i][j]));
+                    if (data[130 - i][j] != -9999) {
+                        f = (float) Math.floor(cvt.convert(data[130 - i][j]));
                     }
 
                     int dx = i - 66;
@@ -390,7 +391,7 @@ public class RadarCoverageResource extends
 
         // Draw label
         if (iFont == null) {
-            iFont = target.initializeFont("Dialog", 12, null);
+            iFont = target.initializeFont("Dialog", 10, null);
         }
         String text = RADAR_COVERAGE;
 
@@ -403,8 +404,7 @@ public class RadarCoverageResource extends
         string.verticallAlignment = VerticalAlignment.TOP;
         target.drawStrings(string);
 
-        if (missingData)
-        {
+        if (missingData) {
             string.setText(MISSING_DATA, textColor);
             string.setCoordinates(screenExtent.getMinX() + 350,
                     screenExtent.getMinY() + 550);
diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/RadarGageOverlayRsc.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/RadarGageOverlayRsc.java
index 80a609f679..0c92b79d2a 100644
--- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/RadarGageOverlayRsc.java
+++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/RadarGageOverlayRsc.java
@@ -49,7 +49,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Nov 8, 2009  3232       mpduff      Initial creation.
+ * Nov 08, 2009 3232       mpduff      Initial creation.
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -133,7 +134,7 @@ public class RadarGageOverlayRsc extends
         if (getProperties().isVisible()) {
             if (shape == null) {
                 IFont font = target.initializeFont(target.getDefaultFont()
-                        .getFontName(), 9, null);
+                        .getFontName(), 8, null);
 
                 DrawableString string = new DrawableString("+", null);
                 string.font = font;
diff --git a/cave/com.raytheon.viz.mpe/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.mpe/META-INF/MANIFEST.MF
index d602f27a96..3d2b73a78a 100644
--- a/cave/com.raytheon.viz.mpe/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.mpe/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mpe Plug-in
 Bundle-SymbolicName: com.raytheon.viz.mpe
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Activator: com.raytheon.viz.mpe.Activator
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.geotools,
  com.raytheon.viz.core,
- org.apache.commons.lang,
+ org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.viz.hydrocommon,
  javax.persistence;bundle-version="1.0.0",
  javax.measure;bundle-version="1.0.0",
diff --git a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/MPEDataManager.java b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/MPEDataManager.java
index c2c09fbfcb..aa4fca4eec 100644
--- a/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/MPEDataManager.java
+++ b/cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/MPEDataManager.java
@@ -40,7 +40,7 @@ import java.util.TimeZone;
 
 import javax.persistence.Table;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.opengis.metadata.spatial.PixelOrientation;
 
 import com.raytheon.uf.common.dataplugin.shef.tables.Hourlypc;
@@ -154,9 +154,9 @@ public class MPEDataManager {
         private short[] unbiasedRadarData;
 
         private double rwBiasValUsed;
-//        private double daaBiasValUsed;
-       
-        
+
+        // private double daaBiasValUsed;
+
         private double memSpanUsed;
 
         private String editBias;
@@ -209,21 +209,18 @@ public class MPEDataManager {
         }
 
         /*
-        public double getDAABiasValUsed() {
-            return daaBiasValUsed;
-        }
-        */
-        
+         * public double getDAABiasValUsed() { return daaBiasValUsed; }
+         */
+
         public void setRwBiasValUsed(double rwBiasValUsed) {
             this.rwBiasValUsed = rwBiasValUsed;
         }
 
         /*
-        public void setDAABiasValUsed(double daaBiasValUsed) {
-            this.daaBiasValUsed = daaBiasValUsed;
-        }
-        */
-        
+         * public void setDAABiasValUsed(double daaBiasValUsed) {
+         * this.daaBiasValUsed = daaBiasValUsed; }
+         */
+
         /**
          * @return the memSpanUsed
          */
@@ -766,8 +763,8 @@ public class MPEDataManager {
     }
 
     public Map<Date, MPEDateInfo> getDateMap(boolean update) {
-            
-    	getDates(update);
+
+        getDates(update);
         return dateMap;
     }
 
@@ -781,7 +778,8 @@ public class MPEDataManager {
             for (Object[] item : results) {
                 // note db stores west longitude as positive so must negate
                 MPERadarLoc radarLoc = new MPERadarLoc((String) item[0],
-                        ((Number) item[1]).doubleValue(), -((Number) item[2]).doubleValue());
+                        ((Number) item[1]).doubleValue(),
+                        -((Number) item[2]).doubleValue());
                 radarList.add(radarLoc);
             }
         } catch (VizException e) {
@@ -833,7 +831,8 @@ public class MPEDataManager {
                     }
                     radarData.setRadAvail(radAvail);
 
-                    radarData.setRwBiasValUsed(((Number) item[3]).doubleValue());
+                    radarData
+                            .setRwBiasValUsed(((Number) item[3]).doubleValue());
                     radarData.setMemSpanUsed(((Number) item[4]).doubleValue());
                     radarData.setEditBias((String) item[5]);
                     radarData.setIgnoreRadar(!"n".equals(item[6]));
@@ -868,26 +867,28 @@ public class MPEDataManager {
         return radarResultList;
     }
 
-    public Map<String, MPERadarData> readSPRadarData(Date date)
-    {
-    	//reads DPA radar data
-    	return readRadarData(date, "rwradarresult");
-    	
+    public Map<String, MPERadarData> readSPRadarData(Date date) {
+        // reads DPA radar data
+        return readRadarData(date, "rwradarresult");
+
     }
-    
-    public Map<String, MPERadarData> readDPRadarData(Date date)
-    {
-    	//reads DAA radar data
-      	return readRadarData(date, "daaradarresult");
+
+    public Map<String, MPERadarData> readDPRadarData(Date date) {
+        // reads DAA radar data
+        return readRadarData(date, "daaradarresult");
     }
-    
-    
+
     public Map<String, MPERadarData> readRadarData(Date date, String tableName) {
         getRadars();
         StringBuffer sqlQuery = new StringBuffer();
-        sqlQuery.append("select radid,num_gages, rad_avail, rw_bias_val_used, mem_span_used, edit_bias, ignore_radar from " + 
-        				 tableName + " where obstime='" + sdf.format(date) + "' and radid in(");
-        System.out.println("Datestring actually passed in query to radar table: " + sdf.format(date));
+        sqlQuery.append("select radid,num_gages, rad_avail, rw_bias_val_used, mem_span_used, edit_bias, ignore_radar from "
+                + tableName
+                + " where obstime='"
+                + sdf.format(date)
+                + "' and radid in(");
+        System.out
+                .println("Datestring actually passed in query to radar table: "
+                        + sdf.format(date));
         for (int i = 0; i < radarList.size(); i++) {
             sqlQuery.append("'");
             sqlQuery.append(radarList.get(i).getId());
@@ -926,7 +927,8 @@ public class MPEDataManager {
                     }
                     radarData.setRadAvail(radAvail);
 
-                    radarData.setRwBiasValUsed(((Number) item[3]).doubleValue());
+                    radarData
+                            .setRwBiasValUsed(((Number) item[3]).doubleValue());
                     radarData.setMemSpanUsed(((Number) item[4]).doubleValue());
                     radarData.setEditBias((String) item[5]);
                     radarData.setIgnoreRadar(!"n".equals(item[6]));
diff --git a/cave/com.raytheon.viz.pointdata/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.pointdata/META-INF/MANIFEST.MF
index fbd19db39b..48a909f512 100644
--- a/cave/com.raytheon.viz.pointdata/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.pointdata/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Pointdata Plug-in
 Bundle-SymbolicName: com.raytheon.viz.pointdata;singleton:=true
-Bundle-Version: 1.15.0.qualifier
+Bundle-Version: 1.15.1.qualifier
 Bundle-Vendor: Raytheon
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
@@ -11,7 +11,7 @@ Require-Bundle: org.apache.batik;bundle-version="1.6",
  org.eclipse.core.runtime;bundle-version="3.8",
  com.raytheon.uf.viz.core;bundle-version="1.14.3",
  com.raytheon.viz.ui;bundle-version="1.14.0",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  javax.measure,
  com.raytheon.uf.viz.localization,
  org.jep;bundle-version="2.3.0",
diff --git a/cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer.xml
deleted file mode 100644
index d31a24daf6..0000000000
--- a/cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-	<displayList>
-		<displays xsi:type="d2DMapRenderableDisplay"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<descriptor xsi:type="mapDescriptor">
-				<resource>
-                    <loadProperties>
-						<capabilities>
-							<capability xsi:type="colorableCapability" colorAsString="#bfbfbf"/>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${legend} Scatterometer Winds missing"
-						plotModelFile="${svg}" pixelSizeHint="25"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true"
-						lowerLimit="-10000.0" upperLimit="-9998.0" plotMissingData="true">
-						<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="windSpd">
-								<!-- -1.1 to 0.0 converted from knots to m/s -->
-								<constraint constraintValue="-2.1382--0.0" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-						<timeQueryMetadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</timeQueryMetadataMap>
-						<plotInfoRetriever xsi:type="scatterometerPlotInfoRetriever" />
-					</resourceData>
-				</resource>
-			    <resource>
-                    <loadProperties>
-						<capabilities>
-							<capability xsi:type="colorableCapability" colorAsString="#00ff00"/>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${legend} Scatterometer Wind s &lt; 34 kts"
-						plotModelFile="${svg}" pixelSizeHint="25"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="windSpd">
-								<!-- 0.0 to 34.0 converted from knots to m/s -->
-								<constraint constraintValue="0.0--17.49" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-						<timeQueryMetadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</timeQueryMetadataMap>
-						<plotInfoRetriever xsi:type="scatterometerPlotInfoRetriever" />
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-							<capability xsi:type="colorableCapability" colorAsString="#ffff00"/>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${legend}  Scatterometer Wind 34 &lt;= s &lt; 48 kts"
-						plotModelFile="${svg}" pixelSizeHint="25"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="windSpd">
-							    <!-- 34.0 to 48.0 converted from knots to m/s -->
-								<constraint constraintValue="17.49--24.69" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-						<timeQueryMetadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</timeQueryMetadataMap>
-						<plotInfoRetriever xsi:type="scatterometerPlotInfoRetriever" />
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-							<capability xsi:type="colorableCapability" colorAsString="#ff0000"/>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${legend}  Scatterometer Wind s >= 48 kts"
-						plotModelFile="${svg}" pixelSizeHint="25"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true"
-						plotMissingData="true">
-						<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="windSpd">
-							    <!-- 48.0.0 to 999.0 converted from knots to m/s -->
-								<constraint constraintValue="24.69--513.93" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-						<timeQueryMetadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</timeQueryMetadataMap>
-						<plotInfoRetriever xsi:type="scatterometerPlotInfoRetriever" />
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer_quikscat.xml b/cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer_quikscat.xml
deleted file mode 100644
index e499bcac9b..0000000000
--- a/cave/com.raytheon.viz.pointdata/localization/bundles/Scatterometer_quikscat.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-	<displayList>
-		<displays xsi:type="d2DMapRenderableDisplay"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<descriptor xsi:type="mapDescriptor">
-				<resource>
-                    <loadProperties>
-						<capabilities>
-							<capability xsi:type="colorableCapability" colorAsString="#bfbfbf"/>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${legend} Scatterometer Winds missing"
-						plotModelFile="${svg}" pixelSizeHint="45"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true"
-						lowerLimit="-10000.0" upperLimit="-9998.0" plotMissingData="true">
-						<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-						<timeQueryMetadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</timeQueryMetadataMap>
-						<plotInfoRetriever xsi:type="scatterometerPlotInfoRetriever" />
-					</resourceData>
-				</resource>
-			    <resource>
-                    <loadProperties>
-						<capabilities>
-							<capability xsi:type="colorableCapability" colorAsString="#00ff00"/>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${legend} Scatterometer Wind s &lt; 34 kts"
-						plotModelFile="${svg}" pixelSizeHint="45"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-						<timeQueryMetadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</timeQueryMetadataMap>
-						<plotInfoRetriever xsi:type="scatterometerPlotInfoRetriever" />
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-							<capability xsi:type="colorableCapability" colorAsString="#ffff00"/>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${legend}  Scatterometer Wind 34 &lt;= s &lt; 48 kts"
-						plotModelFile="${svg}" pixelSizeHint="45"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-						<timeQueryMetadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</timeQueryMetadataMap>
-						<plotInfoRetriever xsi:type="scatterometerPlotInfoRetriever" />
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-							<capability xsi:type="colorableCapability" colorAsString="#ff0000"/>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${legend}  Scatterometer Wind s >= 48 kts"
-						plotModelFile="${svg}" pixelSizeHint="45"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true"
-						plotMissingData="true">
-						<binOffset posOffset="${posOffset}" negOffset="${negOffset}" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-						<timeQueryMetadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${plugin}" constraintType="EQUALS" />
-							</mapping>
-						</timeQueryMetadataMap>
-						<plotInfoRetriever xsi:type="scatterometerPlotInfoRetriever" />
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
-</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml
index 29451efc45..022080e94a 100644
--- a/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml
+++ b/cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml
@@ -57,16 +57,6 @@
 	        <substitute key="reportType" value="1007"/>
 	    </contribute>	
 		<contribute xsi:type="subMenu" menuText="Scatterometer Winds">
-			<!-- 
-			<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml" 
-	               menuText="QuikSCAT Winds 12.5 km" id="QuikSCAT">
-		        <substitute key="legend" value="QUIKSCAT"/>
-		        <substitute key="svg" value="quikScatPlotDesign.svg"/>
-		        <substitute key="plugin" value="bufrquikscat"/>
-		        <substitute key="posOffset" value="0"/>
-		        <substitute key="negOffset" value="5400"/>
-		    </contribute>
-		    -->
 		    <contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml" 
 	               menuText="ASCAT Winds 25 km" id="ASCATWinds">
 		        <substitute key="legend" value="ASCAT"/>
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/quikScatPlotDesign.svg b/cave/com.raytheon.viz.pointdata/localization/plotModels/quikScatPlotDesign.svg
deleted file mode 100644
index 2787b591e9..0000000000
--- a/cave/com.raytheon.viz.pointdata/localization/plotModels/quikScatPlotDesign.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<svg width="80" height="80" 
-viewBox="0 0 80 80" 
-overflow="visible" 
-xmlns="http://www.w3.org/2000/svg" 
-xmlns:xlink="http://www.w3.org/1999/xlink" style="stroke: rgb(255,255,255);">
-   <defs>
-<style type="text/css">
-<![CDATA[
-        @font-face { font-family: "WindSymbolFont";
-                src: url(WindSymbols.svg#WindSymbols); }
-        @font-face { font-family: "StandardFont";
-                src: url(Standard.svg#Standard); }
-        @font-face { font-family: "WxSymbolFont";
-                src: url(WxSymbols.svg#WxSymbols); }
-        @font-face { font-family: "SpecialSymbolFont";
-                src: url(SpecialSymbols.svg#SpecialSymbols); }
-        text.barb
-            {
-                fill: none;
-                font-size: 1em;
-                font-size: 1em;
-                font-family: WindSymbolFont;
-            }
-        text.text
-            {
-                fill: none;
-                font-size: 1em;
-                stroke-width: 1px;
-                font-family: StandardFont;
-                font-size: 1em;
-            }
-
-]]>
-</style>
-
-<symbol overflow="visible" id="plotData" class="info">
-  	<text id="sample1" plotMode="sample" class="text" plotParam="validTime" plotFormat="time" plotSymbol="Z">0</text>
-	<text id="sample2" plotMode="sample" class="text" plotParam="satelliteID" plotLookupTable="sat_type_lookup.txt">0</text>
-	<text id="sample3" plotMode="sample" class="text" plotParam="windDir" plotSymbol=" @" plotFormat="%3.0f">0</text>
-  	<text id="sample4" plotMode="sample" class="text" plotParam="windSpd" plotUnit="kts" plotSymbol="  RAIN FLAG" plotFormat="%3.0f">0</text>
-  	<text id="sample4" plotMode="sample" class="text" plotParam="probRain" plotSymbol="%">0</text>
-  	
-	<g id="windVaneText" plotMode="barb" plotParam="windSpd,windDir" plotUnit="kts" x="0" y="0" transform="rotate(0,0,0)">
-    	<text id="windArrowText" class="barb" x="0" y="0">75</text>
-	</g>
-
-</symbol>
-</defs>
-<use id="wind" x="40" y="40" width="80" height="80" visibility="visible" xlink:href="#plotData"/>
-</svg>
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/LocalizationParsedURLHandler.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/LocalizationParsedURLHandler.java
deleted file mode 100644
index b52b961547..0000000000
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/LocalizationParsedURLHandler.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.viz.pointdata;
-
-import java.io.File;
-
-import org.apache.batik.util.ParsedURL;
-import org.apache.batik.util.ParsedURLData;
-import org.apache.batik.util.ParsedURLDefaultProtocolHandler;
-
-import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.viz.pointdata.rsc.PlotResourceData;
-
-/**
- * parse file URLs to go through localization
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Oct 26, 2010            mschenke     Initial creation
- * 
- * </pre>
- * 
- * @author mschenke
- * @version 1.0
- */
-
-public class LocalizationParsedURLHandler extends
-        ParsedURLDefaultProtocolHandler {
-
-    private IPathManager pathManager;
-
-    public LocalizationParsedURLHandler() {
-        super("file");
-        pathManager = PathManagerFactory.getPathManager();
-    }
-
-    @Override
-    public ParsedURLData parseURL(String urlStr) {
-        ParsedURLData data = null;
-        if (urlStr != null && urlStr.startsWith("file:") == false
-                && urlStr.startsWith("#") == false
-                && urlStr.startsWith(IPathManager.SEPARATOR) == false) { // Win32
-            String name = urlStr;
-            String endName = "";
-            int idx = name.indexOf("#");
-            if (idx > -1) {
-                endName = name.substring(idx);
-                name = name.substring(0, idx);
-            }
-            File file = pathManager.getStaticFile(PlotResourceData.PLOT_DIR
-                    + name);
-            if (file != null) {
-                // Win32: Change to convert both Linux and Win32 paths
-                // Win32 path -> URL needs separator changed and "/" pre-pended
-                String absPath = file.getAbsolutePath();
-                absPath = absPath.replace(File.separator,
-                        IPathManager.SEPARATOR);
-                if (absPath.startsWith(IPathManager.SEPARATOR) == false)
-                    absPath = IPathManager.SEPARATOR + absPath;
-                data = super.parseURL("file:" + absPath + endName);
-            }
-        }
-
-        if (data == null) {
-            data = super.parseURL(urlStr);
-        }
-        return data;
-    }
-
-    @Override
-    public ParsedURLData parseURL(ParsedURL baseURL, String urlStr) {
-        ParsedURLData data = null;
-        if (urlStr != null && urlStr.startsWith("file:") == false
-                && urlStr.startsWith("#") == false
-                && urlStr.startsWith(IPathManager.SEPARATOR) == false) { // Win32
-            String name = urlStr;
-            String endName = "";
-            int idx = name.indexOf("#");
-            if (idx > -1) {
-                endName = name.substring(idx);
-                name = name.substring(0, idx);
-            }
-            File file = pathManager.getStaticFile(PlotResourceData.PLOT_DIR
-                    + name);
-            if (file != null) {
-                // Win32: Change to convert both Linux and Win32 paths
-                // Win32 path -> URL needs separator changed and "/" pre-pended
-                String absPath = file.getAbsolutePath();
-                absPath = absPath.replace(File.separator,
-                        IPathManager.SEPARATOR);
-                if (absPath.startsWith(IPathManager.SEPARATOR) == false)
-                    absPath = IPathManager.SEPARATOR + absPath;
-                data = super.parseURL("file:" + absPath + endName);
-            }
-        }
-        if (data == null) {
-            data = super.parseURL(baseURL, urlStr);
-        }
-        return data;
-    }
-}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory.java
index 066bcb15e7..acf332b154 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelFactory.java
@@ -20,9 +20,7 @@
 
 package com.raytheon.viz.pointdata;
 
-import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
-import java.awt.image.IndexColorModel;
 import java.io.File;
 import java.text.ParseException;
 import java.text.ParsePosition;
@@ -35,21 +33,13 @@ import java.util.Formatter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TimeZone;
 
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.Unit;
 import javax.measure.unit.UnitFormat;
 
-import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.util.XMLResourceDescriptor;
 import org.eclipse.swt.graphics.RGB;
 import org.geotools.referencing.GeodeticCalculator;
-import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -61,9 +51,11 @@ import com.raytheon.uf.common.python.concurrent.PythonJobCoordinator;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
+import com.raytheon.uf.common.time.util.TimeUtil;
 import com.raytheon.uf.viz.core.IGraphicsTarget.LineStyle;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.IMapDescriptor;
+import com.raytheon.uf.viz.core.point.svg.SVGImageFactory;
 import com.raytheon.viz.pointdata.lookup.IAbstractLookupTable;
 import com.raytheon.viz.pointdata.lookup.LookupUtils;
 import com.raytheon.viz.pointdata.python.CheckPlotValidityExecutor;
@@ -71,7 +63,6 @@ import com.raytheon.viz.pointdata.python.PlotPythonScript;
 import com.raytheon.viz.pointdata.python.PlotPythonScriptFactory;
 import com.raytheon.viz.pointdata.python.SampleTextExecutor;
 import com.raytheon.viz.pointdata.rsc.PlotResource;
-import com.raytheon.viz.pointdata.rsc.PlotResourceData;
 
 /**
  * A factory for generating plot images and sample messages by parsing the
@@ -94,13 +85,16 @@ import com.raytheon.viz.pointdata.rsc.PlotResourceData;
  * Jun 06, 2014  2061     bsteffen    Rename and add support for data formats in sampling.
  * Aug 07, 2014  3478     bclement    removed PointDataDescription.Type.Double
  * Dec 16, 2014 16193     kshrestha   Updated range limits
+ * Oct 27, 2015  4798     bsteffen    Extend SVGImageFactory
+ * Dec 14, 2015  4816     dgilling    Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
  * @author BRock97
  * @version 1.0
  */
-public class PlotModelFactory {
+public class PlotModelFactory extends SVGImageFactory {
+
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(PlotModelFactory.class);
 
@@ -128,9 +122,7 @@ public class PlotModelFactory {
 
     private final SimpleDateFormat SAMPLE_DATE = new SimpleDateFormat("HHmm");
 
-    // Need to include attribute and code to allow for String2String lookups and
-    // String2Number lookups
-    // to support clouds and present weather
+    private static final int NUM_POOL_THREADS = 1;
 
     private int width = 1;
 
@@ -138,12 +130,6 @@ public class PlotModelFactory {
 
     private String currentStyleStr;
 
-    private Document document;
-
-    private final GVTBuilder builder;
-
-    private final BridgeContext bridgeContext;
-
     private int plotModelWidth;
 
     private int plotModelHeight;
@@ -158,7 +144,7 @@ public class PlotModelFactory {
 
     private final IMapDescriptor mapDescriptor;
 
-    private IndexColorModel tm;
+    private RGB color;
 
     private final List<PlotModelElement> plotFields;
 
@@ -180,7 +166,7 @@ public class PlotModelFactory {
         TEXT, BARB, TABLE, AVAIL, RANGE, NULL, SAMPLE, ARROW
     }
 
-    public class PlotModelElement {
+    public static class PlotModelElement {
         DisplayMode mode = DisplayMode.TEXT;
 
         String format = null;
@@ -218,7 +204,7 @@ public class PlotModelFactory {
         }
     }
 
-    public class PlotWindElement {
+    public static class PlotWindElement {
         Node barbNode = null;
 
         Element barbElement = null;
@@ -236,29 +222,18 @@ public class PlotModelFactory {
         String gustY = null;
     }
 
-    public PlotModelFactory(IMapDescriptor mapDescriptor, String plotModelFile) {
-        byte full = (byte) 255;
-        byte zero = (byte) 0;
-        byte[] red = { 0, zero };
-        byte[] blue = { 0, full };
-        byte[] green = { 0, zero };
+    public PlotModelFactory(IMapDescriptor mapDescriptor, String plotModelFile)
+            throws VizException {
+        super(plotModelFile(plotModelFile));
         regenerateStyle();
         this.plotModelFile = plotModelFile;
         this.plotFields = new ArrayList<PlotModelElement>();
         this.sampleFields = new ArrayList<PlotModelElement>();
 
-        tm = new IndexColorModel(8, 2, red, blue, green, 0);
+        setColor(new RGB(0, 0, 255));
         this.gc = new GeodeticCalculator(mapDescriptor.getCRS());
         this.mapDescriptor = mapDescriptor;
-        String parser = XMLResourceDescriptor.getXMLParserClassName();
-        SAXSVGDocumentFactory f = new SAXSVGDocumentFactory(parser);
-        try {
-            document = f.createDocument(PathManagerFactory.getPathManager()
-                    .getStaticFile(PlotResourceData.PLOT_DIR + plotModelFile)
-                    .toURI().toString());
-        } catch (Exception e) {
-            statusHandler.handle(Priority.PROBLEM, "Error parsing svg file", e);
-        }
+
         this.svgRoot = document.getDocumentElement();
         this.originalPlotModelWidth = Integer.parseInt(svgRoot.getAttributeNS(
                 null, "width"));
@@ -276,171 +251,12 @@ public class PlotModelFactory {
             if (Node.ELEMENT_NODE == plotElements.item(i).getNodeType()) {
                 Element plotElement = (Element) plotElements.item(i);
                 if (plotElement.hasAttribute(DM_ATTRIBUTE)) {
-                    PlotModelElement thisElement = new PlotModelElement();
-                    thisElement.plotElement = plotElement;
-                    thisElement.plotNode = plotElement.getChildNodes().item(0);
-                    if (plotElement.getAttribute(DM_ATTRIBUTE).equals("text")) {
-                        thisElement.mode = DisplayMode.TEXT;
-                        plotElement.setAttribute("class", "text");
-                        displayedElementCount++;
-                    } else if (plotElement.getAttribute(DM_ATTRIBUTE).equals(
-                            "barb")) {
-                        thisElement.mode = DisplayMode.BARB;
-                        thisElement.winds = new PlotWindElement();
-                        NodeList windElements = plotElement.getChildNodes();
-                        for (int j = 0; j < windElements.getLength(); j++) {
-                            if (Node.ELEMENT_NODE == windElements.item(j)
-                                    .getNodeType()) {
-                                Element windElement = (Element) windElements
-                                        .item(j);
-                                if (windElement.getAttribute("class").matches(
-                                        "arrow")) {
-                                    thisElement.winds.arrowElement = windElement;
-                                    thisElement.winds.arrowNode = windElement
-                                            .getChildNodes().item(0);
-                                } else if (windElement.getAttribute("class")
-                                        .matches("barb")) {
-                                    thisElement.winds.barbElement = windElement;
-                                    thisElement.winds.barbNode = windElement
-                                            .getChildNodes().item(0);
-                                } else if (windElement.getAttribute("class")
-                                        .matches("text")) {
-                                    thisElement.winds.gustElement = windElement;
-                                    thisElement.winds.gustNode = windElement
-                                            .getChildNodes().item(0);
-                                    thisElement.winds.gustX = windElement
-                                            .getAttribute("x");
-                                    thisElement.winds.gustY = windElement
-                                            .getAttribute("y");
-                                }
-                            }
-                        }
-                        displayedElementCount++;
-                    } else if (plotElement.getAttribute(DM_ATTRIBUTE).equals(
-                            "arrowuv")) {
-                        thisElement.mode = DisplayMode.ARROW;
-                        thisElement.winds = new PlotWindElement();
-                        NodeList windElements = plotElement.getChildNodes();
-                        for (int j = 0; j < windElements.getLength(); j++) {
-                            if (Node.ELEMENT_NODE == windElements.item(j)
-                                    .getNodeType()) {
-                                Element windElement = (Element) windElements
-                                        .item(j);
-                                String attrClass = windElement
-                                        .getAttribute("class");
-                                if ("arrow".matches(attrClass)) {
-                                    thisElement.winds.arrowElement = windElement;
-                                    thisElement.winds.arrowNode = windElement
-                                            .getChildNodes().item(0);
-                                } else if ("arrow1".matches(attrClass)) {
-                                    thisElement.winds.arrowElement = windElement;
-                                    thisElement.winds.arrowNode = windElement
-                                            .getChildNodes().item(0);
-                                    thisElement.winds.arrowElement
-                                            .setAttribute("arrowtype",
-                                                    attrClass);
-                                } else if ("arrow2".matches(attrClass)) {
-                                    thisElement.winds.arrowElement = windElement;
-                                    thisElement.winds.arrowNode = windElement
-                                            .getChildNodes().item(0);
-                                    thisElement.winds.arrowElement
-                                            .setAttribute("arrowtype",
-                                                    attrClass);
-                                } else if ("text".matches(attrClass)) {
-                                    thisElement.winds.gustElement = windElement;
-                                    thisElement.winds.gustNode = windElement
-                                            .getChildNodes().item(0);
-                                    thisElement.winds.gustX = windElement
-                                            .getAttribute("x");
-                                    thisElement.winds.gustY = windElement
-                                            .getAttribute("y");
-                                }
-                            }
-                        }
-                        displayedElementCount++;
-                    } else if (plotElement.getAttribute(DM_ATTRIBUTE).equals(
-                            "table")
-                            || plotElement.getAttribute(DM_ATTRIBUTE).equals(
-                                    "recursive_translation")) {
-                        thisElement.mode = DisplayMode.TABLE;
-                        if (plotElement.hasAttribute(PFT_ATTRIBUTE)) {
-                            thisElement.ranking = S2N.readS2NFile(plotElement
-                                    .getAttribute(PFT_ATTRIBUTE));
-                        }
-                        if (plotElement.hasAttribute(PLT_ATTRIBUTE)) {
-                            File table = getTableFile(plotElement
-                                    .getAttribute(PLT_ATTRIBUTE));
-                            thisElement.lookup = LookupUtils
-                                    .buildLookupTable(table);
-                            thisElement.lookup.setMode(plotElement
-                                    .getAttribute(DM_ATTRIBUTE));
-                        }
-                        displayedElementCount++;
-                    } else if (plotElement.getAttribute(DM_ATTRIBUTE).equals(
-                            "arrow")) {
-                        plotElement.setAttribute("class", "text");
-                        thisElement.mode = DisplayMode.BARB;
-                        displayedElementCount++;
-                    } else if (plotElement.getAttribute(DM_ATTRIBUTE).equals(
-                            "available")) {
-                        thisElement.mode = DisplayMode.AVAIL;
-                        plotElement.setAttribute("class", "text");
-                        displayedElementCount++;
-                    } else if (plotElement.getAttribute(DM_ATTRIBUTE).equals(
-                            "range")) {
-                        thisElement.mode = DisplayMode.RANGE;
-                        if (plotElement.hasAttribute(PLT_ATTRIBUTE)) {
-                            File table = getTableFile(plotElement
-                                    .getAttribute(PLT_ATTRIBUTE));
-                            thisElement.lookup = LookupUtils
-                                    .buildLookupTable(table);
-                            thisElement.lookup.setMode(plotElement
-                                    .getAttribute(DM_ATTRIBUTE));
-                        }
-                        displayedElementCount++;
-                    } else if (plotElement.getAttribute(DM_ATTRIBUTE).equals(
-                            "null")) {
-                        thisElement.mode = DisplayMode.NULL;
-                    } else if (plotElement.getAttribute(DM_ATTRIBUTE).equals(
-                            "sample")) {
-                        thisElement.mode = DisplayMode.SAMPLE;
-                        if (plotElement.hasAttribute(PLT_ATTRIBUTE)) {
-                            File table = getTableFile(plotElement
-                                    .getAttribute(PLT_ATTRIBUTE));
-                            thisElement.lookup = LookupUtils
-                                    .buildLookupTable(table);
-                            thisElement.lookup.setMode(plotElement
-                                    .getAttribute(DM_ATTRIBUTE));
-                        }
-                    }
-                    thisElement.parameter = plotElement
-                            .getAttribute(P_ATTRIBUTE);
-                    if (plotElement.hasAttribute(FMT_ATTRIBUTE)) {
-                        thisElement.format = plotElement
-                                .getAttribute(FMT_ATTRIBUTE);
-                    }
-                    if (plotElement.hasAttribute(UNIT_ATTRIBUTE)) {
-                        thisElement.unit = plotElement
-                                .getAttribute(UNIT_ATTRIBUTE);
-                    }
-                    if (plotElement.hasAttribute(SYMBOL_ATTRIBUTE)) {
-                        thisElement.symbol = plotElement
-                                .getAttribute(SYMBOL_ATTRIBUTE);
-                    }
-                    if (plotElement.hasAttribute(TRIM_ATTRIBUTE)) {
-                        thisElement.trim = Integer.parseInt(plotElement
-                                .getAttribute(TRIM_ATTRIBUTE));
-                    }
-                    if (plotElement.hasAttribute(PLT_INDEX)) {
-                        thisElement.index = Integer.parseInt(plotElement
-                                .getAttribute(PLT_INDEX));
-                    }
-                    if (plotElement.hasAttribute(REQUIRED)) {
-                        thisElement.required = Boolean.parseBoolean(plotElement
-                                .getAttribute(REQUIRED));
-                    }
+                    PlotModelElement thisElement = parseElement(plotElement);
                     if (thisElement.mode != DisplayMode.SAMPLE) {
                         this.plotFields.add(thisElement);
+                        if (thisElement.mode != DisplayMode.NULL) {
+                            displayedElementCount += 1;
+                        }
                     } else {
                         this.sampleFields.add(thisElement);
                         thisElement.plotNode.setNodeValue("");
@@ -450,11 +266,13 @@ public class PlotModelFactory {
         }
 
         if (displayedElementCount <= 3) {
-            // Dont use image caching if more then 3 elements are used, with
-            // very few elements the hit rate is good enought to risk keeping
-            // the images in memory, but with more elements the hit rate drops
-            // and the cache size increases. 3 elements might not be the optimal
-            // way of detecting complexity but it is better than nothing.
+            /*
+             * Don't use image caching if more then 3 elements are used, with
+             * very few elements the hit rate is good enough to risk keeping the
+             * images in memory, but with more elements the hit rate drops and
+             * the cache size increases. 3 elements might not be the optimal way
+             * of detecting complexity but it is better than nothing.
+             */
             imageCache = new HashMap<String, BufferedImage>();
         }
         NodeList scriptNodes = document.getElementsByTagName("script");
@@ -480,54 +298,168 @@ public class PlotModelFactory {
             if (scriptText.length() > 0) {
                 PlotPythonScriptFactory pythonFactory = new PlotPythonScriptFactory(
                         plotModelFile, scriptText, plotDelegateName);
-                python = PythonJobCoordinator.newInstance(pythonFactory);
+                python = new PythonJobCoordinator<>(NUM_POOL_THREADS,
+                        plotModelFile, pythonFactory);
             }
 
-            // remove the scriptNode in memory so time isn't wasted
-            // later attempting to render it
+            /*
+             * Remove the scriptNode in memory so time isn't wasted later
+             * attempting to render it
+             */
             scriptNode.getParentNode().removeChild(scriptNode);
         }
+    }
 
-        UserAgentAdapter userAgentAdapter = new UserAgentAdapter();
-        this.bridgeContext = new BridgeContext(userAgentAdapter);
-        this.builder = new GVTBuilder();
+    private static PlotModelElement parseElement(Element plotElement) {
+        String dmAttribute = plotElement.getAttribute(DM_ATTRIBUTE);
+        PlotModelElement thisElement = new PlotModelElement();
+        thisElement.plotElement = plotElement;
+        thisElement.plotNode = plotElement.getChildNodes().item(0);
+        if (dmAttribute.equals("text")) {
+            thisElement.mode = DisplayMode.TEXT;
+            plotElement.setAttribute("class", "text");
+        } else if (dmAttribute.equals("barb")) {
+            thisElement.mode = DisplayMode.BARB;
+            thisElement.winds = new PlotWindElement();
+            NodeList windElements = plotElement.getChildNodes();
+            for (int j = 0; j < windElements.getLength(); j++) {
+                if (Node.ELEMENT_NODE == windElements.item(j).getNodeType()) {
+                    Element windElement = (Element) windElements.item(j);
+                    String elementClass = windElement.getAttribute("class");
+                    if (elementClass.matches("arrow")) {
+                        thisElement.winds.arrowElement = windElement;
+                        thisElement.winds.arrowNode = windElement
+                                .getChildNodes().item(0);
+                    } else if (elementClass.matches("barb")) {
+                        thisElement.winds.barbElement = windElement;
+                        thisElement.winds.barbNode = windElement
+                                .getChildNodes().item(0);
+                    } else if (elementClass.matches("text")) {
+                        thisElement.winds.gustElement = windElement;
+                        thisElement.winds.gustNode = windElement
+                                .getChildNodes().item(0);
+                        thisElement.winds.gustX = windElement.getAttribute("x");
+                        thisElement.winds.gustY = windElement.getAttribute("y");
+                    }
+                }
+            }
+        } else if (dmAttribute.equals("arrowuv")) {
+            thisElement.mode = DisplayMode.ARROW;
+            thisElement.winds = new PlotWindElement();
+            NodeList windElements = plotElement.getChildNodes();
+            for (int j = 0; j < windElements.getLength(); j++) {
+                if (Node.ELEMENT_NODE == windElements.item(j).getNodeType()) {
+                    Element windElement = (Element) windElements.item(j);
+                    String attrClass = windElement.getAttribute("class");
+                    if ("arrow".matches(attrClass)) {
+                        thisElement.winds.arrowElement = windElement;
+                        thisElement.winds.arrowNode = windElement
+                                .getChildNodes().item(0);
+                    } else if ("arrow1".matches(attrClass)) {
+                        thisElement.winds.arrowElement = windElement;
+                        thisElement.winds.arrowNode = windElement
+                                .getChildNodes().item(0);
+                        thisElement.winds.arrowElement.setAttribute(
+                                "arrowtype", attrClass);
+                    } else if ("arrow2".matches(attrClass)) {
+                        thisElement.winds.arrowElement = windElement;
+                        thisElement.winds.arrowNode = windElement
+                                .getChildNodes().item(0);
+                        thisElement.winds.arrowElement.setAttribute(
+                                "arrowtype", attrClass);
+                    } else if ("text".matches(attrClass)) {
+                        thisElement.winds.gustElement = windElement;
+                        thisElement.winds.gustNode = windElement
+                                .getChildNodes().item(0);
+                        thisElement.winds.gustX = windElement.getAttribute("x");
+                        thisElement.winds.gustY = windElement.getAttribute("y");
+                    }
+                }
+            }
+        } else if (dmAttribute.equals("table")
+                || dmAttribute.equals("recursive_translation")) {
+            thisElement.mode = DisplayMode.TABLE;
+            if (plotElement.hasAttribute(PFT_ATTRIBUTE)) {
+                thisElement.ranking = S2N.readS2NFile(plotElement
+                        .getAttribute(PFT_ATTRIBUTE));
+            }
+            if (plotElement.hasAttribute(PLT_ATTRIBUTE)) {
+                File table = getTableFile(plotElement
+                        .getAttribute(PLT_ATTRIBUTE));
+                thisElement.lookup = LookupUtils.buildLookupTable(table);
+                thisElement.lookup.setMode(dmAttribute);
+            }
+        } else if (dmAttribute.equals("arrow")) {
+            plotElement.setAttribute("class", "text");
+            thisElement.mode = DisplayMode.BARB;
+        } else if (dmAttribute.equals("available")) {
+            thisElement.mode = DisplayMode.AVAIL;
+            plotElement.setAttribute("class", "text");
+        } else if (dmAttribute.equals("range")) {
+            thisElement.mode = DisplayMode.RANGE;
+            if (plotElement.hasAttribute(PLT_ATTRIBUTE)) {
+                File table = getTableFile(plotElement
+                        .getAttribute(PLT_ATTRIBUTE));
+                thisElement.lookup = LookupUtils.buildLookupTable(table);
+                thisElement.lookup.setMode(dmAttribute);
+            }
+        } else if (dmAttribute.equals("null")) {
+            thisElement.mode = DisplayMode.NULL;
+        } else if (dmAttribute.equals("sample")) {
+            thisElement.mode = DisplayMode.SAMPLE;
+            if (plotElement.hasAttribute(PLT_ATTRIBUTE)) {
+                File table = getTableFile(plotElement
+                        .getAttribute(PLT_ATTRIBUTE));
+                thisElement.lookup = LookupUtils.buildLookupTable(table);
+                thisElement.lookup.setMode(dmAttribute);
+            }
+        }
+        thisElement.parameter = plotElement.getAttribute(P_ATTRIBUTE);
+        if (plotElement.hasAttribute(FMT_ATTRIBUTE)) {
+            thisElement.format = plotElement.getAttribute(FMT_ATTRIBUTE);
+        }
+        if (plotElement.hasAttribute(UNIT_ATTRIBUTE)) {
+            thisElement.unit = plotElement.getAttribute(UNIT_ATTRIBUTE);
+        }
+        if (plotElement.hasAttribute(SYMBOL_ATTRIBUTE)) {
+            thisElement.symbol = plotElement.getAttribute(SYMBOL_ATTRIBUTE);
+        }
+        if (plotElement.hasAttribute(TRIM_ATTRIBUTE)) {
+            thisElement.trim = Integer.parseInt(plotElement
+                    .getAttribute(TRIM_ATTRIBUTE));
+        }
+        if (plotElement.hasAttribute(PLT_INDEX)) {
+            thisElement.index = Integer.parseInt(plotElement
+                    .getAttribute(PLT_INDEX));
+        }
+        if (plotElement.hasAttribute(REQUIRED)) {
+            thisElement.required = Boolean.parseBoolean(plotElement
+                    .getAttribute(REQUIRED));
+        }
+        return thisElement;
     }
 
     public void setColor(RGB color) {
         if (imageCache != null) {
             imageCache.clear();
         }
-        byte fullr = (byte) color.red;
-        byte fullg = (byte) color.green;
-        byte fullb = (byte) color.blue;
-        // String style = "stroke: rgb(" + color.red + "," + color.green + ","
-        // + color.blue + ");";
-        // this.svgRoot.setAttribute("style", style);
-        // System.out.println(style);
-        byte[] red = { 0, fullr };
-        byte[] blue = { 0, fullb };
-        byte[] green = { 0, fullg };
-        tm = new IndexColorModel(8, 2, red, green, blue, 0);
-        // System.out.println(style);
+        this.color = color;
     }
 
     public void setLineWidth(int width) {
-        if (imageCache != null) {
-            imageCache.clear();
-        }
         this.width = width;
         regenerateStyle();
     }
 
     public void setLineStyle(LineStyle style) {
-        if (imageCache != null) {
-            imageCache.clear();
-        }
         this.lineStyle = style;
         regenerateStyle();
     }
 
     private void regenerateStyle() {
+        if (imageCache != null) {
+            imageCache.clear();
+        }
         String strokeStart = "stroke-dasharray: ";
         switch (lineStyle) {
         case DASH_DOTTED: {
@@ -576,12 +508,14 @@ public class PlotModelFactory {
     }
 
     /**
-     * Takes the station data object and produces a buffered image.
+     * Takes the plot data object and produces a buffered image.
      * 
-     * @param station
-     *            The station name
      * @param stationData
-     *            A metar record for that station
+     *            The data
+     * @param latitude
+     *            the longitude the data will be displayed
+     * @param longitude
+     *            the latitude the data will be displayed
      * @return A buffered image representing the station data
      */
     public synchronized BufferedImage getStationPlot(PlotData stationData,
@@ -607,7 +541,7 @@ public class PlotModelFactory {
                 CheckPlotValidityExecutor task = new CheckPlotValidityExecutor(
                         stationData);
                 try {
-                    result = python.submitSyncJob(task);
+                    result = python.submitJob(task).get();
                 } catch (Exception e) {
                     statusHandler.handle(Priority.PROBLEM,
                             "Error checking if plot is valid for plot model "
@@ -685,24 +619,9 @@ public class PlotModelFactory {
                 return imageCache.get(imageId.toString());
             }
 
-            BufferedImage bufferedImage = new BufferedImage(
-                    this.plotModelWidth, this.plotModelHeight,
-                    BufferedImage.TYPE_BYTE_INDEXED, tm);
+            BufferedImage bufferedImage = createSingleColorImage(color,
+                    plotModelHeight, plotModelWidth);
 
-            // long t0 = System.currentTimeMillis();
-            GraphicsNode graphicsNode = builder.build(this.bridgeContext,
-                    this.document);
-            Graphics2D g2d = null;
-            try {
-                g2d = bufferedImage.createGraphics();
-                graphicsNode.primitivePaint(g2d);
-            } finally {
-                if (g2d != null) {
-                    g2d.dispose();
-                }
-            }
-            // System.out.println("Time building and creating graphics: "
-            // + (System.currentTimeMillis() - t0));
             if (imageCache != null) {
                 imageCache.put(imageId.toString(), bufferedImage);
             }
@@ -724,7 +643,7 @@ public class PlotModelFactory {
                 String result = null;
                 SampleTextExecutor task = new SampleTextExecutor(stationData);
                 try {
-                    result = python.submitSyncJob(task);
+                    result = python.submitJob(task).get();
                 } catch (Exception e) {
                     statusHandler.handle(Priority.PROBLEM,
                             "Error getting sample text for plot model "
@@ -865,8 +784,6 @@ public class PlotModelFactory {
         }
 
         if (isValidValue(cWindSpeed)) {
-            // Element eWindSpeed =
-            // (Element)element.plotElement.getChildNodes().item(0)
             if (element.winds.barbElement != null) {
                 if (cWindSpeed == -9999.0 && plotMissingData) {
                     element.winds.barbElement.removeAttribute("transform");
@@ -1067,13 +984,15 @@ public class PlotModelFactory {
                 if (element.format != null) {
                     if (element.format.equals("time")) {
                         Date d = new Date(new Double(displayValue).longValue());
-                        SAMPLE_DATE.setTimeZone(TimeZone.getTimeZone("UTC"));
-                        sValue = SAMPLE_DATE.format(d);
+                        synchronized (SAMPLE_DATE) {
+                            SAMPLE_DATE.setTimeZone(TimeUtil.GMT_TIME_ZONE);
+                            sValue = SAMPLE_DATE.format(d);
+                        }
                     } else if (element.format.startsWith("time:")) {
                         Date d = new Date(new Double(displayValue).longValue());
                         SimpleDateFormat sampleData = new SimpleDateFormat(
                                 element.format.substring(5));
-                        sampleData.setTimeZone(TimeZone.getTimeZone("UTC"));
+                        sampleData.setTimeZone(TimeUtil.GMT_TIME_ZONE);
                         sValue = sampleData.format(d);
                     } else {
                         StringBuilder sb = new StringBuilder();
@@ -1097,8 +1016,8 @@ public class PlotModelFactory {
 
         if (element.lookup != null && sValue != null) {
             String lu = null;
-            if (!sValue.equals("?")){
-               lu = element.lookup.lookup(sValue);
+            if (!sValue.equals("?")) {
+                lu = element.lookup.lookup(sValue);
             }
             if (lu != null) {
                 sValue = lu.trim();
@@ -1122,36 +1041,36 @@ public class PlotModelFactory {
         case LONG:
             Number value = ob.getNumber(element.parameter);
             if (value != null && value.doubleValue() != -9999.0) {
-                    double displayValue = 0.0;
-                    if (element.unit != null) {
-                        if (element.converter == null) {
-                            try {
-                                Unit<?> unit = UnitFormat.getUCUMInstance()
-                                        .parseProductUnit(element.unit,
-                                                new ParsePosition(0));
-                                element.converter = ob.getUnit(
-                                        element.parameter).getConverterTo(unit);
-                            } catch (ParseException e) {
-                                throw new VizException("Unable parse units ", e);
-                            }
+                double displayValue = 0.0;
+                if (element.unit != null) {
+                    if (element.converter == null) {
+                        try {
+                            Unit<?> unit = UnitFormat.getUCUMInstance()
+                                    .parseProductUnit(element.unit,
+                                            new ParsePosition(0));
+                            element.converter = ob.getUnit(element.parameter)
+                                    .getConverterTo(unit);
+                        } catch (ParseException e) {
+                            throw new VizException("Unable parse units ", e);
                         }
-                        displayValue = element.converter.convert(value
-                                .doubleValue());
+                    }
+                    displayValue = element.converter.convert(value
+                            .doubleValue());
+                } else {
+                    displayValue = value.doubleValue();
+                }
+
+                if (isValidValue(displayValue)) {
+                    if (element.format != null) {
+                        StringBuilder sb = new StringBuilder();
+                        Formatter testing = new Formatter(sb);
+                        testing.format(element.format, displayValue);
+                        sValue = sb.toString();
+                        testing.close();
                     } else {
-                        displayValue = value.doubleValue();
-                    }
-                    
-                    if (isValidValue(displayValue)){
-                       if (element.format != null) {
-                          StringBuilder sb = new StringBuilder();
-                          Formatter testing = new Formatter(sb);
-                          testing.format(element.format, displayValue);
-                          sValue = sb.toString();
-                          testing.close();
-                        } else {
-                            sValue = Double.toString(displayValue);
-                        }
+                        sValue = Double.toString(displayValue);
                     }
+                }
             }
             break;
         case STRING:
@@ -1163,8 +1082,9 @@ public class PlotModelFactory {
         if (element.lookup != null && sValue != null) {
             String lu = null;
             lu = element.lookup.lookup(sValue);
-            if (!lu.equals(""))
+            if (!lu.equals("")) {
                 sValue = lu;
+            }
         }
         if (sValue != null) {
             element.plotNode.setNodeValue(sValue.substring(element.trim));
@@ -1258,7 +1178,7 @@ public class PlotModelFactory {
         this.plotMissingData = b;
     }
 
-    private File getTableFile(String fileName) {
+    private static File getTableFile(String fileName) {
         File rval = PathManagerFactory.getPathManager().getStaticFile(
                 PLOT_MODEL_DIR + IPathManager.SEPARATOR + fileName);
         return rval;
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModels.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModels.java
index c6592a0d5d..7ec77eca87 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModels.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModels.java
@@ -34,9 +34,9 @@ import com.raytheon.uf.common.dataplugin.level.Level;
 import com.raytheon.uf.common.dataplugin.level.LevelFactory;
 import com.raytheon.uf.common.dataplugin.level.mapping.LevelMapping;
 import com.raytheon.uf.common.dataplugin.level.mapping.LevelMappingFactory;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.MapDescriptor;
@@ -57,6 +57,7 @@ import com.raytheon.viz.pointdata.util.PointDataInventory;
  * Jun 06, 2014  2061     bsteffen    Remove old PlotResource
  * Sep 09, 2014  3356     njensen     Remove CommunicationException
  * Aug 17, 2015  4717     mapeters    Added null check in getLevels()
+ * Feb 12, 2016  5242     dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -117,7 +118,7 @@ public class PlotModels {
         if (models == null) {
             models = new HashMap<String, List<String>>();
             IPathManager pm = PathManagerFactory.getPathManager();
-            LocalizationFile[] files = pm.listFiles(
+            ILocalizationFile[] files = pm.listFiles(
                     pm.getLocalSearchHierarchy(LocalizationType.CAVE_STATIC),
                     PLOTLOCATION, new String[] { ".svg" }, true, true);
 
@@ -128,8 +129,8 @@ public class PlotModels {
                 throw new RuntimeException(e);
             }
 
-            for (LocalizationFile file : files) {
-                String fileName = file.getName();
+            for (ILocalizationFile file : files) {
+                String fileName = file.getPath();
                 fileName = fileName.substring(PLOTLOCATION.length() + 1);
                 try {
                     if (!models.containsKey(fileName)) {
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PointDataRequest.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PointDataRequest.java
index 3320a1e4cf..21b9402aa5 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PointDataRequest.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PointDataRequest.java
@@ -22,7 +22,7 @@ package com.raytheon.viz.pointdata;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
 import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
@@ -242,7 +242,6 @@ public class PointDataRequest {
                     new RequestConstraint(
                             PointDataServerRequest.REQUEST_MODE_2D));
 
-
             PointDataServerRequest request = new PointDataServerRequest(rcMap);
 
             Object result = ThriftClient.sendRequest(request);
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/python/PlotPythonScriptFactory.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/python/PlotPythonScriptFactory.java
index 36262a7f96..50b4bd3907 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/python/PlotPythonScriptFactory.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/python/PlotPythonScriptFactory.java
@@ -27,7 +27,7 @@ import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
+import com.raytheon.uf.common.python.concurrent.PythonInterpreterFactory;
 import com.raytheon.viz.pointdata.PlotModelFactory;
 
 /**
@@ -44,6 +44,7 @@ import com.raytheon.viz.pointdata.PlotModelFactory;
  * ------------- -------- ----------- --------------------------
  * Mar 14, 2014  2868     njensen     Initial creation
  * Jun 06, 2014  2061     bsteffen    Remove old PlotResource
+ * Dec 14, 2015  4816     dgilling    Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -51,13 +52,15 @@ import com.raytheon.viz.pointdata.PlotModelFactory;
  * @version 1.0
  */
 
-public class PlotPythonScriptFactory extends
-        AbstractPythonScriptFactory<PlotPythonScript> {
+public class PlotPythonScriptFactory implements
+        PythonInterpreterFactory<PlotPythonScript> {
 
     private static String includePath;
 
     private static String baseFilePath;
 
+    protected String plotSvgName;
+
     protected String scriptText;
 
     protected String plotDelegateName;
@@ -76,7 +79,7 @@ public class PlotPythonScriptFactory extends
      */
     public PlotPythonScriptFactory(String plotSvgName, String scriptText,
             String plotDelegateName) {
-        super(plotSvgName, 1);
+        this.plotSvgName = plotSvgName;
         this.scriptText = scriptText;
         this.plotDelegateName = plotDelegateName;
     }
@@ -112,6 +115,6 @@ public class PlotPythonScriptFactory extends
         }
 
         return new PlotPythonScript(baseFilePath, includePath, scriptText,
-                plotDelegateName, this.getName());
+                plotDelegateName, plotSvgName);
     }
 }
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
index 2f22180ef4..14ebbabdc4 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
@@ -21,6 +21,7 @@ package com.raytheon.viz.pointdata.rsc;
 
 import java.awt.Font;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -75,6 +76,8 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
 import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
 import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
 import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
+import com.raytheon.viz.pointdata.rsc.progdisc.GenericProgressiveDisclosure;
+import com.raytheon.viz.pointdata.rsc.progdisc.GenericProgressiveDisclosure.PlotItem;
 import com.raytheon.viz.pointdata.util.MetarPrecipDataContainer;
 import com.raytheon.viz.pointdata.util.MetarPrecipDataContainer.PrecipData;
 import com.vividsolutions.jts.geom.Coordinate;
@@ -90,12 +93,14 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Aug 19, 2011            bsteffen    Initial creation
- * Jun 07, 2013 2070       bsteffen    Add geospatial constraints to metar
- *                                     precip requests.
- * Mar 11, 2014 #2718      randerso    Changes for GeoTools 10.5
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- --------------------------------------------
+ * Aug 19, 2011  7725     bsteffen  Initial creation
+ * Jun 07, 2013  2070     bsteffen  Add geospatial constraints to metar precip
+ *                                  requests.
+ * Mar 11, 2014  2718     randerso  Changes for GeoTools 10.5
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
+ * Nov 13, 2015  4903     bsteffen  Extract progressive disclosure
  * 
  * </pre>
  * 
@@ -109,15 +114,19 @@ public class MetarPrecipResource extends
 
     private static final int PLOT_PIXEL_SIZE = 30;
 
-    private class RenderablePrecipData extends PrecipData {
+    private class RenderablePrecipData extends PrecipData implements PlotItem {
 
-        Double distValue = 0.0;
+        public final DrawableString string;
 
-        DrawableString string = null;
-
-        public RenderablePrecipData(PrecipData data) {
+        public RenderablePrecipData(PrecipData data, DrawableString string) {
             super(data.getTimeObs(), data.getStationName(),
                     data.getPrecipAmt(), data.getLatLon().x, data.getLatLon().y);
+            this.string = string;
+        }
+
+        @Override
+        public Coordinate getLocation() {
+            return new Coordinate(string.basics.x, string.basics.y);
         }
 
     }
@@ -149,7 +158,7 @@ public class MetarPrecipResource extends
 
     private boolean reproject = false;
 
-    private Map<DataTime, List<RenderablePrecipData>> data = new HashMap<DataTime, List<RenderablePrecipData>>();
+    private Map<DataTime, GenericProgressiveDisclosure<RenderablePrecipData>> data = new HashMap<>();
 
     private IFont font = null;
 
@@ -175,59 +184,53 @@ public class MetarPrecipResource extends
         if (time == null) {
             return;
         }
-        List<RenderablePrecipData> precips = getPrecipData(time);
-        if (precips == null) {
+        GenericProgressiveDisclosure<RenderablePrecipData> disclosure = null;
+        synchronized (data) {
+            disclosure = data.get(time);
+        }
+        if (disclosure == null) {
             dataProcessJob.schedule();
             return;
         }
-        if (precips.isEmpty()) {
-            return;
-        }
-
-        RGB color = getCapability(ColorableCapability.class).getColor();
+        IExtent extent = paintProps.getView().getExtent();
         Double magnification = getCapability(MagnificationCapability.class)
                 .getMagnification();
         Double density = getCapability(DensityCapability.class).getDensity();
+        double threshold = (PLOT_PIXEL_SIZE * magnification) / density;
+        threshold = (threshold * extent.getWidth())
+                / paintProps.getCanvasBounds().width;
+        Collection<RenderablePrecipData> precips = disclosure.runDisclosure(
+                extent, threshold);
+        if (precips.isEmpty()) {
+            return;
+        }
+        RGB color = getCapability(ColorableCapability.class).getColor();
 
         if (font == null) {
-            font = target.initializeFont(Font.DIALOG, 10,
+            font = target.initializeFont(Font.DIALOG, 8,
                     new Style[] { Style.BOLD });
             font.setMagnification(magnification.floatValue());
         }
 
         List<DrawableString> strings = new ArrayList<DrawableString>();
 
-        IExtent extent = paintProps.getView().getExtent();
-
-        double threshold = (PLOT_PIXEL_SIZE * magnification) / density;
-        threshold = (threshold * extent.getWidth())
-                / paintProps.getCanvasBounds().width;
-
         for (RenderablePrecipData data : precips) {
-            if (!extent.contains(new double[] { data.string.basics.x,
-                    data.string.basics.y })) {
-                continue;
-            }
-            if (data.distValue >= threshold) {
-                // This is easier then changing it when the capability changes.
-                data.string.font = this.font;
-                data.string.setText(data.string.getText(), color);
-                strings.add(data.string);
-            }
+            // This is easier then changing it when the capability changes.
+            data.string.font = this.font;
+            data.string.setText(data.string.getText(), color);
+            strings.add(data.string);
         }
 
         target.drawStrings(strings);
     }
 
     private List<RenderablePrecipData> getPrecipData(DataTime time) {
-        List<RenderablePrecipData> currData = null;
+        GenericProgressiveDisclosure<RenderablePrecipData> currData = null;
         synchronized (data) {
             currData = data.get(time);
         }
         if (currData != null) {
-            synchronized (currData) {
-                return new ArrayList<RenderablePrecipData>(currData);
-            }
+            return currData.getAll();
         }
         return null;
     }
@@ -335,7 +338,9 @@ public class MetarPrecipResource extends
             GridEnvelope2D envelope = GridGeometry2D.wrap(
                     descriptor.getGridGeometry()).getGridRange2D();
             synchronized (data) {
-                for (List<RenderablePrecipData> dataList : data.values()) {
+                for (GenericProgressiveDisclosure<RenderablePrecipData> disclosure : data
+                        .values()) {
+                    List<RenderablePrecipData> dataList = disclosure.getAll();
                     Iterator<RenderablePrecipData> it = dataList.iterator();
                     while (it.hasNext()) {
                         RenderablePrecipData precip = it.next();
@@ -424,22 +429,20 @@ public class MetarPrecipResource extends
         rcMap.put("location.stationId", rc);
         MetarPrecipDataContainer container = new MetarPrecipDataContainer(
                 resourceData.getDuration(), rcMap);
-        for (Entry<DataTime, List<RenderablePrecipData>> entry : data
+        for (Entry<DataTime, GenericProgressiveDisclosure<RenderablePrecipData>> entry : data
                 .entrySet()) {
             DataTime time = entry.getKey();
             if (time.getMatchValid() < earliestTime) {
                 // No need to reprocess times after the earliest update.
                 continue;
             }
-            synchronized (entry.getValue()) {
-                Iterator<RenderablePrecipData> iter = entry.getValue()
-                        .iterator();
-                while (iter.hasNext()) {
-                    if (newStations.contains(iter.next().getStationName())) {
-                        iter.remove();
-                    }
+            GenericProgressiveDisclosure<RenderablePrecipData> newValue = new GenericProgressiveDisclosure<>();
+            for (RenderablePrecipData data : entry.getValue().getAll()) {
+                if (!newStations.contains(data.getStationName())) {
+                    newValue.add(data);
                 }
             }
+            entry.setValue(newValue);
             addData(time, container.getBasePrecipData(time));
             addData(time, container.getDerivedPrecipData(time));
             if (monitor.isCanceled()) {
@@ -522,10 +525,9 @@ public class MetarPrecipResource extends
     private void addData(DataTime time, List<PrecipData> precips) {
         if (precips.isEmpty()) {
             if (!dataTimes.contains(time)) {
+                GenericProgressiveDisclosure<RenderablePrecipData> disclosure = new GenericProgressiveDisclosure<RenderablePrecipData>();
                 synchronized (data) {
-                    List<RenderablePrecipData> newPrecips = Collections
-                            .emptyList();
-                    data.put(time, newPrecips);
+                    data.put(time, disclosure);
                 }
                 dataTimes.add(time);
             }
@@ -543,8 +545,7 @@ public class MetarPrecipResource extends
 
         });
 
-        List<RenderablePrecipData> newPrecips = new ArrayList<RenderablePrecipData>(
-                precips.size());
+        GenericProgressiveDisclosure<RenderablePrecipData> newPrecips = new GenericProgressiveDisclosure<RenderablePrecipData>();
 
         RGB color = getCapability(ColorableCapability.class).getColor();
 
@@ -557,32 +558,19 @@ public class MetarPrecipResource extends
             if (precip instanceof RenderablePrecipData) {
                 data = (RenderablePrecipData) precip;
             } else {
-                data = new RenderablePrecipData(precip);
                 double[] px = descriptor.worldToPixel(new double[] {
                         precip.getLatLon().x, precip.getLatLon().y });
                 if (!envelope.contains(px[0], px[1])) {
                     continue;
                 }
-                data.string = new DrawableString(formatPrecip(precips.get(i)
-                        .getPrecipAmt()), color);
-                data.string.setCoordinates(px[0], px[1], px[2]);
-                data.string.verticallAlignment = VerticalAlignment.MIDDLE;
-                data.string.horizontalAlignment = HorizontalAlignment.CENTER;
-            }
-            double bestDist = Double.MAX_VALUE;
-            for (RenderablePrecipData exist : newPrecips) {
-                double xDist = exist.string.basics.x - data.string.basics.x;
-                double yDist = exist.string.basics.y - data.string.basics.y;
-                double dist = Math.hypot(xDist, yDist);
-                if (dist < bestDist) {
-                    bestDist = dist;
-                }
-            }
-            data.distValue = bestDist;
-            // this checks removes duplicates
-            if (bestDist > 0) {
-                newPrecips.add(data);
+                DrawableString string = new DrawableString(formatPrecip(precips
+                        .get(i).getPrecipAmt()), color);
+                string.setCoordinates(px[0], px[1], px[2]);
+                string.verticallAlignment = VerticalAlignment.MIDDLE;
+                string.horizontalAlignment = HorizontalAlignment.CENTER;
+                data = new RenderablePrecipData(precip, string);
             }
+            newPrecips.add(data);
         }
         synchronized (data) {
             data.put(time, newPrecips);
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource.java
index 99c6750547..69adfb8a93 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource.java
@@ -30,7 +30,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.eclipse.swt.graphics.RGB;
 import org.opengis.coverage.grid.GridEnvelope;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResourceData.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResourceData.java
index da7f124027..931329d718 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResourceData.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResourceData.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -28,8 +28,6 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.apache.batik.util.ParsedURL;
-
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
 import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType;
@@ -41,29 +39,35 @@ import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
 import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
-import com.raytheon.viz.pointdata.LocalizationParsedURLHandler;
 import com.raytheon.viz.pointdata.rsc.retrieve.AbstractPlotInfoRetriever;
 import com.raytheon.viz.pointdata.rsc.retrieve.PointDataPlotInfoRetriever;
 
 /**
  * Resource data for plots
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * Date          Ticket#  Engineer    Description
- * ------------- -------- ----------- --------------------------
- * Feb 17, 2009           njensen     Initial creation
- * Jun 29, 2009  2538     jsanchez    Implemented Metars.
- * May 14, 2013  1869     bsteffen    Get plots working without dataURI
- * Aug 09, 2013  2033     mschenke    Switched File.separator to 
- *                                    IPathManager.SEPARATOR
- * Sep 05, 2013  2316     bsteffen    Unify pirep and ncpirep.
- * Jun 06, 2014  2061     bsteffen    Remove old PlotResource
- * Sep 16, 2014  2707     bclement    lsr no longer uses dataURI
- * 
+ *
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- --------------------------------------------
+ * Feb 17, 2009  1960     njensen   Initial creation
+ * Jun 29, 2009  2538     jsanchez  Implemented Metars.
+ * May 14, 2013  1869     bsteffen  Get plots working without dataURI
+ * Aug 09, 2013  2033     mschenke  Switched File.separator to
+ *                                  IPathManager.SEPARATOR
+ * Sep 05, 2013  2316     bsteffen  Unify pirep and ncpirep.
+ * Jun 06, 2014  2061     bsteffen  Remove old PlotResource
+ * Sep 16, 2014  2707     bclement  lsr no longer uses dataURI
+ * Oct 27, 2015  4798     bsteffen  Move SVG localization url handler
+ *                                  registration.
+ * Nov 16, 2015  5119     bsteffen  Remove bufquikscat
+ * Jan 19, 2016  5253     tgurney   Remove svrwx dependency on dataURI
+ * Jan 28, 2016  5286     tgurney   Remove tcg dependency on dataURI
+ * Feb 09, 2016  5283     nabowle   Remove NGM MOS support.
+ *
  * </pre>
- * 
+ *
  * @author njensen
  * @version 1.0
  */
@@ -143,10 +147,7 @@ public class PlotResourceData extends AbstractRequestableResourceData {
          * In the future if stationId can be set to anything that is even a
          * little unique we can get rid of this
          */
-        pluginProps.put("bufrquikscat", new PluginPlotProperties(false));
         pluginProps.put("radar", new PluginPlotProperties(false));
-        pluginProps.put("tcg", new PluginPlotProperties(false));
-        pluginProps.put("svrwx", new PluginPlotProperties(false));
         pluginProps.put("ldadhydro", new PluginPlotProperties(false));
         pluginProps.put("textPoints", new PluginPlotProperties(false));
 
@@ -155,6 +156,9 @@ public class PlotResourceData extends AbstractRequestableResourceData {
          * default behavior, but for now they are included so we have a
          * comprehensive list of which plugins use certain behaviors.
          */
+
+        pluginProps.put("tcg", new PluginPlotProperties());
+        pluginProps.put("svrwx", new PluginPlotProperties());
         pluginProps.put("obs", new PluginPlotProperties());
         pluginProps.put("goessounding", new PluginPlotProperties());
         pluginProps.put("poessounding", new PluginPlotProperties());
@@ -169,7 +173,6 @@ public class PlotResourceData extends AbstractRequestableResourceData {
         pluginProps.put("bufrmosHPC", new PluginPlotProperties());
         pluginProps.put("bufrmosLAMP", new PluginPlotProperties());
         pluginProps.put("bufrmosMRF", new PluginPlotProperties());
-        pluginProps.put("bufrmosNGM", new PluginPlotProperties());
         pluginProps.put("ldadmesonet", new PluginPlotProperties());
         pluginProps.put("qc", new PluginPlotProperties());
         pluginProps.put("bufrascat", new PluginPlotProperties());
@@ -181,8 +184,6 @@ public class PlotResourceData extends AbstractRequestableResourceData {
         pluginProps.put("airep", new PluginPlotProperties());
         pluginProps.put("acars", new PluginPlotProperties());
         pluginProps.put("lsr", new PluginPlotProperties());
-
-        ParsedURL.registerHandler(new LocalizationParsedURLHandler());
     }
 
     public PlotResourceData() {
@@ -192,13 +193,6 @@ public class PlotResourceData extends AbstractRequestableResourceData {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @seecom.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData#
-     * constructResource(com.raytheon.uf.viz.core.comm.LoadProperties,
-     * com.raytheon.edex.db.objects.PluginDataObject[])
-     */
     @Override
     protected AbstractVizResource<?, ?> constructResource(
             LoadProperties loadProperties, PluginDataObject[] objects) {
@@ -342,12 +336,6 @@ public class PlotResourceData extends AbstractRequestableResourceData {
         this.defaultPeriod = defaultPeriod;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData#
-     * getAvailableTimes()
-     */
     @Override
     public DataTime[] getAvailableTimes() throws VizException {
         Map<String, RequestConstraint> map = null;
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/GenericProgressiveDisclosure.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/GenericProgressiveDisclosure.java
new file mode 100644
index 0000000000..2dd4a36507
--- /dev/null
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/progdisc/GenericProgressiveDisclosure.java
@@ -0,0 +1,362 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.viz.pointdata.rsc.progdisc;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.raytheon.uf.viz.core.IExtent;
+import com.raytheon.viz.pointdata.rsc.progdisc.GenericProgressiveDisclosure.PlotItem;
+import com.vividsolutions.jts.geom.Coordinate;
+
+/**
+ * A generic progressive disclosure algorithm that will determine a subset of
+ * {@link PlotItem}s that should be displayed given a particular {@link IExtent}
+ * and the desired distance between plot items. The exact disclosure for a set
+ * of items can be weighted by adding the items in a specific order. In general
+ * the items that are added first will displayed sooner than those added later.
+ * For example if you were displaying cities, then sorting the cities by
+ * population before adding would result in large cities being displayed before
+ * small cities.
+ * <p>
+ * This class was designed to scale well for any number of points. To achieve
+ * this it uses a combination of two distinct algorithms with different
+ * performance characteristics:
+ * <ol>
+ * <li>The <b>static algorithm</b>: When a new item is inserted using this
+ * algorithm then the position is compared to all the existing items to
+ * determine the distance from the closest item. When disclosure is run it is
+ * simply a loop over the items to find any with a large enough distance value.
+ * This has Θ(n²) insertion time, Θ(n) disclosure time.
+ * <li>The <b>dynamic algorithm</b>: When a new item is inserted using this
+ * algorithm it is simply appended to the list of items. When disclosure is run
+ * then each item is compared to any other displayed items to see if it fits
+ * into the display without getting to close. This has Θ(1) insertion time,
+ * Θ(n*m) disclosure time(m is the number of items actually displayed).
+ * <p>
+ * The static algorithm is much better for performance if the disclosure is
+ * going to be reused since it has a much faster disclosure time. However the
+ * longer insertion time can be a problem for more than 5000-10000 items.
+ * <p>
+ * Besides raw performance, a major consideration between the two algorithms is
+ * that the dynamic algorithm suffers from inconsistent disclosure that can
+ * cause a flickering artifact as the extent changes. For example if you zoom in
+ * on a display then sometimes there is enough room to replace a single item
+ * with two items that are spread further apart, however if those items are too
+ * close to other items then they may be removed and replaced with items
+ * slightly further away. A very small change to the extent leads to a very big
+ * change in the set of items displayed which is generally unpleasant for users.
+ * <p>
+ * There are two tweaks to the dynamic algorithm that help mitigate the flicker.
+ * <ol>
+ * <li>First, when the dynamic algorithm is used it caches the disclosed items
+ * and tries to disclose the same items across multiple calls, before
+ * considering new items. This helps immensely because as the extent changes
+ * only minimal changes are made to the set of disclosed items. There can still
+ * be a problem if you zoom in on an area and zoom back out, the extra items
+ * introduced by zooming in can significantly change the result when zooming
+ * out. Although this effect is much more gradual than a flicker, it is still
+ * annoying when there is a specific item of interest that disappears
+ * unexpectedly.
+ * <li>Secondly, pure dynamic disclosure is never used, instead a hybrid of
+ * dynamic/static is always used. For the first few thousand items the insertion
+ * cost for the static algorithm is very low so using a static algorithm for a
+ * certain number of points is beneficial. The static items can be quickly
+ * disclosed before adding in the dynamic points and they act like anchor points
+ * that help keep the dynamic algorithm more consistent.
+ * <p>
+ * The hybrid approach provides a balance between getting something to display
+ * quickly and keeping the disclosure consistent. If the disclosure is going to
+ * be used for awhile it may be worthwhile to use the static disclosure more. It
+ * is possible to asynchronously calculate the static values so that as soon as
+ * possible the disclosure will be completely consistent(
+ * {@link #calculateStaticDistances()}.
+ * <p>
+ * This class uses internal synchronization to make it safe to use from multiple
+ * threads. When properly configured all function calls will be very fast so
+ * there should not be significant waiting.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- -----------------
+ * Nov 12, 2015  4903     bsteffen  Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bsteffen
+ * @version 1.0
+ * @param <T>
+ */
+public class GenericProgressiveDisclosure<T extends PlotItem> {
+
+    private final int staticToDynamicThreshold;
+
+    private AtomicInteger waitingTasks = new AtomicInteger(0);
+
+    private int staticCount = 0;
+
+    private List<ItemInfo<T>> items = new ArrayList<>();
+
+    private List<ItemInfo<T>> prevItems = Collections.emptyList();
+
+    public GenericProgressiveDisclosure() {
+        this(5000);
+    }
+
+    /**
+     * Construct a new instance with a specific threshold for switching between
+     * the two disclosure algorithms. Its usually best to keep the number
+     * relatively small and use {@link #calculateStaticDistances()}
+     * asynchronously to ensure that that
+     * {@link #runDisclosure(IExtent, double)} does not have to wait for slow
+     * calls to {@link #add(PlotItem)}.
+     * 
+     * @param staticToDynamicThreshold
+     *            the number of items that should calculate static distance
+     *            values before switching to dynamic calculations.
+     */
+    public GenericProgressiveDisclosure(int staticToDynamicThreshold) {
+        this.staticToDynamicThreshold = staticToDynamicThreshold;
+    }
+
+    /**
+     * @return all the {@link PlotItem}s contained in this disclosure.
+     */
+    public List<T> getAll() {
+        ArrayList<T> all = new ArrayList<>();
+        waitingTasks.incrementAndGet();
+        synchronized (items) {
+            all.ensureCapacity(items.size());
+            for (ItemInfo<T> info : items) {
+                all.add(info.getItem());
+            }
+        }
+        waitingTasks.decrementAndGet();
+        return all;
+    }
+
+    /**
+     * Get a set of items that are all within extent and are not closer together
+     * than minDistance.
+     * 
+     * @param extent
+     *            area whcich will contain all items returned
+     * @param minDistance
+     *            the minimum distance between any two disclosed items, no two
+     *            items returned will be closer than this.
+     * @return items
+     */
+    public Collection<T> runDisclosure(IExtent extent, double minDistance) {
+        List<ItemInfo<T>> items = new ArrayList<>();
+        Set<T> result = new HashSet<>(100);
+        waitingTasks.incrementAndGet();
+        synchronized (this.items) {
+            for (ItemInfo<T> item : getStaticItems()) {
+                if (item.getDistance() > minDistance && item.within(extent)) {
+                    result.add(item.getItem());
+                    items.add(item);
+                }
+            }
+            if (staticCount < this.items.size()) {
+                for (ItemInfo<T> item : this.prevItems) {
+                    if (!item.hasDistance() && item.within(extent)
+                            && getMinDistance(items, item) > minDistance) {
+                        if (result.add(item.getItem())) {
+                            items.add(item);
+                        }
+                    }
+                }
+                for (ItemInfo<T> item : getDynamicItems()) {
+                    if (item.within(extent)
+                            && getMinDistance(items, item) > minDistance) {
+                        if (result.add(item.getItem())) {
+                            items.add(item);
+                        }
+                    }
+                }
+                this.prevItems = items;
+            }
+        }
+        waitingTasks.decrementAndGet();
+        return result;
+    }
+
+    /**
+     * Add a new item that can be disclosed. This will not do any aggressive
+     * duplicate checking.
+     */
+    public double add(T item) {
+        return add(item, false);
+    }
+
+    /**
+     * Add a new item that can be disclosed.
+     * 
+     * @param item
+     *            the item to add
+     * @param checkDuplicate
+     *            when this is true then the item will be checked against all
+     *            existing items and ignored if it is in a location that is
+     *            already used. This slows down the method so if you are
+     *            reasonably certain there are no duplicates its better to use
+     *            false.
+     * @return The static distance between the new item and the next closest
+     *         item, or NaN if there are too many items for static calculations.
+     */
+    public double add(T item, boolean checkDuplicate) {
+        ItemInfo<T> info = new ItemInfo<>(item);
+        waitingTasks.incrementAndGet();
+        synchronized (items) {
+            if (items.size() < staticToDynamicThreshold) {
+                double distance = getMinDistance(items, info);
+                info.setDistance(distance);
+            } else if (checkDuplicate) {
+                for (ItemInfo<T> itemToCheck : items) {
+                    if (itemToCheck.getItem().getLocation()
+                            .equals(item.getLocation())) {
+                        info.setDistance(0);
+                        break;
+                    }
+                }
+            }
+            if (!info.hasDistance()) {
+                items.add(info);
+            } else if (info.getDistance() > 0) {
+                staticCount += 1;
+                items.add(info);
+            }
+        }
+        waitingTasks.decrementAndGet();
+        return info.getDistance();
+    }
+
+    /**
+     * Convert any items within the disclosure that are using the dynamic
+     * algorithm to be able to use the static algorithm. This will result in
+     * more consistent disclosure and faster execution of
+     * {@link #runDisclosure(IExtent, double)}. If there are alot of items this
+     * method can be slow and should not be run on a thread that is sensitive to
+     * delays.
+     * <p>
+     * Running the calculation requires an exclusive lock that can block other
+     * methods. to avoid causing problems this method will return early if there
+     * is another thread using this object. The early return will often occur
+     * after some items have been converted so future calls will have less work
+     * to do. If the return value indicates an early return then the calling
+     * code should generally {@link Thread#sleep(long)}, {@link Thread#yield()},
+     * or do other tasks before calling this method again. Calling this method
+     * again before other threads have a chance to run will return immediately
+     * after doing no work.
+     * 
+     * @return false if the calculation was interrupted and there are more
+     *         dynamic items, true if this disclosure is now 100% static.
+     */
+    public boolean calculateStaticDistances() {
+        if (waitingTasks.get() > 0) {
+            return false;
+        }
+        synchronized (items) {
+            while (staticCount < items.size()) {
+                ItemInfo<T> item = items.get(staticCount);
+                double distance = getMinDistance(getStaticItems(), item);
+                if (distance > 0) {
+                    item.setDistance(distance);
+                    staticCount += 1;
+                } else {
+                    items.remove(staticCount);
+                }
+                if (waitingTasks.get() > 0) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }
+
+    protected List<ItemInfo<T>> getStaticItems() {
+        return items.subList(0, staticCount);
+    }
+
+    protected List<ItemInfo<T>> getDynamicItems() {
+        return items.subList(staticCount, items.size());
+    }
+
+    private double getMinDistance(List<ItemInfo<T>> list, ItemInfo<T> item) {
+        double min_dist = Double.MAX_VALUE;
+        for (ItemInfo<T> existing : list) {
+            double dist = existing.getItem().getLocation()
+                    .distance(item.getItem().getLocation());
+            if (dist < min_dist
+                    && (Double.isNaN(existing.getDistance()) || dist < existing
+                            .getDistance())) {
+                min_dist = dist;
+            }
+        }
+        return min_dist;
+
+    }
+
+    public static interface PlotItem {
+
+        public Coordinate getLocation();
+    }
+
+    private static class ItemInfo<T extends PlotItem> {
+
+        private final T item;
+
+        private double distance;
+
+        public ItemInfo(T item) {
+            this.item = item;
+            this.distance = Double.NaN;
+        }
+
+        public T getItem() {
+            return item;
+        }
+
+        public boolean within(IExtent extent) {
+            Coordinate location = item.getLocation();
+            return extent.contains(new double[] { location.x, location.y });
+        }
+
+        public boolean hasDistance() {
+            return !Double.isNaN(distance);
+        }
+
+        public double getDistance() {
+            return distance;
+        }
+
+        public void setDistance(double distance) {
+            this.distance = distance;
+        }
+
+    }
+}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotConfig.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotConfig.java
new file mode 100644
index 0000000000..ee9174b1da
--- /dev/null
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotConfig.java
@@ -0,0 +1,152 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.viz.pointdata.rsc.wind;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * 
+ * JAXB compatible representation of all the configuration options needed to
+ * request data and sampling information for wind vectors.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- -----------------
+ * Nov 13, 2015  4903     bsteffen  Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bsteffen
+ * @version 1.0
+ */
+@XmlAccessorType(XmlAccessType.NONE)
+public class WindPlotConfig {
+
+    @XmlElement
+    private WindPlotParameter longitude = new WindPlotParameter("longitude");
+
+    @XmlElement
+    private WindPlotParameter latitude = new WindPlotParameter("latitude");
+
+    @XmlElement
+    private WindPlotParameter speed = new WindPlotParameter("windSpd", "kn");
+
+    @XmlElement
+    private WindPlotParameter direction = new WindPlotParameter("windDir");
+
+    @XmlElement
+    private SampleFormat sample;
+
+    public WindPlotParameter getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(WindPlotParameter longitude) {
+        this.longitude = longitude;
+    }
+
+    public WindPlotParameter getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(WindPlotParameter latitude) {
+        this.latitude = latitude;
+    }
+
+    public WindPlotParameter getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(WindPlotParameter speed) {
+        this.speed = speed;
+    }
+
+    public WindPlotParameter getDirection() {
+        return direction;
+    }
+
+    public void setDirection(WindPlotParameter direction) {
+        this.direction = direction;
+    }
+
+    public SampleFormat getSample() {
+        return sample;
+    }
+
+    public void setSample(SampleFormat sample) {
+        this.sample = sample;
+    }
+
+    public Set<String> getUniqueParameters() {
+        Set<String> result = new HashSet<>(5);
+        result.add(longitude.getParameter());
+        result.add(latitude.getParameter());
+        result.add(speed.getParameter());
+        result.add(direction.getParameter());
+        if (sample != null) {
+            result.addAll(sample.getUniqueParameters());
+        }
+        return result;
+    }
+
+    @XmlAccessorType(XmlAccessType.NONE)
+    public static class SampleFormat {
+
+        @XmlAttribute
+        private String text;
+
+        @XmlElement(name = "field")
+        private WindPlotParameter[] fields;
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+
+        public WindPlotParameter[] getFields() {
+            return fields;
+        }
+
+        public void setFields(WindPlotParameter[] fields) {
+            this.fields = fields;
+        }
+
+        public Set<String> getUniqueParameters() {
+            Set<String> result = new HashSet<>();
+            for (WindPlotParameter p : fields) {
+                result.add(p.getParameter());
+            }
+            return result;
+        }
+
+    }
+}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotParameter.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotParameter.java
new file mode 100644
index 0000000000..273eb2d726
--- /dev/null
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotParameter.java
@@ -0,0 +1,236 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.viz.pointdata.rsc.wind;
+
+import java.text.ParseException;
+import java.text.ParsePosition;
+import java.util.Date;
+
+import javax.measure.unit.Unit;
+import javax.measure.unit.UnitFormat;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+import com.raytheon.uf.common.pointdata.PointDataDescription.Type;
+import com.raytheon.uf.common.pointdata.PointDataView;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
+import com.raytheon.uf.common.time.util.TimeUtil;
+
+/**
+ * 
+ * Configuration information for a single parameter that is part of a
+ * {@link WindPlotConfig}.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- -----------------
+ * Nov 13, 2015  4903     bsteffen  Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bsteffen
+ * @version 1.0
+ */
+@XmlAccessorType(XmlAccessType.NONE)
+public class WindPlotParameter {
+
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(WindPlotParameter.class);
+
+    @XmlAttribute
+    private String parameter;
+
+    @XmlAttribute
+    private String unit;
+
+    @XmlAttribute
+    private Boolean time;
+
+    @XmlElement(name = "format")
+    private FormatValue[] formats;
+
+    @XmlTransient
+    private Unit<?> parsedUnit;
+
+    /* Avoid spamming logs. */
+    @XmlTransient
+    private boolean unitParseFailed = false;
+
+    public WindPlotParameter() {
+
+    }
+
+    public WindPlotParameter(String parameter) {
+        this.parameter = parameter;
+    }
+
+    public WindPlotParameter(String parameter, String unit) {
+        this.parameter = parameter;
+        this.unit = unit;
+    }
+
+    public String getParameter() {
+        return parameter;
+    }
+
+    public void setParameter(String parameter) {
+        this.parameter = parameter;
+    }
+
+    public String getUnit() {
+        return unit;
+    }
+
+    public void setUnit(String unit) {
+        this.unit = unit;
+    }
+
+    public Boolean getTime() {
+        return time;
+    }
+
+    public void setTime(Boolean time) {
+        this.time = time;
+    }
+
+    public FormatValue[] getFormats() {
+        return formats;
+    }
+
+    public void setFormats(FormatValue[] formats) {
+        this.formats = formats;
+    }
+
+    public Unit<?> getParsedUnit() {
+        if (!unitParseFailed && parsedUnit == null) {
+            try {
+                parsedUnit = UnitFormat.getUCUMInstance().parseProductUnit(
+                        unit, new ParsePosition(0));
+            } catch (ParseException e) {
+                statusHandler.handle(Priority.WARN,
+                        "Error retrieving wind data.", e);
+                unitParseFailed = true;
+            }
+        }
+        return parsedUnit;
+    }
+
+    public double getNumericValue(PointDataView view) {
+        double value = view.getNumber(parameter).doubleValue();
+        if (unit != null) {
+            Unit<?> desired = getParsedUnit();
+            Unit<?> current = view.getUnit(parameter);
+            if (desired != null && current.isCompatible(desired)) {
+                value = current.getConverterTo(desired).convert(value);
+            }
+        }
+        return value;
+    }
+
+    public Object getValue(PointDataView view) {
+        if (view.getType(parameter) == Type.STRING) {
+            return view.getString(parameter);
+        } else if (Boolean.TRUE.equals(time)) {
+            return TimeUtil.newGmtCalendar(new Date(view.getNumber(parameter)
+                    .longValue()));
+        } else if (formats != null) {
+            Number value = view.getNumber(parameter);
+            for (FormatValue format : formats) {
+                if (format.matches(value)) {
+                    return format.getText();
+                }
+            }
+            return value.toString();
+        } else if (unit != null) {
+            return getNumericValue(view);
+        }
+        return view.getNumber(parameter);
+    }
+
+    @XmlAccessorType(XmlAccessType.NONE)
+    public static class FormatValue {
+
+        @XmlAttribute
+        private Double high;
+
+        @XmlAttribute
+        private Double low;
+
+        @XmlAttribute
+        private Double value;
+
+        @XmlAttribute
+        private String text;
+
+        public boolean matches(Number value) {
+            if (this.value != null
+                    && value.doubleValue() == this.value.doubleValue()) {
+                return true;
+            } else if (high != null && low != null
+                    && high.doubleValue() >= value.doubleValue()
+                    && low.doubleValue() < value.doubleValue()) {
+                return true;
+            }
+            return false;
+        }
+
+        public Double getHigh() {
+            return high;
+        }
+
+        public void setHigh(Double high) {
+            this.high = high;
+        }
+
+        public Double getLow() {
+            return low;
+        }
+
+        public void setLow(Double low) {
+            this.low = low;
+        }
+
+        public Double getValue() {
+            return value;
+        }
+
+        public void setValue(Double value) {
+            this.value = value;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+        public void setText(String text) {
+            this.text = text;
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotRenderable.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotRenderable.java
new file mode 100644
index 0000000000..c797b42865
--- /dev/null
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotRenderable.java
@@ -0,0 +1,268 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.viz.pointdata.rsc.wind;
+
+import java.util.Collection;
+
+import org.eclipse.swt.graphics.RGB;
+import org.geotools.referencing.GeodeticCalculator;
+
+import com.raytheon.uf.viz.core.IExtent;
+import com.raytheon.uf.viz.core.IGraphicsTarget;
+import com.raytheon.uf.viz.core.drawables.IDescriptor;
+import com.raytheon.uf.viz.core.drawables.PaintProperties;
+import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.core.point.display.VectorGraphicsConfig;
+import com.raytheon.uf.viz.core.point.display.VectorGraphicsRenderable;
+import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
+import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
+import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
+import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
+import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability;
+import com.raytheon.viz.pointdata.rsc.progdisc.GenericProgressiveDisclosure;
+import com.raytheon.viz.pointdata.rsc.progdisc.GenericProgressiveDisclosure.PlotItem;
+import com.vividsolutions.jts.geom.Coordinate;
+
+/**
+ * 
+ * Combines a {@link VectorGraphicsRenderable} with a
+ * {@link GenericProgressiveDisclosure} to generate progressively disclosed wind
+ * displays.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- -----------------
+ * Nov 13, 2015  4903     bsteffen  Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bsteffen
+ * @version 1.0
+ */
+public class WindPlotRenderable {
+
+    protected final AbstractVizResource<?, ?> resource;
+
+    private final IResourceDataChanged changeListener = new IResourceDataChanged() {
+
+        @Override
+        public void resourceChanged(ChangeType type, Object object) {
+            if (type == ChangeType.CAPABILITY) {
+                lastPaintedExtent = null;
+            }
+        }
+    };
+
+    protected VectorGraphicsConfig config = new VectorGraphicsConfig();
+
+    protected double baseDensity = 1.0;
+
+    protected GenericProgressiveDisclosure<Barb> barbs = new GenericProgressiveDisclosure<>();
+
+    private VectorGraphicsRenderable renderable;
+
+    private double lastPaintedDistance = Double.POSITIVE_INFINITY;
+
+    private IExtent lastPaintedExtent;
+
+    public WindPlotRenderable(AbstractVizResource<?, ?> resource) {
+        this.resource = resource;
+        resource.getResourceData().addChangeListener(changeListener);
+    }
+
+    public VectorGraphicsConfig getConfig() {
+        return config;
+    }
+
+    public void reconfigure() {
+        if (lastPaintedExtent != null) {
+            lastPaintedExtent = null;
+            resource.issueRefresh();
+        }
+    }
+
+    public void dispose() {
+        if (renderable != null) {
+            renderable.dispose();
+            renderable = null;
+        }
+        resource.getResourceData().removeChangeListener(changeListener);
+    }
+
+    public void paint(IGraphicsTarget target, PaintProperties paintProps)
+            throws VizException {
+        IExtent extent = paintProps.getView().getExtent();
+        if (renderable != null
+                && (lastPaintedExtent == null || !lastPaintedExtent
+                        .equals(extent))) {
+            renderable.dispose();
+            renderable = null;
+        }
+        if (renderable == null) {
+
+            double magnification = resource.getCapability(
+                    MagnificationCapability.class).getMagnification();
+            double ratio = magnification * extent.getWidth()
+                    / paintProps.getCanvasBounds().width;
+            config.setSizeScaler(ratio);
+            renderable = new VectorGraphicsRenderable(getDescriptor(), target,
+                    config);
+            lastPaintedExtent = extent.clone();
+            double density = resource.getCapability(DensityCapability.class)
+                    .getDensity();
+            double minDist = config.getScaledSize() / baseDensity / density;
+            lastPaintedDistance = minDist;
+            Collection<Barb> barbs = this.barbs.runDisclosure(extent, minDist);
+            GeodeticCalculator gc = new GeodeticCalculator();
+            for (Barb barb : barbs) {
+                double dir = barb.getDirection();
+                Coordinate lonLat = barb.getLonLat();
+                Coordinate plotLoc = barb.getLocation();
+                gc.setStartingGeographicPoint(lonLat.x, lonLat.y);
+                double[] world = getDescriptor().pixelToWorld(
+                        new double[] { plotLoc.x, plotLoc.y - 1 });
+                gc.setDestinationGeographicPoint(world[0], world[1]);
+                dir -= gc.getAzimuth();
+                dir = Math.toRadians(dir);
+                renderable.paintBarb(plotLoc, barb.getMagnitude(), dir);
+            }
+        }
+        renderable.setColor(getColor());
+        renderable.paint(target);
+    }
+
+    public String getText(Coordinate pixelLoc) {
+        String text = null;
+        double bestDist = 100;
+        if (renderable != null) {
+            bestDist = renderable.getConfig().getScaledSize() * 2;
+        }
+        for (Barb barb : barbs.getAll()) {
+            double dist = barb.getLocation().distance(pixelLoc);
+            if (dist < bestDist) {
+                bestDist = dist;
+                text = barb.getText();
+            }
+        }
+        return text;
+    }
+
+    protected RGB getColor() {
+        return resource.getCapability(ColorableCapability.class).getColor();
+    }
+
+    public synchronized boolean optimizeDisclosure() {
+        return barbs.calculateStaticDistances();
+    }
+
+    public void addBarb(Coordinate lonLat, double magnitude, double direction) {
+        addBarb(lonLat, magnitude, direction, null, false);
+    }
+
+    public void addBarb(Coordinate lonLat, double magnitude, double direction,
+            boolean checkDuplicate) {
+        addBarb(lonLat, magnitude, direction, null, checkDuplicate);
+    }
+
+    public void addBarb(Coordinate lonLat, double magnitude, double direction,
+            String text) {
+        addBarb(lonLat, magnitude, direction, text, false);
+    }
+
+    public synchronized void addBarb(Coordinate lonLat, double magnitude,
+            double direction, String text, boolean checkDuplicate) {
+        double[] pixel = getDescriptor().worldToPixel(
+                new double[] { lonLat.x, lonLat.y });
+        Coordinate plotLoc = new Coordinate(pixel[0], pixel[1]);
+        double distance = barbs.add(new Barb(lonLat, plotLoc, magnitude,
+                direction, text), checkDuplicate);
+        if (Double.isNaN(distance) || distance > lastPaintedDistance) {
+            IExtent extent = lastPaintedExtent;
+            if (extent != null && extent.contains(pixel)) {
+                resource.issueRefresh();
+                lastPaintedExtent = null;
+            }
+        }
+    }
+
+    public synchronized void reproject() {
+        GenericProgressiveDisclosure<Barb> barbs = this.barbs;
+        this.barbs = new GenericProgressiveDisclosure<>();
+        for (Barb barb : barbs.getAll()) {
+            addBarb(barb.getLonLat(), barb.getMagnitude(), barb.getDirection());
+        }
+    }
+
+    protected IDescriptor getDescriptor() {
+        return resource.getDescriptor();
+    }
+
+    private class Barb implements PlotItem {
+
+        public final Coordinate lonLat;
+
+        public final Coordinate plotLoc;
+
+        public final double magnitude;
+
+        public final double direction;
+
+        public final String text;
+
+        public Barb(Coordinate lonLat, Coordinate plotLoc, double magnitude,
+                double direction, String text) {
+            this.lonLat = lonLat;
+            this.plotLoc = plotLoc;
+            this.magnitude = magnitude;
+            this.direction = direction;
+            this.text = text;
+        }
+
+        public Coordinate getLonLat() {
+            return lonLat;
+        }
+
+        @Override
+        public Coordinate getLocation() {
+            return plotLoc;
+        }
+
+        public double getMagnitude() {
+            return magnitude;
+        }
+
+        public double getDirection() {
+            return direction;
+        }
+
+        public String getText() {
+            return text;
+        }
+
+    }
+
+    public void setBaseDensity(double baseDensity) {
+        this.baseDensity = baseDensity;
+    }
+
+}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotResource.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotResource.java
new file mode 100644
index 0000000000..4bada49793
--- /dev/null
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotResource.java
@@ -0,0 +1,404 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.viz.pointdata.rsc.wind;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.opengis.referencing.FactoryException;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.TransformException;
+
+import com.raytheon.uf.common.dataplugin.PluginDataObject;
+import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
+import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
+import com.raytheon.uf.common.pointdata.PointDataContainer;
+import com.raytheon.uf.common.pointdata.PointDataServerRequest;
+import com.raytheon.uf.common.pointdata.PointDataView;
+import com.raytheon.uf.common.time.BinOffset;
+import com.raytheon.uf.common.time.DataTime;
+import com.raytheon.uf.common.time.TimeRange;
+import com.raytheon.uf.viz.core.IGraphicsTarget;
+import com.raytheon.uf.viz.core.drawables.PaintProperties;
+import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.core.jobs.JobPool;
+import com.raytheon.uf.viz.core.map.IMapDescriptor;
+import com.raytheon.uf.viz.core.point.display.VectorGraphicsConfig;
+import com.raytheon.uf.viz.core.requests.ThriftClient;
+import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
+import com.raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType;
+import com.raytheon.uf.viz.core.rsc.LoadProperties;
+import com.raytheon.viz.pointdata.rsc.wind.WindPlotConfig.SampleFormat;
+import com.vividsolutions.jts.geom.Coordinate;
+
+/**
+ * 
+ * Resource for displaying wind barbs of point data.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- -----------------
+ * Nov 13, 2015  4903     bsteffen  Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bsteffen
+ * @version 1.0
+ */
+public class WindPlotResource extends
+        AbstractVizResource<WindPlotResourceData, IMapDescriptor> {
+
+    private JobPool primaryLoadPool;
+
+    private Job secondaryLoadJob;
+
+    private final Object framesLock = new Object();
+
+    private Map<DataTime, DataFrame> frames;
+
+    protected WindPlotResource(WindPlotResourceData resourceData,
+            LoadProperties loadProperties) {
+        super(resourceData, loadProperties);
+    }
+
+    @Override
+    protected void initInternal(IGraphicsTarget target) throws VizException {
+        synchronized (framesLock) {
+            dataTimes = new CopyOnWriteArrayList<>();
+            frames = new HashMap<DataTime, DataFrame>();
+            primaryLoadPool = new JobPool("Loading Wind Data", 4, false);
+            secondaryLoadJob = new SecondaryUpdateJob();
+            secondaryLoadJob.setSystem(true);
+            secondaryLoadJob.schedule();
+        }
+    }
+
+    @Override
+    protected void disposeInternal() {
+        secondaryLoadJob.cancel();
+        secondaryLoadJob = null;
+        primaryLoadPool.cancel();
+        primaryLoadPool = null;
+        synchronized (framesLock) {
+            for (DataFrame frame : frames.values()) {
+                frame.getRenderable().dispose();
+            }
+            this.frames = null;
+        }
+
+    }
+
+    @Override
+    protected void paintInternal(IGraphicsTarget target,
+            PaintProperties paintProps) throws VizException {
+        DataTime time = paintProps.getDataTime();
+        if (time == null) {
+            return;
+        }
+        DataFrame frame;
+        synchronized (framesLock) {
+            frame = frames.get(time);
+            if (frame == null) {
+                frame = addFrame(time);
+            }
+        }
+        primaryLoadPool.schedule(frame);
+        frame.getRenderable().paint(target, paintProps);
+    }
+
+    protected DataFrame addFrame(DataTime dataTime) {
+        synchronized (framesLock) {
+            DataFrame frame = frames.get(dataTime);
+            if (frame == null) {
+                frame = new DataFrame(dataTime);
+                int index = Collections.binarySearch(dataTimes, dataTime);
+                if (index < 0) {
+                    /* Keep the list sorted. */
+                    dataTimes.add(-1 * index - 1, dataTime);
+                }
+                frames.put(dataTime, frame);
+            }
+            return frame;
+        }
+    }
+
+    @Override
+    public void remove(DataTime dataTime) {
+        synchronized (framesLock) {
+            frames.remove(dataTime);
+            super.remove(dataTime);
+        }
+    }
+
+    @Override
+    public String inspect(ReferencedCoordinate coord) throws VizException {
+        if (resourceData.getConfig().getSample() == null) {
+            return null;
+        }
+        DataTime time = descriptor.getTimeForResource(this);
+        if (time == null) {
+            return null;
+        }
+        DataFrame frame;
+        synchronized (framesLock) {
+            frame = frames.get(time);
+        }
+        if (frame == null) {
+            return null;
+        }
+        try {
+            String text = frame.getRenderable().getText(
+                    coord.asPixel(descriptor.getGridGeometry()));
+            if (text == null) {
+                text = "NO DATA";
+            }
+            return text;
+        } catch (TransformException | FactoryException e) {
+            throw new VizException("Unable to transform point for inspect.", e);
+        }
+    }
+
+    @Override
+    public void project(CoordinateReferenceSystem crs) throws VizException {
+        synchronized (framesLock) {
+            for (DataFrame frame : frames.values()) {
+                frame.reproject();
+            }
+        }
+    }
+
+    @Override
+    public String getName() {
+        String name = resourceData.getLegend();
+        if (name == null) {
+            name = "Wind";
+        }
+        return name;
+    }
+
+    protected void loadData(DataTime dataTime, WindPlotRenderable renderable,
+            boolean initialLoad) {
+        WindPlotConfig config = resourceData.getConfig();
+        SampleFormat sample = config.getSample();
+        Map<String, RequestConstraint> constraints = new HashMap<>(
+                resourceData.getFullDataMetadataMap());
+        constraints.put(PointDataServerRequest.REQUEST_MODE_KEY,
+                new RequestConstraint(PointDataServerRequest.REQUEST_MODE_2D));
+        constraints.put(PointDataServerRequest.REQUEST_PARAMETERS_KEY,
+                new RequestConstraint(config.getUniqueParameters()));
+
+        BinOffset binOffset = resourceData.getBinOffset();
+        if (binOffset == null) {
+            constraints.put(PluginDataObject.DATATIME_ID,
+                    new RequestConstraint(dataTime.toString()));
+        } else {
+            TimeRange range = binOffset.getTimeRange(dataTime);
+            constraints.put(PluginDataObject.REFTIME_ID, new RequestConstraint(
+                    new DataTime(range.getStart()).toString(), new DataTime(
+                            range.getEnd()).toString()));
+        }
+        PointDataServerRequest request = new PointDataServerRequest();
+        request.setRcMap(constraints);
+        try {
+            PointDataContainer container = (PointDataContainer) ThriftClient
+                    .sendRequest(request);
+            if (container == null) {
+                return;
+            }
+            for (int i = 0; i < container.getAllocatedSz(); i += 1) {
+                PointDataView view = container.readRandom(i);
+                double longitude = config.getLongitude().getNumericValue(view);
+                double latitude = config.getLatitude().getNumericValue(view);
+                double magnitude = config.getSpeed().getNumericValue(view);
+                double direction = config.getDirection().getNumericValue(view);
+                Coordinate lonLat = new Coordinate(longitude, latitude);
+                if (sample == null) {
+                    renderable.addBarb(lonLat, magnitude, direction,
+                            !initialLoad);
+                } else {
+                    WindPlotParameter[] fields = sample.getFields();
+                    Object[] args = new Object[fields.length];
+                    for (int c = 0; c < args.length; c += 1) {
+                        args[c] = fields[c].getValue(view);
+                    }
+                    String text = String.format(sample.getText(), args)
+                            .toString();
+                    renderable.addBarb(lonLat, magnitude, direction, text,
+                            !initialLoad);
+                }
+
+            }
+        } catch (VizException e) {
+            statusHandler.error("Error retrieving wind data.", e);
+        }
+    }
+
+    @Override
+    protected void resourceDataChanged(ChangeType type, Object updateObject) {
+        if (type == ChangeType.DATA_UPDATE
+                && updateObject instanceof PluginDataObject[]) {
+            synchronized (framesLock) {
+                BinOffset binOffset = resourceData.getBinOffset();
+                for (PluginDataObject pdo : (PluginDataObject[]) updateObject) {
+                    DataTime time = pdo.getDataTime();
+                    if (binOffset != null) {
+                        time = binOffset.getNormalizedTime(time);
+                    }
+                    DataFrame frame = frames.get(time);
+                    if (frame != null) {
+                        frame.update();
+                    }
+                }
+                secondaryLoadJob.schedule();
+            }
+        }
+    }
+
+
+    private class DataFrame implements Runnable {
+
+        private final DataTime time;
+
+        private final WindPlotRenderable renderable;
+
+        private boolean needsReproject = false;
+
+        private boolean needsData = true;
+
+        private boolean initialLoad = true;
+
+        public DataFrame(DataTime time) {
+            this.time = time;
+            this.renderable = new WindPlotRenderable(WindPlotResource.this);
+            renderable.setBaseDensity(resourceData.getBaseDensity());
+            VectorGraphicsConfig config = renderable.getConfig();
+            config.setBaseSize(20);
+            config.setCalmCircleSizeRatio(0.3);
+        }
+
+        public WindPlotRenderable getRenderable() {
+            return renderable;
+        }
+
+        public void update() {
+            needsData = true;
+        }
+
+        public void reproject() {
+            needsReproject = true;
+        }
+
+        @Override
+        public void run() {
+            asyncUpdate();
+        }
+
+        public synchronized boolean asyncUpdate() {
+            boolean result = needsReproject | needsData;
+            if (needsReproject) {
+                needsReproject = false;
+                renderable.reproject();
+            }
+            if (needsData) {
+                needsData = false;
+                loadData(time, renderable, initialLoad);
+                initialLoad = false;
+            }
+            return result;
+        }
+
+    }
+
+    private class SecondaryUpdateJob extends Job {
+
+        public SecondaryUpdateJob() {
+            super("Updating wind data.");
+            setSystem(true);
+        }
+
+        @Override
+        protected IStatus run(IProgressMonitor monitor) {
+            List<DataFrame> frameList;
+            synchronized (framesLock) {
+                if (frames == null) {
+                    return Status.OK_STATUS;
+                }
+                frameList = new ArrayList<>(frames.values());
+            }
+            for (DataFrame frame : frameList) {
+                if (frame.asyncUpdate()) {
+                    /*
+                     * Restart after every frame to make sure frames haven't
+                     * been added or removed while it was updating.
+                     */
+                    schedule();
+                    return Status.OK_STATUS;
+                }
+            }
+            DataTime[] times = descriptor.getFramesInfo().getTimeMap()
+                    .get(WindPlotResource.this);
+            if (times == null) {
+                return Status.OK_STATUS;
+            }
+            boolean added = false;
+            for (DataTime time : times) {
+                if (time == null) {
+                    continue;
+                }
+                synchronized (framesLock) {
+                    if (!frames.containsKey(time)) {
+                        addFrame(time);
+                        added = true;
+                    }
+                }
+            }
+            if (added) {
+                /*
+                 * Restart to ensure data is requested before optimization.
+                 */
+                schedule();
+                return Status.OK_STATUS;
+            }
+            boolean finished = true;
+            for (DataFrame frame : frameList) {
+                if (!frame.getRenderable().optimizeDisclosure()) {
+                    finished = false;
+                }
+            }
+            if (!finished) {
+                schedule();
+            }
+            return Status.OK_STATUS;
+        }
+
+    }
+
+}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotResourceData.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotResourceData.java
new file mode 100644
index 0000000000..d451e1bf2c
--- /dev/null
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/wind/WindPlotResourceData.java
@@ -0,0 +1,199 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.viz.pointdata.rsc.wind;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.JAXB;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+import com.raytheon.uf.common.dataplugin.PluginDataObject;
+import com.raytheon.uf.common.dataquery.requests.RequestConstraint;
+import com.raytheon.uf.common.dataquery.requests.RequestableMetadataMarshaller;
+import com.raytheon.uf.common.localization.IPathManager;
+import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
+import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
+import com.raytheon.uf.viz.core.rsc.LoadProperties;
+
+/**
+ * 
+ * Resource data for displaying wind barbs of point data.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- -----------------
+ * Nov 13, 2015  4903     bsteffen  Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bsteffen
+ * @version 1.0
+ */
+@XmlAccessorType(XmlAccessType.NONE)
+public class WindPlotResourceData extends AbstractRequestableResourceData {
+
+    @XmlAttribute
+    private String legend;
+
+    @XmlAttribute
+    private String windFile;
+
+    @XmlAttribute
+    private double baseDensity = 1.0;
+
+    @XmlJavaTypeAdapter(value = RequestableMetadataMarshaller.class)
+    protected HashMap<String, RequestConstraint> dataMetadataMap;
+
+    @XmlTransient
+    protected WindPlotConfig config;
+
+    public WindPlotResourceData() {
+        /*
+         * Resource data should never instigate a trip to the DB, the resource
+         * is responsible for requesting its own stuff.
+         */
+        setRetrieveData(false);
+        setUpdatingOnMetadataOnly(true);
+    }
+
+    @Override
+    protected AbstractVizResource<?, ?> constructResource(
+            LoadProperties loadProperties, PluginDataObject[] objects)
+            throws VizException {
+        if (config == null) {
+            IPathManager pathManager = PathManagerFactory.getPathManager();
+            String path = "plotWind" + IPathManager.SEPARATOR + windFile;
+            LocalizationFile localizedFile = pathManager
+                    .getStaticLocalizationFile(path);
+            try (InputStream is = localizedFile.openInputStream()) {
+                config = JAXB.unmarshal(is, WindPlotConfig.class);
+            } catch (Exception e) {
+                throw new VizException("Error loading " + path, e);
+            }
+        }
+        return new WindPlotResource(this, loadProperties);
+    }
+
+    public String getLegend() {
+        return legend;
+    }
+
+    public void setLegend(String legend) {
+        this.legend = legend;
+    }
+
+    public String getWindFile() {
+        return windFile;
+    }
+
+    public void setWindFile(String windFile) {
+        this.windFile = windFile;
+    }
+
+    public double getBaseDensity() {
+        return baseDensity;
+    }
+
+    public void setBaseDensity(double baseDensity) {
+        this.baseDensity = baseDensity;
+    }
+
+    public HashMap<String, RequestConstraint> getDataMetadataMap() {
+        return dataMetadataMap;
+    }
+
+    public void setDataMetadataMap(
+            HashMap<String, RequestConstraint> dataMetadataMap) {
+        this.dataMetadataMap = dataMetadataMap;
+    }
+
+    public Map<String, RequestConstraint> getFullDataMetadataMap() {
+        Map<String, RequestConstraint> result = new HashMap<>(getMetadataMap());
+        if (dataMetadataMap != null) {
+            result.putAll(dataMetadataMap);
+        }
+        return result;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result
+                + ((dataMetadataMap == null) ? 0 : dataMetadataMap.hashCode());
+        result = prime * result + ((legend == null) ? 0 : legend.hashCode());
+        result = prime * result
+                + ((windFile == null) ? 0 : windFile.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (!super.equals(obj)) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        WindPlotResourceData other = (WindPlotResourceData) obj;
+        if (dataMetadataMap == null) {
+            if (other.dataMetadataMap != null) {
+                return false;
+            }
+        } else if (!dataMetadataMap.equals(other.dataMetadataMap)) {
+            return false;
+        }
+        if (legend == null) {
+            if (other.legend != null) {
+                return false;
+            }
+        } else if (!legend.equals(other.legend)) {
+            return false;
+        }
+        if (windFile == null) {
+            if (other.windFile != null) {
+                return false;
+            }
+        } else if (!windFile.equals(other.windFile)) {
+            return false;
+        }
+        return true;
+    }
+
+    public WindPlotConfig getConfig() {
+        return config;
+    }
+
+}
diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java
index bb5a9d2ade..b6498b366a 100644
--- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java
+++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/util/PointDataCubeAdapter.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -49,20 +49,24 @@ import com.raytheon.viz.pointdata.PointDataRequest;
  * sets. It is important to note that derived parameters for point data is much
  * different than grid. The primary difference is that while grid is combining
  * multiple records that represent different parameters, point data is combining
- * multiple paramters within a single record. As a result point data does not
+ * multiple parameters within a single record. As a result point data does not
  * use the time and space matching functions of derived parameters since they
  * are guaranteed to match for all parameters within a record.
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jun 1, 2009             brockwoo    Initial creation
- * Nov 21, 2009 #3576      rjpeter     Refactored use of DerivParamDesc.
- * Sep 09, 2014  3356      njensen     Remove CommunicationException
+ *
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- ----------------------------------
+ * Jun 01, 2009  2149     brockwoo  Initial creation
+ * Nov 21, 2009  3576     rjpeter   Refactored use of DerivParamDesc.
+ * Sep 09, 2014  3356     njensen   Remove CommunicationException
+ * Nov 16, 2015  5119     bsteffen  Remove bufquikscat
+ * Feb 09, 2016  5283     nabowle   Remove NGM MOS support.
+ *
  * </pre>
- * 
+ *
  * @author brockwoo
  * @version 1.0
  */
@@ -74,11 +78,11 @@ public class PointDataCubeAdapter extends DefaultDataCubeAdapter {
     public static String PLUGIN_NAME = PointDataInventory.PLUGIN_NAME;
 
     private static String[] supportedPlugins = { "obs", "madis",
-            "modelsounding", "bufrssmi", "bufrquikscat", "lsr", "sfcobs",
-            "goessounding", "bufrascat", "poessounding", "profiler", "bufrua",
-            "ldadmesonet", "ldadhydro", "qc", "fssobs", "bufrmosAVN",
-            "bufrmosETA", "bufrmosGFS", "bufrmosHPC", "bufrmosLAMP",
-            "bufrmosMRF", "bufrmosNGM", "airep", "pirep", "nctaf" };
+            "modelsounding", "bufrssmi", "lsr", "sfcobs", "goessounding",
+            "bufrascat", "poessounding", "profiler", "bufrua", "ldadmesonet",
+            "ldadhydro", "qc", "fssobs", "bufrmosAVN", "bufrmosETA",
+            "bufrmosGFS", "bufrmosHPC", "bufrmosLAMP", "bufrmosMRF", "airep",
+            "pirep", "nctaf" };
 
     protected AbstractPointDataInventory inventory;
 
@@ -86,12 +90,6 @@ public class PointDataCubeAdapter extends DefaultDataCubeAdapter {
         super(PLUGIN_NAME);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter#getInventory()
-     */
     @Override
     public Object getInventory() {
         if (inventory == null) {
@@ -100,13 +98,6 @@ public class PointDataCubeAdapter extends DefaultDataCubeAdapter {
         return this.inventory;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter#getPoints(java
-     * .lang.String[], java.util.Map)
-     */
     @Override
     public PointDataContainer getPoints(String plugin, String[] parameters,
             Map<String, RequestConstraint> queryParams)
@@ -231,25 +222,11 @@ public class PointDataCubeAdapter extends DefaultDataCubeAdapter {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter#getSupportedPlugin
-     * ()
-     */
     @Override
     public String[] getSupportedPlugins() {
         return supportedPlugins;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.datastructure.IDataCubeAdapter#initInventory
-     * (java.util.Map)
-     */
     @Override
     public void initInventory() {
         if (inventory == null) {
diff --git a/cave/com.raytheon.viz.radar/localization/menus/tools/radar-tools-index.xml b/cave/com.raytheon.viz.radar/localization/menus/tools/radar-tools-index.xml
new file mode 100644
index 0000000000..a2c3b0edde
--- /dev/null
+++ b/cave/com.raytheon.viz.radar/localization/menus/tools/radar-tools-index.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuContributionFile>
+    <include installTo="menu:tools?after=tools.Rad"
+        fileName="menus/tools/radar-tools-menu.xml">
+    </include>
+</menuContributionFile>
diff --git a/cave/com.raytheon.viz.radar/localization/menus/tools/radar-tools-menu.xml b/cave/com.raytheon.viz.radar/localization/menus/tools/radar-tools-menu.xml
new file mode 100644
index 0000000000..78d5994da6
--- /dev/null
+++ b/cave/com.raytheon.viz.radar/localization/menus/tools/radar-tools-menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <contribute xsi:type="command"
+        commandId="com.raytheon.viz.radar.ui.RadarDisplayControls"
+        menuText="Radar Display Controls..." />
+
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.radar/plugin.xml b/cave/com.raytheon.viz.radar/plugin.xml
index d3f3bb4e7c..ee3b1cdf04 100644
--- a/cave/com.raytheon.viz.radar/plugin.xml
+++ b/cave/com.raytheon.viz.radar/plugin.xml
@@ -172,14 +172,6 @@
          </menu>
       </menuContribution>
    </extension>
-   <extension
-         point="org.eclipse.ui.themes">
-      <fontDefinition
-            id="com.raytheon.viz.radar.rsc.graphic.RadarGraphicsPage"
-            label="Radar Graphics Font"
-            value="Monospaced-regular-12">
-      </fontDefinition>
-   </extension>
    <extension
          point="com.raytheon.uf.viz.core.graphicsExtension">
       <graphicsExtension
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarTextResource.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarTextResource.java
index da43a6ff09..2a75d01c6c 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarTextResource.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/RadarTextResource.java
@@ -54,9 +54,10 @@ import com.raytheon.viz.radar.rsc.mosaic.RadarMosaicResource;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jul 29, 2010            mschenke     Initial creation
- * Aug 14, 2014 3523       mapeters     Updated deprecated {@link DrawableString#textStyle} 
- *                                      assignments.
+ * Jul 29, 2010            mschenke    Initial creation
+ * Aug 14, 2014 3523       mapeters    Updated deprecated {@link DrawableString#textStyle} 
+ *                                     assignments.
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -142,7 +143,7 @@ public class RadarTextResource extends
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
         // initialize the font
-        textFont = target.initializeFont(java.awt.Font.DIALOG, 11.0f,
+        textFont = target.initializeFont(java.awt.Font.DIALOG, 9,
                 new IFont.Style[] {});
     }
 
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
index 41ecc48dde..c11e1c3990 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
@@ -20,23 +20,13 @@
 
 package com.raytheon.viz.radar.rsc.graphic;
 
-import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
-import java.awt.image.IndexColorModel;
 import java.awt.image.RenderedImage;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
-import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.util.XMLResourceDescriptor;
 import org.eclipse.swt.graphics.RGB;
 import org.geotools.coverage.grid.GeneralGridGeometry;
 import org.opengis.referencing.FactoryException;
@@ -47,25 +37,21 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import com.raytheon.uf.common.dataplugin.radar.level3.HdaHailPacket.HdaHailPoint;
-import com.raytheon.uf.common.dataplugin.radar.level3.MesocyclonePacket.MesocyclonePoint;
 import com.raytheon.uf.common.dataplugin.radar.level3.SCITDataPacket;
 import com.raytheon.uf.common.dataplugin.radar.level3.SCITDataPacket.SCITDataCell;
-import com.raytheon.uf.common.dataplugin.radar.level3.STICirclePacket.STICirclePoint;
 import com.raytheon.uf.common.dataplugin.radar.level3.SpecialGraphicSymbolPacket.SpecialGraphicPoint;
 import com.raytheon.uf.common.dataplugin.radar.level3.SymbologyPacket;
 import com.raytheon.uf.common.dataplugin.radar.level3.TVSPacket.TVSPoint;
 import com.raytheon.uf.common.dataplugin.radar.level3.TextSymbolPacket;
-import com.raytheon.uf.common.dataplugin.radar.level3.WindBarbPacket.WindBarbPoint;
 import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
 import com.raytheon.uf.common.geospatial.ReferencedObject.Type;
-import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.viz.core.IGraphicsTarget;
 import com.raytheon.uf.viz.core.data.IRenderedImageCallback;
 import com.raytheon.uf.viz.core.drawables.IDescriptor;
 import com.raytheon.uf.viz.core.drawables.IImage;
 import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.uf.viz.core.point.display.PointWindDisplay;
-import com.raytheon.uf.viz.core.point.display.PointWindDisplay.DisplayType;
+import com.raytheon.uf.viz.core.point.svg.SVGImageFactory;
 import com.raytheon.viz.radar.RadarHelper;
 import com.raytheon.viz.radar.ui.RadarDisplayControls;
 import com.raytheon.viz.radar.ui.RadarDisplayManager;
@@ -79,13 +65,14 @@ import com.vividsolutions.jts.geom.Coordinate;
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jan 13, 2009            chammack     Initial creation
- * Jan 20, 2010 DR 4059    Zihou Wang   Display more GSM status and
- *                                      correct display features.
- * Aug 11, 2014  3504      mapeters     Replaced deprecated IODataPreparer
- *                                      instances with IRenderedImageCallback.
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Jan 13, 2009            chammack   Initial creation
+ * Jan 20, 2010  4059      Zihou Wang Display more GSM status and
+ *                                    correct display features.
+ * Aug 11, 2014  3504      mapeters   Replaced deprecated IODataPreparer
+ *                                    instances with IRenderedImageCallback.
+ * Oct 37, 2015  4798      bsteffen   Use SVGImageFactory
  * 
  * </pre>
  * 
@@ -105,9 +92,6 @@ public class RadarGraphicFunctions {
     /** ID in the svg for sti forecast symbols */
     private static final String STI_FORE_SYMBOL = "STIForecastSymbol";
 
-    /** ID in the svg for sti hexagon symbols */
-    private static final String STI_HEX_SYMBOL = "STIHexagonSymbol";
-
     /** Index of the font for the past symbol */
     private static final String PAST_SYM = "056";
 
@@ -152,16 +136,7 @@ public class RadarGraphicFunctions {
     /** ID in the svg for tvs */
     private static final String TVS_ATTRIB = "tvs";
 
-    static BufferedImage colorMapImage = null;
-
-    private static UserAgentAdapter userAgentAdapter = new UserAgentAdapter();
-
-    private static BridgeContext bridgeContext = new BridgeContext(
-            userAgentAdapter);
-
-    private static GVTBuilder builder = new GVTBuilder();
-
-    private static Map<String, Document> docMap = new HashMap<String, Document>();
+    private static Map<String, RadarSVGImageFactory> imageFactoryMap = new HashMap<>();
 
     public static enum MesocycloneType {
         CORRELATED_SHEAR, CORRELATED_SHEAR_EXTRAPOLATED, MESOCYCLONE, MESOCYCLONE_WITH_SPIKES
@@ -272,8 +247,7 @@ public class RadarGraphicFunctions {
             objArr.put(HAIL_SIZE, size);
 
             BufferedImage img = createImage(objArr, "HailIndex.svg", color);
-            IImage image = convertBufferedImage(target, img, UUID.randomUUID()
-                    .toString());
+            IImage image = convertBufferedImage(target, img);
             PlotObject po = new PlotObject();
             po.image = image;
             ReferencedCoordinate rc = new ReferencedCoordinate(
@@ -294,31 +268,6 @@ public class RadarGraphicFunctions {
         return null;
     }
 
-    /**
-     * Create a set of plot objects from the TVSPacket and ETVSPacket
-     * 
-     * @param packet
-     * @param target
-     * @param gridGeometry
-     * @param descriptor
-     * @return
-     * @throws VizException
-     */
-    public static List<PlotObject> createTVS(SymbologyPacket packet,
-            IGraphicsTarget target, GeneralGridGeometry gridGeometry,
-            IDescriptor descriptor, RGB color) throws VizException {
-        List<PlotObject> images = new ArrayList<PlotObject>();
-        TVSPoint[] points = (TVSPoint[]) RadarHelper.getItems(packet).toArray();
-        if (points == null)
-            return images;
-
-        for (TVSPoint point : points) {
-            images.add(createTVS(point, target, gridGeometry, descriptor, color));
-        }
-
-        return images;
-    }
-
     public static List<PlotObject> createTVS(SpecialGraphicPoint currPt,
             boolean isElevated, IGraphicsTarget target,
             GeneralGridGeometry gridGeometry, IDescriptor descriptor,
@@ -338,7 +287,7 @@ public class RadarGraphicFunctions {
                 target, gridGeometry, descriptor, color);
     }
 
-    public static PlotObject createTVS(int i, int j, boolean isElevated,
+    protected static PlotObject createTVS(int i, int j, boolean isElevated,
             boolean isExtrapolated, IGraphicsTarget target,
             GeneralGridGeometry gridGeometry, IDescriptor descriptor, RGB color)
             throws VizException {
@@ -355,8 +304,7 @@ public class RadarGraphicFunctions {
         }
 
         BufferedImage img = createImage(objArr, "TVS.svg", color);
-        IImage image = convertBufferedImage(target, img, UUID.randomUUID()
-                .toString());
+        IImage image = convertBufferedImage(target, img);
         PlotObject po = new PlotObject();
         po.image = image;
         ReferencedCoordinate rc = new ReferencedCoordinate(
@@ -436,7 +384,8 @@ public class RadarGraphicFunctions {
         }
 
         // Get the SVG
-        Document document = loadSVG(svgToGet);
+        RadarSVGImageFactory imageFactory = getImageFactory(svgToGet);
+        Document document = imageFactory.getDocument();
 
         // Load the values into the SVG
         // Set radius
@@ -494,11 +443,10 @@ public class RadarGraphicFunctions {
         }
 
         // Get the buffered image from SVG
-        BufferedImage img = getBufferedImage(document, color);
+        BufferedImage img = imageFactory.createSingleColorImage(color);
 
         // Plot
-        IImage image = convertBufferedImage(target, img, UUID.randomUUID()
-                .toString());
+        IImage image = convertBufferedImage(target, img);
         PlotObject po = new PlotObject();
         po.image = image;
 
@@ -532,146 +480,6 @@ public class RadarGraphicFunctions {
         return images;
     }
 
-    public static List<PlotObject> createMesocycloneImage(
-            SymbologyPacket packet, IGraphicsTarget target,
-            GeneralGridGeometry gridGeometry, IDescriptor descriptor,
-            MesocycloneType type, RGB color) throws VizException,
-            TransformException, FactoryException {
-        List<PlotObject> images = new ArrayList<PlotObject>();
-        MesocyclonePoint[] points = (MesocyclonePoint[]) RadarHelper.getItems(
-                packet).toArray();
-
-        if (points == null)
-            return images;
-
-        for (MesocyclonePoint point : points) {
-            PlotObject po = createMesocycloneImage(point.getI(), point.getJ(),
-                    point.getMesoCycloneRadius(), target, gridGeometry,
-                    descriptor, type, color);
-
-            images.add(po);
-        }
-
-        return images;
-    }
-
-    public static List<PlotObject> createMesocycloneImage(
-            SymbologyPacket packet, IGraphicsTarget target,
-            GeneralGridGeometry gridGeometry, IDescriptor descriptor, RGB color)
-            throws VizException, TransformException, FactoryException {
-        return createMesocycloneImage(packet, target, gridGeometry, descriptor,
-                MesocycloneType.MESOCYCLONE, color);
-    }
-
-    /**
-     * Create a set of plot objects from a WindBarbPacket, making a table
-     * 
-     * @param packet
-     * @param target
-     * @param gridGeometry
-     * @param descriptor
-     * @return
-     * @throws VizException
-     */
-    public static List<PlotObject> createWindBarb(SymbologyPacket packet,
-            IGraphicsTarget target, IDescriptor descriptor) throws VizException {
-
-        List<PlotObject> images = new ArrayList<PlotObject>();
-        WindBarbPoint[] points = (WindBarbPoint[]) RadarHelper.getItems(packet)
-                .toArray();
-        if (points == null)
-            return images;
-
-        int imgSize = 64;
-        for (WindBarbPoint point : points) {
-            PointWindDisplay barb = new PointWindDisplay(imgSize * 0.4, 1, 0, 0);
-            RGB color;
-            barb.setImageParameters(imgSize, imgSize, 255, 255, 255, 1);
-
-            switch (point.getColorValue()) {
-            case 1:
-                color = RadarHelper.GREEN;
-                break;
-            case 2:
-                color = RadarHelper.YELLOW;
-                break;
-            case 3:
-                color = RadarHelper.BRIGHT_RED;
-                break;
-            case 4:
-                color = RadarHelper.LIGHT_BLUE;
-                break;
-            case 5:
-                color = RadarHelper.MED_PURPLE;
-                break;
-            default:
-                color = RadarHelper.WHITE;
-                break;
-            }
-            barb.setColor(color);
-            barb.setWind(point.getWindBarbDir(), point.getWindBarbSpd(), true);
-            BufferedImage img = barb.getWindImage(false, DisplayType.BARB, 1);
-            IImage image = convertBufferedImage(target, img, UUID.randomUUID()
-                    .toString());
-            PlotObject po = new PlotObject();
-            po.image = image;
-            ReferencedCoordinate rc = new ReferencedCoordinate(
-                    RadarGraphicsPage.rectifyCoordinate(new Coordinate(point
-                            .getI(), point.getJ())),
-                    descriptor.getGridGeometry(), Type.GRID_CENTER);
-            try {
-                // po.coord = rc.asPixel(descriptor);
-                po.coord = new Coordinate(point.i, point.j);
-                // adjust y coord per original code
-                // po.pixelOffset = new int[] { 0, 8 };
-                po.pixelOffset = new int[] { 0, 0 };
-            } catch (Exception e) {
-                throw new VizException("Unable to transform coordinates", e);
-            }
-            images.add(po);
-        }
-
-        return images;
-    }
-
-    public static List<PlotObject> createStormTrackIndexCircle(
-            SymbologyPacket packet, IGraphicsTarget target,
-            GeneralGridGeometry gridGeometry, IDescriptor descriptor,
-            int hexOrCircle, RGB color) throws VizException {
-        List<PlotObject> images = new ArrayList<PlotObject>();
-        STICirclePoint[] points = (STICirclePoint[]) RadarHelper.getItems(
-                packet).toArray();
-        if (points == null)
-            return images;
-
-        for (STICirclePoint point : points) {
-            Map<String, Object> objArr = new HashMap<String, Object>();
-
-            // TODO no type of product used as of 2/17/09
-            BufferedImage img = createImage(objArr, "TVS.svg", color);
-            IImage image = convertBufferedImage(target, img, UUID.randomUUID()
-                    .toString());
-            PlotObject po = new PlotObject();
-            po.image = image;
-            ReferencedCoordinate rc = new ReferencedCoordinate(
-                    RadarGraphicsPage.rectifyCoordinate(new Coordinate(point
-                            .getI(), point.getJ())), gridGeometry,
-                    Type.GRID_CENTER);
-            try {
-                po.coord = rc.asPixel(descriptor.getGridGeometry());
-                // adjust y coord per original code
-                po.pixelOffset = new int[] { 0, 8 };
-            } catch (Exception e) {
-                throw new VizException("Unable to transform coordinates", e);
-            }
-
-            images.add(po);
-
-        }
-
-        return images;
-    }
-
     /**
      * 
      * @param packet
@@ -718,8 +526,7 @@ public class RadarGraphicFunctions {
                 break;
             }
             BufferedImage img = createImage(objArr, "STI.svg", color);
-            IImage image = convertBufferedImage(target, img, UUID.randomUUID()
-                    .toString());
+            IImage image = convertBufferedImage(target, img);
             PlotObject po = new PlotObject();
             po.image = image;
             ReferencedCoordinate rc = new ReferencedCoordinate(
@@ -740,7 +547,7 @@ public class RadarGraphicFunctions {
         return images;
     }
 
-    public static PlotObject createDMDSTIImage(ReferencedCoordinate rc,
+    protected static PlotObject createDMDSTIImage(ReferencedCoordinate rc,
             String type, IGraphicsTarget target,
             GeneralGridGeometry gridGeometry, IDescriptor descriptor, RGB color)
             throws VizException {
@@ -762,8 +569,7 @@ public class RadarGraphicFunctions {
         }
 
         BufferedImage img = createImage(objArr, "STI.svg", color);
-        IImage image = convertBufferedImage(target, img, UUID.randomUUID()
-                .toString());
+        IImage image = convertBufferedImage(target, img);
 
         po.image = image;
 
@@ -793,115 +599,70 @@ public class RadarGraphicFunctions {
     private static synchronized BufferedImage createImage(
             Map<String, Object> objs, String plotModelFile, RGB rgb)
             throws VizException {
-        // Get the SVG
-        Document document = loadSVG(plotModelFile);
-        // Load the values into the SVG
-        setSVGValues(objs, document);
-
-        // Get the buffered image from SVG
-        BufferedImage bufferedImage = getBufferedImage(document, rgb);
-
-        return bufferedImage;
+        RadarSVGImageFactory imageFactory = getImageFactory(plotModelFile);
+        imageFactory.setSVGValues(objs);
+        return imageFactory.createSingleColorImage(rgb);
     }
 
-    private static BufferedImage getBufferedImage(Document document, RGB rgb) {
-        Element svgRoot = document.getDocumentElement();
-        int originalPlotModelWidth = Integer.parseInt(svgRoot.getAttributeNS(
-                null, "width"));
-        int originalPlotModelHeight = Integer.parseInt(svgRoot.getAttributeNS(
-                null, "height"));
-
-        byte[] red = new byte[] { 0, (byte) rgb.red };
-        byte[] green = new byte[] { 0, (byte) rgb.green };
-        byte[] blue = new byte[] { 0, (byte) rgb.blue };
-
-        IndexColorModel tm = new IndexColorModel(8, 2, red, green, blue, 0);
-
-        BufferedImage bufferedImage = new BufferedImage(originalPlotModelWidth,
-                originalPlotModelHeight, BufferedImage.TYPE_BYTE_INDEXED, tm);
-        Graphics2D g2d = bufferedImage.createGraphics();
-
-        GraphicsNode theGraphicsNode = builder.build(bridgeContext, document);
-        theGraphicsNode.primitivePaint(g2d);
-        theGraphicsNode.paint(g2d);
-        // Cleanup and return image
-        g2d.dispose();
-
-        return bufferedImage;
+    private static RadarSVGImageFactory getImageFactory(String plotModelFile)
+            throws VizException {
+        RadarSVGImageFactory imageFactory = imageFactoryMap.get(plotModelFile);
+        if(imageFactory == null){
+            imageFactory = new RadarSVGImageFactory(plotModelFile);
+        }
+        return imageFactory;
     }
 
-    private static void setSVGValues(Map<String, Object> objs, Document document) {
-        Element plot = document.getElementById("plotData");
-        NodeList plotElements = plot.getChildNodes();
-        for (int i = 0; i < plotElements.getLength(); i++) {
-            if (Node.ELEMENT_NODE == plotElements.item(i).getNodeType()) {
-                Element plotElement = (Element) plotElements.item(i);
-                String id = plotElement.getAttribute("id");
+    /**
+     * Converting the buffered image to a IGraphicsTarget API.
+     */
+    protected static IImage convertBufferedImage(IGraphicsTarget target,
+            final BufferedImage img) {
+        return target.initializeRaster(new IRenderedImageCallback() {
+            @Override
+            public RenderedImage getImage() throws VizException {
+                return img;
+            }
+        });
+    }
 
-                if (id != null && objs.containsKey(id)) {
-                    Object value = objs.get(id);
-                    plotElement.getChildNodes().item(0)
-                            .setNodeValue(value.toString());
+    private static class RadarSVGImageFactory extends SVGImageFactory {
+
+        public RadarSVGImageFactory(String localizationPath)
+                throws VizException {
+            super(RADAR_PLOTMODEL_DIR + IPathManager.SEPARATOR
+                    + localizationPath);
+        }
+
+        public BufferedImage createSingleColorImage(RGB color) {
+            Element svgRoot = document.getDocumentElement();
+            int width = Integer.parseInt(svgRoot.getAttributeNS(null, "width"));
+            int height = Integer.parseInt(svgRoot
+                    .getAttributeNS(null, "height"));
+            return super.createSingleColorImage(color, width, height);
+        }
+
+        public Document getDocument() {
+            return document;
+        }
+
+        public void setSVGValues(Map<String, Object> objs) {
+            Element plot = document.getElementById("plotData");
+            NodeList plotElements = plot.getChildNodes();
+            for (int i = 0; i < plotElements.getLength(); i++) {
+                if (Node.ELEMENT_NODE == plotElements.item(i).getNodeType()) {
+                    Element plotElement = (Element) plotElements.item(i);
+                    String id = plotElement.getAttribute("id");
+
+                    if (id != null && objs.containsKey(id)) {
+                        Object value = objs.get(id);
+                        plotElement.getChildNodes().item(0)
+                                .setNodeValue(value.toString());
+                    }
                 }
             }
         }
 
     }
 
-    private static Document loadSVG(String plotModelFile) throws VizException {
-        Document document = docMap.get(plotModelFile);
-        if (document == null) {
-
-            String parser = XMLResourceDescriptor.getXMLParserClassName();
-            SAXSVGDocumentFactory f = new SAXSVGDocumentFactory(parser);
-
-            try {
-                document = f.createDocument(PathManagerFactory
-                        .getPathManager()
-                        .getStaticFile(
-                                RADAR_PLOTMODEL_DIR + File.separator
-                                        + plotModelFile).toURI().toString());
-            } catch (Exception e1) {
-                throw new VizException("Unable to set up radar graphics model",
-                        e1);
-            }
-            docMap.put(plotModelFile, document);
-        }
-
-        return document;
-    }
-
-    /**
-     * Converting the buffered image to a graphics card image
-     * 
-     * @param target
-     * @param img
-     * @param name
-     * @return
-     */
-    public static IImage convertBufferedImage(IGraphicsTarget target,
-            BufferedImage img, String name) throws VizException {
-        final BufferedImage image = img;
-        return target.initializeRaster(new IRenderedImageCallback() {
-            @Override
-            public RenderedImage getImage() throws VizException {
-                return image;
-            }
-        });
-    }
-
-    /**
-     * Drawing the legend for the color bars on the top left
-     * 
-     * @param colors
-     * @return
-     */
-    public static BufferedImage drawColorLegend(IGraphicsTarget target,
-            IDescriptor descriptor, RGB[] colors, int startNum, int endNum,
-            int offset) {
-        BufferedImage img = new BufferedImage(15, 15,
-                BufferedImage.TYPE_BYTE_INDEXED);
-
-        return img;
-    }
 }
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
index c52ea25e1f..53f977487a 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
@@ -107,8 +107,10 @@ import com.vividsolutions.jts.geom.LineString;
  * Jun 04, 2014  3232     bsteffen    Cleanup.
  * Aug 11, 2014  3504     mapeters    Replaced deprecated IODataPreparer
  *                                    instances with IRenderedImageCallback.
- * Sep 03, 2014  3574     njensen      Properly dispose objects
- * Nov 06, 2014  16776    zwang        Handle AMDA product MBA
+ * Sep 03, 2014  3574     njensen     Properly dispose objects
+ * Nov 06, 2014  16776    zwang       Handle AMDA product MBA
+ * Feb 08, 2016  5318     randerso    Font should not be preference based because the
+ *                                    size must match the table outline
  * 
  * </pre>
  * 
@@ -230,8 +232,8 @@ public class RadarGraphicsPage implements IRenderable {
     public void addSymbologyPacket(SymbologyPacket sp, CoordinateSystem cs)
             throws VizException {
         List<ReferencedGeometry> localGeometries = new ArrayList<ReferencedGeometry>();
-        if (sp instanceof UnlinkedVectorPacket
-                || sp instanceof UnlinkedContourVectorPacket) {
+        if ((sp instanceof UnlinkedVectorPacket)
+                || (sp instanceof UnlinkedContourVectorPacket)) {
             List<UnlinkedVector> vectors = (List<UnlinkedVector>) RadarHelper
                     .getItems(sp);
 
@@ -699,8 +701,8 @@ public class RadarGraphicsPage implements IRenderable {
 
                     if ((!onLowestElev.equals("") && onLowestElev
                             .equalsIgnoreCase("Y"))
-                            || (!baseHeight.equals("") && Double
-                                    .parseDouble(baseHeight) <= 1)) {
+                            || (!baseHeight.equals("") && (Double
+                                    .parseDouble(baseHeight) <= 1))) {
                         iconType = MesocycloneType.MESOCYCLONE_WITH_SPIKES;
                     } else {
                         iconType = MesocycloneType.MESOCYCLONE;
@@ -731,7 +733,7 @@ public class RadarGraphicsPage implements IRenderable {
                 float prevLat;
                 float prevLon;
                 // Forecast Positions
-                if (numFcstPos > 0
+                if ((numFcstPos > 0)
                         && (currentSettings.getDmdTrackType().equals(
                                 TrackTypes.FORECAST) || currentSettings
                                 .getDmdTrackType().equals(
@@ -777,7 +779,7 @@ public class RadarGraphicsPage implements IRenderable {
                 }
 
                 // Past Positions
-                if (numPastPos > 0
+                if ((numPastPos > 0)
                         && (currentSettings.getDmdTrackType().equals(
                                 TrackTypes.PAST) || currentSettings
                                 .getDmdTrackType().equals(
@@ -926,7 +928,7 @@ public class RadarGraphicsPage implements IRenderable {
             barb.setColor(this.color);
 
             // plot the wind arrow in the same length as 50 kts
-            double spd = Math.sqrt(pU * pU + pV * pV);
+            double spd = Math.sqrt((pU * pU) + (pV * pV));
             if (spd > 0) {
                 pU *= 50.0 / spd;
                 pV *= 50.0 / spd;
@@ -934,15 +936,14 @@ public class RadarGraphicsPage implements IRenderable {
 
             barb.setWind(pU, pV, false);
             final BufferedImage imgBuf = barb.getWindImage(false,
-                    DisplayType.ARROW,
-                    0.2);
+                    DisplayType.ARROW, 0.2);
             poWind.image = target
                     .initializeRaster(new IRenderedImageCallback() {
-                @Override
-                public RenderedImage getImage() throws VizException {
-                    return imgBuf;
-                }
-            });
+                        @Override
+                        public RenderedImage getImage() throws VizException {
+                            return imgBuf;
+                        }
+                    });
 
             ReferencedCoordinate rc = referencedGfmCoord(wX, wY);
             try {
@@ -985,28 +986,27 @@ public class RadarGraphicsPage implements IRenderable {
     }
 
     // Handle MBA product
-    private void drawMbaImage(GenericDataComponent currPt)
-            throws VizException {
- 
+    private void drawMbaImage(GenericDataComponent currPt) throws VizException {
+
         double x, y;
         Coordinate point;
 
         // Determine if the feature should be rendered
         RadarDisplayControls currentSettings = RadarDisplayManager
                 .getInstance().getCurrentSettings();
-        
+
         AreaComponent currFeature = (AreaComponent) currPt;
-        String cat = currFeature.getValue(MBAAttributeIDs.CATEGORY
-                .getName());
+        String cat = currFeature.getValue(MBAAttributeIDs.CATEGORY.getName());
         int catValue = cat.equals("") ? 0 : Integer.parseInt(cat);
 
         // By default, do not show MBA Wind Shear
         int minCat = 1;
-        if (currentSettings.isMbaShowWindShear())
+        if (currentSettings.isMbaShowWindShear()) {
             minCat = 0;
-        
+        }
+
         if (catValue >= minCat) {
-        
+
             int numPoints = currFeature.getPoints().size();
             Coordinate[] points = new Coordinate[numPoints];
 
@@ -1027,7 +1027,7 @@ public class RadarGraphicsPage implements IRenderable {
             }
         }
     }
-    
+
     private PlotObject getImage(HdaHailPoint currPt) throws VizException {
         PlotObject image = null;
 
@@ -1184,7 +1184,7 @@ public class RadarGraphicsPage implements IRenderable {
      *            the magnification to set
      */
     public void setMagnification(double magnification) {
-        if (this.magnification != magnification && this.font != null) {
+        if ((this.magnification != magnification) && (this.font != null)) {
             font.setMagnification((float) magnification, false);
         }
 
@@ -1217,7 +1217,7 @@ public class RadarGraphicsPage implements IRenderable {
     public void paint(IGraphicsTarget target, PaintProperties paintProps)
             throws VizException {
         if (font == null) {
-            this.font = target.initializeFont(getClass().getName());
+            this.font = target.initializeFont("Monospace", 10, null);
             this.font.setMagnification((float) magnification, false);
             this.font.setSmoothing(true);
         }
@@ -1253,7 +1253,7 @@ public class RadarGraphicsPage implements IRenderable {
         double yOffset = 24.0;
         double xOffset = 24.0;
         double magnification = this.magnification;
-        if (this.screenGeometries != null && !this.screenGeometries.isEmpty()) {
+        if ((this.screenGeometries != null) && !this.screenGeometries.isEmpty()) {
             double minx = Double.MAX_VALUE;
             double maxx = Double.MIN_VALUE;
             for (Geometry g : this.screenGeometries) {
@@ -1271,9 +1271,8 @@ public class RadarGraphicsPage implements IRenderable {
             double width = (maxx - minx) * magnification;
             // If the table wider than our canvas then shrink it
             if (width > paintProps.getCanvasBounds().width) {
-                magnification = this.magnification
-                        * paintProps.getCanvasBounds().width
-                        / (width + xOffset * 2);
+                magnification = (this.magnification * paintProps
+                        .getCanvasBounds().width) / (width + (xOffset * 2));
                 font.setMagnification((float) magnification, false);
                 magnification = target.getStringsBounds(testString).getHeight() / 14;
                 width = (maxx - minx) * magnification;
@@ -1284,11 +1283,11 @@ public class RadarGraphicsPage implements IRenderable {
                 Coordinate[] coords = g.getCoordinates();
 
                 // offsets to make the table fit the screen
-                double x1 = coords[0].x * magnification + xOffset;
-                double y1 = (coords[0].y + 0.25) * magnification * 1.3
+                double x1 = (coords[0].x * magnification) + xOffset;
+                double y1 = ((coords[0].y + 0.25) * magnification * 1.3)
                         + yOffset;
-                double x2 = coords[1].x * magnification + xOffset;
-                double y2 = (coords[1].y + 0.25) * magnification * 1.3
+                double x2 = (coords[1].x * magnification) + xOffset;
+                double y2 = ((coords[1].y + 0.25) * magnification * 1.3)
                         + yOffset;
                 DrawableLine line = new DrawableLine();
                 line.addPoint(x1, y1);
@@ -1302,15 +1301,16 @@ public class RadarGraphicsPage implements IRenderable {
 
         // Only paint data table text if no configuration is specified or
         // if configuration says to show table.
-        if (tableModifier == null
-                || (tableModifier != null && tableModifier.isShowTable())) {
+        if ((tableModifier == null)
+                || ((tableModifier != null) && tableModifier.isShowTable())) {
             // Paint the table data text.
-            if (this.screenStringMap != null && !this.screenStringMap.isEmpty()) {
+            if ((this.screenStringMap != null)
+                    && !this.screenStringMap.isEmpty()) {
                 for (Coordinate c : this.screenStringMap.keySet()) {
                     String str = this.screenStringMap.get(c);
 
-                    double x = c.x * magnification + xOffset;
-                    double y = c.y * magnification * 1.3 + yOffset;
+                    double x = (c.x * magnification) + xOffset;
+                    double y = (c.y * magnification * 1.3) + yOffset;
                     // if (x < 0.1) {
                     // x = 0;
                     // }
@@ -1386,7 +1386,7 @@ public class RadarGraphicsPage implements IRenderable {
             tableRight += width;
         }
 
-        int tableBottom = rowHeight * numberOfRows + tableTop;
+        int tableBottom = (rowHeight * numberOfRows) + tableTop;
 
         // Rows
         for (int i = tableTop; i <= tableBottom; i += rowHeight) {
@@ -1551,7 +1551,7 @@ public class RadarGraphicsPage implements IRenderable {
         for (int k = 0; k < numPoints; k++) {
             x2 = currFeature.getPoints().get(k).getCoordinate1();
             y2 = currFeature.getPoints().get(k).getCoordinate2();
-            dist = (x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1);
+            dist = ((x2 - x1) * (x2 - x1)) + ((y2 - y1) * (y2 - y1));
             if (dist < minDist) {
                 point.x = x2;
                 point.y = y2;
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java
index 982c9af5f3..317d3301b5 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java
@@ -84,6 +84,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  *                                     around for better logical separation
  * Aug 14, 2014 3523       mapeters    Updated deprecated {@link DrawableString#textStyle} 
  *                                     assignments.
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author mnash
@@ -138,7 +140,7 @@ public class RadarMLResource extends RadarGraphicsResource {
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
         // initialize the font
-        textFont = target.initializeFont(java.awt.Font.DIALOG, 11.0f,
+        textFont = target.initializeFont(java.awt.Font.DIALOG, 9,
                 new IFont.Style[] {});
     }
 
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/RadarDisplayControlDlg.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/RadarDisplayControlDlg.java
index 2149f4cb16..303b4a6893 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/RadarDisplayControlDlg.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/RadarDisplayControlDlg.java
@@ -54,6 +54,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 04 DEC 2007  373        lvenable    Initial creation
  * 06 Nov 2014  DCS 16776  zwang       Add control for MBA
  * May 13, 2015 4461       bsteffen    Add option for sails.
+ * Jan 14, 2016 5054       randerso    Made independent shell to keep same
+ *                                     behavior as when parented by dummy shell
  * 
  * </pre>
  * 
@@ -205,7 +207,7 @@ public class RadarDisplayControlDlg extends CaveSWTDialog {
      *            Parent shell.
      */
     public RadarDisplayControlDlg(Shell parent) {
-        super(parent);
+        super(parent, SWT.DIALOG_TRIM, CAVE.INDEPENDENT_SHELL);
         setText("Radar Display Controls");
 
         this.values = RadarDisplayManager.getInstance().getCurrentSettings();
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/RadarDisplayControlsHandler.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/RadarDisplayControlsHandler.java
index 4156bc333a..b378c79384 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/RadarDisplayControlsHandler.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/RadarDisplayControlsHandler.java
@@ -23,12 +23,31 @@ import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.handlers.HandlerUtil;
 
+/**
+ * Opens RadarDisplayControlDlg
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 14, 2016   5054     randerso    Set parent to active workbench window
+ *                                     instead of dummy shell
+ * 
+ * </pre>
+ * 
+ * @author randerso
+ * @version 1.0
+ */
 public class RadarDisplayControlsHandler extends AbstractHandler {
 
     @Override
-    public Object execute(ExecutionEvent arg0) throws ExecutionException {
-        RadarDisplayControlDlg dlg = new RadarDisplayControlDlg(new Shell());
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        Shell shell = HandlerUtil.getActiveShell(event);
+        RadarDisplayControlDlg dlg = new RadarDisplayControlDlg(shell);
         dlg.open();
 
         return null;
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/CellTrendGraph.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/CellTrendGraph.java
index 241caf89d3..7c20832911 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/CellTrendGraph.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/CellTrendGraph.java
@@ -61,6 +61,8 @@ import com.raytheon.viz.radar.ui.xy.RadarGraphResource.GraphPosition;
  * 07-21-14     #3412      mapeters    Updated deprecated drawCircle call.
  * 07-24-14     #3429      mapeters    Updated deprecated drawLine() calls.
  * 07-29-14     #3465      mapeters    Updated deprecated drawString() calls.
+ * 11-05-2015   #5070      randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author askripsk
@@ -122,7 +124,7 @@ public class CellTrendGraph extends XYGraph {
                 for (XYDataList currSeries : dataSeries) {
                     currLineStyle = dataSeriesLineTypes.get(i);
                     currPointType = dataSeriesPointTypes.get(i++);
-                    
+
                     DrawableLine line = new DrawableLine();
                     line.basics.color = colorCap.getColor();
                     line.width = outlineCap.getOutlineWidth();
@@ -161,10 +163,9 @@ public class CellTrendGraph extends XYGraph {
             }
         }
     }
-    
+
     private AbstractDrawableObject createPoint(IGraphicsTarget target,
-            double x, double y,
-            PointType currPointType) throws VizException {
+            double x, double y, PointType currPointType) throws VizException {
         if (currPointType.equals(PointType.CIRCLE)) {
             DrawableCircle circle = new DrawableCircle();
             circle = new DrawableCircle();
@@ -235,7 +236,7 @@ public class CellTrendGraph extends XYGraph {
             PointType pt = dataSeriesPointTypes.get(i);
             AbstractDrawableObject object = createPoint(target, labelx[i],
                     labely[i], pt);
-            //Add the point to its corresponding list
+            // Add the point to its corresponding list
             if (object instanceof DrawableCircle) {
                 circles.add((DrawableCircle) object);
             } else if (object instanceof DrawableLine) {
@@ -256,7 +257,7 @@ public class CellTrendGraph extends XYGraph {
             strings[i].setCoordinates(labelx[i] + offset, labely[i]);
             strings[i].verticallAlignment = VerticalAlignment.MIDDLE;
         }
-        
+
         target.drawLine(lines.toArray(new DrawableLine[0]));
         target.drawCircle(circles.toArray(new DrawableCircle[0]));
         target.drawStrings(strings);
@@ -307,7 +308,7 @@ public class CellTrendGraph extends XYGraph {
         yAxis.setLabeling(axisLabels);
         yAxis.setDrawLinesAtLabels(true);
         yAxis.setLabelLineStyle(IGraphicsTarget.LineStyle.DASHED_LARGE);
-        yAxis.setFontSize(10);
+        yAxis.setFontSize(8);
 
         ArrayList<String> label = new ArrayList<String>();
         label.add(this.yLabel);
@@ -378,8 +379,8 @@ public class CellTrendGraph extends XYGraph {
                     max = time;
                 }
 
-                labelVals.put(Double.valueOf(time), String.format("%02d%02d",
-                        time / 60, time % 60));
+                labelVals.put(Double.valueOf(time),
+                        String.format("%02d%02d", time / 60, time % 60));
             }
 
             NumberAxis xAxis = AxisFactory.buildNumberAxis(
@@ -387,7 +388,7 @@ public class CellTrendGraph extends XYGraph {
             xAxis.setDrawLinesAtLabels(false);
             xAxis.setDrawTickmarksAtLabels(true);
             xAxis.setLabelLineStyle(IGraphicsTarget.LineStyle.SOLID);
-            xAxis.setFontSize(10);
+            xAxis.setFontSize(8);
 
             AxisLabeling axisLabels = new AxisLabeling();
             axisLabels.setLabels(labelVals);
@@ -414,7 +415,7 @@ public class CellTrendGraph extends XYGraph {
 
         NumberAxis yAxis = AxisFactory.buildNumberAxis(
                 IAxis.Orientation.HORIZONTAL, 0, 100, "Percent");
-        yAxis.setFontSize(10);
+        yAxis.setFontSize(8);
         yAxis.setDrawLinesAtLabels(true);
         // axis.addTitle(getName(), new RGB(100, 100, 100));
         yAxis.setLabelLineStyle(IGraphicsTarget.LineStyle.DASHED);
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarXYResource.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarXYResource.java
index 6c1c09c31a..d48d1e25e2 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarXYResource.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/ui/xy/RadarXYResource.java
@@ -85,6 +85,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  *                                    hdf5.
  * Sep 23, 2013  2363     bsteffen    Add more vector configuration options.
  * Jul 23, 2014  3429     mapeters    Updated deprecated drawLine() calls.
+ * Nov 05, 2015 5070      randerso    Adjust font sizes for dpi scaling
+ * 
  * </pre>
  * 
  * @author askripsk
@@ -145,7 +147,7 @@ public class RadarXYResource extends RadarImageResource<RadarXYDescriptor> {
         if (this.font == null) {
             // Anything larger than 10 leads to text overlap, to go larger we
             // will need to place the text smarter
-            this.font = target.initializeFont(Font.MONOSPACED, 10,
+            this.font = target.initializeFont(Font.MONOSPACED, 8,
                     new Style[] { Style.BOLD });
         }
         if (paintProps.getDataTime() == null) {
@@ -221,7 +223,8 @@ public class RadarXYResource extends RadarImageResource<RadarXYDescriptor> {
                 .getMagnification().floatValue();
 
         // Paint unlinked lines
-        DrawableLine[] lines = new DrawableLine[this.unlinkedLines.size() + this.linkedLines.size()];
+        DrawableLine[] lines = new DrawableLine[this.unlinkedLines.size()
+                + this.linkedLines.size()];
         int i = 0;
         for (UnlinkedVector currVec : this.unlinkedLines) {
             lines[i] = new DrawableLine();
@@ -280,8 +283,7 @@ public class RadarXYResource extends RadarImageResource<RadarXYDescriptor> {
             plotLoc.y -= 2;
             plotLoc.x *= SCALAR;
             plotLoc.y *= SCALAR;
-            renderables[index].paintBarb(plotLoc,
-                    point.getWindBarbSpd(),
+            renderables[index].paintBarb(plotLoc, point.getWindBarbSpd(),
                     Math.toRadians(point.getWindBarbDir()));
         }
         for (VectorGraphicsRenderable renderable : renderables) {
diff --git a/cave/com.raytheon.viz.redbook/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.redbook/META-INF/MANIFEST.MF
index e8838a5ea5..77ee69f5eb 100644
--- a/cave/com.raytheon.viz.redbook/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.redbook/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Redbook Plug-in
 Bundle-SymbolicName: com.raytheon.viz.redbook;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Activator: com.raytheon.viz.redbook.Activator
 Bundle-Vendor: Raytheon
 Require-Bundle: org.apache.batik,
@@ -11,12 +11,13 @@ Require-Bundle: org.apache.batik,
  com.raytheon.viz.core,
  org.geotools,
  com.raytheon.viz.ui,
- org.apache.commons.lang,
+ org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.pointdata;bundle-version="1.11.26",
  com.raytheon.viz.pointdata,
  com.raytheon.uf.viz.productbrowser;bundle-version="1.11.31",
- com.raytheon.uf.common.dataplugin.redbook;bundle-version="1.14.0"
+ com.raytheon.uf.common.dataplugin.redbook;bundle-version="1.14.0",
+ com.raytheon.uf.viz.core.point;bundle-version="1.15.1"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.viz.redbook,
  com.raytheon.viz.redbook.blocks,
diff --git a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
index d9d3913095..21f2d0081d 100644
--- a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
+++ b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
 import com.raytheon.uf.common.dataplugin.HDF5Util;
@@ -69,6 +69,8 @@ import com.raytheon.viz.redbook.rsc.RedbookFrame.RedbookStatus;
  * Mar 13, 2014 2907        njensen     split edex.redbook plugin into common
  *                                      and edex redbook plugins
  * Jun 26, 2015 4512        mapeters    Updated for RedbookWMOMap API changes
+ * Oct 27, 2015 4798        bsteffen    Throw VizException for missing svg.
+ * Nov 05, 2015 5070        randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -87,7 +89,7 @@ public class RedbookResource extends
 
     private IFont font;
 
-    private WxSymbols wxSymbols = new WxSymbols();
+    private WxSymbols wxSymbols;
 
     private String humanReadableName;
 
@@ -96,11 +98,12 @@ public class RedbookResource extends
     private boolean magnificationChanged = false;
 
     protected RedbookResource(RedbookResourceData resourceData,
-            LoadProperties loadProperties) {
+            LoadProperties loadProperties) throws VizException {
         super(resourceData, loadProperties);
         this.dataTimes = new ArrayList<DataTime>();
         resourceData.addChangeListener(this);
         this.redbookFrames = new HashMap<DataTime, RedbookFrame>();
+        wxSymbols = new WxSymbols();
     }
 
     /*
@@ -114,8 +117,9 @@ public class RedbookResource extends
             font.dispose();
             font = null;
         }
-        for (RedbookFrame frame : this.redbookFrames.values())
+        for (RedbookFrame frame : this.redbookFrames.values()) {
             frame.dispose();
+        }
     }
 
     /*
@@ -205,8 +209,9 @@ public class RedbookResource extends
     @Override
     public void remove(DataTime dataTime) {
         RedbookFrame frame = this.redbookFrames.remove(dataTime);
-        if (frame != null)
+        if (frame != null) {
             frame.dispose();
+        }
     }
 
     /*
@@ -219,8 +224,9 @@ public class RedbookResource extends
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
         for (RedbookFrame frame : this.redbookFrames.values()) {
-            if (!frame.hasInited())
+            if (!frame.hasInited()) {
                 frame.init(target);
+            }
         }
     }
 
@@ -249,7 +255,7 @@ public class RedbookResource extends
                     font = null;
                 }
                 font = target.initializeFont(target.getDefaultFont()
-                        .getFontName(), (float) (10 * magnification), null);
+                        .getFontName(), (float) (8 * magnification), null);
                 magnificationChanged = false;
             }
 
diff --git a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResourceData.java b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResourceData.java
index bc24021ae6..ac89112ff5 100644
--- a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResourceData.java
+++ b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResourceData.java
@@ -23,10 +23,11 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.redbook.RedbookRecord;
+import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData;
 import com.raytheon.uf.viz.core.rsc.AbstractVizResource;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
@@ -42,6 +43,7 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
  * Feb 18, 2009            chammack    Initial creation
  * Mar 13, 2014 2907       njensen     split edex.redbook plugin into common and
  *                                     edex redbook plugins
+ * Oct 27, 2015 4798       bsteffen    Throw VizException for missing svg.
  * 
  * </pre>
  * 
@@ -63,7 +65,8 @@ public class RedbookResourceData extends AbstractRequestableResourceData {
      */
     @Override
     protected AbstractVizResource<?, ?> constructResource(
-            LoadProperties loadProperties, PluginDataObject[] objects) {
+            LoadProperties loadProperties, PluginDataObject[] objects)
+            throws VizException {
         RedbookResource rsc = new RedbookResource(this, loadProperties);
         for (PluginDataObject pdo : objects) {
             Validate.isTrue(
diff --git a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/WxSymbols.java b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/WxSymbols.java
index fb7f9bf9e2..c349c14aa6 100644
--- a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/WxSymbols.java
+++ b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/WxSymbols.java
@@ -19,31 +19,21 @@
  **/
 package com.raytheon.viz.redbook.rsc;
 
-import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
-import java.awt.image.IndexColorModel;
 import java.awt.image.RenderedImage;
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
 import java.util.HashMap;
+import java.util.Map;
 
-import org.apache.batik.bridge.BridgeContext;
-import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.bridge.UserAgentAdapter;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
-import org.apache.batik.gvt.GraphicsNode;
-import org.apache.batik.util.XMLResourceDescriptor;
 import org.eclipse.swt.graphics.RGB;
-import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Text;
 
-import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.viz.core.IGraphicsTarget;
 import com.raytheon.uf.viz.core.data.IRenderedImageCallback;
 import com.raytheon.uf.viz.core.drawables.IImage;
 import com.raytheon.uf.viz.core.exception.VizException;
+import com.raytheon.uf.viz.core.point.svg.SVGImageFactory;
 
 /**
  * Create weather symbol images to be drawn on the target.
@@ -51,68 +41,35 @@ import com.raytheon.uf.viz.core.exception.VizException;
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- *                                     Initial creation.
- * Aug 11, 2014 3504       mapeters    Replaced deprecated IODataPreparer
- *                                     instances with IRenderedImageCallback.
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- --------------------------
+ * Aug 11, 2014  3504     mapeters  Replaced deprecated IODataPreparer
+ *                                  instances with IRenderedImageCallback.
+ * Oct 27, 2015  4798     bsteffen  Extend SVGImageFactory
  * 
  * </pre>
  */
-public class WxSymbols {
+public class WxSymbols extends SVGImageFactory {
+
+    private final Map<Character, IImage> images = new HashMap<>();
+
     private IGraphicsTarget target;
 
     private RGB color;
 
-    private HashMap<Character, IImage> images = new HashMap<Character, IImage>();
-
-    private Document document;
-
-    private Element textNode;
-
-    private Text textText;
-
-    private final GVTBuilder builder;
-
-    private final BridgeContext bridgeContext;
-
-    public WxSymbols() {
-        String parser = XMLResourceDescriptor.getXMLParserClassName();
-        SAXSVGDocumentFactory f = new SAXSVGDocumentFactory(parser);
-        try {
-            document = f.createDocument(PathManagerFactory.getPathManager()
-                    .getStaticFile(
-                            "redbook" + File.separator
-                                    + "RedbookSymbolText.svg").toURI()
-                    .toString());
-        } catch (MalformedURLException e1) {
-            // TODO Auto-generated catch block
-            e1.printStackTrace();
-        } catch (IOException e1) {
-            // TODO Auto-generated catch block
-            e1.printStackTrace();
-        }
-        textNode = document.getElementById("theText");
-        textText = (Text) textNode.getFirstChild();
-
-        UserAgentAdapter userAgentAdapter = new UserAgentAdapter();
-        this.bridgeContext = new BridgeContext(userAgentAdapter);
-        this.builder = new GVTBuilder();
+    public WxSymbols() throws VizException {
+        super("redbook"
+                + IPathManager.SEPARATOR + "RedbookSymbolText.svg");
     }
 
-    private IndexColorModel tm;
 
     public IImage getImage(IGraphicsTarget target, RGB color, char c) {
 
         if (this.target != target || this.color == null
                 || !this.color.equals(color)) {
-            byte[] red = { 0, (byte) color.red };
-            byte[] green = { 0, (byte) color.green };
-            byte[] blue = { 0, (byte) color.blue };
             this.target = target;
             this.color = new RGB(color.red, color.green, color.blue);
 
-            tm = new IndexColorModel(8, 2, red, green, blue, 0);
             images.clear();
 
             /*
@@ -132,14 +89,6 @@ public class WxSymbols {
         IImage image = images.get(c);
         if (image == null) {
 
-            // Is this code going to convert the font every time?
-            // should use the bridge context to get the TextNode and change
-            // that instead of the origonal DOM and rebuild..
-
-            final BufferedImage bufferedImage = new BufferedImage(12, 12,
-                    BufferedImage.TYPE_BYTE_INDEXED, tm);
-            Graphics2D g2d = bufferedImage.createGraphics();
-
             // textText.setTextContent(Character.toString(c));
 
             /*
@@ -147,14 +96,12 @@ public class WxSymbols {
              * font to support low ASCII characters in an SVG file. Use the
              * Unicode PUA at U+E000 instead.
              */
+            Element textNode = document.getElementById("theText");
+            Text textText = (Text) textNode.getFirstChild();
             textText.setNodeValue(Character.toString((char) (c + 0xe000)));
 
-            GraphicsNode gn = builder.build(this.bridgeContext, this.document);
-            gn.paint(g2d);
-            /*
-             * g2d.setColor(new Color(color.red,color.green,color.blue));
-             * g2d.drawRect(0, 0, 13, 13);
-             */
+            final BufferedImage bufferedImage = createSingleColorImage(color,
+                    12, 12);
 
             image = target.initializeRaster(new IRenderedImageCallback() {
                 @Override
@@ -163,8 +110,6 @@ public class WxSymbols {
                 }
             });
             images.put(c, image);
-
-            g2d.dispose();
         }
         return image;
     }
diff --git a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
index d4aa9b209d..2154e3c104 100644
--- a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
+++ b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -91,6 +91,12 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Aug 11, 2014 3504       mapeters    Replaced deprecated IODataPreparer
  *                                     instances with IRenderedImageCallback.
  * Jun 26, 2015 4512       mapeters    Updated for RedbookWMOMap API changes.
+ * Oct 27, 2015 4798       bsteffen    Handle VizException for missing svg.
+ * Nov 05, 2015 5070       randerso    Adjust font sizes for dpi scaling
+ * Dec 03, 2015 5143       kbisanz     Remove unneeded setting of DataTime
+ *                                     utility flag in getName() to prevent
+ *                                     NPE in case of no data.
+ * 
  * 
  * </pre>
  * 
@@ -135,8 +141,9 @@ public class RedbookUpperAirResource extends
      */
     @Override
     protected void disposeInternal() {
-        for (UAFrame frame : this.frames.values())
+        for (UAFrame frame : this.frames.values()) {
             frame.dispose();
+        }
 
         if (font != null) {
             font.dispose();
@@ -150,13 +157,6 @@ public class RedbookUpperAirResource extends
      */
     @Override
     public String getName() {
-        DataTime[] times = descriptor.getTimeMatchingMap().get(this);
-        for (int i = 0; i < times.length; i++) {
-            if (times[i] != null) {
-                times[i] = times[i].clone();
-                times[i].getUtilityFlags().remove(DataTime.FLAG.FCST_USED);
-            }
-        }
         if (this.humanReadableName == null) {
             buildHumanReadableName();
         }
@@ -181,8 +181,9 @@ public class RedbookUpperAirResource extends
                 return;
             }
             RedbookWMOMap.Info info = map.getValue(wmo.getConstraintValue());
-            if (info != null && info.name != null)
+            if (info != null && info.name != null) {
                 this.humanReadableName = info.name;
+            }
         }
     }
 
@@ -230,8 +231,9 @@ public class RedbookUpperAirResource extends
     public void remove(DataTime dataTime) {
         dataTimes.remove(dataTime);
         UAFrame frame = frames.remove(dataTime);
-        if (frame != null)
+        if (frame != null) {
             frame.dispose();
+        }
     }
 
     /*
@@ -243,11 +245,11 @@ public class RedbookUpperAirResource extends
      */
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
-        this.font = target.initializeFont("Monospace", 10, null);
+        this.font = target.initializeFont("Monospace", 8, null);
         this.graphicsTarget = target;
     }
 
-    protected PlotModelFactory getPlotModelFactory() {
+    protected PlotModelFactory getPlotModelFactory() throws VizException {
         if (plotModelFactory == null) {
             plotModelFactory = new PlotModelFactory(getDescriptor(),
                     "redbookuaDesign.svg");
@@ -274,17 +276,19 @@ public class RedbookUpperAirResource extends
         UAFrame frame = frames.get(displayedDataTime);
         if (frame != null) {
 
-            if (frame.isReadyToPaint())
+            if (frame.isReadyToPaint()) {
                 frame.paint(target, paintProps);
-            else
+            } else {
                 job.upadte();
+            }
         }
     }
 
     private void invalidateAll() {
         synchronized (job) {
-            for (UAFrame frame : frames.values())
+            for (UAFrame frame : frames.values()) {
                 frame.invalidate();
+            }
         }
     }
 
@@ -378,14 +382,21 @@ public class RedbookUpperAirResource extends
         }
 
         public void init(IGraphicsTarget target) {
-            if (pointData == null)
+            if (pointData == null) {
                 retrieveAndDecodeData();
+            }
 
             PlotModelFactory pmf;
 
             synchronized (job) {
                 plotSettingsChanged = false;
-                pmf = getPlotModelFactory();
+                try {
+                    pmf = getPlotModelFactory();
+                } catch (VizException e) {
+                    statusHandler.handle(Priority.PROBLEM,
+                            e.getLocalizedMessage(), e);
+                    return;
+                }
                 int actualPlotWidth = pmf.getDefinedPlotModelWidth();
                 Double magnification = getCapability(
                         MagnificationCapability.class).getMagnification();
@@ -426,20 +437,22 @@ public class RedbookUpperAirResource extends
             }
 
             synchronized (job) {
-                if (!plotSettingsChanged)
+                if (!plotSettingsChanged) {
                     valid = true;
+                }
             }
         }
 
         public void dispose() {
             synchronized (this) {
-                if (images != null)
+                if (images != null) {
                     for (int i = 0; i < images.length; ++i) {
                         if (images[i] != null) {
                             images[i].dispose();
                             images[i] = null;
                         }
                     }
+                }
                 valid = false;
                 redbookRecord = null;
                 pointData = null;
@@ -448,8 +461,9 @@ public class RedbookUpperAirResource extends
 
         public void paint(IGraphicsTarget target, PaintProperties paintProps)
                 throws VizException {
-            if (pointData == null || images == null)
+            if (pointData == null || images == null) {
                 return;
+            }
 
             IExtent pe = paintProps.getView().getExtent();
 
@@ -470,24 +484,27 @@ public class RedbookUpperAirResource extends
 
             int threshold;
 
-            if (netZoom <= 0.8)
+            if (netZoom <= 0.8) {
                 threshold = 0;
-            else if (netZoom <= 1.5)
+            } else if (netZoom <= 1.5) {
                 threshold = 1;
-            else if (netZoom <= 2.5)
+            } else if (netZoom <= 2.5) {
                 threshold = 2;
-            else
+            } else {
                 threshold = 3;
+            }
 
             for (int i = 0; i < pointData.getCurrentSz(); ++i) {
-                if (images[i] == null)
+                if (images[i] == null) {
                     continue;
+                }
 
                 PointDataView pdv = pointData.readRandom(i);
 
                 int zoomLevel = pdv.getInt(RedbookUpperAirDecoder.P_ZOOM_LEVEL);
-                if (zoomLevel > threshold)
+                if (zoomLevel > threshold) {
                     continue;
+                }
 
                 double[] worldCoord = new double[] {
                         pdv.getFloat(RedbookUpperAirDecoder.P_LONGITUDE),
@@ -512,8 +529,9 @@ public class RedbookUpperAirResource extends
                         stationPixelLocation[1] + scaleValue, 0 };
 
                 if (ul[0] > pe.getMaxX() || ul[1] > pe.getMaxY()
-                        || lr[0] < pe.getMinX() || lr[1] < pe.getMinY())
+                        || lr[0] < pe.getMinX() || lr[1] < pe.getMinY()) {
                     continue;
+                }
 
                 PixelCoverage pc = new PixelCoverage(new Coordinate(ul[0],
                         ul[1], ul[2]), new Coordinate(ur[0], ur[1], ur[2]),
diff --git a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResourceData.java b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResourceData.java
index 37a36c2399..78547f34c4 100644
--- a/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResourceData.java
+++ b/cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResourceData.java
@@ -22,7 +22,7 @@ package com.raytheon.viz.redbookua.rsc;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.redbook.RedbookRecord;
diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/Satellite3_9WindPlots.xml b/cave/com.raytheon.viz.satellite/localization/bundles/Satellite3_9WindPlots.xml
index 53153e3770..5f91331f3d 100644
--- a/cave/com.raytheon.viz.satellite/localization/bundles/Satellite3_9WindPlots.xml
+++ b/cave/com.raytheon.viz.satellite/localization/bundles/Satellite3_9WindPlots.xml
@@ -1,52 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-	<displayList>
-		<displays xsi:type="d2DMapRenderableDisplay"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<descriptor xsi:type="mapDescriptor">
-				<resource>
-                    <loadProperties>
-						<capabilities>							
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} IR 3.9u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="IR3.9u" constraintType="EQUALS" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+    
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+    
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+    
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+<bundle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <displayList>
+    <displays xsi:type="mapRenderableDisplay">
+      <descriptor xsi:type="mapDescriptor">
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} IR 3.9u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="IR3.9u" constraintType="EQUALS" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+      </descriptor>
+    </displays>
+  </displayList>
 </bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteLayerPlot.xml b/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteLayerPlot.xml
index c669e5d6be..3da444bea2 100644
--- a/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteLayerPlot.xml
+++ b/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteLayerPlot.xml
@@ -1,52 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-	<displayList>
-		<displays xsi:type="d2DMapRenderableDisplay"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<descriptor xsi:type="mapDescriptor">
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} ${legend} Satellite Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="${between}" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+    
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+    
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+    
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+<bundle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <displayList>
+    <displays xsi:type="mapRenderableDisplay">
+      <descriptor xsi:type="mapDescriptor">
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} ${legend} Satellite Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="${between}" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+      </descriptor>
+    </displays>
+  </displayList>
 </bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWV7_0WindPlots.xml b/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWV7_0WindPlots.xml
index 70094eeb22..248ff3bc22 100644
--- a/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWV7_0WindPlots.xml
+++ b/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWV7_0WindPlots.xml
@@ -1,185 +1,136 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-	<displayList>
-		<displays xsi:type="d2DMapRenderableDisplay"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<descriptor xsi:type="mapDescriptor">
-				<resource>
-                    <loadProperties>
-						<capabilities>							
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 1050mb-526mb Water Vapor 7.0u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.0u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="52600--105000" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 525mb-476mb Water Vapor 7.0u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.0u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="47600--52500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 475mb-426mb Water Vapor 7.0u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.0u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="42600--47500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-								<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 425mb-376mb Water Vapor 7.0u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.0u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="37600--42500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 375mb-327mb Water Vapor 7.0u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg" 
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.0u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="32700--37500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 326mb-100mb Water Vapor 7.0u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.0u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="32600--10000" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+    
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+    
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+    
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+<bundle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <displayList>
+    <displays xsi:type="mapRenderableDisplay">
+      <descriptor xsi:type="mapDescriptor">
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 1050mb-526mb Water Vapor 7.0u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.0u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="52600--105000" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 525mb-476mb Water Vapor 7.0u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.0u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="47600--52500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 475mb-426mb Water Vapor 7.0u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.0u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="42600--47500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 425mb-376mb Water Vapor 7.0u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.0u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="37600--42500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 375mb-327mb Water Vapor 7.0u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.0u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="32700--37500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 326mb-100mb Water Vapor 7.0u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.0u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="32600--10000" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+      </descriptor>
+    </displays>
+  </displayList>
 </bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWV7_4WindPlots.xml b/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWV7_4WindPlots.xml
index 6978c1b829..8a7fa984bd 100644
--- a/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWV7_4WindPlots.xml
+++ b/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWV7_4WindPlots.xml
@@ -1,211 +1,154 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-	<displayList>
-		<displays xsi:type="d2DMapRenderableDisplay"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<descriptor xsi:type="mapDescriptor">
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 1050mb-626mb Water Vapor 7.4u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.4u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="62600--105000" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 625mb-576mb Water Vapor 7.4u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg" 
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.4u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="57600--62500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 575mb-526mb Water Vapor 7.4u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg" 
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.4u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="52600--57500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 525mb-476mb Water Vapor 7.4u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.4u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="47600--52500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 475mb-426mb Water Vapor 7.4u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.4u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="42600--47500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 425mb-377mb Water Vapor 7.4u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg" 
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.4u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="37700--42500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties>
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 376mb-100mb Water Vapor 7.4u Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg" 
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="WV7.4u" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="10000--37600" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+    
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+    
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+    
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+<bundle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <displayList>
+    <displays xsi:type="mapRenderableDisplay">
+      <descriptor xsi:type="mapDescriptor">
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 1050mb-626mb Water Vapor 7.4u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.4u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="62600--105000" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 625mb-576mb Water Vapor 7.4u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.4u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="57600--62500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 575mb-526mb Water Vapor 7.4u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.4u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="52600--57500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 525mb-476mb Water Vapor 7.4u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.4u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="47600--52500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 475mb-426mb Water Vapor 7.4u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.4u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="42600--47500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 425mb-377mb Water Vapor 7.4u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.4u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="37700--42500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 376mb-100mb Water Vapor 7.4u Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="WV7.4u" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="10000--37600" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+      </descriptor>
+    </displays>
+  </displayList>
 </bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWindPlots.xml b/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWindPlots.xml
index 17060a0485..45bb8eeeb5 100644
--- a/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWindPlots.xml
+++ b/cave/com.raytheon.viz.satellite/localization/bundles/SatelliteWindPlots.xml
@@ -1,237 +1,172 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<bundle>
-	<displayList>
-		<displays xsi:type="d2DMapRenderableDisplay"
-			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-			<descriptor xsi:type="mapDescriptor">
-				<resource>
-                    <loadProperties loadWithoutData="true">
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 1050mb-901mb ${legend} Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg" 
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="${satType}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="90100--105000" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 900mb-776mb ${legend} Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="${satType}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="77600--90000" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 775mb-601mb ${legend} Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="${satType}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="60100--77500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 600mb-451mb ${legend} Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="${satType}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="45100--60000" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 450mb-351mb ${legend} Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg" 
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="${satType}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="35100--45000" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 350mb-276mb ${legend} Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="${satType}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="27600--35000" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 275mb-227mb ${legend} Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="${satType}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="22700--27500" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-				<resource>
-                    <loadProperties loadWithoutData="true">
-						<capabilities>
-						</capabilities>
-					</loadProperties>
-					<properties isSystemResource="false" isBlinking="false"
-						isMapLayer="false" isHoverOn="false"
-						isVisible="true" />
-					<resourceData xsi:type="plotResourceData" plotSource="${source} 226mb-100mb ${legend} Winds Plot"
-						plotModelFile="hdwTypePlotDesign.svg"
-						retrieveData="false" isUpdatingOnMetadataOnly="false"
-						isRequeryNecessaryOnTimeMatch="true">
-						<binOffset posOffset="1800" negOffset="1800" virtualOffset="0"/>
-						<metadataMap>
-							<mapping key="pluginName">
-								<constraint constraintValue="${pluginName}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="satType">
-								<constraint constraintValue="${satType}" constraintType="EQUALS" />
-							</mapping>
-							<mapping key="pressure">
-								<constraint constraintValue="10000--22600" constraintType="BETWEEN" />
-							</mapping>
-						</metadataMap>
-					</resourceData>
-				</resource>
-			</descriptor>
-		</displays>
-	</displayList>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+    
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+    
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+    
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+<bundle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <displayList>
+    <displays xsi:type="mapRenderableDisplay">
+      <descriptor xsi:type="mapDescriptor">
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 1050mb-901mb ${legend} Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="${satType}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="90100--105000" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 900mb-776mb ${legend} Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="${satType}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="77600--90000" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 775mb-601mb ${legend} Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="${satType}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="60100--77500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 600mb-451mb ${legend} Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="${satType}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="45100--60000" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 450mb-351mb ${legend} Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="${satType}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="35100--45000" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 350mb-276mb ${legend} Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="${satType}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="27600--35000" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 275mb-227mb ${legend} Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="${satType}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="22700--27500" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties />
+          <resourceData xsi:type="windPlotResourceData" legend="${source} 226mb-100mb ${legend} Winds Plot"
+            windFile="hdw_wind.xml" baseDensity="0.7">
+            <binOffset posOffset="1800" negOffset="1800" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${pluginName}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="satType">
+                <constraint constraintValue="${satType}" constraintType="EQUALS" />
+              </mapping>
+              <mapping key="pressure">
+                <constraint constraintValue="10000--22600" constraintType="BETWEEN" />
+              </mapping>
+            </metadataMap>
+          </resourceData>
+        </resource>
+      </descriptor>
+    </displays>
+  </displayList>
 </bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/bundles/Scatterometer.xml b/cave/com.raytheon.viz.satellite/localization/bundles/Scatterometer.xml
new file mode 100644
index 0000000000..a284d1373d
--- /dev/null
+++ b/cave/com.raytheon.viz.satellite/localization/bundles/Scatterometer.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+    
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+    
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+    
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+<bundle xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <displayList>
+    <displays xsi:type="mapRenderableDisplay">
+      <descriptor xsi:type="mapDescriptor">
+        <resource>
+          <loadProperties>
+            <capabilities>
+              <capability xsi:type="colorableCapability" colorAsString="#bfbfbf" />
+            </capabilities>
+          </loadProperties>
+          <resourceData xsi:type="windPlotResourceData" legend="${legend} Scatterometer Winds missing"
+            windFile="ascat_wind.xml" baseDensity="2.0">
+            <binOffset posOffset="${posOffset}" negOffset="${negOffset}" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${plugin}" constraintType="EQUALS" />
+              </mapping>
+            </metadataMap>
+            <dataMetadataMap>
+              <mapping key="windSpd">
+                <!-- -1.1 to 0.0 converted from knots to m/s -->
+                <constraint constraintValue="-2.1382--0.0" constraintType="BETWEEN" />
+              </mapping>
+            </dataMetadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties>
+            <capabilities>
+              <capability xsi:type="colorableCapability" colorAsString="#00ff00" />
+            </capabilities>
+          </loadProperties>
+          <resourceData xsi:type="windPlotResourceData" legend="${legend} Scatterometer Wind s &lt; 34 kts"
+            windFile="ascat_wind.xml" baseDensity="2.0">
+            <binOffset posOffset="${posOffset}" negOffset="${negOffset}" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${plugin}" constraintType="EQUALS" />
+              </mapping>
+            </metadataMap>
+            <dataMetadataMap>
+              <mapping key="windSpd">
+                <!-- 0.0 to 34.0 converted from knots to m/s -->
+                <constraint constraintValue="0.0--17.49" constraintType="BETWEEN" />
+              </mapping>
+            </dataMetadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties>
+            <capabilities>
+              <capability xsi:type="colorableCapability" colorAsString="#ffff00" />
+            </capabilities>
+          </loadProperties>
+          <resourceData xsi:type="windPlotResourceData" legend="${legend}  Scatterometer Wind 34 &lt;= s &lt; 48 kts"
+            windFile="ascat_wind.xml" baseDensity="2.0">
+            <binOffset posOffset="${posOffset}" negOffset="${negOffset}" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${plugin}" constraintType="EQUALS" />
+              </mapping>
+            </metadataMap>
+            <dataMetadataMap>
+              <mapping key="windSpd">
+                <!-- 34.0 to 48.0 converted from knots to m/s -->
+                <constraint constraintValue="17.49--24.69" constraintType="BETWEEN" />
+              </mapping>
+            </dataMetadataMap>
+          </resourceData>
+        </resource>
+        <resource>
+          <loadProperties>
+            <capabilities>
+              <capability xsi:type="colorableCapability" colorAsString="#ff0000" />
+            </capabilities>
+          </loadProperties>
+          <resourceData xsi:type="windPlotResourceData" legend="${legend}  Scatterometer Wind s >= 48 kts"
+            windFile="ascat_wind.xml" baseDensity="2.0">
+            <binOffset posOffset="${posOffset}" negOffset="${negOffset}" />
+            <metadataMap>
+              <mapping key="pluginName">
+                <constraint constraintValue="${plugin}" constraintType="EQUALS" />
+              </mapping>
+            </metadataMap>
+            <dataMetadataMap>
+              <mapping key="windSpd">
+                <!-- 48.0.0 to 999.0 converted from knots to m/s -->
+                <constraint constraintValue="24.69--513.93" constraintType="BETWEEN" />
+              </mapping>
+            </dataMetadataMap>
+          </resourceData>
+        </resource>
+      </descriptor>
+    </displays>
+  </displayList>
+</bundle>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
index 36e5a55bce..4fd460a578 100644
--- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
+++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductPlots.xml
@@ -208,16 +208,6 @@
 		</contribute>
 	</contribute>
 	<contribute xsi:type="subMenu" menuText="Scatterometer Winds">
-		<!--
-		<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml"
-			menuText="QuikSCAT 12.5 km" id="QuikSCAT">
-	        <substitute key="legend" value="QUIKSCAT"/>
-	        <substitute key="svg" value="quikScatPlotDesign.svg"/>
-	        <substitute key="plugin" value="bufrquikscat"/>
-	        <substitute key="posOffset" value="0"/>
-	        <substitute key="negOffset" value="5400"/>
-	    </contribute>
-	    -->
 	    <contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml" 
                menuText="ASCAT Winds 25 km" id="ASCATWinds">
 	        <substitute key="legend" value="ASCAT"/>
@@ -231,23 +221,23 @@
 		<contribute xsi:type="titleItem" 
 				titleText="------ SSM/I Data ------" id="SSMIDataLine"/>
 		<contribute xsi:type="bundleItem" file="bundles/SSMIWindPlot.xml" 
-               menuText="SSM/I Wind Speeds" id="SSMIDataLine">
+               menuText="SSM/I Wind Speeds" id="SSMIWindSpeeds">
 	        <substitute key="svg" value="ssmiWindPlotDesign.svg"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml" 
-               menuText="SSM/I Precip. Water" id="SSMIDataLine">
+               menuText="SSM/I Precip. Water" id="SSMIPrecipWater">
 	        <substitute key="svg" value="ssmiPWPlotDesign.svg"/>
 	        <substitute key="legend" value="SSM/I Precipitable Water (kg/m**2)"/>
 	        <substitute key="offset" value="1800"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml" 
-               menuText="SSM/I Sea Temperature" id="SSMIDataLine">
+               menuText="SSM/I Sea Temperature" id="SSMISeaTemp">
 	        <substitute key="svg" value="ssmiSTPlotDesign.svg"/>
 	        <substitute key="legend" value="SSM/I Sea Temperature (C)"/>
 	        <substitute key="offset" value="1800"/>
 	    </contribute>
 		<contribute xsi:type="bundleItem" file="bundles/SSMIPlot.xml" 
-               menuText="SSM/I VIL" id="SSMIDataLine">
+               menuText="SSM/I VIL" id="SSMIVIL">
 	        <substitute key="svg" value="ssmiVILPlotDesign.svg"/>
 	        <substitute key="legend" value="SSM/I Vert. Integ. Water (kg/(m**2))"/>
 	        <substitute key="offset" value="1800"/>
diff --git a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml
index 3cc60cd8c3..57f2ea9604 100644
--- a/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml
+++ b/cave/com.raytheon.viz.satellite/localization/menus/satellite/baseDerivedProductsImagery.xml
@@ -40,7 +40,7 @@
 	        <substitute key="colormap" value="Sat/Precip Water/Precip Water Default"/>
 	    </contribute>
         <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml" 
-                menuText="Cloud Amount" id="cloud Amount">
+                menuText="Cloud Amount" id="cloudAmount">
 	        <substitute key="element" value="Gridded Cloud Amount"/>
 	        <substitute key="entity" value="Composite"/>
 	        <substitute key="colormap" value="Sat/Cloud Amount Default"/>
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/ascatPlotDesign.svg b/cave/com.raytheon.viz.satellite/localization/plotModels/ascatPlotDesign.svg
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/ascatPlotDesign.svg
rename to cave/com.raytheon.viz.satellite/localization/plotModels/ascatPlotDesign.svg
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/hdwTypePlotDesign.svg b/cave/com.raytheon.viz.satellite/localization/plotModels/hdwTypePlotDesign.svg
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/hdwTypePlotDesign.svg
rename to cave/com.raytheon.viz.satellite/localization/plotModels/hdwTypePlotDesign.svg
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/hdw_sat_lookup.txt b/cave/com.raytheon.viz.satellite/localization/plotModels/hdw_sat_lookup.txt
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/hdw_sat_lookup.txt
rename to cave/com.raytheon.viz.satellite/localization/plotModels/hdw_sat_lookup.txt
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/sat_name_lookup.txt b/cave/com.raytheon.viz.satellite/localization/plotModels/sat_name_lookup.txt
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/sat_name_lookup.txt
rename to cave/com.raytheon.viz.satellite/localization/plotModels/sat_name_lookup.txt
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/sat_type_lookup.txt b/cave/com.raytheon.viz.satellite/localization/plotModels/sat_type_lookup.txt
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/sat_type_lookup.txt
rename to cave/com.raytheon.viz.satellite/localization/plotModels/sat_type_lookup.txt
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/sat_type_lookup_ascat.txt b/cave/com.raytheon.viz.satellite/localization/plotModels/sat_type_lookup_ascat.txt
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/sat_type_lookup_ascat.txt
rename to cave/com.raytheon.viz.satellite/localization/plotModels/sat_type_lookup_ascat.txt
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiPWPlotDesign.svg b/cave/com.raytheon.viz.satellite/localization/plotModels/ssmiPWPlotDesign.svg
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiPWPlotDesign.svg
rename to cave/com.raytheon.viz.satellite/localization/plotModels/ssmiPWPlotDesign.svg
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiSTPlotDesign.svg b/cave/com.raytheon.viz.satellite/localization/plotModels/ssmiSTPlotDesign.svg
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiSTPlotDesign.svg
rename to cave/com.raytheon.viz.satellite/localization/plotModels/ssmiSTPlotDesign.svg
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiVILPlotDesign.svg b/cave/com.raytheon.viz.satellite/localization/plotModels/ssmiVILPlotDesign.svg
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiVILPlotDesign.svg
rename to cave/com.raytheon.viz.satellite/localization/plotModels/ssmiVILPlotDesign.svg
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiVILPlotDesign.txt b/cave/com.raytheon.viz.satellite/localization/plotModels/ssmiVILPlotDesign.txt
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiVILPlotDesign.txt
rename to cave/com.raytheon.viz.satellite/localization/plotModels/ssmiVILPlotDesign.txt
diff --git a/cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiWindPlotDesign.svg b/cave/com.raytheon.viz.satellite/localization/plotModels/ssmiWindPlotDesign.svg
similarity index 100%
rename from cave/com.raytheon.viz.pointdata/localization/plotModels/ssmiWindPlotDesign.svg
rename to cave/com.raytheon.viz.satellite/localization/plotModels/ssmiWindPlotDesign.svg
diff --git a/cave/com.raytheon.viz.satellite/localization/plotWind/ascat_wind.xml b/cave/com.raytheon.viz.satellite/localization/plotWind/ascat_wind.xml
new file mode 100644
index 0000000000..7ece70ea3a
--- /dev/null
+++ b/cave/com.raytheon.viz.satellite/localization/plotWind/ascat_wind.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+    
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+    
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+    
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+<windPlot>
+  <longitude parameter="longitude"/>
+  <latitude parameter="latitude" />
+  <magnitude parameter="windSpd" unit="kn"/>
+  <direction parameter="windDir" />
+  <sample text="%tH%tMZ  %3.0f @ %3.0f  RAIN FLAG %s">
+    <field parameter="validTime" time="true"/>
+    <field parameter="validTime" time="true"/>
+    <field parameter="windDir" />
+    <field parameter="windSpd" unit="kn"/>
+    <field parameter="probRain">
+      <format value="-9999" text="?" />
+    </field>
+  </sample>
+</windPlot>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.satellite/localization/plotWind/hdw_wind.xml b/cave/com.raytheon.viz.satellite/localization/plotWind/hdw_wind.xml
new file mode 100644
index 0000000000..2dd21d8b0d
--- /dev/null
+++ b/cave/com.raytheon.viz.satellite/localization/plotWind/hdw_wind.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+    
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+    
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+    
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+<windPlot>
+  <longitude parameter="longitude"/>
+  <latitude parameter="latitude" />
+  <magnitude parameter="windSpd" unit="kn"/>
+  <direction parameter="windDir" />
+  <sample text="%tH%tMZ %s %3.1fC %5.0fmb %3.0fdeg %3.0fkts">
+    <field parameter="validTime" time="true"/>
+    <field parameter="validTime" time="true"/>
+    <field parameter="satelliteFreq">
+      <format low="2.79374e+13" high="2.81374e+13" text="IR" />
+      <format low="4.04405e+13" high="4.06405e+13" text="WV7.4u" />
+      <format low="4.27571e+13" high="4.29571e+13" text="WV7.0u" />
+      <format low="4.40176e+13" high="4.42176e+13" text="WV" />
+      <format low="4.60538e+14" high="4.62538e+14" text="Vis" />
+      <format low="7.67699e+13" high="7.69699e+13" text="IR3.9u" />
+    </field>
+    <field parameter="coldestTemp" unit="C"/>
+    <field parameter="pressure" unit="hPa"/>
+    <field parameter="windDir" />
+    <field parameter="windSpd" unit="kn"/>
+  </sample>
+</windPlot>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.spi/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.spi/META-INF/MANIFEST.MF
index e4b3fac88f..921cbe2fdd 100644
--- a/cave/com.raytheon.viz.spi/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.spi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SPI Plug-in
 Bundle-SymbolicName: com.raytheon.viz.spi;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Activator: com.raytheon.viz.spi.Activator
 Bundle-Vendor: Raytheon
 Require-Bundle: org.eclipse.ui,
@@ -11,7 +11,6 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.viz.ui,
  org.geotools,
  com.raytheon.viz.pointdata,
- org.apache.commons.lang,
  com.raytheon.uf.viz.core.maps;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.viz.spi
diff --git a/cave/com.raytheon.viz.spi/src/com/raytheon/viz/spi/SPIResource.java b/cave/com.raytheon.viz.spi/src/com/raytheon/viz/spi/SPIResource.java
index 91e2d8e6f0..e8b8ef7cfa 100644
--- a/cave/com.raytheon.viz.spi/src/com/raytheon/viz/spi/SPIResource.java
+++ b/cave/com.raytheon.viz.spi/src/com/raytheon/viz/spi/SPIResource.java
@@ -36,12 +36,10 @@ import com.raytheon.uf.viz.core.DrawableString;
 import com.raytheon.uf.viz.core.IGraphicsTarget;
 import com.raytheon.uf.viz.core.IGraphicsTarget.HorizontalAlignment;
 import com.raytheon.uf.viz.core.IGraphicsTarget.PointStyle;
-import com.raytheon.uf.viz.core.drawables.IFont;
 import com.raytheon.uf.viz.core.drawables.PaintProperties;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.uf.viz.core.map.MapDescriptor;
 import com.raytheon.uf.viz.core.maps.rsc.StyledMapResource;
-import com.raytheon.uf.viz.core.rsc.IResourceDataChanged;
 import com.raytheon.uf.viz.core.rsc.LoadProperties;
 import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability;
 import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability;
@@ -56,13 +54,14 @@ import com.raytheon.viz.pointdata.StaticPlotInfoPV.SPIEntry;
  * 
  * <pre>
  * 
- *    SOFTWARE HISTORY
- *   
- *    Date          Ticket#     Engineer    Description
- *    ------------  ----------  ----------- --------------------------
- *    1/10/08       562         bphillip    Initial Creation.
- *    8/04/14       3489        mapeters    Updated deprecated getStringBounds() calls.
- *    08/21/2014   #3459        randerso    Restructured Map resource class hierarchy
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#     Engineer    Description
+ * ------------  ----------  ----------- --------------------------
+ * 1/10/08       562         bphillip    Initial Creation.
+ * 8/04/14       3489        mapeters    Updated deprecated getStringBounds() calls.
+ * 08/21/2014   #3459        randerso    Restructured Map resource class hierarchy
+ * Nov 05, 2015 #5070        randerso    Moved label font management up to AbstractMapResource
  * 
  * </pre>
  * 
@@ -70,8 +69,7 @@ import com.raytheon.viz.pointdata.StaticPlotInfoPV.SPIEntry;
  * 
  */
 public class SPIResource extends
-        StyledMapResource<SPIResourceData, MapDescriptor> implements
-        IResourceDataChanged {
+        StyledMapResource<SPIResourceData, MapDescriptor> {
 
     /** The line color */
     private static final RGB DEFAULT_COLOR = new RGB(155, 155, 155);
@@ -82,8 +80,6 @@ public class SPIResource extends
 
     private int pixelSizeHint = 90;
 
-    private IFont font;
-
     public int getPixelSizeHint() {
         return pixelSizeHint;
     }
@@ -102,7 +98,6 @@ public class SPIResource extends
     @Override
     protected void initInternal(IGraphicsTarget target) throws VizException {
         super.initInternal(target);
-        resourceData.addChangeListener(this);
         getCapability(LabelableCapability.class).setAvailableLabelFields(
                 "Label");
         getCapability(LabelableCapability.class).setLabelField("Label");
@@ -129,17 +124,12 @@ public class SPIResource extends
 
         }
         project(this.descriptor.getCRS());
-
-        font = target.initializeFont(target.getDefaultFont().getFontName(), 10,
-                null);
-        float magnification = getCapability(MagnificationCapability.class)
-                .getMagnification().floatValue();
-        font.setMagnification(magnification);
     }
 
     @Override
     protected void paintInternal(IGraphicsTarget target,
             PaintProperties paintProps) throws VizException {
+
         int displayWidth = (int) (this.descriptor.getMapWidth() * paintProps
                 .getZoomLevel());
 
@@ -150,7 +140,7 @@ public class SPIResource extends
                 / paintProps.getView().getExtent().getWidth();
 
         DrawableString n = new DrawableString("N");
-        n.font = font;
+        n.font = getFont(target);
         Rectangle2D charSize = target.getStringsBounds(n);
         double charWidth = charSize.getWidth();
         double charHeight = charSize.getHeight();
@@ -196,7 +186,7 @@ public class SPIResource extends
                 points.add(entry.pixel);
                 if (isLabeled && (magnification > 0.0)) {
                     DrawableString string = new DrawableString(key, color);
-                    string.font = font;
+                    string.font = getFont(target);
                     string.setCoordinates(entry.pixel[0] + offsetX,
                             entry.pixel[1] + offsetY, 0.0);
                     string.horizontalAlignment = align;
@@ -219,30 +209,4 @@ public class SPIResource extends
         }
     }
 
-    @Override
-    protected void disposeInternal() {
-        resourceData.removeChangeListener(this);
-        font.dispose();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.viz.core.rsc.IResourceDataChanged#resourceChanged(com
-     * .raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType,
-     * java.lang.Object)
-     */
-    @Override
-    public void resourceChanged(ChangeType type, Object object) {
-        if (type == ChangeType.CAPABILITY) {
-            if (object instanceof MagnificationCapability) {
-                if (font != null) {
-                    font.setMagnification(((MagnificationCapability) object)
-                            .getMagnification().floatValue());
-                }
-            }
-        }
-        this.issueRefresh();
-    }
 }
diff --git a/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF
index 876d18affd..6bfe5709d5 100644
--- a/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.texteditor/META-INF/MANIFEST.MF
@@ -2,13 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Texteditor Plug-in
 Bundle-SymbolicName: com.raytheon.viz.texteditor;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.16.0.qualifier
 Bundle-Activator: com.raytheon.viz.texteditor.Activator
 Bundle-Vendor: Raytheon
 Require-Bundle: com.raytheon.uf.common.activetable,
  com.raytheon.uf.common.auth;bundle-version="1.12.1174",
  com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.text;bundle-version="1.11.30",
+ com.raytheon.uf.common.dataplugin.text.subscription,
  com.raytheon.uf.common.dataplugin.warning;bundle-version="1.12.1174",
  com.raytheon.uf.common.python,
  com.raytheon.uf.common.serialization.comm,
diff --git a/cave/com.raytheon.viz.texteditor/localization/menus/textws/baseToolsMenus.xml b/cave/com.raytheon.viz.texteditor/localization/menus/textws/baseToolsMenus.xml
index bfaa9313aa..c82c2de71b 100644
--- a/cave/com.raytheon.viz.texteditor/localization/menus/textws/baseToolsMenus.xml
+++ b/cave/com.raytheon.viz.texteditor/localization/menus/textws/baseToolsMenus.xml
@@ -19,12 +19,6 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-   <contribute xsi:type="command" menuText="Create TAF template" commandId="com.raytheon.viz.ui.actions.notImplemented"/>
-   <contribute xsi:type="command" menuText="Transmit TAF" commandId="com.raytheon.viz.ui.actions.notImplemented"/>
-
-   <contribute xsi:type="separator" id="belowTransmitTaf"/>
-   
    <contribute xsi:type="subinclude" fileName="menus/textws/toolsMenus.xml"/>
 </menuTemplate>
         
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.texteditor/localization/menus/tools/texteditor-index.xml b/cave/com.raytheon.viz.texteditor/localization/menus/tools/texteditor-index.xml
new file mode 100644
index 0000000000..6aea541ae8
--- /dev/null
+++ b/cave/com.raytheon.viz.texteditor/localization/menus/tools/texteditor-index.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuContributionFile>
+    <include installTo="menu:tools?after=tools.Te"
+        fileName="menus/tools/texteditor-menu.xml">
+    </include>
+</menuContributionFile>
diff --git a/cave/com.raytheon.viz.texteditor/localization/menus/tools/texteditor-menu.xml b/cave/com.raytheon.viz.texteditor/localization/menus/tools/texteditor-menu.xml
new file mode 100644
index 0000000000..33ea9faa9b
--- /dev/null
+++ b/cave/com.raytheon.viz.texteditor/localization/menus/tools/texteditor-menu.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <contribute xsi:type="command"
+        commandId="com.raytheon.viz.texteditor.opentexteditor"
+        menuText="Text Window..." />
+
+</menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextEditorAction.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextEditorAction.java
index 50608f3539..4ef1e0c16c 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextEditorAction.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextEditorAction.java
@@ -27,20 +27,20 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
 import com.raytheon.viz.texteditor.dialogs.TextEditorDialog;
-import com.raytheon.viz.ui.dialogs.CaveSWTDialogBase.CAVE;
+import com.raytheon.viz.ui.dialogs.CaveSWTDialog.CAVE;
 
 /**
- * Action for unimplemented features. To be used temporarily until final
- * behavior is implemented.
+ * Text Editor Action: opens a new Text Editor Dialog
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * 
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * 6/27/06                  randerso    Initial creation.
- * 10/11/2007   482         grichard    Reformatted file.
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * 6/27/06                  randerso   Initial creation.
+ * 10/11/2007   482         grichard   Reformatted file.
+ * 01/18/2016   5045        randerso   Merged CaveSWTDialog and CaveSWTDialogBase
  * 
  * </pre>
  * 
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextWorkstationConstants.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextWorkstationConstants.java
index 27afb4c536..d7670b5a4b 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextWorkstationConstants.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/TextWorkstationConstants.java
@@ -35,21 +35,22 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.viz.core.mode.CAVEMode;
 
 /**
- * TODO Add Description
+ * Constants for the text workstation
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Nov 11, 2009            mschenke     Initial creation
+ * Nov 11, 2009            mschenke    Initial creation
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
  * 
  * </pre>
  * 
@@ -158,7 +159,7 @@ public class TextWorkstationConstants {
                     super.save();
                     try {
                         file.save();
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (LocalizationException e) {
                         statusHandler.handle(Priority.PROBLEM,
                                 "Error saving text workstation preferences", e);
                     }
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmAlertSaveLoadDlg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmAlertSaveLoadDlg.java
index 88c84712f2..718c390686 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmAlertSaveLoadDlg.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmAlertSaveLoadDlg.java
@@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Text;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -53,13 +53,13 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Sep 17, 2009            mnash     Initial creation
- * ======================================
- * AWIPS2 DR Work
- * 07/25/2012          953 jkorman     Modified file "search" to return LocalizationFile
- * instead of File so references are deleted in all locations.
- * 09/20/2012   1196       rferrel   Setup fileName now in return value for
- *                                    use with close callback.
+ * Sep 17, 2009            mnash       Initial creation
+ * 07/25/2012   953        jkorman     Modified file "search" to return LocalizationFile
+ *                                     instead of File so references are deleted in all locations.
+ * 09/20/2012   1196       rferrel     Setup fileName now in return value for
+ *                                     use with close callback.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Dec 09, 2015 4834       njensen     updates for API changes to LocalizationFile
  * 
  * </pre>
  * 
@@ -189,6 +189,7 @@ public class AlarmAlertSaveLoadDlg extends CaveSWTDialog {
 
         // loads the
         loadButton.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 // Set the filename to be returned through getFileName()
                 if (lists.getSelectionCount() > 0) {
@@ -203,20 +204,15 @@ public class AlarmAlertSaveLoadDlg extends CaveSWTDialog {
 
         // delete the file from the display list and from the file system
         deleteButton.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 int num = lists.getSelectionIndex();
                 LocalizationFile f = fileList.get(num);
                 try {
-                    if (!f.delete()) {
-                        String msg = String.format(
-                                "ALARM/ALERT:Failed deleting file %s", f
-                                        .getFile().getPath());
-                        statusHandler.handle(Priority.PROBLEM, msg);
-                    }
-                } catch (LocalizationOpFailedException e) {
+                    f.delete();
+                } catch (LocalizationException e) {
                     String msg = String.format(
-                            "ALARM/ALERT:Failed deleting file %s", f.getFile()
-                                    .getPath());
+                            "ALARM/ALERT: Failed deleting file %s", f.getPath());
                     statusHandler.handle(Priority.PROBLEM, msg, e);
                 }
                 lists.remove(num);
@@ -225,6 +221,7 @@ public class AlarmAlertSaveLoadDlg extends CaveSWTDialog {
 
         // close the display without doing anything else
         cancelButton.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 shell.close();
             }
@@ -287,6 +284,7 @@ public class AlarmAlertSaveLoadDlg extends CaveSWTDialog {
 
         // get the file name
         saveButton.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 // Set the filename to be returned through getFileName()
                 fileName = textBox.getText();
@@ -297,12 +295,14 @@ public class AlarmAlertSaveLoadDlg extends CaveSWTDialog {
 
         // close the display without doing anything else
         cancelButton.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 shell.close();
             }
         });
 
         lists.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 textBox.setText(lists.getSelection()[0]);
             }
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
index d40803126e..54a96959a5 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
@@ -37,6 +37,7 @@ import java.util.regex.Pattern;
 import javax.xml.bind.JAXB;
 
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.PlatformUI;
 
 import com.raytheon.uf.common.dataplugin.text.alarms.AlarmAlertProduct;
 import com.raytheon.uf.common.dataplugin.text.alarms.AlarmAlertProduct.ProductType;
@@ -52,7 +53,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -77,28 +78,22 @@ import com.vividsolutions.jts.geom.GeometryFactory;
  * ------------ ---------- ----------- --------------------------
  * Sep 18, 2009            mnash       Initial creation
  * 03/19/2012              D. Friedman Fix determination of "Alarm" entries.
- * 12/07/2012	15555	   m.gamazaychikov	Added methods and constants for 
- * 											the implementation of proximity alarm
- * 07/24/2014   3423       randerso    Ensure ringBell is called on UI thread
- * 09/09/2014   3580       mapeters    Removed IQueryTransport usage (no longer exists).
- * 12/03/2014   ASM #16829 D. Friedman Lazy initialization of alarmAlertBell
- * 11/29/2015   ASM #14995 m.gamazaychikov Made sure that non-standard latlons in 
- * 					   LAT...LON string did not result in error.
+ * 12/07/2012   15555  m.gamazaychikov Added methods and constants for 
+ *                                     the implementation of proximity alarm
+ * 07/24/2014    3423      randerso    Ensure ringBell is called on UI thread
+ * 09/09/2014    3580      mapeters    Removed IQueryTransport usage (no longer exists).
+ * 12/03/2014   16829      D. Friedman Lazy initialization of alarmAlertBell
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * 11/29/2015   14995  m.gamazaychikov Made sure that non-standard latlons in 
+ *                                     LAT...LON string did not result in error.
+ * 15/01/2016    5054      randerso    Use proper parent shell
+ * 
  * 
  * </pre>
  * 
  * @author mnash
  * @version 1.0
  */
-
-/**
- * @author michaelg
- *
- */
-/**
- * @author michaelg
- * 
- */
 public class AlarmAlertFunctions {
 
     private static final AlarmAlertProduct.ProductType AA = AlarmAlertProduct.ProductType.Alarm_Alert;
@@ -135,10 +130,6 @@ public class AlarmAlertFunctions {
 
     private static final double ONE_DEGREE_KM = 111.20;
 
-    protected void getGIS() {
-
-    }
-
     /**
      * Create the string for distance in the dialog
      * 
@@ -155,13 +146,14 @@ public class AlarmAlertFunctions {
              * DR15555 - check the text content, if it is not a valid number set
              * the text to default 3000 mi
              */
-            Scanner scn = new Scanner(prod.getAorDistance());
-            while (scn.hasNext()) {
-                if (!scn.hasNextInt()) {
-                    prod.setAorDistance(DEFAULT_DISTANCE);
-                    break;
-                } else {
-                    scn.next();
+            try (Scanner scn = new Scanner(prod.getAorDistance())) {
+                while (scn.hasNext()) {
+                    if (!scn.hasNextInt()) {
+                        prod.setAorDistance(DEFAULT_DISTANCE);
+                        break;
+                    } else {
+                        scn.next();
+                    }
                 }
             }
             string.append("AOR+" + prod.getAorDistance() + prod.getAorLabel());
@@ -171,10 +163,6 @@ public class AlarmAlertFunctions {
         return string.toString();
     }
 
-    protected void print(String textToPrint) {
-
-    }
-
     protected static void ringBell(boolean sound) {
         getAlarmalertbell().open(sound);
     }
@@ -524,7 +512,6 @@ public class AlarmAlertFunctions {
             double lonE = coords[i].x;
             if (coords[i].x < centerLon) {
                 lonE = coords[i].x - deltaX;
-                ;
             } else if (coords[i].x > centerLon) {
                 lonE = coords[i].x + deltaX;
             } else if (coords[i].x == centerLon) {
@@ -762,7 +749,7 @@ public class AlarmAlertFunctions {
             JAXB.marshal(alarms, file.getFile());
             try {
                 file.save();
-            } catch (LocalizationOpFailedException e) {
+            } catch (LocalizationException e) {
                 statusHandler.handle(Priority.SIGNIFICANT,
                         e.getLocalizedMessage(), e);
             }
@@ -812,7 +799,7 @@ public class AlarmAlertFunctions {
                     lFile.getFile().createNewFile();
                     try {
                         lFile.save();
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (LocalizationException e) {
                         statusHandler.handle(Priority.SIGNIFICANT,
                                 e.getLocalizedMessage(), e);
                     }
@@ -852,7 +839,7 @@ public class AlarmAlertFunctions {
                     w.close();
                     try {
                         lFile.save();
-                    } catch (LocalizationOpFailedException e) {
+                    } catch (LocalizationException e) {
                         statusHandler.handle(Priority.SIGNIFICANT,
                                 e.getLocalizedMessage(), e);
                     }
@@ -876,8 +863,11 @@ public class AlarmAlertFunctions {
      */
     public static AlarmAlertBell getAlarmalertbell() {
         if (alarmAlertBell == null) {
-            // No synchronize because this must be called on the UI thread anyway.
-            alarmAlertBell = new AlarmAlertBell(new Shell());
+            // No synchronize because this must be called on the UI thread
+            // anyway.
+            Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+                    .getShell();
+            alarmAlertBell = new AlarmAlertBell(shell);
         }
         return alarmAlertBell;
     }
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
index d22b3052d8..b24504d1a3 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
@@ -49,6 +49,7 @@ import java.util.regex.Pattern;
 import javax.xml.bind.JAXB;
 import javax.xml.bind.JAXBException;
 
+import org.apache.commons.lang.StringUtils;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -106,6 +107,7 @@ import org.eclipse.swt.widgets.Layout;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.Monitor;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.PlatformUI;
@@ -356,14 +358,20 @@ import com.raytheon.viz.ui.simulatedtime.SimulatedTimeOperations;
  *                                       simulated time.
  * Sep 30, 2015   4860      skorolev    Corrected misspelling.
  * 07Oct2015   RM 18132     D. Friedman Exclude certain phensigs from automatic ETN incrementing.
+ * Oct 28, 2015 5054        randerso    Make Text Editor windows appear on same monitor as the parent.
+ *                                      Removed hard coded offset for window placement.
  * Nov 05, 2015 5039        rferrel     Prevent wrapping text to a component name line and clean up of streams.
  * 19Nov2015   5141         randerso    Replace commas with ellipses if product not enabled for 
  *                                      mixed case transmission
  * 10Dec2015   5206         randerso    Replace commas with ellipses only in WarnGen products
  * 11Dec2015   RM14752   mgamazaychikov Fix problems with wrapping in the impact section.
- * 6Jan2016    RM18452   mgamazaychikov Fix NPE for null product in enterEditor
+ * 06Jan2016    RM18452  mgamazaychikov Fix NPE for null product in enterEditor
  * 06Jan2016   5225         randerso    Fix problem with mixed case not getting converted to upper case 
  *                                      when multiple text editors are open on the same product.
+ * 27Jan2016   5054         randerso    Removed ignored second ICON from Cancel confirmation
+ * 04Feb2016   5076         dgilling    Prevent text editor from adding multiple
+ *                                      copies of header to edited product after
+ *                                      save/cancel cycling.
  * 
  * </pre>
  * 
@@ -894,16 +902,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
      */
     private MenuItem productsMenuItem;
 
-    /**
-     * Help on a window item menu item.
-     */
-    private MenuItem onTextWindowItem;
-
-    /**
-     * About menu item.
-     */
-    private MenuItem aboutItem;
-
     /**
      * Composite for the script runner controls
      */
@@ -1600,7 +1598,17 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
         createMenus();
 
         // Initialize all of the controls and layouts
-        initializeComponents();
+        createTopButtonRow();
+
+        Label sepLbl = new Label(shell, SWT.SEPARATOR | SWT.HORIZONTAL);
+        sepLbl.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
+        createTextRow();
+        createHeaderTextField();
+        createEditorControlButtons();
+        createTextAreaEditor();
+        createScriptRunnerControlBar();
+        createStatusBar();
 
         // initialize scripting controls
         setScriptControls(false);
@@ -1627,7 +1635,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
         createToolsMenus(menuBar);
         createScriptsMenus(menuBar);
         createProductsMenus(menuBar);
-        createHelpMenus(menuBar);
 
         shell.setMenuBar(menuBar);
     }
@@ -2356,47 +2363,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
         productsMenuItem = productsMenu.getParentItem();
     }
 
-    /**
-     * Create the Help menu (top menu bar) and all of the menu items under the
-     * Help menu.
-     * 
-     * @param menuBar
-     *            The main menu bar.
-     */
-    private void createHelpMenus(Menu menuBar) {
-        // -----------------------------------------
-        // Create all the items in the Help menu
-        // -----------------------------------------
-        MenuItem helpMenuItem = new MenuItem(menuBar, SWT.CASCADE);
-        helpMenuItem.setText("Help");
-
-        // Create the Products menu item with a Products "dropdown" menu
-        Menu helpMenu = new Menu(menuBar);
-        helpMenuItem.setMenu(helpMenu);
-
-        onTextWindowItem = new MenuItem(helpMenu, SWT.NONE);
-        onTextWindowItem.setText("On Text Window...\tF1");
-        onTextWindowItem.setAccelerator(SWT.F1);
-        onTextWindowItem.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                notImplementedYet("On text window");
-            }
-        });
-
-        // Add a menu separator.
-        new MenuItem(helpMenu, SWT.SEPARATOR);
-
-        aboutItem = new MenuItem(helpMenu, SWT.NONE);
-        aboutItem.setText("About...");
-        aboutItem.addSelectionListener(new SelectionAdapter() {
-            @Override
-            public void widgetSelected(SelectionEvent event) {
-                notImplementedYet("About");
-            }
-        });
-    }
-
     /**
      * Method to determine the target position for page up or page down.
      * 
@@ -3053,23 +3019,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
         dftFont = new Font(getDisplay(), fontName, fontSize, SWT.NORMAL);
     }
 
-    /**
-     * Initialize the components and put them on the display.
-     */
-    private void initializeComponents() {
-        createTopButtonRow();
-
-        Label sepLbl = new Label(shell, SWT.SEPARATOR | SWT.HORIZONTAL);
-        sepLbl.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-        createTextRow();
-        createHeaderTextField();
-        createEditorControlButtons();
-        createTextAreaEditor();
-        createScriptRunnerControlBar();
-        createStatusBar();
-    }
-
     /**
      * Create the top row of buttons on the display.
      */
@@ -4310,7 +4259,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
             // Notify the user that any unsaved changes will be lost.
             SWTMessageBox mb = new SWTMessageBox(shell, "Cancel Editor",
                     "Any unsaved changes will be lost. Cancel anyway?",
-                    SWT.ICON_QUESTION | SWT.YES | SWT.NO | SWT.ICON_WARNING);
+                    SWT.ICON_QUESTION | SWT.YES | SWT.NO);
             mb.setCloseCallback(new ICloseCallback() {
 
                 @Override
@@ -4388,15 +4337,6 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
             searchReplaceDlg.setEditMode(inEditMode);
         }
 
-        // Restore the contents of the text editor if needed
-        // Note: this block conpensates for the unusual behavior of the AWIPS-I
-        // cancel editor functionality. Basically, once a product has been saved
-        // cancelling DOES NOT roll back changes in AWIPS-I!
-        if (saved) {
-            replaceWorkProductId();
-            originalText = combineOriginalMessage();
-        }
-
         if (originalText != null) {
             textEditor.setText(originalText);
         }
@@ -5107,7 +5047,8 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
             try {
                 updateTextEditor(body);
                 if ((inEditMode || resend)
-                        && saveEditedProduct(prod, false, resend, true)) {
+                        && !saveEditedProduct(prod, false, resend, true)
+                                .isEmpty()) {
                     inEditMode = false;
                 }
                 if (!resend) {
@@ -5189,7 +5130,8 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
                 }
                 updateTextEditor(body);
                 if ((inEditMode || resend)
-                        && saveEditedProduct(prod, false, resend, false)) {
+                        && !saveEditedProduct(prod, false, resend, false)
+                                .isEmpty()) {
                     inEditMode = false;
                 }
                 SendPracticeProductRequest req = new SendPracticeProductRequest();
@@ -5353,12 +5295,12 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
             userInformation("This product MUST be edited in GFE! \n Please exit and return to GFE. \n Action Aborted!");
             return;
         }
-        boolean successful = saveEditedProduct(product, false, false, false);
-        if (successful) {
+        String savedProduct = saveEditedProduct(product, false, false, false);
+        if (!savedProduct.isEmpty()) {
             // reset the editor status flags
             saved = true;
             replaceWorkProductId();
-            originalText = combineOriginalMessage();
+            originalText = savedProduct;
             if (warnGenFlag == true) {
                 originalText = removeSoftReturns(originalText);
             }
@@ -5377,16 +5319,16 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
      * @param isOperationalSend
      *            true if operational send
      * 
-     * @return true is the save was successful
+     * @return The text of the saved product if successful. Empty string if not.
      */
-    synchronized private boolean saveEditedProduct(StdTextProduct product,
+    synchronized private String saveEditedProduct(StdTextProduct product,
             boolean isAutoSave, boolean resend, boolean isOperationalSend) {
         if ((product != null)
                 && gfeForbidden(product.getCccid(), product.getNnnid())) {
             // Pop up forbidden window.
             inEditMode = false;
             userInformation("This product MUST be edited in GFE! \n Please exit and return to GFE. \n Action Aborted!");
-            return false;
+            return StringUtils.EMPTY;
         }
         boolean successful = false;
 
@@ -5401,7 +5343,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
         // Convert the text in the text editor to uppercase
         if (!isAutoSave) {
             if (!verifyRequiredFields()) {
-                return false;
+                return StringUtils.EMPTY;
             }
             replaceWorkProductId();
 
@@ -5486,7 +5428,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
             successful = true;
         } else {
             if (!saveStoredTextProduct(storedProduct)) {
-                return false;
+                return StringUtils.EMPTY;
             }
 
             // Update the TextProductInfo table within the Text Database when a
@@ -5498,7 +5440,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
             successful = saveTextProductInfo();
         }
 
-        return successful;
+        return (successful) ? productText.trim() : StringUtils.EMPTY;
     }
 
     /**
@@ -7752,20 +7694,35 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
     protected void preOpened() {
         // Shell shell = ted.getShell();
         if (textWorkstationFlag) {
-            Rectangle rect = getShell().getDisplay().getClientArea();
-            int x = rect.width / 4;
 
-            // account for dual monitor
-            if (rect.width > (rect.height * 2)) {
-                x /= 2;
+            // get bounds of monitor containing parent shell
+            Point parentLoc = getParent().getShell().getLocation();
+            Rectangle rect = null;
+            for (Monitor monitor : getShell().getDisplay().getMonitors()) {
+                rect = monitor.getBounds();
+                if (rect.contains(parentLoc)) {
+                    break;
+                }
             }
+            int x = rect.x + (rect.width / 4);
+            int y = rect.y;
 
             int index = getText().indexOf(" ");
             int editorIndex = new Integer(getText().substring(index + 1))
                     .intValue();
 
-            int offset = (editorIndex - 1) * 25;
-            getShell().setLocation(x + offset, (rect.height / 4) + offset);
+            Rectangle bounds = getShell().getBounds();
+            Rectangle clientArea = getShell().getClientArea();
+
+            /*
+             * NOTE: this offset includes the height of the title bar and the
+             * menu. There appears to be no way to get just the title bar in
+             * Eclipse 3.8 We may be able to do this in Eclipse 4
+             */
+            int xOffset = (editorIndex - 1) * (bounds.width - clientArea.width);
+            int yOffset = (editorIndex - 1)
+                    * (bounds.height - clientArea.height);
+            getShell().setLocation(x + xOffset, y + yOffset);
         }
 
         inEditMode = false;
@@ -8048,9 +8005,9 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
         }
 
         // is this the impact paragraph?
-        if (paragraphStart.startsWith("  IMPACT...") ||
-            paragraphStart.startsWith("  HAZARD...") ||
-            paragraphStart.startsWith("  SOURCE...") ) {
+        if (paragraphStart.startsWith("  IMPACT...")
+                || paragraphStart.startsWith("  HAZARD...")
+                || paragraphStart.startsWith("  SOURCE...")) {
             padding = "           ";
         }
 
@@ -8134,8 +8091,9 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener,
             // if the next line does not start a new paragraph
             if (!isParagraphStart(lineNumber + 1)) {
                 // if the next line is not empty
-                if (!textEditor.getLine(lineNumber + 1).trim().isEmpty() ||
-                    (textEditor.getLine(lineNumber + 1).length() == padding.length()+1)   ) {
+                if (!textEditor.getLine(lineNumber + 1).trim().isEmpty()
+                        || (textEditor.getLine(lineNumber + 1).length() == (padding
+                                .length() + 1))) {
                     // Determine what kind of end of line marker line has.
                     int deleteLen = 0;
 
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/FaxMessageDlg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/FaxMessageDlg.java
index d6429bdb0d..93b274ba95 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/FaxMessageDlg.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/FaxMessageDlg.java
@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-import com.raytheon.uf.common.dataplugin.text.request.SendFaxRequest;
+import com.raytheon.uf.common.dataplugin.text.subscription.request.SendFaxRequest;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/FaxSiteEditorDlg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/FaxSiteEditorDlg.java
index c9abef0a84..3489fb8b6b 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/FaxSiteEditorDlg.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/FaxSiteEditorDlg.java
@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.MenuItem;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
-import com.raytheon.uf.common.dataplugin.text.db.AutoFaxRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.AutoFaxRecord;
 import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 
 /**
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/LdadFaxSitesDlg.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/LdadFaxSitesDlg.java
index 73df1595d8..05ff5b0266 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/LdadFaxSitesDlg.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/fax/dialogs/LdadFaxSitesDlg.java
@@ -38,10 +38,10 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
 
-import com.raytheon.uf.common.dataplugin.text.AutoFaxContainer;
-import com.raytheon.uf.common.dataplugin.text.db.AutoFaxRecord;
-import com.raytheon.uf.common.dataplugin.text.request.AutoFaxRequest;
-import com.raytheon.uf.common.dataplugin.text.request.GetAutoFaxRecordsRequest;
+import com.raytheon.uf.common.dataplugin.text.subscription.AutoFaxContainer;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.AutoFaxRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.request.AutoFaxRequest;
+import com.raytheon.uf.common.dataplugin.text.subscription.request.GetAutoFaxRecordsRequest;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpiration.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpiration.java
index 6e4f9055ea..10e1f2133b 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpiration.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpiration.java
@@ -25,6 +25,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.texteditor.TextDisplayModel;
@@ -41,8 +42,9 @@ import com.raytheon.viz.texteditor.util.VtecUtil;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * May 24, 2010            jsanchez     Initial creation
+ * May 24, 2010            jsanchez    Initial creation
  * Apr 25, 2014 DR 16668   D. Friedman Only notify on NEW products.
+ * Jan 26, 2016 5054       randerso    Changed to use display as parent
  * 
  * </pre>
  * 
@@ -60,7 +62,7 @@ public class NotifyExpiration {
 
     private static ArrayList<String> ALLOWED_TYPES = new ArrayList<String>(5);
 
-    private Shell parent;
+    private Display display;
 
     static {
         ALLOWED_TYPES.add("SMW");
@@ -70,8 +72,8 @@ public class NotifyExpiration {
         ALLOWED_TYPES.add("FLW");
     }
 
-    public NotifyExpiration(Shell parent) {
-        this.parent = parent;
+    public NotifyExpiration(Display display) {
+        this.display = display;
     }
 
     public void add(String warning) {
@@ -84,11 +86,11 @@ public class NotifyExpiration {
         }
 
         VtecObject vtecObject = VtecUtil.parseMessage(warning);
-        if (vtecObject == null || !"NEW".equals(vtecObject.getAction())) {
+        if ((vtecObject == null) || !"NEW".equals(vtecObject.getAction())) {
             return;
         }
         Calendar expire = vtecObject.getEndTime();
-        TimerTask notify = new NotifyExpirationTask(parent, productId,
+        TimerTask notify = new NotifyExpirationTask(display, productId,
                 vtecObject);
         Timer timer = new Timer();
         expire.add(Calendar.MINUTE, -10);
@@ -97,7 +99,7 @@ public class NotifyExpiration {
     }
 
     public void checkExpirationNotices(Shell shell) {
-        if (shell != null && !tasks.isEmpty()) {
+        if ((shell != null) && !tasks.isEmpty()) {
             if (MessageDialog.openQuestion(shell, EXIT_TITLE, EXIT_MSG)) {
                 for (TimerTask t : tasks) {
                     t.cancel();
diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpirationTask.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpirationTask.java
index 0164ef57f0..5003c86a36 100644
--- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpirationTask.java
+++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/notify/NotifyExpirationTask.java
@@ -24,7 +24,7 @@ import java.text.SimpleDateFormat;
 import java.util.TimerTask;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Display;
 
 import com.raytheon.uf.common.activetable.ActiveTableMode;
 import com.raytheon.uf.common.activetable.ActiveTableRecord;
@@ -57,6 +57,9 @@ import com.raytheon.viz.ui.dialogs.SWTMessageBox;
  * Apr 25, 2014 DR 16668   D. Friedman Handle partial cancellations
  * Apr 28, 2015 4027       randerso    Expunged Calendar from ActiveTableRecord
  * Nov 03, 2015 5086       rferrel     Generate sound while displaying warning expire message.
+ * Jan 26, 2016 5054       randerso    Changed to use display as parent,
+ *                                     code cleanup
+ * 
  * </pre>
  * 
  * @author jsanchez
@@ -80,11 +83,16 @@ public class NotifyExpirationTask extends TimerTask {
 
     private String message;
 
-    private Shell parentShell;
+    private Display display;
 
-    public NotifyExpirationTask(Shell parent, String productId,
+    /**
+     * @param display
+     * @param productId
+     * @param vtecObject
+     */
+    public NotifyExpirationTask(Display display, String productId,
             VtecObject vtecObject) {
-        this.parentShell = parent;
+        this.display = display;
         office = vtecObject.getOffice();
         phenSig = vtecObject.getPhenomena() + "."
                 + vtecObject.getSignificance();
@@ -100,13 +108,13 @@ public class NotifyExpirationTask extends TimerTask {
         if (!isCanceled()) {
             final AlarmBeepJob abj = new AlarmBeepJob("expire", 0);
             abj.schedule();
-            parentShell.getDisplay().asyncExec(new Runnable() {
+            display.asyncExec(new Runnable() {
                 @Override
                 public void run() {
                     SWTMessageBox mb = new SWTMessageBox(
-                            NotifyExpirationTask.this.parentShell,
-                            "Watch/Warning Expires Soon", message, SWT.OK,
-                            SWT.MODELESS, true);
+                            NotifyExpirationTask.this.display,
+                            "Watch/Warning Expires Soon", message,
+                            SWT.ICON_WARNING | SWT.OK);
                     mb.setCloseCallback(new ICloseCallback() {
 
                         @Override
diff --git a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/SelectUserIdDlg.java b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/SelectUserIdDlg.java
deleted file mode 100644
index 692bb927b7..0000000000
--- a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/SelectUserIdDlg.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-
-package com.raytheon.viz.textworkstation;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-
-import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
-
-/**
- * SelectUserIdDlg class.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * 9/27/2007    368         lvenable    Initial creation.
- * 10/11/2007   482         grichard    Reformatted file.
- * 26Sep2012    1196        lvenable    Dialog refactor to not block.
- * 
- * </pre>
- * 
- * @author lvenable
- */
-public class SelectUserIdDlg extends CaveSWTDialog {
-
-    private Font font;
-
-    private List userIdList;
-
-    public SelectUserIdDlg(Shell parent) {
-        super(parent, SWT.DIALOG_TRIM, CAVE.PERSPECTIVE_INDEPENDENT
-                | CAVE.DO_NOT_BLOCK);
-        setText("Select User ID");
-    }
-
-    @Override
-    protected void disposed() {
-        font.dispose();
-    }
-
-    @Override
-    protected void initializeComponents(Shell shell) {
-        setReturnValue(false);
-
-        font = new Font(shell.getDisplay(), "Monospace", 10, SWT.NORMAL);
-
-        // Initialize all of the controls and layouts
-        createUserIdList();
-        createBottomButtons();
-
-        // TODO : remove this method call...
-        createDummyData();
-    }
-
-    private void createUserIdList() {
-        GridData gd = new GridData(SWT.CENTER, SWT.DEFAULT, false, false);
-        gd.widthHint = 200;
-        gd.heightHint = 350;
-        userIdList = new List(shell, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL);
-        userIdList.setLayoutData(gd);
-
-        userIdList.setFont(font);
-    }
-
-    private void createBottomButtons() {
-        Composite centeredComp = new Composite(shell, SWT.NONE);
-        GridLayout gl = new GridLayout(2, false);
-        centeredComp.setLayout(gl);
-        GridData gd = new GridData(SWT.CENTER, SWT.DEFAULT, true, false);
-        centeredComp.setLayoutData(gd);
-
-        gd = new GridData(70, SWT.DEFAULT);
-        Button okBtn = new Button(centeredComp, SWT.NONE);
-        okBtn.setText("OK");
-        okBtn.setLayoutData(gd);
-        okBtn.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-            }
-        });
-
-        gd = new GridData(70, SWT.DEFAULT);
-        Button cancelBtn = new Button(centeredComp, SWT.NONE);
-        cancelBtn.setText("Cancel");
-        cancelBtn.setLayoutData(gd);
-        cancelBtn.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                shell.dispose();
-            }
-        });
-    }
-
-    // TODO : remove this method...
-    private void createDummyData() {
-        String tmp;
-
-        for (int i = 0; i < 30; i++) {
-            tmp = "User ID " + i;
-            userIdList.add(tmp);
-        }
-    }
-}
diff --git a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationAction.java b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationAction.java
index 93b9160bc9..70705df833 100644
--- a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationAction.java
+++ b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationAction.java
@@ -23,8 +23,7 @@ package com.raytheon.viz.textworkstation;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
+import org.eclipse.swt.widgets.Display;
 
 import com.raytheon.viz.ui.dialogs.ICloseCallback;
 
@@ -42,6 +41,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
  * 10/11/2007   482         grichard    Reformatted file.
  * 08/03/2011   9572        rferrel     Allow single instance of the dialog.
  * 26Sep2012    1196        lvenable    Update for the dialog refactor.
+ * Jan 26, 2016 5054        randerso    Changed to use display as parent
  * 
  * </pre>
  * 
@@ -54,10 +54,8 @@ public class TextWorkstationAction extends AbstractHandler {
 
     @Override
     public Object execute(ExecutionEvent arg0) throws ExecutionException {
-        Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getShell();
-        if (textWorkstationDlg == null || textWorkstationDlg.isDisposed()) {
-            textWorkstationDlg = new TextWorkstationDlg(shell);
+        if ((textWorkstationDlg == null) || textWorkstationDlg.isDisposed()) {
+            textWorkstationDlg = new TextWorkstationDlg(Display.getCurrent());
             textWorkstationDlg.setCloseCallback(new ICloseCallback() {
 
                 @Override
diff --git a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationComponent.java b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationComponent.java
index a7f9c380bf..56444f18b6 100644
--- a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationComponent.java
+++ b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationComponent.java
@@ -1,7 +1,6 @@
 package com.raytheon.viz.textworkstation;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.serialization.SerializationUtil;
 import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
@@ -36,11 +35,12 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 28, 2011            mschenke     Initial creation
+ * Apr 28, 2011            mschenke    Initial creation
  * Oct 02, 2012 1229       rferrel     Make a blocking dialog.
- * Oct 17, 2012 1229       rferrel     Changes for non-blocking
- *                                      TextWorkstationDlg.
+ * Oct 17, 2012 1229       rferrel     Changes for non-blocking TextWorkstationDlg.
  * Sep 09, 2014 3580       mapeters    Removed {@link SerializationUtil} usage.
+ * Oct 28, 2015 5054       randerso    Make TextWorkstationDlg appear on current monitor.
+ * Jan 26, 2016 5054       randerso    Changed to use display as parent
  * 
  * </pre>
  * 
@@ -60,7 +60,7 @@ public class TextWorkstationComponent extends AbstractCAVEDialogComponent {
     @Override
     protected void startInternal(String componentName) throws Exception {
         TextWorkstationDlg textWorkstationDlg = new TextWorkstationDlg(
-                new Shell(Display.getCurrent()));
+                Display.getCurrent());
         textWorkstationDlg.open();
         blockUntilClosed(textWorkstationDlg);
     }
diff --git a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
index 48eeadb361..f6fb4d794c 100644
--- a/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
+++ b/cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
@@ -32,12 +32,15 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.MessageBox;
+import org.eclipse.swt.widgets.Monitor;
 import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.uf.common.jms.notification.INotificationObserver;
@@ -90,8 +93,12 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 02Oct2012    1229        rferrel     Option to allow blocking when top dialog.
  * 13Dec2012    1353        rferrel     Fix bug introduced in the Show all dialogs.
  * 30Jan2013    DR 14736    D. Friedman Display local time.
- * 24Jun2013	DR 15733	XHuang		Display MAX_BUTTON_CNT (8 button).
+ * 24Jun2013	DR 15733    XHuang      Display MAX_BUTTON_CNT (8 button).
  * 25July2013   DR 15733    Greg Hull   Make dflt and max number of Text Buttons configurable.
+ * 28Oct2015    5054        randerso    Make TextWorkstationDlg appear in upper left corner of 
+ *                                      monitor where parent shell is located
+ * Dec 14, 2015 4834        njensen     Remove dead menu items
+ * Jan 26, 2016 5054        randerso    Changed to use display as parent
  * Feb 15, 2016 4860        njensen     Removed references to IAviationObserver
  * 
  * 
@@ -146,20 +153,15 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
 
     private long initStartTime;
 
-    /** Select user ID dialog */
-    private SelectUserIdDlg userIdDlg;
-
     /**
-     * Create dialog specifying NONE for blocking and DO_NOT_BLOCK for
-     * non-blocking dialog.
+     * Create top level Text Workstation Dialog
+     * 
+     * @param display
      * 
-     * @param parent
-     *            - CAVE.DO_NOT_BLOCK or CAVE.NONE
      */
-    public TextWorkstationDlg(Shell parent) {
-        super(parent, SWT.DIALOG_TRIM | SWT.MIN | SWT.RESIZE,
-                CAVE.PERSPECTIVE_INDEPENDENT | CAVE.INDEPENDENT_SHELL
-                        | CAVE.DO_NOT_BLOCK);
+    public TextWorkstationDlg(Display display) {
+        super(display, SWT.DIALOG_TRIM | SWT.MIN, CAVE.PERSPECTIVE_INDEPENDENT
+                | CAVE.INDEPENDENT_SHELL | CAVE.DO_NOT_BLOCK);
 
         setText("Text Workstation");
         TextDisplayModel.getInstance().setTextRadar(new RadarTextUtility());
@@ -193,34 +195,21 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
     protected void initializeComponents(final Shell shell) {
         setReturnValue(false);
 
-        notify = new NotifyExpiration(getParent());
+        notify = new NotifyExpiration(getDisplay());
         font = new Font(shell.getDisplay(), "Monospace", 10, SWT.NORMAL);
 
         fontAwipsLabel = new Font(shell.getDisplay(), "Helvetica", 24,
                 SWT.ITALIC);
 
-        INIT_BUTTON_CNT = TextEditorCfg.getTextEditorCfg().getDefaultNumEditors();
+        INIT_BUTTON_CNT = TextEditorCfg.getTextEditorCfg()
+                .getDefaultNumEditors();
         MAX_BUTTON_CNT = TextEditorCfg.getTextEditorCfg().getMaxNumEditors();
-        
+
         // Initialize all of the controls and layouts
-        initializeComponents();
-    }
-
-    @Override
-    protected void opened() {
-        if (productToDisplay != null) {
-            wgDlg.showWarngenProduct(productToDisplay, notify);
-        }
-
-        // Display the first Text Editor
-        showTextEditor(0);
-    }
-
-    private void initializeComponents() {
         sdfUTC.setTimeZone(TimeZone.getTimeZone("UTC"));
         String localTZName = System.getenv("FXA_LOCAL_TZ");
-        sdfLocal.setTimeZone(localTZName != null ?
-                TimeZone.getTimeZone(localTZName) : TimeZone.getDefault());
+        sdfLocal.setTimeZone(localTZName != null ? TimeZone
+                .getTimeZone(localTZName) : TimeZone.getDefault());
 
         createMenus();
         new Label(shell, SWT.NONE).setText("host: "
@@ -237,6 +226,49 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
         alarmDlg.openInvisible();
     }
 
+    /*
+     * (non-Javadoc)
+     * 
+     * @see com.raytheon.viz.ui.dialogs.CaveSWTDialog#preOpened()
+     */
+    @Override
+    protected void preOpened() {
+        super.preOpened();
+
+        Monitor monitor = null;
+        if (getParent() != null) {
+            monitor = getParent().getShell().getMonitor();
+
+        } else {
+            Point cursor = getDisplay().getCursorLocation();
+            for (Monitor m : getDisplay().getMonitors()) {
+                Rectangle bounds = m.getBounds();
+                if (bounds.contains(cursor)) {
+                    monitor = m;
+                    break;
+                }
+            }
+        }
+
+        Point loc = new Point(0, 0);
+        if (monitor != null) {
+            Rectangle bounds = monitor.getBounds();
+            loc.x = bounds.x;
+            loc.y = bounds.y;
+        }
+        shell.setLocation(loc);
+    }
+
+    @Override
+    protected void opened() {
+        if (productToDisplay != null) {
+            wgDlg.showWarngenProduct(productToDisplay, notify);
+        }
+
+        // Display the first Text Editor
+        showTextEditor(0);
+    }
+
     private void createMenus() {
         Menu menuBar = new Menu(shell, SWT.BAR);
 
@@ -258,43 +290,12 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
         fileMenuItem.setMenu(fileMenu);
 
         // --------------------------------------------------
-        // Create Select User ID menu item
-        // --------------------------------------------------
-        MenuItem selectUserIdMenuItem = new MenuItem(fileMenu, SWT.NONE);
-        selectUserIdMenuItem.setText("Select User ID...");
-        selectUserIdMenuItem.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                if (userIdDlg == null || userIdDlg.isDisposed()) {
-                    userIdDlg = new SelectUserIdDlg(shell);
-                    userIdDlg.open();
-                } else {
-                    userIdDlg.bringToTop();
-                }
-            }
-        });
-
-        // --------------------------------------------------
-        // Create Evaluation sub menu item
-        // --------------------------------------------------
-        MenuItem evaluationMenuItem = new MenuItem(fileMenu, SWT.CASCADE);
-        evaluationMenuItem.setText("Select");
-
-        Menu selectSubMenu = new Menu(shell, SWT.DROP_DOWN);
-        evaluationMenuItem.setMenu(selectSubMenu);
-
-        createEvaluationSubMenu(selectSubMenu);
-
-        // -------------------------------
-        // Add a menu separator.
-        // -------------------------------
-        new MenuItem(fileMenu, SWT.SEPARATOR);
-
-        // --------------------------------------------------
-        // Create Select User ID menu item
+        // Create Exit menu item
         // --------------------------------------------------
         MenuItem exitMenuItem = new MenuItem(fileMenu, SWT.NONE);
         exitMenuItem.setText("Exit");
         exitMenuItem.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 getShell().close();
             }
@@ -318,6 +319,7 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
         MenuItem hideAllMenuItem = new MenuItem(windowsMenu, SWT.NONE);
         hideAllMenuItem.setText("Hide All");
         hideAllMenuItem.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 hideAllTextEditors();
             }
@@ -329,6 +331,7 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
         MenuItem showAllMenuItem = new MenuItem(windowsMenu, SWT.NONE);
         showAllMenuItem.setText("Show All");
         showAllMenuItem.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 showAllTextEditors();
             }
@@ -345,38 +348,13 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
         newWindowMenuItem = new MenuItem(windowsMenu, SWT.NONE);
         newWindowMenuItem.setText("New Window");
         newWindowMenuItem.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 addNewWindowButton();
             }
         });
     }
 
-    private void createEvaluationSubMenu(Menu evalSubMenu) {
-        MenuItem evaluationLogItem = new MenuItem(evalSubMenu, SWT.NONE);
-        evaluationLogItem.setText("Evaluation Log");
-        evaluationLogItem.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                notImplementedYet("Evaluation Log");
-            }
-        });
-
-        MenuItem endOfShiftItem = new MenuItem(evalSubMenu, SWT.NONE);
-        endOfShiftItem.setText("End of Shift");
-        endOfShiftItem.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                notImplementedYet("End of Shift");
-            }
-        });
-
-        MenuItem questionnaireItem = new MenuItem(evalSubMenu, SWT.NONE);
-        questionnaireItem.setText("Questionnaire");
-        questionnaireItem.addSelectionListener(new SelectionAdapter() {
-            public void widgetSelected(SelectionEvent event) {
-                notImplementedYet("Questionnaire");
-            }
-        });
-    }
-
     private void createAwipsLabel() {
         GridData gd = new GridData(300, 20);
         Label awipsBlankLabel = new Label(shell, SWT.NONE);
@@ -414,6 +392,7 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
         AlarmAlertNotificationObserver.getInstance();
 
         alertAlarmBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 if (alarmDlg == null) {
                     AlarmAlertNotificationObserver.getInstance();
@@ -436,7 +415,7 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
         textBtnArray = new ArrayList<Button>();
         textEditorArray = new ArrayList<TextEditorDialog>();
 
-        for (int x = 1; x <= INIT_BUTTON_CNT; ++x) {	
+        for (int x = 1; x <= INIT_BUTTON_CNT; ++x) {
             createButtonAndTextEditor(x);
         }
     }
@@ -462,6 +441,7 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
         textBtn.setText(btnTitle);
         textBtn.setLayoutData(gd);
         textBtn.addSelectionListener(new SelectionAdapter() {
+            @Override
             public void widgetSelected(SelectionEvent event) {
                 showTextEditor(textBtnArray.indexOf(event.getSource()));
             }
@@ -474,7 +454,7 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
 
     private synchronized void createWarngenDisplay() {
         if (wgDlg == null) {
-            wgDlg = new TextEditorDialog(getParent(), "Text Warngen", false,
+            wgDlg = new TextEditorDialog(getShell(), "Text Warngen", false,
                     "9", true);
         }
     }
@@ -523,8 +503,10 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
         timer = new Timer();
 
         updateTimeTask = new TimerTask() {
+            @Override
             public void run() {
                 getDisplay().syncExec(new Runnable() {
+                    @Override
                     public void run() {
                         updateTimeLabels();
                     }
@@ -555,17 +537,6 @@ public class TextWorkstationDlg extends CaveSWTDialog implements
 
     }
 
-    // TODO - remove this when needed...
-    // this is a convenience method to show a dialog
-    // when functionality has not been implemented...
-    //
-    private void notImplementedYet(String information) {
-        MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
-        mb.setText("Notice");
-        mb.setMessage("Functionality not implemented yet:\n\n" + information);
-        mb.open();
-    }
-
     @Override
     public synchronized void notificationArrived(NotificationMessage[] messages) {
         // SimpleDateFormat sdf = new
diff --git a/cave/com.raytheon.viz.ui.personalities.awips/splash.bmp b/cave/com.raytheon.viz.ui.personalities.awips/splash.bmp
index bd3eba7e61..e7918c8bcc 100644
Binary files a/cave/com.raytheon.viz.ui.personalities.awips/splash.bmp and b/cave/com.raytheon.viz.ui.personalities.awips/splash.bmp differ
diff --git a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEDialogComponent.java b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEDialogComponent.java
index ca78246c9d..50121a1009 100644
--- a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEDialogComponent.java
+++ b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEDialogComponent.java
@@ -21,7 +21,7 @@ package com.raytheon.viz.ui.personalities.awips;
 
 import org.eclipse.swt.widgets.Display;
 
-import com.raytheon.viz.ui.dialogs.CaveSWTDialogBase;
+import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
 
 /**
  * This abstract class provides a way to wait for a non-blocking dialog to
@@ -37,6 +37,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialogBase;
  * ------------ ---------- ----------- --------------------------
  * Oct 18, 2012 1229       rferrel     Initial creation
  * Mar 23, 2015 4278       njensen     Added try/catch throwable
+ * Jan 18, 2016 5045       randerso    Merged CaveSWTDialog and CaveSWTDialogBase
  * 
  * </pre>
  * 
@@ -46,7 +47,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialogBase;
 
 public abstract class AbstractCAVEDialogComponent extends
         AbstractAWIPSComponent {
-    protected void blockUntilClosed(CaveSWTDialogBase dlg) {
+    protected void blockUntilClosed(CaveSWTDialog dlg) {
         while (!dlg.isDisposed()) {
             try {
                 if (!Display.getCurrent().readAndDispatch()) {
diff --git a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/splash.jpg b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/splash.jpg
deleted file mode 100644
index 757ae3a6c9..0000000000
Binary files a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/splash.jpg and /dev/null differ
diff --git a/cave/com.raytheon.viz.ui.tools.looping/src/com/raytheon/viz/ui/tools/looping/LoopPropertiesDialog.java b/cave/com.raytheon.viz.ui.tools.looping/src/com/raytheon/viz/ui/tools/looping/LoopPropertiesDialog.java
index 6cc771923e..ff76e54f1c 100644
--- a/cave/com.raytheon.viz.ui.tools.looping/src/com/raytheon/viz/ui/tools/looping/LoopPropertiesDialog.java
+++ b/cave/com.raytheon.viz.ui.tools.looping/src/com/raytheon/viz/ui/tools/looping/LoopPropertiesDialog.java
@@ -57,6 +57,7 @@ import com.raytheon.viz.ui.keys.PageUpDownKey;
  * Date       	Ticket#		Engineer	Description
  * ------------	----------	-----------	--------------------------
  * Aug 1, 2006              chammack    Initial Creation.
+ * Jan 12, 2016  5238       lvenable    Increased label width so the scale labels do not get hidden.
  * 
  * </pre>
  * 
@@ -126,7 +127,7 @@ public class LoopPropertiesDialog extends CaveJFACEDialog implements
 
     private static final int SCALE_WIDTH = 130;
 
-    private static final int LABEL_WIDTH = 35;
+    private static final int LABEL_WIDTH = 60;
 
     private final String title;
 
@@ -152,7 +153,7 @@ public class LoopPropertiesDialog extends CaveJFACEDialog implements
 
     private LoopProperties loopProperties;
 
-    private PageUpDownListener keyListener = new PageUpDownListener();
+    private final PageUpDownListener keyListener = new PageUpDownListener();
 
     /**
      * Constructor
@@ -267,6 +268,7 @@ public class LoopPropertiesDialog extends CaveJFACEDialog implements
         fwdLoopSpeedLabel = new Label(composite, SWT.NONE);
         fwdLoopSpeedLabel.setLayoutData(new GridData(LABEL_WIDTH, SWT.DEFAULT));
         fwdLoopSpeedScale.addListener(SWT.Selection, new Listener() {
+            @Override
             public void handleEvent(Event event) {
                 loopProperties
                         .setFwdFrameTime(calculateFrameTime(fwdLoopSpeedScale));
@@ -289,6 +291,7 @@ public class LoopPropertiesDialog extends CaveJFACEDialog implements
         revLoopSpeedLabel = new Label(composite, SWT.NONE);
         revLoopSpeedLabel.setLayoutData(new GridData(LABEL_WIDTH, SWT.DEFAULT));
         revLoopSpeedScale.addListener(SWT.Selection, new Listener() {
+            @Override
             public void handleEvent(Event event) {
                 loopProperties
                         .setRevFrameTime(calculateFrameTime(revLoopSpeedScale));
@@ -314,6 +317,7 @@ public class LoopPropertiesDialog extends CaveJFACEDialog implements
         firstFrameDwellLabel.setLayoutData(new GridData(LABEL_WIDTH,
                 SWT.DEFAULT));
         firstFrameDwellScale.addListener(SWT.Selection, new Listener() {
+            @Override
             public void handleEvent(Event event) {
                 loopProperties
                         .setFirstFrameDwell(calculateDwellTime(firstFrameDwellScale));
@@ -339,6 +343,7 @@ public class LoopPropertiesDialog extends CaveJFACEDialog implements
         lastFrameDwellLabel
                 .setLayoutData(new GridData(LABEL_WIDTH, SWT.DEFAULT));
         lastFrameDwellScale.addListener(SWT.Selection, new Listener() {
+            @Override
             public void handleEvent(Event event) {
                 loopProperties
                         .setLastFrameDwell(calculateDwellTime(lastFrameDwellScale));
@@ -350,6 +355,7 @@ public class LoopPropertiesDialog extends CaveJFACEDialog implements
         isLoopingButton = new Button(composite, SWT.CHECK);
         isLoopingButton.setText("Looping");
         isLoopingButton.addListener(SWT.Selection, new Listener() {
+            @Override
             public void handleEvent(Event event) {
                 loopProperties.setLooping(isLoopingButton.getSelection());
                 if ((loopProperties.getFwdFrameTime() == 0)
diff --git a/cave/com.raytheon.viz.volumebrowser/DataSelectionMenuItems.xml b/cave/com.raytheon.viz.volumebrowser/DataSelectionMenuItems.xml
index c6d6e8a80d..66d3ecd925 100644
--- a/cave/com.raytheon.viz.volumebrowser/DataSelectionMenuItems.xml
+++ b/cave/com.raytheon.viz.volumebrowser/DataSelectionMenuItems.xml
@@ -22,7 +22,6 @@
 	<Source-Grid>NAM40</Source-Grid>
 	<Source-Grid>NAM80</Source-Grid>
 	<Source-Grid>NAMWX</Source-Grid>
-	<Source-Grid>NGM80</Source-Grid>
 	<Source-Grid>NICIE</Source-Grid>
 	<Source-Grid>TPC-HurWind</Source-Grid>
 	<Source-Grid>TPCWindProb</Source-Grid>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/pwpf.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/pwpf.xml
new file mode 100644
index 0000000000..9c7610069d
--- /dev/null
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/pwpf.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <contribute xsi:type="toolbarSubMenu" menuText="Probablistic Forecasts">
+        <contribute xsi:type="toolbarSubMenu" menuText="12hr">
+            <contribute xsi:type="menuItem" menuText="5th Percentile Snow accumulation" key="TOTSN5pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="10th Percentile Snow accumulation" key="TOTSN10pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="25th Percentile Snow accumulation" key="TOTSN25pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="50th Percentile Snow accumulation" key="TOTSN50pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="75th Percentile Snow accumulation" key="TOTSN75pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="90th Percentile Snow accumulation" key="TOTSN90pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="95th Percentile Snow accumulation" key="TOTSN95pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 1in Snow" key="TOTSN1in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 2in Snow" key="TOTSN2in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 4in Snow" key="TOTSN4in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 6in Snow" key="TOTSN6in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 8in Snow" key="TOTSN8in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 12in Snow" key="TOTSN12in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 18in Snow" key="TOTSN18in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="5th Percentile Freezing Rain accumulation" key="FRZR5pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="10th Percentile Freezing Rain accumulation" key="FRZR10pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="25th Percentile Freezing Rain accumulation" key="FRZR25pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="50th Percentile Freezing Rain accumulation" key="FRZR50pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="75th Percentile Freezing Rain accumulation" key="FRZR75pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="90th Percentile Freezing Rain accumulation" key="FRZR90pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="95th Percentile Freezing Rain accumulation" key="FRZR95pct12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.01in Freezing Rain" key="FRZR0.01in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.1in Freezing Rain" key="FRZR0.1in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.25in Freezing Rain" key="FRZR0.25in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.5in Freezing Rain" key="FRZR0.5in12hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 1in Freezing Rain" key="FRZR1in12hr" indentText="false" />
+        </contribute>
+        <contribute xsi:type="toolbarSubMenu" menuText="24hr">
+            <contribute xsi:type="menuItem" menuText="5th Percentile Snow accumulation" key="TOTSN5pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="10th Percentile Snow accumulation" key="TOTSN10pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="25th Percentile Snow accumulation" key="TOTSN25pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="50th Percentile Snow accumulation" key="TOTSN50pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="75th Percentile Snow accumulation" key="TOTSN75pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="90th Percentile Snow accumulation" key="TOTSN90pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="95th Percentile Snow accumulation" key="TOTSN95pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 1in Snow" key="TOTSN1in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 2in Snow" key="TOTSN2in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 4in Snow" key="TOTSN4in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 6in Snow" key="TOTSN6in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 8in Snow" key="TOTSN8in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 12in Snow" key="TOTSN12in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 18in Snow" key="TOTSN18in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="5th Percentile Freezing Rain accumulation" key="FRZR5pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="10th Percentile Freezing Rain accumulation" key="FRZR10pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="25th Percentile Freezing Rain accumulation" key="FRZR25pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="50th Percentile Freezing Rain accumulation" key="FRZR50pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="75th Percentile Freezing Rain accumulation" key="FRZR75pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="90th Percentile Freezing Rain accumulation" key="FRZR90pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="95th Percentile Freezing Rain accumulation" key="FRZR95pct24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.01in Freezing Rain" key="FRZR0.01in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.1in Freezing Rain" key="FRZR0.1in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.25in Freezing Rain" key="FRZR0.25in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.5in Freezing Rain" key="FRZR0.5in24hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 1in Freezing Rain" key="FRZR1in24hr" indentText="false" />
+        </contribute>
+        <contribute xsi:type="toolbarSubMenu" menuText="48hr">
+            <contribute xsi:type="menuItem" menuText="5th Percentile Snow accumulation" key="TOTSN5pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="10th Percentile Snow accumulation" key="TOTSN10pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="25th Percentile Snow accumulation" key="TOTSN25pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="50th Percentile Snow accumulation" key="TOTSN50pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="75th Percentile Snow accumulation" key="TOTSN75pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="90th Percentile Snow accumulation" key="TOTSN90pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="95th Percentile Snow accumulation" key="TOTSN95pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 2in Snow" key="TOTSN2in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 4in Snow" key="TOTSN4in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 8in Snow" key="TOTSN8in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 12in Snow" key="TOTSN12in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 18in Snow" key="TOTSN18in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 24in Snow" key="TOTSN24in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 30in Snow" key="TOTSN30in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="5th Percentile Freezing Rain accumulation" key="FRZR5pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="10th Percentile Freezing Rain accumulation" key="FRZR10pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="25th Percentile Freezing Rain accumulation" key="FRZR25pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="50th Percentile Freezing Rain accumulation" key="FRZR50pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="75th Percentile Freezing Rain accumulation" key="FRZR75pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="90th Percentile Freezing Rain accumulation" key="FRZR90pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="95th Percentile Freezing Rain accumulation" key="FRZR95pct48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.1in Freezing Rain" key="FRZR0.1in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.25in Freezing Rain" key="FRZR0.25in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.5in Freezing Rain" key="FRZR0.5in48hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 1in Freezing Rain" key="FRZR1in48hr" indentText="false" />
+        </contribute>
+        <contribute xsi:type="toolbarSubMenu" menuText="72hr">
+            <contribute xsi:type="menuItem" menuText="5th Percentile Snow accumulation" key="TOTSN5pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="10th Percentile Snow accumulation" key="TOTSN10pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="25th Percentile Snow accumulation" key="TOTSN25pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="50th Percentile Snow accumulation" key="TOTSN50pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="75th Percentile Snow accumulation" key="TOTSN75pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="90th Percentile Snow accumulation" key="TOTSN90pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="95th Percentile Snow accumulation" key="TOTSN95pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 2in Snow" key="TOTSN2in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 4in Snow" key="TOTSN4in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 8in Snow" key="TOTSN8in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 12in Snow" key="TOTSN12in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 18in Snow" key="TOTSN18in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 24in Snow" key="TOTSN24in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 30in Snow" key="TOTSN30in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="5th Percentile Freezing Rain accumulation" key="FRZR5pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="10th Percentile Freezing Rain accumulation" key="FRZR10pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="25th Percentile Freezing Rain accumulation" key="FRZR25pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="50th Percentile Freezing Rain accumulation" key="FRZR50pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="75th Percentile Freezing Rain accumulation" key="FRZR75pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="90th Percentile Freezing Rain accumulation" key="FRZR90pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="95th Percentile Freezing Rain accumulation" key="FRZR95pct72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.1in Freezing Rain" key="FRZR0.1in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.25in Freezing Rain" key="FRZR0.25in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 0.5in Freezing Rain" key="FRZR0.5in72hr" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="% chance &gt; 1in Freezing Rain" key="FRZR1in72hr" indentText="false" />
+        </contribute>
+    </contribute>
+</menuTemplate>
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/winter.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/winter.xml
index b882f6dccb..77d2c43f9a 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/winter.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/winter.xml
@@ -20,46 +20,48 @@
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <contribute xsi:type="toolbarSubMenu" menuText="WPC-WWD">
-		<contribute xsi:type="menuItem" menuText="6-hr ice" key="FRZR6hr" indentText="false" />
-		<contribute xsi:type="menuItem" menuText="6-hr snowfall" key="TOTSN6hr" indentText="false" />
-		<contribute xsi:type="toolbarSubMenu" menuText="Snow Density/Snow-water Ratio">
-			<contribute xsi:type="menuItem" menuText="Climo Density SON/DJF/MAM" key="SDENCLIMO" indentText="false" />
-			<contribute xsi:type="menuItem" menuText="Climo Ratio SON/DJF/MAM" key="s2H2O_CLIMO" indentText="false" />
-			<contribute xsi:type="menuItem" menuText="GFS Density" key="SDENGFS" indentText="false" />
-			<contribute xsi:type="menuItem" menuText="GFS Ratio" key="s2H2O_GFS" indentText="false" />
-			<contribute xsi:type="menuItem" menuText="NAM Density" key="SDENNAM" indentText="false" />
-			<contribute xsi:type="menuItem" menuText="NAM Ratio" key="s2H2O_NAM" indentText="false" />
-			<contribute xsi:type="menuItem" menuText="HPC Mean Density" key="SDENMEAN" indentText="false" />
-			<contribute xsi:type="menuItem" menuText="HPC Mean Ratio" key="s2H2O_MEAN" indentText="false" />
-		</contribute>
-	</contribute>
-	<contribute xsi:type="menuItem" menuText="Dendritic Growth Isotherms" key="Tdend" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="EPV* - Sat Geo Equiv Pot Vort" key="MpV" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="EPV* - Less than 0.25" key="QPV2" indentText="true" />
-	<contribute xsi:type="menuItem" menuText="Instability - Upright vs. Slantwise Icons" key="EPVt2" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Lake Snow Parameter" key="LSP" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Precip Type Icons" key="PTyp" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Preferred Ice Growth" key="SnowT" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Pressure Diff: -15C and MaxOmega" key="OmDiff" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Reflectivity w/PType" key="RRtype" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Q-Vector Convergence" key="QPV1" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="QPV Net - QVec Conv * Neg EPV*" key="QPV3" indentText="true" />
+        <contribute xsi:type="menuItem" menuText="6-hr ice" key="FRZR6hr" indentText="false" />
+        <contribute xsi:type="menuItem" menuText="6-hr snowfall" key="TOTSN6hr" indentText="false" />
+        <contribute xsi:type="toolbarSubMenu" menuText="Snow Density/Snow-water Ratio">
+            <contribute xsi:type="menuItem" menuText="Climo Density SON/DJF/MAM" key="SDENCLIMO" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="Climo Ratio SON/DJF/MAM" key="s2H2O_CLIMO" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="GFS Density" key="SDENGFS" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="GFS Ratio" key="s2H2O_GFS" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="NAM Density" key="SDENNAM" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="NAM Ratio" key="s2H2O_NAM" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="HPC Mean Density" key="SDENMEAN" indentText="false" />
+            <contribute xsi:type="menuItem" menuText="HPC Mean Ratio" key="s2H2O_MEAN" indentText="false" />
+        </contribute>
+        <contribute xsi:type="subinclude"
+            fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/pwpf.xml" />
+    </contribute>
+    <contribute xsi:type="menuItem" menuText="Dendritic Growth Isotherms" key="Tdend" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="EPV* - Sat Geo Equiv Pot Vort" key="MpV" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="EPV* - Less than 0.25" key="QPV2" indentText="true" />
+    <contribute xsi:type="menuItem" menuText="Instability - Upright vs. Slantwise Icons" key="EPVt2" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Lake Snow Parameter" key="LSP" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Precip Type Icons" key="PTyp" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Preferred Ice Growth" key="SnowT" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Pressure Diff: -15C and MaxOmega" key="OmDiff" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Reflectivity w/PType" key="RRtype" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Q-Vector Convergence" key="QPV1" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="QPV Net - QVec Conv * Neg EPV*" key="QPV3" indentText="true" />
     <contribute xsi:type="menuItem" menuText="QG-EPV" key="QPV4" indentText="true" />
-	<contribute xsi:type="menuItem" menuText="Sfc-Based Lyr MinT For Sleet" key="CritT1" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Snow Cover" key="SCP" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Snow Depth - fm Model" key="SnD" indentText="false" />
-	<contribute xsi:type="toolbarSubMenu" menuText="Snow Ratios">
-	  <contribute xsi:type="menuItem" menuText="Snow Ratio - Crocus/ECMWF" key="snoRatCrocus" indentText="false" />
-	  <contribute xsi:type="menuItem" menuText="Snow Ratio - SPC" key="snoRatSPC" indentText="false" />
-	  <contribute xsi:type="menuItem" menuText="Snow Ratio - EMC SREF" key="snoRatEMCSREF" indentText="false" />
-	  <contribute xsi:type="menuItem" menuText="Snow Ratio - WPC Mean" key="s2H2O_MEAN" indentText="false" />
-	</contribute>
-	<contribute xsi:type="menuItem" menuText="Snow Squall Parameter" key="SNSQ" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Thickness (All Models)" key="dZ" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Thickness: Snow Likely" key="Snow3" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Thickness: ZR" key="Fzra2" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Thickness: Mixed Precip" key="Mix2" indentText="false" />
-	<contribute xsi:type="menuItem" menuText="Thickness: Rain Likely" key="Rain3" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Sfc-Based Lyr MinT For Sleet" key="CritT1" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Snow Cover" key="SCP" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Snow Depth - fm Model" key="SnD" indentText="false" />
+    <contribute xsi:type="toolbarSubMenu" menuText="Snow Ratios">
+        <contribute xsi:type="menuItem" menuText="Snow Ratio - Crocus/ECMWF" key="snoRatCrocus" indentText="false" />
+        <contribute xsi:type="menuItem" menuText="Snow Ratio - SPC" key="snoRatSPC" indentText="false" />
+        <contribute xsi:type="menuItem" menuText="Snow Ratio - EMC SREF" key="snoRatEMCSREF" indentText="false" />
+        <contribute xsi:type="menuItem" menuText="Snow Ratio - WPC Mean" key="s2H2O_MEAN" indentText="false" />
+    </contribute>
+    <contribute xsi:type="menuItem" menuText="Snow Squall Parameter" key="SNSQ" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Thickness (All Models)" key="dZ" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Thickness: Snow Likely" key="Snow3" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Thickness: ZR" key="Fzra2" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Thickness: Mixed Precip" key="Mix2" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Thickness: Rain Likely" key="Rain3" indentText="false" />
 
 <!--  <contribute xsi:type="menuItem" menuText="Cold Sleet Layer with Warm Air Aloft" key="IPLayer" indentText="false" /> --> 
 
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
index f6ddba567e..b502016ad6 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources/sfcGrid.xml
@@ -165,4 +165,5 @@
     <vbSource key="WPHwave10" category="SfcGrid" views="PLANVIEW TIMESERIES" />
     <vbSource key="PGBlended" category="SfcGrid/NOS" views="PLANVIEW TIMESERIES" />
     <vbSource key="PGBlended-Night" category="SfcGrid/NOS" views="PLANVIEW TIMESERIES" />
+    <vbSource key="PWPF" category="SfcGrid" views="PLANVIEW TIMESERIES" />
 </vbSourceList>
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AvailableDataRequest.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AvailableDataRequest.java
index 8aa48b4d48..5b48219b80 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AvailableDataRequest.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/AvailableDataRequest.java
@@ -19,20 +19,26 @@
  **/
 package com.raytheon.viz.volumebrowser.datacatalog;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
 /**
  * 
- * TODO Add Description
+ * Data structure allowing async communication between the background thread
+ * that is determining which menu items should be available and the man UI
+ * thread which is updating the menu items to show availability.
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * May 24, 2011            bsteffen     Initial creation
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- --------------------------------------------
+ * May 24, 2011  9493     bsteffen  Initial creation
+ * Feb 01, 2016  5275     bsteffen  Track all available items and add to queue
+ *                                  only once.
  * 
  * </pre>
  * 
@@ -48,6 +54,12 @@ public class AvailableDataRequest {
 
     private final BlockingQueue<String> planeQueue;
 
+    private final Set<String> availableSources;
+
+    private final Set<String> availableFields;
+
+    private final Set<String> availablePlanes;
+
     private final String[] selectedSources;
 
     private final String[] selectedFields;
@@ -62,6 +74,9 @@ public class AvailableDataRequest {
         this.sourceQueue = new LinkedBlockingQueue<String>();
         this.fieldQueue = new LinkedBlockingQueue<String>();
         this.planeQueue = new LinkedBlockingQueue<String>();
+        this.availableSources = new HashSet<>();
+        this.availableFields = new HashSet<>();
+        this.availablePlanes = new HashSet<>();
     }
 
     public String[] getSelectedSources() {
@@ -77,15 +92,21 @@ public class AvailableDataRequest {
     }
 
     public void addAvailableSource(String source) {
-        sourceQueue.add(source);
+        if (availableSources.add(source)) {
+            sourceQueue.add(source);
+        }
     }
 
     public void addAvailableField(String field) {
-        fieldQueue.add(field);
+        if (availableFields.add(field)) {
+            fieldQueue.add(field);
+        }
     }
 
     public void addAvailablePlane(String plane) {
-        planeQueue.add(plane);
+        if (availablePlanes.add(plane)) {
+            planeQueue.add(plane);
+        }
     }
 
     public String getAvailableSource() {
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/CloneDialog.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/CloneDialog.java
index 2f63054666..7e1bb6198f 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/CloneDialog.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/CloneDialog.java
@@ -22,8 +22,6 @@ package com.raytheon.viz.volumebrowser.vbui;
 import java.util.List;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
@@ -44,7 +42,8 @@ import com.raytheon.viz.volumebrowser.vbui.VBMenuBarItemsMgr.ViewMenu;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Nov 9, 2009            jelkins     Initial creation
+ * Nov  9, 2009            jelkins     Initial creation
+ * Jan 12, 2016  5055      randerso    Fix dialog to open on same monitor as CAVE session
  * 
  * </pre>
  * 
@@ -66,16 +65,12 @@ public class CloneDialog extends CaveSWTDialog {
      */
     protected CloneDialog(Shell parentShell,
             List<ProductTableData> selectedProducts) {
-        super(parentShell, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.DO_NOT_BLOCK); // Win32
+        super(parentShell, SWT.DIALOG_TRIM | SWT.RESIZE, CAVE.INDEPENDENT_SHELL
+                | CAVE.DO_NOT_BLOCK); // Win32
         setText(DIALOG_TITLE);
         this.selectedProducts = selectedProducts;
     }
 
-    @Override
-    protected void opened() {
-        productTableComponent.resizeTableColumns();
-    }
-
     @Override
     protected Object constructShellLayoutData() {
         return new GridData(SWT.FILL, SWT.FILL, true, true);
@@ -93,7 +88,6 @@ public class CloneDialog extends CaveSWTDialog {
     @Override
     protected void initializeComponents(Shell shell) {
         initializeComponents();
-        setupListeners();
     }
 
     @Override
@@ -120,25 +114,6 @@ public class CloneDialog extends CaveSWTDialog {
 
     }
 
-    /**
-     * setup the listeners
-     */
-    private void setupListeners() {
-        shell.addControlListener(new ControlAdapter() {
-            /*
-             * (non-Javadoc)
-             * 
-             * @see
-             * org.eclipse.swt.events.ControlAdapter#controlResized(org.eclipse
-             * .swt.events.ControlEvent)
-             */
-            @Override
-            public void controlResized(ControlEvent e) {
-                productTableComponent.resizeTableColumns();
-            }
-        });
-    }
-
     private void createDialogSettingsComponent() {
         Composite composite = new Composite(shell, SWT.NONE);
         GridLayout gl = new GridLayout(4, false);
@@ -155,8 +130,7 @@ public class CloneDialog extends CaveSWTDialog {
         ViewMenu viewSelection = dialogSettings.getViewSelection();
         LeftRightMenu timeDirectionSelection = dialogSettings
                 .getTimeDirectionSelection();
-        HeightScale heightScale = dialogSettings
-                .getHeightScaleSelection();
+        HeightScale heightScale = dialogSettings.getHeightScaleSelection();
 
         // there will always be a view selection
         (new Label(composite, SWT.NONE)).setText(viewSelection
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
index 96fba76b1e..afa4f685ab 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
@@ -45,6 +45,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Monitor;
 
 import com.raytheon.uf.common.menus.xml.CommonToolBarContribution;
 import com.raytheon.uf.common.menus.xml.VariableSubstitution;
@@ -89,6 +90,14 @@ import com.raytheon.viz.volumebrowser.xml.VbSourceList;
  * Oct 03, 2014  2618     mapeters    Updated pointChangeListener's pointChanged() 
  *                                    implementation to fully remove deleted points,
  *                                    added createUniqueKey(String, String, String).
+ * Nov 18, 2015  4894     kbisanz     Call setActiveDataSelection(...)
+ *                                    before calling
+ *                                    splitToMultipleBars(...) to set data
+ *                                    selection correctly and prevent menu
+ *                                    items from being referenced on
+ *                                    multiple menus.
+ * Jan 12, 2016 #5055      randerso   Added support for adjusting split of toolbar menus 
+ *                                    when dialog resized.
  * 
  * </pre>
  * 
@@ -193,9 +202,7 @@ public class DataListsProdTableComp extends Composite implements
     /**
      * One of either source, field, or plane
      */
-    public class SelectionControl {
-
-        private final Composite composite;
+    public class SelectionControl extends Composite {
 
         private ListController list;
 
@@ -213,28 +220,29 @@ public class DataListsProdTableComp extends Composite implements
         }
 
         SelectionControl(Composite parent, DataSelection dataSelection) {
+            super(parent, SWT.NONE);
 
             data = dataSelection;
 
-            composite = new Composite(parent, SWT.NONE);
             GridLayout gl = new GridLayout(1, false);
-            gl.marginHeight = 2;
-            gl.marginWidth = 2;
-            composite.setLayout(gl);
-            composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true,
-                    false));
+            gl.marginHeight = 0;
+            gl.marginWidth = 0;
+            gl.verticalSpacing = 0;
+            setLayout(gl);
+            setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 
             StringBuilder labelText = new StringBuilder();
             labelText.append(dataSelection.toString().charAt(0));
             labelText.append(dataSelection.toString().toLowerCase()
                     .substring(1));
 
-            Label label = new Label(composite, SWT.CENTER);
+            Label label = new Label(this, SWT.CENTER);
             label.setText(labelText.toString());
             label.setFont(italicFont);
             label.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
 
-            toolbar = new MultiToolbar(composite, SWT.NONE);
+            toolbar = new MultiToolbar(this, SWT.NONE);
+            toolbar.setData(labelText.toString());
             toolbar.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
             toolbar.addToolItemSelectionListener(new SelectionAdapter() {
 
@@ -288,12 +296,12 @@ public class DataListsProdTableComp extends Composite implements
          * 
          */
         private void initializeFind(String labelText) {
-            find = new Combo(composite, SWT.DROP_DOWN);
+            find = new Combo(this, SWT.DROP_DOWN);
 
             find.setLayoutData(new GridData(SWT.FILL, SWT.DEFAULT, true, false));
             find.setToolTipText("Find " + labelText + "...");
             find.setVisible(false);
-            ((GridData) find.getLayoutData()).heightHint = 0;
+            ((GridData) find.getLayoutData()).exclude = true;
 
             new AutoFindComboInput(find);
 
@@ -338,12 +346,12 @@ public class DataListsProdTableComp extends Composite implements
         public void toggleFind() {
             if (find.isVisible()) {
                 find.setVisible(false);
-                ((GridData) find.getLayoutData()).heightHint = 0;
-                composite.pack();
+                ((GridData) find.getLayoutData()).exclude = true;
+                pack();
             } else {
                 find.setVisible(true);
-                ((GridData) find.getLayoutData()).heightHint = SWT.DEFAULT;
-                composite.pack();
+                ((GridData) find.getLayoutData()).exclude = false;
+                pack();
             }
         }
 
@@ -909,20 +917,30 @@ public class DataListsProdTableComp extends Composite implements
         createFieldsToolBarItems(setting, spaceTime);
         createPlanesToolBarItems(setting, spaceTime);
 
-        int sourcesWidth = sourceControl.toolbar.computeSize(-1, -1).x;
-        int fieldsWidth = fieldControl.toolbar.computeSize(-1, -1).x;
-        int planesWidth = planeControl.toolbar.computeSize(-1, -1).x;
-        int totalWidth = sourcesWidth + fieldsWidth + planesWidth;
-        int screenWidth = getDisplay().getPrimaryMonitor().getBounds().width;
-        // If the total width of the toolbars is bigger than 80% of the monitor
-        // make multiple rows.
-        if (screenWidth * 0.90 < totalWidth) {
-            // Divide by 70% of screen Width to allow some fudge factor when
-            // laying it all out.
-            int numBars = totalWidth / (int) (screenWidth * 0.7) + 1;
+        // find width of smallest monitor
+        int screenWidth = Integer.MAX_VALUE;
+        for (Monitor m : getDisplay().getMonitors()) {
+            screenWidth = Math.min(screenWidth, m.getBounds().width);
+        }
+
+        int numBars = 1;
+        int width = this.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
+        while (width >= screenWidth * 0.90) {
+            numBars++;
+
+
+            // The current value of the active data selection is unknown, so set
+            // it explicitly to the desired value.
+            setActiveDataSelection(DataSelection.SOURCES);
             sourceControl.toolbar.splitToMultipleBars(numBars);
+
+            setActiveDataSelection(DataSelection.FIELDS);
             fieldControl.toolbar.splitToMultipleBars(numBars);
+
+            setActiveDataSelection(DataSelection.PLANES);
             planeControl.toolbar.splitToMultipleBars(numBars);
+
+            width = this.computeSize(SWT.DEFAULT, SWT.DEFAULT).x;
         }
 
         this.pack();
@@ -931,6 +949,35 @@ public class DataListsProdTableComp extends Composite implements
 
     }
 
+    /**
+     * called to re-split the toolbars when shell is resized
+     */
+    public void resizeToolbars() {
+
+        int numBars = 1;
+
+        numBars = Math.max(numBars, sourceControl.toolbar.barsNeeded());
+        numBars = Math.max(numBars, fieldControl.toolbar.barsNeeded());
+        numBars = Math.max(numBars, planeControl.toolbar.barsNeeded());
+
+        if (numBars != sourceControl.toolbar.getNumBars()) {
+
+            // The current value of the active data selection is unknown, so set
+            // it explicitly to the desired value.
+            setActiveDataSelection(DataSelection.SOURCES);
+            sourceControl.toolbar.splitToMultipleBars(numBars);
+
+            setActiveDataSelection(DataSelection.FIELDS);
+            fieldControl.toolbar.splitToMultipleBars(numBars);
+
+            setActiveDataSelection(DataSelection.PLANES);
+            planeControl.toolbar.splitToMultipleBars(numBars);
+
+            this.pack();
+        }
+
+    }
+
     /**
      * Add a menu selection to the active list control (Sources, Fields, or
      * Planes). If there are items selected in the Sources, Fields, and Planes
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ListController.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ListController.java
index dd47c513cf..856c010b06 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ListController.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ListController.java
@@ -46,7 +46,8 @@ import com.raytheon.viz.volumebrowser.xml.MenuContribution;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * May 27, 2009 #2161      lvenable     Initial creation
+ * May 27, 2009 #2161      lvenable    Initial creation
+ * Jan 12, 2016 #5055      randerso    Removed width hint to improve layout when dialog resized
  * 
  * </pre>
  * 
@@ -115,7 +116,6 @@ public class ListController {
         dataArray = new ArrayList<SelectionListData>();
 
         GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true);
-        gd.widthHint = 200;
         gd.heightHint = 125;
 
         dataItemList = new List(parentComp, SWT.BORDER | SWT.MULTI
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/MenuItemManager.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/MenuItemManager.java
index 645da6c182..de2499eda7 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/MenuItemManager.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/MenuItemManager.java
@@ -39,12 +39,14 @@ import com.raytheon.viz.volumebrowser.xml.MenuContribution;
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * May 27, 2009 #2161      lvenable     Initial creation
- * Jan 24, 2013 #1516      rferrel     Methods to change/get 
- *                                      Active Data Selection.
- * Dec 06, 2013 #2271      mpduff      Added the set of keys for the selected plane items
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- --------------------------------------------
+ * May 27, 2009  2161     lvenable  Initial creation
+ * Jan 24, 2013  1516     rferrel   Methods to change/get Active Data Selection.
+ * Dec 06, 2013  2271     mpduff    Added the set of keys for the selected plane
+ *                                  items
+ * Feb 01, 2016  5275     bsteffen  Add getAvailableKeys
  * 
  * </pre>
  * 
@@ -610,4 +612,21 @@ public class MenuItemManager {
     public Set<String> getSelectedPlaneItems() {
         return selectedPlaneItems;
     }
+
+    /**
+     * Return the keys for all possible sources, fields, or planes that are
+     * available for selection from the currently loaded menu items.
+     */
+    public Set<String> getAvailableKeys(DataSelection data) {
+        switch (data) {
+        case SOURCES:
+            return new HashSet<>(sourcesMenuItemMap.keySet());
+        case FIELDS:
+            return new HashSet<>(fieldsMenuItemMap.keySet());
+        case PLANES:
+            return new HashSet<>(planesMenuItemMap.keySet());
+        default:
+            throw new IllegalArgumentException();
+        }
+    }
 }
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/MultiToolbar.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/MultiToolbar.java
index 579ff273f7..22e3df38c7 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/MultiToolbar.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/MultiToolbar.java
@@ -31,6 +31,8 @@ import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.ToolBar;
 import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.menus.IMenuService;
@@ -47,8 +49,10 @@ import org.eclipse.ui.menus.IMenuService;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Nov 2, 2011            bsteffen     Initial creation
+ * Nov  2, 2011            bsteffen    Initial creation
  * Jul 31, 2012 #875       rferrel     Added add(IAction) method.
+ * Jan 12, 2016 #5055      randerso    Added support for adjusting split when dialog resized.
+ *                                     Code cleanup
  * 
  * </pre>
  * 
@@ -67,9 +71,30 @@ public class MultiToolbar extends Composite {
     // will trigger a resplit.
     private boolean isDirty = false;
 
+    /**
+     * Constructor
+     * 
+     * @param parent
+     *            a widget which will be the parent of the new instance (cannot
+     *            be null)
+     * @param style
+     *            the style of widget to construct
+     */
     public MultiToolbar(Composite parent, int style) {
         super(parent, style);
-        setLayout(new GridLayout(1, false));
+        GridLayout layout = new GridLayout(1, false);
+        layout.marginWidth = 0;
+        layout.marginHeight = 0;
+        layout.horizontalSpacing = 0;
+        layout.verticalSpacing = 0;
+        setLayout(layout);
+    }
+
+    /**
+     * @return the numBars
+     */
+    public int getNumBars() {
+        return numBars;
     }
 
     /**
@@ -77,10 +102,11 @@ public class MultiToolbar extends Composite {
      **/
     private ToolBarManager createToolBarManager() {
         ToolBarManager tbm = new ToolBarManager(SWT.NONE);
+        ToolBar tb = tbm.createControl(this);
         GridData data = new GridData(GridData.CENTER, GridData.CENTER, true,
                 false);
         data.horizontalAlignment = GridData.CENTER;
-        tbm.createControl(this).setLayoutData(data);
+        tb.setLayoutData(data);
         tbms.add(tbm);
         return tbm;
     }
@@ -114,6 +140,7 @@ public class MultiToolbar extends Composite {
         return tbm;
     }
 
+    @Override
     public void update() {
         if (isDirty && numBars > 1) {
             splitToMultipleBars(numBars);
@@ -169,18 +196,18 @@ public class MultiToolbar extends Composite {
      * @param numBars
      */
     public void splitToMultipleBars(int numBars) {
-        this.numBars = numBars;
         List<IContributionItem> items = new ArrayList<IContributionItem>();
         for (ToolBarManager tbm : tbms) {
             items.addAll(Arrays.asList(tbm.getItems()));
         }
         disposeToolbars();
-        splitContruibutionItems(items, numBars);
+        this.numBars = numBars;
+        splitContributionItems(items, numBars);
         isDirty = false;
         update();
     }
 
-    private void splitContruibutionItems(List<IContributionItem> items,
+    private void splitContributionItems(List<IContributionItem> items,
             int numBars) {
         // The reason we recalculate for every row is so that 13 in four rows is
         // 4,3,3,3 instead of 4,4,4,1
@@ -192,8 +219,8 @@ public class MultiToolbar extends Composite {
         for (int i = 0; i < itemsPerBar; i++) {
             tbm.add(items.remove(0));
         }
-        if (numBars > 1) {
-            splitContruibutionItems(items, numBars - 1);
+        if (numBars > 1 && items.size() > 0) {
+            splitContributionItems(items, numBars - 1);
         }
     }
 
@@ -201,4 +228,21 @@ public class MultiToolbar extends Composite {
         toolItemSelectionListeners.add(listener);
     }
 
+    public int barsNeeded() {
+        int barsNeeded = 1;
+        int width = getClientArea().width;
+        if (width > 0) {
+            int x = 4; // Overhead per toolbar
+            for (Control child : getChildren()) {
+                for (ToolItem item : ((ToolBar) child).getItems()) {
+                    if (x + item.getWidth() > width) {
+                        barsNeeded++;
+                        x = 4;
+                    }
+                    x += item.getWidth();
+                }
+            }
+        }
+        return barsNeeded;
+    }
 }
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
index 74c8fc2d81..6d483b297c 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
@@ -35,6 +35,8 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.events.MouseAdapter;
@@ -90,6 +92,8 @@ import com.raytheon.viz.volumebrowser.vbui.VBMenuBarItemsMgr.ViewMenu;
  * Feb 12, 2015  4105     rferrel   Remove duplicate update of table item in
  *                                  addProduct.
  * Aug 03, 2015  3861     bsteffen  Move product loading to ProductLoader
+ * Jan 12, 2016  5055     randerso  Moved resize listener into this class.
+ *                                  Set column widths at creation
  * 
  * </pre>
  * 
@@ -282,6 +286,14 @@ public class ProductTableComp extends Composite {
         prodSelTable.setHeaderVisible(true);
         prodSelTable.setLinesVisible(true);
 
+        prodSelTable.addControlListener(new ControlAdapter() {
+            @Override
+            public void controlResized(ControlEvent e) {
+                resizeTableColumns();
+            }
+
+        });
+
         // Add a selection listener so the indexes can be updated.
         prodSelTable.addSelectionListener(new SelectionAdapter() {
             @Override
@@ -395,12 +407,16 @@ public class ProductTableComp extends Composite {
     private void addTableColumns() {
         TableColumn column1 = new TableColumn(prodSelTable, SWT.NONE);
         column1.setText("Times");
+        column1.setWidth(timesColWidth);
+        column1.setResizable(false);
 
         TableColumn column2 = new TableColumn(prodSelTable, SWT.NONE);
         column2.setText("Product Selection List");
 
         TableColumn column3 = new TableColumn(prodSelTable, SWT.NONE);
         column3.setText("Inventory");
+        column3.setWidth(inventoryColWidth);
+        column3.setResizable(false);
 
         // Pack the columns
         for (int i = 0; i < prodSelTableColumnCount; i++) {
@@ -872,7 +888,7 @@ public class ProductTableComp extends Composite {
      * Resize the table columns. This will maintain sizes for the Times and
      * Inventory columns. The products column will adjust in size.
      */
-    public void resizeTableColumns() {
+    private void resizeTableColumns() {
         Rectangle tableBounds = prodSelTable.getBounds();
 
         prodSelTable.getColumn(0).setWidth(timesColWidth);
@@ -955,7 +971,7 @@ public class ProductTableComp extends Composite {
         if (!hasProductCreator(tblData.getCatalogEntry())) {
             return;
         }
-        
+
         synchronized (productKeySet) {
             String uniqueKey = tblData.getSelectedData().getUniqueKey();
             if (!productKeySet.contains(uniqueKey)) {
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/VolumeBrowserDlg.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/VolumeBrowserDlg.java
index 9f5682d698..bc04a25143 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/VolumeBrowserDlg.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/VolumeBrowserDlg.java
@@ -71,14 +71,16 @@ import com.raytheon.viz.volumebrowser.vbui.VBMenuBarItemsMgr.ViewMenu;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * May 12, 2009 #2161      lvenable     Initial creation
+ * May 12, 2009 #2161      lvenable    Initial creation
  * Jul 21, 2012 #875       rferrel     Now uses points.
  * Sep 26, 2012 #1216      rferrel     Point Change listener added to update
  *                                      the Time Series Point menu.
  * Oct  2, 2012 #1234      rferrel     Time series Point menu accounts for 
  *                                      having no points.
  * Jun 23, 2014 #3162      lvenable    Added code to have the Volume Browser display the min/max
- *                                     buttons in the title bar on thin client.
+ *                                      buttons in the title bar on thin client.
+ * Jan 12, 2016 #5055      randerso    Changed toolbar menus to split when dialog is resized.
+ *                                      Other general GUI cleanup
  * 
  * </pre>
  * 
@@ -157,7 +159,7 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
         GridLayout mainLayout = new GridLayout(1, false);
         mainLayout.marginHeight = 2;
         mainLayout.marginWidth = 2;
-        mainLayout.verticalSpacing = 2;
+        mainLayout.verticalSpacing = 0;
         return mainLayout;
     }
 
@@ -186,7 +188,9 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
         shell.addControlListener(new ControlAdapter() {
             @Override
             public void controlResized(ControlEvent e) {
-                getProductTable().resizeTableColumns();
+
+                listTableComp.resizeToolbars();
+
             }
 
         });
@@ -203,7 +207,7 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
 
             @Override
             public void shellClosed(ShellEvent e) {
-                VolumeBrowserDlg.this.shell.setVisible(false);
+                hide();
                 e.doit = false;
             }
         });
@@ -211,15 +215,6 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
         initialized = true;
     }
 
-    @Override
-    protected void preOpened() {
-        // Resize the product table columns.
-        getProductTable().resizeTableColumns();
-
-        // Set the shell's minimum size so the controls cannot be hidden.
-        shell.setMinimumSize(shell.getSize());
-    }
-
     /**
      * Initialize the components on the display.
      */
@@ -228,7 +223,7 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
 
         createDataSelectionListProductTableManager();
 
-        updateToolbarMenus(false);
+        updateToolbarMenus();
     }
 
     /**
@@ -275,8 +270,7 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
 
                 List<ProductTableData> selectedProducts = getProductTable()
                         .getSelectedData();
-                new CloneDialog(new Shell(SWT.MODELESS), selectedProducts)
-                        .open();
+                new CloneDialog(getParent(), selectedProducts).open();
             }
         });
 
@@ -727,7 +721,7 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
 
         dialogSettings.setViewSelection(currentSetting);
 
-        updateToolbarMenus(true);
+        updateToolbarMenus();
     }
 
     /**
@@ -765,7 +759,7 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
                     MenuItem mi = (MenuItem) event.getSource();
                     dialogSettings.setSpaceTimeSelection(mi);
                     updateMenu(mi);
-                    updateToolbarMenus(true);
+                    updateToolbarMenus();
                 }
             });
         }
@@ -933,13 +927,9 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
 
     /**
      * Update the toolbar menus as they may have changed.
-     * 
-     * @param packShellFlag
-     *            Flag indicating the shell must be packed.
      */
-    private void updateToolbarMenus(boolean packShellFlag) {
-        shell.setMinimumSize(new org.eclipse.swt.graphics.Point(10, 10));
-        shell.setSize(new org.eclipse.swt.graphics.Point(10, 10));
+    private void updateToolbarMenus() {
+        shell.setMinimumSize(10, 10);
 
         ViewMenu setting = (ViewMenu) settingsMI.getData();
         SpaceTimeMenu spaceTime = null;
@@ -950,28 +940,15 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
 
         listTableComp.updateToolbarMenus(setting, spaceTime);
 
-        if (packShellFlag == true) {
+        shell.pack();
 
-            getProductTable().packTable();
-
-            shell.layout();
-            shell.pack();
-
-            getProductTable().resizeTableColumns();
-
-            shell.setMinimumSize(shell.getSize());
-        }
+        shell.setMinimumSize(shell.getSize());
     }
 
     public VolumeBrowserDialogSettings getDialogSettings() {
         return dialogSettings;
     }
 
-    public void showVBDialog() {
-        shell.setVisible(true);
-        shell.setFocus();
-    }
-
     public DataListsProdTableComp getListTableComp() {
         return listTableComp;
     }
@@ -997,7 +974,8 @@ public class VolumeBrowserDlg extends CaveSWTDialog implements
                     break;
                 }
             }
-            updateToolbarMenus(true);
+            updateToolbarMenus();
         }
     }
+
 }
diff --git a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/xml/VbSourceList.java b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/xml/VbSourceList.java
index 5983338909..f65c188d1a 100644
--- a/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/xml/VbSourceList.java
+++ b/cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/xml/VbSourceList.java
@@ -61,6 +61,7 @@ import com.raytheon.viz.volumebrowser.vbui.VBMenuBarItemsMgr.ViewMenu;
  * Jul 07, 2015  4641     mapeters    Fix/improve comparators for VbSource sorting.
  * Jul 10, 2015  4641     mapeters    Added check for sources with null key/category fields.
  * Oct 05, 2015  3861     bsteffen    Remove deprecated method call on LocalizationFile
+ * Feb 12, 2016  5242     dgilling    Remove calls to deprecated Localization APIs.
  * 
  * </pre>
  * 
@@ -217,8 +218,9 @@ public class VbSourceList {
                     return 1;
                 } else if (n2 > n1 && Character.isDigit(s2.charAt(n1))) {
                     return -1;
-                } else
+                } else {
                     return Integer.valueOf(number1) - Integer.valueOf(number2);
+                }
             }
             return n1 - n2;
         }
@@ -345,7 +347,7 @@ public class VbSourceList {
             LocalizationFile[] files = pm.listStaticFiles(
                     "volumebrowser/VbSources", null, false, true);
             for (LocalizationFile file : files) {
-                fileNames.add(file.getName());
+                fileNames.add(file.getPath());
             }
         } else {
             fileNames.add(VB_SOURCE_FILE);
@@ -369,7 +371,7 @@ public class VbSourceList {
                     } catch (IOException | LocalizationException e) {
                         statusHandler
                                 .handle(Priority.ERROR,
-                                        locFile.getName()
+                                        locFile.getPath()
                                                 + " was excluded from sources menu due to error reading file.");
                     }
                     if (sources != null) {
diff --git a/cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
index 83ca70cf81..3a5d89fd91 100644
--- a/cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Warngen Plug-in
 Bundle-SymbolicName: com.raytheon.viz.warngen;singleton:=true
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Activator: com.raytheon.viz.warngen.Activator
 Bundle-Vendor: Raytheon
 Eclipse-RegisterBuddy: com.raytheon.uf.viz.core.rsc, org.apache.velocity
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.viz.ui,
  org.apache.velocity;bundle-version="1.7.0",
  javax.measure,
- org.apache.commons.lang,
+ org.apache.commons.lang3;bundle-version="3.4.0",
  org.geotools,
  com.raytheon.viz.awipstools,
  com.raytheon.viz.texteditor,
diff --git a/cave/com.raytheon.viz.warngen/plugin.xml b/cave/com.raytheon.viz.warngen/plugin.xml
index 76c5e441e6..8ae3392f88 100644
--- a/cave/com.raytheon.viz.warngen/plugin.xml
+++ b/cave/com.raytheon.viz.warngen/plugin.xml
@@ -70,7 +70,7 @@
 				</command>
 			</toolbar>
 		</menuContribution>
-		<menuContribution locationURI="menu:tools">
+		<menuContribution locationURI="menu:tools?after=tools.W">
 			<command
 				commandId="com.raytheon.viz.warngen.gui.WarngenAction"
 				label="Warngen">
diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
index 1948729f1d..5d5f268612 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
@@ -15,7 +15,7 @@ import java.util.Set;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.geotools.geometry.jts.JTS;
 import org.geotools.referencing.GeodeticCalculator;
 import org.opengis.referencing.operation.MathTransform;
@@ -185,8 +185,8 @@ abstract public class AbstractDbSourceDataAdaptor {
                         ptFields.toArray(new String[ptFields.size()]),
                         searchArea, filter, SearchMode.INTERSECTS);
             }
-            perfLog.logDuration("Retrieve location data for '" + pointSource + "'",
-                    System.currentTimeMillis() - t0);
+            perfLog.logDuration("Retrieve location data for '" + pointSource
+                    + "'", System.currentTimeMillis() - t0);
         } catch (SpatialException e) {
             throw new VizException("Error querying " + pointSource + " table: "
                     + e.getLocalizedMessage(), e);
@@ -309,7 +309,8 @@ abstract public class AbstractDbSourceDataAdaptor {
                 iter.remove();
             }
         }
-        SpatialQueryResult[] ptFeaturesFiltered = ptFeaturesList.toArray(new SpatialQueryResult[ptFeaturesList.size()]);
+        SpatialQueryResult[] ptFeaturesFiltered = ptFeaturesList
+                .toArray(new SpatialQueryResult[ptFeaturesList.size()]);
 
         Geometry localPCGeom = null;
         if (pcGeom != null) {
diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
index 2208a97f9d..3f656d523c 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.raytheon.uf.common.dataplugin.warning.config.AreaSourceConfiguration;
 import com.raytheon.uf.common.dataplugin.warning.config.AreaSourceConfiguration.AreaType;
@@ -35,6 +35,7 @@ import com.raytheon.uf.common.dataplugin.warning.config.GeospatialConfiguration;
 import com.raytheon.uf.common.dataplugin.warning.config.WarngenConfiguration;
 import com.raytheon.uf.common.dataplugin.warning.gis.GeospatialData;
 import com.raytheon.uf.common.dataplugin.warning.portions.GisUtil;
+import com.raytheon.uf.common.dataplugin.warning.portions.GisUtil.Direction;
 import com.raytheon.uf.common.dataplugin.warning.portions.PortionsUtil;
 import com.raytheon.uf.common.dataplugin.warning.util.CountyUserData;
 import com.raytheon.uf.common.dataplugin.warning.util.GeometryUtil;
@@ -50,12 +51,11 @@ import com.raytheon.uf.common.status.PerformanceStatus;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.viz.core.exception.VizException;
-//import com.raytheon.viz.warngen.gis.GisUtil.Direction;
-import com.raytheon.uf.common.dataplugin.warning.portions.GisUtil.Direction;
 import com.raytheon.viz.warngen.gui.WarngenLayer;
 import com.raytheon.viz.warngen.util.Abbreviation;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.prep.PreparedGeometry;
+//import com.raytheon.viz.warngen.gis.GisUtil.Direction;
 
 /**
  * Area
diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
index 9959d97e89..a9a1edc198 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
@@ -25,7 +25,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 
 /**
  * TODO Add Description
@@ -94,7 +94,7 @@ public class ClosestPointComparator implements Comparator<ClosestPoint> {
 
         ClosestPoint[] points = null;
         if (array1 != null && array2 != null) {
-            points = (ClosestPoint[]) ArrayUtils.addAll(array1, array2);
+            points = ArrayUtils.addAll(array1, array2);
         } else if (array1 != null && array2 == null) {
             points = array1;
         } else if (array1 == null && array2 != null) {
diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
index 0e6260c54e..1e9213d51a 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
@@ -38,7 +38,7 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.unit.NonSI;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 import com.raytheon.uf.common.activetable.ActiveTableRecord;
 import com.raytheon.uf.common.activetable.OperationalActiveTableRecord;
@@ -281,11 +281,15 @@ public class WatchUtil {
 
         DbQueryRequest request = new DbQueryRequest();
         request.setEntityClass(entityClass);
-        request.addConstraint(START_TIME_FIELD,
-                new RequestConstraint(TimeUtil.formatToSqlTimestamp(startConstraintTime),
+        request.addConstraint(
+                START_TIME_FIELD,
+                new RequestConstraint(TimeUtil
+                        .formatToSqlTimestamp(startConstraintTime),
                         ConstraintType.LESS_THAN_EQUALS));
-        request.addConstraint(END_TIME_FIELD,
-                new RequestConstraint(TimeUtil.formatToSqlTimestamp(simulatedTime),
+        request.addConstraint(
+                END_TIME_FIELD,
+                new RequestConstraint(TimeUtil
+                        .formatToSqlTimestamp(simulatedTime),
                         ConstraintType.GREATER_THAN_EQUALS));
         request.addConstraint("phensig",
                 new RequestConstraint(phenSig.toString(), ConstraintType.IN));
diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
index 270aa2ad0c..2d8dfdb57a 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
@@ -42,7 +42,7 @@ import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 import javax.measure.unit.UnitFormat;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 import org.geotools.geometry.jts.JTS;
 import org.geotools.referencing.GeodeticCalculator;
 import org.opengis.referencing.FactoryException;
@@ -271,8 +271,10 @@ public class Wx {
             String trxFileStr = pathcastConfiguration
                     .getAreaNotationTranslationFile();
             if (trxFileStr != null) {
-                File trxFile = WarnFileUtil.findFileInLocalizationIncludingBackupSite(
-                        areaNotationAbbrevField, localizedSite, null).getFile();
+                File trxFile = WarnFileUtil
+                        .findFileInLocalizationIncludingBackupSite(
+                                areaNotationAbbrevField, localizedSite, null)
+                        .getFile();
                 if (!trxFile.exists()) {
                     throw new WarngenException(
                             "Translation file does not exist: " + trxFileStr);
@@ -537,8 +539,7 @@ public class Wx {
                 pathcasts.remove(pathcasts.size() - 1);
             }
 
-            perfLog.logDuration("Get pathcast",
-                    System.currentTimeMillis() - t0);
+            perfLog.logDuration("Get pathcast", System.currentTimeMillis() - t0);
             return pathcasts.toArray(new PathCast[pathcasts.size()]);
         } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM,
@@ -614,8 +615,8 @@ public class Wx {
                                 + variable + "'", t);
             }
         }
-        perfLog.logDuration("Get closestPoints",
-                System.currentTimeMillis() - t0);
+        perfLog.logDuration("Get closestPoints", System.currentTimeMillis()
+                - t0);
         return pointsMap;
     }
 
@@ -976,8 +977,9 @@ public class Wx {
             List<ClosestPoint> points, double stormtrackAngle) {
         // convert storm track angle to geometry angle in range of (0,360)
         double convertedAngle = 90.0 - stormtrackAngle;
-        if (convertedAngle < 0.0)
+        if (convertedAngle < 0.0) {
             convertedAngle += 360.0;
+        }
 
         Iterator<ClosestPoint> iter = points.iterator();
         List<ClosestPoint> removedPoints = new ArrayList<ClosestPoint>();
@@ -985,10 +987,12 @@ public class Wx {
             ClosestPoint cp = iter.next();
             double d = Math.abs(convertedAngle
                     - computeAngle(centroid, cp.point));
-            if (d > 180.0)
+            if (d > 180.0) {
                 d = 360.0 - d;
-            if (d > 90.0)
+            }
+            if (d > 90.0) {
                 removedPoints.add(cp);
+            }
         }
         return removedPoints;
     }
@@ -996,8 +1000,9 @@ public class Wx {
     private double computeAngle(Point p, Coordinate c) {
         double angle = Math.atan2(c.y - p.getY(), c.x - p.getX()) * 180
                 / Math.PI;
-        if (angle < 0)
+        if (angle < 0) {
             angle += 360;
+        }
         return angle;
     }
 }
diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/BulletListManager.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/BulletListManager.java
index d0b6896822..70f9d4cbf9 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/BulletListManager.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/BulletListManager.java
@@ -8,7 +8,7 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 
 import com.raytheon.uf.common.dataplugin.warning.AbstractWarningRecord;
 import com.raytheon.uf.common.dataplugin.warning.WarningRecord.WarningAction;
@@ -430,8 +430,7 @@ public class BulletListManager {
     private void loadBullets(Bullet[] bullets, DamInfoBullet[] damInfoBullets) {
         this.bullets = bullets;
         if (damInfoBullets != null) {
-            this.bullets = (Bullet[]) ArrayUtils
-                    .addAll(bullets, damInfoBullets);
+            this.bullets = ArrayUtils.addAll(bullets, damInfoBullets);
         }
     }
 
diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
index 551e071de2..c0d2c84a03 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.raytheon.uf.common.dataplugin.warning.WarningRecord.WarningAction;
 import com.raytheon.uf.common.dataplugin.warning.util.WarnFileUtil;
@@ -217,7 +217,8 @@ abstract public class AbstractLockingBehavior {
         // should not be locked. For some reason, this differs from followups as
         // stated in DR 15110. Need verification from NWS. This is a variance?
         if (!isMarineProduct()) {
-            StringBuilder newText = new StringBuilder(firstBulletText.length() + 1024);
+            StringBuilder newText = new StringBuilder(
+                    firstBulletText.length() + 1024);
             Matcher m = null;
             boolean first = true;
             for (String line : firstBulletText.split("\\n", -1)) {
@@ -240,10 +241,11 @@ abstract public class AbstractLockingBehavior {
 
                 int endIndex = line.toUpperCase().indexOf(" IN ");
                 String textForSearch = null;
-                if (endIndex == -1)
+                if (endIndex == -1) {
                     textForSearch = line;
-                else
+                } else {
                     textForSearch = line.substring(0, endIndex);
+                }
                 for (AffectedAreas affectedArea : affectedAreas) {
                     String name = affectedArea.getName();
                     String areaNotation = affectedArea.getAreaNotation();
@@ -290,7 +292,8 @@ abstract public class AbstractLockingBehavior {
         Matcher m = WarnGenPatterns.firstBulletPtrn.matcher(firstBulletText);
         firstBulletText = m.replaceAll(WarnGenPatterns.REPLACEMENT);
 
-        this.text = new StringBuffer(text).replace(start, end, firstBulletText).toString();
+        this.text = new StringBuffer(text).replace(start, end, firstBulletText)
+                .toString();
     }
 
     /**
diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
index 192ab3f9ce..17bffeaa58 100644
--- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
+++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWWAResource.java
@@ -69,26 +69,27 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * May 3, 2011            jsanchez     Initial creation
- * Aug 5, 2011            njensen       Refactored maps
- * Aug 22, 2011  10631   njensen  Major refactor
+ * May 3, 2011             jsanchez    Initial creation
+ * Aug 5, 2011             njensen     Refactored maps
+ * Aug 22, 2011  10631     njensen     Major refactor
  * May 31, 2012 DR14992  mgamazaychikov Changed the order of strings in the
  *                                      String array returned from getText method
  * Jun 04, 2012 DR14992  mgamazaychikov Reversed the previous changes
- * Sep 26, 2012          jsanchez       Refactored AbstractWarningResource and AbstractWatchesResource into this class.
- * Apr 11, 2013   1877   jsanchez       Updated conditions for matching a frame.
- * Apr 18, 2013   1877   jsanchez       Had the child classes set the comparator. Fixed a null pointer.
- *                                      Remove frameAltered condition in matchesFrame. It prevented entries from being displayed.
- *                                      Check if geometry is null when inspecting.
- * Jul 22, 2013   2176   jsanchez       Updated the wire frame and text for EMERGENCY warnings.
- * Sep  4, 2013   2176   jsanchez       Made the polygon line width thicker and made regular text not bold.
- * Nov 11, 2013   2439   rferrel        Changes to prevent getting future warning when in DRT mode.
- * Dec  3, 2013   2576   jsanchez       Increased the font size of EMER.
- * Mar 10, 2014   2832   njensen        Moved duplicated subclass's disposeInternal() logic here
- * Aug 14, 2014   3523   mapeters       Updated deprecated {@link DrawableString#textStyle} 
- *                                      assignments.
- * Dec 5, 2014   DR14944 jgerth         Only set outline width when there is no existing capability
- * Oct 16, 2015   4971   bsteffen       Do not reverse order of text.
+ * Sep 26, 2012            jsanchez    Refactored AbstractWarningResource and AbstractWatchesResource into this class.
+ * Apr 11, 2013   1877     jsanchez    Updated conditions for matching a frame.
+ * Apr 18, 2013   1877     jsanchez    Had the child classes set the comparator. Fixed a null pointer.
+ *                                     Remove frameAltered condition in matchesFrame. It prevented entries from being displayed.
+ *                                     Check if geometry is null when inspecting.
+ * Jul 22, 2013   2176     jsanchez    Updated the wire frame and text for EMERGENCY warnings.
+ * Sep  4, 2013   2176     jsanchez    Made the polygon line width thicker and made regular text not bold.
+ * Nov 11, 2013   2439     rferrel     Changes to prevent getting future warning when in DRT mode.
+ * Dec  3, 2013   2576     jsanchez    Increased the font size of EMER.
+ * Mar 10, 2014   2832     njensen     Moved duplicated subclass's disposeInternal() logic here
+ * Aug 14, 2014   3523     mapeters    Updated deprecated {@link DrawableString#textStyle} 
+ *                                     assignments.
+ * Dec 5, 2014   DR14944   jgerth      Only set outline width when there is no existing capability
+ * Oct 16, 2015   4971     bsteffen    Do not reverse order of text.
+ * Nov 05, 2015   5070     randerso    Adjust font sizes for dpi scaling
  * 
  * </pre>
  * 
@@ -211,8 +212,9 @@ public abstract class AbstractWWAResource extends
         FramesInfo framesInfo = this.descriptor.getFramesInfo();
         int frameIdx = framesInfo.getFrameIndex();
         DataTime[] frameTimes = framesInfo.getFrameTimes();
-        if (frameIdx < 0 || frameIdx >= frameTimes.length)
+        if (frameIdx < 0 || frameIdx >= frameTimes.length) {
             return "NO DATA";
+        }
         DataTime time = frameTimes[frameIdx];
 
         TimeRange framePeriod = null;
@@ -359,8 +361,9 @@ public abstract class AbstractWWAResource extends
                             || (current.record.getIssueTime().equals(
                                     entry.record.getIssueTime()) && current.record
                                     .getInsertTime().before(
-                                            entry.record.getInsertTime())))
+                                            entry.record.getInsertTime()))) {
                         candidates.put(key, entry);
+                    }
                 }
             }
             for (WarningEntry entry : candidates.values()) {
@@ -413,10 +416,10 @@ public abstract class AbstractWWAResource extends
                     String[] textToPrint = getText(record, mapWidth);
                     if (warningsFont == null) {
                         warningsFont = target.initializeFont(target
-                                .getDefaultFont().getFontName(), 11,
+                                .getDefaultFont().getFontName(), 9,
                                 new IFont.Style[0]);
                         emergencyFont = target.getDefaultFont().deriveWithSize(
-                                14);
+                                12);
                     }
 
                     DrawableString params = new DrawableString(textToPrint,
diff --git a/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatAction.java b/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatAction.java
index 789e65c85e..55f2856c82 100644
--- a/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatAction.java
+++ b/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatAction.java
@@ -25,8 +25,7 @@ package com.raytheon.viz.xdat;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
+import org.eclipse.swt.widgets.Display;
 
 /**
  * Action for unimplemented features. To be used temporarily until final
@@ -36,12 +35,12 @@ import org.eclipse.ui.PlatformUI;
  * 
  * SOFTWARE HISTORY
  * 
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * 6/27/06                  lvenable    Initial Creation.
- * 3/9/09                   wkwock      eliminate the DB name argument in calling XdatDlg.
- *                                      XdatDlg extracts the DB name from the URL.
- * 3/31/09      
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * 6/27/06                 lvenable    Initial Creation.
+ * 3/9/09                  wkwock      eliminate the DB name argument in calling XdatDlg.
+ *                                     XdatDlg extracts the DB name from the URL.
+ * 01/26/2016   5054       randerso    Made XdatDlg parented to display
  * 
  * </pre>
  * 
@@ -49,14 +48,11 @@ import org.eclipse.ui.PlatformUI;
  * 
  */
 public class XdatAction extends AbstractHandler {
-//    private static final String JDBC_URL = "jdbcUrl";
-    
-    @Override
-    public Object execute(ExecutionEvent arg0) throws ExecutionException {
-        Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                .getShell();
 
-        XdatDlg xdatDlg = new XdatDlg(shell);
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+
+        XdatDlg xdatDlg = new XdatDlg(Display.getCurrent());
         xdatDlg.open();
 
         return null;
diff --git a/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatComponent.java b/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatComponent.java
index 9fa25b9d7c..270302943c 100644
--- a/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatComponent.java
+++ b/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatComponent.java
@@ -20,13 +20,12 @@
 package com.raytheon.viz.xdat;
 
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 
 import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
 
 /**
- * This class starts XdatDialog as a stand alone component with runtime mode
- * of ALERT_VIZ.
+ * This class starts XdatDialog as a stand alone component with runtime mode of
+ * ALERT_VIZ.
  * 
  * <pre>
  * 
@@ -34,10 +33,10 @@ import com.raytheon.viz.ui.personalities.awips.AbstractCAVEDialogComponent;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 28, 2011            mschenke     Initial creation
+ * Apr 28, 2011            mschenke    Initial creation
  * Oct 08, 2012 1229       rferrel     Make a blocking dialog.
- * Oct 17, 2012 1229       rferrel     Changes for non-blocking
- *                                      XdatDialog.
+ * Oct 17, 2012 1229       rferrel     Changes for non-blocking XdatDlg.
+ * 01/26/2016   5054       randerso    Made XdatDlg parented to display
  * 
  * </pre>
  * 
@@ -56,8 +55,8 @@ public class XdatComponent extends AbstractCAVEDialogComponent {
      */
     @Override
     protected void startInternal(String componentName) throws Exception {
-        
-    	XdatDlg xdatDialg = new XdatDlg( new Shell( Display.getCurrent() ) );
+
+        XdatDlg xdatDialg = new XdatDlg(Display.getCurrent());
         xdatDialg.open();
         blockUntilClosed(xdatDialg);
     }
diff --git a/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatDlg.java b/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatDlg.java
index 20aec2d98a..513338a3e9 100644
--- a/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatDlg.java
+++ b/cave/com.raytheon.viz.xdat/src/com/raytheon/viz/xdat/XdatDlg.java
@@ -49,6 +49,7 @@ import org.eclipse.swt.printing.Printer;
 import org.eclipse.swt.printing.PrinterData;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
@@ -80,6 +81,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
  * 16 Mar 2011  6251	   lbousaidi   activate [Enter] for idTF box
  * 02 Jun 2011  9150       mduff       xdat_flood_hours needs to be negative on the calendar.add
  * 22 May 2015  4501       skorolev    Removed old DB connection commands. Got rid of Vector.
+ * 26 Jan 2016  5054       randerso    Made XdatDlg parented to display
  * 
  * </pre>
  * 
@@ -189,11 +191,11 @@ public class XdatDlg extends CaveSWTDialog implements ITextDisplay {
     /**
      * Constructor.
      * 
-     * @param parentShell
-     *            Parent shell.
+     * @param display
+     * 
      */
-    public XdatDlg(Shell parentShell) {
-        super(parentShell, SWT.DIALOG_TRIM | SWT.RESIZE | CAVE.DO_NOT_BLOCK);
+    public XdatDlg(Display display) {
+        super(display, SWT.DIALOG_TRIM | SWT.RESIZE | CAVE.DO_NOT_BLOCK);
         databaseMgr = new XdatDB();
         appsDefaults = AppsDefaults.getInstance();
 
@@ -664,7 +666,7 @@ public class XdatDlg extends CaveSWTDialog implements ITextDisplay {
          * Check if there is text to be saved.
          */
         if (textArea.getText().trim().length() == 0) {
-            MessageBox mb = new MessageBox(getParent(), SWT.ICON_WARNING
+            MessageBox mb = new MessageBox(getShell(), SWT.ICON_WARNING
                     | SWT.OK);
             mb.setText("Save Warning");
             mb.setMessage("There is no text to be saved.");
@@ -703,7 +705,7 @@ public class XdatDlg extends CaveSWTDialog implements ITextDisplay {
          */
         if (saveFile.exists() == true) {
 
-            MessageBox mb = new MessageBox(getParent(), SWT.ICON_WARNING
+            MessageBox mb = new MessageBox(getShell(), SWT.ICON_WARNING
                     | SWT.YES | SWT.NO);
             mb.setText("Save Warning");
             mb.setMessage("The file to save already exists.\n\n"
@@ -900,7 +902,7 @@ public class XdatDlg extends CaveSWTDialog implements ITextDisplay {
                 sDate = startDate.parse(setToday);
             }
         } catch (ParseException e) {
-            MessageBox mb = new MessageBox(getParent(), SWT.ICON_WARNING
+            MessageBox mb = new MessageBox(getShell(), SWT.ICON_WARNING
                     | SWT.OK);
             mb.setText("Error with xdat_settoday token");
             mb.setMessage("Invalid value entered as token value.");
@@ -1154,7 +1156,7 @@ public class XdatDlg extends CaveSWTDialog implements ITextDisplay {
         String selectedId = idTF.getText().trim().toUpperCase();
 
         if (selectedId.trim().compareTo("") == 0) {
-            MessageBox mb = new MessageBox(getParent(), SWT.ICON_WARNING
+            MessageBox mb = new MessageBox(getShell(), SWT.ICON_WARNING
                     | SWT.OK);
             mb.setText("Search Warning");
             mb.setMessage("You need to enter an ID into the ID text field.");
@@ -1233,7 +1235,7 @@ public class XdatDlg extends CaveSWTDialog implements ITextDisplay {
             return true;
         }
 
-        MessageBox mb = new MessageBox(getParent(), SWT.ICON_WARNING | SWT.OK);
+        MessageBox mb = new MessageBox(getShell(), SWT.ICON_WARNING | SWT.OK);
         mb.setText("Date Warning");
         mb.setMessage("The selected end time is before the selected start time.");
         mb.open();
@@ -1336,7 +1338,7 @@ public class XdatDlg extends CaveSWTDialog implements ITextDisplay {
         final String text = textArea.getText();
 
         if (text.trim().length() == 0) {
-            MessageBox mb = new MessageBox(getParent(), SWT.ICON_WARNING
+            MessageBox mb = new MessageBox(getShell(), SWT.ICON_WARNING
                     | SWT.OK);
             mb.setText("Print Warning");
             mb.setMessage("There is no text to be printed.");
diff --git a/deltaScripts/16.2.2/DR4677/update_bufrmos_location_pks.sh b/deltaScripts/16.2.2/DR4677/update_bufrmos_location_pks.sh
new file mode 100755
index 0000000000..0c955f58c0
--- /dev/null
+++ b/deltaScripts/16.2.2/DR4677/update_bufrmos_location_pks.sh
@@ -0,0 +1,193 @@
+#!/bin/bash
+# DR #4677 - This script replaces all PKs in bufrmos_location with
+#            sequence-generated values, and cascades the update to all
+#            referencing tables.
+
+PSQL="/awips2/psql/bin/psql"
+
+# Given table name as argument, return the name of the FK constraint
+# referencing bufrmos_location.
+get_constraint_name() {
+    ${PSQL} -U awips -Aqt -d metadata << EOF
+    SELECT tc.constraint_name
+    FROM information_schema.table_constraints AS tc 
+    JOIN information_schema.key_column_usage AS kcu
+    ON tc.constraint_name = kcu.constraint_name
+    JOIN information_schema.constraint_column_usage AS ccu
+    ON ccu.constraint_name = tc.constraint_name
+    WHERE constraint_type = 'FOREIGN KEY'
+    AND tc.table_name='$1'
+    and ccu.table_name = 'bufrmos_location';
+EOF
+}
+
+# Check for existence of bufrmos_locationseq
+sequence_exists() {
+    ${PSQL} -U awips -Aqt -d metadata << EOF
+    select 0
+    from information_schema.sequences
+    where sequence_name = 'bufrmos_locationseq'
+EOF
+}
+
+get_min_pk() {
+    ${PSQL} -U awips -Aqt -d metadata << EOF
+    select min(id) id
+    from bufrmos_location;
+EOF
+}
+
+get_max_pk() {
+    ${PSQL} -U awips -Aqt -d metadata << EOF
+    select max(id) id
+    from bufrmos_location;
+EOF
+}
+
+last_bufrmos_locationseq_value() { 
+    ${PSQL} -U awips -Aqt -d metadata -c \
+        "select last_value from bufrmos_locationseq;"
+}
+
+
+if [[ "$(sequence_exists)" != "0" ]]; then
+    echo "INFO: bufrmos_locationseq does not exist in the database"
+    echo "INFO: Attempting to create bufrmos_locationseq"
+    ${PSQL} -U awips -d metadata -c \
+        "create sequence bufrmos_locationseq increment 1 start 1;"
+    if [[ "$?" != "0" || "$(sequence_exists)" != "0" ]]; then
+        echo "ERROR: Failed to create bufrmos_locationseq"
+        exit 1
+    else
+        echo "INFO Successfully created bufrmos_locationseq"
+    fi
+fi
+
+min_pk="$(get_min_pk)"
+max_pk="$(get_max_pk)"
+
+if [[ ("$min_pk" -gt 0) && ("$max_pk" -le "$(last_bufrmos_locationseq_value)") ]]; then
+    echo "WARN: Looks like PKs were already updated."
+    echo "WARN: (smallest PK found: ${min_pk})"
+    echo "WARN: (largest PK found: ${max_pk})"
+    echo "WARN: Doing nothing."
+    exit 0
+fi
+
+fk_bufrmosavn=`get_constraint_name bufrmosavn`
+fk_bufrmoseta=`get_constraint_name bufrmoseta`
+fk_bufrmosgfs=`get_constraint_name bufrmosgfs`
+fk_bufrmoshpc=`get_constraint_name bufrmoshpc`
+fk_bufrmoslamp=`get_constraint_name bufrmoslamp`
+fk_bufrmosmrf=`get_constraint_name bufrmosmrf`
+fk_bufrmosngm=`get_constraint_name bufrmosngm`
+
+echo "INFO: Updating all PKs of bufrmos_location"
+echo "INFO: This may take a few minutes..."
+
+${PSQL} -U awips -d metadata << EOF
+begin transaction;
+alter table bufrmosavn
+drop constraint ${fk_bufrmosavn},
+add constraint ${fk_bufrmosavn}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE NO ACTION;
+
+alter table bufrmoseta
+drop constraint ${fk_bufrmoseta},
+add constraint ${fk_bufrmoseta}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE NO ACTION;
+
+alter table bufrmosgfs
+drop constraint ${fk_bufrmosgfs},
+add constraint ${fk_bufrmosgfs}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE NO ACTION;
+
+alter table bufrmoshpc
+drop constraint ${fk_bufrmoshpc},
+add constraint ${fk_bufrmoshpc}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE NO ACTION;
+
+alter table bufrmoslamp
+drop constraint ${fk_bufrmoslamp},
+add constraint ${fk_bufrmoslamp}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE NO ACTION;
+
+alter table bufrmosmrf
+drop constraint ${fk_bufrmosmrf},
+add constraint ${fk_bufrmosmrf}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE NO ACTION;
+
+alter table bufrmosngm
+drop constraint ${fk_bufrmosngm},
+add constraint ${fk_bufrmosngm}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE CASCADE ON DELETE NO ACTION;
+
+UPDATE bufrmos_location
+   SET id=nextval('bufrmos_locationseq');
+ 
+alter table bufrmosavn
+drop constraint ${fk_bufrmosavn},
+add constraint ${fk_bufrmosavn}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+alter table bufrmoseta
+drop constraint ${fk_bufrmoseta},
+add constraint ${fk_bufrmoseta}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+alter table bufrmosgfs
+drop constraint ${fk_bufrmosgfs},
+add constraint ${fk_bufrmosgfs}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+alter table bufrmoshpc
+drop constraint ${fk_bufrmoshpc},
+add constraint ${fk_bufrmoshpc}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+alter table bufrmoslamp
+drop constraint ${fk_bufrmoslamp},
+add constraint ${fk_bufrmoslamp}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+alter table bufrmosmrf
+drop constraint ${fk_bufrmosmrf},
+add constraint ${fk_bufrmosmrf}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+
+alter table bufrmosngm
+drop constraint ${fk_bufrmosngm},
+add constraint ${fk_bufrmosngm}
+      FOREIGN KEY (location_id)
+      REFERENCES bufrmos_location (id) MATCH SIMPLE
+      ON UPDATE NO ACTION ON DELETE NO ACTION;
+commit transaction;
+EOF
+
+echo "INFO: Done."
diff --git a/deltaScripts/16.2.2/DR5119/drop_quikscat.sh b/deltaScripts/16.2.2/DR5119/drop_quikscat.sh
new file mode 100755
index 0000000000..109d8a9056
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5119/drop_quikscat.sh
@@ -0,0 +1,10 @@
+#! /bin/bash
+# DR #5119 - This script drops the bufrquikscat table
+
+PSQL="/awips2/psql/bin/psql"
+
+echo "INFO: Removing bufrquikscat table"
+
+${PSQL} -U awips -d metadata -c "DROP TABLE IF EXISTS bufrquikscat;"
+${PSQL} -U awips -d metadata -c "DROP SEQUENCE IF EXISTS bufrquikscatseq;"
+
diff --git a/deltaScripts/16.2.2/DR5253/alter_svrwx_drop_datauri.sh b/deltaScripts/16.2.2/DR5253/alter_svrwx_drop_datauri.sh
new file mode 100755
index 0000000000..ea435b1f9f
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5253/alter_svrwx_drop_datauri.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# DR #5253 - This script drops dataURI column from svrwx table and adds a new
+#            multi-column unique constraint
+
+PSQL="/awips2/psql/bin/psql"
+
+echo "INFO: Altering table svrwx"
+
+${PSQL} -U awips -d metadata << EOF
+begin transaction;
+alter table svrwx
+    drop constraint if exists uk_svrwx_datauri_fields,
+    drop column if exists datauri,
+    add constraint uk_svrwx_datauri_fields unique (
+        reftime, reporttype, stationid, latitude, longitude);
+commit transaction;
+EOF
diff --git a/deltaScripts/16.2.2/DR5254/alter_cwa_drop_datauri.sh b/deltaScripts/16.2.2/DR5254/alter_cwa_drop_datauri.sh
new file mode 100755
index 0000000000..c538b24982
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5254/alter_cwa_drop_datauri.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# DR #5254 - This script drops dataURI column from cwa table and adds a new
+#            multi-column unique constraint
+
+PSQL="/awips2/psql/bin/psql"
+
+echo "INFO: Altering table cwa"
+
+${PSQL} -U awips -d metadata << EOF
+begin transaction;
+delete from cwa where eventid is null;
+alter table cwa
+    drop constraint if exists uk_cwa_datauri_fields,
+    drop column if exists datauri,
+    alter eventid set not null,
+    add constraint uk_cwa_datauri_fields unique (reftime, eventid);
+commit transaction;
+EOF
diff --git a/deltaScripts/16.2.2/DR5269/watchwarn_drop.sh b/deltaScripts/16.2.2/DR5269/watchwarn_drop.sh
new file mode 100644
index 0000000000..919f3218d6
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5269/watchwarn_drop.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# DR #5269 - This script drops table fxatext.watchwarn
+
+PSQL="/awips2/psql/bin/psql"
+
+echo "INFO: Dropping table fxatext.watchwarn."
+
+${PSQL} -U awips -d fxatext -q -c "DROP TABLE IF EXISTS watchwarn CASCADE;"
+
+if [ $? -eq 0 ]; then
+      echo "INFO: watchwarn table successfully dropped."
+else
+      echo "WARNING: Unable to drop watchwarn table."
+      exit 1
+fi
+
diff --git a/deltaScripts/16.2.2/DR5283/drop_bufrmosngm.sh b/deltaScripts/16.2.2/DR5283/drop_bufrmosngm.sh
new file mode 100755
index 0000000000..7d797651ab
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5283/drop_bufrmosngm.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# DR #5283 - Remove support for NGM. Drops the bufrmosngm table and removes 
+# references to the plugin from purgejobs and plugin_info. 
+
+PSQL="/awips2/psql/bin/psql"
+
+
+echo "INFO: Attempting to drop bufrmosngm table"
+
+${PSQL} -U awips -d metadata -c "DROP TABLE IF EXISTS bufrmosngm"
+
+echo "INFO: Attempting to remove bufrmosNGM plugin references from other tables"
+
+${PSQL} -U awips -d metadata -c "DELETE FROM plugin_info where name = 'bufrmosNGM'"
+${PSQL} -U awips -d metadata -c "DELETE FROM purgejobs where plugin = 'bufrmosNGM'"
+
+echo "INFO: Done."
\ No newline at end of file
diff --git a/deltaScripts/16.2.2/DR5285/alter_tcs_drop_datauri.sh b/deltaScripts/16.2.2/DR5285/alter_tcs_drop_datauri.sh
new file mode 100755
index 0000000000..edb78befe5
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5285/alter_tcs_drop_datauri.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# DR #5285 - This script drops dataURI column from tcs table and adds a new
+#            multi-column unique constraint
+
+PSQL="/awips2/psql/bin/psql"
+
+echo "INFO: Altering table tcs"
+
+${PSQL} -U awips -d metadata << EOF
+begin transaction;
+alter table tcs
+    drop constraint if exists uk_tcs_datauri_fields,
+    drop column if exists datauri,
+    add constraint uk_tcs_datauri_fields unique
+        (reftime, producttype, latitude, longitude, stationid);
+commit transaction;
+EOF
diff --git a/deltaScripts/16.2.2/DR5286/alter_tcg_drop_datauri.sh b/deltaScripts/16.2.2/DR5286/alter_tcg_drop_datauri.sh
new file mode 100755
index 0000000000..20d62c8477
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5286/alter_tcg_drop_datauri.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# DR #5286 - This script drops dataURI column from tcg table and adds a new
+#            multi-column unique constraint
+
+TABLE=tcg
+
+PSQL="/awips2/psql/bin/psql"
+
+echo "INFO: Altering table ${TABLE}"
+
+${PSQL} -U awips -d metadata << EOF
+begin transaction;
+alter table ${TABLE}
+    drop constraint if exists uk_${TABLE}_datauri_fields,
+    drop column if exists datauri,
+    add constraint uk_${TABLE}_datauri_fields unique
+        (reftime, producttype, modelname, latitude, longitude, stationid);
+commit transaction;
+EOF
diff --git a/deltaScripts/16.2.2/DR5309/alter_bufrsigwx_drop_datauri.sh b/deltaScripts/16.2.2/DR5309/alter_bufrsigwx_drop_datauri.sh
new file mode 100755
index 0000000000..73117a61dd
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5309/alter_bufrsigwx_drop_datauri.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# DR #5309 - This script drops dataURI column from bufrsigwx table and adds a
+#            new multi-column unique constraint
+
+TABLE=bufrsigwx
+
+PSQL="/awips2/psql/bin/psql"
+
+echo "INFO: Altering table ${TABLE}"
+
+${PSQL} -U awips -d metadata << EOF
+begin transaction;
+delete from ${TABLE}
+    where wxLayer is null
+    or wxType is null
+    or key is null;
+alter table ${TABLE}
+    drop constraint if exists uk_${TABLE}_datauri_fields,
+    drop column if exists datauri,
+    alter wxLayer set not null,
+    alter wxType set not null,
+    alter key set not null,
+    add constraint uk_${TABLE}_datauri_fields unique
+        (reftime, wxLayer, wxType, key);
+commit transaction;
+EOF
diff --git a/deltaScripts/16.2.2/DR5310/alter_bufrncwf_drop_datauri.sh b/deltaScripts/16.2.2/DR5310/alter_bufrncwf_drop_datauri.sh
new file mode 100755
index 0000000000..2e90ff1203
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5310/alter_bufrncwf_drop_datauri.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+# DR #5310 - This script drops dataURI column from bufrncwf table and adds a
+#            new multi-column unique constraint
+
+TABLE=bufrncwf
+
+PSQL="/awips2/psql/bin/psql"
+
+echo "INFO: Altering table ${TABLE}"
+
+${PSQL} -U awips -d metadata << EOF
+begin transaction;
+alter table ${TABLE}
+    drop constraint if exists uk_${TABLE}_datauri_fields,
+    drop column if exists datauri,
+    add constraint uk_${TABLE}_datauri_fields unique
+        (reftime, latitude, longitude, stationid);
+commit transaction;
+EOF
diff --git a/deltaScripts/16.2.2/DR5348/add_county_names_view.sh b/deltaScripts/16.2.2/DR5348/add_county_names_view.sh
new file mode 100755
index 0000000000..726922155c
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5348/add_county_names_view.sh
@@ -0,0 +1,16 @@
+#!/bin/sh 
+# DR #5348 - This script creates the county_names view on the county table
+#            in the maps database
+
+if [ -z $1 ] ; then
+    PGHOST=dx1
+else
+    PGHOST=${1}
+fi
+
+/awips2/psql/bin/psql -d maps -U awips -q -h ${PGHOST} -c "
+    DROP VIEW IF EXISTS mapdata.county_names;
+    CREATE OR REPLACE VIEW mapdata.county_names AS
+    SELECT countyname as name, ST_SetSRID(ST_Point(lon,lat), 4326)::geometry(Point, 4326) as the_geom
+    FROM mapdata.county;
+"
diff --git a/deltaScripts/16.2.2/DR5348/replaceCountyNamesLpi.py b/deltaScripts/16.2.2/DR5348/replaceCountyNamesLpi.py
new file mode 100755
index 0000000000..3e8dddf385
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5348/replaceCountyNamesLpi.py
@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+# DR 5348 - This script will replace references to us_county.lpi in a bundle or procedure with
+# references to the new county_names view in the maps database
+
+import sys
+import xml.etree.ElementTree as ET
+
+xsitype = '{http://www.w3.org/2001/XMLSchema-instance}type'
+
+def upgradeBundle(inputFile, outputFile):
+    tree = ET.parse(inputFile)
+    root = tree.getroot()
+    iterpath = 'bundles/bundle/displayList/displays/descriptor/resource'
+    if root.tag == 'bundle':
+        iterpath = 'displayList/displays/descriptor/resource'
+
+    if checkResources(root, iterpath):
+        with open(outputFile, 'w') as out:   
+            tree.write(out, encoding='UTF-8', xml_declaration=True)
+
+def checkResources(element, iterPath):
+    updated = False
+    for resource in element.iterfind(iterPath):
+        resourceData = resource.find('resourceData') 
+        type = resourceData.get(xsitype)
+        if type == 'mapResourceGroupData':
+            updated |= checkResources(resourceData, 'resource')
+        elif type == 'lpiResourceData':
+            filename = resourceData.find('filename')
+            if filename.text == 'us_county.lpi':
+                convertResource(resource)
+                updated |= True
+    
+    return updated
+
+def convertResource(resource):
+    # convert resourceData to dpPointMapResourceData
+    resourceData = resource.find('resourceData')
+    resourceData.set(xsitype,'dbPointMapResourceData')
+    resourceData.remove(resourceData.find('filename'))
+    table = ET.SubElement(resourceData, 'table')
+    table.text = 'mapdata.county_names'
+
+    # remove the outlineCapability, densityCapability, and labelableCapability
+    loadProperties = resource.find('loadProperties')
+    capabilities = loadProperties.find('capabilities')
+    for capability in capabilities.findall('capability'):
+        if capability.get(xsitype) in ['outlineCapability', 'densityCapability', 'labelableCapability']:
+            capabilities.remove(capability)
+    
+    # set density to max so all county names are displayed
+    densityCapability = ET.SubElement(capabilities, 'capability')
+    densityCapability.set(xsitype, 'densityCapability')
+    densityCapability.set('density', '9999')
+    
+    labelableCapability = ET.SubElement(capabilities, 'capability')
+    labelableCapability.set(xsitype, 'labelableCapability')
+    labelableCapability.set('labelField', 'name')
+    
+    # set pdProps to only display county names when counties are displayed in States/County Boundaries
+    properties = resource.find('properties')
+    if properties == None:
+        properties = ET.SubElement(resource, 'properties')
+        properties.set('isSystemResource', 'false') 
+        properties.set('isBlinking', 'false') 
+        properties.set('isMapLayer', 'true') 
+        properties.set('isHoverOn', 'false')
+        properties.set('isVisible', 'true')
+
+    pdProps = properties.find('pdProps')
+    if pdProps  == None:
+        pdProps = ET.SubElement(properties, 'pdProps')
+        pdProps.set('minDisplayWidth', '0')
+    pdProps.set('maxDisplayWidth', '750000')
+
+if __name__ == '__main__':
+    if len(sys.argv) < 3:
+        print "Usage:\n", sys.argv[0], "inputFile outputFile"
+        sys.exit(1)
+    
+    upgradeBundle(sys.argv[1], sys.argv[2])
\ No newline at end of file
diff --git a/deltaScripts/16.2.2/DR5348/updateBundlesAndProcedures.sh b/deltaScripts/16.2.2/DR5348/updateBundlesAndProcedures.sh
new file mode 100755
index 0000000000..95fdaf65e3
--- /dev/null
+++ b/deltaScripts/16.2.2/DR5348/updateBundlesAndProcedures.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# DR 5348 - This script will replace references to us_county.lpi in any bundles or procedure with
+# references to the new county_names view in the maps database
+
+IFS=$'\n'
+files=`find /awips2/edex/data/utility/cave_static/*/*/bundles/ /awips2/edex/data/utility/cave_static/*/*/procedures/ -iname '*.xml'`   
+
+MY_DIR=`dirname $0`
+for f in $files; do
+    python $MY_DIR/replaceCountyNamesLpi.py $f $f.tmp
+    if [[ $? == 0 ]]
+    then
+        # if output file doesn't exist, no changes were made
+        if [[ -e $f.tmp ]]
+        then
+            mv $f.tmp $f
+            echo "Updated: $f"
+        fi
+    else
+        echo "ERROR: Problem updating file $f"
+    fi
+done
+
+
+
+echo "INFO: The update finished successfully."
+exit 0
+
diff --git a/edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh b/edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
index 0542d094e6..d7b190c16d 100644
--- a/edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
+++ b/edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
@@ -25,6 +25,7 @@
 # 03/25/2014    #2664     randerso    Added support for importing non-WGS84 shape files
 # 10/23/2014    #3685     randerso    Fixed bug where .prj was not recognized when shape file
 #                                     was in the current directory (no directory specified)
+# 02/11/2016    #5348     randerso    Add code to create a county_names view into the county table
 #     
 ##
 
@@ -103,6 +104,16 @@ if [ ! -r ${SHP_PATH} ]; then
 fi
 
 echo "  Importing ${SHP_NAME} into ${SCHEMA}.${TABLE} ..."
+
+#
+# If updating county table drop the county names view
+#
+if [ "county" == ${TABLE} ] ; then
+    ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} -c "
+        DROP VIEW IF EXISTS ${SCHEMA}.county_names;
+    "
+fi
+
 ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} -c "
     DELETE FROM public.geometry_columns WHERE f_table_schema = '${SCHEMA}' AND f_table_name = '${TABLE}';
     DELETE FROM ${SCHEMA}.map_version WHERE table_name='${TABLE}';
@@ -116,6 +127,17 @@ ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} -c "
     CREATE INDEX ${TABLE}_the_geom_0_gist ON ${SCHEMA}.${TABLE} USING gist(the_geom_0);
 "
 
+#
+# If updating county table recreate the county names view
+#
+if [ "county" == ${TABLE} ] ; then
+    ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} -c "
+        CREATE OR REPLACE VIEW ${SCHEMA}.county_names AS
+        SELECT countyname as name, ST_SetSRID(ST_Point(lon,lat), 4326)::geometry(Point, 4326) as the_geom
+	 	FROM ${SCHEMA}.county;
+	"
+fi
+
 if [ -n "$SIMPLEVS" ] ; then
     echo "  Creating simplification levels ${SIMPLEVS}..."
     IFS=",	 "
diff --git a/edexOsgi/build.edex/opt/db/ddl/maps/initializeMapsDb.sh b/edexOsgi/build.edex/opt/db/ddl/maps/initializeMapsDb.sh
index afe91210ba..47d191a94b 100644
--- a/edexOsgi/build.edex/opt/db/ddl/maps/initializeMapsDb.sh
+++ b/edexOsgi/build.edex/opt/db/ddl/maps/initializeMapsDb.sh
@@ -17,6 +17,12 @@
 # 
 # See the AWIPS II Master Rights File ("Master Rights File.pdf") for
 # further licensing information.
+#
+#
+# SOFTWARE HISTORY
+# Date         Ticket#    Engineer    Description
+# ------------ ---------- ----------- --------------------------
+# 02/11/2016    #5348     randerso    Do a full vacuum after creating the maps database
 ##
 
 if [ $# -lt 1 ] ; then
@@ -95,6 +101,6 @@ else
         echo Importing `basename $file` into $base...
         ${DATABASEDIR}/importPointsInfo.sh $file mapdata $base $PGUSER $PGPORT $1
     done
-    ${PGBINDIR}/vacuumdb -d maps -U ${PGUSER} -p ${PGPORT} -vz
+    ${PGBINDIR}/vacuumdb -d maps -U ${PGUSER} -p ${PGPORT} -vfz
     ${DATABASEDIR}/createMapsDbSnapshot.sh ${1} $PGUSER $PGPORT ${DATABASEDIR}/maps.db
 fi
diff --git a/edexOsgi/com.raytheon.edex.notifysrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.notifysrv/META-INF/MANIFEST.MF
index 3addbb7de8..0ceed65423 100644
--- a/edexOsgi/com.raytheon.edex.notifysrv/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.notifysrv/META-INF/MANIFEST.MF
@@ -11,4 +11,4 @@ Require-Bundle: com.raytheon.uf.edex.core;bundle-version="1.12.1174",
  org.apache.commons.configuration;bundle-version="1.6.0"
 Import-Package: com.raytheon.edex.subscription,
  com.raytheon.uf.common.util,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.notifysrv/src/com/raytheon/edex/services/NotifySrv.java b/edexOsgi/com.raytheon.edex.notifysrv/src/com/raytheon/edex/services/NotifySrv.java
index f88e36ce70..e45c640ad9 100644
--- a/edexOsgi/com.raytheon.edex.notifysrv/src/com/raytheon/edex/services/NotifySrv.java
+++ b/edexOsgi/com.raytheon.edex.notifysrv/src/com/raytheon/edex/services/NotifySrv.java
@@ -23,8 +23,8 @@ package com.raytheon.edex.services;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.subscription.ISubscriptionManager;
 import com.raytheon.edex.subscription.Script;
@@ -43,13 +43,14 @@ import com.raytheon.uf.edex.core.EdexException;
  * 
  * <pre>
  * SOFTWARE HISTORY
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
  * 14Aug2006    #18         MW Fegan    Initial Creation.
  * 06Feb2007    TO5         MW Fegan    Removed JMX registration.
  * 27Apr2007    208         MW Fegan    Pass only dataURI in message.
  * 26Nov2007    443         bphillip    Modified to receive lists of PluginDataObjects
  * Jul 10, 2014 2914        garmendariz Remove EnvProperties
+ * Dec 10, 2015 5166        kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author mfegan
@@ -60,7 +61,7 @@ public class NotifySrv {
 
     private ISubscriptionManager subscriptionManager;
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     /**
      * Constructor. Constructs the Notification Server object and registers with
diff --git a/edexOsgi/com.raytheon.edex.plugin.binlightning/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.binlightning/META-INF/MANIFEST.MF
index fda613c4dd..0f46d7e326 100644
--- a/edexOsgi/com.raytheon.edex.plugin.binlightning/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.binlightning/META-INF/MANIFEST.MF
@@ -23,8 +23,7 @@ Import-Package: com.raytheon.edex.esb,
  com.vividsolutions.jts.geom,
  com.vividsolutions.jts.geom.prep,
  com.vividsolutions.jts.io,
- gov.noaa.nws.ost.edex.plugin.binlightning,
- org.apache.commons.logging
+ gov.noaa.nws.ost.edex.plugin.binlightning
 Require-Bundle: com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.12.1174",
  com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
diff --git a/edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/filter/LightningGeoFilter.java b/edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/filter/LightningGeoFilter.java
index 7178852501..9d8f46b6a5 100644
--- a/edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/filter/LightningGeoFilter.java
+++ b/edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/filter/LightningGeoFilter.java
@@ -31,6 +31,7 @@ import javax.xml.bind.JAXBException;
 
 import com.raytheon.uf.common.dataplugin.binlightning.BinLightningRecord;
 import com.raytheon.uf.common.dataplugin.binlightning.impl.LightningStrikePoint;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
@@ -51,9 +52,11 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometry;
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
+ * Date         Ticket#    Engineer     Description
+ * ------------ ---------- -----------  --------------------------
  * Jun 10, 2014 3226       bclement     Initial creation
+ * Jan 27, 2016 5237       tgurney      Replace LocalizationFile with
+ *                                      ILocalizationFile
  * 
  * </pre>
  * 
@@ -92,11 +95,11 @@ public class LightningGeoFilter {
                         LOCALIZATION_FILTER_DIR, new String[] { ".xml" }, true,
                         true);
 
-                for (LocalizationFile file : files) {
+                for (ILocalizationFile file : files) {
                     Collection<PreparedGeometry> filters = getFilterGeometries(file);
                     if (!filters.isEmpty()) {
                         String bareName = getFileNameWithoutExtension(file
-                                .getName());
+                                .getPath());
                         geometryMap.put(bareName.toLowerCase(), filters);
                     }
                 }
@@ -112,11 +115,9 @@ public class LightningGeoFilter {
      * @return empty list on error
      */
     private static Collection<PreparedGeometry> getFilterGeometries(
-            LocalizationFile file) {
+            ILocalizationFile file) {
         Collection<PreparedGeometry> rval;
-        InputStream in = null;
-        try {
-            in = file.openInputStream();
+        try (InputStream in = file.openInputStream()) {
             GeoFilterResult result = GeoFilterParser.parse(in);
             if (result.hasErrors()) {
                 for (GeoFilterException e : result.getErrors()) {
@@ -125,25 +126,10 @@ public class LightningGeoFilter {
                 log.warn("Filter parsing included errors, filters will be incomplete");
             }
             return result.getFilters();
-        } catch (JAXBException e) {
-            log.error("Unable to parse filter file: " + file.getName(), e);
+        } catch (IOException | JAXBException | LocalizationException
+                | SerializationException e) {
+            log.error("Unable to parse filter file: " + file.getPath(), e);
             rval = Collections.emptyList();
-        } catch (LocalizationException e) {
-            log.error("Unable to open filter file: " + file.getName(), e);
-            rval = Collections.emptyList();
-        } catch (SerializationException e) {
-            log.error("Unable to parse filter file: " + file.getName(), e);
-            rval = Collections.emptyList();
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException e) {
-                    log.error(
-                            "Problem closing localization file: "
-                                    + file.getName(), e);
-                }
-            }
         }
         return rval;
     }
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.bufrua/META-INF/MANIFEST.MF
index 4e60af5348..8a7d0854ed 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bufrua Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.bufrua
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.raytheon.edex.plugin.bufrua.dao
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrua;bundle-version="1.12.1174",
  com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
@@ -23,4 +23,4 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.bufrua;bundle-version="1.12.11
 Import-Package: com.raytheon.edex.esb,
  com.raytheon.edex.plugin,
  com.raytheon.uf.common.wmo,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUASeparator.java b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUASeparator.java
index 4406f76ba7..415b34c12d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUASeparator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUASeparator.java
@@ -22,8 +22,8 @@ package com.raytheon.edex.plugin.bufrua;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.plugin.AbstractRecordSeparator;
@@ -58,6 +58,7 @@ import com.raytheon.uf.edex.decodertools.core.DecoderTools;
  * 20080107            382 jkorman     Fixed NullPointerEx in hasNext.
  * 20080214            862 jkorman     Refactored data separation into BUFRFile.
  * May 14, 2014 2536       bclement    moved WMO Header to common
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -67,7 +68,7 @@ import com.raytheon.uf.edex.decodertools.core.DecoderTools;
 public class BufrUASeparator extends AbstractRecordSeparator implements
         IDescriptorFactorySelector {
     /** The logger */
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     // WMO header of the message containing the BUFR data.
     private WMOHeader wmoHeader = null;
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
index ea4501c443..e2c4db9fa3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/AbstractBUFRUAAdapter.java
@@ -23,8 +23,8 @@ import java.util.Calendar;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrua.UAObs;
 import com.raytheon.uf.common.pointdata.PointDataContainer;
@@ -55,6 +55,8 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  *                                     bufrua.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed TimeTools
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J and
+ *                                     make logger protected
  * 
  * </pre>
  * 
@@ -78,7 +80,7 @@ public abstract class AbstractBUFRUAAdapter extends BUFRPointDataAdapter<UAObs>
 
     private static final int MINUTE_POS = 8;
 
-    Log logger = LogFactory.getLog(getClass());
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 
     WMOHeader wmoHeader;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUAAdapterFactory.java b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUAAdapterFactory.java
index 3a89d3d4ef..ed4feed4d3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUAAdapterFactory.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUAAdapterFactory.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.edex.plugin.bufrua.decoder;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrua.UAObs;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
@@ -36,6 +36,8 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 21, 2009            jkorman     Initial creation
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J and
+ *                                     make logger protected
  * 
  * </pre>
  * 
@@ -45,7 +47,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
 
 public class BUFRUAAdapterFactory {
 
-    Log logger = LogFactory.getLog(getClass());
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 
     private PointDataDescription pdd;
 
@@ -71,26 +73,27 @@ public class BUFRUAAdapterFactory {
      * @return
      */
     public AbstractBUFRUAAdapter getAdapter(WMOHeader wmoHeader) {
-        
+
         AbstractBUFRUAAdapter adapter = null;
-        
-        int ii = wmoHeader.getIi() % 10;;
-        
-        switch(ii) {
-        case 1 :
-        case 3 : {
+
+        int ii = wmoHeader.getIi() % 10;
+
+        switch (ii) {
+        case 1:
+        case 3: {
             adapter = new BUFRUAManLevelAdapter(pdd, dao, pluginName);
             break;
         }
-        case 2 :
-        case 4 :
-        case 6 :
-        case 8 : {
+        case 2:
+        case 4:
+        case 6:
+        case 8: {
             adapter = new BUFRUASigLevelAdapter(pdd, dao, pluginName);
             break;
         }
-        default : {
-            logger.error("Unknown WMOHeader info. Creating null adapter for " + wmoHeader.getWmoHeader());
+        default: {
+            logger.error("Unknown WMOHeader info. Creating null adapter for "
+                    + wmoHeader.getWmoHeader());
             adapter = new BUFRUANullLevelAdapter(pdd, dao, pluginName);
         }
         } // switch
diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/util/RaobSitesInUseUtil.java b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/util/RaobSitesInUseUtil.java
index 81c03e0573..5393299f55 100644
--- a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/util/RaobSitesInUseUtil.java
+++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/util/RaobSitesInUseUtil.java
@@ -21,8 +21,8 @@ package com.raytheon.edex.plugin.bufrua.util;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -30,12 +30,13 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.PathManager;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 
@@ -45,9 +46,11 @@ import com.raytheon.uf.common.status.UFStatus;
  * <pre>
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jul 15, 2010            mnash     Initial creation
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- -------------------------------------
+ * Jul 15, 2010  5571     mnash     Initial creation
+ * Feb 16, 2016  5237     bsteffen  Replace deprecated localization API.
  * 
  * </pre>
  * 
@@ -80,7 +83,7 @@ public class RaobSitesInUseUtil {
      * 
      * @throws IOException
      */
-    private static void parseFile(String site) throws IOException {
+    private static void parseFile(String site) {
         if (parsed && raobSite.equals(site)) {
             return;
         }
@@ -93,7 +96,7 @@ public class RaobSitesInUseUtil {
         }
 
         siteMap.clear();
-        PathManager pm = (PathManager) PathManagerFactory.getPathManager();
+        IPathManager pm = PathManagerFactory.getPathManager();
 
         LocalizationContext context = null;
         if (site != null) {
@@ -104,10 +107,10 @@ public class RaobSitesInUseUtil {
                     LocalizationLevel.SITE);
         }
 
-        LocalizationFile file = pm.getLocalizationFile(context, "upperair"
+        ILocalizationFile file = pm.getLocalizationFile(context, "upperair"
                 + File.separator + "raobSitesInUse.txt");
 
-        if (!file.exists()) {
+        if (file == null || !file.exists()) {
             LocalizationContext baseContext = pm.getContext(
                     LocalizationType.COMMON_STATIC, LocalizationLevel.BASE);
             file = pm.getLocalizationFile(baseContext, "upperair"
@@ -116,33 +119,34 @@ public class RaobSitesInUseUtil {
                     .info("Site raobSitesInUse.txt file not configured for "
                             + site + ".  Using the base file.");
         }
-        if (file != null) {
-            BufferedReader buf = new BufferedReader(new FileReader(
-                    file.getFile()));
-            System.out.println("temping");
-            String temp = buf.readLine();
-            temp = buf.readLine();
-            String radarType = "";
-            List<UpperAirSite> sites = new ArrayList<UpperAirSite>();
-            while (temp != null) {
-                temp = temp.trim();
-                if (temp.startsWith("#")) {
-                    sites = new ArrayList<UpperAirSite>();
-                    radarType = temp.substring(1, temp.indexOf(" ", 2));
-                    siteMap.put(radarType.trim(), sites);
-                } else if (!temp.isEmpty()) {
-                    Matcher m = raob_pattern.matcher(temp);
-                    while (m.find()) {
-                        UpperAirSite uaSite = new UpperAirSite();
-                        uaSite.setIcao(m.group(1));
-                        uaSite.setSiteId(m.group(2));
-                        uaSite.setCity(m.group(3));
-                        sites.add(uaSite);
-                    }
-                }
+        if (file != null && file.exists()) {
+            try (BufferedReader buf = new BufferedReader(new InputStreamReader(
+                    file.openInputStream()))) {
+                String temp = buf.readLine();
                 temp = buf.readLine();
+                String radarType = "";
+                List<UpperAirSite> sites = new ArrayList<UpperAirSite>();
+                while (temp != null) {
+                    temp = temp.trim();
+                    if (temp.startsWith("#")) {
+                        sites = new ArrayList<UpperAirSite>();
+                        radarType = temp.substring(1, temp.indexOf(" ", 2));
+                        siteMap.put(radarType.trim(), sites);
+                    } else if (!temp.isEmpty()) {
+                        Matcher m = raob_pattern.matcher(temp);
+                        while (m.find()) {
+                            UpperAirSite uaSite = new UpperAirSite();
+                            uaSite.setIcao(m.group(1));
+                            uaSite.setSiteId(m.group(2));
+                            uaSite.setCity(m.group(3));
+                            sites.add(uaSite);
+                        }
+                    }
+                    temp = buf.readLine();
+                }
+            } catch (IOException | LocalizationException e) {
+                statusHandler.error("Error reading " + file.getPath(), e);
             }
-            buf.close();
         }
     }
 
@@ -153,11 +157,7 @@ public class RaobSitesInUseUtil {
      * @return
      */
     public static List<UpperAirSite> getSite(String site, String type) {
-        try {
-            parseFile(site);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        parseFile(site);
         return siteMap.get(type);
     }
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
index d48805e038..7e52de0fe0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: com.raytheon.uf.common.dataplugin.gfe;bundle-version="1.12.1174"
  com.raytheon.uf.common.dataplugin.grid;bundle-version="1.0.0",
  com.raytheon.uf.common.util;bundle-version="1.12.1174",
  com.google.guava;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.common.python.concurrent;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
  com.raytheon.uf.edex.esb.camel;bundle-version="1.12.1174"
@@ -66,6 +66,6 @@ Import-Package: com.raytheon.edex.db.dao,
  com.raytheon.uf.common.time.util,
  com.raytheon.uf.edex.activetable,
  com.raytheon.uf.edex.site,
- org.apache.commons.logging,
+ org.slf4j,
  org.hibernate
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
index 9096936a54..a529eafde0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
@@ -8,7 +8,12 @@
         <constructor-arg ref="iscProvider" />
     </bean>
     
-    <bean id="gfeSitesActiveRequest" factory-bean="siteAwareRegistry" factory-method="register">
+    <bean id="gfeSitesActiveRequest" factory-bean="siteAwareRegistry" factory-method="register"
+        depends-on="gfeActivationAsyncRequest">
+        <constructor-arg ref="gfeSiteActivation"/>
+    </bean>
+    
+    <bean id="gfeActivationAsyncRequest" factory-bean="contextManager" factory-method="registerAsyncStartupBean">
         <constructor-arg ref="gfeSiteActivation"/>
     </bean>
 
@@ -370,41 +375,29 @@
 
     <bean id="ifpnetCDFFactory" class="com.raytheon.edex.plugin.gfe.isc.IscScriptFactory">
         <constructor-arg value="ifpnetCDF"/>
-        <constructor-arg value="2"/>
     </bean>
-    <bean name="ifpnetCDFPythonThreadPool" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-        <property name="staticMethod" value="com.raytheon.uf.common.python.concurrent.PythonJobCoordinator.newInstance"/>
-        <property name="arguments">
-            <list>
-                <ref bean="ifpnetCDFFactory"/>
-            </list>
-        </property>
+    <bean id="ifpnetCDFPythonThreadPool" class="com.raytheon.uf.common.python.concurrent.PythonJobCoordinator">
+        <constructor-arg value="2" />
+        <constructor-arg value="ifpnetCDF" />
+        <constructor-arg ref="ifpnetCDFFactory"/>
     </bean>
 
     <bean id="iscMosaicFactory" class="com.raytheon.edex.plugin.gfe.isc.IscScriptFactory">
         <constructor-arg value="iscMosaic"/>
-        <constructor-arg value="2"/>
     </bean>
-    <bean name="iscMosaicPythonThreadPool" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-        <property name="staticMethod" value="com.raytheon.uf.common.python.concurrent.PythonJobCoordinator.newInstance"/>
-        <property name="arguments">
-            <list>
-                <ref bean="iscMosaicFactory"/>
-            </list>
-        </property>
+    <bean id="iscMosaicPythonThreadPool" class="com.raytheon.uf.common.python.concurrent.PythonJobCoordinator">
+        <constructor-arg value="2" />
+        <constructor-arg value="iscMosaic" />
+        <constructor-arg ref="iscMosaicFactory" />
     </bean>
 
     <bean id="iscDataRecFactory" class="com.raytheon.edex.plugin.gfe.isc.IscScriptFactory">
         <constructor-arg value="iscDataRec"/>
-        <constructor-arg value="2"/>
     </bean>
-    <bean name="iscDataRecPythonThreadPool" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
-        <property name="staticMethod" value="com.raytheon.uf.common.python.concurrent.PythonJobCoordinator.newInstance"/>
-        <property name="arguments">
-            <list>
-                <ref bean="iscDataRecFactory"/>
-            </list>
-        </property>
+    <bean id="iscDataRecPythonThreadPool" class="com.raytheon.uf.common.python.concurrent.PythonJobCoordinator">
+        <constructor-arg value="2" />
+        <constructor-arg value="iscDataRec" />
+        <constructor-arg ref="iscDataRecFactory" />
     </bean>
 
     <!-- End Additional ISC Beans -->
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
index 8c41b61bda..ab75980423 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
@@ -13,7 +13,11 @@
     <bean id="smartInitQueue" class="com.raytheon.edex.plugin.gfe.smartinit.SmartInitQueue" factory-method="createQueue"/>
 
     <bean id="gfeSitesActiveIngest" factory-bean="siteAwareRegistry" factory-method="register"
-            depends-on="smartInitQueue">
+            depends-on="smartInitQueue, gfeActivationAsyncIngest">
+        <constructor-arg ref="gfeSiteActivation"/>
+    </bean>
+    
+    <bean id="gfeActivationAsyncIngest" factory-bean="contextManager" factory-method="registerAsyncStartupBean">
         <constructor-arg ref="gfeSiteActivation"/>
     </bean>
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
index 556be7eb3e..0f10238a50 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
@@ -38,6 +38,7 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.edex.core.EDEXUtil;
+import com.raytheon.uf.edex.core.EdexAsyncStartupBean;
 import com.raytheon.uf.edex.core.EdexException;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.database.cluster.ClusterLockUtils;
@@ -76,6 +77,7 @@ import com.raytheon.uf.edex.site.notify.SendSiteActivationNotifications;
  * Dec 10, 2014  #4953    randerso     Added requestTCVFiles call at site activation
  * Feb 25, 2015  #4128    dgilling     Simplify activation of active table sharing.
  * Mar 11, 2015  #4128    dgilling     Refactor activation and management of ISC services.
+ * Dec 22, 2015  #4262    dgilling     Implement EdexAsyncStartupBean.
  * 
  * </pre>
  * 
@@ -83,7 +85,8 @@ import com.raytheon.uf.edex.site.notify.SendSiteActivationNotifications;
  * @version 1.0
  */
 
-public class GFESiteActivation implements ISiteActivationListener {
+public class GFESiteActivation implements ISiteActivationListener,
+        EdexAsyncStartupBean {
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(GFESiteActivation.class);
 
@@ -93,7 +96,7 @@ public class GFESiteActivation implements ISiteActivationListener {
 
     private static final int LOCK_TASK_TIMEOUT = 180000;
 
-    private boolean intialized;
+    private volatile boolean intialized;
 
     private final IscServiceProvider iscServices;
 
@@ -414,4 +417,9 @@ public class GFESiteActivation implements ISiteActivationListener {
         }
         return retVal;
     }
+
+    @Override
+    public boolean isDone() {
+        return intialized;
+    }
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GridDbConfig.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GridDbConfig.java
index baf9ce4c8f..25957757ed 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GridDbConfig.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GridDbConfig.java
@@ -24,8 +24,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.gfe.config.ProjectionData;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
@@ -51,8 +51,9 @@ import com.raytheon.uf.common.dataplugin.gfe.weather.WxDefinition;
  *                                     Cloned ParmStorageInfo when requested so we have
  *                                     a unique instance per database.
  * 01/13/2015   #3955      randerso    Fixed NullPointerException when extraWEPrecision is null
- * 10/30/20115  #5019      dgilling    Fix creation of ParmID when parm name 
+ * 10/30/2015   #5019      dgilling    Fix creation of ParmID when parm name
  *                                     specifies name and level together.
+ * 12/15/2015   #5166      kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -61,7 +62,7 @@ import com.raytheon.uf.common.dataplugin.gfe.weather.WxDefinition;
  */
 
 public class GridDbConfig {
-    private final Log theLogger = LogFactory.getLog(this.getClass());
+    private final Logger theLogger = LoggerFactory.getLogger(this.getClass());
 
     private HashMap<String, ParmStorageInfo> _parmInfoDict;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/IFPServerConfig.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/IFPServerConfig.java
index aa95b55244..f2303ef305 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/IFPServerConfig.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/IFPServerConfig.java
@@ -28,8 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.gfe.DiscreteTerm;
 import com.raytheon.uf.common.dataplugin.gfe.config.ProjectionData;
@@ -51,7 +51,7 @@ import com.raytheon.uf.common.dataplugin.gfe.weather.WxDefinition;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 03/11/08     #1030      randerso    Initial port	
+ * 03/11/08     #1030      randerso    Initial port
  * 04/08/08     #875       bphillip    Changed exception handling
  * 06/24/08     #1160      randerso    Added a method to get the Topo dbId
  * 07/09/09     #2590      njensen     No longer singleton
@@ -59,6 +59,7 @@ import com.raytheon.uf.common.dataplugin.gfe.weather.WxDefinition;
  * 08/14/2013   #1571      randerso    Changed to use ProjectionType enum
  * 03/05/2015   #4169      randerso    Changed model name mappings to return null if no mapping
  * 04/09/2015   #4383      dgilling    Support FireWx ISC.
+ * 12/15/2015   #5166      kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -66,8 +67,8 @@ import com.raytheon.uf.common.dataplugin.gfe.weather.WxDefinition;
  * @version 1.0
  */
 public class IFPServerConfig {
-    private static final Log theLogger = LogFactory
-            .getLog(IFPServerConfig.class);
+    private static final Logger theLogger = LoggerFactory
+            .getLogger(IFPServerConfig.class);
 
     private String _serverHost, _mhsid;
 
@@ -860,4 +861,4 @@ public class IFPServerConfig {
         }
         return retVal;
     }
-}
\ No newline at end of file
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/IFPServerConfigManager.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/IFPServerConfigManager.java
index ed34c5b43f..cf99e8c1fe 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/IFPServerConfigManager.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/IFPServerConfigManager.java
@@ -25,8 +25,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.gfe.exception.GfeConfigurationException;
 import com.raytheon.edex.plugin.gfe.exception.GfeMissingConfigurationException;
@@ -50,11 +50,12 @@ import com.raytheon.uf.common.util.FileUtil;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jul 9, 2009            njensen     Initial creation
- * Dec 11, 2012 14360     ryu         Throw specific exception for missing configuration.
- * Feb 20, 2014 #2824     randerso    Fixed import of localVTECPartners to use siteID
- *                                    Added common python path for LogStream
- * Jul 09, 2014 #3146     randerso    Improved exception handling
+ * Jul 9, 2009             njensen     Initial creation
+ * Dec 11, 2012 14360      ryu         Throw specific exception for missing configuration.
+ * Feb 20, 2014 #2824      randerso    Fixed import of localVTECPartners to use siteID
+ *                                     Added common python path for LogStream
+ * Jul 09, 2014 #3146      randerso    Improved exception handling
+ * Dec 15, 2015 #5166      kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -64,8 +65,8 @@ import com.raytheon.uf.common.util.FileUtil;
 
 public class IFPServerConfigManager {
 
-    private static final Log logger = LogFactory
-            .getLog(IFPServerConfigManager.class);
+    private static final Logger logger = LoggerFactory
+            .getLogger(IFPServerConfigManager.class);
 
     private static final String CONFIG_PATH = FileUtil.join("config", "gfe");
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/ifpAG/ASCIIGrid.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/ifpAG/ASCIIGrid.java
index 91e48c9cfd..90c300cd9f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/ifpAG/ASCIIGrid.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/ifpAG/ASCIIGrid.java
@@ -22,7 +22,10 @@ package com.raytheon.edex.plugin.gfe.ifpAG;
 import java.awt.Point;
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -73,9 +76,11 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Apr 13, 2011  #8393     dgilling     Initial creation
- * 02/19/13     #1637      randerso    Added exception handling for Discrete and Weather
- * 10/31/2013   #2508      randerso    Change to use DiscreteGridSlice.getKeys()
- * 04/22/2014   #3050      randerso    Allow exceptions to propagate to caller from readASCIIGridData
+ * 02/19/13      #1637     randerso     Added exception handling for Discrete and Weather
+ * 10/31/2013    #2508     randerso     Change to use DiscreteGridSlice.getKeys()
+ * 04/22/2014    #3050     randerso     Allow exceptions to propagate to caller from readASCIIGridData
+ * Jan 14, 2016  #5237     tgurney      Allow outputAsciiGridData to take
+ *                                      OutputStream as well as File
  * 
  * </pre>
  * 
@@ -186,73 +191,78 @@ public class ASCIIGrid {
     }
 
     public void outputAsciiGridData(File outputFile) throws IOException {
-        PrintWriter outputStream = null;
+        try (FileOutputStream outputStream = new FileOutputStream(outputFile)) {
+            outputAsciiGridData(outputFile);
+        }
+    }
 
-        try {
-            outputStream = new PrintWriter(outputFile, "US-ASCII");
+    public void outputAsciiGridData(OutputStream outputStream)
+            throws IOException {
+        try (PrintWriter printStream = new PrintWriter(new OutputStreamWriter(
+                outputStream, "US-ASCII"))) {
 
             // output for each IGridSlice
             for (IGridSlice gs : gridSlices) {
                 // keyword identifying new ASCIIGrid
-                outputStream.println("ASCIIGRID");
+                printStream.println("ASCIIGRID");
 
                 // data type
                 if (gs.getGridInfo().getGridType().equals(GridType.SCALAR)) {
-                    outputStream.println("SCALAR");
+                    printStream.println("SCALAR");
                 } else if (gs.getGridInfo().getGridType()
                         .equals(GridType.VECTOR)) {
-                    outputStream.println("VECTOR");
+                    printStream.println("VECTOR");
                 } else if (gs.getGridInfo().getGridType()
                         .equals(GridType.WEATHER)) {
-                    outputStream.println("WEATHER");
+                    printStream.println("WEATHER");
                 } else if (gs.getGridInfo().getGridType()
                         .equals(GridType.DISCRETE)) {
-                    outputStream.println("DISCRETE");
+                    printStream.println("DISCRETE");
                 } else {
-                    outputStream.println("NONE");
+                    printStream.println("NONE");
                 }
 
                 // parameter name and level
                 if (!gs.getGridInfo().getParmID().getParmLevel()
                         .equals(ParmID.defaultLevel())) {
-                    outputStream
+                    printStream
                             .println(gs.getGridInfo().getParmID().getParmName()
                                     + "_"
                                     + gs.getGridInfo().getParmID()
                                             .getParmLevel());
                 } else {
-                    outputStream.println(gs.getGridInfo().getParmID()
+                    printStream.println(gs.getGridInfo().getParmID()
                             .getParmName());
                 }
 
                 // database site identifier
-                outputStream.println(gs.getGridInfo().getParmID().getDbId()
+                printStream.println(gs.getGridInfo().getParmID().getDbId()
                         .getSiteId());
 
                 // database optional type
                 if (gs.getGridInfo().getParmID().getDbId().getDbType()
                         .equals("")) {
-                    outputStream.println("<notype>");
+                    printStream.println("<notype>");
                 } else {
-                    outputStream.println(gs.getGridInfo().getParmID().getDbId()
+                    printStream.println(gs.getGridInfo().getParmID().getDbId()
                             .getDbType());
                 }
 
                 // database model name
-                outputStream.println(gs.getGridInfo().getParmID().getDbId()
+                printStream.println(gs.getGridInfo().getParmID().getDbId()
                         .getModelName());
 
                 // database time
-                outputStream.println(gs.getGridInfo().getParmID().getDbId()
+                printStream.println(gs.getGridInfo().getParmID().getDbId()
                         .getModelTime());
 
                 // projection identifier
-                outputStream.println(gs.getGridInfo().getGridLoc()
+                printStream.println(gs.getGridInfo().getGridLoc()
                         .getProjection().getProjectionID());
 
                 // grid size (x y), minimum world coordinates (x y),
                 // domain extent (x y)
-                outputStream.println(gs.getGridInfo().getGridLoc().getNx()
+                printStream.println(gs.getGridInfo().getGridLoc().getNx()
                         .toString()
                         + " "
                         + gs.getGridInfo().getGridLoc().getNy().toString()
@@ -265,26 +275,26 @@ public class ASCIIGrid {
                         + " " + gs.getGridInfo().getGridLoc().getExtent().y);
 
                 // units
-                outputStream.println(gs.getGridInfo().getUnitString());
+                printStream.println(gs.getGridInfo().getUnitString());
 
                 // descriptive name
-                outputStream.println(gs.getGridInfo().getDescriptiveName());
+                printStream.println(gs.getGridInfo().getDescriptiveName());
 
                 // minimum possible value, maximum possible value, data
                 // precision,
                 // time independent parameter
-                outputStream.print(gs.getGridInfo().getMinValue() + " "
+                printStream.print(gs.getGridInfo().getMinValue() + " "
                         + gs.getGridInfo().getMaxValue() + " "
                         + gs.getGridInfo().getPrecision() + " ");
                 if (gs.getGridInfo().isTimeIndependentParm()) {
-                    outputStream.print(1);
+                    printStream.print(1);
                 } else {
-                    outputStream.print(0);
+                    printStream.print(0);
                 }
-                outputStream.println();
+                printStream.println();
 
                 // time constraints (startTime, duration, repeatInterval)
-                outputStream.println(gs.getGridInfo().getTimeConstraints()
+                printStream.println(gs.getGridInfo().getTimeConstraints()
                         .getStartTime()
                         + " "
                         + gs.getGridInfo().getTimeConstraints().getDuration()
@@ -293,9 +303,9 @@ public class ASCIIGrid {
                                 .getRepeatInterval());
 
                 // valid time range for grid
-                outputStream.print(validTimeFormat.format(gs.getValidTime()
+                printStream.print(validTimeFormat.format(gs.getValidTime()
                         .getStart()) + " ");
-                outputStream.println(validTimeFormat.format(gs.getValidTime()
+                printStream.println(validTimeFormat.format(gs.getValidTime()
                         .getEnd()));
 
                 // output the grid points
@@ -305,7 +315,7 @@ public class ASCIIGrid {
                     ScalarGridSlice scalar = (ScalarGridSlice) gs;
                     for (int i = scalar.getScalarGrid().getYdim() - 1; i >= 0; i--) {
                         for (int j = 0; j < scalar.getScalarGrid().getXdim(); j++) {
-                            outputStream
+                            printStream
                                     .println(round(
                                             scalar.getScalarGrid().get(j, i),
                                             gs.getGridInfo().getPrecision()));
@@ -316,14 +326,14 @@ public class ASCIIGrid {
                     VectorGridSlice vector = (VectorGridSlice) gs;
                     for (int i = vector.getMagGrid().getYdim() - 1; i >= 0; i--) {
                         for (int j = 0; j < vector.getMagGrid().getXdim(); j++) {
-                            outputStream.print(round(
+                            printStream.print(round(
                                     vector.getMagGrid().get(j, i), gs
                                             .getGridInfo().getPrecision()));
-                            outputStream.print(' ');
-                            outputStream.print(round(
+                            printStream.print(' ');
+                            printStream.print(round(
                                     vector.getDirGrid().get(j, i), gs
                                             .getGridInfo().getPrecision()));
-                            outputStream.println();
+                            printStream.println();
                         }
                     }
                 } else if (gs.getGridInfo().getGridType()
@@ -333,7 +343,7 @@ public class ASCIIGrid {
                         for (int j = 0; j < weather.getWeatherGrid().getXdim(); j++) {
                             String key = weather.getKeys()[weather
                                     .getWeatherGrid().get(j, i)].toString();
-                            outputStream.println(key);
+                            printStream.println(key);
                         }
                     }
                 } else if (gs.getGridInfo().getGridType()
@@ -344,15 +354,11 @@ public class ASCIIGrid {
                                 .getXdim(); j++) {
                             String key = discrete.getKeys()[discrete
                                     .getDiscreteGrid().get(j, i)].toString();
-                            outputStream.println(key);
+                            printStream.println(key);
                         }
                     }
                 }
             }
-        } finally {
-            if (outputStream != null) {
-                outputStream.close();
-            }
         }
     }
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
index 15fce6bad8..ec4afbbf43 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
@@ -20,19 +20,16 @@
 
 package com.raytheon.edex.plugin.gfe.isc;
 
-import java.io.File;
-import java.io.FilenameFilter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import jep.JepException;
 
-import com.raytheon.edex.plugin.gfe.config.GridDbConfig;
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfig;
-import com.raytheon.edex.plugin.gfe.server.IFPServer;
-import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.uf.common.localization.IPathManager;
@@ -45,7 +42,6 @@ import com.raytheon.uf.common.python.PythonScript;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.time.util.TimeUtil;
-import com.raytheon.uf.common.util.FileUtil;
 
 /**
  * Class for interfacing with the IRT server
@@ -63,6 +59,8 @@ import com.raytheon.uf.common.util.FileUtil;
  * Oct 16, 2013 2475       dgilling     Move logic previously in IrtServer.py
  *                                      into this class to avoid Jep memory leak.
  * Mar 11, 2015 4128       dgilling     Refactored to match refactored IRTManager.
+ * Nov 11, 2015 5110       dgilling     Improved logging, moved verification of
+ *                                      ISC sites and parms to IFPServer.
  * 
  * </pre>
  * 
@@ -144,52 +142,30 @@ public final class GfeIRT implements Runnable {
         this.gridBoundBox.add(domain.getExtent().y);
 
         this.parmsWanted = config.requestedISCparms();
-        if (this.parmsWanted.isEmpty()) {
-            List<DatabaseID> dbs = IFPServer.getActiveServer(this.siteID)
-                    .getGridParmMgr().getDbInventory().getPayload();
-            for (DatabaseID dbId : dbs) {
-                if ((dbId.getModelName().equals("ISC"))
-                        && (dbId.getDbType().equals(""))
-                        && (dbId.getSiteId().equals(this.siteID))) {
-                    GridDbConfig gdc = config.gridDbConfig(dbId);
-                    this.parmsWanted = gdc.parmAndLevelList();
-                }
-            }
-            config.setRequestedISCparms(this.parmsWanted);
-        }
-        statusHandler.info("ParmsWanted: " + this.parmsWanted);
-
         this.iscWfosWanted = config.requestedISCsites();
-        if (this.iscWfosWanted.isEmpty()) {
-            List<String> knownSites = config.allSites();
 
-            IPathManager pathMgr = PathManagerFactory.getPathManager();
-            LocalizationContext commonStaticConfig = pathMgr.getContext(
-                    LocalizationType.COMMON_STATIC,
-                    LocalizationLevel.CONFIGURED);
-            commonStaticConfig.setContextName(this.siteID);
-            File editAreaDir = pathMgr.getFile(commonStaticConfig,
-                    "gfe/editAreas");
-
-            FilenameFilter filter = new FilenameFilter() {
-                @Override
-                public boolean accept(File dir, String name) {
-                    return name.trim().matches("ISC_\\p{Alnum}{3}\\.xml");
-                }
-            };
-            List<File> editAreas = FileUtil.listFiles(editAreaDir, filter,
-                    false);
-
-            this.iscWfosWanted = new ArrayList<String>();
-            for (File f : editAreas) {
-                String name = f.getName().replace("ISC_", "")
-                        .replace(".xml", "");
-                if (knownSites.contains(name)) {
-                    iscWfosWanted.add(name);
-                }
-            }
-            config.setRequestedISCsites(this.iscWfosWanted);
+        // log the information
+        StringBuilder o = new StringBuilder(
+                "IRT (ISC Routing Table) Registration Information");
+        Map<String, String> addresses = config.iscRoutingTableAddress();
+        SortedSet<String> sorted = new TreeSet<>(addresses.keySet());
+        for (String key : sorted) {
+            String value = addresses.get(key);
+            o.append("\nIRTAddress:      ").append(key).append(' ')
+                    .append(value);
         }
+        o.append("\nRequestISC flag: ").append(config.requestISC());
+        o.append("\nMHS id:          ").append(mhsID);
+        o.append("\nServerHost:      ").append(serverHost);
+        o.append("\nServerPort:      ").append(serverPort);
+        o.append("\nServerProtocol:  ").append(serverProtocol);
+        o.append("\nSite:            ").append(siteID);
+        o.append("\nGridDims:        ").append(gridDims);
+        o.append("\nGridProj:        ").append(gridProj);
+        o.append("\nGridBoundBox:    ").append(gridBoundBox);
+        o.append("\nParmsWanted:     ").append(parmsWanted);
+        o.append("\nISCwfosWanted:   ").append(iscWfosWanted);
+        statusHandler.info(o.toString());
     }
 
     @Override
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IRTManager.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IRTManager.java
index 4708346d70..aa1d66eb68 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IRTManager.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IRTManager.java
@@ -48,6 +48,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * 08/10/09     1995       bphillip    Initial creation
  * 06/13/13     2044       randerso    Refactored to use IFPServer
  * 03/11/15     4128       dgilling    Refactored to use ISCServiceProvider.
+ * 11/11/15     5110       dgilling    Fix copy/paste error in log message.
  * 
  * </pre>
  * 
@@ -119,7 +120,8 @@ public final class IRTManager {
                 irtMap.put(siteID, future);
             } catch (RejectedExecutionException e) {
                 statusHandler.handle(Priority.PROBLEM,
-                        "Unable to submit fetchAT job for execution:", e);
+                        "Unable to submit IRT registration job for execution:",
+                        e);
                 irtMap.remove(siteID);
             }
         }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscReceiveSrv.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscReceiveSrv.java
index ed3ae70482..f71801b4d6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscReceiveSrv.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscReceiveSrv.java
@@ -148,7 +148,7 @@ public class IscReceiveSrv {
             IscScriptExecutor executor = new IscScriptExecutor(METHOD_NAME,
                     siteArgs.getKey(), args);
             try {
-                threadPool.submitAsyncJob(executor, jobListener);
+                threadPool.submitJobWithCallback(executor, jobListener);
             } catch (Exception e) {
                 statusHandler
                         .handle(Priority.PROBLEM,
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscScriptFactory.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscScriptFactory.java
index a8ad2e9a85..1502851a00 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscScriptFactory.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscScriptFactory.java
@@ -21,10 +21,9 @@ package com.raytheon.edex.plugin.gfe.isc;
 
 import jep.JepException;
 
-import com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory;
+import com.raytheon.uf.common.python.concurrent.PythonInterpreterFactory;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
  * Instantiates a {@link IscScript} on a separate thread.
@@ -36,6 +35,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 11, 2013            dgilling     Initial creation
+ * Dec 14, 2015  #4816     dgilling     Support refactored PythonJobCoordinator API.
  * 
  * </pre>
  * 
@@ -43,35 +43,35 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * @version 1.0
  */
 
-public class IscScriptFactory extends AbstractPythonScriptFactory<IscScript> {
+public class IscScriptFactory implements PythonInterpreterFactory<IscScript> {
 
     private static final IUFStatusHandler statusHandler = UFStatus
             .getHandler(IscScriptFactory.class);
 
     private static final String SCRIPT_EXTENSION = ".py";
 
+    private final String name;
+
     /**
+     * Construct a new script factory for the python module with the specified
+     * name.
+     * 
      * @param name
-     * @param maxThreads
+     *            The name of the python module (minus the .py extension) that
+     *            this factory will build {@code IscScript} instances for.
      */
-    public IscScriptFactory(String name, int maxThreads) {
-        super(name, maxThreads);
+    public IscScriptFactory(String name) {
+        this.name = name;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.python.concurrent.AbstractPythonScriptFactory#
-     * createPythonScript()
-     */
     @Override
     public IscScript createPythonScript() {
         try {
-            return new IscScript(getName() + SCRIPT_EXTENSION);
+            return new IscScript(name + SCRIPT_EXTENSION);
         } catch (JepException e) {
-            statusHandler.handle(Priority.ERROR,
-                    "Unable to create GFE ISC script [" + getName() + "]", e);
+            statusHandler
+                    .error(String.format(
+                            "Unable to create GFE ISC script [%s]", name), e);
         }
         return null;
     }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscServiceProvider.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscServiceProvider.java
index 03ba2e2d26..1c3e912628 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscServiceProvider.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscServiceProvider.java
@@ -24,6 +24,8 @@ import java.util.Collection;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfig;
 import com.raytheon.edex.plugin.gfe.server.IFPServer;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -41,6 +43,8 @@ import com.raytheon.uf.edex.core.IContextStateProcessor;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 11, 2015  #4128     dgilling     Initial creation
+ * Nov 11, 2015  #5110     dgilling     Fixed activation check in activateSite
+ *                                      to better match A1.
  * 
  * </pre>
  * 
@@ -161,7 +165,11 @@ public final class IscServiceProvider implements IContextStateProcessor {
     public void activateSite(final String siteID, final IFPServerConfig config) {
         statusHandler.info("Checking ISC configuration for site " + siteID);
 
-        if (config.requestISC()) {
+        String irtAddress = config.iscRoutingTableAddress().get("ANCF");
+        if ((config.iscRoutingTableAddress().containsKey("ANCF"))
+                && (config.iscRoutingTableAddress().containsKey("BNCF"))
+                && (StringUtils.isNotBlank(irtAddress))
+                && (config.requestISC())) {
             if (activeInstance) {
                 statusHandler.info("Enabling ISC for site " + siteID);
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/log/EdexLogStream.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/log/EdexLogStream.java
index 126c8d55c8..5a594eb382 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/log/EdexLogStream.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/log/EdexLogStream.java
@@ -19,17 +19,18 @@
  **/
 package com.raytheon.edex.plugin.gfe.log;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Used by python code where old GFE called into static LogStream
  * 
  * <pre>
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * May 14, 2008				njensen	    Initial creation
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * May 14, 2008            njensen     Initial creation
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -39,7 +40,8 @@ import org.apache.commons.logging.LogFactory;
 
 public class EdexLogStream {
 
-    private static final Log logger = LogFactory.getLog(EdexLogStream.class);
+    private static final Logger logger = LoggerFactory
+            .getLogger(EdexLogStream.class);
 
     public static void logEvent(String message) {
         if (logger.isInfoEnabled()) {
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/GridParamInfoLookup.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/GridParamInfoLookup.java
index 35314e444e..c4f048ae20 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/GridParamInfoLookup.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/paraminfo/GridParamInfoLookup.java
@@ -61,6 +61,8 @@ import com.raytheon.uf.common.util.mapping.MultipleMappingException;
  * Oct 14, 2013  2473     bsteffen    Remove lookup of deprecated grib files.
  * Jun 05, 2015  4495     njensen     Improved error message
  * Jul 13, 2015  4537     randerso    Removed unused function
+ * Jan 27, 2016  5237     tgurney     Remove deprecated LocalizationFile
+ *                                    method call
  * 
  * </pre>
  * 
@@ -190,7 +192,7 @@ public class GridParamInfoLookup {
             } catch (JAXBException e) {
                 statusHandler.handle(Priority.PROBLEM,
                         "Error unmarshalling grid parameter information from file "
-                                + file.getName(), e);
+                                + file.getPath(), e);
             }
         }
         for (GridParamInfo gridParamInfo : modelParamMap.values()) {
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/ReferenceMgr.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/ReferenceMgr.java
index eb69d259a5..55dc65acdb 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/ReferenceMgr.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/ReferenceMgr.java
@@ -57,6 +57,8 @@ import com.raytheon.uf.common.util.FileUtil;
  * Feb 19, 2015       4125 rjpeter     Fix jaxb performance issue
  * Apr 10, 2015       4383 dgilling    Fix getData so it searches correct localization
  *                                     directories for secondary sites.
+ * Jan 27, 2016       5237 tgurney     Remove deprecated LocalizationFile
+ *                                     method call
  * 
  * </pre>
  * 
@@ -93,7 +95,7 @@ public class ReferenceMgr {
                 new String[] { ".xml" }, false, true);
         if (contents != null) {
             for (LocalizationFile lf : contents) {
-                String s = LocalizationUtil.extractName(lf.getName());
+                String s = LocalizationUtil.extractName(lf.getPath());
                 String area = s.replace(".xml", "");
                 refIDs.add(new ReferenceID(area, lf.isProtected(), lf
                         .getContext().getLocalizationLevel()));
@@ -163,11 +165,6 @@ public class ReferenceMgr {
         return sr;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
     @Override
     public String toString() {
         return "ReferenceMgr [" + dbGridLocation.getSiteId() + "]";
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
index 5299f30b47..15c65d0cc7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
@@ -138,6 +138,8 @@ import com.raytheon.uf.edex.database.purge.PurgeLogger;
  *                                     ingested while deactivated gets recognized
  * 10/27/2014   #3766      randerso    Fixed return type and javadoc for createNewDb
  * 03/05/2015   #4169      randerso    Fix error handling in getDatabase
+ * 11/17/2015   #5129      dgilling    Ensure ServerResponse payload is always
+ *                                     populated when calling getGridHistory.
  * 12/03/2015   #5168      randerso    Added check to skip running smartInit for static data at non-zero fcsthr
  * 
  * </pre>
@@ -302,11 +304,17 @@ public class GridParmManager {
     public ServerResponse<Map<TimeRange, List<GridDataHistory>>> getGridHistory(
             ParmID parmId, List<TimeRange> trs) {
         ServerResponse<Map<TimeRange, List<GridDataHistory>>> sr = new ServerResponse<Map<TimeRange, List<GridDataHistory>>>();
+        Map<TimeRange, List<GridDataHistory>> history = Collections.emptyMap();
 
         try {
             GridParm gp = gridParm(parmId);
             if (gp.isValid()) {
-                sr = gp.getGridHistory(trs);
+                ServerResponse<Map<TimeRange, List<GridDataHistory>>> ssr = gp
+                        .getGridHistory(trs);
+                sr.addMessages(ssr);
+                if (ssr.getPayload() != null) {
+                    history = ssr.getPayload();
+                }
             } else {
                 sr.addMessage("Unknown Parm: " + parmId
                         + " in getGridInventory()");
@@ -317,6 +325,7 @@ public class GridParmManager {
                     + " in getGridInventory()", e);
         }
 
+        sr.setPayload(history);
         return sr;
     }
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/IFPServer.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/IFPServer.java
index 823f5552ae..70c6309c46 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/IFPServer.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/IFPServer.java
@@ -19,6 +19,10 @@
  **/
 package com.raytheon.edex.plugin.gfe.server;
 
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -26,8 +30,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import com.raytheon.edex.plugin.gfe.cache.gridlocations.GridLocationCache;
+import com.raytheon.edex.plugin.gfe.config.GridDbConfig;
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfig;
 import com.raytheon.edex.plugin.gfe.db.dao.IscSendRecordDao;
 import com.raytheon.edex.plugin.gfe.reference.MapManager;
@@ -35,6 +42,7 @@ import com.raytheon.edex.plugin.gfe.server.database.NetCDFDatabaseManager;
 import com.raytheon.edex.plugin.gfe.server.database.TopoDatabaseManager;
 import com.raytheon.edex.plugin.gfe.server.lock.LockManager;
 import com.raytheon.uf.common.dataplugin.PluginException;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
 import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
@@ -43,8 +51,14 @@ import com.raytheon.uf.common.dataplugin.gfe.slice.ScalarGridSlice;
 import com.raytheon.uf.common.dataplugin.grid.GridRecord;
 import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
 import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord;
+import com.raytheon.uf.common.localization.IPathManager;
+import com.raytheon.uf.common.localization.LocalizationContext;
+import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
+import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
+import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.util.StringUtil;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
 
 /**
@@ -62,6 +76,7 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
  * Nov 20, 2013  #2331     randerso    Added getTopoData method
  * Oct 07, 2014  #3684     randerso    Restructured IFPServer start up
  * Mar 11, 2015  #4128     dgilling    Remove unregister from IRT to IRTManager.
+ * Nov 11, 2015  #5110     dgilling    Add initIRT.
  * 
  * </pre>
  * 
@@ -206,6 +221,8 @@ public class IFPServer {
         new MapManager(config);
 
         this.gridParmMgr = new GridParmManager(siteId, config);
+
+        initIRT();
     }
 
     private void dispose() {
@@ -339,4 +356,93 @@ public class IFPServer {
         return getTopoMgr().getTopoData(gloc);
     }
 
+    private void initIRT() {
+        /*
+         * no web address or request not enabled, so no need to verify ISC
+         * configuraation
+         */
+        String irtAddress = config.iscRoutingTableAddress().get("ANCF");
+        if ((!config.iscRoutingTableAddress().containsKey("ANCF"))
+                || (!config.iscRoutingTableAddress().containsKey("BNCF"))
+                || (StringUtil.isEmptyString(irtAddress))
+                || (!config.requestISC())) {
+            StringBuilder oz = new StringBuilder(
+                    "IRT (ISC Routing Table) Registration Information");
+            Map<String, String> addresses = config.iscRoutingTableAddress();
+            SortedSet<String> sorted = new TreeSet<>(addresses.keySet());
+            for (String key : sorted) {
+                String value = addresses.get(key);
+                oz.append("\nIRTAddress:      ").append(key).append(' ')
+                        .append(value);
+            }
+            oz.append("\nRequestISC flag: ").append(config.requestISC());
+
+            statusHandler.info(oz.toString());
+        }
+
+        // determine which parms are wanted
+        List<String> parmsWanted = config.requestedISCparms();
+        if (parmsWanted.isEmpty()) {
+            // get known list of databases
+            List<DatabaseID> dbs = getGridParmMgr().getDbInventory()
+                    .getPayload();
+
+            // find the ISC database
+            for (DatabaseID dbId : dbs) {
+                if ((dbId.getModelName().equals("ISC"))
+                        && (dbId.getDbType().equals(""))
+                        && (dbId.getSiteId().equals(siteId))) {
+                    GridDbConfig gdc = config.gridDbConfig(dbId);
+                    parmsWanted = gdc.parmAndLevelList();
+                    break;
+                }
+            }
+
+            statusHandler.info("ParmsWanted: " + parmsWanted);
+            config.setRequestedISCparms(parmsWanted);
+        }
+
+        // determine isc areas that are wanted
+        List<String> iscWfosWanted = config.requestedISCsites();
+        if (iscWfosWanted.isEmpty()) {
+            IPathManager pathMgr = PathManagerFactory.getPathManager();
+            LocalizationContext commonStaticConfig = pathMgr.getContext(
+                    LocalizationType.COMMON_STATIC,
+                    LocalizationLevel.CONFIGURED);
+            commonStaticConfig.setContextName(siteId);
+
+            DirectoryStream.Filter<Path> filter = new DirectoryStream.Filter<Path>() {
+
+                @Override
+                public boolean accept(Path entry) throws IOException {
+                    Path fileName = entry.getFileName();
+                    if (fileName != null) {
+                        return fileName.toString().matches(
+                                "ISC_\\p{Alnum}{3}\\.xml");
+                    }
+                    return false;
+                }
+            };
+
+            Path editAreaDir = pathMgr.getFile(commonStaticConfig,
+                    "gfe" + IPathManager.SEPARATOR + "editAreas").toPath();
+            iscWfosWanted = new ArrayList<String>();
+            try (DirectoryStream<Path> stream = Files.newDirectoryStream(
+                    editAreaDir, filter)) {
+                List<String> knownSites = config.allSites();
+
+                for (Path editArea : stream) {
+                    String name = editArea.getFileName().toString()
+                            .replace("ISC_", "").replace(".xml", "");
+                    if (knownSites.contains(name)) {
+                        iscWfosWanted.add(name);
+                    }
+                }
+            } catch (IOException e) {
+                statusHandler.error(
+                        "Unable to retrieve list of ISC edit areas.", e);
+            }
+            config.setRequestedISCsites(iscWfosWanted);
+        }
+    }
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DSatDatabase.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DSatDatabase.java
index 3412048d7b..37dfb5ae41 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DSatDatabase.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DSatDatabase.java
@@ -20,6 +20,7 @@
 package com.raytheon.edex.plugin.gfe.server.database;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -62,6 +63,8 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
  * Oct 10  2012  #1260     randerso    Added code to set valid flag
  * May 02  2013  #1969     randerso    Removed unnecessary updateDbs method
  * Jun 13  2013  #2044     randerso    Added getDbId and update methods
+ * Nov 17  2015  #5129     dgilling    Ensure ServerResponse payload is always
+ *                                     populated when calling getGridHistory.
  * 
  * </pre>
  * 
@@ -175,6 +178,8 @@ public class D2DSatDatabase extends VGridDatabase {
             return p.getGridHistory(trs);
         }
         ServerResponse<Map<TimeRange, List<GridDataHistory>>> sr = new ServerResponse<Map<TimeRange, List<GridDataHistory>>>();
+        Map<TimeRange, List<GridDataHistory>> history = Collections.emptyMap();
+        sr.setPayload(history);
         sr.addMessage("Parm not found: " + id);
         return sr;
     }
@@ -256,7 +261,8 @@ public class D2DSatDatabase extends VGridDatabase {
     public GridUpdateNotification update(SatelliteRecord record) {
         GridUpdateNotification notify = null;
 
-        String productId = record.getSectorID() + "/" + record.getPhysicalElement();
+        String productId = record.getSectorID() + "/"
+                + record.getPhysicalElement();
         D2DSatParm satParm = idToParm.get(productId);
         if (satParm != null) {
             notify = satParm.update(record);
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
index b04c5f5e52..95f4288c64 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
@@ -118,6 +118,8 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
  * 09/21/2014   #3648      randerso    Changed deleteDatabase to handle database already being deleted by other JVM
  * 01/13/2015   #3955      randerso    Changed a few private methods to protected to allow TopoDatabase to subclass IFPGridDatabase
  * 10/13/2015   16938      ryu         Remove existing HDF5 data before calling saveGridsToHdf5 when storage type changed
+ * 11/17/2015   #5129      dgilling    Ensure ServerResponse payload is always
+ *                                     populated when calling getGridHistory.
  * 
  * </pre>
  * 
@@ -643,10 +645,9 @@ public class IFPGridDatabase extends GridDatabase {
     public ServerResponse<Map<TimeRange, List<GridDataHistory>>> getGridHistory(
             ParmID id, List<TimeRange> trs) {
         ServerResponse<Map<TimeRange, List<GridDataHistory>>> sr = new ServerResponse<Map<TimeRange, List<GridDataHistory>>>();
+        Map<TimeRange, List<GridDataHistory>> history = Collections.emptyMap();
         try {
-            Map<TimeRange, List<GridDataHistory>> history = dao.getGridHistory(
-                    getCachedParmID(id), trs);
-            sr.setPayload(history);
+            history = dao.getGridHistory(getCachedParmID(id), trs);
         } catch (DataAccessLayerException e) {
             sr.addMessage("Error getting grid history for: " + id + "\n"
                     + e.getLocalizedMessage());
@@ -656,6 +657,7 @@ public class IFPGridDatabase extends GridDatabase {
             statusHandler.handle(Priority.PROBLEM, "Unknown parmId: " + id, e);
         }
 
+        sr.setPayload(history);
         return sr;
     }
 
@@ -1935,8 +1937,10 @@ public class IFPGridDatabase extends GridDatabase {
                                     VECTOR_DIR_DATA_OFFSET,
                                     VECTOR_DIR_DATA_MULTIPLIER,
                                     magStorageInfo.getStorageType());
-                            recs[0] = storageToFloat(magRec, magStorageInfo, false);
-                            recs[1] = storageToFloat(dirRec, dirStorageInfo, true);
+                            recs[0] = storageToFloat(magRec, magStorageInfo,
+                                    false);
+                            recs[1] = storageToFloat(dirRec, dirStorageInfo,
+                                    true);
                         }
 
                         records.put(timeRange, recs);
@@ -1974,8 +1978,7 @@ public class IFPGridDatabase extends GridDatabase {
      *         conversion in parmStorageInfo.
      */
     protected FloatDataRecord storageToFloat(IDataRecord rawData,
-            ParmStorageInfo parmStorageInfo, 
-            boolean isDirRecord) {
+            ParmStorageInfo parmStorageInfo, boolean isDirRecord) {
         FloatDataRecord data;
         String storageType = parmStorageInfo.getStorageType();
         float multiplier = parmStorageInfo.getDataMultiplier();
@@ -1986,10 +1989,12 @@ public class IFPGridDatabase extends GridDatabase {
             floats = new float[rawBytes.length];
             for (int idx = 0; idx < rawBytes.length; idx++) {
                 // hex mask to treat bytes as unsigned
-                if (isDirRecord)
+                if (isDirRecord) {
                     floats[idx] = (((rawBytes[idx] & 0xff) / multiplier) + offset) % 360.0f;
-                else
-                    floats[idx] = ((rawBytes[idx] & 0xff) / multiplier) + offset;
+                } else {
+                    floats[idx] = ((rawBytes[idx] & 0xff) / multiplier)
+                            + offset;
+                }
             }
         } else if ("short".equals(storageType)) {
             short[] rawShorts = ((ShortDataRecord) rawData).getShortData();
@@ -2096,13 +2101,13 @@ public class IFPGridDatabase extends GridDatabase {
     /**
      * Removes records of a single parm from the HDF5 repository. If the records
      * do not exist in the HDF5, the operation is ignored.
-     *
+     * 
      * @param records
      *            The records to be removed
      */
     private void removeFromHDF5(List<GFERecord> records) {
         List<TimeRange> times = new ArrayList<TimeRange>(records.size());
-        for (GFERecord record: records) {
+        for (GFERecord record : records) {
             times.add(record.getTimeRange());
         }
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/CommitGridsHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/CommitGridsHandler.java
index 23cf14f815..fb0b730ad7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/CommitGridsHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/CommitGridsHandler.java
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfig;
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager;
@@ -57,10 +57,11 @@ import com.raytheon.uf.common.time.util.TimeUtil;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 04/08/08     #875       bphillip    Initial Creation
- * 06/16/09                 njensen    Send notifications
+ * 06/16/09                njensen     Send notifications
  * 09/22/09     3058       rjpeter     Converted to IRequestHandler
- * 03/17/13     1773       njensen   Log performance
+ * 03/17/13     1773       njensen     Log performance
  * 06/13/13     2044       randerso    Refactored to use IFPServer
+ * 12/15/15     5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author bphillip
@@ -68,7 +69,8 @@ import com.raytheon.uf.common.time.util.TimeUtil;
  */
 public class CommitGridsHandler extends BaseGfeRequestHandler implements
         IRequestHandler<CommitGridsRequest> {
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     private final IPerformanceStatusHandler perfLog = PerformanceStatus
             .getHandler("GFE:");
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIfpNetCDFGridRequestHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIfpNetCDFGridRequestHandler.java
index d4041cff9e..65b0aa6126 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIfpNetCDFGridRequestHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIfpNetCDFGridRequestHandler.java
@@ -21,6 +21,7 @@ package com.raytheon.edex.plugin.gfe.server.handler;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Future;
 
 import com.raytheon.edex.plugin.gfe.isc.IscScript;
 import com.raytheon.edex.plugin.gfe.isc.IscScriptExecutor;
@@ -107,8 +108,9 @@ public class ExecuteIfpNetCDFGridRequestHandler implements
         args.put("siteIdOverride", request.getSiteIdOverride());
         IscScriptExecutor executor = new IscScriptExecutor(METHOD_NAME,
                 request.getSiteID(), args);
-        String retVal = threadPool.submitSyncJob(executor);
+        Future<String> task = threadPool.submitJob(executor);
 
+        String retVal = task.get();
         if (retVal != null) {
             sr.addMessage(retVal);
             return sr;
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIscMosaicRequestHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIscMosaicRequestHandler.java
index 230d17c7ad..0c83e9218c 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIscMosaicRequestHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/ExecuteIscMosaicRequestHandler.java
@@ -2,6 +2,7 @@ package com.raytheon.edex.plugin.gfe.server.handler;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.Future;
 
 import com.raytheon.edex.plugin.gfe.isc.IscScript;
 import com.raytheon.edex.plugin.gfe.isc.IscScriptExecutor;
@@ -76,8 +77,9 @@ public class ExecuteIscMosaicRequestHandler implements
 
         IscScriptExecutor executor = new IscScriptExecutor(METHOD_NAME,
                 request.getSiteID(), args);
-        String retVal = threadPool.submitSyncJob(executor);
+        Future<String> task = threadPool.submitJob(executor);
 
+        String retVal = task.get();
         if (retVal != null) {
             sr.addMessage(retVal);
             return sr;
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetASCIIGridsHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetASCIIGridsHandler.java
index 84aaba9393..cf1c85078e 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetASCIIGridsHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetASCIIGridsHandler.java
@@ -32,27 +32,31 @@ import com.raytheon.uf.common.dataplugin.gfe.request.GetASCIIGridsRequest;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.dataplugin.gfe.server.request.GetGridRequest;
 import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.message.WsId;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 import com.raytheon.uf.common.time.TimeRange;
 
 /**
- * TODO Add Description
+ * Takes temporary grid in ASCII format, converts to GridSlice, and saves to
+ * requested database.
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Apr 14, 2011  #8983     dgilling     Initial creation
- * Jun 13, 2013     #2044  randerso     Refactored to use IFPServer
+ * Date         Ticket#    Engineer     Description
+ * ------------ ---------- -----------  --------------------------
+ * Apr 14, 2011 8983       dgilling     Initial creation
+ * Jun 13, 2013 2044       randerso     Refactored to use IFPServer
+ * Jan 08, 2016 5237       tgurney      Replace calls to deprecated methods of
+ *                                      LocalizationFile + add desc in javadoc
  * 
  * </pre>
  * 
@@ -63,13 +67,6 @@ import com.raytheon.uf.common.time.TimeRange;
 public class GetASCIIGridsHandler extends BaseGfeRequestHandler implements
         IRequestHandler<GetASCIIGridsRequest> {
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.serialization.comm.IRequestHandler#handleRequest
-     * (com.raytheon.uf.common.serialization.comm.IServerRequest)
-     */
     @Override
     public ServerResponse<String> handleRequest(GetASCIIGridsRequest request)
             throws Exception {
@@ -84,11 +81,13 @@ public class GetASCIIGridsHandler extends BaseGfeRequestHandler implements
         ASCIIGrid aGrid = new ASCIIGrid(gridSlices,
                 request.getCoordConversionString(), request.getSiteID());
 
-        LocalizationFile tempFile = getTempFile(request.getWorkstationID());
-        aGrid.outputAsciiGridData(tempFile.getFile());
-        tempFile.save();
+        ILocalizationFile tempFile = getTempFile(request.getWorkstationID());
+        try (SaveableOutputStream tempFileStream = tempFile.openOutputStream()) {
+            aGrid.outputAsciiGridData(tempFileStream);
+            tempFileStream.save();
+        }
 
-        sr.setPayload(tempFile.getName());
+        sr.setPayload(tempFile.getPath());
 
         return sr;
     }
@@ -187,7 +186,7 @@ public class GetASCIIGridsHandler extends BaseGfeRequestHandler implements
         return limitTime.contains(t);
     }
 
-    private LocalizationFile getTempFile(WsId requestor) throws IOException {
+    private ILocalizationFile getTempFile(WsId requestor) throws IOException {
         IPathManager pathManager = PathManagerFactory.getPathManager();
         LocalizationContext ctx = pathManager.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.USER);
@@ -199,7 +198,7 @@ public class GetASCIIGridsHandler extends BaseGfeRequestHandler implements
         }
 
         File tmpFile = File.createTempFile("ifpAG", ".txt", parentDir);
-        LocalizationFile locTmpFile = pathManager.getLocalizationFile(ctx,
+        ILocalizationFile locTmpFile = pathManager.getLocalizationFile(ctx,
                 "/gfe/ifpAG/" + tmpFile.getName());
 
         return locTmpFile;
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetDiscreteDefinitionHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetDiscreteDefinitionHandler.java
index 2a929d49d1..8cb9303586 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetDiscreteDefinitionHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetDiscreteDefinitionHandler.java
@@ -20,8 +20,8 @@
 
 package com.raytheon.edex.plugin.gfe.server.handler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager;
 import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteDefinition;
@@ -37,8 +37,9 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 05/08/08     #1086      dfitch      Initial Creation
+ * 05/08/08     1086       dfitch      Initial Creation
  * 09/22/09     3058       rjpeter     Converted to IRequestHandler
+ * 12/15/15     5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author dfitch
@@ -46,7 +47,8 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  */
 public class GetDiscreteDefinitionHandler implements
         IRequestHandler<GetDiscreteDefinitionRequest> {
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     @Override
     public ServerResponse<DiscreteDefinition> handleRequest(
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetIscSendStatusHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetIscSendStatusHandler.java
index 3abaa809c7..f6941ae01f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetIscSendStatusHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetIscSendStatusHandler.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.edex.plugin.gfe.server.handler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfig;
 import com.raytheon.edex.plugin.gfe.server.IFPServer;
@@ -38,8 +38,9 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jan 21, 2011      #4686 randerso     Initial creation
- * Jun 13, 2013     #2044  randerso     Refactored to use IFPServer
+ * Jan 21, 2011 4686       randerso    Initial creation
+ * Jun 13, 2013 2044       randerso    Refactored to use IFPServer
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -49,7 +50,8 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 
 public class GetIscSendStatusHandler extends BaseGfeRequestHandler implements
         IRequestHandler<GetIscSendStatusRequest> {
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     /*
      * (non-Javadoc)
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetKnownOfficeTypesHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetKnownOfficeTypesHandler.java
index 055b861fc9..7e12edd4a1 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetKnownOfficeTypesHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetKnownOfficeTypesHandler.java
@@ -20,13 +20,11 @@
 
 package com.raytheon.edex.plugin.gfe.server.handler;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager;
-import com.raytheon.edex.plugin.gfe.exception.GfeConfigurationException;
+import com.raytheon.edex.plugin.gfe.config.IFPServerConfig;
 import com.raytheon.uf.common.dataplugin.gfe.request.GetKnownOfficeTypesRequest;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
@@ -42,30 +40,28 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * ------------ ----------  ----------- --------------------------
  * 07/15/09      1995       bphillip    Initial release
  * 09/22/09      3058       rjpeter     Converted to IRequestHandler
+ * 11/18/15      5129       dgilling    Rewritten to better match A1.
  * </pre>
  * 
  * @author bphillip
  * @version 1
  */
-public class GetKnownOfficeTypesHandler implements
+public class GetKnownOfficeTypesHandler extends BaseGfeRequestHandler implements
         IRequestHandler<GetKnownOfficeTypesRequest> {
-    protected final transient Log logger = LogFactory.getLog(getClass());
 
     @Override
-    public ServerResponse<List<String>> handleRequest(
+    public ServerResponse<Map<String, String>> handleRequest(
             GetKnownOfficeTypesRequest request) throws Exception {
-        ServerResponse<List<String>> sr = null;
-        try {
-            sr = new ServerResponse<List<String>>();
-            List<String> officeTypes = IFPServerConfigManager.getServerConfig(
-                    request.getSiteID()).officeTypes();
-            sr.setPayload(officeTypes);
-        } catch (GfeConfigurationException e) {
-            logger.error("Error getting known sites", e);
-            sr = new ServerResponse<List<String>>();
-            sr.addMessage("Error getting known sites");
+        IFPServerConfig config = getIfpServer(request).getConfig();
+        List<String> ids = config.allSites();
+        List<String> officeTypes = config.officeTypes();
+        Map<String, String> sitesWithOfficeType = new HashMap<>();
+        for (int i = 0; i < ids.size(); i++) {
+            sitesWithOfficeType.put(ids.get(i), officeTypes.get(i));
         }
+
+        ServerResponse<Map<String, String>> sr = new ServerResponse<>();
+        sr.setPayload(sitesWithOfficeType);
         return sr;
     }
-
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetKnownSitesHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetKnownSitesHandler.java
index c4fa6819d3..7350ff29e0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetKnownSitesHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetKnownSitesHandler.java
@@ -22,11 +22,6 @@ package com.raytheon.edex.plugin.gfe.server.handler;
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager;
-import com.raytheon.edex.plugin.gfe.exception.GfeConfigurationException;
 import com.raytheon.uf.common.dataplugin.gfe.request.GetKnownSitesRequest;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
@@ -47,25 +42,15 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * @author bphillip
  * @version 1
  */
-public class GetKnownSitesHandler implements
+public class GetKnownSitesHandler extends BaseGfeRequestHandler implements
         IRequestHandler<GetKnownSitesRequest> {
-    protected final transient Log logger = LogFactory.getLog(getClass());
 
     @Override
     public ServerResponse<List<String>> handleRequest(
             GetKnownSitesRequest request) throws Exception {
-        ServerResponse<List<String>> sr = null;
-        try {
-            sr = new ServerResponse<List<String>>();
-            List<String> sites = IFPServerConfigManager.getServerConfig(
-                    request.getSiteID()).allSites();
-            sr.setPayload(sites);
-        } catch (GfeConfigurationException e) {
-            logger.error("Error getting known sites", e);
-            sr = new ServerResponse<List<String>>();
-            sr.addMessage("Error getting known sites");
-        }
+        List<String> ids = getIfpServer(request).getConfig().allSites();
+        ServerResponse<List<String>> sr = new ServerResponse<>();
+        sr.setPayload(ids);
         return sr;
     }
-
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetOfficeTypeHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetOfficeTypeHandler.java
index 34e744d037..aa9053743c 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetOfficeTypeHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetOfficeTypeHandler.java
@@ -22,8 +22,8 @@ package com.raytheon.edex.plugin.gfe.server.handler;
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager;
 import com.raytheon.edex.plugin.gfe.exception.GfeConfigurationException;
@@ -40,8 +40,9 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * 
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
- * 07/15/09      1995       bphillip    Initial release
- * 09/22/09      3058       rjpeter     Converted to IRequestHandler
+ * 07/15/09     1995        bphillip    Initial release
+ * 09/22/09     3058        rjpeter     Converted to IRequestHandler
+ * 12/15/15     5166        kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author bphillip
@@ -49,7 +50,8 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  */
 public class GetOfficeTypeHandler implements
         IRequestHandler<GetOfficeTypeRequest> {
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     @Override
     public ServerResponse<String> handleRequest(GetOfficeTypeRequest request)
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetSiteTimeZoneInfoRequestHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetSiteTimeZoneInfoRequestHandler.java
index 767840bc61..7c9821f8a2 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetSiteTimeZoneInfoRequestHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetSiteTimeZoneInfoRequestHandler.java
@@ -19,6 +19,7 @@
  **/
 package com.raytheon.edex.plugin.gfe.server.handler;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -30,7 +31,8 @@ import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 
 /**
- * TODO Add Description
+ * Returns the time zones associated with the given sites. The site must be
+ * activated to get a result.
  * 
  * <pre>
  * 
@@ -40,6 +42,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * ------------ ---------- ----------- --------------------------
  * Jan 19, 2011            dgilling     Initial creation
  * Feb 26, 2015  #4128     dgilling     Switch to IFPServer.getActiveSites().
+ * Nov 17, 2015  #5129     dgilling     Support changes to GetSiteTimeZoneInfoRequest.
  * 
  * </pre>
  * 
@@ -61,19 +64,25 @@ public class GetSiteTimeZoneInfoRequestHandler implements
     public ServerResponse<Map<String, String>> handleRequest(
             GetSiteTimeZoneInfoRequest request) throws Exception {
         ServerResponse<Map<String, String>> sr = new ServerResponse<Map<String, String>>();
-
-        Set<String> sites = IFPServer.getActiveSites();
         Map<String, String> siteWithTimeZone = new HashMap<String, String>();
-        for (String site : sites) {
-            // getTimeZones() seems to only ever return a 1 sized List
-            // containing the site's time zone
-            siteWithTimeZone.put(site,
-                    IFPServerConfigManager.getServerConfig(site).getTimeZones()
-                            .get(0));
-        }
-        sr.setPayload(siteWithTimeZone);
 
+        Set<String> activeSites = IFPServer.getActiveSites();
+
+        for (String site : request.getRequestedSiteIDs()) {
+            if (activeSites.contains(site)) {
+                siteWithTimeZone.put(site, IFPServerConfigManager
+                        .getServerConfig(site).getTimeZones().get(0));
+            } else {
+                String message = String.format(
+                        "Unknown site id: %s Known sites: %s", site,
+                        activeSites);
+                sr.addMessage(message);
+                siteWithTimeZone = Collections.emptyMap();
+                break;
+            }
+        }
+
+        sr.setPayload(siteWithTimeZone);
         return sr;
     }
-
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetWXDefinitionHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetWXDefinitionHandler.java
index 93e7f2d3c1..64a260a436 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetWXDefinitionHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GetWXDefinitionHandler.java
@@ -20,8 +20,8 @@
 
 package com.raytheon.edex.plugin.gfe.server.handler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager;
 import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
@@ -37,8 +37,9 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 05/08/08     #1086      dfitch      Initial Creation
+ * 05/08/08     1086       dfitch      Initial Creation
  * 09/22/09     3058       rjpeter     Converted to IRequestHandler
+ * 12/15/15     5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author dfitch
@@ -46,7 +47,8 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  */
 public class GetWXDefinitionHandler implements
         IRequestHandler<GetWXDefinitionRequest> {
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     @Override
     public ServerResponse<WxDefinition> handleRequest(
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GridLocHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GridLocHandler.java
index d31d19357d..d4f6ebea4a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GridLocHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/GridLocHandler.java
@@ -20,15 +20,7 @@
 
 package com.raytheon.edex.plugin.gfe.server.handler;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager;
 import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
-import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
 import com.raytheon.uf.common.dataplugin.gfe.request.GridLocRequest;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
@@ -42,30 +34,21 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * ------------ ---------- ----------- --------------------------
  * 05/20/08     #875       bphillip    Initial Creation
  * 09/22/09     3058       rjpeter     Converted to IRequestHandler
+ * 11/18/15     5129       dgilling    Use better return type.
  * </pre>
  * 
  * @author bphillip
  * @version 1.0
  */
-public class GridLocHandler implements IRequestHandler<GridLocRequest> {
-    protected final transient Log logger = LogFactory.getLog(getClass());
+public class GridLocHandler extends BaseGfeRequestHandler implements
+        IRequestHandler<GridLocRequest> {
 
     @Override
-    public ServerResponse<List<GridLocation>> handleRequest(
-            GridLocRequest request) throws Exception {
-        ServerResponse<List<GridLocation>> sr = new ServerResponse<List<GridLocation>>();
-        try {
-            sr
-                    .setPayload(Arrays
-                            .asList(new GridLocation[] { IFPServerConfigManager
-                                    .getServerConfig(request.getSiteID())
-                                    .dbDomain() }));
-        } catch (GfeException e) {
-            logger.error("Error getting grid location", e);
-            sr.addMessage("Error getting grid location: "
-                    + e.getLocalizedMessage());
-        }
+    public ServerResponse<GridLocation> handleRequest(GridLocRequest request)
+            throws Exception {
+        GridLocation gloc = getIfpServer(request).getConfig().dbDomain();
+        ServerResponse<GridLocation> sr = new ServerResponse<>();
+        sr.setPayload(gloc);
         return sr;
     }
-
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/IscCreateDomainDictHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/IscCreateDomainDictHandler.java
index b3cca91af2..472e012b97 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/IscCreateDomainDictHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/IscCreateDomainDictHandler.java
@@ -26,8 +26,8 @@ import java.util.Map;
 
 import jep.JepException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.uf.common.dataplugin.gfe.request.IscCreateDomainDictRequest;
@@ -50,9 +50,10 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * 
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
- * 07/06/09      1995       bphillip    Initial port
- * 09/22/09      3058       rjpeter     Converted to IRequestHandler
- * 09/05/13      2307       dgilling    Use better PythonScript constructor.
+ * 07/06/09     1995        bphillip    Initial port
+ * 09/22/09     3058        rjpeter     Converted to IRequestHandler
+ * 09/05/13     2307        dgilling    Use better PythonScript constructor.
+ * 12/15/15     5166        kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author bphillip
@@ -60,7 +61,8 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  */
 public class IscCreateDomainDictHandler implements
         IRequestHandler<IscCreateDomainDictRequest> {
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     @Override
     public ServerResponse<Object> handleRequest(
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/IscRequestQueryHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/IscRequestQueryHandler.java
index fab4bed2d8..a0778f1a5a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/IscRequestQueryHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/IscRequestQueryHandler.java
@@ -20,18 +20,20 @@
 
 package com.raytheon.edex.plugin.gfe.server.handler;
 
-import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import jep.JepException;
 
+import org.apache.commons.lang3.StringUtils;
+
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfig;
-import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager;
-import com.raytheon.edex.plugin.gfe.exception.GfeConfigurationException;
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.uf.common.dataplugin.gfe.request.IscRequestQueryRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.IscRequestQueryRequest.IscQueryResponse;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
@@ -43,7 +45,6 @@ import com.raytheon.uf.common.python.PythonScript;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
  * Port of the requestQuery from AWIPS I
@@ -59,106 +60,85 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * 09/05/13      2307       dgilling    Use better PythonScript constructor.
  * 08/14/15      4750       dgilling    Send domainDicts back as Maps, not
  *                                      python pickled strings.
+ * 11/30/15      5129       dgilling    Code cleanup.
  * </pre>
  * 
  * @author bphillip
  * @version 1
  */
-public class IscRequestQueryHandler implements
+public class IscRequestQueryHandler extends BaseGfeRequestHandler implements
         IRequestHandler<IscRequestQueryRequest> {
 
     private final IUFStatusHandler statusHandler = UFStatus
             .getHandler(getClass());
 
-    private static final String ISC_UTIL = "gfe" + IPathManager.SEPARATOR
-            + "isc" + IPathManager.SEPARATOR + "iscUtil.py";
-
     private static final String IRT_SERVER = "gfe" + IPathManager.SEPARATOR
             + "isc" + IPathManager.SEPARATOR + "IrtServer.py";
 
-    @Override
-    public ServerResponse<List<Object>> handleRequest(
-            IscRequestQueryRequest request) throws Exception {
-        ServerResponse<List<Object>> response = new ServerResponse<List<Object>>();
-        IFPServerConfig config = null;
-        String siteID = request.getSiteID();
-        try {
-            config = IFPServerConfigManager.getServerConfig(siteID);
-        } catch (GfeConfigurationException e) {
-            response.addMessage("Unable to get server config for site ["
-                    + siteID + "]");
-            return response;
-        }
+    private static final String ISC_UTIL = "gfe" + IPathManager.SEPARATOR
+            + "isc" + IPathManager.SEPARATOR + "iscUtil.py";
 
-        if (statusHandler.isPriorityEnabled(Priority.DEBUG)) {
-            statusHandler.debug("Request:  requestor="
-                    + request.getWorkstationID().toString());
-        }
+    @Override
+    public ServerResponse<IscQueryResponse> handleRequest(
+            IscRequestQueryRequest request) throws Exception {
+        ServerResponse<IscQueryResponse> sr = new ServerResponse<>();
+
+        // init return values
+        String xmlResponse = StringUtils.EMPTY;
+        Collection<String> parmsWanted = Collections.emptyList();
+        Map<String, Map<String, List<Map<String, String>>>> domainDict = Collections
+                .emptyMap();
+        Map<String, Map<String, String>> serverDictT2S = Collections.emptyMap();
 
         // ensure there is a routing table
-        String ancf, bncf = null;
-        ancf = config.iscRoutingTableAddress().get("ANCF");
-        bncf = config.iscRoutingTableAddress().get("BNCF");
+        IFPServerConfig config = getIfpServer(request).getConfig();
+        String ancf = config.iscRoutingTableAddress().get("ANCF");
+        String bncf = config.iscRoutingTableAddress().get("BNCF");
+        if ((StringUtils.isBlank(ancf)) || (StringUtils.isBlank(bncf))
+                || (!config.requestISC())) {
+            sr.addMessage("IRT Address/requestISC not enabled. No ISC data available.");
+        } else {
+            // calculate XML
+            try (PythonScript script = new PythonScript(
+                    getScriptPath(IRT_SERVER),
+                    getIncludePath(request.getSiteID()), getClass()
+                            .getClassLoader())) {
+                Map<String, Object> args = new HashMap<String, Object>();
+                args.put("ancfURL", ancf);
+                args.put("bncfURL", bncf);
+                args.put("iscWfosWanted", config.requestedISCsites());
+                String xml = (String) script.execute("irtGetServers", args);
+                xmlResponse = xml;
+                parmsWanted = config.requestedISCparms();
+            } catch (JepException e) {
+                statusHandler.error("Can't create IrtAccess instance: ", e);
+                sr.addMessage("No ISC data available due to inability to access Irt");
+            }
 
-        boolean irtUnavailable = false;
-        if (ancf == null) {
-            irtUnavailable = true;
-        } else if (ancf.isEmpty()) {
-            irtUnavailable = true;
-        }
-
-        if (irtUnavailable) {
-            if (bncf == null) {
-                irtUnavailable = true;
-            } else if (bncf.isEmpty()) {
-                irtUnavailable = true;
-            } else {
-                irtUnavailable = false;
+            if (!xmlResponse.isEmpty()) {
+                try (PythonScript script = new PythonScript(
+                        getScriptPath(ISC_UTIL),
+                        getIncludePath(request.getSiteID()), getClass()
+                                .getClassLoader())) {
+                    Map<String, Object> args = new HashMap<String, Object>();
+                    args.put("xml", xmlResponse);
+                    Map<String, Object> objectDict = (Map<String, Object>) script
+                            .execute("createDomainDict", args);
+                    domainDict = (Map<String, Map<String, List<Map<String, String>>>>) objectDict
+                            .get("domains");
+                    serverDictT2S = (Map<String, Map<String, String>>) objectDict
+                            .get("serverDictT2S");
+                } catch (JepException e) {
+                    statusHandler.error(
+                            "Error occurred creating Isc Domain Dict", e);
+                    sr.addMessage("No ISC data available due to inability to process Irt server response.");
+                }
             }
         }
 
-        if (!config.requestISC()) {
-            irtUnavailable = true;
-        }
-
-        if (irtUnavailable) {
-            response.addMessage("IRT Address/requestISC not enabled. No ISC data available");
-            return response;
-        }
-
-        // calculate XML
-        List<String> domains = new ArrayList<String>(config.requestedISCsites());
-
-        String xml = null;
-        Object domainDict = null;
-
-        try (PythonScript script = new PythonScript(getScriptPath(IRT_SERVER),
-                getIncludePath(siteID), getClass().getClassLoader())) {
-            Map<String, Object> args = new HashMap<String, Object>();
-            args.put("ancfURL", ancf);
-            args.put("bncfURL", bncf);
-            args.put("iscWfosWanted", domains);
-            xml = (String) script.execute("irtGetServers", args);
-
-        } catch (JepException e) {
-            statusHandler.error("Error occurred running IscRequestQuery", e);
-        }
-
-        try (PythonScript script = new PythonScript(getScriptPath(ISC_UTIL),
-                getIncludePath(siteID), getClass().getClassLoader())) {
-            Map<String, Object> args = new HashMap<String, Object>();
-            args.put("xml", xml);
-            domainDict = script.execute("createDomainDict", args);
-        } catch (JepException e) {
-            statusHandler.error("Error occurred creating Isc Domain Dict", e);
-        }
-
-        List<Object> responseList = new ArrayList<Object>();
-        responseList.add(xml);
-        responseList.add(domainDict);
-        responseList.add(config.requestedISCparms());
-        response.setPayload(responseList);
-        return response;
+        sr.setPayload(new IscQueryResponse(domainDict, serverDictT2S,
+                parmsWanted));
+        return sr;
     }
 
     private static String getScriptPath(String locPath) {
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
index 83177ec677..a3a9958861 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
@@ -31,11 +31,12 @@ import com.raytheon.edex.plugin.gfe.util.SendNotifications;
 import com.raytheon.uf.common.dataplugin.gfe.request.SaveCombinationsFileRequest;
 import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
 import com.raytheon.uf.common.dataplugin.gfe.server.notify.CombinationsFileChangedNotification;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 import com.raytheon.uf.common.util.FileUtil;
 import com.raytheon.uf.common.util.StringUtil;
@@ -56,6 +57,8 @@ import com.raytheon.uf.common.util.StringUtil;
  *                                      flushed/closed.
  * Feb 05, 2014  #2591                  Added CombinationFileChangedNotification
  * Jul 21, 2014  2768      bclement     removed FileUpdateMessage
+ * Jan 08, 2016  5237      tgurney      Replace calls to deprecated
+ *                                      LocalizationFile methods
  * 
  * </pre>
  * 
@@ -69,13 +72,6 @@ public class SaveCombinationsFileHandler implements
     private static final String COMBO_FILE_DIR = FileUtil.join("gfe",
             "combinations");
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.serialization.comm.IRequestHandler#handleRequest
-     * (com.raytheon.uf.common.serialization.comm.IServerRequest)
-     */
     @Override
     public ServerResponse<Object> handleRequest(
             SaveCombinationsFileRequest request) throws Exception {
@@ -86,12 +82,12 @@ public class SaveCombinationsFileHandler implements
 
         String comboName = request.getFileName();
         String fileName = FileUtil.join(COMBO_FILE_DIR, comboName) + ".py";
-        LocalizationFile lf = pm.getLocalizationFile(localization, fileName);
+        ILocalizationFile lf = pm.getLocalizationFile(localization, fileName);
+
+        try (SaveableOutputStream lfStream = lf.openOutputStream();
+                Writer outWriter = new BufferedWriter(new OutputStreamWriter(
+                        lfStream))) {
 
-        Writer outWriter = null;
-        try {
-            outWriter = new BufferedWriter(new OutputStreamWriter(
-                    lf.openOutputStream()));
             String zoneComments = "\n# Automatically generated combinations file\n# "
                     + comboName + "\n\nCombinations = [\n";
             outWriter.write(zoneComments);
@@ -113,12 +109,9 @@ public class SaveCombinationsFileHandler implements
                 outWriter.write(nextLineToWrite.toString());
             }
             outWriter.write("]");
-        } finally {
-            if (outWriter != null) {
-                outWriter.close();
-            }
+            outWriter.close();
+            lfStream.save();
         }
-        lf.save();
 
         /*
          * placing the notification code here ensures we only send the
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/ImportConfRequestHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/ImportConfRequestHandler.java
index a1217c3859..6fb17bf959 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/ImportConfRequestHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/svcbu/ImportConfRequestHandler.java
@@ -19,7 +19,7 @@
  **/
 package com.raytheon.edex.plugin.gfe.server.handler.svcbu;
 
-import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang3.BooleanUtils;
 
 import com.raytheon.edex.plugin.gfe.svcbackup.SvcBackupUtil;
 import com.raytheon.uf.common.dataplugin.gfe.request.ImportConfRequest;
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
index 23beafe4aa..6e1aa5a890 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/lock/LockManager.java
@@ -69,6 +69,8 @@ import com.raytheon.uf.edex.database.DataAccessLayerException;
  *                                     site managed by IFPServer
  * 10/07/2014   #3684      randerso    Restructured IFPServer start up
  * 03/03/15      629    mgamazaychikov Add getAllLocks method.
+ * 12/09/2015   #5129      dgilling    Ensure payload is always populated in
+ *                                     getLockTables.
  * </pre>
  * 
  * @author bphillip
@@ -113,10 +115,13 @@ public class LockManager {
      */
     public ServerResponse<List<LockTable>> getLockTables(
             List<LockTableRequest> request, WsId requestor) {
+        List<LockTable> emptyTable = Collections.emptyList();
+
         ServerResponse<List<LockTable>> sr = new ServerResponse<List<LockTable>>();
 
-        if (request.size() == 0) {
+        if (request.isEmpty()) {
             sr.addMessage("No Lock Table Requests");
+            sr.setPayload(emptyTable);
             return sr;
         }
 
@@ -138,7 +143,7 @@ public class LockManager {
                 }
             }
 
-            List<LockTable> payLoad = null;
+            List<LockTable> payLoad = emptyTable;
 
             if (!parmIds.isEmpty()) {
                 Map<ParmID, LockTable> lockMap = dao.getLocks(parmIds,
@@ -161,7 +166,7 @@ public class LockManager {
         } catch (Exception e) {
             statusHandler.error("Error getting lock tables for " + parmIds, e);
             sr.addMessage("Error getting lock tables for " + parmIds);
-            sr.setPayload(new ArrayList<LockTable>(0));
+            sr.setPayload(emptyTable);
         }
 
         return sr;
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/SmartInitTransactions.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/SmartInitTransactions.java
index f3de33bf3d..7256b1dfce 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/SmartInitTransactions.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/SmartInitTransactions.java
@@ -24,8 +24,6 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
 import org.hibernate.LockOptions;
@@ -34,6 +32,8 @@ import org.hibernate.Transaction;
 import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Order;
 import org.hibernate.criterion.Restrictions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.gfe.smartinit.SmartInitRecordPK.State;
 import com.raytheon.uf.edex.database.cluster.ClusterLockUtils;
@@ -53,6 +53,7 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * Apr 12, 2010            njensen     Initial creation
  * May 20, 2014 #3069      randerso    Added validTime to sort order when 
  *                                     choosing next smartInit to run
+ * Dec 15, 2015 #5166      kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -64,8 +65,8 @@ public class SmartInitTransactions {
 
     protected static final String TASK_NAME = "GfeSmartInit";
 
-    protected static transient Log logger = LogFactory
-            .getLog(SmartInitTransactions.class);
+    protected static transient Logger logger = LoggerFactory
+            .getLogger(SmartInitTransactions.class);
 
     @SuppressWarnings("unchecked")
     public static SmartInitRecord getSmartInitToRun(
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
index 26b0abadd8..7b6057471a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
@@ -28,8 +28,8 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Sets;
 import com.raytheon.uf.common.auth.exception.AuthorizationException;
@@ -74,6 +74,7 @@ import com.raytheon.uf.edex.site.SiteAwareRegistry;
  * Feb 17, 2015 4103       dgilling    Add getLockDir for specific site, code 
  *                                     cleanup.
  * Mar 27, 2015 4103       dgilling    Support new location for svcbu.properties.
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -94,8 +95,8 @@ public class SvcBackupUtil {
             "gfe", "svcbu.properties");
 
     /** The logger instance */
-    protected static transient Log logger = LogFactory
-            .getLog(SvcBackupUtil.class);
+    protected static transient Logger logger = LoggerFactory
+            .getLogger(SvcBackupUtil.class);
 
     /**
      * A private constructor so that Java does not attempt to create one for us.
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
index c2a8e763f6..40daea571d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
@@ -34,13 +34,13 @@ import com.raytheon.edex.plugin.gfe.reference.MapManager;
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.uf.common.dataquery.db.QueryResult;
 import com.raytheon.uf.common.dataquery.db.QueryResultRow;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.python.PyUtil;
 import com.raytheon.uf.common.python.PythonScript;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -66,6 +66,8 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  *                                     LocalizationSupport
  * Jul 13, 2015   4500     rjpeter     Fix SQL Injection concerns.
  * Dec 15, 2015 RM17933 mgamazaychikov Add four new corners to PART_OF_STATE.
+ * Jan 08, 2016   5237     tgurney     Replace calls to deprecated LocalizationFile
+ *                                     methods
  * </pre>
  * 
  * @author wldougher
@@ -235,8 +237,19 @@ public class AreaDictionaryMaker {
         // To generate national fips2cities and zones2cities files
         // uncomment the previous lines
 
-        genFips2Cities(context, countyAttrs);
-        genZones2Cities(context, zoneAttrs);
+        if (countyAttrs != null) {
+            genFips2Cities(context, countyAttrs);
+        } else {
+            statusHandler
+                    .warn("No county edit area attributes found. Not generating fips2cites.");
+        }
+
+        if (zoneAttrs != null) {
+            genZones2Cities(context, zoneAttrs);
+        } else {
+            statusHandler
+                    .warn("No zone edit area attributes found. Not generating zones2cites.");
+        }
 
         LocalizationContext baseCtx = pathMgr.getContext(
                 LocalizationType.EDEX_STATIC, LocalizationLevel.BASE);
@@ -278,9 +291,9 @@ public class AreaDictionaryMaker {
             pyScript.execute("createCityLocation", argMap);
 
             // check to see if Hazard_TCV was configured for this site
-            LocalizationFile lf = pathMgr.getLocalizationFile(caveStaticConfig,
-                    FileUtil.join("gfe", "userPython", "textProducts",
-                            "Hazard_TCV.py"));
+            ILocalizationFile lf = pathMgr.getLocalizationFile(
+                    caveStaticConfig, FileUtil.join("gfe", "userPython",
+                            "textProducts", "Hazard_TCV.py"));
             if (lf.exists()) {
                 argMap.put("siteID", siteID);
                 pyScript.execute("createTCVAreaDictionary", argMap);
@@ -315,10 +328,11 @@ public class AreaDictionaryMaker {
             List<Map<String, Object>> attributes, String fileName,
             String dictName, String group, char separator, String cityQuery) {
 
-        LocalizationFile lf = pathMgr.getLocalizationFile(context,
+        ILocalizationFile lf = pathMgr.getLocalizationFile(context,
                 FileUtil.join("gfe", fileName));
 
-        try (PrintWriter out = new PrintWriter(lf.openOutputStream())) {
+        try (SaveableOutputStream lfStream = lf.openOutputStream();
+                PrintWriter out = new PrintWriter(lfStream)) {
             out.println(dictName + " = {");
 
             try {
@@ -402,12 +416,8 @@ public class AreaDictionaryMaker {
             }
 
             out.println("}");
-        } catch (LocalizationException e) {
-            statusHandler.error(e.getLocalizedMessage(), e);
-        }
-
-        try {
-            lf.save();
+            out.close();
+            lfStream.save();
         } catch (Exception e) {
             statusHandler.error(e.getLocalizedMessage(), e);
         }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/CombinationsFileMaker.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/CombinationsFileMaker.java
index 2e35a544c0..3507bdf73b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/CombinationsFileMaker.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/CombinationsFileMaker.java
@@ -26,8 +26,8 @@ import java.util.Map;
 
 import jep.JepException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.gfe.reference.MapManager;
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
@@ -50,7 +50,8 @@ import com.raytheon.uf.common.util.FileUtil;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * May 4, 2011            wldougher     Moved from MapManager
+ * May 04, 2011            wldougher   Moved from MapManager
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -59,8 +60,8 @@ import com.raytheon.uf.common.util.FileUtil;
  */
 
 public class CombinationsFileMaker {
-    private static final Log theLogger = LogFactory
-            .getLog(CombinationsFileMaker.class);
+    private static final Logger theLogger = LoggerFactory
+            .getLogger(CombinationsFileMaker.class);
 
     // Unit tests may use a custom path manager
     protected IPathManager pathMgr = PathManagerFactory.getPathManager();
@@ -107,8 +108,8 @@ public class CombinationsFileMaker {
         caveStaticConfig.setContextName(site);
 
         String definitionDir = pathMgr
-                .getLocalizationFile(caveStaticConfig,
-                        GfePyIncludeUtil.REGULAR).getFile().getPath();
+                .getLocalizationFile(caveStaticConfig, GfePyIncludeUtil.REGULAR)
+                .getFile().getPath();
         File outputDirFile = pathMgr.getLocalizationFile(caveStaticConfig,
                 FileUtil.join("gfe", "combinations")).getFile();
         outputDirFile.mkdir();
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
index 4d0491bc10..53432873db 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
@@ -29,19 +29,20 @@ import java.util.Map;
 
 import jep.JepException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.utility.ProtectedFiles;
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.uf.common.dataquery.db.QueryResult;
 import com.raytheon.uf.common.dataquery.db.QueryResultRow;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.python.PyUtil;
 import com.raytheon.uf.common.python.PythonScript;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -74,8 +75,11 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * Oct 20, 2014 #3685       randerso    Added code to generate SiteCFG.py from GIS database
  *                                      Cleaned up how protected file updates are returned
  * Jan 23, 2015 #4027       randerso    Fixed python include path
- * Apr 27, 2015  4259       njensen     Updated for new JEP API
- * Jul 13, 2015  4500       rjpeter     Removed SqlQueryTask.
+ * Apr 27, 2015 4259        njensen     Updated for new JEP API
+ * Jul 13, 2015 4500        rjpeter     Removed SqlQueryTask.
+ * Dec 15, 2015 5166        kbisanz     Update logging to use SLF4J
+ * Jan 08, 2016 5237        tgurney     Replace calls to deprecated LocalizationFile
+ *                                      methods
  * </pre>
  * 
  * @author jelkins
@@ -96,7 +100,7 @@ public class Configurator {
 
     private String pythonDirectory;
 
-    private transient Log log = LogFactory.getLog(getClass());
+    private transient Logger log = LoggerFactory.getLogger(getClass());
 
     /**
      * The Protected Files list.
@@ -108,6 +112,8 @@ public class Configurator {
      * <p>
      * Get the siteID and determine the appropriate paths.
      * </p>
+     * 
+     * @param siteID
      */
     public Configurator(String siteID) {
 
@@ -206,14 +212,15 @@ public class Configurator {
         context.setContextName(siteID);
 
         // regenerate siteCFG.py
-        LocalizationFile lf = null;
+        ILocalizationFile lf = null;
         try {
             lf = pathMgr.getLocalizationFile(context,
                     FileUtil.join("python", "gfe", "SiteCFG.py"));
 
             CoreDao dao = new CoreDao(DaoConfig.forDatabase("maps"));
             QueryResult results = dao.executeMappedSQLQuery(CWA_QUERY);
-            try (PrintWriter out = new PrintWriter(lf.openOutputStream())) {
+            try (SaveableOutputStream lfStream = lf.openOutputStream();
+                    PrintWriter out = new PrintWriter(lfStream)) {
                 out.println("##");
                 out.println("# Contains information about products, regions, etc. for each site");
                 out.println("# in the country.");
@@ -254,9 +261,10 @@ public class Configurator {
                         "Washington DC", ""));
 
                 out.println("}");
-            } // out is closed here
+                out.close();
+                lfStream.save();
+            }
 
-            lf.save();
         } catch (Exception e) {
             statusHandler.error(e.getLocalizedMessage(), e);
         }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/ConfigureTextProductsHandler.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/ConfigureTextProductsHandler.java
index 078da7c802..598cc91280 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/ConfigureTextProductsHandler.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/ConfigureTextProductsHandler.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.edex.plugin.gfe.textproducts;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.gfe.request.ConfigureTextProductsRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
@@ -38,6 +38,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * May  4, 2011            wldougher   Add script file creation
  * Sep 18, 2011      #1091 randerso    Removed combo file and area dictionary creation
  *                                     since they were not in A1
+ * Dec 15, 2015      #5166 kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -48,14 +49,14 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 public class ConfigureTextProductsHandler implements
         IRequestHandler<ConfigureTextProductsRequest> {
 
-    private transient Log log;
+    private transient Logger log;
 
     protected CombinationsFileMaker combinationsFileMaker;
 
     protected AreaDictionaryMaker areaDictionaryMaker;
 
     public ConfigureTextProductsHandler() {
-        log = LogFactory.getLog(getClass());
+        log = LoggerFactory.getLogger(getClass());
         combinationsFileMaker = new CombinationsFileMaker();
         areaDictionaryMaker = new AreaDictionaryMaker();
     }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
index 844e77ce63..209d72a3f8 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
@@ -43,14 +43,16 @@ import com.raytheon.uf.common.activetable.VTECPartners;
 import com.raytheon.uf.common.dataplugin.gfe.python.GfePyIncludeUtil;
 import com.raytheon.uf.common.dataplugin.warning.AbstractWarningRecord;
 import com.raytheon.uf.common.dataplugin.warning.PracticeWarningRecord;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.python.PyUtil;
+import com.raytheon.uf.common.python.PythonIncludePathUtil;
 import com.raytheon.uf.common.python.PythonScript;
 import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -80,6 +82,9 @@ import com.raytheon.uf.edex.activetable.ActiveTablePyIncludeUtil;
  *                                     Added call to nwrwavestcv.csh
  *                                     Added support for sending TCVAdvisory files to 
  *                                     VTEC partners
+ * Nov 12, 2015   4834     njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Jan 27, 2016   5237     tgurney     Replace LocalizationFile with ILocalizationFile
+ * 
  * </pre>
  * 
  * @author njensen
@@ -126,11 +131,6 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
 
     private static final ThreadLocal<PythonScript> pythonScript = new ThreadLocal<PythonScript>() {
 
-        /*
-         * (non-Javadoc)
-         * 
-         * @see java.lang.ThreadLocal#initialValue()
-         */
         @Override
         protected PythonScript initialValue() {
             IPathManager pathMgr = PathManagerFactory.getPathManager();
@@ -169,13 +169,6 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
         super(TPC_WATCH_TYPE);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.edex.plugin.gfe.watch.AbstractWatchNotifierSrv#handleWatch
-     * (java.util.List)
-     */
     @Override
     public void handleWatch(List<AbstractWarningRecord> warningRecs) {
         /*
@@ -282,7 +275,7 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
         try {
             transmittedFile.save();
             transmittedFileSaved = true;
-        } catch (LocalizationOpFailedException e) {
+        } catch (LocalizationException e) {
             statusHandler.error("Failed to save advisory "
                     + transmittedFilename);
         }
@@ -290,7 +283,7 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
         if (transmittedFileSaved) {
             try {
                 pendingFile.delete();
-            } catch (LocalizationOpFailedException e) {
+            } catch (LocalizationException e) {
                 statusHandler.error("Unable to delete " + pendingFile, e);
             }
 
@@ -351,7 +344,7 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
                                         practiceMode);
                         try {
                             advisoryFile.delete();
-                        } catch (LocalizationOpFailedException e) {
+                        } catch (LocalizationException e) {
                             statusHandler.error("Unable to delete "
                                     + advisoryFile, e);
                         }
@@ -378,7 +371,7 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
                 .getPath();
 
         String pythonIncludePath = PyUtil.buildJepIncludePath(
-                ActiveTablePyIncludeUtil.getCommonPythonIncludePath(),
+                PythonIncludePathUtil.getCommonPythonIncludePath(),
                 ActiveTablePyIncludeUtil.getCommonGfeIncludePath(),
                 ActiveTablePyIncludeUtil.getVtecIncludePath(siteId),
                 ActiveTablePyIncludeUtil.getGfeConfigIncludePath(siteId),
@@ -436,7 +429,7 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
         return practiceMode ? PRACTICE_PATH : TCV_ADVISORY_PATH;
     }
 
-    private Map<String, Object> loadJSONDictionary(LocalizationFile lf) {
+    private Map<String, Object> loadJSONDictionary(ILocalizationFile lf) {
         if (lf != null) {
             PythonScript script = this.pythonScript.get();
             if (script != null) {
@@ -444,7 +437,7 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
                 args.put("localizationType", lf.getContext()
                         .getLocalizationType());
                 args.put("siteID", lf.getContext().getContextName());
-                args.put("fileName", lf.getName());
+                args.put("fileName", lf.getPath());
                 try {
                     @SuppressWarnings("unchecked")
                     Map<String, Object> retVal = (Map<String, Object>) script
@@ -460,7 +453,7 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
         return null;
     }
 
-    private void saveJSONDictionary(LocalizationFile lf,
+    private void saveJSONDictionary(ILocalizationFile lf,
             Map<String, Object> dict) {
         if (lf != null) {
             PythonScript script = this.pythonScript.get();
@@ -469,7 +462,7 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
                 args.put("localizationType", lf.getContext()
                         .getLocalizationType());
                 args.put("siteID", lf.getContext().getContextName());
-                args.put("fileName", lf.getName());
+                args.put("fileName", lf.getPath());
                 args.put("javaObject", dict);
                 try {
                     script.execute("saveJsonFromJava", args);
@@ -481,13 +474,6 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.edex.plugin.gfe.warning.AbstractWarningNotifierSrv#
-     * buildNotification(java.util.List,
-     * com.raytheon.uf.common.activetable.VTECPartners)
-     */
     @Override
     protected String buildNotification(List<AbstractWarningRecord> decodedVTEC,
             VTECPartners partnersConfig) {
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
index e33bd5c710..8a07b52d06 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
@@ -38,7 +38,6 @@
     <alias base="ukmet228">ukmetNH</alias>
     <alias base="ETA">eta211</alias>
     <alias base="AVN">avn202</alias>
-    <alias base="NGM">ngm211</alias>
     <alias base="MRF">mrf202</alias>
     <alias base="MRF21">mrf202</alias>
     <alias base="MRF22">mrf202</alias>
@@ -49,8 +48,6 @@
     <alias base="GFS201">gfs201</alias>
     <alias base="mrfNH">mrf201</alias>
     <alias base="GFS213">gfs213</alias>
-    <alias base="NGM213">ngm213</alias>
-    <alias base="NGM202">ngm202</alias>
     <alias base="AVN211">avn211</alias>
     <alias base="mesoEta212">mesoEta212</alias>
     <alias base="mesoEta215">mesoEta215</alias>
@@ -59,7 +56,6 @@
     <alias base="MRF203">mrf203</alias>
     <alias base="MRF204">mrf204</alias>
     <alias base="MRF205">mrf205</alias>
-    <alias base="NGM207">ngm207</alias>
     <alias base="ETA207">eta207</alias>
     <alias base="AVN-NorthernHemisphere">avnNH</alias>
     <alias base="AVN37">avnNH</alias>
@@ -239,4 +235,5 @@
     <alias base="NCOM-SOCAL">ncom</alias>
     <alias base="NCOM-ALASKA">ncom</alias>
     <alias base="NCOM-HAWAII">ncom</alias>
+    <alias base="PWPF">PWPF</alias>
 </aliasList>
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
index 063de131e5..3804992baf 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
@@ -167,6 +167,52 @@
     <alias base="DpTsprd">dptsprd</alias>
     <alias base="ELON">elon</alias>
     <alias base="FD">fd</alias>
+    <alias base="FRZR0.01in12hr">frzr001in12hr</alias>
+    <alias base="FRZR0.1in12hr">frzr010in12hr</alias>
+    <alias base="FRZR0.25in12hr">frzr025in12hr</alias>
+    <alias base="FRZR0.5in12hr">frzr050in12hr</alias>
+    <alias base="FRZR1in12hr">frzr1in12hr</alias>
+    <alias base="FRZR0.01in24hr">frzr001in24hr</alias>
+    <alias base="FRZR0.1in24hr">frzr010in24hr</alias>
+    <alias base="FRZR0.25in24hr">frzr025in24hr</alias>
+    <alias base="FRZR0.5in24hr">frzr050in24hr</alias>
+    <alias base="FRZR1in24hr">frzr1in24hr</alias>
+    <alias base="FRZR0.1in48hr">frzr010in48hr</alias>
+    <alias base="FRZR0.25in48hr">frzr025in48hr</alias>
+    <alias base="FRZR0.5in48hr">frzr050in48hr</alias>
+    <alias base="FRZR1in48hr">frzr1in48hr</alias>
+    <alias base="FRZR0.1in72hr">frzr010in72hr</alias>
+    <alias base="FRZR0.25in72hr">frzr025in72hr</alias>
+    <alias base="FRZR0.5in72hr">frzr050in72hr</alias>
+    <alias base="FRZR1in72hr">frzr1in72hr</alias>
+    <alias base="FRZR5pct12hr">frzr5pct12hr</alias>
+    <alias base="FRZR10pct12hr">frzr10pct12hr</alias>
+    <alias base="FRZR25pct12hr">frzr25pct12hr</alias>
+    <alias base="FRZR50pct12hr">frzr50pct12hr</alias>
+    <alias base="FRZR75pct12hr">frzr75pct12hr</alias>
+    <alias base="FRZR90pct12hr">frzr90pct12hr</alias>
+    <alias base="FRZR95pct12hr">frzr95pct12hr</alias>
+    <alias base="FRZR5pct24hr">frzr5pct24hr</alias>
+    <alias base="FRZR10pct24hr">frzr10pct24hr</alias>
+    <alias base="FRZR25pct24hr">frzr25pct24hr</alias>
+    <alias base="FRZR50pct24hr">frzr50pct24hr</alias>
+    <alias base="FRZR75pct24hr">frzr75pct24hr</alias>
+    <alias base="FRZR90pct24hr">frzr90pct24hr</alias>
+    <alias base="FRZR95pct24hr">frzr95pct24hr</alias>
+    <alias base="FRZR5pct48hr">frzr5pct48hr</alias>
+    <alias base="FRZR10pct48hr">frzr10pct48hr</alias>
+    <alias base="FRZR25pct48hr">frzr25pct48hr</alias>
+    <alias base="FRZR50pct48hr">frzr50pct48hr</alias>
+    <alias base="FRZR75pct48hr">frzr75pct48hr</alias>
+    <alias base="FRZR90pct48hr">frzr90pct48hr</alias>
+    <alias base="FRZR95pct48hr">frzr95pct48hr</alias>
+    <alias base="FRZR5pct72hr">frzr5pct72hr</alias>
+    <alias base="FRZR10pct72hr">frzr10pct72hr</alias>
+    <alias base="FRZR25pct72hr">frzr25pct72hr</alias>
+    <alias base="FRZR50pct72hr">frzr50pct72hr</alias>
+    <alias base="FRZR75pct72hr">frzr75pct72hr</alias>
+    <alias base="FRZR90pct72hr">frzr90pct72hr</alias>
+    <alias base="FRZR95pct72hr">frzr95pct72hr</alias>
     <alias base="FZNP">fznp</alias>
     <alias base="GHmean">ghmean</alias>
     <alias base="GHsprd">ghsprd</alias>
@@ -304,6 +350,62 @@
     <alias base="ThP6hr">thp6hr</alias>
     <alias base="Tmean">tmean</alias>
     <alias base="TOTSN">totsn</alias>
+    <alias base="TOTSN1in12hr">totsn1in12hr</alias>
+    <alias base="TOTSN2in12hr">totsn2in12hr</alias>
+    <alias base="TOTSN4in12hr">totsn4in12hr</alias>
+    <alias base="TOTSN6in12hr">totsn6in12hr</alias>
+    <alias base="TOTSN8in12hr">totsn8in12hr</alias>
+    <alias base="TOTSN12in12hr">totsn12in12hr</alias>
+    <alias base="TOTSN18in12hr">totsn18in12hr</alias>
+    <alias base="TOTSN1in24hr">totsn1in24hr</alias>
+    <alias base="TOTSN2in24hr">totsn2in24hr</alias>
+    <alias base="TOTSN4in24hr">totsn4in24hr</alias>
+    <alias base="TOTSN6in24hr">totsn6in24hr</alias>
+    <alias base="TOTSN8in24hr">totsn8in24hr</alias>
+    <alias base="TOTSN12in24hr">totsn12in24hr</alias>
+    <alias base="TOTSN18in24hr">totsn18in24hr</alias>
+    <alias base="TOTSN2in48hr">totsn2in48hr</alias>
+    <alias base="TOTSN4in48hr">totsn4in48hr</alias>
+    <alias base="TOTSN8in48hr">totsn8in48hr</alias>
+    <alias base="TOTSN12in48hr">totsn12in48hr</alias>
+    <alias base="TOTSN18in48hr">totsn18in48hr</alias>
+    <alias base="TOTSN24in48hr">totsn24in48hr</alias>
+    <alias base="TOTSN30in48hr">totsn30in48hr</alias>
+    <alias base="TOTSN2in72hr">totsn2in72hr</alias>
+    <alias base="TOTSN4in72hr">totsn4in72hr</alias>
+    <alias base="TOTSN8in72hr">totsn8in72hr</alias>
+    <alias base="TOTSN12in72hr">totsn12in72hr</alias>
+    <alias base="TOTSN18in72hr">totsn18in72hr</alias>
+    <alias base="TOTSN24in72hr">totsn24in72hr</alias>
+    <alias base="TOTSN30in72hr">totsn30in72hr</alias>
+    <alias base="TOTSN5pct12hr">totsn5pct12hr</alias>
+    <alias base="TOTSN10pct12hr">totsn10pct12hr</alias>
+    <alias base="TOTSN25pct12hr">totsn25pct12hr</alias>
+    <alias base="TOTSN50pct12hr">totsn50pct12hr</alias>
+    <alias base="TOTSN75pct12hr">totsn75pct12hr</alias>
+    <alias base="TOTSN90pct12hr">totsn90pct12hr</alias>
+    <alias base="TOTSN95pct12hr">totsn95pct12hr</alias>
+    <alias base="TOTSN5pct24hr">totsn5pct24hr</alias>
+    <alias base="TOTSN10pct24hr">totsn10pct24hr</alias>
+    <alias base="TOTSN25pct24hr">totsn25pct24hr</alias>
+    <alias base="TOTSN50pct24hr">totsn50pct24hr</alias>
+    <alias base="TOTSN75pct24hr">totsn75pct24hr</alias>
+    <alias base="TOTSN90pct24hr">totsn90pct24hr</alias>
+    <alias base="TOTSN95pct24hr">totsn95pct24hr</alias>
+    <alias base="TOTSN5pct48hr">totsn5pct48hr</alias>
+    <alias base="TOTSN10pct48hr">totsn10pct48hr</alias>
+    <alias base="TOTSN25pct48hr">totsn25pct48hr</alias>
+    <alias base="TOTSN50pct48hr">totsn50pct48hr</alias>
+    <alias base="TOTSN75pct48hr">totsn75pct48hr</alias>
+    <alias base="TOTSN90pct48hr">totsn90pct48hr</alias>
+    <alias base="TOTSN95pct48hr">totsn95pct48hr</alias>
+    <alias base="TOTSN5pct72hr">totsn5pct72hr</alias>
+    <alias base="TOTSN10pct72hr">totsn10pct72hr</alias>
+    <alias base="TOTSN25pct72hr">totsn25pct72hr</alias>
+    <alias base="TOTSN50pct72hr">totsn50pct72hr</alias>
+    <alias base="TOTSN75pct72hr">totsn75pct72hr</alias>
+    <alias base="TOTSN90pct72hr">totsn90pct72hr</alias>
+    <alias base="TOTSN95pct72hr">totsn95pct72hr</alias>
     <alias base="TP1hr">tp1hr</alias>
     <alias base="TP120hr">tp120hr</alias>
     <alias base="tp12c1">tp12c1</alias>
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
index 049e7fc708..930e19cc40 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
@@ -75,6 +75,7 @@
 #    10/30/2015          #17940    jendrowski     Responded to Code Review.  Mostly syntactical changes.
 #    11/05/2015          #18182    ryu            Change D2DDBVERSIONS value for HPCERP to 24 
 #    12/22/2015          #14152    jwatson        Added Sky, Wind to GFSLAMPGrid parms
+#    02/09/2016          #5283     nabowle        Remove NGM support.
 ####################################################################################################
 
 #----------------------------------------------------------------------------
@@ -2046,8 +2047,6 @@ NAM12       = ('NAM12',        GRID,   '', NO,  NO,  2, 0)
 NAM40       = ('NAM40',        GRID,   '', NO,  NO,  2, 0)
 NAM80       = ('NAM80',        GRID,   '', NO,  NO,  2, 0)
 NAM95       = ('NAM95',        GRID,   '', NO,  NO,  2, 0)
-NGM80       = ('NGM80',        GRID,   '', NO,  NO,  2, 0)
-NGM95       = ('NGM95',        GRID,   '', NO,  NO,  2, 0)
 GFS40       = ('GFS40',        GRID,   '', NO,  NO,  2, 0)
 GFS80       = ('GFS80',        GRID,   '', NO,  NO,  2, 0)
 GFS190      = ('GFS190',       GRID,   '', NO,  NO,  2, 0)
@@ -2122,7 +2121,6 @@ if SID in groups['ALASKA_SITES']:
                  ('mesoEta217', 'NAM20'),
                  ('AVN203', 'GFS190'),
                  ('MRF203', 'gfsLR'),
-                 ('NGM207', 'NGM95'),
                  ('ETA207', 'NAM95'),
                  'GWW233',
                  ('ETA242', 'NAM12'),
@@ -2197,7 +2195,6 @@ elif SID == "SJU":
     D2DMODELS = [('AVN211', 'GFS80'),
                  ('GFS212', 'GFS40'),
                  ('ETA', 'NAM80'),
-                 ('NGM', 'NGM80'),
                  ('MRF205', 'gfsLR'),
                  ('OPCWave180', 'OPCTAFBE'),
                  'HurWind226',
@@ -2250,7 +2247,6 @@ elif SID in groups['CONUS_EAST_SITES']:
                  ('ETA', 'NAM80'),
                  'HRRR',
                  'HWRF',
-                 ('NGM', 'NGM80'),
                  ('MRF', 'gfsLR'),
                  ('RUC130', 'RUC13'),
                  ('RUC', 'RUC80'),
@@ -2325,6 +2321,7 @@ elif SID in groups['CONUS_EAST_SITES']:
                  'PGBlended-Night',
                  ('NCOM-USEAST', 'NCOMUSEAST'),
                  ('NCOM-AMSEAS', 'NCOMAMSEAS'),
+                 'PWPF',
                ]
 
 else:   #######DCS3501 WEST_CONUS
@@ -2332,7 +2329,6 @@ else:   #######DCS3501 WEST_CONUS
     D2DMODELS = [('GFS212', 'GFS40'),
                  ('AVN211', 'GFS80'),
                  ('ETA', 'NAM80'),
-                 ('NGM', 'NGM80'),
                  ('MRF', 'gfsLR'),
                  ('RUC130', 'RUC13'),
                  ('RUC', 'RUC80'),
@@ -2411,6 +2407,7 @@ else:   #######DCS3501 WEST_CONUS
                  ('NCOM-SOCAL', 'NCOMSOCAL'),
                  ('NCOM-AMSEAS', 'NCOMAMSEAS'),
                  ('NCOM-ALASKA', 'NCOMALASKA'),
+                 'PWPF',
                ]
 
 if SID in groups['GreatLake_SITES']:
@@ -2543,7 +2540,6 @@ elif SID in groups['ALASKA_SITES']:
 #        "AKwave10" : ['AKwave10'],
 #        "GlobalWave" : ["GlobalWave"],
 #        "NAM95" : ["NAM95"],
-#        "NGM95" : ["NGM95"],
 #        "gfsLR" : ["gfsLR"],
         "NAM12" : ["NAM12"],
         "GFS80" : ["GFS80"],
@@ -2599,7 +2595,6 @@ elif SID == "SJU":
         "RUC13" : ["RUC13"],
         "RUC80" : ["RUC80"],
 #        "gfsLR" : ["gfsLR"],
-#        "NGM80" : ["NGM80"],
         "NAM12" : ["NAM12"],
         "GFS80" : ["GFS80"],
         "GFS40" : ["GFS40"],
@@ -2707,8 +2702,6 @@ D2DAccumulativeElements= {
     "NAM40": ["tp", "cp"],
     "NAM20": ["tp", "cp"],
     "NAM12": ["tp", "cp", "crain", "csnow", "cfrzr", "cicep"],
-    "NGM80": ["tp", "cp"],
-    "NGM95": ["tp", "cp"],
     "gfsLR": ["tp", "cp"],
     "RUC13": ["tp", "cp"],
     "RUC80": ["tp", "cp"],
@@ -3025,8 +3018,6 @@ DATABASES = [
              (NAM95, STD6_MODEL),
              (RUC13, STD1_MODEL),
              (RUC80, STD1_MODEL),
-             (NGM80, STD6_MODEL),
-             (NGM95, STD6_MODEL),
              (GFS40, STD6_MODEL),
              (GFS80, STD6_MODEL),
              (GFS75, STD6_MODEL),
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/PWPF.xml b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/PWPF.xml
new file mode 100644
index 0000000000..167339e333
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/PWPF.xml
@@ -0,0 +1,1569 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gridParamInfo xmlns:ns2="group">
+  <valtimeMINUSreftime>
+    <fcst>43200</fcst>
+    <fcst>64800</fcst>
+    <fcst>86400</fcst>
+    <fcst>108000</fcst>
+    <fcst>129600</fcst>
+    <fcst>151200</fcst>
+    <fcst>172800</fcst>
+    <fcst>194400</fcst>
+    <fcst>216000</fcst>
+    <fcst>237600</fcst>
+    <fcst>259200</fcst>
+  </valtimeMINUSreftime>
+
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn1in12hr</short_name>
+    <long_name>Prob of Snowfall &gt; 1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN1in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn1in24hr</short_name>
+    <long_name>Prob of Snowfall &gt; 1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN1in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn2in12hr</short_name>
+    <long_name>Prob of Snowfall &gt; 2 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN2in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn2in24hr</short_name>
+    <long_name>Prob of Snowfall &gt; 2 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN2in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn2in48hr</short_name>
+    <long_name>Prob of Snowfall &gt; 2 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN2in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn2in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 2 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN2in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn4in12hr</short_name>
+    <long_name>Prob of Snowfall &gt; 4 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN4in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn4in24hr</short_name>
+    <long_name>Prob of Snowfall &gt; 4 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN4in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn4in48hr</short_name>
+    <long_name>Prob of Snowfall &gt; 4 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN4in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn4in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 4 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN4in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn6in12hr</short_name>
+    <long_name>Prob of Snowfall &gt; 6 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN6in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn6in24hr</short_name>
+    <long_name>Prob of Snowfall &gt; 6 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN6in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn8in12hr</short_name>
+    <long_name>Prob of Snowfall &gt; 8 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN8in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn8in24hr</short_name>
+    <long_name>Prob of Snowfall &gt; 8 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN8in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn8in48hr</short_name>
+    <long_name>Prob of Snowfall &gt; 8 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN8in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn8in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 8 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN8in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn12in12hr</short_name>
+    <long_name>Prob of Snowfall &gt; 12 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN12in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn12in24hr</short_name>
+    <long_name>Prob of Snowfall &gt; 12 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN12in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn12in48hr</short_name>
+    <long_name>Prob of Snowfall &gt; 12 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN12in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn12in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 12 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN12in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn18in12hr</short_name>
+    <long_name>Prob of Snowfall &gt; 18 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN18in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn18in24hr</short_name>
+    <long_name>Prob of Snowfall &gt; 18 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN18in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn18in48hr</short_name>
+    <long_name>Prob of Snowfall &gt; 18 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN18in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn18in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 18 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN18in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn24in38hr</short_name>
+    <long_name>Prob of Snowfall &gt; 24 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN24in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn24in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 24 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN24in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn30in48hr</short_name>
+    <long_name>Prob of Snowfall &gt; 30 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN30in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn30in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 30 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>TOTSN30in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn5pct12hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(5)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN5pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn5pct24hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(5)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN5pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn5pct48hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(5)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN5pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn5pct72hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(5)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN5pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn10pct12hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(10)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN10pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn10pct24hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(10)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN10pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn10pct48hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(10)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN10pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn10pct72hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(10)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN10pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn25pct12hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(25)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN25pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn25pct24hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(25)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN25pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn25pct48hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(25)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN25pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn25pct72hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(25)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN25pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn50pct12hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(50)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN50pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn50pct24hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(50)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN50pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn50pct48hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(50)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN50pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn50pct72hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(50)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN50pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn75pct12hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(75)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN75pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn75pct24hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(75)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN75pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn75pct48hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(75)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN75pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn75pct72hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(75)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN75pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn90pct12hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(90)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN90pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn90pct24hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(90)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN90pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn90pct48hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(90)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN90pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn90pct72hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(90)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN90pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn95pct12hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(95)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN95pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn95pct24hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(95)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN95pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn95pct48hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(95)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN95pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>totsn95pct72hr</short_name>
+    <long_name>Snowfall Accumulation Percentile(95)</long_name>
+    <units>m</units>
+    <udunits>meters</udunits>
+    <uiname>TOTSN95pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>2.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr001in12hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.01 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.01in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr001in24hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.01 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.01in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr010in12hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.1in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr010in24hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.1in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr010in48hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.1in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr010in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 0.1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.1in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr025in12hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.25 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.25in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr025in24hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.25 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.25n24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr025in48hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.25 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.25in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr025in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 0.25 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.25in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr050in12hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.5 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.5in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr050in24hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.5 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.5in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr050in48hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 0.5 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.5in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr050in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 0.5 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR0.5in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr1in12hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR1in12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr1in24hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR1in24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr1in48hr</short_name>
+    <long_name>Prob of Freezing Rain &gt; 1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR1in48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr1in72hr</short_name>
+    <long_name>Prob of Snowfall &gt; 1 inch</long_name>
+    <units>%</units>
+    <udunits>percent</udunits>
+    <uiname>FRZR1in72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>100.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr5pct12hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(5)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR5pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr5pct24hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(5)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR5pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr5pct48hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(5)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR5pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr5pct72hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(5)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR5pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr10pct12hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(10)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR10pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr10pct24hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(10)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR10pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr10pct48hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(10)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR10pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr10pct72hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(10)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR10pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr25pct12hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(25)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR25pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr25pct24hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(25)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR25pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr25pct48hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(25)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR25pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr25pct72hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(25)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR25pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr50pct12hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(50)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR50pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr50pct24hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(50)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR50pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr50pct48hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(50)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR50pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr50pct72hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(50)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR50pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr75pct12hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(75)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR75pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr75pct24hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(75)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR75pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr75pct48hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(75)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR75pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr75pct72hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(75)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR75pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr90pct12hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(90)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR90pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr90pct24hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(90)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR90pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr90pct48hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(90)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR90pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr90pct72hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(90)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR90pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr95pct12hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(95)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR95pct12hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr95pct24hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(95)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR95pct24hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr95pct48hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(95)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR95pct48hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>frzr95pct72hr</short_name>
+    <long_name>Freezing Rain Accumulation Percentile(95)</long_name>
+    <units>mm</units>
+    <udunits>millimeters</udunits>
+    <uiname>FRZR95pct72hr</uiname>
+    <valid_range>0.0</valid_range>
+    <valid_range>254.0</valid_range>
+    <fillValue>-999999.0</fillValue>
+    <n3D>0</n3D>
+    <levelsDesc>SFC</levelsDesc>
+    <levels>
+      <level>SFC</level>
+    </levels>
+  </gridParameterInfo>
+
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>staticTopo</short_name>
+    <long_name>Topography</long_name>
+    <units>meters</units>
+    <fillValue>-99999.0</fillValue>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>staticCoriolis</short_name>
+    <long_name>Coriolis parameter</long_name>
+    <units>/s</units>
+    <fillValue>-99999.0</fillValue>
+  </gridParameterInfo>
+  <gridParameterInfo xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="parameterInfo">
+    <short_name>staticSpacing</short_name>
+    <long_name>Grid spacing</long_name>
+    <units>meters</units>
+    <fillValue>-99999.0</fillValue>
+  </gridParameterInfo>
+</gridParamInfo>
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_HLS.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_HLS.py
index d0348cfc80..7c0404a410 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_HLS.py
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/templates/product/Hazard_HLS.py
@@ -39,6 +39,10 @@ import string, time, re, os, glob, types, copy, LogStream
 import ModuleAccessor, SampleAnalysis
 from math import *
 import AbsTime, DatabaseID, StartupDialog
+from com.raytheon.uf.viz.core import VizApp
+from com.raytheon.uf.common.gfe.ifpclient import PyFPClient
+
+
 DEG_TO_RAD = 0.017453292
 
 from com.raytheon.uf.common.dataplugin.gfe.reference import ReferenceData, ReferenceID
@@ -6061,7 +6065,7 @@ NNNN
         dataMgr = parent
         argDict['dataMgr'] = dataMgr
         argDict["databaseID"] = self._getDbId(dataMgr, definition['database'])
-        argDict["ifpClient"] = dataMgr.getClient()
+        argDict["ifpClient"] = PyFPClient(VizApp.getWsId(), dataMgr.getSiteID())
         import VTECMessageType
         vtecMode = VTECMessageType.getVTECMessageType(self._pil)
         argDict["vtecMode"] = vtecMode
diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.goessounding/META-INF/MANIFEST.MF
index 4af4cc9457..a262e7c3da 100644
--- a/edexOsgi/com.raytheon.edex.plugin.goessounding/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Goessounding Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.goessounding
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
@@ -23,4 +23,4 @@ Import-Package: com.raytheon.uf.common.dataplugin.goessounding,
  com.raytheon.uf.edex.bufrtools.descriptors,
  com.raytheon.uf.edex.bufrtools.packets,
  com.raytheon.uf.edex.pointdata,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/GOESSndgSeparatorFactory.java b/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/GOESSndgSeparatorFactory.java
index 9744eda632..862b67f49f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/GOESSndgSeparatorFactory.java
+++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/GOESSndgSeparatorFactory.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.edex.plugin.goessounding;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 
@@ -33,7 +33,8 @@ import com.raytheon.edex.esb.Headers;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 6, 2009            jkorman     Initial creation
+ * Oct 06, 2009            jkorman     Initial creation
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -43,8 +44,8 @@ import com.raytheon.edex.esb.Headers;
 
 public class GOESSndgSeparatorFactory {
 
-    private static Log logger = LogFactory
-            .getLog(GOESSndgSeparatorFactory.class);
+    private static Logger logger = LoggerFactory
+            .getLogger(GOESSndgSeparatorFactory.class);
 
     /**
      * Factory method to return a separator to the client.
diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/GOESSoundingDecoder.java b/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/GOESSoundingDecoder.java
index a160f877c9..6452670416 100644
--- a/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/GOESSoundingDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/GOESSoundingDecoder.java
@@ -26,8 +26,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
@@ -62,6 +62,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
  * Nov 25, 2008 1684       chammack    Camel Refactor
  * May 15, 2013 1869       bsteffen    Remove DataURI from goes/poes soundings.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -75,7 +76,7 @@ public class GOESSoundingDecoder extends AbstractDecoder implements
     public static final String PLUGIN_NAME = "goessounding";
 
     /** The logger */
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private PointDataDescription pdd;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/decoder/GOESSoundingDataAdapter.java b/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/decoder/GOESSoundingDataAdapter.java
index 1e698ca919..50567e67d4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/decoder/GOESSoundingDataAdapter.java
+++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/decoder/GOESSoundingDataAdapter.java
@@ -24,8 +24,8 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.goessounding.dao.GOESSoundingDAO;
 import com.raytheon.uf.common.dataplugin.goessounding.GOESSounding;
@@ -63,6 +63,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed TimeTools usage
  * Jul 23, 2014 3410       bclement    location changed to floats
  * Sep 16, 2014 3628       mapeters    Replaced static imports.
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -71,8 +72,8 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
  */
 public class GOESSoundingDataAdapter {
 
-    private static Log logger = LogFactory
-            .getLog(GOESSoundingDataAdapter.class);
+    private static Logger logger = LoggerFactory
+            .getLogger(GOESSoundingDataAdapter.class);
 
     private static final String SPI_FILE = "goesBufr.spi";
 
@@ -162,22 +163,23 @@ public class GOESSoundingDataAdapter {
 
             index = SAT_YEAR_POS;
             dp = dataList.get(index++);
-            year = getInt(dp,null);
-            
-//            year = (dp.getValue() != null) ? ((Number) dp.getValue())
-//                    .intValue() : null;
-            dp = dataList.get(index++);
-            day = getInt(dp,null);
+            year = getInt(dp, null);
 
-//            day = (dp.getValue() != null) ? ((Number) dp.getValue()).intValue()
-//                    : null;
+            // year = (dp.getValue() != null) ? ((Number) dp.getValue())
+            // .intValue() : null;
+            dp = dataList.get(index++);
+            day = getInt(dp, null);
+
+            // day = (dp.getValue() != null) ? ((Number)
+            // dp.getValue()).intValue()
+            // : null;
 
             dp = dataList.get(index++);
-            lat = getDouble(dp,null);
-//            lat = ((Number) dp.getValue()).doubleValue();
+            lat = getDouble(dp, null);
+            // lat = ((Number) dp.getValue()).doubleValue();
             dp = dataList.get(index++);
-            lon = getDouble(dp,null);
-//            lon = ((Number) dp.getValue()).doubleValue();
+            lon = getDouble(dp, null);
+            // lon = ((Number) dp.getValue()).doubleValue();
 
             // If we have lat/lon data, set it into the obs object. Otherwise
             // no need to go further, set the obs object to null and quit!
@@ -202,19 +204,19 @@ public class GOESSoundingDataAdapter {
             }
             if (obsData != null) {
                 dp = dataList.get(index++);
-                hour = getInt(dp,null);
-//                hour = (dp.getValue() != null) ? ((Double) dp.getValue())
-//                        .intValue() : null;
+                hour = getInt(dp, null);
+                // hour = (dp.getValue() != null) ? ((Double) dp.getValue())
+                // .intValue() : null;
 
                 dp = dataList.get(index++);
-                minute = getInt(dp,null);
-//                minute = (dp.getValue() != null) ? ((Double) dp.getValue())
-//                        .intValue() : null;
+                minute = getInt(dp, null);
+                // minute = (dp.getValue() != null) ? ((Double) dp.getValue())
+                // .intValue() : null;
 
                 dp = dataList.get(index++);
-                seconds = getInt(dp,null);
-//                seconds = (dp.getValue() != null) ? ((Double) dp.getValue())
-//                        .intValue() : null;
+                seconds = getInt(dp, null);
+                // seconds = (dp.getValue() != null) ? ((Double) dp.getValue())
+                // .intValue() : null;
 
                 Calendar baseTime = TimeUtil.newGmtCalendar(year, 1, 1);
                 baseTime.set(Calendar.DAY_OF_YEAR, day);
@@ -247,27 +249,27 @@ public class GOESSoundingDataAdapter {
             int n;
 
             IBUFRDataPacket dp = dataList.get(SAT_ID_POS);
-            n = getInt(dp,-9999);
-//            n = (dp.getValue() != null) ? ((Long) dp.getValue()).intValue()
-//                    : -9999;
+            n = getInt(dp, -9999);
+            // n = (dp.getValue() != null) ? ((Long) dp.getValue()).intValue()
+            // : -9999;
             view.setInt("satid", n);
 
             dp = dataList.get(SAT_PROC_INSTR);
-            n = getInt(dp,-9999);
-//            n = (dp.getValue() != null) ? ((Long) dp.getValue()).intValue()
-//                    : -9999;
+            n = getInt(dp, -9999);
+            // n = (dp.getValue() != null) ? ((Long) dp.getValue()).intValue()
+            // : -9999;
             view.setInt("satinstrument", n);
 
             dp = dataList.get(SAT_QUAL_POS);
-            n = getInt(dp,-9999);
-//            n = (dp.getValue() != null) ? ((Long) dp.getValue()).intValue()
-//                    : -9999;
+            n = getInt(dp, -9999);
+            // n = (dp.getValue() != null) ? ((Long) dp.getValue()).intValue()
+            // : -9999;
             view.setInt("qualityinfo", n);
 
             dp = dataList.get(SAT_CHANNELS_POS);
-            n = getInt(dp,-9999);
-//            n = (dp.getValue() != null) ? ((Long) dp.getValue()).intValue()
-//                    : -9999;
+            n = getInt(dp, -9999);
+            // n = (dp.getValue() != null) ? ((Long) dp.getValue()).intValue()
+            // : -9999;
             view.setInt("sounderchannels", n);
 
             // TODO: need elevation
@@ -375,13 +377,13 @@ public class GOESSoundingDataAdapter {
      */
     private static Double getDouble(IBUFRDataPacket packet, Double defaultValue) {
         Double retValue = defaultValue;
-        if(packet != null) {
+        if (packet != null) {
             Object o = packet.getValue();
-            if(o instanceof Double) {
+            if (o instanceof Double) {
                 retValue = ((Double) o).doubleValue();
-            } else if(o instanceof Long) {
+            } else if (o instanceof Long) {
                 retValue = ((Long) o).doubleValue();
-            } 
+            }
         }
         return retValue;
     }
@@ -394,19 +396,17 @@ public class GOESSoundingDataAdapter {
      */
     private static Integer getInt(IBUFRDataPacket packet, Integer defaultValue) {
         Integer retValue = defaultValue;
-        if(packet != null) {
+        if (packet != null) {
             Object o = packet.getValue();
-            if(o instanceof Double) {
+            if (o instanceof Double) {
                 retValue = ((Double) o).intValue();
-            } else if(o instanceof Long) {
+            } else if (o instanceof Long) {
                 retValue = ((Long) o).intValue();
-            } 
+            }
         }
         return retValue;
     }
-    
-    
-    
+
     /**
      * 
      * @return
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py b/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
index 226885dd15..90560cde48 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
@@ -26,6 +26,7 @@
 # Jul 07, 2014 3344       rferrel     Change GRID_FILL_VALUE to new plugin location.
 # Mar 05, 2015 3959       rjpeter     Fix subgrid across seam of world wide grid.
 # Oct 01, 2015 4868       rjpeter     Discard invalid subgrids.
+# Dec 16, 2015 5182       tjensen     Updated GribModelLookup calls to pass in filepath.
 # 
 
 import grib2
@@ -1223,7 +1224,7 @@ class GribDecoder():
 
         process = gribDict['genprocess']
         processType = gribDict['processType']
-        gridModel = GribModelLookup.getInstance().getModel(center, subcenter, grid, process, processType)
+        gridModel = GribModelLookup.getInstance().getModel(center, subcenter, grid, process, processType, self.fileName)
         return gridModel
     
     def _createModelName(self, gribDict, grid):
@@ -1232,7 +1233,7 @@ class GribDecoder():
 
         process = gribDict['genprocess']
         processType = gribDict['processType']
-        return GribModelLookup.getInstance().getModelName(center, subcenter, grid, process, processType)
+        return GribModelLookup.getInstance().getModelName(center, subcenter, grid, process, processType, self.fileName)
         
     def _checkForecastFlag(self, gribDict, grid, dataTime):
         gridModel = self._getGridModel(gribDict, grid)
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
index 741e417733..e2f5a20a29 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Grib Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.grib
-Bundle-Version: 1.15.1.qualifier
+Bundle-Version: 1.15.2.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common;bundle-version="1.14.0",
  com.raytheon.uf.common.awipstools,
@@ -16,7 +16,7 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.14.0",
  com.raytheon.uf.edex.plugin.grid,
  com.raytheon.uf.edex.python.decoder,
  org.apache.camel;bundle-version="2.12.3",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  javax.measure,
  ucar.nc2,
  org.jep;bundle-version="3.3.0"
@@ -27,4 +27,4 @@ Export-Package: com.raytheon.edex.plugin.grib,
  com.raytheon.edex.plugin.grib.util,
  com.raytheon.edex.util.grib
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: org.apache.commons.logging
+Import-Package: org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
index 89b92b439b..f1b5031409 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
@@ -101,6 +101,7 @@ import com.raytheon.uf.common.util.mapping.MultipleMappingException;
  * Sep 09, 2014  3356     njensen     Remove CommunicationException
  * Mar 05, 2015  3959     rjpeter     Added world wrap check to subGrid.
  * Oct 01, 2015  4868     rjpeter     Discard invalid subgrids.
+ * Dec 16, 2015  5182     tjensen     Updated GribModelLookup calls to pass in filepath.
  * </pre>
  * 
  * @author bphillip
@@ -159,7 +160,7 @@ public class Grib1Decoder {
             ArrayList<Grib1Record> records = g1i.getRecords();
             List<GridRecord> gribRecords = new ArrayList<GridRecord>();
             for (int i = 0; i < records.size(); i++) {
-                GridRecord rec = decodeRecord(records.get(i), raf);
+                GridRecord rec = decodeRecord(records.get(i), raf, fileName);
                 if (rec != null) {
                     gribRecords.add(rec);
                 }
@@ -194,12 +195,14 @@ public class Grib1Decoder {
      *            The record to decode
      * @param raf
      *            The file object
+     * @param filePath
+     *            The path of the file to decode
      * @return The decoded GridRecord
      * @throws GribException
      *             If the record cannot be decoded properly
      */
-    private GridRecord decodeRecord(Grib1Record rec, RandomAccessFile raf)
-            throws GribException {
+    private GridRecord decodeRecord(Grib1Record rec, RandomAccessFile raf,
+            String filePath) throws GribException {
 
         GridRecord retVal = new GridRecord();
 
@@ -321,7 +324,7 @@ public class Grib1Decoder {
         retVal.addExtraAttribute("gridid", gridCoverage.getName());
 
         retVal.setDatasetId(createModelName(centerid, subcenterid, genProcess,
-                gridCoverage));
+                gridCoverage, filePath));
 
         // Get the level information
         float[] levelMetadata = this.convertGrib1LevelInfo(
@@ -512,7 +515,7 @@ public class Grib1Decoder {
 
         // check if FLAG.FCST_USED needs to be removed
         checkForecastFlag(retVal.getDataTime(), centerid, subcenterid,
-                genProcess, gridCoverage);
+                genProcess, gridCoverage, filePath);
 
         return retVal;
     }
@@ -927,29 +930,31 @@ public class Grib1Decoder {
      * @param centerId
      * @param subcenterId
      * @param process
+     * @param filePath
      * @param gridId
      * @return
      */
     private String createModelName(int centerId, int subcenterId, int process,
-            GridCoverage grid) {
+            GridCoverage grid, String filePath) {
         return GribModelLookup.getInstance().getModelName(centerId,
-                subcenterId, grid, process, null);
+                subcenterId, grid, process, null, filePath);
     }
 
     /**
      * Check if the forecast flag should be removed
      * 
      * @param time
-     *            he datatime to remove forecast flag if needed
+     *            The datatime to remove forecast flag if needed
      * @param centerId
      * @param subcenterId
      * @param process
+     * @param filePath
      * @param gridId
      */
     private void checkForecastFlag(DataTime time, int centerId,
-            int subcenterId, int process, GridCoverage grid) {
+            int subcenterId, int process, GridCoverage grid, String filePath) {
         GridModel gridModel = GribModelLookup.getInstance().getModel(centerId,
-                subcenterId, grid, process, null);
+                subcenterId, grid, process, null, filePath);
         if ((gridModel != null) && gridModel.getAnalysisOnly()) {
             time.getUtilityFlags().remove(FLAG.FCST_USED);
         }
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TemperatureCorrectionPostProcessor.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TemperatureCorrectionPostProcessor.java
index ae793148db..71ad860f54 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TemperatureCorrectionPostProcessor.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TemperatureCorrectionPostProcessor.java
@@ -19,6 +19,7 @@
  **/
 package com.raytheon.edex.plugin.grib.decoderpostprocessors;
 
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,10 +35,9 @@ import javax.xml.bind.annotation.XmlRootElement;
 
 import com.raytheon.edex.plugin.grib.exception.GribException;
 import com.raytheon.uf.common.dataplugin.grid.GridRecord;
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.parameter.Parameter;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -45,32 +45,33 @@ import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
- *
+ * 
  * Adjusts temperature values that are mislabled as Celsius or Kelvin when they
  * actually represent the other one. Loads a list of parameters and thresholds
  * from a localization file. Assumes that all values above the threshold for a
  * parameter are in Kelvin and will convert if the declared unit is Celsius.
  * Values below the threshold are assumed to be in Celsius and will be converted
  * if the declared unit is Kelvin
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date          Ticket#  Engineer    Description
  * ------------- -------- ----------- --------------------------
  * Mar 28, 2010  2874     bsteffen    Initial creation
  * Apr 25, 2014  2060     njensen     Use JAXB instead of JAXBManager
  * Oct 07, 2015  3756     nabowle     Extends DecoderPostProcessor.
- *
- *
+ * Feb 16, 2016  5237     bsteffen    Replace deprecated localization API.
+ * 
+ * 
  * </pre>
- *
+ * 
  * @author bsteffen
  * @version 1.0
  */
 public class TemperatureCorrectionPostProcessor extends DecoderPostProcessor
-        implements ILocalizationFileObserver {
+        implements ILocalizationPathObserver {
 
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(TemperatureCorrectionPostProcessor.class);
@@ -86,21 +87,21 @@ public class TemperatureCorrectionPostProcessor extends DecoderPostProcessor
 
     private Map<String, Double> paramThresholdMap;
 
-    public TemperatureCorrectionPostProcessor() throws GribException {
-        LocalizationFile file = readConfiguration();
-        if (file != null) {
-            file.addFileUpdatedObserver(this);
-        }
+    public TemperatureCorrectionPostProcessor() {
+        readConfiguration();
+        PathManagerFactory.getPathManager().addLocalizationPathObserver(
+                LOCALIZATON_LOCATION, this);
+
     }
 
-    protected LocalizationFile readConfiguration() {
-        LocalizationFile file = PathManagerFactory.getPathManager()
+    protected void readConfiguration() {
+        ILocalizationFile file = PathManagerFactory.getPathManager()
                 .getStaticLocalizationFile(LOCALIZATON_LOCATION);
         Map<String, Double> paramThresholdMap = new HashMap<String, Double>(8);
         if (file != null && file.exists()) {
             TemperatureCorrectionParameters params = null;
-            try {
-                params = JAXB.unmarshal(file.getFile(),
+            try (InputStream is = file.openInputStream()) {
+                params = JAXB.unmarshal(is,
                         TemperatureCorrectionParameters.class);
             } catch (Exception e) {
                 /* Some hope of recovering with a better file. */
@@ -119,11 +120,10 @@ public class TemperatureCorrectionPostProcessor extends DecoderPostProcessor
             }
         }
         this.paramThresholdMap = paramThresholdMap;
-        return file;
     }
 
     @Override
-    public void fileUpdated(FileUpdatedMessage message) {
+    public void fileChanged(ILocalizationFile file) {
         try {
             readConfiguration();
         } catch (Exception e) {
@@ -209,4 +209,5 @@ public class TemperatureCorrectionPostProcessor extends DecoderPostProcessor
         }
 
     }
+
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
index c24e5f1e4d..2b298116b8 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
@@ -21,6 +21,7 @@
 package com.raytheon.edex.plugin.grib.spatial;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
@@ -43,10 +44,10 @@ import com.raytheon.uf.common.gridcoverage.GridCoverage;
 import com.raytheon.uf.common.gridcoverage.exception.GridCoverageException;
 import com.raytheon.uf.common.gridcoverage.lookup.GridCoverageLookup;
 import com.raytheon.uf.common.gridcoverage.subgrid.SubGrid;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
@@ -82,6 +83,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Jul 21, 2014  3373     bclement     JAXB managers only live during initializeGrids()
  * Mar 04, 2015  3959     rjpeter      Update for grid based subgridding.
  * Sep 28, 2015  4868     rjpeter      Allow subgrids to be defined per coverage.
+ * Feb 16, 2016  5237     bsteffen     Replace deprecated localization API.
+ * 
  * </pre>
  * 
  * @author bphillip
@@ -633,16 +636,15 @@ public class GribSpatialCache {
     private Coordinate getDefaultSubGridCenterPoint() throws Exception {
         Coordinate defaultCenterPoint = null;
         IPathManager pm = PathManagerFactory.getPathManager();
-        LocalizationFile defaultSubGridLocationFile = pm
+        ILocalizationFile defaultSubGridLocationFile = pm
                 .getStaticLocalizationFile("/grib/defaultSubGridCenterPoint.xml");
         SingleTypeJAXBManager<DefaultSubGridCenterPoint> subGridCenterJaxb = new SingleTypeJAXBManager<DefaultSubGridCenterPoint>(
                 DefaultSubGridCenterPoint.class);
         if ((defaultSubGridLocationFile != null)
                 && defaultSubGridLocationFile.exists()) {
-            try {
-                DefaultSubGridCenterPoint defaultSubGridLocation = defaultSubGridLocationFile
-                        .jaxbUnmarshal(DefaultSubGridCenterPoint.class,
-                                subGridCenterJaxb);
+            try (InputStream is = defaultSubGridLocationFile.openInputStream()) {
+                DefaultSubGridCenterPoint defaultSubGridLocation = subGridCenterJaxb
+                        .unmarshalFromInputStream(is);
                 if ((defaultSubGridLocation != null)
                         && (defaultSubGridLocation.getCenterLatitude() != null)
                         && (defaultSubGridLocation.getCenterLongitude() != null)) {
@@ -657,8 +659,7 @@ public class GribSpatialCache {
             } catch (Exception e) {
                 statusHandler.error(
                         "Unable to load default sub grid location from file: "
-                                + defaultSubGridLocationFile.getFile()
-                                        .getAbsolutePath(), e);
+                                + defaultSubGridLocationFile.getPath(), e);
             }
         }
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/Grib1Parameter.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/Grib1Parameter.java
index 4f46da5620..0e8528a14d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/Grib1Parameter.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/Grib1Parameter.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@@ -127,6 +127,7 @@ public class Grib1Parameter {
         this.id = hashCode();
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         builder.append(center);
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/Grib1ParameterLookup.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/Grib1ParameterLookup.java
index 690741690a..fbff70d3e2 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/Grib1ParameterLookup.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/Grib1ParameterLookup.java
@@ -24,8 +24,8 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.grib.exception.GribException;
 import com.raytheon.uf.common.localization.IPathManager;
@@ -47,6 +47,7 @@ import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
  * Mar 09, 2010  4758     bphillip    Initial Creation
  * Oct 15, 2013  2473     bsteffen    Remove deprecated method calls.
  * Jul 21, 2014  3373     bclement    JAXB manager API changes
+ * Dec 15, 2015  5166     kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -58,7 +59,7 @@ public class Grib1ParameterLookup {
             + "grib1ParameterConvTable.xml";
 
     /** The logger */
-    protected transient Log logger = LogFactory.getLog(getClass());
+    protected transient Logger logger = LoggerFactory.getLogger(getClass());
 
     /** The singleton instance */
     private static Grib1ParameterLookup instance;
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribLevel.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribLevel.java
index f271d4fc47..8d18076e17 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribLevel.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribLevel.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@@ -122,6 +122,7 @@ public class GribLevel {
         this.id = hashCode();
     }
 
+    @Override
     public int hashCode() {
         HashCodeBuilder builder = new HashCodeBuilder();
         builder.append(center);
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
index 6a20481976..82630f371a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
@@ -19,21 +19,29 @@
  **/
 package com.raytheon.edex.plugin.grib.util;
 
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
 
 import javax.xml.bind.JAXB;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.grib.spatial.GribSpatialCache;
 import com.raytheon.uf.common.dataplugin.grid.mapping.DatasetIdMapper;
 import com.raytheon.uf.common.gridcoverage.GridCoverage;
+import com.raytheon.uf.common.gridcoverage.exception.GridCoverageException;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -58,7 +66,11 @@ import com.raytheon.uf.common.util.mapping.MultipleMappingException;
  * Apr 25, 2014  2874     bsteffen    Add processType
  * Jul 02, 2014  3230     rferrel     Recursively get model files in initModelList.
  * Jul 30, 2014  3455     bsteffen    Allow model matching with no grid defined.
- * 
+ * Dec 15, 2015  5166     kbisanz     Update logging to use SLF4J
+ * Dec 16, 2015  5182     tjensen     Added functionality for file name regex 
+ *                                    matching and support for meta characters in 
+ *                                    model names.
+ * Feb 16, 2016  5237     bsteffen    Replace deprecated localization API.
  * 
  * </pre>
  * 
@@ -70,7 +82,7 @@ public class GribModelLookup {
             .getHandler(GribModelLookup.class);
 
     /** The logger */
-    protected transient Log logger = LogFactory.getLog(getClass());
+    protected transient Logger logger = LoggerFactory.getLogger(getClass());
 
     /** The singleton instance of GribModelLookup **/
     private static GribModelLookup instance;
@@ -82,6 +94,8 @@ public class GribModelLookup {
      */
     private final Map<String, GridModel> models;
 
+    private List<GridModel> regexModels;
+
     /** A map of the models. The key is the title of the model */
     private final Map<String, GridModel> modelsByName;
 
@@ -95,6 +109,7 @@ public class GribModelLookup {
     private GribModelLookup() {
         models = new HashMap<String, GridModel>();
         modelsByName = new HashMap<String, GridModel>();
+        regexModels = new ArrayList<GridModel>();
         initModelList();
     }
 
@@ -114,14 +129,22 @@ public class GribModelLookup {
      *            this method expects the byte to be resolved to a string by
      *            looking up the type id in the grib tables(4.3). grib1 does not
      *            include a value for process type so null is acceptable.
+     * @param filePath
+     *            the path to the the grib file.
      * @return The grid model if one is find or null if no such model is defined
      *         in the localization files..
      */
     public GridModel getModel(int center, int subcenter, GridCoverage grid,
-            int process, String processType) {
-        /* Match all fields */
-        GridModel model = getModelSimple(center, subcenter, grid, process,
-                processType);
+            int process, String processType, String filePath) {
+
+        /* Check for regex matching */
+        GridModel model = getModelRegex(center, subcenter, grid, process,
+                processType, filePath);
+        if (model == null) {
+            /* Match all fields */
+            model = getModelSimple(center, subcenter, grid, process,
+                    processType);
+        }
         if (model == null && processType != null) {
             /* Match with no processType specified */
             model = getModelSimple(center, subcenter, grid, process, null);
@@ -157,8 +180,51 @@ public class GribModelLookup {
         return null;
     }
 
-    public GridModel getModelByName(String name) {
-        return modelsByName.get(name);
+    private GridModel getModelRegex(int center, int subcenter,
+            GridCoverage grid, int process, String processType, String filePath) {
+        Path path = Paths.get(filePath);
+        String fileName = path.getFileName().toString();
+        for (GridModel model : regexModels) {
+            Matcher m = model.getNamePattern().matcher(fileName);
+            if (m.matches()) {
+                /* If pattern matches, compare other fields if available */
+                if (!(model.getAllGrids().isEmpty()) && grid != null) {
+                    boolean gridMatch = !Collections.disjoint(model
+                            .getAllGrids(), GribSpatialCache.getInstance()
+                            .getGribCoverageNames(grid));
+                    if (!gridMatch) {
+                        continue;
+                    }
+                }
+                if (model.getProcess() != null && !model.getProcess().isEmpty()) {
+                    boolean pidMatch = false;
+                    for (int pid : model.getProcess()) {
+                        if (pid == process) {
+                            pidMatch = true;
+                            break;
+                        }
+                    }
+                    if (!pidMatch) {
+                        continue;
+                    }
+                }
+                if (model.getCenter() != null && center != model.getCenter()) {
+                    continue;
+                }
+                if (model.getSubCenter() != null
+                        && subcenter != Integer.parseInt(model.getSubCenter())) {
+                    continue;
+                }
+                if (model.getProcessType() != null
+                        && model.getProcessType().equals(processType) == false) {
+                    continue;
+                }
+
+                return model;
+
+            }
+        }
+        return null;
     }
 
     public Set<String> getModelNames() {
@@ -166,9 +232,9 @@ public class GribModelLookup {
     }
 
     public String getModelName(int center, int subcenter, GridCoverage grid,
-            int process, String processType) {
+            int process, String processType, String filePath) {
         GridModel model = getModel(center, subcenter, grid, process,
-                processType);
+                processType, filePath);
         if (model == null || model.getName() == null) {
             String cenSubProc = "GribModel:" + String.valueOf(center) + ":"
                     + String.valueOf(subcenter) + ":" + String.valueOf(process);
@@ -201,7 +267,13 @@ public class GribModelLookup {
                 return e.getArbitraryMapping();
             }
         } else {
-            return model.getName();
+            String retval = model.getName();
+            try {
+                retval = model.getTransformedName(grid, filePath);
+            } catch (GridCoverageException e) {
+                statusHandler.handle(Priority.WARN, e.getLocalizedMessage(), e);
+            }
+            return retval;
         }
     }
 
@@ -218,7 +290,7 @@ public class GribModelLookup {
                         LocalizationContext.LocalizationType.EDEX_STATIC,
                         LocalizationContext.LocalizationLevel.SITE);
 
-        LocalizationFile[] modelFiles = PathManagerFactory.getPathManager()
+        ILocalizationFile[] modelFiles = PathManagerFactory.getPathManager()
                 .listFiles(
                         new LocalizationContext[] { edexStaticBase,
                                 edexStaticSite },
@@ -227,10 +299,9 @@ public class GribModelLookup {
 
         GridModelSet modelSet = new GridModelSet();
 
-        for (LocalizationFile modelFile : modelFiles) {
-            try {
-                GridModelSet fileSet = JAXB.unmarshal(modelFile.getFile(),
-                        GridModelSet.class);
+        for (ILocalizationFile modelFile : modelFiles) {
+            try (InputStream is = modelFile.openInputStream()) {
+                GridModelSet fileSet = JAXB.unmarshal(is, GridModelSet.class);
                 modelSet.addModels(fileSet.getModels());
             } catch (Exception e) {
                 logger.error("Unable to unmarshal grib models file:"
@@ -245,18 +316,28 @@ public class GribModelLookup {
 
     private void addModels(GridModelSet modelSet) {
         for (GridModel model : modelSet.getModels()) {
-            int subCenter = Integer.parseInt(model.getSubCenter());
+
+            String validNameError = model.checkValidName();
+            if (!("".equals(validNameError))) {
+                logger.error(validNameError);
+            }
+
             modelsByName.put(model.getName(), model);
-            for (int process : model.getProcess()) {
-                if (model.getAllGrids().isEmpty()) {
-                    String key = toKey(model.getCenter(), subCenter, null,
-                            process, model.getProcessType());
-                    models.put(key, model);
-                }
-                for (String grid : model.getAllGrids()) {
-                    String key = toKey(model.getCenter(), subCenter, grid,
-                            process, model.getProcessType());
-                    models.put(key, model);
+            if (model.getFileNameRegex() != null) {
+                regexModels.add(model);
+            } else {
+                int subCenter = Integer.parseInt(model.getSubCenter());
+                for (int process : model.getProcess()) {
+                    if (model.getAllGrids().isEmpty()) {
+                        String key = toKey(model.getCenter(), subCenter, null,
+                                process, model.getProcessType());
+                        models.put(key, model);
+                    }
+                    for (String grid : model.getAllGrids()) {
+                        String key = toKey(model.getCenter(), subCenter, grid,
+                                process, model.getProcessType());
+                        models.put(key, model);
+                    }
                 }
             }
         }
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
index 5c5b806698..cc69ff9a34 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridModel.java
@@ -19,14 +19,22 @@
  **/
 package com.raytheon.edex.plugin.grib.util;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
+import com.raytheon.edex.plugin.grib.spatial.GribSpatialCache;
+import com.raytheon.uf.common.gridcoverage.GridCoverage;
+import com.raytheon.uf.common.gridcoverage.exception.GridCoverageException;
+
 /**
  * 
  * Contains the grib fields that map to a specific grid dataset.
@@ -38,6 +46,8 @@ import javax.xml.bind.annotation.XmlElementWrapper;
  * Date          Ticket#  Engineer    Description
  * ------------- -------- ----------- --------------------------
  * Oct 15, 2013  2473     bsteffen    Remove deprecated ISerializableObject.
+ * Dec 16, 2015  5182     tjensen     Added fileName and support for meta 
+ *                                    characters in the model name.
  * 
  * </pre>
  * 
@@ -52,7 +62,25 @@ public class GridModel {
     @XmlElement
     private String title;
 
-    /** The model name */
+    /**
+     * The model name. May contain certain meta characters to allow simple
+     * generation of names based on model information.
+     * 
+     * <pre>
+     * Supported meta characters are:
+     *   ${COVERAGE}  Replaced with the grid name of associated with the model
+     *   ${REGION}    Replaced with the name of the region for the GridCoverage
+     *                associated with the model.
+     *   ${RES(:(\d+)?(:([01]))?)?}
+     *                Replaced with the resolution of the grid associated with
+     *                the model. May provide optional information to specify
+     *                the precision (\d+) and whether or not to add the units
+     *                to the resolution ([01]) may be provided. Defaults to
+     *                precision stored in grid and no units.
+     *   ${\d+}       Replaced with corresponding numbered group from the
+     *                provided file name regex.
+     * </pre>
+     */
     @XmlElement
     private String name;
 
@@ -79,7 +107,7 @@ public class GridModel {
     /** The generating processes associated with this model */
     @XmlElement
     private String processType;
-    
+
     @XmlElement
     private String alias;
 
@@ -95,6 +123,34 @@ public class GridModel {
     @XmlElement
     private boolean analysisOnly;
 
+    /**
+     * The regex file names for this model must match.
+     */
+    @XmlElement
+    private String fileNameRegex;
+
+    private Pattern namePattern;
+
+    public String getFileNameRegex() {
+        return fileNameRegex;
+    }
+
+    public void setFileNameRegex(String fileName) {
+        this.fileNameRegex = fileName;
+    }
+
+    /**
+     * Get the compiled pattern for the file name regex if it is not null.
+     * 
+     * @return Pattern for file name regex
+     */
+    public Pattern getNamePattern() {
+        if (fileNameRegex != null && namePattern == null) {
+            namePattern = Pattern.compile(fileNameRegex);
+        }
+        return namePattern;
+    }
+
     /**
      * use datasetInfo instead
      */
@@ -119,6 +175,163 @@ public class GridModel {
         this.name = name;
     }
 
+    private static final Pattern metaRegex = Pattern.compile("\\$\\{.*?\\}");
+
+    private static final Pattern covRegex = Pattern
+            .compile("\\$\\{COVERAGE\\}");
+
+    private static final Pattern resRegex = Pattern
+            .compile("\\$\\{RES(:(\\d+)?(:([01]))?)?\\}");
+
+    private static final Pattern regRegex = Pattern.compile("\\$\\{REGION\\}");
+
+    private static final Pattern groupRegex = Pattern
+            .compile("\\$\\{(\\d+)\\}");
+
+    /**
+     * Gets the name of the model with all accepted meta characters replaced
+     * with the appropriate values.
+     * 
+     * @param gc
+     *            GridCoverage used to get the resolution information.
+     * @param filePath
+     * @param myGrid
+     *            Grid used to get the grid and region information.
+     * @return model name with meta characters replaced.
+     * @throws GridCoverageException
+     */
+    public String getTransformedName(GridCoverage gc, String filePath)
+            throws GridCoverageException {
+        String retval = name;
+        /*
+         * if name contains "${COVERAGE}", replace it with the appropriate grid
+         * coverage name
+         */
+        Matcher covMatch = covRegex.matcher(retval);
+        if (covMatch.find()) {
+            if (GribSpatialCache.getInstance().getGribCoverageNames(gc).size() != 1) {
+                throw new GridCoverageException(
+                        "Unable to determine model name for spatial coverage");
+            }
+            retval = covMatch.replaceAll(gc.getName());
+        }
+
+        /*
+         * if name contains "${RES(:(d+)?(:([01]))?)?}", replace it with
+         * resolution. "d+" is the number of decimal places to set resolution
+         * to. "[01]" is a boolean for whether or not to add units.
+         */
+        Matcher resMatch = resRegex.matcher(retval);
+        if (resMatch.find()) {
+            resMatch.reset();
+            StringBuffer sb = new StringBuffer();
+            while (resMatch.find()) {
+                String resReplace = "";
+
+                /*
+                 * If we have a precision specified in our match, display
+                 * resolution in that precision. Else default to the precision
+                 * stored in the GridCoverage
+                 */
+                if (resMatch.group(2) != null) {
+                    resReplace += String.format("%." + resMatch.group(2) + "f",
+                            gc.getDx());
+                } else {
+                    resReplace += gc.getDx();
+                }
+
+                /*
+                 * If we have a boolean for displaying units and its value is
+                 * "1", add units to the resolution.
+                 */
+                if (resMatch.group(4) != null && resMatch.group(4).equals("1")) {
+                    resReplace += gc.getSpacingUnit();
+                }
+                resMatch.appendReplacement(sb, resReplace);
+            }
+            resMatch.appendTail(sb);
+            retval = sb.toString();
+        }
+
+        // if name contains ${REGION}, replace it with the appropriate region.
+        Matcher regMatch = regRegex.matcher(retval);
+        if (regMatch.find()) {
+            String region = GridRegionLookup.getInstance().determineRegion(gc);
+
+            if (region != null) {
+                retval = regMatch.replaceAll(region);
+            } else {
+                retval = regMatch.replaceAll("UNK");
+            }
+        }
+
+        // if name contains "${1}", "${2}", etc and the model has a fileName
+        // regex, pull the value of the noted group from the file name and
+        // insert it into the model name.
+        Matcher groupMatch = groupRegex.matcher(retval);
+        if (fileNameRegex != null && groupMatch.find()) {
+            groupMatch.reset();
+            Path path = Paths.get(filePath);
+            String myFileName = path.getFileName().toString();
+            Matcher fileMatch = getNamePattern().matcher(myFileName);
+
+            StringBuffer sb = new StringBuffer();
+            while (groupMatch.find()) {
+                int groupNum = Integer.parseInt(groupMatch.group(1));
+                if (fileMatch.groupCount() >= groupNum && fileMatch.find()) {
+                    groupMatch.appendReplacement(sb, fileMatch.group(groupNum));
+                }
+            }
+            groupMatch.appendTail(sb);
+            retval = sb.toString();
+        }
+
+        return retval;
+    }
+
+    /**
+     * Checks to make sure all meta characters in the name are supported. Any
+     * unsupported meta characters will be replaced with empty strings.
+     * 
+     * @return Error message if name is invalid, else an empty string.
+     */
+    public String checkValidName() {
+        String retval = "";
+        Matcher metaMatch = metaRegex.matcher(name);
+        StringBuffer sb = new StringBuffer();
+        /*
+         * Loop over all meta characters found in the name. Keep all that match
+         * the supported ones and drop all others from the name.
+         */
+        while (metaMatch.find()) {
+            Matcher covMatch = covRegex.matcher(metaMatch.group(0));
+            Matcher resMatch = resRegex.matcher(metaMatch.group(0));
+            Matcher regMatch = regRegex.matcher(metaMatch.group(0));
+            Matcher groupMatch = groupRegex.matcher(metaMatch.group(0));
+            if (covMatch.matches() || resMatch.matches() || regMatch.matches()
+                    || groupMatch.matches()) {
+                metaMatch.appendReplacement(sb,
+                        Matcher.quoteReplacement(metaMatch.group(0)));
+
+            } else {
+                metaMatch.appendReplacement(sb, "");
+            }
+        }
+        metaMatch.appendTail(sb);
+        String result = sb.toString();
+        /*
+         * If name doesn't match, that means there was an unsupported meta
+         * character found. Update the name to remove it.
+         */
+        if (!result.equals(name)) {
+            retval += "Model name '" + name
+                    + "' contains unexpected meta characters. Using name '"
+                    + result + "' instead.";
+            name = result;
+        }
+        return retval;
+    }
+
     public String getGrid() {
         return grid;
     }
@@ -134,7 +347,7 @@ public class GridModel {
     public void setProcess(ArrayList<Integer> process) {
         this.process = process;
     }
-    
+
     public String getProcessType() {
         return processType;
     }
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridRegion.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridRegion.java
new file mode 100644
index 0000000000..d6f1b9a7d1
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridRegion.java
@@ -0,0 +1,108 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.edex.plugin.grib.util;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+import com.raytheon.uf.common.geospatial.MapUtil;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * 
+ * Contains the information about a given Grib Model Region.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Feb 8, 2016  5182       tjensen     Initial creation
+ * 
+ * </pre>
+ * 
+ * @author tjensen
+ * @version 1.0
+ */
+@XmlAccessorType(XmlAccessType.NONE)
+public class GridRegion {
+
+    @XmlElement
+    private String name;
+
+    @XmlElement
+    private Double lat1;
+
+    @XmlElement
+    private Double lon1;
+
+    @XmlElement
+    private Double lat2;
+
+    @XmlElement
+    private Double lon2;
+
+    public Polygon getRegionGeometry() {
+        return MapUtil.createGeometry(lat1, lon1, lat2, lon2);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Double getLat1() {
+        return lat1;
+    }
+
+    public void setLat1(Double lat1) {
+        this.lat1 = lat1;
+    }
+
+    public Double getLon1() {
+        return lon1;
+    }
+
+    public void setLon1(Double lon1) {
+        this.lon1 = lon1;
+    }
+
+    public Double getLat2() {
+        return lat2;
+    }
+
+    public void setLat2(Double lat2) {
+        this.lat2 = lat2;
+    }
+
+    public Double getLon2() {
+        return lon2;
+    }
+
+    public void setLon2(Double lon2) {
+        this.lon2 = lon2;
+    }
+
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridRegionLookup.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridRegionLookup.java
new file mode 100644
index 0000000000..7f54c02931
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridRegionLookup.java
@@ -0,0 +1,190 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.edex.plugin.grib.util;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.bind.JAXB;
+
+import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.opengis.referencing.FactoryException;
+import org.opengis.referencing.operation.TransformException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.raytheon.uf.common.geospatial.MapUtil;
+import com.raytheon.uf.common.geospatial.util.EnvelopeIntersection;
+import com.raytheon.uf.common.gridcoverage.GridCoverage;
+import com.raytheon.uf.common.gridcoverage.PolarStereoGridCoverage;
+import com.raytheon.uf.common.localization.IPathManager;
+import com.raytheon.uf.common.localization.LocalizationContext;
+import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * 
+ * Lookup a region based off the grid name.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 16, 2015 5182       tjensen     Initial creation
+ * 
+ * </pre>
+ * 
+ * @author tjensen
+ * @version 1.0
+ */
+public class GridRegionLookup {
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(GridRegionLookup.class);
+
+    /** The logger */
+    protected transient Logger logger = LoggerFactory.getLogger(getClass());
+
+    private final Map<String, Polygon> regionMaps;
+
+    /** The singleton instance of GribModelLookup **/
+    private static GridRegionLookup instance;
+
+    public static synchronized GridRegionLookup getInstance() {
+        if (instance == null) {
+            instance = new GridRegionLookup();
+        }
+        return instance;
+    }
+
+    private GridRegionLookup() {
+        regionMaps = new HashMap<String, Polygon>();
+        initRegionList();
+    }
+
+    /**
+     * Initializes mappings of regions and grids based on information in
+     * gribModel files.
+     * 
+     * Note: This is an extrapolation from existing gribModel information and
+     * should not be considered a definitive list of which grids are considered
+     * which region.
+     */
+    private void initRegionList() {
+        logger.info("Initializing grib regions");
+        long startTime = System.currentTimeMillis();
+        LocalizationContext edexStaticBase = PathManagerFactory
+                .getPathManager().getContext(
+                        LocalizationContext.LocalizationType.EDEX_STATIC,
+                        LocalizationContext.LocalizationLevel.BASE);
+
+        LocalizationContext edexStaticSite = PathManagerFactory
+                .getPathManager().getContext(
+                        LocalizationContext.LocalizationType.EDEX_STATIC,
+                        LocalizationContext.LocalizationLevel.SITE);
+
+        LocalizationFile[] regionFiles = PathManagerFactory.getPathManager()
+                .listFiles(
+                        new LocalizationContext[] { edexStaticBase,
+                                edexStaticSite },
+                        "grib" + IPathManager.SEPARATOR + "modelRegions", // Win32
+                        new String[] { ".xml" }, true, true);
+
+        for (LocalizationFile regionFile : regionFiles) {
+            try (InputStream is = regionFile.openInputStream()) {
+                GridRegionSet fileSet = JAXB.unmarshal(is, GridRegionSet.class);
+                for (GridRegion fileRegion : fileSet.getRegions()) {
+                    regionMaps.put(fileRegion.getName(),
+                            fileRegion.getRegionGeometry());
+                }
+            } catch (Exception e) {
+                logger.error("Unable to unmarshal grib model region file:"
+                        + regionFile, e);
+            }
+        }
+        long endTime = System.currentTimeMillis();
+        logger.info("Grib model regions initialized: " + (endTime - startTime)
+                + "ms");
+    }
+
+    public String determineRegion(GridCoverage gc) {
+        // Default to "UNK". Return this if no regions intersect with the grid.
+        String bestMatchRegion = "UNK";
+
+        double bestMatchQual = 0;
+        Geometry coverageGeo = gc.getGeometry();
+
+        /*
+         * If our coverage's projection is Polar Stereographic, we need to
+         * create a projection in the Lat/Lon projection before we do our
+         * comparison. If envelope intersection fails, log the failure and fall
+         * back to using the GridCoverage geometry directly.
+         */
+        if (PolarStereoGridCoverage.PROJECTION_TYPE.equals(gc
+                .getProjectionType())) {
+            ReferencedEnvelope worldEnvelope = new ReferencedEnvelope(-180,
+                    180, -90, 90, MapUtil.LATLON_PROJECTION);
+            try {
+                coverageGeo = EnvelopeIntersection.createEnvelopeIntersection(
+                        gc.getGridGeometry().getEnvelope(), worldEnvelope);
+            } catch (TransformException | FactoryException e) {
+                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
+                        e);
+            }
+        }
+        double coverageArea = coverageGeo.getArea();
+
+        // Loop over all regions
+        for (Map.Entry<String, Polygon> region : regionMaps.entrySet()) {
+            Polygon regionGeo = region.getValue();
+            Geometry intersection = coverageGeo.intersection(regionGeo);
+            // Check if grid coverage intersects with this region
+            if (!intersection.isEmpty()) {
+                /*
+                 * If coverage intersects, determine the 'quality' of the match
+                 * by adding together how much of the region is covered by the
+                 * intersection and how much of the grid is covered by the
+                 * intersection. The higher this sum is, the closer the grid
+                 * coverage is to matching the selected region.
+                 */
+                double matchQuality = (intersection.getArea() / coverageArea)
+                        + (intersection.getArea() / regionGeo.getArea());
+
+                /*
+                 * If this quality is better than our current best match,
+                 * replace our best match with this region.
+                 */
+                if (matchQuality > bestMatchQual) {
+                    bestMatchQual = matchQuality;
+                    bestMatchRegion = region.getKey();
+                }
+            }
+        }
+
+        return bestMatchRegion;
+    }
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridRegionSet.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridRegionSet.java
new file mode 100644
index 0000000000..04f3cf6a92
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GridRegionSet.java
@@ -0,0 +1,78 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.edex.plugin.grib.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * 
+ * A JAXBable set of {@link GridRegion}s.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Feb 8, 2016  5182       tjensen     Initial creation
+ * 
+ * </pre>
+ * 
+ * @author tjensen
+ * @version 1.0
+ */
+@XmlRootElement(name = "gribRegionSet")
+@XmlAccessorType(XmlAccessType.NONE)
+public class GridRegionSet {
+
+    /**
+     * List of regions for/from the XML.
+     */
+    @XmlElements({ @XmlElement(name = "region", type = GridRegion.class) })
+    private ArrayList<GridRegion> regions;
+
+    public ArrayList<GridRegion> getRegions() {
+        return regions;
+    }
+
+    public void setRegions(ArrayList<GridRegion> regions) {
+        this.regions = regions;
+    }
+
+    /**
+     * Adds regions to this set
+     * 
+     * @param regions
+     *            The regions to add
+     */
+    public void addRegions(Collection<GridRegion> regions) {
+        if (this.regions == null) {
+            this.regions = new ArrayList<GridRegion>();
+        }
+        this.regions.addAll(regions);
+    }
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/util/grib/GribParamTranslator.java b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/util/grib/GribParamTranslator.java
index 3dbb22f903..0f2a750146 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/util/grib/GribParamTranslator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/util/grib/GribParamTranslator.java
@@ -22,18 +22,20 @@ package com.raytheon.edex.util.grib;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.HashMap;
 import java.util.Map;
 
 import com.raytheon.edex.plugin.grib.exception.GribException;
 import com.raytheon.edex.plugin.grib.util.DataFieldTableLookup;
 import com.raytheon.uf.common.gridcoverage.GridCoverage;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.parameter.Parameter;
 import com.raytheon.uf.common.time.DataTime;
 
@@ -48,6 +50,7 @@ import com.raytheon.uf.common.time.DataTime;
  * ------------- -------- ----------- --------------------------
  * Apr 15, 2010  4553     bphillip    Initial Creation
  * Oct 15, 2013  2473     bsteffen    Remove e.printStackTrace()
+ * Feb 16, 2016  5237     bsteffen    Replace deprecated localization API.
  * 
  * </pre>
  * 
@@ -246,9 +249,9 @@ public class GribParamTranslator {
                 .getPathManager().getTieredLocalizationFile(
                         LocalizationType.COMMON_STATIC,
                         "grid" + File.separator + "master_grib2_lookup.txt");
-        loadDefs(files.get(LocalizationLevel.BASE).getFile(), 2);
+        loadDefs(files.get(LocalizationLevel.BASE), 2);
         if (files.containsKey(LocalizationLevel.SITE)) {
-            loadDefs(files.get(LocalizationLevel.SITE).getFile(), 2);
+            loadDefs(files.get(LocalizationLevel.SITE), 2);
         }
     }
 
@@ -264,9 +267,9 @@ public class GribParamTranslator {
                 .getPathManager().getTieredLocalizationFile(
                         LocalizationType.COMMON_STATIC,
                         "grid" + File.separator + "master_grib1_lookup.txt");
-        loadDefs(files.get(LocalizationLevel.BASE).getFile(), 1);
+        loadDefs(files.get(LocalizationLevel.BASE), 1);
         if (files.containsKey(LocalizationLevel.SITE)) {
-            loadDefs(files.get(LocalizationLevel.SITE).getFile(), 1);
+            loadDefs(files.get(LocalizationLevel.SITE), 1);
         }
     }
 
@@ -276,10 +279,9 @@ public class GribParamTranslator {
                 .getPathManager().getTieredLocalizationFile(
                         LocalizationType.COMMON_STATIC,
                         "grid" + File.separator + "parameterNameAlias.txt");
-        loadParameterNameAliases(files.get(LocalizationLevel.BASE).getFile());
+        loadParameterNameAliases(files.get(LocalizationLevel.BASE));
         if (files.containsKey(LocalizationLevel.SITE)) {
-            loadParameterNameAliases(files.get(LocalizationLevel.SITE)
-                    .getFile());
+            loadParameterNameAliases(files.get(LocalizationLevel.SITE));
         }
     }
 
@@ -293,12 +295,10 @@ public class GribParamTranslator {
      * @throws GribException
      *             If errors occur while processing the file
      */
-    private void loadDefs(File lookupFile, int gribVersion)
+    private void loadDefs(ILocalizationFile lookupFile, int gribVersion)
             throws GribException {
-        BufferedReader in = null;
-        String[] tokens = null;
-        try {
-            in = new BufferedReader(new FileReader(lookupFile));
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(
+                lookupFile.openInputStream()))) {
             String str;
 
             /*
@@ -310,7 +310,7 @@ public class GribParamTranslator {
                     continue;
                 }
 
-                tokens = str.split(" ");
+                String[] tokens = str.split(" ");
                 if (tokens.length < 2) {
                     continue;
                 }
@@ -320,24 +320,17 @@ public class GribParamTranslator {
                     grib2Map.put(tokens[0], tokens[tokens.length - 1]);
                 }
             }
-        } catch (IOException e) {
+        } catch (IOException | LocalizationException e) {
             throw new GribException(
                     "Error processing master grib parameters file", e);
         }
 
-        try {
-            in.close();
-        } catch (IOException e) {
-            throw new GribException(
-                    "Error processing master grib parameters file", e);
-        }
     }
 
-    private void loadParameterNameAliases(File lookupFile) throws GribException {
-        BufferedReader in = null;
-        String[] tokens = null;
-        try {
-            in = new BufferedReader(new FileReader(lookupFile));
+    private void loadParameterNameAliases(ILocalizationFile lookupFile)
+            throws GribException {
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(
+                lookupFile.openInputStream()))) {
             String str;
 
             /*
@@ -349,7 +342,7 @@ public class GribParamTranslator {
                     continue;
                 }
 
-                tokens = str.split("::");
+                String[] tokens = str.split("::");
                 if (tokens.length < 3) {
                     continue;
                 }
@@ -364,14 +357,7 @@ public class GribParamTranslator {
                         parameterName);
 
             }
-        } catch (IOException e) {
-            throw new GribException(
-                    "Error processing master grib parameters file", e);
-        }
-
-        try {
-            in.close();
-        } catch (IOException e) {
+        } catch (IOException | LocalizationException e) {
             throw new GribException(
                     "Error processing master grib parameters file", e);
         }
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
index 9fa4326ee6..09bebc564a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/datasetInfo/gribDatasets_NCEP-7.xml
@@ -15,11 +15,6 @@
         <datasetId>AVN</datasetId>
         <dt>6</dt>
     </info>
-    <info>
-        <title>NGM80</title>
-        <datasetId>NGM</datasetId>
-        <dt>6</dt>
-    </info>
     <info>
         <title>gfsLR</title>
         <datasetId>MRF</datasetId>
@@ -95,16 +90,6 @@
         <datasetId>GFS213</datasetId>
         <dt>6</dt>
     </info>
-    <info>
-        <title>NGM90</title>
-        <datasetId>NGM213</datasetId>
-        <dt>6</dt>
-    </info>
-    <info>
-        <title>NGM180</title>
-        <datasetId>NGM202</datasetId>
-        <dt>6</dt>
-    </info>
     <info>
         <title>GFS80</title>
         <datasetId>AVN211</datasetId>
@@ -151,11 +136,6 @@
         <datasetId>MRF205</datasetId>
         <dt>12</dt>
     </info>
-    <info>
-        <title>NGM95</title>
-        <datasetId>NGM207</datasetId>
-        <dt>6</dt>
-    </info>
     <info>
         <title>NAM95</title>
         <datasetId>ETA207</datasetId>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
index a07d131936..ff101e982a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
@@ -329,11 +329,11 @@ SIGWINDPROB0.254% SIGWINDPROB
 PRSVR0.254% PRSVR
 PRSIGSV0.254% PRSIGSV
 
-#TPCSurgeProb
-# For the pct parameters the parameters coming out of the grib files are coded
-# as the height where there is XX probability that the surge is less than a
-# height but the desired interpretation is XX probability that the surge is
-# greater than a height
+//TPCSurgeProb
+// For the pct parameters the parameters coming out of the grib files are coded
+// as the height where there is XX probability that the surge is less than a
+// height but the desired interpretation is XX probability that the surge is
+// greater than a height
 Surge10pct_21600-0 Surge90pct6hr
 Surge20pct_21600-0 Surge80pct6hr
 Surge30pct_21600-0 Surge70pct6hr
@@ -343,9 +343,9 @@ Surge60pct_21600-0 Surge40pct6hr
 Surge70pct_21600-0 Surge30pct6hr
 Surge80pct_21600-0 Surge20pct6hr
 Surge90pct_21600-0 Surge10pct6hr
-# For the m parameters convert the abbreviation from the grib decoder contains
-# a height in meters but it was intended and can be dispalyed nicely as a
-# height in feet.
+// For the m parameters convert the abbreviation from the grib decoder contains
+// a height in meters but it was intended and can be dispalyed nicely as a
+// height in feet.
 Surge0.0m_21600-0 PSurge0ft6hr
 Surge0.3m_21600-0 PSurge1ft6hr
 Surge0.61m_21600-0 PSurge2ft6hr
@@ -372,9 +372,9 @@ Surge6.71m_21600-0 PSurge22ft6hr
 Surge7.01m_21600-0 PSurge23ft6hr
 Surge7.32m_21600-0 PSurge24ft6hr
 Surge7.62m_21600-0 PSurge25ft6hr
-# For the Cumulative this mapping not only inverses the percentages and
-# converts the heights, it also prevents the decoder from appending a duration
-# which is necessary because the duration increases for each forecast time.
+// For the Cumulative this mapping not only inverses the percentages and
+// converts the heights, it also prevents the decoder from appending a duration
+// which is necessary because the duration increases for each forecast time.
 Surge10pctCumul Surge90pctCumul
 Surge20pctCumul Surge80pctCumul
 Surge30pctCumul Surge70pctCumul
@@ -410,3 +410,62 @@ Surge6.71mCumul PSurge22ftCumul
 Surge7.01mCumul PSurge23ftCumul
 Surge7.32mCumul PSurge24ftCumul
 Surge7.62mCumul PSurge25ftCumul
+
+//WPC Probabilistic Winter Precipitation Forecast (PWPF)
+// Total Snow
+// metric to imperial
+TOTSN0.0254m_43200-0 TOTSN1in12hr
+TOTSN0.0508m_43200-0 TOTSN2in12hr
+TOTSN0.1016m_43200-0 TOTSN4in12hr
+TOTSN0.1524m_43200-0 TOTSN6in12hr
+TOTSN0.2032m_43200-0 TOTSN8in12hr
+TOTSN0.3048m_43200-0 TOTSN12in12hr
+TOTSN0.4572m_43200-0 TOTSN18in12hr
+
+TOTSN0.0254m_86400-0 TOTSN1in24hr
+TOTSN0.0508m_86400-0 TOTSN2in24hr
+TOTSN0.1016m_86400-0 TOTSN4in24hr
+TOTSN0.1524m_86400-0 TOTSN6in24hr
+TOTSN0.2032m_86400-0 TOTSN8in24hr
+TOTSN0.3048m_86400-0 TOTSN12in24hr
+TOTSN0.4572m_86400-0 TOTSN18in24hr
+
+TOTSN0.0508m_172800-0 TOTSN2in48hr
+TOTSN0.1016m_172800-0 TOTSN4in48hr
+TOTSN0.2032m_172800-0 TOTSN8in48hr
+TOTSN0.3048m_172800-0 TOTSN12in48hr
+TOTSN0.4572m_172800-0 TOTSN18in48hr
+TOTSN0.6096m_172800-0 TOTSN24in48hr
+TOTSN0.762m_172800-0 TOTSN30in48hr
+
+TOTSN0.0508m_259200-0 TOTSN2in72hr
+TOTSN0.1016m_259200-0 TOTSN4in72hr
+TOTSN0.2032m_259200-0 TOTSN8in72hr
+TOTSN0.3048m_259200-0 TOTSN12in72hr
+TOTSN0.4572m_259200-0 TOTSN18in72hr
+TOTSN0.6096m_259200-0 TOTSN24in72hr
+TOTSN0.762m_259200-0 TOTSN30in72hr
+
+// Freezing Rain
+// metric to imperial
+FRZR0.254mm_43200-0 FRZR0.01in12hr
+FRZR2.54mm_43200-0 FRZR0.1in12hr
+FRZR6.35mm_43200-0 FRZR0.25in12hr
+FRZR12.7mm_43200-0 FRZR0.5in12hr
+FRZR25.4mm_43200-0 FRZR1in12hr
+
+FRZR0.254mm_86400-0 FRZR0.01in24hr
+FRZR2.54mm_86400-0 FRZR0.1in24hr
+FRZR6.35mm_86400-0 FRZR0.25in24hr
+FRZR12.7mm_86400-0 FRZR0.5in24hr
+FRZR25.4mm_86400-0 FRZR1in24hr
+
+FRZR2.54mm_172800-0 FRZR0.1in48hr
+FRZR6.35mm_172800-0 FRZR0.25in48hr
+FRZR12.7mm_172800-0 FRZR0.5in48hr
+FRZR25.4mm_172800-0 FRZR1in48hr
+
+FRZR2.54mm_259200-0 FRZR0.1in72hr
+FRZR6.35mm_259200-0 FRZR0.25in72hr
+FRZR12.7mm_259200-0 FRZR0.5in72hr
+FRZR25.4mm_259200-0 FRZR1in72hr
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/definition/pwpf_parameters.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/definition/pwpf_parameters.xml
new file mode 100644
index 0000000000..ab87003b95
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/parameter/definition/pwpf_parameters.xml
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+<parameterList>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.01in</name>
+        <abbreviation>FRZR0.01in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.01in</name>
+        <abbreviation>FRZR0.01in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Freezing Rain > 0.1in</name>
+        <abbreviation>FRZR0.1in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.1in</name>
+        <abbreviation>FRZR0.1in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.1in</name>
+        <abbreviation>FRZR0.1in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.1in</name>
+        <abbreviation>FRZR0.1in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Freezing Rain > 0.25in</name>
+        <abbreviation>FRZR0.25in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.25in</name>
+        <abbreviation>FRZR0.25in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.25in</name>
+        <abbreviation>FRZR0.25in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.25in</name>
+        <abbreviation>FRZR0.25in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Freezing Rain > 0.5in</name>
+        <abbreviation>FRZR0.5in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.5in</name>
+        <abbreviation>FRZR0.5in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.5in</name>
+        <abbreviation>FRZR0.5in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 0.5in</name>
+        <abbreviation>FRZR0.5in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Freezing Rain > 1in</name>
+        <abbreviation>FRZR1in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 1in</name>
+        <abbreviation>FRZR1in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 1in</name>
+        <abbreviation>FRZR1in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Freezing Rain > 1in</name>
+        <abbreviation>FRZR1in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Total snowfall > 1in</name>
+        <abbreviation>TOTSN1in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 1in</name>
+        <abbreviation>TOTSN1in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Total snowfall > 2in</name>
+        <abbreviation>TOTSN2in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 2in</name>
+        <abbreviation>TOTSN2in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 2in</name>
+        <abbreviation>TOTSN2in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 2in</name>
+        <abbreviation>TOTSN2in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Total snowfall > 4in</name>
+        <abbreviation>TOTSN4in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 4in</name>
+        <abbreviation>TOTSN4in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 4in</name>
+        <abbreviation>TOTSN4in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 4in</name>
+        <abbreviation>TOTSN4in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Total snowfall > 6in</name>
+        <abbreviation>TOTSN6in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 6in</name>
+        <abbreviation>TOTSN6in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Total snowfall > 8in</name>
+        <abbreviation>TOTSN8in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 8in</name>
+        <abbreviation>TOTSN8in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 8in</name>
+        <abbreviation>TOTSN8in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 8in</name>
+        <abbreviation>TOTSN8in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Total snowfall > 12in</name>
+        <abbreviation>TOTSN12in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 12in</name>
+        <abbreviation>TOTSN12in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 12in</name>
+        <abbreviation>TOTSN12in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 12in</name>
+        <abbreviation>TOTSN12in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Total snowfall > 18in</name>
+        <abbreviation>TOTSN18in12hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 18in</name>
+        <abbreviation>TOTSN18in24hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 18in</name>
+        <abbreviation>TOTSN18in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 18in</name>
+        <abbreviation>TOTSN18in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Total snowfall > 24in</name>
+        <abbreviation>TOTSN24in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 24in</name>
+        <abbreviation>TOTSN24in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+
+
+    <parameter>
+        <name>Prob of Total snowfall > 30in</name>
+        <abbreviation>TOTSN30in48hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+    <parameter>
+        <name>Prob of Total snowfall > 30in</name>
+        <abbreviation>TOTSN30in72hr</abbreviation>
+        <unit>%</unit>
+    </parameter>
+</parameterList>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/modelRegions/GribModelRegions.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/modelRegions/GribModelRegions.xml
new file mode 100644
index 0000000000..cfa1ea4cc0
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/modelRegions/GribModelRegions.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+    
+    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+    This_software_product_contains_export-restricted_data_whose
+    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+    an_export_license_or_other_authorization.
+    
+    Contractor_Name:________Raytheon_Company
+    Contractor_Address:_____6825_Pine_Street,_Suite_340
+    ________________________Mail_Stop_B8
+    ________________________Omaha,_NE_68106
+    ________________________402.291.0100
+    
+    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+    further_licensing_information.
+-->
+
+<gribRegionSet>
+
+   <!--  List of known supported regions and their bounds. Currently does not support regions that cross the date line. -->
+
+   <!-- Alaska (Note that since this is a polar stereographic projection, this region is a simple lat/lon approximation) -->
+   <region>
+      <name>AK</name>
+      <lat1>85.0</lat1>
+      <lon1>-180.0</lon1>
+      <lat2>35.0</lat2>
+      <lon2>-120.0</lon2>
+   </region>
+
+   <!-- United States (CONUS) -->
+   <region>
+      <name>US</name>
+      <lat1>54.6</lat1>
+      <lon1>-153.0</lon1>
+      <lat2>14.2</lat2>
+      <lon2>-65.0</lon2>
+   </region>
+   <!--  Hawaii -->
+   <region>
+      <name>HI</name>
+      <lat1>24.0</lat1>
+      <lon1>-162.4</lon1>
+      <lat2>16.4</lat2>
+      <lon2>-152.3</lon2>
+   </region>
+   <!--  Pacific Region (Note that some model names use PR for Puerto Rico. Do not replace those with this region) -->
+   <region>
+      <name>PR</name>
+      <lat1>60.9</lat1>
+      <lon1>-180.0</lon1>
+      <lat2>-35.1</lat2>
+      <lon2>-109.0</lon2>
+   </region>
+   <!--  Eastern Pacific -->
+   <region>
+      <name>EP</name>
+      <lat1>60.0</lat1>
+      <lon1>-170.0</lon1>
+      <lat2>5.0</lat2>
+      <lon2>-75.0</lon2>
+   </region>
+   <!--  Western CONUS -->
+   <region>
+      <name>WC</name>
+      <lat1>50.0</lat1>
+      <lon1>-135.0</lon1>
+      <lat2>27.8</lat2>
+      <lon2>-114.0</lon2>
+   </region>
+   <!--  San Juan, Puerto Rico -->
+   <region>
+      <name>SJU</name>
+      <lat1>22.8</lat1>
+      <lon1>-76.6</lon1>
+      <lat2>13.5</lat2>
+      <lon2>-63.1</lon2>
+   </region>
+   <!--  Guam -->
+   <region>
+      <name>GU</name>
+      <lat1>19.3</lat1>
+      <lon1>141.0</lon1>
+      <lat2>11.7</lat2>
+      <lon2>151.0</lon2>
+   </region>
+   <!--  Western North Atlantic -->
+   <region>
+      <name>WNA</name>
+      <lat1>50.0</lat1>
+      <lon1>-100.0</lon1>
+      <lat2>0.0</lat2>
+      <lon2>30.0</lon2>
+   </region>
+</gribRegionSet>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
index 56eb605c65..30bd814352 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/GribModels_FNMO-58.xml
@@ -16,40 +16,13 @@
 		<name>nogaps</name>
 		<center>58</center>
 		<subcenter>0</subcenter>
-		<grid>401</grid>
-		<process>
-			<id>58</id>
-			<id>18</id>
-		</process>
-	</model>
-
-	<model>
-		<name>nogaps</name>
-		<center>58</center>
-		<subcenter>0</subcenter>
-		<grid>362181001</grid>
-		<process>
-			<id>58</id>
-			<id>18</id>
-		</process>
-	</model>
-
-	<model>
-		<name>nogaps</name>
-		<center>58</center>
-		<subcenter>0</subcenter>
-		<grid>362181002</grid>
-		<process>
-			<id>58</id>
-			<id>18</id>
-		</process>
-	</model>
-
-	<model>
-		<name>nogaps</name>
-		<center>58</center>
-		<subcenter>0</subcenter>
-		<grid>2291</grid>
+		<grids>
+            <id>401</id>
+            <id>362181001</id>
+            <id>362181002</id>
+            <id>2291</id>
+            <id>361181002</id>
+        </grids>
 		<process>
 			<id>58</id>
 			<id>18</id>
@@ -60,78 +33,26 @@
 		<name>fens</name>
 		<center>58</center>
 		<subcenter>0</subcenter>
-		<grid>2291</grid>
+		<grids>
+            <id>2291</id>
+            <id>361181002</id>
+        </grids>
 		<process>
 			<id>50</id>
 		</process>
 	</model>
 
-	<model>
-		<name>nogaps</name>
-		<center>58</center>
-		<subcenter>0</subcenter>
-		<grid>361181002</grid>
-		<process>
-			<id>18</id>
-			<id>58</id>
-		</process>
-	</model>
-
-	<model>
-		<name>fens</name>
-		<center>58</center>
-		<subcenter>0</subcenter>
-		<grid>361181002</grid>
-		<process>
-			<id>50</id>
-		</process>
-	</model>
-	
 	<model>
 		<name>fnmocWave</name>
 		<center>58</center>
 		<subcenter>0</subcenter>
-		<grid>401</grid>
-		<process>
-			<id>110</id>
-		</process>
-	</model>
-
-	<model>
-		<name>fnmocWave</name>
-		<center>58</center>
-		<subcenter>0</subcenter>
-		<grid>362181001</grid>
-		<process>
-			<id>110</id>
-		</process>
-	</model>
-
-	<model>
-		<name>fnmocWave</name>
-		<center>58</center>
-		<subcenter>0</subcenter>
-		<grid>362181002</grid>
-		<process>
-			<id>110</id>
-		</process>
-	</model>
-
-	<model>
-		<name>fnmocWave</name>
-		<center>58</center>
-		<subcenter>0</subcenter>
-		<grid>2291</grid>
-		<process>
-			<id>110</id>
-		</process>
-	</model>
-
-	<model>
-		<name>fnmocWave</name>
-		<center>58</center>
-		<subcenter>0</subcenter>
-		<grid>361181002</grid>
+		<grids>
+            <id>401</id>
+            <id>362181001</id>
+            <id>362181002</id>
+            <id>2291</id>
+            <id>361181002</id>
+        </grids>
 		<process>
 			<id>110</id>
 		</process>
@@ -148,7 +69,7 @@
 	</model>
 
 	<model>
-		<name>AK-NOGAPS</name>
+		<name>${REGION}-NOGAPS</name>
 		<center>58</center>
 		<subcenter>20</subcenter>
 		<grid>242</grid>
@@ -157,7 +78,5 @@
 		</process>
 	</model>
 
-
-
 	<!-- END SUBCENTER 20 -->
 </gribModelSet>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/NCEP/gribModels_NCEP-7_ETSS.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/NCEP/gribModels_NCEP-7_ETSS.xml
index a3a08b6674..255603e33e 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/NCEP/gribModels_NCEP-7_ETSS.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/NCEP/gribModels_NCEP-7_ETSS.xml
@@ -31,7 +31,7 @@
 	</model>
 
 	<model>
-		<name>ETSS-AK</name>
+		<name>ETSS-${REGION}</name>
 		<center>7</center>
 		<subcenter>14</subcenter>
 		<grid>1023</grid>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/NCEP/gribModels_NCEP-7_GEFS.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/NCEP/gribModels_NCEP-7_GEFS.xml
index de40df9c70..fb259d47d9 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/NCEP/gribModels_NCEP-7_GEFS.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/NCEP/gribModels_NCEP-7_GEFS.xml
@@ -13,47 +13,13 @@
 		<name>GEFS</name>
 		<center>7</center>
 		<subcenter>2</subcenter>
-		<grid>2</grid>
-		<process>
-			<id>107</id>
-		</process>
-	</model>
-
-	<model>
-		<name>GEFS</name>
-		<center>7</center>
-		<subcenter>2</subcenter>
-		<grid>3</grid>
-		<process>
-			<id>107</id>
-		</process>
-	</model>
-
-	<model>
-		<name>GEFS</name>
-		<center>7</center>
-		<subcenter>2</subcenter>
-		<grid>361181001</grid>
-		<process>
-			<id>107</id>
-		</process>
-	</model>
-
-	<model>
-		<name>GEFS</name>
-		<center>7</center>
-		<subcenter>2</subcenter>
-		<grid>372</grid>
-		<process>
-			<id>107</id>
-		</process>
-	</model>
-
-	<model>
-		<name>GEFS</name>
-		<center>7</center>
-		<subcenter>2</subcenter>
-		<grid>375</grid>
+		<grids>
+            <id>2</id>
+            <id>3</id>
+            <id>361181001</id>
+            <id>372</id>
+            <id>375</id>
+        </grids>
 		<process>
 			<id>107</id>
 		</process>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
index 4c230ac693..9dcc482b7a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_ECMWF-98.xml
@@ -39,35 +39,11 @@
 		<name>ecmwf</name>
 		<center>98</center>
 		<subcenter>0</subcenter>
-		<grid>3</grid>
-		<process>
-			<id>141</id>
-			<id>142</id>
-			<id>143</id>
-			<id>144</id>
-			<id>145</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwf</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>361181001</grid>
-		<process>
-			<id>141</id>
-			<id>142</id>
-			<id>143</id>
-			<id>144</id>
-			<id>145</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwf</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>229</grid>
+		<grids>
+            <id>3</id>
+            <id>361181001</id>
+            <id>229</id>
+        </grids>
 		<process>
 			<id>141</id>
 			<id>142</id>
@@ -81,21 +57,12 @@
 		<name>ecmwfg</name>
 		<center>98</center>
 		<subcenter>0</subcenter>
-		<grid>228</grid>
-		<process>
-			<id>141</id>
-			<id>142</id>
-			<id>143</id>
-			<id>144</id>
-			<id>145</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwfg</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>145073001</grid>
+		<grids>
+            <id>228</id>
+            <id>145073001</id>
+            <id>145029001</id>
+            <id>145029002</id>
+        </grids>
 		<process>
 			<id>141</id>
 			<id>142</id>
@@ -109,49 +76,10 @@
 		<name>ecmwft</name>
 		<center>98</center>
 		<subcenter>0</subcenter>
-		<grid>22829</grid>
-		<process>
-			<id>141</id>
-			<id>142</id>
-			<id>143</id>
-			<id>144</id>
-			<id>145</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwfg</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>145029001</grid>
-		<process>
-			<id>141</id>
-			<id>142</id>
-			<id>143</id>
-			<id>144</id>
-			<id>145</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwfg</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>145029002</grid>
-		<process>
-			<id>141</id>
-			<id>142</id>
-			<id>143</id>
-			<id>144</id>
-			<id>145</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwft</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>14529</grid>
+		<grids>
+            <id>22829</id>
+            <id>14529</id>
+        </grids>
 		<process>
 			<id>141</id>
 			<id>142</id>
@@ -165,37 +93,12 @@
 		<name>narr</name>
 		<center>98</center>
 		<subcenter>0</subcenter>
-		<grid>14529</grid>
-		<process>
-			<id>140</id>
-		</process>
-	</model>
-
-	<model>
-		<name>narr</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>2</grid>
-		<process>
-			<id>140</id>
-		</process>
-	</model>
-
-	<model>
-		<name>narr</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>228</grid>
-		<process>
-			<id>140</id>
-		</process>
-	</model>
-
-	<model>
-		<name>narr</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>145073001</grid>
+		<grids>
+            <id>14529</id>
+            <id>2</id>
+            <id>228</id>
+            <id>145073001</id>
+        </grids>
 		<process>
 			<id>140</id>
 		</process>
@@ -205,7 +108,11 @@
 		<name>ecmwfWave</name>
 		<center>98</center>
 		<subcenter>0</subcenter>
-		<grid>403</grid>
+		<grids>
+            <id>403</id>
+            <id>361181001</id>
+            <id>360181001</id>
+        </grids>
 		<process>
 			<id>108</id>
 			<id>109</id>
@@ -222,82 +129,13 @@
 		<name>ecmwfWave</name>
 		<center>98</center>
 		<subcenter>0</subcenter>
-		<grid>361181001</grid>
-		<process>
-			<id>108</id>
-			<id>109</id>
-			<id>110</id>
-			<id>111</id>
-			<id>112</id>
-			<id>113</id>
-			<id>114</id>
-			<id>115</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwfWave</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>360181001</grid>
-		<process>
-			<id>108</id>
-			<id>109</id>
-			<id>110</id>
-			<id>111</id>
-			<id>112</id>
-			<id>113</id>
-			<id>114</id>
-			<id>115</id>
-		</process>
-	</model>
-
-
-	<model>
-		<name>ecmwfWave</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>361181002</grid>
-		<process>
-			<id>109</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwfWave</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>362181001</grid>
-		<process>
-			<id>109</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwfWave</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>362181002</grid>
-		<process>
-			<id>109</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwfWave</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>363181001</grid>
-		<process>
-			<id>109</id>
-		</process>
-	</model>
-
-	<model>
-		<name>ecmwfWave</name>
-		<center>98</center>
-		<subcenter>0</subcenter>
-		<grid>363181002</grid>
+		<grids>
+            <id>361181002</id>
+            <id>362181001</id>
+            <id>362181002</id>
+            <id>363181001</id>
+            <id>363181002</id>
+        </grids>
 		<process>
 			<id>109</id>
 		</process>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
index 01b839a789..e78c28ca0a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
@@ -65,16 +65,6 @@
         </process>
     </model>
 
-    <model>
-        <name>NGM</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>211</grid>
-        <process>
-            <id>39</id>
-        </process>
-    </model>
-
     <model>
         <name>MRF</name>
         <center>7</center>
@@ -89,10 +79,20 @@
     </model>
 
     <model>
-        <name>MRF21</name>
+        <name>MRF${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>21</grid>
+        <grids>
+            <id>21</id>
+            <id>22</id>
+            <id>23</id>
+            <id>24</id>
+            <id>25</id>
+            <id>26</id>
+            <id>203</id>
+            <id>204</id>
+            <id>205</id>
+        </grids>
         <process>
             <id>78</id>
             <id>80</id>
@@ -102,83 +102,42 @@
     </model>
 
     <model>
-        <name>MRF22</name>
+        <name>GFS${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>22</grid>
-        <process>
-            <id>78</id>
-            <id>80</id>
-            <id>82</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>MRF23</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>23</grid>
-        <process>
-            <id>78</id>
-            <id>80</id>
-            <id>82</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>MRF24</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>24</grid>
-        <process>
-            <id>78</id>
-            <id>80</id>
-            <id>82</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>MRF25</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>25</grid>
-        <process>
-            <id>78</id>
-            <id>80</id>
-            <id>82</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>MRF26</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>26</grid>
-        <process>
-            <id>78</id>
-            <id>80</id>
-            <id>82</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GFS201</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>201</grid>
+        <grids>
+            <id>201</id>
+            <id>215</id> <!-- conus 20KM -->
+            <id>217</id> <!-- ak 20KM -->
+        </grids>
         <process>
             <id>96</id>
             <id>81</id>
         </process>
     </model>
+    
+    <model>
+        <name>GFS${COVERAGE}</name>
+        <center>7</center>
+        <subcenter>0</subcenter>
+        <grids>
+            <id>213</id>
+            <id>212</id>
+            <id>160</id>
+            <id>254</id>
+            <id>161</id>
+            <id>199</id>
+            <id>230</id>
+        </grids>
+        <process>
+            <id>96</id>
+            <id>81</id>
+            <id>77</id>
+        </process>
+    </model>
 
     <model>
-        <name>mrfNH</name>
+        <name>mrf${REGION}</name>
         <center>7</center>
         <subcenter>0</subcenter>
         <grid>201</grid>
@@ -191,10 +150,14 @@
     </model>
 
     <model>
-        <name>GFS213</name>
+        <name>AVN${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>213</grid>
+        <grids>
+            <id>211</id>
+            <id>203</id>
+            <id>225</id>
+        </grids>
         <process>
             <id>77</id>
             <id>81</id>
@@ -203,82 +166,43 @@
     </model>
 
     <model>
-        <name>NGM213</name>
+        <name>AVN${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>213</grid>
-        <process>
+        <grids>
+            <id>37</id>
+            <id>38</id>
             <id>39</id>
-        </process>
-    </model>
-
-    <model>
-        <name>NGM202</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>202</grid>
-        <process>
-            <id>39</id>
-        </process>
-    </model>
-
-
-    <model>
-        <name>AVN211</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>211</grid>
+            <id>40</id>
+            <id>41</id>
+            <id>42</id>
+            <id>43</id>
+            <id>44</id>
+        </grids>
         <process>
+            <id>96</id>
             <id>77</id>
             <id>81</id>
-            <id>96</id>
+            <id>94</id>
         </process>
     </model>
-
+    
     <model>
-        <name>mesoEta212</name>
+        <name>mesoEta${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>212</grid>
+        <grids>
+            <id>212</id>
+            <id>215</id>
+            <id>216</id>
+            <id>217</id>
+            <id>237</id>
+        </grids>
         <process>
             <id>84</id>
         </process>
     </model>
 
-    <model>
-        <name>mesoEta215</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>215</grid>
-        <process>
-            <id>84</id>
-        </process>
-    </model>
-
-    <!-- conus 20KM -->
-    <model>
-        <name>GFS215</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>215</grid>
-        <process>
-            <id>81</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <!-- ak 20KM -->
-    <model>
-        <name>GFS217</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>217</grid>
-        <process>
-            <id>81</id>
-            <id>96</id>
-        </process>
-    </model>
-
     <!-- pac 20KM -->
     <model>
         <name>GFS20-PAC</name>
@@ -318,21 +242,10 @@
         <name>WAFS</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>45</grid>
-        <process>
-            <id>80</id>
-            <id>81</id>
-            <id>82</id>
-            <id>94</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <model>
-        <name>WAFS</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>289145001</grid>
+        <grids>
+            <id>45</id>
+            <id>289145001</id>
+        </grids>
         <process>
             <id>80</id>
             <id>81</id>
@@ -353,71 +266,14 @@
     </model>
 
     <model>
-        <name>AVN203</name>
+        <name>ETA${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>203</grid>
-        <process>
-            <id>77</id>
-            <id>81</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <model>
-        <name>MRF203</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>203</grid>
-        <process>
-            <id>78</id>
-            <id>80</id>
-            <id>82</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>MRF204</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>204</grid>
-        <process>
-            <id>78</id>
-            <id>80</id>
-            <id>82</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>MRF205</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>205</grid>
-        <process>
-            <id>78</id>
-            <id>80</id>
-            <id>82</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>NGM207</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>207</grid>
-        <process>
-            <id>39</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ETA207</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>207</grid>
+        <grids>
+            <id>207</id>
+            <id>218</id>
+            <id>242</id>
+        </grids>
         <process>
             <id>84</id>
         </process>
@@ -436,125 +292,14 @@
         </process>
     </model>
 
-    <model>
-        <name>AVN37</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>37</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>AVN38</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>38</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>AVN39</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>39</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>AVN40</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>40</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>AVN41</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>41</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>AVN42</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>42</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>AVN43</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>43</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-            <id>94</id>
-        </process>
-    </model>
-
-    <model>
-        <name>AVN44</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>44</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-            <id>94</id>
-        </process>
-    </model>
-
     <model>
         <name>gww</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>3</grid>
-        <process>
-            <id>10</id>
-        </process>
-    </model>
-
-    <model>
-        <name>gww</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>361181001</grid>
+        <grids>
+            <id>3</id>
+            <id>361181001</id>
+        </grids>
         <process>
             <id>10</id>
         </process>
@@ -580,16 +325,6 @@
         </process>
     </model>
 
-    <model>
-        <name>GWW233</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>233</grid>
-        <process>
-            <id>10</id>
-        </process>
-    </model>
-
     <model>
         <name>gww4</name>
         <center>7</center>
@@ -611,40 +346,16 @@
     </model>
 
     <model>
-        <name>GWW21</name>
+        <name>GWW${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>21</grid>
-        <process>
-            <id>10</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GWW22</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>22</grid>
-        <process>
-            <id>10</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GWW23</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>23</grid>
-        <process>
-            <id>10</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GWW24</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>24</grid>
+        <grids>
+            <id>21</id>
+            <id>22</id>
+            <id>23</id>
+            <id>24</id>
+            <id>233</id>
+        </grids>
         <process>
             <id>10</id>
         </process>
@@ -661,30 +372,14 @@
     </model>
 
     <model>
-        <name>SeaIce220</name>
+        <name>SeaIce${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>220</grid>
-        <process>
-            <id>120</id>
-        </process>
-    </model>
-
-    <model>
-        <name>SeaIce173</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>173</grid>
-        <process>
-            <id>120</id>
-        </process>
-    </model>
-
-    <model>
-        <name>SeaIce235</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>235</grid>
+        <grids>
+            <id>220</id>
+            <id>173</id>
+            <id>235</id>
+        </grids>
         <process>
             <id>120</id>
         </process>
@@ -751,10 +446,13 @@
     </model>
 
     <model>
-        <name>RUC236</name>
+        <name>RUC${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>236</grid>
+        <grids>
+            <id>236</id>
+            <id>130</id>
+        </grids>
         <process>
             <id>105</id>
         </process>
@@ -771,19 +469,7 @@
     </model>
 
     <model>
-        <name>AVN225</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>225</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-        </process>
-    </model>
-
-    <model>
-        <name>AKWAVE239</name>
+        <name>${REGION}WAVE${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
         <grid>239</grid>
@@ -793,7 +479,7 @@
     </model>
 
     <model>
-        <name>WNAWAVE238</name>
+        <name>${REGION}WAVE${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
         <grid>238</grid>
@@ -812,46 +498,6 @@
         </process>
     </model>
 
-    <model>
-        <name>mesoEta216</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>216</grid>
-        <process>
-            <id>84</id>
-        </process>
-    </model>
-
-    <model>
-        <name>mesoEta217</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>217</grid>
-        <process>
-            <id>84</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ETA218</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>218</grid>
-        <process>
-            <id>84</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ETA242</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>242</grid>
-        <process>
-            <id>84</id>
-        </process>
-    </model>
-
     <model>
         <name>NAM227</name>
         <center>7</center>
@@ -864,27 +510,20 @@
     </model>
 
     <model>
-        <name>namNestHI</name>
+        <name>namNest${REGION}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>406</grid>
+        <grids>
+            <id>406</id>
+            <id>196</id>
+        </grids>
         <process>
             <id>84</id>
         </process>
     </model>
 
     <model>
-        <name>namNestHI</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>196</grid>
-        <process>
-            <id>84</id>
-        </process>
-    </model>
-
-    <model>
-        <name>NAMAK</name>
+        <name>NAM${REGION}</name>
         <center>7</center>
         <subcenter>0</subcenter>
         <grid>198</grid>
@@ -894,7 +533,7 @@
     </model>
 
     <model>
-        <name>namPR</name>
+        <name>nam${REGION}</name>
         <center>7</center>
         <subcenter>0</subcenter>
         <grid>407</grid>
@@ -954,30 +593,14 @@
     </model>
 
     <model>
-        <name>HurWind226</name>
+        <name>HurWind${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>226</grid>
-        <process>
-            <id>30</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HurWind175</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>175</grid>
-        <process>
-            <id>30</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HurWind250</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>250</grid>
+        <grids>
+            <id>226</id>
+            <id>175</id>
+            <id>250</id>
+        </grids>
         <process>
             <id>30</id>
         </process>
@@ -994,7 +617,7 @@
     </model>
 
     <model>
-        <name>AK-NICICE</name>
+        <name>${REGION}-NICICE</name>
         <center>7</center>
         <subcenter>0</subcenter>
         <grid>242</grid>
@@ -1004,107 +627,18 @@
     </model>
 
     <model>
-        <name>DGEX185</name>
+        <name>DGEX${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>185</grid>
+        <grids>
+            <id>185</id>
+            <id>186</id>
+        </grids>
         <process>
             <id>115</id>
         </process>
     </model>
 
-    <model>
-        <name>DGEX186</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>186</grid>
-        <process>
-            <id>115</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GFS212</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>212</grid>
-        <process>
-            <id>96</id>
-            <id>81</id>
-            <id>77</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GFS160</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>160</grid>
-        <process>
-            <id>96</id>
-            <id>81</id>
-            <id>77</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GFS254</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>254</grid>
-        <process>
-            <id>96</id>
-            <id>81</id>
-            <id>77</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GFS161</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>161</grid>
-        <process>
-            <id>96</id>
-            <id>81</id>
-            <id>77</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GFS199</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>199</grid>
-        <process>
-            <id>96</id>
-            <id>81</id>
-            <id>77</id>
-        </process>
-    </model>
-
-    <model>
-        <name>GFS230</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>230</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-        </process>
-    </model>
-
-    <model>
-        <name>RUC130</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>130</grid>
-        <process>
-            <id>105</id>
-        </process>
-    </model>
-
     <model>
         <name>rap32</name>
         <center>7</center>
@@ -1136,7 +670,7 @@
     </model>
 
     <model>
-        <name>AK-RTMA</name>
+        <name>${REGION}-RTMA</name>
         <center>7</center>
         <subcenter>0</subcenter>
         <grid>198</grid>
@@ -1206,139 +740,58 @@
     </model>
 
     <model>
-        <name>AKwave10</name>
+        <name>${REGION}wave10</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>15</grid>
+        <grids>
+            <id>15</id>
+            <id>14</id>
+            <id>13</id>
+            <id>12</id>
+        </grids>
         <process>
             <id>11</id>
         </process>
     </model>
 
     <model>
-        <name>AKwave10-2</name>
+        <name>${REGION}wave10-2</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>15</grid>
+        <grids>
+            <id>15</id>
+            <id>14</id>
+            <id>13</id>
+            <id>12</id>
+        </grids>
         <process>
             <id>255</id>
         </process>
     </model>
 
     <model>
-        <name>AKwave4</name>
+        <name>${REGION}wave4</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>16</grid>
+        <grids>
+            <id>16</id>
+            <id>17</id>
+            <id>18</id>
+        </grids>
         <process>
             <id>11</id>
         </process>
     </model>
 
     <model>
-        <name>AKwave4-2</name>
+        <name>${REGION}wave4-2</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>16</grid>
-        <process>
-            <id>255</id>
-        </process>
-    </model>
-
-    <model>
-        <name>EPwave10</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>14</grid>
-        <process>
-            <id>11</id>
-        </process>
-    </model>
-
-    <model>
-        <name>EPwave10-2</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>14</grid>
-        <process>
-            <id>255</id>
-        </process>
-    </model>
-
-    <model>
-        <name>WCwave10</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>13</grid>
-        <process>
-            <id>11</id>
-        </process>
-    </model>
-
-    <model>
-        <name>WCwave10-2</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>13</grid>
-        <process>
-            <id>255</id>
-        </process>
-    </model>
-
-    <model>
-        <name>WCwave4</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>17</grid>
-        <process>
-            <id>11</id>
-        </process>
-    </model>
-    <model>
-        <name>WCwave4-2</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>17</grid>
-        <process>
-            <id>255</id>
-        </process>
-    </model>
-
-    <model>
-        <name>WNAwave10</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>12</grid>
-        <process>
-            <id>11</id>
-        </process>
-    </model>
-
-    <model>
-        <name>WNAwave10-2</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>12</grid>
-        <process>
-            <id>255</id>
-        </process>
-    </model>
-
-    <model>
-        <name>WNAwave4</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>18</grid>
-        <process>
-            <id>11</id>
-        </process>
-    </model>
-
-    <model>
-        <name>WNAwave4-2</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>18</grid>
+        <grids>
+            <id>16</id>
+            <id>17</id>
+            <id>18</id>
+        </grids>
         <process>
             <id>255</id>
         </process>
@@ -1356,178 +809,55 @@
     </model>
 
     <model>
-        <name>AK-NamDNG5</name>
+        <name>${REGION}-NamDNG5</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>198</grid>
+        <grids>
+            <id>198</id>
+            <id>196</id>
+            <id>195</id>
+        </grids>
         <process>
             <id>89</id>
         </process>
     </model>
 
     <model>
-        <name>HI-NamDNG5</name>
+        <name>HiResW-ARW-${REGION}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>196</grid>
-        <process>
-            <id>89</id>
-        </process>
-    </model>
-
-    <model>
-        <name>PR-NamDNG5</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>195</grid>
-        <process>
-            <id>89</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-ARW-East</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255001</grid>
+        <grids>
+            <id>255001</id>
+            <id>255002</id>
+            <id>255003</id>
+            <id>255004</id>
+            <id>255005</id>
+            <id>255006</id>
+            <id>14731025001</id>
+        </grids>
         <process>
             <id>116</id>
         </process>
     </model>
 
     <model>
-        <name>HiResW-ARW-West</name>
+        <name>HiResW-NMM-${REGION}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>255002</grid>
-        <process>
-            <id>116</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-ARW-AK</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255003</grid>
-        <process>
-            <id>116</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-ARW-SJU</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255004</grid>
-        <process>
-            <id>116</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-ARW-HI</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255005</grid>
-        <process>
-            <id>116</id>
-        </process>
-    </model>
-
-
-    <model>
-        <name>HiResW-ARW-GU</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255006</grid>
-        <process>
-            <id>116</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-ARW-US</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>14731025001</grid>
-        <process>
-            <id>116</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-NMM-East</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255001</grid>
+        <grids>
+            <id>255001</id>
+            <id>255002</id>
+            <id>255003</id>
+            <id>255004</id>
+            <id>255005</id>
+            <id>255006</id>
+            <id>14731025001</id>
+        </grids>
         <process>
             <id>112</id>
         </process>
     </model>
 
-
-    <model>
-        <name>HiResW-NMM-West</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255002</grid>
-        <process>
-            <id>112</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-NMM-AK</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255003</grid>
-        <process>
-            <id>112</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-NMM-SJU</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255004</grid>
-        <process>
-            <id>112</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-NMM-HI</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255005</grid>
-        <process>
-            <id>112</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-NMM-GU</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>255006</grid>
-        <process>
-            <id>112</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HiResW-NMM-US</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>14731025001</grid>
-        <process>
-            <id>112</id>
-        </process>
-    </model>
-
-
     <model>
         <name>GRLKwave</name>
         <center>7</center>
@@ -1668,16 +998,6 @@
         </process>
     </model>
 
-    <model>
-        <name>mesoEta237</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>237</grid>
-        <process>
-            <id>84</id>
-        </process>
-    </model>
-
     <model>
         <name>GFS0.5</name>
         <center>7</center>
@@ -1728,7 +1048,10 @@
         <name>gfs</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>228</grid>
+        <grids>
+            <id>228</id>
+            <id>145073001</id>
+        </grids>
         <process>
             <id>96</id>
             <id>77</id>
@@ -1779,18 +1102,6 @@
         </process>
     </model>
 
-    <model>
-        <name>gfs</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>145073001</grid>
-        <process>
-            <id>96</id>
-            <id>77</id>
-            <id>81</id>
-        </process>
-    </model>
-
     <model>
         <name>gfs</name>
         <center>7</center>
@@ -1806,27 +1117,11 @@
         <name>gdas</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>3</grid>
-        <process>
-            <id>82</id>
-        </process>
-    </model>
-
-    <model>
-        <name>gdas</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>361181001</grid>
-        <process>
-            <id>82</id>
-        </process>
-    </model>
-
-    <model>
-        <name>gdas</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>372</grid>
+        <grids>
+            <id>3</id>
+            <id>361181001</id>
+            <id>372</id>
+        </grids>
         <process>
             <id>82</id>
         </process>
@@ -1896,17 +1191,10 @@
         <name>lfm</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>5</grid>
-        <process>
-            <id>84</id>
-        </process>
-    </model>
-
-    <model>
-        <name>lfm</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>6</grid>
+        <grids>
+            <id>5</id>
+            <id>6</id>
+        </grids>
         <process>
             <id>84</id>
         </process>
@@ -1999,17 +1287,10 @@
         <name>nww3</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>233</grid>
-        <process>
-            <id>88</id>
-        </process>
-    </model>
-
-    <model>
-        <name>nww3</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>289157001</grid>
+        <grids>
+            <id>233</id>
+            <id>289157001</id>
+        </grids>
         <process>
             <id>88</id>
         </process>
@@ -2019,17 +1300,10 @@
         <name>RTGSST</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>235</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-
-    <model>
-        <name>RTGSST</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>721360001</grid>
+        <grids>
+            <id>235</id>
+            <id>721360001</id>
+        </grids>        
         <process>
             <id>44</id>
         </process>
@@ -2039,17 +1313,10 @@
         <name>RTGSSTHR</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>173</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-
-    <model>
-        <name>RTGSSTHR</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>4321216001</grid>
+        <grids>
+            <id>173</id>
+            <id>4321216001</id>
+        </grids>          
         <process>
             <id>44</id>
         </process>
@@ -2077,20 +1344,13 @@
     </model>
 
     <model>
-        <name>AQM196</name>
+        <name>AQM${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>196</grid>
-        <process>
-            <id>211</id>
-        </process>
-    </model>
-
-    <model>
-        <name>AQM227</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>227</grid>
+        <grids>
+            <id>196</id>
+            <id>227</id>
+        </grids>
         <process>
             <id>211</id>
         </process>
@@ -2100,27 +1360,11 @@
         <name>wave30mAO</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>720051001</grid>
-        <process>
-            <id>11</id>
-        </process>
-    </model>
-
-    <model>
-        <name>wave30mAO</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>721051001</grid>
-        <process>
-            <id>11</id>
-        </process>
-    </model>
-
-    <model>
-        <name>wave30mAO</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>722051001</grid>
+        <grids>
+            <id>720051001</id>
+            <id>721051001</id>
+            <id>722051001</id>
+        </grids>
         <process>
             <id>11</id>
         </process>
@@ -2141,17 +1385,10 @@
         <name>wave30mGlobal</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>721311001</grid>
-        <process>
-            <id>11</id>
-        </process>
-    </model>
-
-    <model>
-        <name>wave30mGlobal</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>721336001</grid>
+        <grids>
+            <id>721311001</id>
+            <id>721336001</id>
+        </grids>        
         <process>
             <id>11</id>
         </process>
@@ -2276,10 +1513,19 @@
     </model>
 
     <model>
-        <name>ENSEMBLE37</name>
+        <name>ENSEMBLE${COVERAGE}</name>
         <center>7</center>
         <subcenter>2</subcenter>
-        <grid>37</grid>
+        <grids>
+            <id>37</id>
+            <id>38</id>
+            <id>39</id>
+            <id>40</id>
+            <id>41</id>
+            <id>42</id>
+            <id>43</id>
+            <id>44</id>            
+        </grids>
         <process>
             <id>80</id>
             <id>81</id>
@@ -2290,108 +1536,30 @@
     </model>
 
     <model>
-        <name>ENSEMBLE38</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>38</grid>
-        <process>
-            <id>80</id>
-            <id>81</id>
-            <id>82</id>
-            <id>94</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ENSEMBLE39</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>39</grid>
-        <process>
-            <id>80</id>
-            <id>81</id>
-            <id>82</id>
-            <id>94</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ENSEMBLE40</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>40</grid>
-        <process>
-            <id>80</id>
-            <id>81</id>
-            <id>82</id>
-            <id>94</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ENSEMBLE41</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>41</grid>
-        <process>
-            <id>80</id>
-            <id>81</id>
-            <id>82</id>
-            <id>94</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ENSEMBLE42</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>42</grid>
-        <process>
-            <id>80</id>
-            <id>81</id>
-            <id>82</id>
-            <id>94</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ENSEMBLE43</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>43</grid>
-        <process>
-            <id>80</id>
-            <id>81</id>
-            <id>82</id>
-            <id>94</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ENSEMBLE44</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>44</grid>
-        <process>
-            <id>80</id>
-            <id>81</id>
-            <id>82</id>
-            <id>94</id>
-            <id>96</id>
-        </process>
-    </model>
-
-    <model>
-        <name>SREF132</name>
+        <name>SREF${COVERAGE}</name>
         <center>7</center>
         <subcenter>0</subcenter>
-        <grid>132</grid>
+        <grids>
+            <id>132</id>
+            <id>212</id>
+        </grids>
+        <process>
+            <id>111</id>
+            <id>112</id>
+            <id>113</id>
+            <id>116</id>
+        </process>
+    </model>
+
+
+    <model>
+        <name>SREF${COVERAGE}</name>
+        <center>7</center>
+        <subcenter>2</subcenter>
+        <grids>
+            <id>132</id>
+            <id>212</id>
+        </grids>
         <process>
             <id>111</id>
             <id>112</id>
@@ -2401,59 +1569,13 @@
     </model>
 
     <model>
-        <name>SREF132</name>
+        <name>SREF${COVERAGE}</name>
         <center>7</center>
         <subcenter>2</subcenter>
-        <grid>132</grid>
-        <process>
-            <id>111</id>
-            <id>112</id>
-            <id>113</id>
-            <id>116</id>
-        </process>
-    </model>
-
-    <model>
-        <name>SREF212</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>212</grid>
-        <process>
-            <id>111</id>
-            <id>112</id>
-            <id>113</id>
-            <id>116</id>
-        </process>
-    </model>
-
-    <model>
-        <name>SREF212</name>
-        <center>7</center>
-        <subcenter>0</subcenter>
-        <grid>212</grid>
-        <process>
-            <id>111</id>
-            <id>112</id>
-            <id>113</id>
-            <id>116</id>
-        </process>
-    </model>
-
-    <model>
-        <name>SREF216</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>216</grid>
-        <process>
-            <id>113</id>
-        </process>
-    </model>
-
-    <model>
-        <name>SREF243</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>243</grid>
+        <grids>
+            <id>216</id>
+            <id>242</id>
+        </grids>
         <process>
             <id>113</id>
         </process>
@@ -2470,20 +1592,13 @@
     </model>
 
     <model>
-        <name>naefsUS</name>
+        <name>naefs${REGION}</name>
         <center>7</center>
         <subcenter>2</subcenter>
-        <grid>197</grid>
-        <process>
-            <id>114</id>
-        </process>
-    </model>
-
-    <model>
-        <name>naefsAK</name>
-        <center>7</center>
-        <subcenter>2</subcenter>
-        <grid>198</grid>
+        <grids>
+            <id>197</id>
+            <id>198</id>
+        </grids>
         <process>
             <id>114</id>
         </process>
@@ -2536,7 +1651,7 @@
     </model>
 
     <model>
-        <name>GFSGuide-361091001</name>
+        <name>GFSGuide-${COVERAGE}</name>
         <center>7</center>
         <subcenter>4</subcenter>
         <grid>361091001</grid>
@@ -2568,40 +1683,15 @@
     </model>
 
     <model>
-        <name>AK-RTMA</name>
+        <name>${REGION}-RTMA</name>
         <center>7</center>
         <subcenter>4</subcenter>
-        <grid>198</grid>
-        <process>
-            <id>109</id>
-        </process>
-    </model>
-
-    <model>
-        <name>HI-RTMA</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>196</grid>
-        <process>
-            <id>109</id>
-        </process>
-    </model>
-
-    <model>
-        <name>PR-RTMA</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>195</grid>
-        <process>
-            <id>109</id>
-        </process>
-    </model>
-
-    <model>
-        <name>Guam-RTMA</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>199</grid>
+        <grids>
+            <id>198</id>
+            <id>196</id>
+            <id>195</id>
+            <id>199</id>
+        </grids>
         <process>
             <id>109</id>
         </process>
@@ -2638,7 +1728,7 @@
     </model>
 
     <model>
-        <name>ccpaUS</name>
+        <name>ccpa${REGION}</name>
         <center>7</center>
         <subcenter>4</subcenter>
         <grid>240</grid>
@@ -2651,27 +1741,11 @@
         <name>ccpaP5</name>
         <center>7</center>
         <subcenter>4</subcenter>
-        <grid>720361001</grid>
-        <process>
-            <id>184</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ccpaP5</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>721361001</grid>
-        <process>
-            <id>184</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ccpaP5</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>722361001</grid>
+        <grids>
+            <id>720361001</id>
+            <id>721361001</id>
+            <id>722361001</id>
+        </grids>        
         <process>
             <id>184</id>
         </process>
@@ -2688,146 +1762,27 @@
     </model>
 
     <model>
-        <name>SeaSfcAnalysis21</name>
+        <name>SeaSfcAnalysis${COVERAGE}</name>
         <center>7</center>
         <subcenter>4</subcenter>
-        <grid>21</grid>
-        <process>
+        <grids>
+            <id>21</id>
+            <id>22</id>
+            <id>23</id>
+            <id>24</id>
+            <id>37</id>
+            <id>38</id>
+            <id>39</id>
+            <id>40</id>
+            <id>41</id>
+            <id>42</id>
+            <id>43</id>
             <id>44</id>
-        </process>
-    </model>
-
-    <model>
-        <name>SeaSfcAnalysis22</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>22</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis23</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>23</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis24</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>24</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis37</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>37</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis38</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>38</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis39</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>39</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis40</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>40</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis41</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>41</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis42</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>42</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis43</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>43</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis44</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>44</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis61</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>61</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis62</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>62</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis63</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>63</grid>
-        <process>
-            <id>44</id>
-        </process>
-    </model>
-    <model>
-        <name>SeaSfcAnalysis64</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>64</grid>
+            <id>61</id>
+            <id>62</id>
+            <id>63</id>
+            <id>64</id>
+        </grids>          
         <process>
             <id>44</id>
         </process>
@@ -2837,17 +1792,10 @@
         <name>ccpa</name>
         <center>7</center>
         <subcenter>4</subcenter>
-        <grid>3</grid>
-        <process>
-            <id>184</id>
-        </process>
-    </model>
-
-    <model>
-        <name>ccpa</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>361181001</grid>
+        <grids>
+            <id>3</id>
+            <id>361181001</id>
+        </grids>
         <process>
             <id>184</id>
         </process>
@@ -2884,7 +1832,7 @@
     </model>
 
     <model>
-        <name>estofsPR</name>
+        <name>estofs${REGION}</name>
         <center>7</center>
         <subcenter>4</subcenter>
         <grid>339227001</grid>
@@ -2895,30 +1843,14 @@
     </model>
 
     <model>
-        <name>estofsHI</name>
+        <name>estofs${REGION}</name>
         <center>7</center>
         <subcenter>4</subcenter>
-        <grid>321225001</grid>
-        <process>
-            <id>17</id>
-        </process>
-    </model>
-
-    <model>
-        <name>estofsAK</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>825553001</grid>
-        <process>
-            <id>17</id>
-        </process>
-    </model>
-
-    <model>
-        <name>estofsEP</name>
-        <center>7</center>
-        <subcenter>4</subcenter>
-        <grid>184</grid>
+        <grids>
+           <id>321225001</id>
+           <id>825553001</id>
+           <id>184</id>
+        </grids>
         <process>
             <id>17</id>
         </process>
@@ -2957,7 +1889,7 @@
     </model>
 
     <model>
-        <name>HPCGuide-AK</name>
+        <name>HPCGuide-${REGION}</name>
         <center>7</center>
         <subcenter>5</subcenter>
         <grid>198</grid>
@@ -2993,25 +1925,29 @@
         </process>
     </model>
 
+    <model>
+        <name>PWPF</name>
+        <center>7</center>
+        <subcenter>5</subcenter>
+        <grid>184</grid>
+        <process>
+            <id>222</id>
+            <id>223</id>
+        </process>
+    </model>
+
     <!-- END SUBCENTER 5: HYDROMETEROLOGICAL PREDICTION CENTER -->
 
     <!-- SUBCENTER 6: MARINE PREDICTION CENTER -->
 
     <model>
-        <name>OPCWave180</name>
+        <name>OPCWave${COVERAGE}</name>
         <center>7</center>
         <subcenter>6</subcenter>
-        <grid>180</grid>
-        <process>
-            <id>30</id>
-        </process>
-    </model>
-
-    <model>
-        <name>OPCWave181</name>
-        <center>7</center>
-        <subcenter>6</subcenter>
-        <grid>181</grid>
+        <grids>
+            <id>180</id>
+            <id>181</id>
+        </grids>
         <process>
             <id>30</id>
         </process>
@@ -3042,7 +1978,7 @@
     </model>
 
     <model>
-        <name>CPCoutlook-Short-AK</name>
+        <name>CPCoutlook-Short-${REGION}</name>
         <center>7</center>
         <subcenter>7</subcenter>
         <grid>198</grid>
@@ -3052,7 +1988,7 @@
     </model>
 
     <model>
-        <name>CPCoutlook-Medium-AK</name>
+        <name>CPCoutlook-Medium-${REGION}</name>
         <center>7</center>
         <subcenter>7</subcenter>
         <grid>198</grid>
@@ -3167,7 +2103,7 @@
     </model>
 
     <model>
-        <name>TPCWindProb-721181001</name>
+        <name>TPCWindProb-${COVERAGE}</name>
         <center>7</center>
         <subcenter>10</subcenter>
         <grid>721181001</grid>
@@ -3177,7 +2113,7 @@
     </model>
 
     <model>
-        <name>OPCWave182</name>
+        <name>OPCWave${COVERAGE}</name>
         <center>7</center>
         <subcenter>10</subcenter>
         <grid>182</grid>
@@ -3204,17 +2140,20 @@
     </model>
 
     <model>
-        <name>MOSGuide-AK</name>
+        <name>MOSGuide-${REGION}</name>
         <center>7</center>
         <subcenter>14</subcenter>
-        <grid>1023</grid>
+        <grids>
+            <id>1023</id>
+            <id>625561001</id>
+        </grids>
         <process>
             <id>96</id>
         </process>
     </model>
 
     <model>
-        <name>AK-RTMA3</name>
+        <name>${REGION}-RTMA3</name>
         <center>7</center>
         <subcenter>4</subcenter>
         <grid>1023</grid>
@@ -3223,16 +2162,6 @@
         </process>
     </model>
 
-    <model>
-        <name>MOSGuide-HI</name>
-        <center>7</center>
-        <subcenter>14</subcenter>
-        <grid>625561001</grid>
-        <process>
-            <id>96</id>
-        </process>
-    </model>
-
     <model>
         <name>GFSLAMP5km</name>
         <center>7</center>
@@ -3265,7 +2194,7 @@
     </model>
 
     <model>
-        <name>TPCSurgeProb197</name>
+        <name>TPCSurgeProb${COVERAGE}</name>
         <center>7</center>
         <subcenter>14</subcenter>
         <grid>197</grid>
@@ -3275,7 +2204,7 @@
     </model>
 
     <model>
-        <name>TPCSurgeProb-AK</name>
+        <name>TPCSurgeProb-${REGION}</name>
         <center>7</center>
         <subcenter>14</subcenter>
         <grid>198</grid>
@@ -3318,7 +2247,7 @@
     </model>
 
     <model>
-        <name>EKDMOS-AK</name>
+        <name>EKDMOS-${REGION}</name>
         <center>7</center>
         <subcenter>14</subcenter>
         <grid>1023</grid>
diff --git a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
index af5704c089..61d05e5345 100644
--- a/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_UKMET-74.xml
@@ -41,94 +41,19 @@ F.Achorn/OPC	10/15/13	Added Ukmet HR tiles 1-8
 	</model>
 
 	<model>
-		<name>UKMET37</name>
+		<name>UKMET${COVERAGE}</name>
 		<center>74</center>
 		<subcenter>0</subcenter>
-		<grid>37</grid>
-		<process>
-			<id>15</id>
-			<id>44</id>
-			<id>45</id>
-		</process>
-	</model>
-
-	<model>
-		<name>UKMET38</name>
-		<center>74</center>
-		<subcenter>0</subcenter>
-		<grid>38</grid>
-		<process>
-			<id>15</id>
-			<id>44</id>
-			<id>45</id>
-		</process>
-	</model>
-
-	<model>
-		<name>UKMET39</name>
-		<center>74</center>
-		<subcenter>0</subcenter>
-		<grid>39</grid>
-		<process>
-			<id>15</id>
-			<id>44</id>
-			<id>45</id>
-		</process>
-	</model>
-
-	<model>
-		<name>UKMET40</name>
-		<center>74</center>
-		<subcenter>0</subcenter>
-		<grid>40</grid>
-		<process>
-			<id>15</id>
-			<id>44</id>
-			<id>45</id>
-		</process>
-	</model>
-
-	<model>
-		<name>UKMET41</name>
-		<center>74</center>
-		<subcenter>0</subcenter>
-		<grid>41</grid>
-		<process>
-			<id>15</id>
-			<id>44</id>
-			<id>45</id>
-		</process>
-	</model>
-
-	<model>
-		<name>UKMET42</name>
-		<center>74</center>
-		<subcenter>0</subcenter>
-		<grid>42</grid>
-		<process>
-			<id>15</id>
-			<id>44</id>
-			<id>45</id>
-		</process>
-	</model>
-
-	<model>
-		<name>UKMET43</name>
-		<center>74</center>
-		<subcenter>0</subcenter>
-		<grid>43</grid>
-		<process>
-			<id>15</id>
-			<id>44</id>
-			<id>45</id>
-		</process>
-	</model>
-
-	<model>
-		<name>UKMET44</name>
-		<center>74</center>
-		<subcenter>0</subcenter>
-		<grid>44</grid>
+		<grids>
+            <id>37</id>
+            <id>38</id>
+            <id>39</id>
+            <id>40</id>
+            <id>41</id>
+            <id>42</id>
+            <id>43</id>
+            <id>44</id>
+         </grids>
 		<process>
 			<id>15</id>
 			<id>44</id>
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF
index d5c4b12283..7c8088ae09 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ldadhydro Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.ldadhydro
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13",
  com.raytheon.uf.edex.pointdata,
@@ -11,9 +11,9 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13",
  org.geotools;bundle-version="2.5.2",
  com.raytheon.uf.common.localization;bundle-version="1.11.13",
  com.raytheon.edex.plugin.ldad;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.raytheon.edex.plugin.ldadhydro.dao
 Import-Package: com.raytheon.uf.common.dataplugin.ldadhydro,
  com.raytheon.uf.common.status,
  com.raytheon.uf.edex.pointdata,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
index 6dd7550718..85735f7c62 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
@@ -43,8 +43,10 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.raytheon.edex.exception.DecoderException;
-import com.raytheon.edex.plugin.AbstractDecoder;
 import com.raytheon.edex.plugin.IBinaryDecoder;
 import com.raytheon.edex.plugin.ldad.common.DecodedData;
 import com.raytheon.edex.plugin.ldad.common.LdadField;
@@ -69,15 +71,20 @@ import com.raytheon.uf.common.time.DataTime;
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
  * 10/16/13     DR 16685    M.Porricelli Add error checking for date
  *                                       format
- * Jul 23, 2014 3410       bclement    location changed to floats
+ * Jul 23, 2014 3410        bclement    location changed to floats
+ * Dec 17, 2015 5166        kbisanz     Update logging to use SLF4J
+ *                                      by adding private logger and stop
+ *                                      extending AbstractDecoder
  * </pre>
  * 
  * @author vkorolev
  * @version 1
  */
 
-public class HydroDecoder<E> extends AbstractDecoder implements IBinaryDecoder {
-	
+public class HydroDecoder<E> implements IBinaryDecoder {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
     private static final String BAD_PROPERTY_FMT = "NumberFormatException setting property %s.%s(%s %s)";
 
     private String traceId = null;
@@ -199,11 +206,11 @@ public class HydroDecoder<E> extends AbstractDecoder implements IBinaryDecoder {
                         }
                         // DataTime = Observation time
                         Calendar ot = record.getObservationTime();
-                        if (ot != null){
-                           DataTime dt = new DataTime(ot);
-                           record.setDataTime(dt);
-                           record.setLocation(location);
-                           retVal.add(record);
+                        if (ot != null) {
+                            DataTime dt = new DataTime(ot);
+                            record.setDataTime(dt);
+                            record.setLocation(location);
+                            retVal.add(record);
                         }
                         // logger.info("-------------------------------------------------------");
                     }
@@ -259,12 +266,13 @@ public class HydroDecoder<E> extends AbstractDecoder implements IBinaryDecoder {
                     cal.setTimeZone(TimeZone.getTimeZone("GMT"));
                     cal.setTime(ot);
                     val = cal;
-                } catch(Exception e) {
-                    logger.error("Could not parse date field [" + name + ":"  + value + "]");
+                } catch (Exception e) {
+                    logger.error("Could not parse date field [" + name + ":"
+                            + value + "]");
                     return;
                 }
                 // only numbers
-             } else {
+            } else {
                 Double tval = null;
                 try {
                     tval = Double.parseDouble(value);
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/LdadhydroPointDataTransform.java b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/LdadhydroPointDataTransform.java
index 269c48d425..6017c5d2fa 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/LdadhydroPointDataTransform.java
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/LdadhydroPointDataTransform.java
@@ -25,8 +25,8 @@ import java.util.Map;
 
 import javax.xml.bind.JAXBException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.PluginException;
@@ -45,7 +45,8 @@ import com.raytheon.uf.common.pointdata.PointDataView;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Nov 19, 2010            bsteffen     Initial creation
+ * Nov 19, 2010            bsteffen    Initial creation
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -54,7 +55,7 @@ import com.raytheon.uf.common.pointdata.PointDataView;
  */
 public class LdadhydroPointDataTransform {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private LdadHydroDao dao;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/META-INF/MANIFEST.MF
index 13dabcb488..d004649767 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ldadmanual Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.ldadmanual
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13",
  com.raytheon.uf.common.pointdata,
@@ -11,6 +11,6 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13",
  org.geotools;bundle-version="2.5.2",
  com.raytheon.uf.common.localization;bundle-version="1.11.13",
  com.raytheon.edex.plugin.ldad;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.raytheon.edex.plugin.ldadmanual.dao
-Import-Package: org.apache.commons.logging
+Import-Package: org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/src/com/raytheon/edex/plugin/ldadmanual/dao/ManualDecoder.java b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/src/com/raytheon/edex/plugin/ldadmanual/dao/ManualDecoder.java
index 7edcba9873..d808547eb0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/src/com/raytheon/edex/plugin/ldadmanual/dao/ManualDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/src/com/raytheon/edex/plugin/ldadmanual/dao/ManualDecoder.java
@@ -42,8 +42,10 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.raytheon.edex.exception.DecoderException;
-import com.raytheon.edex.plugin.AbstractDecoder;
 import com.raytheon.edex.plugin.IBinaryDecoder;
 import com.raytheon.edex.plugin.ldad.common.DecodedData;
 import com.raytheon.edex.plugin.ldad.common.LdadField;
@@ -65,14 +67,20 @@ import com.raytheon.uf.common.time.DataTime;
  * ------------ ----------  ----------- --------------------------
  * Sep 30, 2009             vkorolev    Initial creation
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
- * Jul 23, 2014 3410       bclement    location changed to floats
+ * Jul 23, 2014 3410        bclement    location changed to floats
+ * Dec 17, 2015 5166        kbisanz     Update logging to use SLF4J
+ *                                      by adding private logger and stop
+ *                                      extending AbstractDecoder
  * </pre>
  * 
  * @author vkorolev
  * @version 1
  */
 
-public class ManualDecoder<E> extends AbstractDecoder implements IBinaryDecoder {
+public class ManualDecoder<E> implements IBinaryDecoder {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
     private String traceId = null;
 
     public SimpleDateFormat sdf = new SimpleDateFormat("yy/MM/dd HH:mm:ss");
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/META-INF/MANIFEST.MF
index e312c208ae..e2cfbd61b5 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ldadprofiler Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.ldadprofiler
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13",
  javax.persistence;bundle-version="1.0.0",
@@ -12,8 +12,8 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.13",
  com.raytheon.edex.plugin.ldad;bundle-version="1.0.0",
  com.raytheon.uf.common.pointdata;bundle-version="1.11.17",
  com.raytheon.uf.edex.pointdata
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.raytheon.edex.plugin.ldadprofiler.common,
  com.raytheon.edex.plugin.ldadprofiler.dao
 Import-Package: com.raytheon.uf.common.status,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/src/com/raytheon/edex/plugin/ldadprofiler/common/LdadprofilerPointDataTransform.java b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/src/com/raytheon/edex/plugin/ldadprofiler/common/LdadprofilerPointDataTransform.java
index e7eb44c1a3..0d88370c71 100644
--- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/src/com/raytheon/edex/plugin/ldadprofiler/common/LdadprofilerPointDataTransform.java
+++ b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/src/com/raytheon/edex/plugin/ldadprofiler/common/LdadprofilerPointDataTransform.java
@@ -25,8 +25,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.ldadprofiler.dao.LdadProfilerDao;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
@@ -45,6 +45,7 @@ import com.raytheon.uf.common.serialization.SerializationException;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Oct 29, 2009            vkorolev    Initial creation
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -98,7 +99,7 @@ public class LdadprofilerPointDataTransform {
 
     private PointDataDescription pdd;
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     public LdadprofilerPointDataTransform() {
 
@@ -134,7 +135,6 @@ public class LdadprofilerPointDataTransform {
         return pdo;
     }
 
-    @SuppressWarnings("unchecked")
     private PointDataView buildView(PointDataContainer container,
             ProfilerLdadObs record) {
         PointDataView pdv = container.append();
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
index 3273b0ab50..566a6eff9a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Obs Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.obs
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Export-Package: com.raytheon.edex.plugin.obs,
  com.raytheon.edex.plugin.obs.metar,
@@ -24,4 +24,4 @@ Import-Package: com.raytheon.uf.common.dataplugin.obs.metar,
  com.raytheon.uf.common.dataplugin.obs.metar.util,
  com.raytheon.uf.common.status,
  com.raytheon.uf.common.wmo,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
index 2f02246324..268d2f580f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/ObsDecoder.java
@@ -20,8 +20,8 @@
 
 package com.raytheon.edex.plugin.obs;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
@@ -56,6 +56,7 @@ import com.raytheon.uf.common.wmo.WMOHeader;
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
  * Oct 23, 2013 2361        njensen     Removed dead mesowest code
  * May 14, 2014 2536        bclement    moved WMO Header to common
+ * Dec 15, 2015 5166        kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author bphillip
@@ -63,7 +64,7 @@ import com.raytheon.uf.common.wmo.WMOHeader;
  */
 public class ObsDecoder extends AbstractDecoder {
     /** The logger */
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private final IPerformanceStatusHandler perfLog = PerformanceStatus
             .getHandler("Obs:");
diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarSeparator.java b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarSeparator.java
index 9afdfbfea4..b0102eb8f8 100644
--- a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarSeparator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarSeparator.java
@@ -1,28 +1,25 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
 
 package com.raytheon.edex.plugin.obs.metar;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -32,8 +29,8 @@ import java.util.NoSuchElementException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
@@ -42,38 +39,31 @@ import com.raytheon.uf.common.util.StringUtil;
 import com.raytheon.uf.common.wmo.WMOHeader;
 
 /**
- * 
- * 
- * Separator implementation for metar record
- * 
+ * Separator implementation for METAR/SPECI files.
+ *
  * <pre>
- * 
- * 
+ *
+ *
  * SOFTWARE HISTORY
- * 
- * Date       	Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * July2006		3 &amp; 14		Phillippe	Initial Creation
- * 14Nov2006	71			Rockwood	Implemented filter for NIL observations	
- * 20080418           1093  jkorman     Added filter for Alaskan &quot;Airways&quot;
+ *
+ * Date         Ticket#     Engineer    Description
+ * ------------ ----------  ----------- --------------------------
+ * Jul ??, 2006 3 &amp; 14  Phillippe   Initial Creation
+ * Nov 14, 2006 71          Rockwood    Implemented filter for NIL observations
+ * Apr 14, 2008 1093        jkorman     Added filter for Alaskan &quot;Airways&quot;
  *                                      observations.
- * May 14, 2014 2536       bclement    moved WMO Header to common, removed unused HEADERREGEX
- * Oct 02, 2014 3693       mapeters    Changed pattern String constants to Pattern constants.
+ * May 14, 2014 2536        bclement    moved WMO Header to common, removed unused HEADERREGEX
+ * Oct 02, 2014 3693        mapeters    Changed pattern String constants to Pattern constants.
+ * Dec 15, 2015 5166        kbisanz     Update logging to use SLF4J
+ * Jan 29, 2016 5265        nabowle     Update type replaceAll. General cleanup.
  * </pre>
- * 
+ *
  * @author bphillip
  * @version 1
  */
-
-/**
- * Implementation of file separator for METAR/SPECI files
- * 
- * @author bphillip
- * 
- */
 public class MetarSeparator extends AbstractRecordSeparator {
 
-    private final Log theLogger = LogFactory.getLog(getClass());
+    private final Logger theLogger = LoggerFactory.getLogger(getClass());
 
     /** Regex used for separating multi-record files */
     private static final Pattern ICAODATEPAIR = Pattern
@@ -82,6 +72,7 @@ public class MetarSeparator extends AbstractRecordSeparator {
     /** Regex used for determining metar type */
     private static final Pattern METARTYPE = Pattern.compile("METAR|SPECI");
 
+    /** Regex to check for Alaskan Airways observations. */
     private static final Pattern AIRWAYS = Pattern
             .compile("[A-Z][A-Z,0-9]{3} (SP|SA) \\d{4} AWOS");
 
@@ -97,6 +88,7 @@ public class MetarSeparator extends AbstractRecordSeparator {
     /** List of record bodies contained in file */
     private List<String> records;
 
+    /** Iterator over the records. */
     private Iterator<String> iterator = null;
 
     public MetarSeparator() {
@@ -112,28 +104,19 @@ public class MetarSeparator extends AbstractRecordSeparator {
 
     /**
      * Get the WMO Header found within this data.
+     *
      * @return The message WMO Header.
      */
     public WMOHeader getWMOHeader() {
         return header;
     }
-    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.edex.plugin.AbstractRecordSeparator#setData(byte[])
-     */
+
     @Override
     public void setData(byte[] data, Headers headers) {
         this.doSeparate(new String(data));
         iterator = records.iterator();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.edex.plugin.AbstractRecordSeparator#nextRecord()
-     */
     public boolean hasNext() {
         if (iterator == null) {
             return false;
@@ -142,11 +125,6 @@ public class MetarSeparator extends AbstractRecordSeparator {
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.util.Iterator#next()
-     */
     public byte[] next() {
         try {
             String temp = iterator.next();
@@ -161,8 +139,10 @@ public class MetarSeparator extends AbstractRecordSeparator {
     }
 
     /**
-     * 
+     * Separates the composite message into the individual records.
+     *
      * @param message
+     *            The message.
      */
     private void doSeparate(String message) {
 
@@ -171,32 +151,27 @@ public class MetarSeparator extends AbstractRecordSeparator {
         try {
             // Extracts the header
             WMOHeader wmoHeader = new WMOHeader(message.getBytes());
-            if(wmoHeader.isValid()) {
+            if (wmoHeader.isValid()) {
                 header = wmoHeader;
             }
-            
-//            Pattern pattern = Pattern.compile(HEADERREGEX);
-//            Matcher matcher = pattern.matcher(message);
-//
-//            if (matcher.find()) {
-//                header = matcher.group();
-//            }
+
             // Determines the type
             Matcher matcher = METARTYPE.matcher(message);
-
             if (matcher.find()) {
                 type = matcher.group();
+                message = matcher.replaceAll("");
             } else {
                 type = "METAR";
             }
-            message = message.replaceAll(type, "");
 
             matcher = ICAODATEPAIR.matcher(message);
 
             List<Integer> bodyIndex = new ArrayList<Integer>();
             Map<String, String> bodyMap = new HashMap<String, String>();
-            // Extracts all the matches out of the message. Looks for ICAO/date
-            // pairs. Does not allow duplicate entries.
+            /*
+             * Extracts all the matches out of the message. Looks for ICAO/date
+             * pairs. Does not allow duplicate entries.
+             */
             if (matcher.find()) {
                 bodyIndex.add(matcher.start());
                 String obsKey = matcher.group();
@@ -226,9 +201,11 @@ public class MetarSeparator extends AbstractRecordSeparator {
                     // If it exists in the map then keep this observation.
                     if (bodyMap.containsKey(obsKey)) {
                         bodyRecords.add(observation);
-                        // now that we have data for this key,
-                        // remove it from the map so we skip any
-                        // subsequent observations with the same key.
+                        /*
+                         * now that we have data for this key, remove it from
+                         * the map so we skip any subsequent observations with
+                         * the same key.
+                         */
                         bodyMap.remove(obsKey);
                     }
                 }
@@ -237,10 +214,11 @@ public class MetarSeparator extends AbstractRecordSeparator {
             // Perform a some more checks on the data.
             for (int i = 0; i < bodyRecords.size(); i++) {
                 String observation = bodyRecords.get(i);
-                // 20080418 - 1093
-                // Check for old style AIRWAYS data from Alaskan stations. This
-                // data will be at the end of valid METAR/SPECI data so just
-                // remove it.
+                /*
+                 * 20080418 - 1093 Check for old style AIRWAYS data from Alaskan
+                 * stations. This data will be at the end of valid METAR/SPECI
+                 * data so just remove it.
+                 */
                 matcher = AIRWAYS.matcher(observation);
                 if (matcher.find()) {
                     observation = observation.substring(0, matcher.start());
@@ -249,51 +227,14 @@ public class MetarSeparator extends AbstractRecordSeparator {
                 // Check for NIL observations and, if found, throw out
                 matcher = NILREGEX.matcher(observation);
                 if (!matcher.find()) {
-                    String record = header.getWmoHeader() + "\n" + type + " " + observation;
+                    String record = header.getWmoHeader() + "\n" + type + " "
+                            + observation;
                     records.add(record);
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
-            theLogger.warn("No valid METAR records found.");
+            theLogger.warn("Invalid METAR message received.", e);
         }
         return;
     }
-
-    /**
-     * Test function
-     * 
-     * @param args
-     */
-    public static void main(String[] args) {
-
-        String CRCRLF = "\r\r\n";
-
-        String fileName = "/common/jkorman/data_store/obs/"
-                + "SAUS70_KWBC_241218.obs";
-        String str;
-        MetarSeparator ben = new MetarSeparator();
-        System.out.println(fileName);
-
-        StringBuilder sb = new StringBuilder();
-        try {
-            BufferedReader in = new BufferedReader(new FileReader(fileName));
-            while ((str = in.readLine()) != null) {
-                sb.append(CRCRLF);
-                sb.append(str);
-            }
-            in.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        ben.setData(sb.toString().getBytes(), null);
-        int i = 0;
-        while (ben.hasNext()) {
-
-            byte[] tData = ben.next();
-
-            System.out.println("Record # " + (++i) + " [" + tData.length
-                    + "]: \n{" + new String(tData) + "}");
-        }
-    }
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.poessounding/META-INF/MANIFEST.MF
index a2a67db9a1..edd1032099 100644
--- a/edexOsgi/com.raytheon.edex.plugin.poessounding/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Poessounding Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.poessounding
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
@@ -23,4 +23,4 @@ Import-Package: com.raytheon.uf.common.dataplugin.poessounding,
  com.raytheon.uf.edex.bufrtools.descriptors,
  com.raytheon.uf.edex.bufrtools.packets,
  com.raytheon.uf.edex.pointdata,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java b/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
index 7247f66b11..65a9574a52 100644
--- a/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingDecoder.java
@@ -26,8 +26,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
@@ -66,6 +66,7 @@ import com.raytheon.uf.edex.database.plugin.PluginFactory;
  *                                     correct file.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * May 14, 2014 2536       bclement    moved WMO Header to common
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -79,7 +80,7 @@ public class POESSoundingDecoder extends AbstractDecoder implements
     public static final String PLUGIN_NAME = "poessounding";
 
     /** The logger */
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private PointDataDescription pdd;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingSeparator.java b/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingSeparator.java
index f9fb80b677..5149cb4b4a 100644
--- a/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingSeparator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/POESSoundingSeparator.java
@@ -22,8 +22,8 @@ package com.raytheon.edex.plugin.poessounding;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.plugin.AbstractRecordSeparator;
@@ -48,8 +48,9 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 20080303           1026 jkorman     Initial implementation.
+ * Mar 03, 2008 1026       jkorman     Initial implementation.
  * May 14, 2014 2536       bclement    moved WMO Header to common
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -59,7 +60,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
 public class POESSoundingSeparator extends AbstractRecordSeparator implements
         IDescriptorFactorySelector {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private WMOHeader wmoHeader = null;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/decoder/POESSoundingDataAdapter.java b/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/decoder/POESSoundingDataAdapter.java
index 9756537e21..be96bb6545 100644
--- a/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/decoder/POESSoundingDataAdapter.java
+++ b/edexOsgi/com.raytheon.edex.plugin.poessounding/src/com/raytheon/edex/plugin/poessounding/decoder/POESSoundingDataAdapter.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.poessounding.dao.POESSoundingDAO;
 import com.raytheon.uf.common.dataplugin.poessounding.POESSounding;
@@ -61,6 +61,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
  *                                     correct file.
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed TimeTools usage
  * Jul 23, 2014 3410       bclement    location changed to floats
+ * Dec 15, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -69,8 +70,8 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
  */
 public class POESSoundingDataAdapter {
 
-    private static Log logger = LogFactory
-            .getLog(POESSoundingDataAdapter.class);
+    private static Logger logger = LoggerFactory
+            .getLogger(POESSoundingDataAdapter.class);
 
     private static final String SPI_FILE = "poesBufr.spi";
 
@@ -154,10 +155,10 @@ public class POESSoundingDataAdapter {
             int index = 10;
 
             IBUFRDataPacket dp = dataList.get(index++);
-            
-            Double lat = getDouble(dp,null); // (Double) dp.getValue();
+
+            Double lat = getDouble(dp, null); // (Double) dp.getValue();
             dp = dataList.get(index++);
-            Double lon = getDouble(dp,null); // (Double) dp.getValue();
+            Double lon = getDouble(dp, null); // (Double) dp.getValue();
 
             // If we have lat/lon data, set it into the obs object. Otherwise
             // no need to go further, set the obs object to null and quit!
@@ -175,7 +176,8 @@ public class POESSoundingDataAdapter {
                         obsData.setLocation(location);
 
                         dp = dataList.get(SNDG_HGT);
-                        Double elev = getDouble(dp,-9999.0); // (Double) dp.getValue();
+                        Double elev = getDouble(dp, -9999.0); // (Double)
+                                                              // dp.getValue();
                         location.setElevation(elev.intValue());
 
                         index = 0;
@@ -290,13 +292,13 @@ public class POESSoundingDataAdapter {
      */
     private static Double getDouble(IBUFRDataPacket packet, Double defaultValue) {
         Double retValue = defaultValue;
-        if(packet != null) {
+        if (packet != null) {
             Object o = packet.getValue();
-            if(o instanceof Double) {
+            if (o instanceof Double) {
                 retValue = ((Double) o).doubleValue();
-            } else if(o instanceof Long) {
+            } else if (o instanceof Long) {
                 retValue = ((Long) o).doubleValue();
-            } 
+            }
         }
         return retValue;
     }
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.radar/META-INF/MANIFEST.MF
index 002d2fa247..04e8584b96 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Radar Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.radar
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.edex.common;bundle-version="1.14.0",
  com.raytheon.uf.common.dataplugin.level;bundle-version="1.14.0",
  com.raytheon.uf.common.localization;bundle-version="1.14.0",
@@ -22,4 +22,4 @@ Export-Package: com.raytheon.edex.plugin.radar,
 Import-Package: com.raytheon.uf.common.dataplugin.text.db,
  com.raytheon.uf.common.inventory.tree,
  com.raytheon.uf.common.wmo,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
index 5ce6012083..2f3ef31ec0 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
@@ -28,16 +28,17 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
-import com.raytheon.edex.plugin.AbstractDecoder;
 import com.raytheon.edex.plugin.radar.dao.RadarStationDao;
 import com.raytheon.edex.plugin.radar.level2.Level2BaseRadar;
 import com.raytheon.edex.plugin.radar.level3.Level3BaseRadar;
 import com.raytheon.edex.plugin.radar.util.RadarEdexTextProductUtil;
 import com.raytheon.edex.plugin.radar.util.RadarSpatialUtil;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.radar.RadarRecord;
 import com.raytheon.uf.common.dataplugin.radar.RadarStation;
 import com.raytheon.uf.common.dataplugin.radar.level3.AlertMessage;
@@ -102,6 +103,11 @@ import com.raytheon.uf.edex.database.cluster.ClusterTask;
  * Dec 26, 2014  ASM#632  dhuffman    Added AlertMessageSanityCheck() for this DR.
  * Feb 27, 2015  17086    zwang       Corrected the elevation of volume based TDWR products
  * Mar 25, 2015  4319     bsteffen    Save the volume scan number.
+ * Dec 16, 2015  5166     kbisanz     Update logging to use SLF4J
+ *                                    by adding private logger and stop
+ *                                    extending AbstractDecoder.
+ *                                    finalizeRecord(..) does not throw
+ *                                    PluginException.
  * 
  * </pre>
  * 
@@ -109,7 +115,9 @@ import com.raytheon.uf.edex.database.cluster.ClusterTask;
  * @version 1
  */
 
-public class RadarDecoder extends AbstractDecoder {
+public class RadarDecoder {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private static final IUFStatusHandler theHandler = UFStatus
             .getHandler(RadarDecoder.class);
@@ -324,7 +332,8 @@ public class RadarDecoder extends AbstractDecoder {
                             record.getIcao() + ": Alert Message Received",
                             details, null);
                 } else {
-                    details += "Alert Category # : " + msg.getAlertCategory() + "\n";
+                    details += "Alert Category # : " + msg.getAlertCategory()
+                            + "\n";
                     EDEXUtil.sendMessageAlertViz(Priority.DEBUG,
                             RadarConstants.PLUGIN_ID, EDEX, RADAR,
                             record.getIcao() + ": Alert Received & Obviated",
@@ -352,7 +361,7 @@ public class RadarDecoder extends AbstractDecoder {
                 // determine to use the primary elevations or the elevation
                 // in the terminal radar configuration file
                 if (TerminalRadarUtils.isTerminalRadar(record.getIcao())
-                    && info.isElevation()) {
+                        && info.isElevation()) {
                     Double elevation = TerminalRadarUtils.getPrimarysMap(
                             record.getIcao()).get(
                             TiltAngleBin.getPrimaryElevationAngle(record
@@ -444,12 +453,7 @@ public class RadarDecoder extends AbstractDecoder {
                 }
             }
 
-            try {
-                finalizeRecord(record);
-            } catch (PluginException e) {
-                logger.error(e);
-                return new PluginDataObject[0];
-            }
+            finalizeRecord(record);
 
             timer.stop();
             perfLog.logDuration("Time to Decode", timer.getElapsedTime());
@@ -514,12 +518,7 @@ public class RadarDecoder extends AbstractDecoder {
             record.setDisplayModes(info.getDisplayModes());
             record.setUnit(info.getUnit());
             record.setLocation(radarStation);
-            try {
-                finalizeRecord(record);
-            } catch (PluginException e) {
-                logger.error(e);
-                continue;
-            }
+            finalizeRecord(record);
             recordList.add(record);
         }
     }
@@ -554,7 +553,7 @@ public class RadarDecoder extends AbstractDecoder {
                 "Free text message received", temp, null);
     }
 
-    private void finalizeRecord(RadarRecord record) throws PluginException {
+    private void finalizeRecord(RadarRecord record) {
         record.setTraceId(traceId);
         record.setInsertTime(TimeUtil.newGmtCalendar());
         // for GSM, we want all the messages as they have the possibility of
@@ -780,7 +779,8 @@ public class RadarDecoder extends AbstractDecoder {
      * @param AlertMessage
      * @return boolean
      */
-    private static boolean AlertMessageSanityCheck(final AlertMessage alertMessage) {
+    private static boolean AlertMessageSanityCheck(
+            final AlertMessage alertMessage) {
         if (alertMessage.getExceedingValue() < alertMessage.getThresholdValue())
             return false;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/Import88DLocationsUtil.java b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/Import88DLocationsUtil.java
index fa906442a9..19f6bad9c4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/Import88DLocationsUtil.java
+++ b/edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/util/Import88DLocationsUtil.java
@@ -43,6 +43,8 @@ import com.vividsolutions.jts.io.WKTReader;
  * 09/11/2012   DR 15366    D. Friedman Set SRID on radar stations.
  * Mar 06, 2014 2876        mpduff      Moved NationalDatasetSubscriber.
  * Jul 09, 2015 4500        rjpeter     Fix SQL Injection concern.
+ * Jan 27, 2016 5237        tgurney     Replace deprecated LocalizationFile
+ *                                      method call
  * </pre>
  */
 public class Import88DLocationsUtil implements INationalDatasetSubscriber {
@@ -166,7 +168,7 @@ public class Import88DLocationsUtil implements INationalDatasetSubscriber {
                     statusHandler.handle(
                             Priority.PROBLEM,
                             "Could not create output file: "
-                                    + outFile.getName(), e);
+                                    + outFile.getPath(), e);
                 }
             } finally {
                 if (fis != null) {
diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.recco/META-INF/MANIFEST.MF
index a5b66c66a4..5e9be7ca11 100644
--- a/edexOsgi/com.raytheon.edex.plugin.recco/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.recco/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Recco Plug-in
 Bundle-SymbolicName: com.raytheon.edex.plugin.recco
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Export-Package: com.raytheon.edex.plugin.recco,
  com.raytheon.edex.plugin.recco.common,
@@ -15,4 +15,4 @@ Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.edex.decodertools;bundle-version="1.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.raytheon.uf.common.wmo,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/RECCODecoder.java b/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/RECCODecoder.java
index f3d76efacf..2bb3acd683 100644
--- a/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/RECCODecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/RECCODecoder.java
@@ -21,9 +21,11 @@ package com.raytheon.edex.plugin.recco;
 
 import java.util.Calendar;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
-import com.raytheon.edex.plugin.AbstractDecoder;
 import com.raytheon.edex.plugin.recco.common.RECCORecord;
 import com.raytheon.edex.plugin.recco.decoder.ReccoParser;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
@@ -58,12 +60,17 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed PLUGIN_NAME
  * Jul 23, 2014 3410       bclement    location changed to floats
  * Sep 26, 2014 3629       mapeters    Added RECCO_MANOBS, RECCO_INTEROBS constants.
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
+ *                                     by adding private logger and stop
+ *                                     extending AbstractDecoder
  * </pre>
  * 
  * @author jkorman
  * @version 1.0
  */
-public class RECCODecoder extends AbstractDecoder {
+public class RECCODecoder {
+
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private static final int RECCO_MANOBS = 4500;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/RECCOSeparator.java b/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/RECCOSeparator.java
index 989457f8aa..01732e5bc7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/RECCOSeparator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/RECCOSeparator.java
@@ -26,8 +26,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.plugin.AbstractRecordSeparator;
@@ -56,6 +56,8 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderInput;
  * 20080103            384 jkorman     Initial Coding.
  * 11/25/08          #1684 chammack    Camel Refactor
  * May 14, 2014 2536       bclement    moved WMO Header to common
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
+ *                                     by adding private logger
  * </pre>
  * 
  * @author jkorman
@@ -63,7 +65,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderInput;
  */
 public class RECCOSeparator extends AbstractRecordSeparator {
     /** The logger */
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private static final String RECCO_HDR = "9(222|555|777)9";
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/purge/satellitePurgeRules.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/purge/satellitePurgeRules.xml
index d17fe041fe..e86ee92115 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/purge/satellitePurgeRules.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/purge/satellitePurgeRules.xml
@@ -3,569 +3,16 @@
 	<key>sectorID</key>
 	<key>physicalElement</key>
 	<defaultRule>
-		<versionsToKeep>24</versionsToKeep>
+		<period>01-00:00:00</period>
 	</defaultRule>
-	<rule>
-		<keyValue>Alaska National</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>48</versionsToKeep>
+	<rule regex="true">
+		<keyValue>.*</keyValue>
+		<keyValue>.*Visible.*</keyValue>
+		<period>00-18:00:00</period>
 	</rule>
-	<rule>
-		<keyValue>Alaska National</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>48</versionsToKeep>
+	<rule regex="true">
+		<keyValue>.*</keyValue>
+		<keyValue>Sounder.*</keyValue>
+		<period>00-12:00:00</period>
 	</rule>
-	<rule>
-		<keyValue>Alaska National</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>36</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Alaska National</keyValue>
-		<keyValue>Percent of Normal TPW</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Alaska National</keyValue>
-		<keyValue>Rain fall rate</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Alaska National</keyValue>
-		<keyValue>Sounder Based Derived Precipitable Water (PW)</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Alaska Regional</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Alaska Regional</keyValue>
-		<keyValue>Imager 12 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Alaska Regional</keyValue>
-		<keyValue>Imager 13 micron (IR)</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Alaska Regional</keyValue>
-		<keyValue>Imager 3.9 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Alaska Regional</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Alaska Regional</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Imager 12 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Imager 13 micron (IR)</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Imager 3.9 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>56</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Low cloud base imagery</keyValue>
-		<versionsToKeep>62</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Sounder 11.03 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Sounder 14.06 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Sounder 3.98 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Sounder 4.45 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Sounder 6.51 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Sounder 7.02 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Sounder 7.43 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>East CONUS</keyValue>
-		<keyValue>Sounder Visible imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>36</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Percent of Normal TPW</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Rain fall rate</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Sounder 11.03 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Sounder 14.06 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Sounder 3.98 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Sounder 4.45 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Sounder 6.51 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Sounder 7.02 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Sounder 7.43 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Sounder Based Derived Precipitable Water (PW)</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii National</keyValue>
-		<keyValue>Sounder Visible imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii Regional</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii Regional</keyValue>
-		<keyValue>Imager 12 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii Regional</keyValue>
-		<keyValue>Imager 3.9 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii Regional</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Hawaii Regional</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>NH Composite - Meteosat-GOES E-GOES W-GMS</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>NH Composite - Meteosat-GOES E-GOES W-GMS</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>NH Composite - Meteosat-GOES E-GOES W-GMS</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Northern Hemisphere Composite</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Northern Hemisphere Composite</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Northern Hemisphere Composite</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>36</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>36</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Percent of Normal TPW</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Rain fall rate</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Sounder 11.03 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Sounder 14.06 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Sounder 3.98 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Sounder 4.45 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Sounder 6.51 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Sounder 7.02 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Sounder 7.43 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Sounder Based Derived Precipitable Water (PW)</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico National</keyValue>
-		<keyValue>Sounder Visible imagery</keyValue>
-		<versionsToKeep>36</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico Regional</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico Regional</keyValue>
-		<keyValue>Imager 12 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico Regional</keyValue>
-		<keyValue>Imager 13 micron (IR)</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico Regional</keyValue>
-		<keyValue>Imager 3.9 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico Regional</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Puerto Rico Regional</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Gridded Cloud Amount</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Gridded Cloud Top Pressure or Height</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>32</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>32</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>32</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Percent of Normal TPW</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Rain fall rate</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder Based Derived Lifted Index (LI)</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder Based Derived Precipitable Water (PW)</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder Based Derived Surface Skin Temp (SFC Skin)</keyValue>
-		<versionsToKeep>48</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>24</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Imager 12 micron IR</keyValue>
-		<versionsToKeep>32</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Imager 13 micron (IR)</keyValue>
-		<versionsToKeep>32</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Imager 3.9 micron IR</keyValue>
-		<versionsToKeep>32</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>32</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>20</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Low cloud base imagery</keyValue>
-		<versionsToKeep>36</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder 11.03 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder 14.06 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder 3.98 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder 4.45 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder 6.51 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder 7.02 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder 7.43 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>Supernational</keyValue>
-		<keyValue>Sounder Visible imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Imager 11 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Imager 12 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Imager 13 micron (IR)</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Imager 3.9 micron IR</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Imager 6.7-6.5 micron IR (WV)</keyValue>
-		<versionsToKeep>96</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Imager Visible</keyValue>
-		<versionsToKeep>56</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Low cloud base imagery</keyValue>
-		<versionsToKeep>62</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Sounder 11.03 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Sounder 14.06 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Sounder 3.98 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Sounder 4.45 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Sounder 6.51 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Sounder 7.02 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Sounder 7.43 micron imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>West CONUS</keyValue>
-		<keyValue>Sounder Visible imagery</keyValue>
-		<versionsToKeep>4</versionsToKeep>
-	</rule>
-	
-</purgeRuleSet>
+</purgeRuleSet>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDecoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDecoder.java
index 2e9f694eb6..08611a54f5 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsDecoder.java
@@ -24,8 +24,8 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
@@ -73,6 +73,7 @@ import com.raytheon.uf.edex.decodertools.core.DecoderTools;
  *                                     added status  to decode.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed TimeTools usage
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -88,7 +89,7 @@ public class SfcObsDecoder extends AbstractDecoder {
             .getHandler("SfcObs:");
 
     /** The logger */
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private boolean removeNILs = true;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsPointDataTransform.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsPointDataTransform.java
index 615d66b471..4284674313 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsPointDataTransform.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsPointDataTransform.java
@@ -27,8 +27,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.sfcobs.AncPrecip;
@@ -49,10 +49,11 @@ import com.raytheon.uf.common.serialization.SerializationException;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 1, 2009             jkorman     Initial creation
- * Feb 15,2011  5705       cjeanbap    Added wmoHeader to HDR_PARAMS_LIST.
- * Apr 04,2014  2906       bclement    made getDescription() and static constants public
- * Apr 22,2014  2906       bclement    removed WMO header, timeObs and timeNominal from HDF5 (times still in DB)
+ * Oct 01, 2009            jkorman     Initial creation
+ * Feb 15, 2011 5705       cjeanbap    Added wmoHeader to HDR_PARAMS_LIST.
+ * Apr 04, 2014 2906       bclement    made getDescription() and static constants public
+ * Apr 22, 2014 2906       bclement    removed WMO header, timeObs and timeNominal from HDF5 (times still in DB)
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -63,8 +64,8 @@ import com.raytheon.uf.common.serialization.SerializationException;
 public class SfcObsPointDataTransform {
 
     /** The logger */
-    private static Log logger = LogFactory
-            .getLog(SfcObsPointDataTransform.class);
+    private static Logger logger = LoggerFactory
+            .getLogger(SfcObsPointDataTransform.class);
 
     public static final int INT_DEFAULT = -9999;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsSeparator.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsSeparator.java
index f0eb9cecad..a3df347192 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsSeparator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/SfcObsSeparator.java
@@ -25,8 +25,8 @@ import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.plugin.AbstractRecordSeparator;
@@ -53,9 +53,10 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 20070925            391 jkorman     Initial Coding.
+ * 20070925     391        jkorman     Initial Coding.
  * May 14, 2014 2536       bclement    moved WMO Header to common
  * Sep 26, 2014 3629       mapeters    Added SOM constant, replaced static imports.
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -63,7 +64,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
  */
 public class SfcObsSeparator extends AbstractRecordSeparator {
     /** The logger */
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private static final String SOM = String
             .valueOf((char) IDecoderConstants.ASCII_SOM);
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/SfcObsDecoderFactory.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/SfcObsDecoderFactory.java
index 509cb19e94..b4ee09ceba 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/SfcObsDecoderFactory.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/SfcObsDecoderFactory.java
@@ -22,8 +22,8 @@ package com.raytheon.edex.plugin.sfcobs.decoder;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.sfcobs.decoder.buoy.DRIBUSynopticDecoder;
 import com.raytheon.edex.plugin.sfcobs.decoder.metar.METARDecoder;
@@ -45,8 +45,9 @@ import com.raytheon.uf.common.wmo.WMOHeader;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 20070925            391 jkorman     Initial Coding.
- * Sep 26, 2014       3629 mapeters    Added SPACE_CHAR constant.
+ * 20070925     391        jkorman     Initial Coding.
+ * Sep 26, 2014 3629       mapeters    Added SPACE_CHAR constant.
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -54,7 +55,8 @@ import com.raytheon.uf.common.wmo.WMOHeader;
  */
 public class SfcObsDecoderFactory {
     /** The logger */
-    private static Log logger = LogFactory.getLog(SfcObsDecoderFactory.class);
+    private static Logger logger = LoggerFactory
+            .getLogger(SfcObsDecoderFactory.class);
 
     private static final char SPACE_CHAR = ' ';
 
@@ -95,9 +97,9 @@ public class SfcObsDecoderFactory {
                     try {
                         decoder = clazz.newInstance();
                     } catch (InstantiationException e) {
-                        logger.error(e);
+                        logger.error("Error getting decoder instance", e);
                     } catch (IllegalAccessException e) {
-                        logger.error(e);
+                        logger.error("Error getting decoder instance", e);
                     }
                 }
                 if (decoder != null) {
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/metar/METARDecoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/metar/METARDecoder.java
index 91b2afe11d..4e411acac1 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/metar/METARDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/metar/METARDecoder.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.edex.plugin.sfcobs.decoder.metar;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.edex.plugin.sfcobs.decoder.AbstractSfcObsDecoder;
@@ -36,7 +36,8 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 20070928            391 jkorman     Initial Coding.
+ * 20070928     391        jkorman     Initial Coding.
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -45,7 +46,7 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject;
 public class METARDecoder extends AbstractSfcObsDecoder {
 
     /** The logger */
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     /**
      * Construct the decoder.
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/CMANSynopticDecoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/CMANSynopticDecoder.java
index cf7231ee91..bca93a4fd3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/CMANSynopticDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/CMANSynopticDecoder.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.edex.plugin.sfcobs.decoder.synoptic;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.edex.plugin.sfcobs.decoder.AbstractSfcObsDecoder;
@@ -44,9 +44,10 @@ import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
  * ------------ ---------- ----------- --------------------------
  * 20070928     391        jkorman     Initial Coding.
  * Dec 17, 2007 600        bphillip    Added dao pool usage
- * 20080116            798 jkorman     Changed logging levels.
+ * 20080116     798        jkorman     Changed logging levels.
  * Feb 27, 2013 1638       mschenke    Moved ObStationDao to edex pointdata plugin
  * Sep 30, 2014 3629       mapeters    Replaced {@link AbstractSfcObsDecoder#matchElement()} calls.
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -55,7 +56,7 @@ import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
 public class CMANSynopticDecoder extends LandSynopticDecoder {
 
     /** The logger */
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     /**
      * Construct an instance of a Coastal Marine observation decoder.
@@ -130,13 +131,13 @@ public class CMANSynopticDecoder extends LandSynopticDecoder {
                         setWmoRegion(stationInfo.getWmoRegion());
                     } else {
                         // The NDM data doesn't discriminate between CMAN and
-                        // fixed buoy identifiers unless manually modified. 
+                        // fixed buoy identifiers unless manually modified.
                         gid = ObStation.createGID(ObStation.CAT_TYPE_BUOY_FXD,
                                 staId);
                         stationInfo = obSta.queryByGid(gid);
                         if (stationInfo != null) {
-                            logger.debug("Processing CMAN[" + getReportIdentifier()
-                                    + "]");
+                            logger.debug("Processing CMAN["
+                                    + getReportIdentifier() + "]");
                             setWmoRegion(stationInfo.getWmoRegion());
                         } else {
                             logger.info("Station id not found ["
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/LandSynopticDecoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/LandSynopticDecoder.java
index 057b9d35f0..ecbca88ae5 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/LandSynopticDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/LandSynopticDecoder.java
@@ -22,8 +22,8 @@ package com.raytheon.edex.plugin.sfcobs.decoder.synoptic;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.edex.plugin.sfcobs.decoder.AbstractSfcObsDecoder;
@@ -51,9 +51,10 @@ import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
  * ------------ ---------- ----------- --------------------------
  * 20070928     391        jkorman     Initial Coding.
  * Dec 17, 2007 600        bphillip    Added dao pool usage
- * 20080116            798 jkorman     Changed logging levels.
+ * 20080116     798        jkorman     Changed logging levels.
  * Feb 27, 2013 1638       mschenke    Moved ObStationDao to edex pointdata plugin
  * Sep 30, 2014 3629       mapeters    Replaced {@link AbstractSfcObsDecoder#matchElement()} calls.
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -62,7 +63,7 @@ import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
 public class LandSynopticDecoder extends AbstractSynopticDecoder {
 
     // The logger
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     protected ObStation stationInfo = null;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/MAROBSynopticDecoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/MAROBSynopticDecoder.java
index b1a74cfd88..cacf1f5f4e 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/MAROBSynopticDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/MAROBSynopticDecoder.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.edex.plugin.sfcobs.decoder.synoptic;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.edex.plugin.sfcobs.decoder.AbstractSfcObsDecoder;
@@ -37,9 +37,10 @@ import com.raytheon.uf.common.dataplugin.sfcobs.ObsCommon;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 20071010            391 jkorman     Initial coding.
- * 20071217            453 jkorman     Added code to report MAROB report type.
- * Sep 30, 2014       3629 mapeters    Replaced {@link AbstractSfcObsDecoder#matchElement()} calls.
+ * 20071010     391        jkorman     Initial coding.
+ * 20071217     453        jkorman     Added code to report MAROB report type.
+ * Sep 30, 2014 3629       mapeters    Replaced {@link AbstractSfcObsDecoder#matchElement()} calls.
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -50,7 +51,7 @@ import com.raytheon.uf.common.dataplugin.sfcobs.ObsCommon;
 public class MAROBSynopticDecoder extends SHIPSynopticDecoder {
 
     // The logger
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     /**
      * Create and set up the MAROB synoptic decoder.
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/MobileSynopticDecoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/MobileSynopticDecoder.java
index 6b7b86de55..00d3d6335f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/MobileSynopticDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/MobileSynopticDecoder.java
@@ -21,8 +21,8 @@ package com.raytheon.edex.plugin.sfcobs.decoder.synoptic;
 
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.edex.plugin.sfcobs.decoder.AbstractSfcObsDecoder;
@@ -41,10 +41,11 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 20070928            391 jkorman     Initial Coding.
+ * 20070928     391        jkorman     Initial Coding.
  * Jul 23, 2014 3410       bclement    location changed to floats
  * Sep 30, 2014 3629       mapeters    Replaced {@link AbstractSfcObsDecoder#matchElement()} 
  *                                     calls, added ELEV_PATTERN.
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -56,7 +57,7 @@ public class MobileSynopticDecoder extends AbstractSynopticDecoder {
             .compile("[/0-9]{4}[1-8]");
 
     // The logger
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private Float mobileLatitude = null;
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SHIPSynopticDecoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SHIPSynopticDecoder.java
index 5ba6c69805..d674688f1b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SHIPSynopticDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SHIPSynopticDecoder.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.edex.plugin.sfcobs.decoder.synoptic;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.edex.plugin.sfcobs.decoder.AbstractSfcObsDecoder;
@@ -44,13 +44,14 @@ import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 20070928            391 jkorman     Initial Coding.
- * 20080106            391 jkorman     Corrected ship longitude decode.
- * 20080108            721 jkorman     Added buoy id query.
- * 20120619      DR 14015  mporricelli Added elevation for fixed buoys
+ * 20070928     391        jkorman     Initial Coding.
+ * 20080106     391        jkorman     Corrected ship longitude decode.
+ * 20080108     721        jkorman     Added buoy id query.
+ * 20120619     DR 14015   mporricelli Added elevation for fixed buoys
  * Feb 27, 2013 1638       mschenke    Moved ObStationDao to edex pointdata plugin
  * Jul 23, 2014 3410       bclement    location changed to floats
  * Sep 30, 2014 3629       mapeters    Replaced {@link AbstractSfcObsDecoder#matchElement()} calls.
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -59,14 +60,14 @@ import com.raytheon.uf.edex.pointdata.spatial.ObStationDao;
 public class SHIPSynopticDecoder extends AbstractSynopticDecoder {
 
     // The logger
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     protected Float shipLatitude = null;
 
     protected Float shipLongitude = null;
 
     protected Integer shipElev = null;
-    
+
     protected Integer shipQuadrant = null;
 
     protected boolean isFixedBuoy = false;
@@ -95,7 +96,7 @@ public class SHIPSynopticDecoder extends AbstractSynopticDecoder {
         isValid = reportPrefix.equals(element);
         Double buoyLat = null;
         Double buoyLon = null;
-        Integer buoyElev = null;        
+        Integer buoyElev = null;
         isFixedBuoy = false;
         if (isValid) {
             reportParser.next();
@@ -117,10 +118,12 @@ public class SHIPSynopticDecoder extends AbstractSynopticDecoder {
                     throw new DecoderException(
                             "Unable to retrieve station info", e);
                 }
-                if(staInfo != null) {
+                if (staInfo != null) {
                     isFixedBuoy = true;
-                    buoyLat = DecoderTools.getCoordinateLatitude(staInfo.getStationGeom().getCoordinate());
-                    buoyLon = DecoderTools.getCoordinateLongitude(staInfo.getStationGeom().getCoordinate());
+                    buoyLat = DecoderTools.getCoordinateLatitude(staInfo
+                            .getStationGeom().getCoordinate());
+                    buoyLon = DecoderTools.getCoordinateLongitude(staInfo
+                            .getStationGeom().getCoordinate());
                     buoyElev = staInfo.getElevation();
                 }
             }
@@ -159,12 +162,11 @@ public class SHIPSynopticDecoder extends AbstractSynopticDecoder {
                     + "---------------->");
             decodeLatitude();
             decodeLongitude();
-            if(isFixedBuoy) {
+            if (isFixedBuoy) {
                 // This change selects the common_obs_spatial location over the
                 // encoded location. This is so that moored buoy locations agree
-                // with the spi files 
-                
-                
+                // with the spi files
+
                 shipLatitude = buoyLat != null ? buoyLat.floatValue() : null;
                 shipLongitude = buoyLon != null ? buoyLon.floatValue() : null;
                 shipElev = buoyElev;
@@ -176,7 +178,8 @@ public class SHIPSynopticDecoder extends AbstractSynopticDecoder {
             } else {
                 if ((shipLatitude == null) || (shipLongitude == null)) {
                     clearSectionDecoders();
-                    logger.error("BAD:YYGGI_SUB_W : " + reportParser.getReport());
+                    logger.error("BAD:YYGGI_SUB_W : "
+                            + reportParser.getReport());
                     return;
                 }
                 adjustLatLon();
diff --git a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SynopticSec3Decoder.java b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SynopticSec3Decoder.java
index b56834e111..be46a5bdef 100644
--- a/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SynopticSec3Decoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.sfcobs/src/com/raytheon/edex/plugin/sfcobs/decoder/synoptic/SynopticSec3Decoder.java
@@ -24,8 +24,8 @@ import java.util.regex.Pattern;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.edex.plugin.sfcobs.decoder.AbstractSfcObsDecoder;
@@ -53,14 +53,15 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 20071010            391 jkorman     Initial coding.
- * 20071203            410 jkorman     JavaDoc complaints.
- * 20080116            798 jkorman     Changed logging levels.
- * Sep 18, 2014 #3627      mapeters    Convert units using {@link UnitConverter}, removed 
- *                                     unused duration field, made patterns constant.
- * Sep 26, 2014 #3629      mapeters    Replaced static imports.
- * Sep 30, 2014 #3629      mapeters    Conformed to changes in ISynoptic constants.
- * May 26, 2015 #4525      mapeters    Fix pressure unit conversion.
+ * 20071010     391        jkorman     Initial coding.
+ * 20071203     410        jkorman     JavaDoc complaints.
+ * 20080116     798        jkorman     Changed logging levels.
+ * Sep 18, 2014 3627       mapeters    Convert units using {@link UnitConverter}, removed
+ *                                      unused duration field, made patterns constant.
+ * Sep 26, 2014 3629       mapeters    Replaced static imports.
+ * Sep 30, 2014 3629       mapeters    Conformed to changes in ISynoptic constants.
+ * May 26, 2015 4525       mapeters    Fix pressure unit conversion.
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -80,7 +81,7 @@ public class SynopticSec3Decoder extends AbstractSectionDecoder {
     private static final Pattern P912 = Pattern.compile("912\\d{2}");
 
     /** The logger */
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private DataItem maxTemperature = null; // (group 1xxxx)
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
index af81d5c4fc..1b4e3ed1cc 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
@@ -30,5 +30,5 @@ Import-Package: com.raytheon.edex.plugin.obs,
  com.raytheon.uf.common.dataplugin.text.request,
  com.raytheon.uf.common.ohd,
  com.raytheon.uf.common.wmo,
- org.apache.commons.logging
+ org.slf4j
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/dao/ShefDao.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/dao/ShefDao.java
index ff79b83d11..d029c0d0ed 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/dao/ShefDao.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/dao/ShefDao.java
@@ -24,28 +24,30 @@ import java.io.File;
 import com.raytheon.edex.db.dao.DefaultPluginDao;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.ohd.AppsDefaults;
+import com.raytheon.uf.common.ohd.AppsDefaultsDirKeys;
 
 /**
  * Dao for SHEF Data.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  *                                     Initial creation
  * Jul 30, 2015 1574       nabowle     Override purgeOrphanedData() to noop
- *
+ * Jan 26, 2016 5264       bkowal      Use the apps defaults dir constant.
+ * 
  * </pre>
- *
+ * 
  * @author nabowle
  * @version 1.0
  */
 public class ShefDao extends DefaultPluginDao {
 
     /**
-     *
+     * 
      * @param pluginName
      * @throws PluginException
      */
@@ -55,8 +57,7 @@ public class ShefDao extends DefaultPluginDao {
 
     @Override
     public void purgeAllData() {
-        logger
-                .warn("Shef Purge All behavior not specified. No data will be purged.");
+        logger.warn("Shef Purge All behavior not specified. No data will be purged.");
     }
 
     @Override
@@ -65,8 +66,8 @@ public class ShefDao extends DefaultPluginDao {
          * Purge the file system
          */
         logger.info("Purging Hydro file system...");
-        File metarInputFile = new File(AppsDefaults.getInstance()
-                .getToken("whfs_local_data_dir")
+        File metarInputFile = new File(AppsDefaults.getInstance().getToken(
+                AppsDefaultsDirKeys.WHFS_LOCAL_DATA_DIR)
                 + "/metar_input");
         if (!metarInputFile.exists()) {
             metarInputFile.mkdir();
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
index d4da14a38b..f0d123c77b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
@@ -33,8 +33,8 @@ import java.util.TimeZone;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.shef.data.ShefData;
 import com.raytheon.edex.plugin.shef.data.ShefRecord;
@@ -132,6 +132,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
  * 09/18/2014   3627       mapeters    Updated deprecated {@link TimeTools} usage.
  * 06/26/2015   17420      xwei        Fix for : Application fails to act on defined locdatalimit range for parameter element SW
  * Aug 05, 2015 4486       rjpeter     Changed Timestamp to Date.
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author mduff
@@ -1098,7 +1099,7 @@ public class PostShef {
      */
     public void logStats(String traceId, long totalTime) {
         if (this.perfLog) {
-            Log perfLog = LogFactory.getLog("ShefPerfLog");
+            Logger perfLog = LoggerFactory.getLogger("ShefPerfLog");
             perfLog.info("********************************");
             perfLog.info("Performance Stats:  " + traceId);
             perfLog.info("Total Elapsed Time (ms): " + totalTime);
@@ -1158,7 +1159,7 @@ public class PostShef {
         }
     }
 
-    private void logIt(Log log, long value, String label) {
+    private void logIt(Logger log, long value, String label) {
         if (value > 0) {
             log.info(value + label);
         }
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PurgeText.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PurgeText.java
index 01cac87430..ce5f2c4d7d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PurgeText.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PurgeText.java
@@ -24,8 +24,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.shef.ShefSeparator;
 import com.raytheon.uf.common.dataplugin.shef.tables.Purgeproduct;
@@ -48,10 +48,11 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Mar 8, 2010             jkorman     Initial creation
+ * Mar 08, 2010            jkorman     Initial creation
  * Dec 03, 2013 2051       rjpeter     Fixed storeTextProduct issue.
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed unused int
  * Aug 05, 2015 4486       rjpeter     Changed Timestamp to Date.
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -60,7 +61,7 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
 
 public class PurgeText {
     /** The logger */
-    private final Log log = LogFactory.getLog(getClass());
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     private boolean storeText = false;
 
@@ -130,9 +131,11 @@ public class PurgeText {
                 }
 
             } catch (Exception e) {
-                log.error(traceId + " - Error processing text data.  ");
+                String errorMsg = traceId + " - Error processing text data.  ";
                 if (log.isDebugEnabled()) {
-                    log.error(e);
+                    log.error(errorMsg, e);
+                } else {
+                    log.error(errorMsg);
                 }
             }
         }
@@ -185,9 +188,11 @@ public class PurgeText {
                 }
             }
         } catch (Exception e) {
-            log.error(traceId + " - Error processing text data.  ");
+            String errorMsg = traceId + " - Error processing text data.  ";
             if (log.isDebugEnabled()) {
-                log.error(e);
+                log.error(errorMsg, e);
+            } else {
+                log.error(errorMsg);
             }
         }
     }
@@ -266,9 +271,11 @@ public class PurgeText {
             dao.saveOrUpdate(t);
             success = true;
         } catch (Exception e) {
-            log.error("Error saving text ");
+            String errorMsg = "Error saving text ";
             if (log.isDebugEnabled()) {
-                log.error(e);
+                log.error(errorMsg, e);
+            } else {
+                log.error(errorMsg);
             }
         }
         return success;
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
index 08dc818fa6..a6510b5f8f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
@@ -25,8 +25,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.shef.data.precip.PrecipRecord;
 import com.raytheon.uf.common.dataplugin.shef.tables.Dailypp;
@@ -48,15 +48,16 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
  * ------------   ---------- ----------- --------------------------
  * 9/22           #1553      mnash       Initial implementation of GagePP
  * 6/1/09         #2432      jsanchez    Updated value magnitude for hourlypp/pc.
- * 26 Nov 2012    #15554     lbousaidi	 used obstime instead of system time in isNear12Z
- * 										 routine.
+ * 26 Nov 2012    #15554     lbousaidi   used obstime instead of system time in isNear12Z
+ *                                       routine.
  * 4 Dec  2012    #15569     lbousaidi   fixed daily pp value when token is set to USE_REVCODE
  * 02 Feb 2012    #15845     lbousaidi   added check for data that comes in as -999
  * 07 May 2013    #15880     lbousaidi   changed pPE parameter because it was inserting to the
  *                                       wrong hour field.
- * 15 Sep 2014    #17129     lbousaidi   add a fix for the top of hour issue for hourlypp.                                     
+ * 15 Sep 2014    #17129     lbousaidi   add a fix for the top of hour issue for hourlypp.
  * 18 Sep 2014    #3627      mapeters    Updated deprecated {@link TimeTools} usage.
  * 15 Jun 2015    #15039     lbousaidi   add a fix to be able to post data to hour24.
+ * 16 Dec 2015    #5166      kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author mnash
@@ -72,7 +73,7 @@ public class GagePP {
     private static final int GPP_SKIP_RECORD = 4;
 
     private static final int GPP_BADRECORD = 3;
-    
+
     private static final int DEFAULT_WINDOW_HOURS = 3;
 
     public static final int MINIMUM_GPP_SLEEP_DURATION = 10;
@@ -97,7 +98,7 @@ public class GagePP {
 
     private static final float MISSING_PRECIP = -9999;
 
-    private static Log logger = LogFactory.getLog(GagePP.class);
+    private static Logger logger = LoggerFactory.getLogger(GagePP.class);
 
     private GagePPWrite gagePPWrite = null;
 
@@ -106,7 +107,7 @@ public class GagePP {
     private short pHourSlot;
 
     private short p6HourSlot;
-    
+
     public GagePP() {
     }
 
@@ -132,7 +133,6 @@ public class GagePP {
         String msgstr = "";
         String cur_key = "";
 
-
         Dailypp dailyPP = new Dailypp();
 
         Hourlypp hourlyPP = new Hourlypp();
@@ -152,9 +152,9 @@ public class GagePP {
         Date btime = new Date();
 
         int status = GPP_OK;
-        
+
         logger.info("Processing records at " + btime);
-        
+
         Calendar dt = TimeUtil.newGmtCalendar();
         dt.setTimeInMillis(rec.getObsTime().getTime());
 
@@ -219,16 +219,16 @@ public class GagePP {
             /*
              * Determine which 6 hour slot to place the data value in.
              */
-            
-            short [] sHour = new short [] { p6HourSlot, };
+
+            short[] sHour = new short[] { p6HourSlot };
             status = gage_pp_6hour_slot(pOptions, dt, obstime_ytd, sHour,
                     offset_code);
-            
-            if(!dt.getTime().equals(rec.getObsTime())) {
+
+            if (!dt.getTime().equals(rec.getObsTime())) {
                 rec.setObsTime(dt.getTime());
                 dp = TimeUtil.newCalendar(dt);
             }
-            
+
             p6HourSlot = sHour[0];
             break;
 
@@ -317,12 +317,13 @@ public class GagePP {
                             + MISSING_PRECIP);
                     value = MISSING_PRECIP;
                 }
-                /* This was added for KRF site that was getting missing values -999
-                 * 
+                /*
+                 * This was added for KRF site that was getting missing values
+                 * -999
                  */
-                
-                if (value ==-99900.0) {
-                     value = MISSING_PRECIP;
+
+                if (value == -99900.0) {
+                    value = MISSING_PRECIP;
                 }
 
                 /*
@@ -331,7 +332,7 @@ public class GagePP {
                  */
                 rec.setValue(Math.round((value)));
             }
-            
+
             if ((Float) (rec.getValue()) != null && rec.getLocationId() != null) {
                 prev_dur = rec.getShefDuration().getValue();
                 status = GPP_OK;
@@ -354,8 +355,8 @@ public class GagePP {
                                 .getLocationId(),
                                 rec.getTypeSource().getCode(), rec.getValue(),
                                 obstime_ytd, '0', 'M');
-                        initialize_hourlypp(hourlyPP, rev_6hour_code,
-                                msgstr, rec, rec.getObsTime());
+                        initialize_hourlypp(hourlyPP, rev_6hour_code, msgstr,
+                                rec, rec.getObsTime());
                         obstime_prev = obstime_ytd;
                         break;
 
@@ -402,18 +403,20 @@ public class GagePP {
                                     .getQualCode()));
                             hourlyPP.setMinuteOffset(String
                                     .valueOf(offset_code[0]));
-                            
+
                             rev_code = (short) ((rec.revision) ? 1 : 0);
                             break;
                         case 6:
                             precip_val = (short) rec.getValue();
-                            PrecipUtils.set_6hour_slot_value(hourlyPP, p6HourSlot,
-                                    precip_val);
+                            PrecipUtils.set_6hour_slot_value(hourlyPP,
+                                    p6HourSlot, precip_val);
                             hourlyPP.setSixhrqc(String.valueOf(rec
                                     .getQualCode()));
-                            hourlyPP.setSixhroffset(String.valueOf(offset_code[0]));
-                            
-                            rev_6hour_code[p6HourSlot] = (short)((rec.revision) ? 1 : 0);
+                            hourlyPP.setSixhroffset(String
+                                    .valueOf(offset_code[0]));
+
+                            rev_6hour_code[p6HourSlot] = (short) ((rec.revision) ? 1
+                                    : 0);
                             break;
                         case 24:
                             dailyPP.setValue(Double.valueOf(rec.getValue()));
@@ -424,13 +427,13 @@ public class GagePP {
                         default:
                             break;
                         }
-                                                
+
                     } else {
-                    	if (rec.getDataDuration() == 24) {
-                    	  dailyPP.setValue(Double.valueOf(rec.getValue()));
-                          dailyPP.setQc(String.valueOf(rec.getQualCode()));
-                          rev_24hour_code = rec.revision;
-                    	}
+                        if (rec.getDataDuration() == 24) {
+                            dailyPP.setValue(Double.valueOf(rec.getValue()));
+                            dailyPP.setQc(String.valueOf(rec.getQualCode()));
+                            rev_24hour_code = rec.revision;
+                        }
                     }
                     /*
                      * Increment the count of total values. This should always
@@ -456,7 +459,6 @@ public class GagePP {
                     + rec.getObsTime() + ": Record skipped");
         }
 
-
         return status;
     }
 
@@ -494,17 +496,18 @@ public class GagePP {
         case 1001:
         case 1006:
             status = GPP_OK;
-//            PrecipUtils.set_6hour_slot_value(pHourlyPP, pHourSlot,
-//                    rec.getValue());
+            // PrecipUtils.set_6hour_slot_value(pHourlyPP, pHourSlot,
+            // rec.getValue());
             try {
-                Short oneHourlyVal = PrecipUtils.get_hour_slot_value(pHourlyPP, pHourSlot);
-                Short sixHourlyVal = PrecipUtils.get_6hour_slot_value(pHourlyPP, p6HourSlot);
-                
-                gagePPWrite
-                        .gage_pp_write_rec(pHourlyPP, rec.getPhysicalElement()
-                                .getCode(), rec.getObsTime(), pOptions,
-                                rev_code, rev_6hour_code, oneHourlyVal,
-                                sixHourlyVal, rec.getQualCode(), rec.getQualifier());
+                Short oneHourlyVal = PrecipUtils.get_hour_slot_value(pHourlyPP,
+                        pHourSlot);
+                Short sixHourlyVal = PrecipUtils.get_6hour_slot_value(
+                        pHourlyPP, p6HourSlot);
+
+                gagePPWrite.gage_pp_write_rec(pHourlyPP, rec
+                        .getPhysicalElement().getCode(), rec.getObsTime(),
+                        pOptions, rev_code, rev_6hour_code, oneHourlyVal,
+                        sixHourlyVal, rec.getQualCode(), rec.getQualifier());
             } catch (Exception e) {
                 logger.error("Unable to write to the database : " + e);
                 status = GPP_ERROR;
@@ -528,7 +531,8 @@ public class GagePP {
         case 5004:
 
             status = GagePPWrite.gage_pp_write_daily_rec(pDailyPP, pOptions,
-                    rec.getObsTime(), rev_24hour_code, rec.getQualCode(), rec.getQualifier());
+                    rec.getObsTime(), rev_24hour_code, rec.getQualCode(),
+                    rec.getQualifier());
             if (status == GPP_OK) {
                 msgstr = String.format("   %s %s %d %s %s: %s; ",
                         rec.getLocationId(), "PP", duration,
@@ -565,22 +569,22 @@ public class GagePP {
         int hour = dt.get(Calendar.HOUR_OF_DAY);
 
         int minute = dt.get(Calendar.MINUTE);
-        
+
         if (rec.getPhysicalElement().getCode().charAt(1) == 'C'
-                          && minute >= MINUTES_PER_HOUR - pOptions.getIntpc()
-                    || (rec.getPhysicalElement().getCode().charAt(1) == 'P'         
-                          &&  minute >= MINUTES_PER_HOUR - pOptions.getIntlppp())) {
+                && minute >= MINUTES_PER_HOUR - pOptions.getIntpc()
+                || (rec.getPhysicalElement().getCode().charAt(1) == 'P' && minute >= MINUTES_PER_HOUR
+                        - pOptions.getIntlppp())) {
             hour++;
             dt.add(Calendar.HOUR_OF_DAY, 1);
             rec.setObsTime(dt.getTime());
         }
-        
+
         if (hour == 24 || hour == 0) {
             // hour = 24;
             dt.add(Calendar.DAY_OF_YEAR, -1);
             rec.setObsTime(dt.getTime());
         }
-        
+
         pOffsetCode = PrecipUtils.get_offset_code(minute);
         pHourSlot = (short) hour;
     }
@@ -600,19 +604,18 @@ public class GagePP {
             short rev = (short) ((pPrecipRecord.revision) ? 1 : 0);
 
             offset_code[0] = pOffsetCode;
-            
+
             char qc = 'M';
             if (pHourlyPP.getHourlyQc() == null) {
                 pHourlyPP.setHourlyQc("------------------------");
             }
             useValue = PrecipUtils.use_precip_value(pPrecipRecord.getValue(),
                     precip_val, qc, pHourlyPP.getHourlyQc().charAt(hour - 1),
-                    '-', pOffsetCode, pOptions.getShef_duplicate()
-                            .name(), rev);
+                    '-', pOffsetCode, pOptions.getShef_duplicate().name(), rev);
         }
         return useValue;
     }
-    
+
     private void initialize_hourlypp(Hourlypp pHourlyPP,
             short rev_6hour_code[], String msgstr,
             final PrecipRecord pPrecipRecord, Date obstime_ytd) {
@@ -639,7 +642,8 @@ public class GagePP {
      * @return
      */
     private static boolean isNear12Z(final Date yearsec_ansi) {
-        int ppp_ppd_window = appsDefaults.getInt("ppp_ppd_local_7am_window", DEFAULT_WINDOW_HOURS);
+        int ppp_ppd_window = appsDefaults.getInt("ppp_ppd_local_7am_window",
+                DEFAULT_WINDOW_HOURS);
         ppp_ppd_window *= SECONDS_PER_HOUR * 1000L;
 
         // Observation time as a calendar
@@ -662,8 +666,8 @@ public class GagePP {
         lower_bound.setTimeInMillis(pStructTm.getTimeInMillis()
                 - ppp_ppd_window);
 
-        return ((timeTObs.getTimeInMillis() >= lower_bound.getTimeInMillis())
-                && timeTObs.getTimeInMillis() <= upper_bound.getTimeInMillis());
+        return ((timeTObs.getTimeInMillis() >= lower_bound.getTimeInMillis()) && timeTObs
+                .getTimeInMillis() <= upper_bound.getTimeInMillis());
     }
 
     /**
@@ -671,11 +675,11 @@ public class GagePP {
      */
     private static int gage_pp_6hour_slot(final GagePPOptions pOptions,
             final Calendar ansi_obstime_year_sec, String ansi_date_year_day,
-            short [] p6HourSlot, char[] p6HourOffsetCode) {
+            short[] p6HourSlot, char[] p6HourOffsetCode) {
 
         float ppq_window = pOptions.getIntppq();
         ppq_window *= SECONDS_PER_HOUR;
-        
+
         int bottom_6_hour_period;
         int diff1;
         int diff2;
@@ -684,8 +688,8 @@ public class GagePP {
         int num_periods;
         int remainder;
         int top_6_hour_period;
-//        Calendar num_seconds_since_00z = Calendar
-//                .getInstance(SHEFTimezone.GMT_TIMEZONE);
+        // Calendar num_seconds_since_00z = Calendar
+        // .getInstance(SHEFTimezone.GMT_TIMEZONE);
 
         int num_seconds_since_00z = (hour * SECONDS_PER_HOUR)
                 + (minute * SECONDS_PER_MINUTE);
@@ -753,9 +757,9 @@ public class GagePP {
          * Using the number of NUM_MINUTES_PER_6HOUR_OFFSET periods, get the
          * offset code.
          */
-        
+
         p6HourSlot[0]--;
-        
+
         p6HourOffsetCode[0] = PrecipUtils.get_offset_code(num_periods);
         return GPP_OK;
     }
@@ -783,16 +787,14 @@ public class GagePP {
         return temp;
     }
 
-    
-    
-    public static final void main(String [] args) {
-        
+    public static final void main(String[] args) {
+
         GagePPOptions pOptions = new GagePPOptions();
         pOptions.setIntlppp(2);
         pOptions.setIntpc(10);
         pOptions.setIntppq(2);
         pOptions.setIntuppp(2);
-        
+
         Calendar obstime = Calendar.getInstance(TimeZone.getTimeZone("Zulu"));
         obstime.set(Calendar.YEAR, 2011);
         obstime.set(Calendar.MONTH, 4);
@@ -801,18 +803,18 @@ public class GagePP {
         obstime.set(Calendar.MINUTE, 0);
         obstime.set(Calendar.SECOND, 0);
         obstime.set(Calendar.MILLISECOND, 0);
-        
-        
+
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(SHEFTimezone.GMT_TIMEZONE);
 
         String time = sdf.format(obstime.getTime());
-        
-        short [] p6HourSlot = { 0 };
+
+        short[] p6HourSlot = { 0 };
         char[] p6HourOffsetCode = { ' ' };
 
-        gage_pp_6hour_slot(pOptions, obstime, time, p6HourSlot, p6HourOffsetCode);
-        
+        gage_pp_6hour_slot(pOptions, obstime, time, p6HourSlot,
+                p6HourOffsetCode);
+
         System.out.println(p6HourSlot[0]);
         System.out.println(p6HourOffsetCode[0]);
     }
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePPWrite.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePPWrite.java
index 7720516456..54484a32f4 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePPWrite.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePPWrite.java
@@ -25,8 +25,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.shef.ohdlib.GagePPOptions.upd_action;
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
@@ -56,6 +56,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
  * May 7, 2013   15880    lbousaidi   changed minute_offset to offset in
  *                                    in write_1_HourValue routine.
  * Sep 18, 2014  3627     mapeters    Updated deprecated {@link TimeTools} usage.
+ * Dec 16, 2015  5166     kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -64,8 +65,8 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
  */
 
 public final class GagePPWrite {
-    private static Log logger = LogFactory.getLog(GagePPWrite.class);
-    
+    private static Logger logger = LoggerFactory.getLogger(GagePPWrite.class);
+
     private char hourly_qc[] = new char[PrecipUtils.NUM_HOURLY_SLOTS];
 
     private char minute_offset[] = new char[PrecipUtils.NUM_HOURLY_SLOTS];
@@ -102,7 +103,6 @@ public final class GagePPWrite {
             double new_hourly_value, String obsdate, char zero_offset_code,
             char manual_qc_code) {
 
-
         Calendar dt = TimeUtil.newGmtCalendar();
         dt.setTimeInMillis(dtime.getTime());
 
@@ -142,20 +142,19 @@ public final class GagePPWrite {
 
         int status = 0;
 
-        if(precip1Hour != null) {
-            status = write_1_HourValue(pHourlyPP, pe, obsDate,
-                    options, revision, precip1Hour,
-                    quality_code, qual);
-        } else if(precip6Hour != null) {
-            status = write_6_HourValue(pHourlyPP, pe, obsDate,
-                    options, revision_6hour, precip6Hour,
-                    quality_code, qual);
+        if (precip1Hour != null) {
+            status = write_1_HourValue(pHourlyPP, pe, obsDate, options,
+                    revision, precip1Hour, quality_code, qual);
+        } else if (precip6Hour != null) {
+            status = write_6_HourValue(pHourlyPP, pe, obsDate, options,
+                    revision_6hour, precip6Hour, quality_code, qual);
         }
         return status;
     }
 
     /**
      * TODO : Write_1
+     * 
      * @return
      */
     private int write_1_HourValue(Hourlypp pHourlyPP, String pe, Date obsDate,
@@ -169,14 +168,14 @@ public final class GagePPWrite {
         Calendar c = getCalendar(obsDate);
         int min = c.get(Calendar.MINUTE);
         int hr = c.get(Calendar.HOUR_OF_DAY);
-        
+
         String where = String.format(
                 "WHERE lid='%s' AND ts='%s' AND obsdate ='%s'", id, ts,
                 sdf.format(obsDate));
 
         char minOff = PrecipUtils.get_offset_code(min);
         char qcc = 'Z'; // ShefQC.buildQcSymbol(qualityCode).charAt(0);
-        if((qual != null)&&(qual.length() > 0)) {
+        if ((qual != null) && (qual.length() > 0)) {
             qcc = qual.charAt(0);
         }
 
@@ -186,11 +185,11 @@ public final class GagePPWrite {
         boolean isPC = ("PC".equalsIgnoreCase(pe));
 
         IHourlyTS hourlyRec = getHourlyRecord(isPC, where);
-        if(hourlyRec == null) {
+        if (hourlyRec == null) {
             PersistableDataObject rec = null;
             String offset = new String(minute_offset);
             String qc = new String(hourly_qc);
-            
+
             if (isPC) {
                 Hourlypc pHourpc = new Hourlypc();
                 HourlypcId pHid = new HourlypcId();
@@ -212,39 +211,39 @@ public final class GagePPWrite {
                 pHourpp.setMinuteOffset(offset);
                 pHourpp.setHourlyQc(qc);
                 PrecipUtils.set_hour_slot_value(pHourpp, hr, newHourlyValue);
-                
+
                 pHourpp.setSixhroffset(new String(sixhr_offset));
                 pHourpp.setSixhrqc(new String(sixhr_qc));
-                
+
                 rec = pHourpp;
             }
             status = update_gage_rec(rec);
         } else {
             boolean useValue = true;
-            
+
             Short oldDataValue = PrecipUtils.get_hour_slot_value(hourlyRec, hr);
             Short newDataValue = null;
-            
-            char [] oldOffset = hourlyRec.getMinuteOffset().toCharArray();
-            char [] offset = new char [oldOffset.length];
+
+            char[] oldOffset = hourlyRec.getMinuteOffset().toCharArray();
+            char[] offset = new char[oldOffset.length];
             System.arraycopy(oldOffset, 0, offset, 0, offset.length);
-            
-            char [] oldQC = hourlyRec.getHourlyQc().toCharArray();
-            char [] qc = new char [oldQC.length];
+
+            char[] oldQC = hourlyRec.getHourlyQc().toCharArray();
+            char[] qc = new char[oldQC.length];
             System.arraycopy(oldQC, 0, qc, 0, qc.length);
-            
-            if(newHourlyValue != null) {
+
+            if (newHourlyValue != null) {
                 if (PrecipUtils.get_hour_slot_value(hourlyRec, hr) != null) {
 
-                    int use_value = PrecipUtils.use_precip_value(newHourlyValue,
-                            oldDataValue, qcc, oldQC[hr], minOff,
-                            oldOffset[hr], options.getShef_duplicate().name(),
-                            revision);
+                    int use_value = PrecipUtils.use_precip_value(
+                            newHourlyValue, oldDataValue, qcc, oldQC[hr],
+                            minOff, oldOffset[hr], options.getShef_duplicate()
+                                    .name(), revision);
                     useValue = (use_value == 1);
                 }
             }
-            
-            if(useValue) {
+
+            if (useValue) {
                 newDataValue = newHourlyValue;
 
                 PrecipUtils.setMinOffset(offset, hr, minOff);
@@ -273,7 +272,7 @@ public final class GagePPWrite {
                     PrecipUtils.set_hour_slot_value(pHourpp, hr, newDataValue);
                     pHourpp.setMinuteOffset(new String(offset));
                     pHourpp.setHourlyQc(new String(qc));
-                    
+
                     rec = pHourpp;
                 }
                 status = update_gage_rec(rec);
@@ -284,6 +283,7 @@ public final class GagePPWrite {
 
     /**
      * TODO : Write_6
+     * 
      * @return
      */
     private int write_6_HourValue(Hourlypp pHourlyPP, String pe, Date obsDate,
@@ -293,32 +293,30 @@ public final class GagePPWrite {
 
         String id = pHourlyPP.getId().getLid();
         String ts = pHourlyPP.getId().getTs();
-        
 
         Calendar c = getCalendar(obsDate);
         int min = c.get(Calendar.MINUTE);
         int hr = c.get(Calendar.HOUR_OF_DAY);
-        
+
         String where = String.format(
                 "WHERE lid='%s' AND ts='%s' AND obsdate ='%s'", id, ts,
                 sdf.format(obsDate));
-        
+
         char minOff = PrecipUtils.get_offset_code(min);
         char qcc = 'Z'; // ShefQC.buildQcSymbol(qualityCode).charAt(0);
-        if((qual != null)&&(qual.length() > 0)) {
+        if ((qual != null) && (qual.length() > 0)) {
             qcc = qual.charAt(0);
         }
-        
 
         // hr = PrecipUtils.getSixHourSelector(hr);
         // find out which slot actually holds the data.
-        for(int i = 0;i < 4;i++) {
-            if(PrecipUtils.get_6hour_slot_value(pHourlyPP,i) != null) {
+        for (int i = 0; i < 4; i++) {
+            if (PrecipUtils.get_6hour_slot_value(pHourlyPP, i) != null) {
                 hr = i;
                 break;
             }
         }
-        
+
         sixhr_offset[hr] = minOff;
         sixhr_qc[hr] = qcc;
 
@@ -337,65 +335,67 @@ public final class GagePPWrite {
                 pHid.setTs(ts);
                 pHid.setObsdate(obsDate);
                 pHourpp.setId(pHid);
-                
+
                 pHourpp.setMinuteOffset(new String(minute_offset));
                 pHourpp.setHourlyQc(new String(hourly_qc));
-                
+
                 pHourpp.setSixhroffset(new String(sixhr_offset));
                 pHourpp.setSixhrqc(new String(sixhr_qc));
-                PrecipUtils.set_6hour_slot_value(pHourpp, hr,
-                        value);
+                PrecipUtils.set_6hour_slot_value(pHourpp, hr, value);
                 rec = pHourpp;
             }
             status = update_gage_rec(rec);
         } else {
             Hourlypp pHourpp = (Hourlypp) hourlyRec;
-            
+
             Short oldDataValue = PrecipUtils.get_6hour_slot_value(pHourpp, hr);
             Short newDataValue = null;
-            
-            char [] oldOffset = pHourpp.getSixhroffset().toCharArray();
-            char [] offset = new char [oldOffset.length];
+
+            char[] oldOffset = pHourpp.getSixhroffset().toCharArray();
+            char[] offset = new char[oldOffset.length];
             System.arraycopy(oldOffset, 0, offset, 0, offset.length);
-            
-            char [] oldQC = pHourpp.getSixhrqc().toCharArray();
-            char [] qc = new char [oldQC.length];
+
+            char[] oldQC = pHourpp.getSixhrqc().toCharArray();
+            char[] qc = new char[oldQC.length];
             System.arraycopy(oldQC, 0, qc, 0, qc.length);
-            
+
             boolean useValue = true;
             // If the old value has been manually edited do not overwrite!
-            if(PrecipUtils.isManualEdit(oldQC[hr]) && !PrecipUtils.isManualEdit(qcc)) {
+            if (PrecipUtils.isManualEdit(oldQC[hr])
+                    && !PrecipUtils.isManualEdit(qcc)) {
                 useValue = false;
             } else {
-                // if the existing offset on record is '-' we haven't written anything yet
-                if(oldOffset[hr] == '-') {
+                // if the existing offset on record is '-' we haven't written
+                // anything yet
+                if (oldOffset[hr] == '-') {
                     useValue = true;
                 } else {
-                    status = PrecipUtils.compare_offset_codes(oldOffset[hr], minOff);
-                    if(status > 0) {
+                    status = PrecipUtils.compare_offset_codes(oldOffset[hr],
+                            minOff);
+                    if (status > 0) {
                         useValue = false;
                     } else if (status == 0) {
-                        if(minOff == oldOffset[hr]) {
+                        if (minOff == oldOffset[hr]) {
                             boolean rev = true;
-                            if(revision[hr] == 1) {
+                            if (revision[hr] == 1) {
                                 rev = false;
                             }
                             String updateAction = PrecipUtils
-                            .determine_update_action(
-                                    options.getShef_duplicate()
-                                            .name(), rev);
+                                    .determine_update_action(options
+                                            .getShef_duplicate().name(), rev);
 
                             if ((upd_action.DONT_UPDATE_ACTION
                                     .isAction(updateAction))
                                     || ((upd_action.IF_DIFFERENT_UPDATE_ACTION
-                                            .isAction(updateAction)) && (value.equals(oldDataValue)))) {
+                                            .isAction(updateAction)) && (value
+                                            .equals(oldDataValue)))) {
                                 useValue = false;
                             }
                         }
                     }
                 }
 
-                if(useValue) {
+                if (useValue) {
                     newDataValue = value;
                     offset[hr] = minOff;
                     qc[hr] = qcc;
@@ -411,37 +411,36 @@ public final class GagePPWrite {
                         pHid.setObsdate(obsDate);
                         pHourpp.setId(pHid);
 
-                        PrecipUtils.set_6hour_slot_value(pHourpp, hr, newDataValue);
+                        PrecipUtils.set_6hour_slot_value(pHourpp, hr,
+                                newDataValue);
                         pHourpp.setSixhroffset(new String(offset));
                         pHourpp.setSixhrqc(new String(qc));
-                        
+
                         rec = pHourpp;
                     }
                     status = update_gage_rec(rec);
                 }
             }
-        }        
+        }
         return status;
     }
-    
+
     private Calendar getCalendar(Date obsDate) {
         Calendar dt = TimeUtil.newGmtCalendar();
         dt.setTime(obsDate);
 
-
-//        int hr = dt.get(Calendar.HOUR_OF_DAY);
-//        if (hr == 0) {
-//            hr = 24;
-//            dt.add(Calendar.HOUR_OF_DAY, -1);
-//            obsDate = dt.getTime();
-//        }
+        // int hr = dt.get(Calendar.HOUR_OF_DAY);
+        // if (hr == 0) {
+        // hr = 24;
+        // dt.add(Calendar.HOUR_OF_DAY, -1);
+        // obsDate = dt.getTime();
+        // }
         return dt;
     }
 
-    
     private IHourlyTS getHourlyRecord(boolean isPC, String where) {
         IHourlyTS rec = null;
-        
+
         if (isPC) {
             List<Hourlypc> hour_PC_old = PrecipUtils.getHourlyPC(where);
             if (hour_PC_old.size() >= 1) {
@@ -453,7 +452,7 @@ public final class GagePPWrite {
                 rec = hour_PP_old.get(0);
             }
         }
-        
+
         return rec;
     }
 
@@ -493,8 +492,8 @@ public final class GagePPWrite {
         Date endtime = dt.getTime();
 
         String qcsym = "Z"; // ShefQC.buildQcSymbol(quality_code);
-        if((qual != null)&&(qual.length() > 0)) {
-            qcsym = qual.substring(0,1);
+        if ((qual != null) && (qual.length() > 0)) {
+            qcsym = qual.substring(0, 1);
         }
         String id = pDailyPP.getId().getLid();
         String ts = pDailyPP.getId().getTs();
@@ -557,7 +556,7 @@ public final class GagePPWrite {
      */
     public static int update_gage_rec(PersistableDataObject rec) {
         int status = -1;
-        if(rec != null) {
+        if (rec != null) {
             try {
                 CoreDao dao = new CoreDao(DaoConfig.forDatabase("ihfs"));
                 try {
@@ -574,281 +573,276 @@ public final class GagePPWrite {
     }
 
     // ------------------ exit here
-    
-    
 
+    // int is_pc = 0;
+    //
+    // String id = pHourlyPP.getId().getLid();
+    // String ts = pHourlyPP.getId().getTs();
+    //
+    //
+    //
+    // // Date dto = obsdate;
+    // Calendar dt = TimeTools.getSystemCalendar();
+    // dt.setTime(obsDate);
+    // String obstime = sdf.format(obsDate);
+    //
+    // int hr = dt.get(Calendar.HOUR_OF_DAY);
+    // if (hr == 0) {
+    // hr = 24;
+    // dt.add(Calendar.HOUR_OF_DAY, -1);
+    // obstime = sdf.format(dt.getTime());
+    // obsDate = dt.getTime();
+    // }
+    // int min = dt.get(Calendar.MINUTE);
+    //
+    // GagePPOptions opts = options;
+    //
+    // char sixhroffset = PrecipUtils.get_offset_code(min);
+    // char sixhrqc = ShefQC.buildQcSymbol(quality_code).charAt(0);
+    // char minoff = sixhroffset;
+    // char qcc = sixhrqc;
+    //
+    // hourly_rec = null;
+    //
+    // String where = String
+    // .format("WHERE lid='%s' AND ts='%s' AND obsdate ='%s'", id, ts,
+    // obstime);
+    //
+    // int six = PrecipUtils.getSixHourSelector(hr);
+    //
+    // if ("PC".equalsIgnoreCase(pe)) {
+    // is_pc = 1;
+    // }
+    // if (is_pc == 1) {
+    // List<Hourlypc> hour_PC_old = PrecipUtils.getHourlyPC(where);
+    // if (hour_PC_old.size() >= 1) {
+    // hourly_rec = hour_PC_old.get(0);
+    // }
+    // } else {
+    // List<Hourlypp> hour_PP_old = PrecipUtils.getHourlyPP(where);
+    // if (hour_PP_old.size() >= 1) {
+    // hourly_rec = hour_PP_old.get(0);
+    // }
+    // }
 
-//  int is_pc = 0;
-//
-//  String id = pHourlyPP.getId().getLid();
-//  String ts = pHourlyPP.getId().getTs();
-//
-//  
-//  
-//  // Date dto = obsdate;
-//  Calendar dt = TimeTools.getSystemCalendar();
-//  dt.setTime(obsDate);
-//  String obstime = sdf.format(obsDate);
-//
-//  int hr = dt.get(Calendar.HOUR_OF_DAY);
-//  if (hr == 0) {
-//      hr = 24;
-//      dt.add(Calendar.HOUR_OF_DAY, -1);
-//      obstime = sdf.format(dt.getTime());
-//      obsDate = dt.getTime();
-//  }
-//  int min = dt.get(Calendar.MINUTE);
-//
-//  GagePPOptions opts = options;
-//
-//  char sixhroffset = PrecipUtils.get_offset_code(min);
-//  char sixhrqc = ShefQC.buildQcSymbol(quality_code).charAt(0);
-//  char minoff = sixhroffset;
-//  char qcc = sixhrqc;
-//  
-//  hourly_rec = null;
-//
-//  String where = String
-//          .format("WHERE lid='%s' AND ts='%s' AND obsdate ='%s'", id, ts,
-//                  obstime);
-//
-//  int six = PrecipUtils.getSixHourSelector(hr);
-//
-//  if ("PC".equalsIgnoreCase(pe)) {
-//      is_pc = 1;
-//  }
-//  if (is_pc == 1) {
-//      List<Hourlypc> hour_PC_old = PrecipUtils.getHourlyPC(where);
-//      if (hour_PC_old.size() >= 1) {
-//          hourly_rec = hour_PC_old.get(0);
-//      }
-//  } else {
-//      List<Hourlypp> hour_PP_old = PrecipUtils.getHourlyPP(where);
-//      if (hour_PP_old.size() >= 1) {
-//          hourly_rec = hour_PP_old.get(0);
-//      }
-//  }
+    // if (hourly_rec == null) {
+    // minute_offset[hr - 1] = minoff;
+    // hourly_qc[hr - 1] = qcc;
+    // sixhr_offset[six] = sixhroffset;
+    // sixhr_qc[six] = sixhrqc;
+    //
+    // if (is_pc == 1) {
+    // Hourlypc pHourpc = new Hourlypc();
+    // HourlypcId pHid = new HourlypcId();
+    // pHid.setLid(id);
+    // pHid.setTs(ts);
+    // pHid.setObsdate(obsDate);
+    // pHourpc.setId(pHid);
+    // if(new_hourly_value != null) {
+    // pHourpc.setMinuteOffset(new String(minute_offset));
+    // pHourpc.setHourlyQc(new String(hourly_qc));
+    // PrecipUtils.set_hour_slot_value(pHourpc, hr, new_hourly_value);
+    // status = update_gage_rec(pHourpc);
+    // }
+    //
+    // } else {
+    // Hourlypp pHourpp = new Hourlypp();
+    // HourlyppId pHid = new HourlyppId();
+    // pHid.setLid(id);
+    // pHid.setTs(ts);
+    // pHid.setObsdate(obsDate);
+    // pHourpp.setId(pHid);
+    // boolean performWrite = false;
+    // if(new_hourly_value != null) {
+    // pHourpp.setMinuteOffset(String.valueOf(minute_offset));
+    // pHourpp.setHourlyQc(String.valueOf(hourly_qc));
+    // PrecipUtils.set_hour_slot_value(pHourpp, hr, new_hourly_value);
+    // performWrite = true;
+    // }
+    // if(pp_value != null) {
+    // pHourpp.setSixhroffset(String.valueOf(sixhr_offset));
+    // pHourpp.setSixhrqc(String.valueOf(sixhr_qc));
+    // PrecipUtils.set_6hour_slot_value(pHourpp, six + 1, pp_value);
+    // performWrite = true;
+    // }
+    // if(performWrite) {
+    // status = update_gage_rec(pHourpp);
+    // }
+    // }
+    //
+    // } else {
+    //
+    // Short old_hr_value = -7700;
+    // Short hr_value = -7700;
+    //
+    // char offset[] = new char[PrecipUtils.NUM_HOURLY_SLOTS];
+    // System.arraycopy(minute_offset, 0, offset, 0, PrecipUtils.NUM_HOURLY_SLOTS);
+    //
+    // char old_offset[] = new char[PrecipUtils.NUM_HOURLY_SLOTS];
+    // String mOff = hourly_rec.getMinuteOffset();
+    // if(mOff != null) {
+    // old_offset = mOff.toCharArray();
+    // } else {
+    // Arrays.fill(old_offset, '-');
+    // }
+    // char prev_offset = old_offset[hr - 1];
+    //
+    // char qc[] = new char[PrecipUtils.NUM_HOURLY_SLOTS];
+    // qc = hourly_qc;
+    //
+    // char old_qc[] = hourly_rec.getHourlyQc().toCharArray();
+    // char prev_qc = old_qc[hr - 1];
+    //
+    // Short six_hr_slot_val = -7700;
+    // Short old_six_hr_val = -7700;
+    //
+    // char old_sixhroffset[] = new char[PrecipUtils.NUM_6HOURLY_SLOTS];
+    // Arrays.fill(old_sixhroffset, '-');
+    //
+    // char old_six_qc[] = new char[PrecipUtils.NUM_6HOURLY_SLOTS];
+    // Arrays.fill(old_six_qc, '-');
+    //
+    // char six_hr_qc[] = new char[PrecipUtils.NUM_6HOURLY_SLOTS];
+    // System.arraycopy(sixhr_qc, 0, six_hr_qc, 0, PrecipUtils.NUM_6HOURLY_SLOTS);
+    //
+    //
+    // char prev_sixhroff = ' ';
+    // char prev_sixqc = ' ';
+    //
+    // int use_value = 1;
+    // if(new_hourly_value != null) {
+    // if (PrecipUtils.get_hour_slot_value(hourly_rec, hr) != null) {
+    // old_hr_value = PrecipUtils.get_hour_slot_value(hourly_rec, hr);
+    //
+    // use_value = PrecipUtils.use_precip_value(new_hourly_value,
+    // old_hr_value, qcc, prev_qc, minute_offset[hr - 1],
+    // prev_offset, opts.getShef_duplicate().name(),
+    // revision[hr - 1]);
+    // }
+    // }
+    //
+    // if (use_value == 1) {
+    // hr_value = new_hourly_value;
+    // offset = old_offset;
+    // offset[hr - 1] = minoff;
+    // qc = old_qc;
+    // qc[hr - 1] = qcc;
+    // } else {
+    // hr_value = old_hr_value;
+    // offset = old_offset;
+    // qc = old_qc;
+    // }
+    //
+    // Hourlypp hpp = null;
+    //
+    // if (use_value == 1) {
+    // if (is_pc == 0) {
+    // if (hourly_rec instanceof Hourlypp) {
+    // hpp = (Hourlypp) hourly_rec;
+    // }
+    // if (hpp != null) {
+    // if (hpp.getSixhroffset() != null) {
+    // old_sixhroffset = hpp.getSixhroffset()
+    // .toCharArray();
+    // }
+    // if (hpp.getSixhrqc() != null) {
+    // old_six_qc = hpp.getSixhrqc().toCharArray();
+    // }
+    // Short sixval = PrecipUtils.get_6hour_slot_value(hpp,
+    // six + 1);
+    // prev_sixhroff = old_sixhroffset[six];
+    // prev_sixqc = old_six_qc[six];
+    //
+    // if (sixval != null) {
+    // if (PrecipUtils.isManualEdit(prev_sixqc)
+    // && PrecipUtils.isManualEdit(sixhrqc)) {
+    // use_value = 0;
+    // } else {
+    // status = PrecipUtils.compare_offset_codes(
+    // sixhr_offset[six], prev_sixhroff);
+    //
+    // if (status > 0) {
+    // use_value = 0;
+    // } else if ((status == 0)
+    // && (sixhroffset == prev_sixhroff)) {
+    // boolean rev = true;
+    // if (revision_6hour[six] == 0) {
+    // rev = false;
+    // }
+    // String update_action = PrecipUtils
+    // .determine_update_action(
+    // options.getShef_duplicate()
+    // .name(), rev);
+    //
+    // if ((upd_action.DONT_UPDATE_ACTION
+    // .isAction(update_action))
+    // || ((upd_action.IF_DIFFERENT_UPDATE_ACTION
+    // .isAction(update_action)) && (pp_value == old_six_hr_val))) {
+    // use_value = 0;
+    // }
+    // }
+    // }
+    // }
+    // if (use_value == 1) {
+    // six_hr_slot_val = pp_value;
+    // sixhr_offset = old_sixhroffset;
+    // sixhr_offset[six] = sixhroffset;
+    // six_hr_qc = old_six_qc;
+    // six_hr_qc[six] = sixhrqc;
+    //
+    // } else {
+    // if (old_six_hr_val == -7700) {
+    // old_six_hr_val = null;
+    // }
+    // six_hr_slot_val = old_six_hr_val;
+    // sixhr_offset = old_sixhroffset;
+    // six_hr_qc = old_six_qc;
+    // }
+    // }
+    // }
+    //
+    // if (is_pc == 1) {
+    // Hourlypc pHourpc = (Hourlypc) hourly_rec;
+    // HourlypcId pHid = new HourlypcId();
+    // pHid.setLid(pHourpc.getLid());
+    // pHid.setTs(pHourpc.getTs());
+    // pHid.setObsdate(obsDate);
+    // pHourpc.setId(pHid);
+    // // Only write out the data if there is a value!
+    // if(hr_value != null) {
+    // PrecipUtils.set_hour_slot_value(pHourpc, hr, hr_value);
+    // pHourpc.setMinuteOffset(String.valueOf(offset));
+    // pHourpc.setHourlyQc(String.valueOf(qc));
+    //
+    // status = update_gage_rec(pHourpc);
+    // }
+    //
+    // } else {
+    //
+    // Hourlypp pHourpp = hpp;
+    // HourlyppId pHid = new HourlyppId();
+    // pHid.setLid(pHourpp.getLid());
+    // pHid.setTs(pHourpp.getTs());
+    // pHid.setObsdate(obsDate);
+    // pHourpp.setId(pHid);
+    // boolean performWrite = false;
+    // if(hr_value != null) {
+    // PrecipUtils.set_hour_slot_value(pHourpp, hr, hr_value);
+    // pHourpp.setMinuteOffset(String.valueOf(offset));
+    // pHourpp.setHourlyQc(String.valueOf(qc));
+    // performWrite = true;
+    // }
+    // if(six_hr_slot_val != null) {
+    // PrecipUtils.set_hour_slot_value(pHourpp, six + 1, six_hr_slot_val);
+    // pHourpp.setSixhroffset(String.valueOf(sixhr_offset));
+    // pHourpp.setSixhrqc(String.valueOf(six_hr_qc));
+    // performWrite = true;
+    // }
+    // if(performWrite) {
+    // status = update_gage_rec(pHourpp);
+    // }
+    // }
+    // }
+    // }
 
-//  if (hourly_rec == null) {
-//      minute_offset[hr - 1] = minoff;
-//      hourly_qc[hr - 1] = qcc;
-//      sixhr_offset[six] = sixhroffset;
-//      sixhr_qc[six] = sixhrqc;
-//
-//      if (is_pc == 1) {
-//          Hourlypc pHourpc = new Hourlypc();
-//          HourlypcId pHid = new HourlypcId();
-//          pHid.setLid(id);
-//          pHid.setTs(ts);
-//          pHid.setObsdate(obsDate);
-//          pHourpc.setId(pHid);
-//          if(new_hourly_value != null) {
-//              pHourpc.setMinuteOffset(new String(minute_offset));
-//              pHourpc.setHourlyQc(new String(hourly_qc));
-//              PrecipUtils.set_hour_slot_value(pHourpc, hr, new_hourly_value);
-//              status = update_gage_rec(pHourpc);
-//          }
-//
-//      } else {
-//          Hourlypp pHourpp = new Hourlypp();
-//          HourlyppId pHid = new HourlyppId();
-//          pHid.setLid(id);
-//          pHid.setTs(ts);
-//          pHid.setObsdate(obsDate);
-//          pHourpp.setId(pHid);
-//          boolean performWrite = false;
-//          if(new_hourly_value != null) {
-//              pHourpp.setMinuteOffset(String.valueOf(minute_offset));
-//              pHourpp.setHourlyQc(String.valueOf(hourly_qc));
-//              PrecipUtils.set_hour_slot_value(pHourpp, hr, new_hourly_value);
-//              performWrite = true;
-//          }
-//          if(pp_value != null) {
-//              pHourpp.setSixhroffset(String.valueOf(sixhr_offset));
-//              pHourpp.setSixhrqc(String.valueOf(sixhr_qc));
-//              PrecipUtils.set_6hour_slot_value(pHourpp, six + 1, pp_value);
-//              performWrite = true;
-//          }
-//          if(performWrite) {
-//              status = update_gage_rec(pHourpp);
-//          }
-//      }
-//
-//  } else {
-//
-//      Short old_hr_value = -7700;
-//      Short hr_value = -7700;
-//      
-//      char offset[] = new char[PrecipUtils.NUM_HOURLY_SLOTS];
-//      System.arraycopy(minute_offset, 0, offset, 0, PrecipUtils.NUM_HOURLY_SLOTS);
-//      
-//      char old_offset[] = new char[PrecipUtils.NUM_HOURLY_SLOTS];
-//      String mOff = hourly_rec.getMinuteOffset();
-//      if(mOff != null) {
-//          old_offset = mOff.toCharArray();
-//      } else {
-//          Arrays.fill(old_offset, '-');
-//      }
-//      char prev_offset = old_offset[hr - 1];
-//      
-//      char qc[] = new char[PrecipUtils.NUM_HOURLY_SLOTS];
-//      qc = hourly_qc;
-//      
-//      char old_qc[] = hourly_rec.getHourlyQc().toCharArray();
-//      char prev_qc = old_qc[hr - 1];
-//      
-//      Short six_hr_slot_val = -7700;
-//      Short old_six_hr_val = -7700;
-//      
-//      char old_sixhroffset[] = new char[PrecipUtils.NUM_6HOURLY_SLOTS];
-//      Arrays.fill(old_sixhroffset, '-');
-//
-//      char old_six_qc[] = new char[PrecipUtils.NUM_6HOURLY_SLOTS];
-//      Arrays.fill(old_six_qc, '-');
-//
-//      char six_hr_qc[] = new char[PrecipUtils.NUM_6HOURLY_SLOTS];
-//      System.arraycopy(sixhr_qc, 0, six_hr_qc, 0, PrecipUtils.NUM_6HOURLY_SLOTS);
-//
-//      
-//      char prev_sixhroff = ' ';
-//      char prev_sixqc = ' ';
-//
-//      int use_value = 1;
-//      if(new_hourly_value != null) {
-//          if (PrecipUtils.get_hour_slot_value(hourly_rec, hr) != null) {
-//              old_hr_value = PrecipUtils.get_hour_slot_value(hourly_rec, hr);
-//
-//              use_value = PrecipUtils.use_precip_value(new_hourly_value,
-//                      old_hr_value, qcc, prev_qc, minute_offset[hr - 1],
-//                      prev_offset, opts.getShef_duplicate().name(),
-//                      revision[hr - 1]);
-//          }
-//      }
-//
-//      if (use_value == 1) {
-//          hr_value = new_hourly_value;
-//          offset = old_offset;
-//          offset[hr - 1] = minoff;
-//          qc = old_qc;
-//          qc[hr - 1] = qcc;
-//      } else {
-//          hr_value = old_hr_value;
-//          offset = old_offset;
-//          qc = old_qc;
-//      }
-//
-//      Hourlypp hpp = null;
-//      
-//      if (use_value == 1) {
-//          if (is_pc == 0) {
-//              if (hourly_rec instanceof Hourlypp) {
-//                  hpp = (Hourlypp) hourly_rec;
-//              }
-//              if (hpp != null) {
-//                  if (hpp.getSixhroffset() != null) {
-//                      old_sixhroffset = hpp.getSixhroffset()
-//                              .toCharArray();
-//                  }
-//                  if (hpp.getSixhrqc() != null) {
-//                      old_six_qc = hpp.getSixhrqc().toCharArray();
-//                  }
-//                  Short sixval = PrecipUtils.get_6hour_slot_value(hpp,
-//                          six + 1);
-//                  prev_sixhroff = old_sixhroffset[six];
-//                  prev_sixqc = old_six_qc[six];
-//
-//                  if (sixval != null) {
-//                      if (PrecipUtils.isManualEdit(prev_sixqc)
-//                              && PrecipUtils.isManualEdit(sixhrqc)) {
-//                          use_value = 0;
-//                      } else {
-//                          status = PrecipUtils.compare_offset_codes(
-//                                  sixhr_offset[six], prev_sixhroff);
-//
-//                          if (status > 0) {
-//                              use_value = 0;
-//                          } else if ((status == 0)
-//                                  && (sixhroffset == prev_sixhroff)) {
-//                              boolean rev = true;
-//                              if (revision_6hour[six] == 0) {
-//                                  rev = false;
-//                              }
-//                              String update_action = PrecipUtils
-//                                      .determine_update_action(
-//                                              options.getShef_duplicate()
-//                                                      .name(), rev);
-//
-//                              if ((upd_action.DONT_UPDATE_ACTION
-//                                      .isAction(update_action))
-//                                      || ((upd_action.IF_DIFFERENT_UPDATE_ACTION
-//                                              .isAction(update_action)) && (pp_value == old_six_hr_val))) {
-//                                  use_value = 0;
-//                              }
-//                          }
-//                      }
-//                  }
-//                  if (use_value == 1) {
-//                      six_hr_slot_val = pp_value;
-//                      sixhr_offset = old_sixhroffset;
-//                      sixhr_offset[six] = sixhroffset;
-//                      six_hr_qc = old_six_qc;
-//                      six_hr_qc[six] = sixhrqc;
-//
-//                  } else {
-//                      if (old_six_hr_val == -7700) {
-//                          old_six_hr_val = null;
-//                      }
-//                      six_hr_slot_val = old_six_hr_val;
-//                      sixhr_offset = old_sixhroffset;
-//                      six_hr_qc = old_six_qc;
-//                  }
-//              }
-//          }
-//
-//          if (is_pc == 1) {
-//              Hourlypc pHourpc = (Hourlypc) hourly_rec;
-//              HourlypcId pHid = new HourlypcId();
-//              pHid.setLid(pHourpc.getLid());
-//              pHid.setTs(pHourpc.getTs());
-//              pHid.setObsdate(obsDate);
-//              pHourpc.setId(pHid);
-//              // Only write out the data if there is a value!
-//              if(hr_value != null) {
-//                  PrecipUtils.set_hour_slot_value(pHourpc, hr, hr_value);
-//                  pHourpc.setMinuteOffset(String.valueOf(offset));
-//                  pHourpc.setHourlyQc(String.valueOf(qc));
-//
-//                  status = update_gage_rec(pHourpc);
-//              }
-//
-//          } else {
-//
-//              Hourlypp pHourpp = hpp;
-//              HourlyppId pHid = new HourlyppId();
-//              pHid.setLid(pHourpp.getLid());
-//              pHid.setTs(pHourpp.getTs());
-//              pHid.setObsdate(obsDate);
-//              pHourpp.setId(pHid);
-//              boolean performWrite = false;
-//              if(hr_value != null) {
-//                  PrecipUtils.set_hour_slot_value(pHourpp, hr, hr_value);
-//                  pHourpp.setMinuteOffset(String.valueOf(offset));
-//                  pHourpp.setHourlyQc(String.valueOf(qc));
-//                  performWrite = true;
-//              }
-//              if(six_hr_slot_val != null) {
-//                  PrecipUtils.set_hour_slot_value(pHourpp, six + 1, six_hr_slot_val);
-//                  pHourpp.setSixhroffset(String.valueOf(sixhr_offset));
-//                  pHourpp.setSixhrqc(String.valueOf(six_hr_qc));
-//                  performWrite = true;
-//              }
-//              if(performWrite) {
-//                  status = update_gage_rec(pHourpp);
-//              }
-//          }
-//      }
-//  }
-
-    
-    
-}
\ No newline at end of file
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/BitUtils.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/BitUtils.java
index fd03c27b61..e91511d9ba 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/BitUtils.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/BitUtils.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.edex.plugin.shef.util;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.shef.data.QC;
 import com.raytheon.uf.common.dataplugin.shef.util.ShefConstants;
@@ -32,7 +32,8 @@ import com.raytheon.uf.common.dataplugin.shef.util.ShefConstants;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 05/02/2008   387        M. Duff     Initial Creation.	
+ * May 02, 2008 387        M. Duff     Initial Creation.
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -41,119 +42,120 @@ import com.raytheon.uf.common.dataplugin.shef.util.ShefConstants;
  */
 
 public class BitUtils {
-	/** The logger */
-	private static final Log log = LogFactory.getLog("com.raytheon.edex.plugin.shef.util");
+    /** The logger */
+    private static final Logger log = LoggerFactory
+            .getLogger("com.raytheon.edex.plugin.shef.util");
 
-	/**
-	 * Check if the specified bit of the quality code is set.
-	 * 
-	 * @param bitPosition
-	 *            position of the bit to check
-	 * @param qualityCode
-	 *            the code to check
-	 * @return true if bit is set
-	 */
-	public static boolean checkQcBit(long bitPosition, long qualityCode) {
-		boolean returnVal = false;
+    /**
+     * Check if the specified bit of the quality code is set.
+     * 
+     * @param bitPosition
+     *            position of the bit to check
+     * @param qualityCode
+     *            the code to check
+     * @return true if bit is set
+     */
+    public static boolean checkQcBit(long bitPosition, long qualityCode) {
+        boolean returnVal = false;
 
-		/*
-		 * Variable used to set a specific bit in bit string to 1; initialized
-		 * as 0000000000000000 0000000000000001
-		 */
-		int mask = 1;
-		long bitwise_AND_result;
+        /*
+         * Variable used to set a specific bit in bit string to 1; initialized
+         * as 0000000000000000 0000000000000001
+         */
+        int mask = 1;
+        long bitwise_AND_result;
 
-		/*
-		 * The mask is employed to set a specific bit to the value of 1 in a
-		 * 32-bit string while the value of the other bits. The mask is
-		 * leftwardly shifted to the bit position of the bit being checked.
-		 */
-		mask = mask << bitPosition;
+        /*
+         * The mask is employed to set a specific bit to the value of 1 in a
+         * 32-bit string while the value of the other bits. The mask is
+         * leftwardly shifted to the bit position of the bit being checked.
+         */
+        mask = mask << bitPosition;
 
-		/*
-		 * To check the setting of the specified bit, the mask variable is
-		 * compared to the bit string of quality control variable. The end
-		 * result yields an integer value.
-		 */
-		bitwise_AND_result = qualityCode & mask;
+        /*
+         * To check the setting of the specified bit, the mask variable is
+         * compared to the bit string of quality control variable. The end
+         * result yields an integer value.
+         */
+        bitwise_AND_result = qualityCode & mask;
 
-		/*
-		 * The following conditional block checks the setting of the specified
-		 * bit. The check determined by the return value of the bitwise AND
-		 * operation. If the return value is greater than zero (0), the
-		 * specified bit is set.
-		 */
+        /*
+         * The following conditional block checks the setting of the specified
+         * bit. The check determined by the return value of the bitwise AND
+         * operation. If the return value is greater than zero (0), the
+         * specified bit is set.
+         */
 
-		if (bitwise_AND_result > 0) {
-			returnVal = true;
-		} else {
-			returnVal = false;
-		}
+        if (bitwise_AND_result > 0) {
+            returnVal = true;
+        } else {
+            returnVal = false;
+        }
 
-		return returnVal;
-	}
+        return returnVal;
+    }
 
-	/**
-	 * Sets the QC bits
-	 * 
-	 * @param qc - The QC object
-	 * @return Status - -1 for invalid, 1 for valid
-	 */
-	public static long setQcBit(QC qc) {   
-		/*
-		 * Variable used to set a specific bit in bit string to 1; initialized as
-		 * 0000000000000000 0000000000000001
-		 */
-		long mask = 1;
-		long bitwise_inclusive_OR_result;                                      				      
-		long bitwise_AND_result; 				       
-		long status;
+    /**
+     * Sets the QC bits
+     * 
+     * @param qc
+     *            - The QC object
+     * @return Status - -1 for invalid, 1 for valid
+     */
+    public static long setQcBit(QC qc) {
+        /*
+         * Variable used to set a specific bit in bit string to 1; initialized
+         * as 0000000000000000 0000000000000001
+         */
+        long mask = 1;
+        long bitwise_inclusive_OR_result;
+        long bitwise_AND_result;
+        long status;
 
- 
-		/* Ensure that a valid bit position is requested. */
- 
-		if (qc.getBitPosition() < ShefConstants.SIGN_QC)  {
-			status = ShefConstants.VALID_QC_REQUEST;
-    
-    
-			/* if setting the bit ON */
-    
-			if (qc.getSetting() == 1) {
-			
-				/*
-				 * The mask is employed to set a specific bit to the value of 1 in a
-				 * 32-bit string while hiding the value of the other bits. The mask is
-				 * leftwardly shifted to the bit position of the bit being referenced.
-				 */
+        /* Ensure that a valid bit position is requested. */
 
-				mask = mask << qc.getBitPosition(); 
-	 
+        if (qc.getBitPosition() < ShefConstants.SIGN_QC) {
+            status = ShefConstants.VALID_QC_REQUEST;
 
-				/*
-				 * The bitwise inclusive OR operation is used to set the specified bit.
-				 * Upon completion, the bit is written to qualityCode memory location.
-				 */
+            /* if setting the bit ON */
 
-				bitwise_inclusive_OR_result = qc.getQualityCode() | mask;  
+            if (qc.getSetting() == 1) {
 
-				qc.setQualityCode(bitwise_inclusive_OR_result);
-			} else {	
-				/*
-				 * if setting the bit OFF. first build a mask that has all ones except for
-				 * the bit in question, then AND the mask with the existing value to turn
-				 * off the single bit.
-				 */
+                /*
+                 * The mask is employed to set a specific bit to the value of 1
+                 * in a 32-bit string while hiding the value of the other bits.
+                 * The mask is leftwardly shifted to the bit position of the bit
+                 * being referenced.
+                 */
 
-				mask = ShefConstants.ALL_ONES ^ (mask << qc.getBitPosition());
-	 
-				bitwise_AND_result = qc.getQualityCode() & mask;  
-	 
-				qc.setQualityCode(bitwise_AND_result);
-			}
-		} else {
-			log.warn("Invalid request made in setQcBit() Method.");
-			status = ShefConstants.INVALID_QC_REQUEST;
-		}
-		return status;
-	} 
+                mask = mask << qc.getBitPosition();
+
+                /*
+                 * The bitwise inclusive OR operation is used to set the
+                 * specified bit. Upon completion, the bit is written to
+                 * qualityCode memory location.
+                 */
+
+                bitwise_inclusive_OR_result = qc.getQualityCode() | mask;
+
+                qc.setQualityCode(bitwise_inclusive_OR_result);
+            } else {
+                /*
+                 * if setting the bit OFF. first build a mask that has all ones
+                 * except for the bit in question, then AND the mask with the
+                 * existing value to turn off the single bit.
+                 */
+
+                mask = ShefConstants.ALL_ONES ^ (mask << qc.getBitPosition());
+
+                bitwise_AND_result = qc.getQualityCode() & mask;
+
+                qc.setQualityCode(bitwise_AND_result);
+            }
+        } else {
+            log.warn("Invalid request made in setQcBit() Method.");
+            status = ShefConstants.INVALID_QC_REQUEST;
+        }
+        return status;
+    }
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/PrecipitationUtils.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/PrecipitationUtils.java
index 8ccd4d5499..485d9bd331 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/PrecipitationUtils.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/PrecipitationUtils.java
@@ -21,8 +21,8 @@ package com.raytheon.edex.plugin.shef.util;
 
 import java.util.Date;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.plugin.shef.data.ShefData;
 import com.raytheon.edex.plugin.shef.data.ShefRecord;
@@ -38,8 +38,9 @@ import com.raytheon.uf.common.dataplugin.shef.util.ShefConstants;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 05/02/2008	387        M. Duff     Initial Creation.
+ * 05/02/2008   387        M. Duff     Initial Creation.
  * 10/16/2008   1548       jelkins     Integrated ParameterCode Types
+ * 12/16/2015   5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -49,13 +50,14 @@ import com.raytheon.uf.common.dataplugin.shef.util.ShefConstants;
 
 public class PrecipitationUtils {
 
-    private static final Log log = LogFactory.getLog(PrecipitationUtils.class);
+    private static final Logger log = LoggerFactory
+            .getLogger(PrecipitationUtils.class);
 
     /**
      * Returns the precipitation index.
      * 
-     * @param pe -
-     *            the physical element
+     * @param pe
+     *            - the physical element
      * @return the index (0, 1, 2, or 3)
      */
     public static int getPrecipitationIndex(PhysicalElement pe) {
@@ -94,8 +96,8 @@ public class PrecipitationUtils {
 
         PrecipRecordStorage.getStorage().incrementRecordCount();
 
-        if(log.isDebugEnabled()) {
-            
+        if (log.isDebugEnabled()) {
+
             PrecipRecord record = new PrecipRecord(shefData);
             record.setProductId(productId);
             record.setProductTime(productTime);
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/SHEFErrors.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/SHEFErrors.java
index 0883a5bdd0..8965d2f48d 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/SHEFErrors.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/SHEFErrors.java
@@ -23,313 +23,316 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * TODO Add Description
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Feb 9, 2010            jkorman     Initial creation
- *
+ * Feb 9, 2010             jkorman     Initial creation
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
+ * 
  * </pre>
- *
+ * 
  * @author jkorman
- * @version 1.0	
+ * @version 1.0
  */
 
 public class SHEFErrors {
-    
+
     public enum HANDLERS {
         DEBUG, WARNING, ERROR;
     }
-    
-    private static final String [] LOG_MSGS = {
-        "00 Reserved",
-        "Intentionally left blank",
-        "Two digits are required in date or time group",
-        "An expected parameter code is missing",
-        "File read error while accessing data file",
-        "No dot in column 1 when looking for new message",
-        "Dot found but not in column 1 of new message",
-        "Unknown message type, looking for .A, .B, or .E",
-        "Bad char in message type format (or missing blank delimiter)",
-        "Last message format was different from this continuation messg",
-        // 10
-        "Last message was NOT a revision unlike this continuation messg",
-        "Last message had an error so cannot continue",
-        "No positional data or no blank before it",
-        "Bad character in station id",
-        "Station id has more than 8 characters",
-        "Bad number in positional data date group",
-        "Incorrect number in date group",
-        "Incorrect number in time group",
-        "Missing blank char in positional data",
-        "Bad creation date",
-        // 20
-        "Bad date code letter after the character \"D\"",               // 20
-        "Unknown data qualifier, data value is lost",                   // 21
-        "Unknown data units code (need S or E)",                        // 22
-        "Unknown duration code (need S,N,H,D,M,Y)",                     // 23
-        "Bad 2-digit number following duration code",                   // 24
-        "Unknown time interval code (need Y,M,D,H,N,S,E)",              // 25
-        "Bad 2-digit number following time interval code",              // 26
-        "Bad character after \"DR\" (relative date code)",              // 27
-        "Bad 1- or 2-digit number in relative date code",               // 28
-        "Bad character in parameter code",                              // 29
-        // 30
-        "Bad parameter code calls for send code",
-        "Trace for code other than PP, PC, PY, SD, SF, SW",
-        "Variable duration not defined",
-        "Bad character where delimiter is expected",
-        "Non-existent value for given type and source parameter code",
-        "ZULU, DR, or DI has send code QY, PY, or HY",
-        "Forecast data given without creation date",
-        "No value given after parameter code and before slash or eol",
-        "Explicit date for codes DRE or DIE is not the end-of-month",
-        "Year not in good range (1753-2199)",
-        // 40
-        "Exceeded limit of data items",
-        "Too many data items for given .B format",
-        "Not enough data items for given .B format",
-        "Cannot adjust forecast date to Zulu time",
-        "Time between 0200 & 0259 on day changing from standard to daylight",
-        "No time increment specified (use DI code)",
-        "No \".END\" message for previous “.B� format",
-        "ID requires 3 to 8 characters",
-        "For daylight savings time, check Apr or Oct for 1976 thru 2040 only",
-        "Bad character in the message",
-        // 50
-        "Missing parameter code",
-        "Bad value chars (or missing delimiter), data may be lost",
-        "Bad character in data field",
-        "\"?\" not accepted for missing, use \"M\" or \"+\"",
-        "Parameter code is too long or too short",
-        "Missing delimiter between data type fields",
-        "Missing delimiter after data type field",
-        "Should use \"/\" after date, time, or other D-code; before data",
-        "Parm codes PP and PC require decimal value",
-        "Abort, cannot read \"shefparm\" file correctly",
-        // 60
-        "Non-existent value for given duration parameter code",
-        "Non-existent value for given extremum parameter code",
-        "Non-existent value for given conversion factor parameter code",
-        "Non-existent value for given probability parameter code",
-        "Parameter code too short or field misinterpreted as parameter code",
-        "Comma not allowed in data field, data value is lost",
-        "Date check for yr-mo-da shows bad date",
-        "No data on line identified with a message type format",
-        "An unexpected \".END\" message was encountered",
-        "BUMMER!!! Maximum number of errors reached, abort message",
-        // 70
-        "Cannot output to binary shefpars file",
-        "Cannot access “PE conversion factors� from the \"shefparm\" file",
-        "Cannot access “send codes� from the \"shefparm\" file",
-        "Cannot access “duration codes� from the \"shefparm\" file",
-        "Cannot access “type/source codes� from the \"shefparm\" file",
-        "Cannot access “extremum codes� from the \"shefparm\" file",
-        "Cannot access “probability codes� from the \"shefparm\" file",
-        "Cannot read \"SHEFPARM\" file!!!!!",
-        "Bad character in data value, data value is lost",
-        "Julian day should be written with 3 digits",
-        // 80
-        "Too many digits in date group!",
-        "Too many characters in quotes",
-        "Data line found before completing .B format line(s)",
-        "Missing slash delimiter or bad time zone code",
-        "Too many chars in qualifier code, data value is lost",
-        "Bad data qualifier, rest of format is lost",
-        "Retained comment found without a data value, comment is lost",
-        "Unexpected slash found after parameter code, before data value",
-        "Cannot access “qualifier codes� from the \"shefparm\" file",
-        "Intentionally left blank",
-        // 90
-        "Unknown error number given",
-        "91 Reserved",
-        "92 Reserved",
-        "93 Reserved",
-        "94 Reserved",
-        "95 Reserved",
-        "96 Reserved",
-        "97 Reserved",
-        "98 Reserved",
-        "99 Reserved",
-        // 100
-        "Observation time expected but not found", // 100
-        "PEDTSEP redeclared in E record data", // 101
-        "Too many digits in DI code", // 102
-        "Too many digits in DR code", // 103
-        "Too many digits in DV code", // 104
+
+    private static final String[] LOG_MSGS = {
+            "00 Reserved",
+            "Intentionally left blank",
+            "Two digits are required in date or time group",
+            "An expected parameter code is missing",
+            "File read error while accessing data file",
+            "No dot in column 1 when looking for new message",
+            "Dot found but not in column 1 of new message",
+            "Unknown message type, looking for .A, .B, or .E",
+            "Bad char in message type format (or missing blank delimiter)",
+            "Last message format was different from this continuation messg",
+            // 10
+            "Last message was NOT a revision unlike this continuation messg",
+            "Last message had an error so cannot continue",
+            "No positional data or no blank before it",
+            "Bad character in station id",
+            "Station id has more than 8 characters",
+            "Bad number in positional data date group",
+            "Incorrect number in date group",
+            "Incorrect number in time group",
+            "Missing blank char in positional data",
+            "Bad creation date",
+            // 20
+            "Bad date code letter after the character \"D\"", // 20
+            "Unknown data qualifier, data value is lost", // 21
+            "Unknown data units code (need S or E)", // 22
+            "Unknown duration code (need S,N,H,D,M,Y)", // 23
+            "Bad 2-digit number following duration code", // 24
+            "Unknown time interval code (need Y,M,D,H,N,S,E)", // 25
+            "Bad 2-digit number following time interval code", // 26
+            "Bad character after \"DR\" (relative date code)", // 27
+            "Bad 1- or 2-digit number in relative date code", // 28
+            "Bad character in parameter code", // 29
+            // 30
+            "Bad parameter code calls for send code",
+            "Trace for code other than PP, PC, PY, SD, SF, SW",
+            "Variable duration not defined",
+            "Bad character where delimiter is expected",
+            "Non-existent value for given type and source parameter code",
+            "ZULU, DR, or DI has send code QY, PY, or HY",
+            "Forecast data given without creation date",
+            "No value given after parameter code and before slash or eol",
+            "Explicit date for codes DRE or DIE is not the end-of-month",
+            "Year not in good range (1753-2199)",
+            // 40
+            "Exceeded limit of data items",
+            "Too many data items for given .B format",
+            "Not enough data items for given .B format",
+            "Cannot adjust forecast date to Zulu time",
+            "Time between 0200 & 0259 on day changing from standard to daylight",
+            "No time increment specified (use DI code)",
+            "No \".END\" message for previous “.B� format",
+            "ID requires 3 to 8 characters",
+            "For daylight savings time, check Apr or Oct for 1976 thru 2040 only",
+            "Bad character in the message",
+            // 50
+            "Missing parameter code",
+            "Bad value chars (or missing delimiter), data may be lost",
+            "Bad character in data field",
+            "\"?\" not accepted for missing, use \"M\" or \"+\"",
+            "Parameter code is too long or too short",
+            "Missing delimiter between data type fields",
+            "Missing delimiter after data type field",
+            "Should use \"/\" after date, time, or other D-code; before data",
+            "Parm codes PP and PC require decimal value",
+            "Abort, cannot read \"shefparm\" file correctly",
+            // 60
+            "Non-existent value for given duration parameter code",
+            "Non-existent value for given extremum parameter code",
+            "Non-existent value for given conversion factor parameter code",
+            "Non-existent value for given probability parameter code",
+            "Parameter code too short or field misinterpreted as parameter code",
+            "Comma not allowed in data field, data value is lost",
+            "Date check for yr-mo-da shows bad date",
+            "No data on line identified with a message type format",
+            "An unexpected \".END\" message was encountered",
+            "BUMMER!!! Maximum number of errors reached, abort message",
+            // 70
+            "Cannot output to binary shefpars file",
+            "Cannot access “PE conversion factors� from the \"shefparm\" file",
+            "Cannot access “send codes� from the \"shefparm\" file",
+            "Cannot access “duration codes� from the \"shefparm\" file",
+            "Cannot access “type/source codes� from the \"shefparm\" file",
+            "Cannot access “extremum codes� from the \"shefparm\" file",
+            "Cannot access “probability codes� from the \"shefparm\" file",
+            "Cannot read \"SHEFPARM\" file!!!!!",
+            "Bad character in data value, data value is lost",
+            "Julian day should be written with 3 digits",
+            // 80
+            "Too many digits in date group!",
+            "Too many characters in quotes",
+            "Data line found before completing .B format line(s)",
+            "Missing slash delimiter or bad time zone code",
+            "Too many chars in qualifier code, data value is lost",
+            "Bad data qualifier, rest of format is lost",
+            "Retained comment found without a data value, comment is lost",
+            "Unexpected slash found after parameter code, before data value",
+            "Cannot access “qualifier codes� from the \"shefparm\" file",
+            "Intentionally left blank",
+            // 90
+            "Unknown error number given",
+            "91 Reserved",
+            "92 Reserved",
+            "93 Reserved",
+            "94 Reserved",
+            "95 Reserved",
+            "96 Reserved",
+            "97 Reserved",
+            "98 Reserved",
+            "99 Reserved",
+            // 100
+            "Observation time expected but not found", // 100
+            "PEDTSEP redeclared in E record data", // 101
+            "Too many digits in DI code", // 102
+            "Too many digits in DR code", // 103
+            "Too many digits in DV code", // 104
     };
 
-//    public static final int LOG_000 =    0;
-//    public static final int LOG_001 =    1;
-//    public static final int LOG_002 =    2;
-//    public static final int LOG_003 =    3;
-//    public static final int LOG_004 =    4;
-//    public static final int LOG_005 =    5;
-//    public static final int LOG_006 =    6;
-//    public static final int LOG_007 =    7;
-//    public static final int LOG_008 =    8;
-//    public static final int LOG_009 =    9;
-//
-//    public static final int LOG_010 =   10;
-//    public static final int LOG_011 =   11;
-//    public static final int LOG_012 =   12;
-//    public static final int LOG_013 =   13;
-//    public static final int LOG_014 =   14;
-//    public static final int LOG_015 =   15;
-//    public static final int LOG_016 =   16;
-//    public static final int LOG_017 =   17;
-//    public static final int LOG_018 =   18;
-//    public static final int LOG_019 =   19;
-//    
-//    public static final int LOG_020 =   20;
-//    public static final int LOG_021 =   21;
-//    public static final int LOG_022 =   22;
-//    public static final int LOG_023 =   23;
-//    public static final int LOG_024 =   24;
-//    public static final int LOG_025 =   25;
-//    public static final int LOG_026 =   26;
-//    public static final int LOG_027 =   27;
-//    public static final int LOG_028 =   28;
-//    public static final int LOG_029 =   29;
-//
-//    public static final int LOG_030 =   30;
-//    public static final int LOG_031 =   31;
-//    public static final int LOG_032 =   32;
-//    public static final int LOG_033 =   33;
-//    public static final int LOG_034 =   34;
-//    public static final int LOG_035 =   35;
-//    public static final int LOG_036 =   36;
-//    public static final int LOG_037 =   37;
-//    public static final int LOG_038 =   38;
-//    public static final int LOG_039 =   39;
-//
-//    public static final int LOG_040 =   40;
-//    public static final int LOG_041 =   41;
-//    public static final int LOG_042 =   42;
-//    public static final int LOG_043 =   43;
-//    public static final int LOG_044 =   44;
-//    public static final int LOG_045 =   45;
-//    public static final int LOG_046 =   46;
-//    public static final int LOG_047 =   47;
-//    public static final int LOG_048 =   48;
-//    public static final int LOG_049 =   49;
-//
-//    public static final int LOG_050 =   50;
-//    public static final int LOG_051 =   51;
-//    public static final int LOG_052 =   52;
-//    public static final int LOG_053 =   53;
-//    public static final int LOG_054 =   54;
-//    public static final int LOG_055 =   55;
-//    public static final int LOG_056 =   56;
-//    public static final int LOG_057 =   57;
-//    public static final int LOG_058 =   58;
-//    public static final int LOG_059 =   59;
-//
-//    public static final int LOG_060 =   60;
-//    public static final int LOG_061 =   61;
-//    public static final int LOG_062 =   62;
-//    public static final int LOG_063 =   63;
-//    public static final int LOG_064 =   64;
-//    public static final int LOG_065 =   65;
-//    public static final int LOG_066 =   66;
-//    public static final int LOG_067 =   67;
-//    public static final int LOG_068 =   68;
-//    public static final int LOG_069 =   69;
-//
-//    public static final int LOG_070 =   70;
-//    public static final int LOG_071 =   71;
-//    public static final int LOG_072 =   72;
-//    public static final int LOG_073 =   73;
-//    public static final int LOG_074 =   74;
-//    public static final int LOG_075 =   75;
-//    public static final int LOG_076 =   76;
-//    public static final int LOG_077 =   77;
-//    public static final int LOG_078 =   78;
-//    public static final int LOG_079 =   79;
-//
-//    public static final int LOG_080 =   80;
-//    public static final int LOG_081 =   81;
-//    public static final int LOG_082 =   82;
-//    public static final int LOG_083 =   83;
-//    public static final int LOG_084 =   84;
-//    public static final int LOG_085 =   85;
-//    public static final int LOG_086 =   86;
-//    public static final int LOG_087 =   87;
-//    public static final int LOG_088 =   88;
-//    public static final int LOG_089 =   89;
-//
-//    public static final int LOG_090 =   90;
-//    public static final int LOG_091 =   91;
-//    public static final int LOG_092 =   92;
-//    public static final int LOG_093 =   93;
-//    public static final int LOG_094 =   94;
-//    public static final int LOG_095 =   95;
-//    public static final int LOG_096 =   96;
-//    public static final int LOG_097 =   97;
-//    public static final int LOG_098 =   98;
-//    public static final int LOG_099 =   99;
-//
-//    public static final int LOG_100 =  100;
-//    public static final int LOG_101 =  101;
-//    public static final int LOG_102 =  102;
-//    public static final int LOG_103 =  103;
-//    public static final int LOG_104 =  104;
-    
+    // public static final int LOG_000 = 0;
+    // public static final int LOG_001 = 1;
+    // public static final int LOG_002 = 2;
+    // public static final int LOG_003 = 3;
+    // public static final int LOG_004 = 4;
+    // public static final int LOG_005 = 5;
+    // public static final int LOG_006 = 6;
+    // public static final int LOG_007 = 7;
+    // public static final int LOG_008 = 8;
+    // public static final int LOG_009 = 9;
+    //
+    // public static final int LOG_010 = 10;
+    // public static final int LOG_011 = 11;
+    // public static final int LOG_012 = 12;
+    // public static final int LOG_013 = 13;
+    // public static final int LOG_014 = 14;
+    // public static final int LOG_015 = 15;
+    // public static final int LOG_016 = 16;
+    // public static final int LOG_017 = 17;
+    // public static final int LOG_018 = 18;
+    // public static final int LOG_019 = 19;
+    //
+    // public static final int LOG_020 = 20;
+    // public static final int LOG_021 = 21;
+    // public static final int LOG_022 = 22;
+    // public static final int LOG_023 = 23;
+    // public static final int LOG_024 = 24;
+    // public static final int LOG_025 = 25;
+    // public static final int LOG_026 = 26;
+    // public static final int LOG_027 = 27;
+    // public static final int LOG_028 = 28;
+    // public static final int LOG_029 = 29;
+    //
+    // public static final int LOG_030 = 30;
+    // public static final int LOG_031 = 31;
+    // public static final int LOG_032 = 32;
+    // public static final int LOG_033 = 33;
+    // public static final int LOG_034 = 34;
+    // public static final int LOG_035 = 35;
+    // public static final int LOG_036 = 36;
+    // public static final int LOG_037 = 37;
+    // public static final int LOG_038 = 38;
+    // public static final int LOG_039 = 39;
+    //
+    // public static final int LOG_040 = 40;
+    // public static final int LOG_041 = 41;
+    // public static final int LOG_042 = 42;
+    // public static final int LOG_043 = 43;
+    // public static final int LOG_044 = 44;
+    // public static final int LOG_045 = 45;
+    // public static final int LOG_046 = 46;
+    // public static final int LOG_047 = 47;
+    // public static final int LOG_048 = 48;
+    // public static final int LOG_049 = 49;
+    //
+    // public static final int LOG_050 = 50;
+    // public static final int LOG_051 = 51;
+    // public static final int LOG_052 = 52;
+    // public static final int LOG_053 = 53;
+    // public static final int LOG_054 = 54;
+    // public static final int LOG_055 = 55;
+    // public static final int LOG_056 = 56;
+    // public static final int LOG_057 = 57;
+    // public static final int LOG_058 = 58;
+    // public static final int LOG_059 = 59;
+    //
+    // public static final int LOG_060 = 60;
+    // public static final int LOG_061 = 61;
+    // public static final int LOG_062 = 62;
+    // public static final int LOG_063 = 63;
+    // public static final int LOG_064 = 64;
+    // public static final int LOG_065 = 65;
+    // public static final int LOG_066 = 66;
+    // public static final int LOG_067 = 67;
+    // public static final int LOG_068 = 68;
+    // public static final int LOG_069 = 69;
+    //
+    // public static final int LOG_070 = 70;
+    // public static final int LOG_071 = 71;
+    // public static final int LOG_072 = 72;
+    // public static final int LOG_073 = 73;
+    // public static final int LOG_074 = 74;
+    // public static final int LOG_075 = 75;
+    // public static final int LOG_076 = 76;
+    // public static final int LOG_077 = 77;
+    // public static final int LOG_078 = 78;
+    // public static final int LOG_079 = 79;
+    //
+    // public static final int LOG_080 = 80;
+    // public static final int LOG_081 = 81;
+    // public static final int LOG_082 = 82;
+    // public static final int LOG_083 = 83;
+    // public static final int LOG_084 = 84;
+    // public static final int LOG_085 = 85;
+    // public static final int LOG_086 = 86;
+    // public static final int LOG_087 = 87;
+    // public static final int LOG_088 = 88;
+    // public static final int LOG_089 = 89;
+    //
+    // public static final int LOG_090 = 90;
+    // public static final int LOG_091 = 91;
+    // public static final int LOG_092 = 92;
+    // public static final int LOG_093 = 93;
+    // public static final int LOG_094 = 94;
+    // public static final int LOG_095 = 95;
+    // public static final int LOG_096 = 96;
+    // public static final int LOG_097 = 97;
+    // public static final int LOG_098 = 98;
+    // public static final int LOG_099 = 99;
+    //
+    // public static final int LOG_100 = 100;
+    // public static final int LOG_101 = 101;
+    // public static final int LOG_102 = 102;
+    // public static final int LOG_103 = 103;
+    // public static final int LOG_104 = 104;
 
     public static final boolean LOGOUT = false;
+
     public static final boolean STDOUT = true;
 
-    private static final String ERR_FMT   = "ERROR %20s %03d %s";
+    private static final String ERR_FMT = "ERROR %20s %03d %s";
+
     private static final String ERROR_FMT = "ERROR %03d %s";
 
-    private static final String WRN_FMT   = "WARNG %20s %03d %s";
-    private static final String WARN_FMT  = "WARNG %03d %s";
+    private static final String WRN_FMT = "WARNG %20s %03d %s";
+
+    private static final String WARN_FMT = "WARNG %03d %s";
+
+    private static final String DBG_FMT = "DEBUG %20s %03d %s";
+
+    private static final String DEBUG_FMT = "DEBUG %03d %s";
 
-    private static final String DBG_FMT   = "DEBUG %20s %03d %s";
-    private static final String DEBUG_FMT  = "DEBUG %03d %s";
-    
-    
     private static SHEFErrors instance;
 
-    private Log logger = LogFactory.getLog(getClass());
-    
-    private Map<Class<?>,Log> loggers;
-    
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    private Map<Class<?>, Logger> loggers;
+
     private boolean stdOut = LOGOUT;
 
     /**
      * 
      */
     private SHEFErrors() {
-        loggers = new HashMap<Class<?>,Log>();
+        loggers = new HashMap<Class<?>, Logger>();
     }
 
     /**
      * 
      */
     private static void ensureMap() {
-        if(instance == null) {
+        if (instance == null) {
             instance = new SHEFErrors();
         }
     }
-    
+
     /**
      * 
-     * @param clazz Class that is requesting a logger registration.
+     * @param clazz
+     *            Class that is requesting a logger registration.
      */
     public static SHEFErrors registerLogger(Class<?> clazz) {
         ensureMap();
-        if(clazz != null) {
-            instance.loggers.put(clazz,LogFactory.getLog(clazz));
+        if (clazz != null) {
+            instance.loggers.put(clazz, LoggerFactory.getLogger(clazz));
         }
         return instance;
     }
@@ -340,9 +343,9 @@ public class SHEFErrors {
      * @param errorCode
      */
     public void error(Class<?> clazz, int errorCode) {
-        error(clazz,errorCode,(Throwable) null);
+        error(clazz, errorCode, (Throwable) null);
     }
-    
+
     /**
      * 
      * @param clazz
@@ -350,22 +353,25 @@ public class SHEFErrors {
      * @param t
      */
     public void error(Class<?> clazz, int errorCode, Throwable t) {
-        Log log = loggers.get(clazz);
-        if(log == null) {
+        Logger log = loggers.get(clazz);
+        if (log == null) {
             setOutMode(STDOUT);
         }
-        if((errorCode >= LOG_MSGS.length) || (errorCode < 0)) {
-            if(stdOut) {
-                System.out.println("Invalid SHEF errorCode [" + errorCode + "]");
+        if ((errorCode >= LOG_MSGS.length) || (errorCode < 0)) {
+            if (stdOut) {
+                System.out
+                        .println("Invalid SHEF errorCode [" + errorCode + "]");
             } else {
                 logger.error("Invalid SHEF errorCode [" + errorCode + "]");
             }
         } else {
-            if(stdOut) {
-                System.out.println(String.format(ERR_FMT,new Date().toString(),errorCode,LOG_MSGS[errorCode]));
+            if (stdOut) {
+                System.out.println(String.format(ERR_FMT,
+                        new Date().toString(), errorCode, LOG_MSGS[errorCode]));
             } else {
-                String err = String.format(ERROR_FMT,errorCode, LOG_MSGS[errorCode]);
-                if(t == null) {
+                String err = String.format(ERROR_FMT, errorCode,
+                        LOG_MSGS[errorCode]);
+                if (t == null) {
                     log.error(err);
                 } else {
                     log.error(err, t);
@@ -381,7 +387,7 @@ public class SHEFErrors {
      * @param t
      */
     public void error(Class<?> clazz, String message) {
-        error(clazz,message,(Throwable) null);
+        error(clazz, message, (Throwable) null);
     }
 
     /**
@@ -391,12 +397,13 @@ public class SHEFErrors {
      * @param t
      */
     public void error(Class<?> clazz, String message, Throwable t) {
-        Log log = loggers.get(clazz);
+        Logger log = loggers.get(clazz);
         if (log == null) {
             setOutMode(STDOUT);
         }
         if (stdOut) {
-            System.out.println("ERROR " + new Date().toString() + " " + message);
+            System.out
+                    .println("ERROR " + new Date().toString() + " " + message);
         } else {
             if (t == null) {
                 log.error(message);
@@ -406,14 +413,13 @@ public class SHEFErrors {
         }
     }
 
-    
     /**
      * 
      * @param clazz
      * @param errorCode
      */
     public void warning(Class<?> clazz, int errorCode) {
-        warning(clazz,errorCode,(Throwable) null);
+        warning(clazz, errorCode, (Throwable) null);
     }
 
     /**
@@ -423,22 +429,25 @@ public class SHEFErrors {
      * @param t
      */
     public void warning(Class<?> clazz, int errorCode, Throwable t) {
-        Log log = loggers.get(clazz);
-        if(log == null) {
+        Logger log = loggers.get(clazz);
+        if (log == null) {
             setOutMode(STDOUT);
         }
-        if((errorCode >= LOG_MSGS.length) || (errorCode < 0)) {
-            if(stdOut) {
-                System.out.println("Invalid SHEF errorCode [" + errorCode + "]");
+        if ((errorCode >= LOG_MSGS.length) || (errorCode < 0)) {
+            if (stdOut) {
+                System.out
+                        .println("Invalid SHEF errorCode [" + errorCode + "]");
             } else {
                 logger.error("Invalid SHEF errorCode [" + errorCode + "]");
             }
         } else {
-            if(stdOut) {
-                System.out.println(String.format(WRN_FMT,new Date().toString(),errorCode,LOG_MSGS[errorCode]));
+            if (stdOut) {
+                System.out.println(String.format(WRN_FMT,
+                        new Date().toString(), errorCode, LOG_MSGS[errorCode]));
             } else {
-                String err = String.format(WARN_FMT,errorCode, LOG_MSGS[errorCode]);
-                if(t == null) {
+                String err = String.format(WARN_FMT, errorCode,
+                        LOG_MSGS[errorCode]);
+                if (t == null) {
                     log.info(err);
                 } else {
                     log.info(err, t);
@@ -454,7 +463,7 @@ public class SHEFErrors {
      * @param t
      */
     public void warning(Class<?> clazz, String message) {
-        warning(clazz,message,(Throwable) null);
+        warning(clazz, message, (Throwable) null);
     }
 
     /**
@@ -464,12 +473,13 @@ public class SHEFErrors {
      * @param t
      */
     public void warning(Class<?> clazz, String message, Throwable t) {
-        Log log = loggers.get(clazz);
+        Logger log = loggers.get(clazz);
         if (log == null) {
             setOutMode(STDOUT);
         }
         if (stdOut) {
-            System.out.println("WARNG " + new Date().toString() + " " + message);
+            System.out
+                    .println("WARNG " + new Date().toString() + " " + message);
         } else {
             if (t == null) {
                 log.info(message);
@@ -486,12 +496,13 @@ public class SHEFErrors {
      * @param t
      */
     public void debug(Class<?> clazz, String data) {
-        Log log = loggers.get(clazz);
+        Logger log = loggers.get(clazz);
         if (log == null) {
             setOutMode(STDOUT);
         }
         if (stdOut) {
-            System.out.println(String.format("DEBUG %20s %s", new Date().toString(),data));
+            System.out.println(String.format("DEBUG %20s %s",
+                    new Date().toString(), data));
         } else {
             log.debug(String.format("DEBUG %s", data));
         }
@@ -504,12 +515,13 @@ public class SHEFErrors {
      * @param t
      */
     public void debug(Class<?> clazz, String message, Throwable t) {
-        Log log = loggers.get(clazz);
+        Logger log = loggers.get(clazz);
         if (log == null) {
             setOutMode(STDOUT);
         }
         if (stdOut) {
-            System.out.println("DEBUG " + new Date().toString() + " " + message);
+            System.out
+                    .println("DEBUG " + new Date().toString() + " " + message);
         } else {
             if (t == null) {
                 log.info(message);
@@ -526,17 +538,18 @@ public class SHEFErrors {
      * @param t
      */
     public void debug(Class<?> clazz, Throwable t) {
-        Log log = loggers.get(clazz);
+        Logger log = loggers.get(clazz);
         if (log == null) {
             setOutMode(STDOUT);
         }
         if (stdOut) {
-            System.out.println("DEBUG " + new Date().toString() + " " + t.getMessage());
+            System.out.println("DEBUG " + new Date().toString() + " "
+                    + t.getMessage());
         } else {
             if (t == null) {
-                log.info(t);
+                log.info("No error", t);
             } else {
-                log.info(t);
+                log.info(t.getLocalizedMessage(), t);
             }
         }
     }
@@ -547,7 +560,7 @@ public class SHEFErrors {
      * @param errorCode
      */
     public void debug(Class<?> clazz, int errorCode) {
-        debug(clazz,errorCode,(Throwable) null);
+        debug(clazz, errorCode, (Throwable) null);
     }
 
     /**
@@ -557,22 +570,25 @@ public class SHEFErrors {
      * @param t
      */
     public void debug(Class<?> clazz, int errorCode, Throwable t) {
-        Log log = loggers.get(clazz);
-        if(log == null) {
+        Logger log = loggers.get(clazz);
+        if (log == null) {
             setOutMode(STDOUT);
         }
-        if((errorCode >= LOG_MSGS.length) || (errorCode < 0)) {
-            if(stdOut) {
-                System.out.println("Invalid SHEF errorCode [" + errorCode + "]");
+        if ((errorCode >= LOG_MSGS.length) || (errorCode < 0)) {
+            if (stdOut) {
+                System.out
+                        .println("Invalid SHEF errorCode [" + errorCode + "]");
             } else {
                 logger.error("Invalid SHEF errorCode [" + errorCode + "]");
             }
         } else {
-            if(stdOut) {
-                System.out.println(String.format(DBG_FMT,new Date().toString(),errorCode,LOG_MSGS[errorCode]));
+            if (stdOut) {
+                System.out.println(String.format(DBG_FMT,
+                        new Date().toString(), errorCode, LOG_MSGS[errorCode]));
             } else {
-                String err = String.format(DEBUG_FMT,errorCode, LOG_MSGS[errorCode]);
-                if(t == null) {
+                String err = String.format(DEBUG_FMT, errorCode,
+                        LOG_MSGS[errorCode]);
+                if (t == null) {
                     log.info(err);
                 } else {
                     log.info(err, t);
@@ -580,9 +596,9 @@ public class SHEFErrors {
             }
         }
     }
-    
+
     public void setOutMode(boolean mode) {
         stdOut = mode;
     }
-    
+
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/ShefParm.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/ShefParm.java
index 0edf652b07..a144d27ae9 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/ShefParm.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/util/ShefParm.java
@@ -26,8 +26,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@@ -43,7 +43,8 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 04/18/2008   387        M. Duff     Initial Version.	
+ * Apr 18, 2008 387        M. Duff     Initial Version.
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -52,8 +53,9 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
  */
 
 public class ShefParm {
-	static {
-        log = LogFactory.getLog(com.raytheon.edex.plugin.shef.util.ShefParm.class);
+    static {
+        log = LoggerFactory
+                .getLogger(com.raytheon.edex.plugin.shef.util.ShefParm.class);
         physicalElementConversion = new HashMap<String, Double>();
         durationCodeValues = new HashMap<String, Short>();
         typeSourceCodes = new HashMap<String, Integer>();
@@ -62,110 +64,128 @@ public class ShefParm {
         sendCodesDuration = new HashMap<String, String>();
         dataQualifierCodes = new HashMap<String, Integer>();
         MAX_ERRORS = 0;
-		populate();
-	}
-	
-	private static Map<String, Double> physicalElementConversion;
-	private static Map<String, Short> durationCodeValues;
-	private static Map<String, Integer> typeSourceCodes;
-	private static Map<String, Integer> extremumCodes;
-	private static Map<String, Float> probabilityCodeValues;
-	private static Map<String, String> sendCodesDuration;
-	private static Map<String, Integer> dataQualifierCodes;
-	private static int MAX_ERRORS;
-    private static final Log log;
+        populate();
+    }
+
+    private static Map<String, Double> physicalElementConversion;
+
+    private static Map<String, Short> durationCodeValues;
+
+    private static Map<String, Integer> typeSourceCodes;
+
+    private static Map<String, Integer> extremumCodes;
+
+    private static Map<String, Float> probabilityCodeValues;
+
+    private static Map<String, String> sendCodesDuration;
+
+    private static Map<String, Integer> dataQualifierCodes;
+
+    private static int MAX_ERRORS;
+
+    private static final Logger log;
+
     private static final String PLUGIN_NAME = "shef";
+
     private static final String PROPFILE_NAME = "SHEFPARM";
-    
+
     private static int fileSection = 0;
 
     /**
-	 * Get a Physical Element conversion factor
-	 * 
-	 * @param key - Physical Element
-	 * @return - the conversion factor
-	 */
-	public static Double getPhysicalElementConversionFactor(String key) {
-		return physicalElementConversion.get(key);
-	}
+     * Get a Physical Element conversion factor
+     * 
+     * @param key
+     *            - Physical Element
+     * @return - the conversion factor
+     */
+    public static Double getPhysicalElementConversionFactor(String key) {
+        return physicalElementConversion.get(key);
+    }
+
+    /**
+     * Get a Duration Code value
+     * 
+     * @param key
+     *            - Duration Code
+     * @return - the Duration Code value
+     */
+    public static Short getDurationCodeValue(String key) {
+        return durationCodeValues.get(key);
+    }
+
+    /**
+     * Check the Type Source Code
+     * 
+     * @param key
+     *            - Type Source
+     * @return - 1 if valid code, null if invalid
+     */
+    public static Integer getTypeSourceCode(String key) {
+        return typeSourceCodes.get(key);
+    }
+
+    /**
+     * Check the Extremum Code
+     * 
+     * @param key
+     *            - Extremum Code
+     * @return - 1 if valid code, null if invalid
+     */
+    public static Integer getExtremumCode(String key) {
+        return extremumCodes.get(key);
+    }
+
+    /**
+     * Get the Probability Code Value
+     * 
+     * @param key
+     *            - Probability Code
+     * @return - Probability Code's value
+     */
+    public static Float getProbabilityCodeValue(String key) {
+        return probabilityCodeValues.get(key);
+    }
+
+    /**
+     * Get a Send Code or Duration default value for these special cases
+     * 
+     * @param key
+     *            - Code
+     * @return - Default Values
+     */
+    public static String getSendCodeDurationDefaults(String key) {
+        return sendCodesDuration.get(key);
+    }
+
+    /**
+     * Check the Data Qualifier Code
+     * 
+     * @param key
+     *            - Extremum Code
+     * @return - 1 if valid code, null if invalid
+     */
+    public static Integer getDataQualifierCodes(String key) {
+        return dataQualifierCodes.get(key);
+    }
+
+    /**
+     * Get the maximum number of errors defined
+     * 
+     * @return - the maximum number of errors
+     */
+    public static Integer getMaxErrors() {
+        return MAX_ERRORS;
+    }
+
+    /**
+     * Populate the values from the file.
+     */
+    private static void populate() {
 
-	/**
-	 * Get a Duration Code value
-	 * 
-	 * @param key - Duration Code
-	 * @return - the Duration Code value
-	 */
-	public static Short getDurationCodeValue(String key) {
-		return durationCodeValues.get(key);
-	}
-	
-	/**
-	 * Check the Type Source Code
-	 * 
-	 * @param key - Type Source
-	 * @return - 1 if valid code, null if invalid
-	 */
-	public static Integer getTypeSourceCode(String key) {
-		return typeSourceCodes.get(key);
-	}
-	
-	/**
-	 * Check the Extremum Code
-	 * 
-	 * @param key - Extremum Code
-	 * @return - 1 if valid code, null if invalid
-	 */
-	public static Integer getExtremumCode(String key) {
-		return extremumCodes.get(key);
-	}
-	
-	/**
-	 * Get the Probability Code Value
-	 * 
-	 * @param key - Probability Code
-	 * @return - Probability Code's value
-	 */
-	public static Float getProbabilityCodeValue(String key) {
-		return probabilityCodeValues.get(key);
-	}
-	
-	/**
-	 * Get a Send Code or Duration default value for these special cases
-	 * 
-	 * @param key - Code
-	 * @return - Default Values
-	 */
-	public static String getSendCodeDurationDefaults(String key) {
-		return sendCodesDuration.get(key);
-	}
-	
-	/**
-	 * Check the Data Qualifier Code
-	 * 
-	 * @param key - Extremum Code
-	 * @return - 1 if valid code, null if invalid
-	 */
-	public static Integer getDataQualifierCodes(String key) {
-		return dataQualifierCodes.get(key);
-	}
-	
-	/**
-	 * Get the maximum number of errors defined
-	 * 
-	 * @return - the maximum number of errors
-	 */
-	public static Integer getMaxErrors() {
-		return MAX_ERRORS;
-	}
-	
-	/**
-	 * Populate the values from the file.
-	 */
-	private static void populate() {
-	    
         PathManager pathMgr = (PathManager) PathManagerFactory.getPathManager();
 
-        LocalizationContext ctx = pathMgr.getContext(LocalizationType.COMMON_STATIC, LocalizationLevel.BASE);
+        LocalizationContext ctx = pathMgr.getContext(
+                LocalizationType.COMMON_STATIC, LocalizationLevel.BASE);
         File baseDir = pathMgr.getFile(ctx, PLUGIN_NAME);
         File srcFile = new File(baseDir, PROPFILE_NAME);
 
@@ -181,31 +201,31 @@ public class ShefParm {
             ioe.printStackTrace();
             log.error("Error loading " + PROPFILE_NAME);
         }
-	}
-	
-	private static String expandPE(String pe) {
-	    // 0123456
-	    // ADZZZZZ
-	    StringBuilder peCode = new StringBuilder("--IRZZ");
-	    if((pe != null)&&(pe.length() >= 2)) {
-	        for(int i = 0;i < pe.length() && (i < peCode.length());i++) {
-	            peCode.setCharAt(i,pe.charAt(i));
-	        }
-	    }
-	    char z4 = peCode.charAt(3);
+    }
+
+    private static String expandPE(String pe) {
+        // 0123456
+        // ADZZZZZ
+        StringBuilder peCode = new StringBuilder("--IRZZ");
+        if ((pe != null) && (pe.length() >= 2)) {
+            for (int i = 0; i < pe.length() && (i < peCode.length()); i++) {
+                peCode.setCharAt(i, pe.charAt(i));
+            }
+        }
+        char z4 = peCode.charAt(3);
         char z5 = peCode.charAt(5);
-	    if('Z' == z4) {
-	        if('Z' == z5) {
-	            peCode.setCharAt(3, 'R');
-	        } else {
-	            // FIXME: This is an error
-	        }
-	    }
-	    
-	    return peCode.toString();
-	}
-	
-	private static void processLine(String line) {
+        if ('Z' == z4) {
+            if ('Z' == z5) {
+                peCode.setCharAt(3, 'R');
+            } else {
+                // FIXME: This is an error
+            }
+        }
+
+        return peCode.toString();
+    }
+
+    private static void processLine(String line) {
         String[] pair = null;
         if (line.startsWith("$")) {
             return;
@@ -223,28 +243,24 @@ public class ShefParm {
             switch (fileSection) {
             case 1:
                 pair = line.split("\\s+");
-                physicalElementConversion.put(pair[0], Double
-                        .parseDouble(pair[1]));
+                physicalElementConversion.put(pair[0],
+                        Double.parseDouble(pair[1]));
                 break;
             case 2:
                 pair = line.split("\\s+");
-                durationCodeValues.put(pair[0], Short
-                        .parseShort(pair[1]));
+                durationCodeValues.put(pair[0], Short.parseShort(pair[1]));
                 break;
             case 3:
                 pair = line.split("\\s+");
-                typeSourceCodes.put(pair[0], Integer
-                        .parseInt(pair[1]));
+                typeSourceCodes.put(pair[0], Integer.parseInt(pair[1]));
                 break;
             case 4:
                 pair = line.split("\\s+");
-                extremumCodes.put(pair[0], Integer
-                        .parseInt(pair[1]));
+                extremumCodes.put(pair[0], Integer.parseInt(pair[1]));
                 break;
             case 5:
                 pair = line.split("\\s+");
-                probabilityCodeValues.put(pair[0], Float
-                        .parseFloat(pair[1]));
+                probabilityCodeValues.put(pair[0], Float.parseFloat(pair[1]));
                 break;
             case 6:
                 pair = line.split("\\s+");
@@ -261,10 +277,9 @@ public class ShefParm {
         }
     }
 
-	public static final void main(String [] args) {
-	    
-	    
-	    String s = expandPE("ADZZZZZ");
-	    System.out.println(s);
-	}
+    public static final void main(String[] args) {
+
+        String s = expandPE("ADZZZZZ");
+        System.out.println(s);
+    }
 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/AbstractShefFilter.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/AbstractShefFilter.java
index d4bc69886a..38e8ac8dd7 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/AbstractShefFilter.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/AbstractShefFilter.java
@@ -26,14 +26,14 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
+import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.serialization.JAXBManager;
 import com.raytheon.uf.edex.decodertools.core.filterimpl.AbstractFilterElement;
 import com.raytheon.uf.edex.decodertools.core.filterimpl.AbstractObsFilter;
@@ -53,6 +53,7 @@ import com.raytheon.uf.edex.decodertools.core.filterimpl.WMOHeaderFilterElement;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Oct 28, 2015 4783       bkowal      Initial creation
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -72,7 +73,7 @@ public abstract class AbstractShefFilter {
 
     public static final String FILTERS_DIR = "plugin-filters";
 
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
 
     private String filterConfigFile = null;
 
@@ -180,4 +181,4 @@ public abstract class AbstractShefFilter {
     protected abstract void createDummyFilter();
 
     public abstract PluginDataObject[] filter(PluginDataObject[] reports);
-}
\ No newline at end of file
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/AbstractShefTransformer.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/AbstractShefTransformer.java
index 6f4bdae5ee..a4af9492e1 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/AbstractShefTransformer.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/AbstractShefTransformer.java
@@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import javax.xml.transform.TransformerException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.transform.shef.obs.ObsToSHEFOptions;
@@ -55,6 +55,7 @@ import com.raytheon.uf.common.wmo.WMOTimeParser;
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed TimeTools usage
  * Jul 01, 2015 16903      lbousaidi   added routine for synoptic data
  * Oct 29, 2015 4783       bkowal      Made {@link #metar2ShefOptions} protected.
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -73,17 +74,17 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
     private final String WMO_HEADER_FMT;
 
     private static final String ARCHIVE_FORMAT = "%s_%04d";
-    
+
     // Note that the nuber of digits must agree with ARCHIVE_FORMAT
     private static final int MAX_ARCHIVE_SEQUENCE = 10000;
-    
+
     private static final String WMO_MSG_SEQ_FMT = "%03d";
-    
+
     // WMO Sequence number range from 001..999
     private static final int MAX_WMO_MSG_SEQ = 1000;
-    
+
     public static final String METAR_2_SHEF_NNN = "MTR";
-    
+
     public static final String METAR_2_SHEF_OPT = "metar2shef_options";
 
     public static final String SHEF_A_RECORD = ".A";
@@ -103,7 +104,7 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
     public static final String SHEF_OBS_BASISTIME_FMT = "/DC%1$ty%1$tm%1$td%1$tH%1$tM";
 
     public static final String OPT_ARC_ENABLE = "archive_enable";
-    
+
     public static final String OPT_SHEF_ARC_DIR = "archive_shefdata_dir";
 
     // ***********************
@@ -114,7 +115,7 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
     // ***********************
     // Exposed properties
 
-    protected Log logger = LogFactory.getLog(getClass());
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 
     private String serviceName = null;
 
@@ -127,24 +128,28 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
     protected String metar2ShefOptions = null;
 
     private boolean archiveEnabled = false;
-    
+
     private String shefArchiveDir = null;
 
     private File shefArchiveFileDir = null;
-    
+
     protected ObsToSHEFOptions options = null;
 
     private static AtomicInteger sequenceNumber = new AtomicInteger();
 
     protected static AtomicInteger msgSequence = new AtomicInteger();
+
     // ************************************************************
 
     /**
      * Create the common transformer.
-     * @param cmdLine Command line options that may be used if these
-     * options are not present in the Apps_defaults.
-     * @param headerFmt The specific WMO header format string to be used
-     * when constructing a WMO header for a particular subclass.
+     * 
+     * @param cmdLine
+     *            Command line options that may be used if these options are not
+     *            present in the Apps_defaults.
+     * @param headerFmt
+     *            The specific WMO header format string to be used when
+     *            constructing a WMO header for a particular subclass.
      */
     public AbstractShefTransformer(String cmdLine, String headerFmt) {
 
@@ -169,8 +174,8 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
             throws TransformerException {
         String cmdLine = AppsDefaults.getInstance().getToken(METAR_2_SHEF_OPT,
                 null);
-        if(options != null) {
-            if(cmdLine != null) {
+        if (options != null) {
+            if (cmdLine != null) {
                 if (!cmdLine.equals(metar2ShefOptions)) {
                     metar2ShefOptions = cmdLine;
                     options.updateCommandLine(cmdLine);
@@ -179,7 +184,7 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
             options.updateOptions();
         }
         configureArchiveDir();
-        
+
         return transformReport(report, headers);
     }
 
@@ -190,7 +195,7 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
      */
     public static Iterator<?> iterate(PluginDataObject[] objects) {
         Iterator<PluginDataObject> it = null;
-        if ((objects != null)&&(objects.length > 0)) {
+        if ((objects != null) && (objects.length > 0)) {
             List<PluginDataObject> obj = Arrays.asList(objects);
             if (obj != null) {
                 it = obj.iterator();
@@ -219,16 +224,21 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
 
     /**
      * Transform the input report to a SHEF encoded report.
-     * @param report A report to transform.
+     * 
+     * @param report
+     *            A report to transform.
      * @return The encoded SHEF report.
-     * @throws TransformerException An error occurred during proccessing.
+     * @throws TransformerException
+     *             An error occurred during proccessing.
      */
     protected abstract byte[] transformReport(T report, Headers headers)
             throws TransformerException;
 
     /**
      * Create a new buffer containing the opening stanza of a WMO bulletin.
-     * @param sequenceId Abuffer 
+     * 
+     * @param sequenceId
+     *            Abuffer
      * @param report
      * @return
      */
@@ -250,15 +260,15 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
             String stationId, Headers headers, WMOHeader hdr) {
 
         Calendar c = null;
-        
-        if((hdr != null)&&(headers != null)) {
+
+        if ((hdr != null) && (headers != null)) {
             String fileName = (String) headers.get(WMOHeader.INGEST_FILE_NAME);
             c = WMOTimeParser.findDataTime(hdr.getYYGGgg(), fileName);
         } else {
             c = TimeUtil.newGmtCalendar();
         }
         buffer.append(String.format(WMO_HEADER_FMT, stationId, c));
-        
+
         return buffer;
     }
 
@@ -273,17 +283,18 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
             String stationId, Headers headers, String hdr) {
 
         Calendar c = null;
-        
-        if((hdr != null)&&(headers != null)) {
+
+        if ((hdr != null) && (headers != null)) {
             String fileName = (String) headers.get(WMOHeader.INGEST_FILE_NAME);
             c = WMOTimeParser.findDataTime(hdr, fileName);
         } else {
             c = TimeUtil.newGmtCalendar();
         }
         buffer.append(String.format(WMO_HEADER_FMT, stationId, c));
-        
+
         return buffer;
     }
+
     /**
      * 
      * @param buffer
@@ -396,7 +407,8 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
 
     /**
      * Get the state of the archive enabled flag. This value follows
-     * AppsDefaults:archive_enable. 
+     * AppsDefaults:archive_enable.
+     * 
      * @return The archive enabled state.
      */
     private boolean isArchiveEnabled() {
@@ -405,12 +417,13 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
 
     /**
      * Get the shef archive file directory if it exists.
-     * @return 
+     * 
+     * @return
      */
     private File getShefArchiveFileDir() {
         return shefArchiveFileDir;
     }
-    
+
     /**
      * 
      */
@@ -428,28 +441,33 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
 
     /**
      * Write an encoded SHEF observation to a specified archive directory.
-     * @param shefObs The SHEF encoded data to archive.
-     * @param fileName The base filename.
+     * 
+     * @param shefObs
+     *            The SHEF encoded data to archive.
+     * @param fileName
+     *            The base filename.
      */
     protected void archiveSHEFObs(String shefObs, String fileName) {
-        if(isArchiveEnabled()) {
+        if (isArchiveEnabled()) {
             File arcFile = getShefArchiveFileDir();
-            if(arcFile != null) {
-                String fName = String.format(ARCHIVE_FORMAT, fileName, getSequenceNumber());
+            if (arcFile != null) {
+                String fName = String.format(ARCHIVE_FORMAT, fileName,
+                        getSequenceNumber());
                 File outFile = new File(arcFile, fName);
                 FileOutputStream fos = null;
                 try {
                     fos = new FileOutputStream(outFile);
                     fos.write(shefObs.getBytes());
                     fos.flush();
-                } catch(IOException ioe) {
+                } catch (IOException ioe) {
                     logger.error("Could not archive data " + fName);
                 } finally {
-                    if(fos != null) {
+                    if (fos != null) {
                         try {
                             fos.close();
-                        } catch(IOException ioe) {
-                            logger.error("Could not close archive file " + fName);
+                        } catch (IOException ioe) {
+                            logger.error("Could not close archive file "
+                                    + fName);
                         }
                     }
                 }
@@ -458,9 +476,10 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
             }
         }
     }
-    
+
     /**
      * Get the next sequence number.
+     * 
      * @return The sequence number.
      */
     private synchronized int getSequenceNumber() {
@@ -471,6 +490,7 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
 
     /**
      * Get the next message sequence number.
+     * 
      * @return The message sequence number.
      */
     private synchronized int getMsgSequenceNumber() {
@@ -562,4 +582,4 @@ public abstract class AbstractShefTransformer<T extends PluginDataObject>
                     OPT_SHEF_ARC_DIR));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/SMToShefTransformer.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/SMToShefTransformer.java
index ae57841d01..b5c75e7ff8 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/SMToShefTransformer.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/SMToShefTransformer.java
@@ -55,6 +55,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
  *                                     into ihfs database
  * Oct 28, 2015 4783       bkowal      Allow {@link SynopticToShefRun}s to override the
  *                                     default configuration.
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -194,7 +195,8 @@ public class SMToShefTransformer extends AbstractShefTransformer<ObsCommon> {
 
             }
         } catch (Exception e) {
-            logger.error(e);
+            logger.error(
+                    "Error transforming input report to SHEF encoded report", e);
         } finally {
             if (result == null) {
                 result = new byte[0];
@@ -310,4 +312,4 @@ public class SMToShefTransformer extends AbstractShefTransformer<ObsCommon> {
         }
         matchMap.putAll(reportMatchMap);
     }
-}
\ No newline at end of file
+}
diff --git a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/obs/ObsToSHEFOptions.java b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/obs/ObsToSHEFOptions.java
index 48ffa942d6..b46c1f9ad2 100644
--- a/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/obs/ObsToSHEFOptions.java
+++ b/edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/obs/ObsToSHEFOptions.java
@@ -36,8 +36,8 @@ import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
@@ -59,6 +59,7 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
  * AWIPS2 DR Work
  * 20120918           1185 jkorman     Added save to archive capability.  
  * Aug 08, 2013      16408 wkwock      Added get configuration file name function
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -176,8 +177,9 @@ public class ObsToSHEFOptions {
     public static final String OPT_CENTURY = "optCentury";
 
     public static final String OPT_NO_HR_TRACE = "optNoHourTrace";
-    
-    private String cfgFileName=null;
+
+    private String cfgFileName = null;
+
     // private static class PCReset {
     //
     // private final String stationId;
@@ -336,8 +338,8 @@ public class ObsToSHEFOptions {
                 Boolean.class));
         // -sw
         // switch source of PEDTSEP from 'Z' to 'V' for testing METAR
-        CMDS.put("-sw", new CmdLineData("-sw", OPT_TYPE_SRC_V, 0,
-                Boolean.class));
+        CMDS.put("-sw",
+                new CmdLineData("-sw", OPT_TYPE_SRC_V, 0, Boolean.class));
         // -strip
         // convert bad ascii values to blanks
         CMDS.put("-strip", new CmdLineData("-strip", OPT_STRIP, 0,
@@ -359,13 +361,14 @@ public class ObsToSHEFOptions {
         // -y2k
         // output century in SHEF output
         CMDS.put("-y2k", new CmdLineData("-y2k", OPT_CENTURY, 0, Boolean.class));
-        
+
         // -notrace
         // turn off trace precip for 1 hour data.
-        CMDS.put("-notrace", new CmdLineData("-notrace", OPT_NO_HR_TRACE, 0, Boolean.class));
+        CMDS.put("-notrace", new CmdLineData("-notrace", OPT_NO_HR_TRACE, 0,
+                Boolean.class));
     }
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private Map<String, Object> options = new HashMap<String, Object>();
 
@@ -405,25 +408,26 @@ public class ObsToSHEFOptions {
         initOptions();
         parseCommandLine(cmdLine);
         if (useLocalized) {
-        	if (cfgFileName==null){
-        		readConfig(METAR_CFG, optConfigContext);
-        	} else {
-        		readConfig(cfgFileName, optConfigContext);
-        	}
+            if (cfgFileName == null) {
+                readConfig(METAR_CFG, optConfigContext);
+            } else {
+                readConfig(cfgFileName, optConfigContext);
+            }
         }
         localized = useLocalized;
     }
-    
+
     /**
      * 
      * @param cmdLine
      */
-    public ObsToSHEFOptions(String configFileName, String cmdLine, boolean useLocalized) {
-    	cfgFileName = configFileName;
+    public ObsToSHEFOptions(String configFileName, String cmdLine,
+            boolean useLocalized) {
+        cfgFileName = configFileName;
         initOptions();
         parseCommandLine(cmdLine);
         if (useLocalized) {
-      	    readConfig(cfgFileName, optConfigContext);
+            readConfig(cfgFileName, optConfigContext);
         }
         localized = useLocalized;
     }
@@ -552,12 +556,13 @@ public class ObsToSHEFOptions {
 
     /**
      * -l SHEF TS for ASOS stations = RO, TS for all other sites = RV
+     * 
      * @return
      */
     public boolean isOptASOS_TS() {
         return (Boolean) options.get(OPT_ASOS_TS);
     }
-    
+
     /**
      * -log turn on log for current product and observation
      * 
@@ -644,25 +649,25 @@ public class ObsToSHEFOptions {
     public boolean isOptDecodePrecipAt12Z() {
         return (Boolean) options.get(OPT_DECODE_12Z_PRECIP);
     }
-    
+
     /**
      * -sw
+     * 
      * @return
      */
     public boolean isOptTypeSrcV() {
         return (Boolean) options.get(OPT_TYPE_SRC_V);
     }
-    
 
     /**
-     * -pct 
+     * -pct
      * 
      * @return
      */
     public Integer getOptPCT() {
         return (Integer) options.get(OPT_PCT);
     }
-    
+
     /**
      * -q1 output wind direction in hundreds & not tens
      * 
@@ -729,14 +734,14 @@ public class ObsToSHEFOptions {
     }
 
     /**
-     * -notrace 
+     * -notrace
      * 
      * @return Should trace precip not be reported for hourly metars.
      */
     public boolean isOptNoTrace() {
         return (Boolean) options.get(OPT_NO_HR_TRACE);
     }
-    
+
     // *****************************************************
 
     /**
@@ -855,10 +860,10 @@ public class ObsToSHEFOptions {
      */
     public void updateOptions() {
         if (loaded && localized) {
-           	if (cfgFileName==null) {
+            if (cfgFileName == null) {
                 readConfig(METAR_CFG, optConfigContext);
             } else {
-               readConfig(cfgFileName, optConfigContext);
+                readConfig(cfgFileName, optConfigContext);
             }
         }
     }
@@ -888,13 +893,14 @@ public class ObsToSHEFOptions {
                             if (SITE_CONTEXT.equals(optConfigContext)) {
                                 // Retry from a base context.
                                 optConfigContext = BASE_CONTEXT;
-                                if (cfgFileName==null) {
-                                	readConfig(METAR_CFG, optConfigContext);
-                                }else{
-                                	readConfig(cfgFileName, optConfigContext);
+                                if (cfgFileName == null) {
+                                    readConfig(METAR_CFG, optConfigContext);
+                                } else {
+                                    readConfig(cfgFileName, optConfigContext);
                                 }
                             } else {
-                            	logger.warn("Uanble to read file "+cfgFileName);
+                                logger.warn("Uanble to read file "
+                                        + cfgFileName);
                             }
                         }
                     } else {
@@ -994,13 +1000,13 @@ public class ObsToSHEFOptions {
     }
 
     public void setCfgFileName(String fileName) {
-    	cfgFileName=fileName;
+        cfgFileName = fileName;
     }
-    
-    public String getCfgFileName () {
-    	return cfgFileName;
+
+    public String getCfgFileName() {
+        return cfgFileName;
     }
-    
+
     public String toString() {
 
         StringBuilder sb = new StringBuilder();
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.warning/META-INF/MANIFEST.MF
index 81b7a152bf..2f0df991fa 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/META-INF/MANIFEST.MF
@@ -20,5 +20,4 @@ Require-Bundle: org.geotools,
 Export-Package: com.raytheon.edex.plugin.warning.tools
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.raytheon.uf.common.time,
- org.apache.commons.logging,
  org.hibernate.annotations
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java b/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
index 2bfe863a36..a08e69cf21 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
@@ -20,6 +20,7 @@
 package com.raytheon.edex.plugin.warning.gis;
 
 import java.io.File;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -66,12 +67,13 @@ import com.raytheon.uf.common.geospatial.MapUtil;
 import com.raytheon.uf.common.geospatial.SpatialException;
 import com.raytheon.uf.common.geospatial.SpatialQueryFactory;
 import com.raytheon.uf.common.geospatial.SpatialQueryResult;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.serialization.SerializationUtil;
@@ -121,6 +123,10 @@ import com.vividsolutions.jts.simplify.TopologyPreservingSimplifier;
  *                                     and added composeMessage().
  * Aug 05, 2015 4486       rjpeter     Changed Timestamp to Date.
  * Dec  9, 2015 ASM# 18209 D. Friedman Support cwaStretch features outside CWA.
+ * Jan 08, 2016  5237      tgurney     Replaced LocalizationFile with ILocalizationFile
+ *                                     (and removed calls to deprecated methods found
+ *                                     only on the former)
+ * 
  * </pre>
  * 
  * @author rjpeter
@@ -993,9 +999,15 @@ public class GeospatialDataGenerator {
             context.setContextName(site);
 
             byte[] data = SerializationUtil.transformToThrift(geoData);
-            LocalizationFile lf = pathMgr.getLocalizationFile(context,
+            ILocalizationFile lf = pathMgr.getLocalizationFile(context,
                     GeospatialFactory.GEO_DIR + fileName);
-            lf.write(data);
+            try (SaveableOutputStream sos = lf.openOutputStream()) {
+                sos.write(data);
+                sos.save();
+            } catch (IOException e) {
+                throw new LocalizationException("Could not write to file "
+                        + lf.getPath(), e);
+            }
 
             curTime.setFileName(fileName);
             times.put(curTime.getMetaData(), curTime);
@@ -1006,7 +1018,13 @@ public class GeospatialDataGenerator {
 
             lf = pathMgr.getLocalizationFile(context,
                     GeospatialFactory.METADATA_FILE);
-            lf.write(xml.getBytes());
+            try (SaveableOutputStream sos = lf.openOutputStream()) {
+                sos.write(xml.getBytes());
+                sos.save();
+            } catch (IOException e) {
+                throw new LocalizationException("Could not write to file "
+                        + lf.getPath(), e);
+            }
         } finally {
             if (ct != null) {
                 ClusterLockUtils.unlock(ct, false);
@@ -1021,14 +1039,14 @@ public class GeospatialDataGenerator {
         LocalizationContext context = pathMgr.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.CONFIGURED);
         context.setContextName(site);
-        LocalizationFile lf = pathMgr.getLocalizationFile(context,
+        ILocalizationFile lf = pathMgr.getLocalizationFile(context,
                 GeospatialFactory.GEO_DIR + fileName);
         if (lf.exists()) {
             try {
                 lf.delete();
             } catch (Exception e) {
                 statusHandler.handle(Priority.WARN,
-                        "Failed to delete area geometry file " + lf.getName(),
+                        "Failed to delete area geometry file " + lf.getPath(),
                         e);
             }
         }
diff --git a/edexOsgi/com.raytheon.edex.plugin.warning/utility/edex_static/base/distribution/warning.xml b/edexOsgi/com.raytheon.edex.plugin.warning/utility/edex_static/base/distribution/warning.xml
index 1361d3ae98..55e3713568 100644
--- a/edexOsgi/com.raytheon.edex.plugin.warning/utility/edex_static/base/distribution/warning.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.warning/utility/edex_static/base/distribution/warning.xml
@@ -22,5 +22,5 @@
     <regex>^(W[FGHOTUW]|FZ)[ACHKMPU][AHKQSWY].*</regex>
     <regex>^(WT)(NT|PZ)\d{2} KNHC.*</regex>
     <regex>^(WTP)A\d{2} PHFO.*</regex>
-    <regex>^NWUS([13-9]\d|2[1-9]) KWNS.*</regex>
+    <regex>^NWUS([13-9]\d|2[4-9]) KWNS.*</regex>
 </requestPatterns>
diff --git a/edexOsgi/com.raytheon.edex.productsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.productsrv/META-INF/MANIFEST.MF
index b9f999de43..13793d6405 100644
--- a/edexOsgi/com.raytheon.edex.productsrv/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.productsrv/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Import-Package: com.raytheon.uf.common.message,
  com.raytheon.uf.common.message.response,
  com.raytheon.uf.common.python,
  com.raytheon.uf.common.status,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.edex.productsrv/src/com/raytheon/edex/services/PlgProductSrv.java b/edexOsgi/com.raytheon.edex.productsrv/src/com/raytheon/edex/services/PlgProductSrv.java
index d3efc58506..57cfaed0f4 100644
--- a/edexOsgi/com.raytheon.edex.productsrv/src/com/raytheon/edex/services/PlgProductSrv.java
+++ b/edexOsgi/com.raytheon.edex.productsrv/src/com/raytheon/edex/services/PlgProductSrv.java
@@ -22,8 +22,8 @@ package com.raytheon.edex.services;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.uengine.ResponseUtil;
 import com.raytheon.edex.uengine.runners.IMicroEngine;
@@ -37,9 +37,10 @@ import com.raytheon.uf.edex.core.EdexException;
  * 
  * <pre>
  * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
+ * Date         Ticket#     Engineer    Description
+ * ----------   ----------  ----------- --------------------------
  * 12Nov2008    1709        MW Fegan    Initial creation
+ * 10Dec2015    5166        kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -48,24 +49,21 @@ import com.raytheon.uf.edex.core.EdexException;
 
 public class PlgProductSrv {
     /**
-     * This is the &mu;Engine instance used to run the scripts.
-     * It will normally be set by the container via dependency
-     * injection.
+     * This is the &mu;Engine instance used to run the scripts. It will normally
+     * be set by the container via dependency injection.
      */
     private IMicroEngine runner = null;
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
-    
- 
     public Object process(String scriptText) throws EdexException {
         String dataURI = ResponseUtil.EMPTY_DATA_URI;
 
-       
         if (this.runner == null) {
             String msg = "Endoint misconfigured - no script runner specified. Contact System Administrator.";
             logger.error(msg);
-            ResponseMessageError error = ResponseMessageError.generateErrorResponse(msg, null);
+            ResponseMessageError error = ResponseMessageError
+                    .generateErrorResponse(msg, null);
             return ResponseUtil.createErrorMessage(error);
         }
         List<AbstractResponseMessage> responseList = null;
@@ -76,28 +74,28 @@ public class PlgProductSrv {
         } catch (Exception e) {
             responseList = new ArrayList<AbstractResponseMessage>();
             ResponseMessageError error = ResponseMessageError
-                    .generateErrorResponse("Error executing script.",e);
+                    .generateErrorResponse("Error executing script.", e);
             responseList.add(error);
         } finally {
             runner.release();
         }
 
-        Message msg = ResponseUtil.createMessageObject(dataURI, "", responseList);
+        Message msg = ResponseUtil.createMessageObject(dataURI, "",
+                responseList);
         return msg;
     }
 
-
     /**
-     * Returns the runner <code>IMicroEngine</code> script runner
-     * configured for this end point.
+     * Returns the runner <code>IMicroEngine</code> script runner configured for
+     * this end point.
      */
     public IMicroEngine getRunner() {
         return runner;
     }
 
     /**
-     * Sets the runner <code>IMicroEngine</code> script runner
-     * configured for this end point.
+     * Sets the runner <code>IMicroEngine</code> script runner configured for
+     * this end point.
      */
     public void setRunner(IMicroEngine runner) {
         this.runner = runner;
diff --git a/edexOsgi/com.raytheon.edex.uengine/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.uengine/META-INF/MANIFEST.MF
index 8e522b7a29..0d45e2faf0 100644
--- a/edexOsgi/com.raytheon.edex.uengine/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.uengine/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Import-Package: com.raytheon.edex.exception,
  com.raytheon.edex.msg,
  com.raytheon.edex.util,
  com.raytheon.edex.utility,
- org.apache.commons.logging
+ org.slf4j
 Require-Bundle: com.raytheon.uf.edex.core;bundle-version="1.12.1174",
  com.raytheon.uf.edex.database;bundle-version="1.0.0",
  com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
@@ -29,5 +29,4 @@ Require-Bundle: com.raytheon.uf.edex.core;bundle-version="1.12.1174",
  com.raytheon.uf.common.python;bundle-version="1.12.1174",
  com.raytheon.uf.common.util;bundle-version="1.12.1174",
  org.apache.commons.configuration;bundle-version="1.6.0",
- org.apache.commons.lang;bundle-version="2.3.0",
- org.apache.commons.pool;bundle-version="1.3.0"
+ org.apache.commons.pool2;bundle-version="2.4.2"
diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/MicroEngineTaskManager.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/MicroEngineTaskManager.java
index f66804d8c2..6bf462bc58 100644
--- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/MicroEngineTaskManager.java
+++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/MicroEngineTaskManager.java
@@ -29,8 +29,8 @@ import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.util.Util;
 import com.raytheon.uf.common.util.FileUtil;
@@ -47,6 +47,7 @@ import com.raytheon.uf.edex.core.EDEXUtil;
  * -----------      ----------      ------------        --------------------------
  * Apr 2, 2007                      njensen             Initial Creation
  * Jul 10, 2014     2914            garmendariz         Remove EnvProperties
+ * Dec 10, 2015     5166            kbisanz             Update logging to use SLF4J
  * </PRE>
  * 
  */
@@ -54,8 +55,8 @@ public class MicroEngineTaskManager {
     /**
      * the logger.
      */
-    private static final Log theLogger = LogFactory
-            .getLog(MicroEngineTaskManager.class);
+    private static final Logger theLogger = LoggerFactory
+            .getLogger(MicroEngineTaskManager.class);
 
     /**
      * name of the base class for uEngine tasks.
diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/jep/JepFactory.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/jep/JepFactory.java
index 497a6e5543..3f7a58eeef 100644
--- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/jep/JepFactory.java
+++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/jep/JepFactory.java
@@ -24,12 +24,12 @@ import jep.Jep;
 import jep.JepException;
 import jep.NamingConventionClassEnquirer;
 
-import org.apache.commons.pool.KeyedPoolableObjectFactory;
+import org.apache.commons.pool2.BaseKeyedPooledObjectFactory;
+import org.apache.commons.pool2.PooledObject;
+import org.apache.commons.pool2.impl.DefaultPooledObject;
 
-import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.python.PyUtil;
+import com.raytheon.uf.common.python.PythonIncludePathUtil;
 
 /**
  * Pooling factory for jep instances for python uEngine scripts
@@ -40,6 +40,7 @@ import com.raytheon.uf.common.python.PyUtil;
  * ------------	----------	-----------	--------------------------
  * Apr 15, 2008             njensen     Initial creation
  * Apr 26, 2015  4259       njensen     Updated for new JEP API
+ * Oct 22, 2015  5004       dgilling    Use new commons-pool2 API.
  * 
  * </pre>
  * 
@@ -47,95 +48,34 @@ import com.raytheon.uf.common.python.PyUtil;
  * @version 1.0
  */
 
-public class JepFactory implements KeyedPoolableObjectFactory {
+public class JepFactory extends BaseKeyedPooledObjectFactory<Long, Jep> {
 
-    private static String includePath;
+    private static final String includePath = PyUtil.buildJepIncludePath(
+            PythonIncludePathUtil.getCommonPythonIncludePath(),
+            PythonIncludePathUtil.getEdexPythonIncludePath());
 
-    static {
-        IPathManager pathMgr = PathManagerFactory.getPathManager();
-
-        LocalizationContext edexStaticBase = pathMgr.getContext(
-                LocalizationContext.LocalizationType.EDEX_STATIC,
-                LocalizationContext.LocalizationLevel.BASE);
-        LocalizationContext commonStaticBase = pathMgr.getContext(
-                LocalizationContext.LocalizationType.COMMON_STATIC,
-                LocalizationContext.LocalizationLevel.BASE);
-
-        String edexPython = pathMgr.getFile(edexStaticBase, "python").getPath();
-        String commonPython = pathMgr.getFile(commonStaticBase, "python")
-                .getPath();
-        includePath = PyUtil.buildJepIncludePath(commonPython, edexPython);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.commons.pool.PoolableObjectFactory#activateObject(java.lang
-     * .Object)
-     */
     @Override
-    public void activateObject(Object key, Object obj) throws Exception {
-        // TODO Auto-generated method stub
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.commons.pool.PoolableObjectFactory#destroyObject(java.lang
-     * .Object)
-     */
-    @Override
-    public void destroyObject(Object key, Object obj) throws Exception {
-        Jep jep = (Jep) obj;
-        jep.close();
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.commons.pool.PoolableObjectFactory#makeObject()
-     */
-    @Override
-    public Object makeObject(Object key) throws Exception {
-        Jep jep = null;
+    public Jep create(Long arg0) throws Exception {
         try {
-            jep = new Jep(false, includePath,
+            Jep jep = new Jep(false, includePath,
                     JepFactory.class.getClassLoader(),
                     new NamingConventionClassEnquirer());
             // this enables easy import of java classes in the python script
             jep.eval("import CatalogQuery");
+            return jep;
         } catch (JepException e) {
             throw new Exception("Error instantiating jep", e);
         }
-        return jep;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.commons.pool.PoolableObjectFactory#passivateObject(java.lang
-     * .Object)
-     */
     @Override
-    public void passivateObject(Object key, Object obj) throws Exception {
-        // TODO Auto-generated method stub
-
+    public PooledObject<Jep> wrap(Jep arg0) {
+        return new DefaultPooledObject<Jep>(arg0);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * org.apache.commons.pool.PoolableObjectFactory#validateObject(java.lang
-     * .Object)
-     */
     @Override
-    public boolean validateObject(Object key, Object obj) {
-        return true;
+    public void destroyObject(Long key, PooledObject<Jep> p) throws Exception {
+        Jep jep = p.getObject();
+        jep.close();
     }
-
 }
diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/jep/JepPool.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/jep/JepPool.java
deleted file mode 100644
index da21048ed0..0000000000
--- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/jep/JepPool.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-
-package com.raytheon.edex.uengine.jep;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.commons.pool.impl.GenericKeyedObjectPool;
-
-/**
- * Pool for jep instances where the key is the thread that instantiated the jep
- * instance
- * 
- * <pre>
- * SOFTWARE HISTORY
- * Date			Ticket#		Engineer	Description
- * ------------	----------	-----------	--------------------------
- * Apr 15, 2008				njensen	Initial creation
- * 
- * </pre>
- * 
- * @author njensen
- * @version 1.0
- */
-
-public class JepPool extends GenericKeyedObjectPool {
-
-    /** The logger */
-    private transient Log logger = LogFactory.getLog(getClass());
-
-    public JepPool(JepFactory jepFactory) {
-        super(jepFactory);
-    }
-
-    @Override
-    public Object borrowObject(Object key) {
-        Object retVal = null;
-        try {
-            retVal = super.borrowObject(key);
-        } catch (Exception e) {
-            logger.error("Unable to borrow Jep instance from pool for key: "
-                    + key, e);
-        }
-        return retVal;
-    }
-
-    @Override
-    public void returnObject(Object key, Object borrowed) {
-        try {
-            if (borrowed != null && key != null) {
-                super.returnObject(key, borrowed);
-            }
-        } catch (Exception e) {
-            logger.error("Unable to return Jep instance to pool for key: "
-                    + key, e);
-        }
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/AMicroEngine.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/AMicroEngine.java
index 9e29ee8d78..339424cddc 100644
--- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/AMicroEngine.java
+++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/AMicroEngine.java
@@ -21,52 +21,57 @@ package com.raytheon.edex.uengine.runners;
 
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.uengine.exception.MicroEngineException;
 import com.raytheon.uf.common.message.response.AbstractResponseMessage;
 
 /**
- * Base class for &mu;Engine script runners. Provides default implementations
- * of IMicroEngine's {@link #setScript(String)}, {@link #executeScript(String)},
+ * Base class for &mu;Engine script runners. Provides default implementations of
+ * IMicroEngine's {@link #setScript(String)}, {@link #executeScript(String)},
  * and {@link #getResult()} methods. It also provides the script and results
- * fields and the logger instance. As implemented here, {@link #setScript(String)}
- * and {@link #getResult()} are Bean style accessors; {@link #executeScript(String)}
- * and {@link #initialize(String)} call the appropriate methods. {@link #initialize()}
- * and {@link #release()} provide safe, no-op implementations. All other methods
- * are abstract and must be implemented.
+ * fields and the logger instance. As implemented here,
+ * {@link #setScript(String)} and {@link #getResult()} are Bean style accessors;
+ * {@link #executeScript(String)} and {@link #initialize(String)} call the
+ * appropriate methods. {@link #initialize()} and {@link #release()} provide
+ * safe, no-op implementations. All other methods are abstract and must be
+ * implemented.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 12Nov2008    1709       MW Fegan    Initial Creation.
  * 25May2011    8686       cjeanbap    Add getter/setter for Triggers.
+ * 12Dec2015    5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
- *
+ * 
  * @author mfegan
- * @version 1.0	
+ * @version 1.0
  */
 
 public abstract class AMicroEngine implements IMicroEngine {
     /**
      * Logger instance for system logging.
      */
-    protected transient Log logger = LogFactory.getLog(getClass());
+    protected transient Logger logger = LoggerFactory.getLogger(getClass());
+
     /**
      * The script to run.
      */
     protected String script = null;
+
     /**
      * Holds the results from running the &mu;Engine script.
      */
     protected List<AbstractResponseMessage> result = null;
-    
+
     protected String trigger = null;
+
     /**
      * Constructor.
      */
@@ -74,21 +79,27 @@ public abstract class AMicroEngine implements IMicroEngine {
         super();
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see com.raytheon.edex.uengine.runners.IMicroEngine#execute()
      */
     @Override
     public abstract void execute() throws MicroEngineException;
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see com.raytheon.edex.uengine.runners.IMicroEngine#initialize()
      */
     @Override
     public void initialize() throws MicroEngineException {
         // the default is to do no initialization
     }
-    
-    /* (non-Javadoc)
+
+    /*
+     * (non-Javadoc)
+     * 
      * @see com.raytheon.edex.uengine.runners.IMicroEngine#release()
      */
     @Override
@@ -96,8 +107,12 @@ public abstract class AMicroEngine implements IMicroEngine {
         // the default is to not release any resources
     }
 
-    /* (non-Javadoc)
-     * @see com.raytheon.edex.uengine.runners.IMicroEngine#executeScript(java.lang.String)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * com.raytheon.edex.uengine.runners.IMicroEngine#executeScript(java.lang
+     * .String)
      */
     @Override
     public List<AbstractResponseMessage> executeScript(String script)
@@ -112,7 +127,9 @@ public abstract class AMicroEngine implements IMicroEngine {
         }
     }
 
-    /* (non-Javadoc)
+    /*
+     * (non-Javadoc)
+     * 
      * @see com.raytheon.edex.uengine.runners.IMicroEngine#getResult()
      */
     @Override
@@ -122,7 +139,10 @@ public abstract class AMicroEngine implements IMicroEngine {
 
     /*
      * (non-Javadoc)
-     * @see com.raytheon.edex.uengine.runners.IMicroEngine#initialize(java.lang.String)
+     * 
+     * @see
+     * com.raytheon.edex.uengine.runners.IMicroEngine#initialize(java.lang.String
+     * )
      */
     @Override
     public void initialize(String script) throws MicroEngineException {
@@ -130,8 +150,12 @@ public abstract class AMicroEngine implements IMicroEngine {
         initialize();
     }
 
-    /* (non-Javadoc)
-     * @see com.raytheon.edex.uengine.runners.IMicroEngine#setScript(java.lang.String)
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * com.raytheon.edex.uengine.runners.IMicroEngine#setScript(java.lang.String
+     * )
      */
     @Override
     public void setScript(String script) {
@@ -141,7 +165,7 @@ public abstract class AMicroEngine implements IMicroEngine {
     public void setTrigger(String trigger) {
         this.trigger = trigger;
     }
-    
+
     public String getTrigger() {
         return this.trigger;
     }
diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/PyMicroEngine.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/PyMicroEngine.java
index 54d1b91323..96a2c694bd 100644
--- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/PyMicroEngine.java
+++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/runners/PyMicroEngine.java
@@ -26,9 +26,11 @@ import java.util.regex.Pattern;
 
 import jep.Jep;
 
+import org.apache.commons.pool2.KeyedObjectPool;
+import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
+
 import com.raytheon.edex.uengine.exception.MicroEngineException;
 import com.raytheon.edex.uengine.jep.JepFactory;
-import com.raytheon.edex.uengine.jep.JepPool;
 import com.raytheon.uf.common.message.response.AbstractResponseMessage;
 import com.raytheon.uf.common.message.response.ResponseMessageError;
 
@@ -41,6 +43,7 @@ import com.raytheon.uf.common.message.response.ResponseMessageError;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 13Nov2008    1709       MW Fegan    Initial creation.
+ * 22Oct2015    5004       dgilling    Use new commons-pool2 API.
  * 
  * </pre>
  * 
@@ -52,10 +55,8 @@ public class PyMicroEngine extends AMicroEngine {
     /**
      * The JEPP pool used to obtain JEPP instances.
      */
-    private static JepPool pool;
-    static {
-        pool = new JepPool(new JepFactory());
-    }
+    private static KeyedObjectPool<Long, Jep> pool = new GenericKeyedObjectPool<>(
+            new JepFactory());
 
     /**
      * The JEPP instance used to execute the script.
@@ -99,12 +100,13 @@ public class PyMicroEngine extends AMicroEngine {
      */
     @Override
     public void initialize() throws MicroEngineException {
-        this.id = Thread.currentThread().getId();
-        this.jep = (Jep) pool.borrowObject(id);
-        if (this.jep == null) {
+        try {
+            this.id = Thread.currentThread().getId();
+            this.jep = pool.borrowObject(id);
+        } catch (Exception e) {
             throw new MicroEngineException(
                     "Unable to initialize uEngine script runner, "
-                            + "unable to obtain JEPP object from pool");
+                            + "unable to obtain JEPP object from pool", e);
         }
     }
 
@@ -115,13 +117,18 @@ public class PyMicroEngine extends AMicroEngine {
      */
     @Override
     public void release() throws MicroEngineException {
-        pool.returnObject(this.id, this.jep);
+        try {
+            pool.returnObject(this.id, this.jep);
+        } catch (Exception e) {
+            throw new MicroEngineException(
+                    "Unable to release uEngine script runner.", e);
+        }
     }
 
     /**
      * Converts the result of executing the script into a <code>
-     * List<AbstractResponseMessage></code>
-     * . Ensures that unexpected results are wrapped correctly.
+     * List<AbstractResponseMessage></code> . Ensures that unexpected results
+     * are wrapped correctly.
      * 
      * @param result
      *            the script result to convert.
@@ -174,8 +181,8 @@ public class PyMicroEngine extends AMicroEngine {
             if (matcher.find()) {
                 wrapper = wrapper.substring(0, wrapper.indexOf("'''"))
                         + matcher.group().replaceAll("\n    ", "\n")
-                        + wrapper.substring(wrapper.indexOf("'''", wrapper
-                                .indexOf("'''") + 3) + 3);
+                        + wrapper.substring(wrapper.indexOf("'''",
+                                wrapper.indexOf("'''") + 3) + 3);
             }
         }
         return wrapper;
diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/ScriptTask.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/ScriptTask.java
index dbe0bf3f43..904e7abd19 100644
--- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/ScriptTask.java
+++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/ScriptTask.java
@@ -20,8 +20,8 @@
 
 package com.raytheon.edex.uengine.tasks;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Abstract class for tasks to be executed from the JavaScript uEngine.
@@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFactory;
  * Date             PR#             Engineer            Description
  * -----------      ----------      ------------        --------------------------
  * Mar 27, 2007                     njensen             Initial Creation
+ * Dec 10, 2015     5166            kbisanz             Update logging to use SLF4J
  * 
  * </PRE>
  * 
@@ -38,7 +39,8 @@ import org.apache.commons.logging.LogFactory;
 @Deprecated
 public abstract class ScriptTask {
     /** The logger */
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     /**
      * Performs the process the task was designed to complete.
diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/catalog/CatalogSearcher.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/catalog/CatalogSearcher.java
index 092f7c097f..0a8c8fb141 100644
--- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/catalog/CatalogSearcher.java
+++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/catalog/CatalogSearcher.java
@@ -23,9 +23,9 @@ package com.raytheon.edex.uengine.tasks.catalog;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.metadata.ClassMetadata;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
 import com.raytheon.uf.common.message.CatalogAttribute;
@@ -42,15 +42,17 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
  * 
  * 
  * <pre>
- *    
+ * 
  *     SOFTWARE HISTORY
  *    
  *     Date         Ticket#     Engineer    Description
  *     ------------ ----------  ----------- --------------------------
  *     Nov 13, 2006             chammack    Initial Creation.
- *     Feb 19, 2007				garmendariz	Modified to use database instead of Lucene
+ *     Feb 19, 2007             garmendariz Modified to use database instead of Lucene
  *     Dec 12, 2007
- *     
+ *     Dec 10, 2015 5166        kbisanz     Update logging to use SLF4J and
+ *                                          fixed warnings
+ * 
  * </pre>
  * 
  * @author chammack
@@ -59,8 +61,8 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
 public class CatalogSearcher {
 
     /** The logger */
-    protected final transient static Log logger = LogFactory
-            .getLog(CatalogSearcher.class);
+    protected final transient static Logger logger = LoggerFactory
+            .getLogger(CatalogSearcher.class);
 
     public static final String TYPE_DISTINCT_VALUE = "distinctValue";
 
@@ -96,7 +98,6 @@ public class CatalogSearcher {
      * @return the response
      * @throws EdexException
      */
-    @SuppressWarnings("unchecked")
     public static ResponseMessageCatalog search(DatabaseQuery query,
             String dbName, String queryClass) throws EdexException {
         ResponseMessageCatalog rmc = new ResponseMessageCatalog();
@@ -160,8 +161,6 @@ public class CatalogSearcher {
     public static ResponseMessageCatalog search(DatabaseQuery query)
             throws EdexException {
         ResponseMessageCatalog rmc = null;
-        List<?> queryResults = null;
-        CoreDao dao = null;
 
         return rmc;
 
@@ -217,7 +216,7 @@ public class CatalogSearcher {
     // break;
     // }
     // }
-    //            
+    //
     //
     // if (uniqueValues) {
     // queryResults = dataDao.queryByCriteria(fields, values,
@@ -295,8 +294,8 @@ public class CatalogSearcher {
     // throw new EdexException("Unable to instantiate class ["
     // + dataDao.getDaoClass() + "]");
     // }
-    //               
-    //                
+    //
+    //
     // GregorianCalendar cal = null;
     // for (int i = 0; i < queryResults.size(); i++) {
     //
diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/query/LatestTimeQuery.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/query/LatestTimeQuery.java
index 2ad2804bd4..670e211175 100644
--- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/query/LatestTimeQuery.java
+++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/tasks/query/LatestTimeQuery.java
@@ -31,9 +31,9 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.hibernate.StatelessSession;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.uengine.tasks.ScriptTask;
 import com.raytheon.uf.common.message.CatalogAttribute;
@@ -51,6 +51,7 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * ------------ ---------- ----------- --------------------------
  * 01/08/2008              randerso    Initial creation
  * 08/20/2009   2586       rjpeter     Optimized query and ensured single bad uri will not break entire list.
+ * 12/10/2015   5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author randerso
@@ -66,7 +67,7 @@ public class LatestTimeQuery extends ScriptTask {
 
     private static final Pattern tableDelimiter = Pattern.compile("/");
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private String uriList;
 
diff --git a/edexOsgi/com.raytheon.edex.uengine/utility/edex_static/base/util/scriptLauncher b/edexOsgi/com.raytheon.edex.uengine/utility/edex_static/base/util/scriptLauncher
deleted file mode 100644
index daf4358a26..0000000000
--- a/edexOsgi/com.raytheon.edex.uengine/utility/edex_static/base/util/scriptLauncher
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "$@" >&/dev/null </dev/null &
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java b/edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
index 6615fe44bf..3b19a06c78 100644
--- a/edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
+++ b/edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
@@ -54,15 +54,14 @@ import com.raytheon.uf.common.archive.config.ArchiveConstants.Type;
 import com.raytheon.uf.common.archive.config.select.ArchiveSelect;
 import com.raytheon.uf.common.archive.config.select.CategorySelect;
 import com.raytheon.uf.common.archive.exception.ArchiveException;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -100,6 +99,8 @@ import com.raytheon.uf.common.util.FileUtil;
  * Feb 24, 2015 3978       njensen     Changed to use abstract InputStream
  * Jun 29, 2015 4583       rferrel     Log detail error message when archive configuration is invalid.
  * Aug 18, 2015 3806       njensen     Use SaveableOutputStream to save
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Jan 12, 2016 5244       njensen     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -107,6 +108,7 @@ import com.raytheon.uf.common.util.FileUtil;
  * @version 1.0
  */
 public class ArchiveConfigManager {
+
     private final IUFStatusHandler statusHandler = UFStatus
             .getHandler(ArchiveConfigManager.class);
 
@@ -119,7 +121,7 @@ public class ArchiveConfigManager {
     /** Localization manager. */
     protected final IPathManager pathMgr;
 
-    private final Map<String, LocalizationFile> archiveNameToLocalizationFileMap = new HashMap<String, LocalizationFile>();
+    private final Map<String, ILocalizationFile> archiveNameToLocalizationFileMap = new HashMap<>();
 
     /** Mapping of archive configuration data keyed to the name. */
     private final Map<String, ArchiveConfig> archiveMap = new HashMap<String, ArchiveConfig>();
@@ -146,8 +148,8 @@ public class ArchiveConfigManager {
      * 
      * @return archiveConfigList
      */
-    private LocalizationFile[] getArchiveConfigFiles() {
-        LocalizationFile[] files = pathMgr.listStaticFiles(ARCHIVE_DIR,
+    private ILocalizationFile[] getArchiveConfigFiles() {
+        ILocalizationFile[] files = pathMgr.listStaticFiles(ARCHIVE_DIR,
                 new String[] { ".xml" }, false, true);
         return files;
     }
@@ -327,7 +329,7 @@ public class ArchiveConfigManager {
      * @param lFile
      * @param archiveConfig
      */
-    public void saveArchiveConfig(LocalizationFile lFile,
+    public void saveArchiveConfig(ILocalizationFile lFile,
             ArchiveConfig archiveConfig) {
         try {
             marshalArchiveConfigToXmlFile(archiveConfig, lFile);
@@ -343,8 +345,8 @@ public class ArchiveConfigManager {
     public void reset() {
         archiveMap.clear();
         archiveNameToLocalizationFileMap.clear();
-        LocalizationFile[] files = getArchiveConfigFiles();
-        for (LocalizationFile lFile : files) {
+        ILocalizationFile[] files = getArchiveConfigFiles();
+        for (ILocalizationFile lFile : files) {
             try {
                 ArchiveConfig archiveConfig = unmarshalArhiveConfigFromXmlFile(lFile);
                 if ((archiveConfig != null) && archiveConfig.isValid()) {
@@ -354,7 +356,7 @@ public class ArchiveConfigManager {
                 } else {
                     StringBuilder sb = new StringBuilder(
                             "Bad Archive configuration file: ");
-                    sb.append(lFile.getFile().getName());
+                    sb.append(lFile.getPath());
                     if (archiveConfig != null) {
                         sb.append(archiveConfig.createErrorMsg());
                     }
@@ -363,11 +365,9 @@ public class ArchiveConfigManager {
             } catch (DataBindingException ex) {
                 statusHandler.handle(Priority.ERROR,
                         "Bad Archive configuration file \""
-                                + lFile.getFile().getName() + "\": ", ex);
-            } catch (IOException e) {
-                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
-                        e);
-            } catch (LocalizationException e) {
+ + lFile.getPath()
+                                + "\": ", ex);
+            } catch (IOException | LocalizationException e) {
                 statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
                         e);
             }
@@ -382,12 +382,12 @@ public class ArchiveConfigManager {
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
         for (String archiveName : archiveMap.keySet()) {
             ArchiveConfig archiveConfig = archiveMap.get(archiveName);
-            LocalizationFile lFile = archiveNameToLocalizationFileMap
+            ILocalizationFile lFile = archiveNameToLocalizationFileMap
                     .get(archiveName);
             if (lFile.getContext().getLocalizationLevel() != LocalizationLevel.SITE) {
                 // Modify the site not the base file.
-                LocalizationFile tlFile = pathMgr.getLocalizationFile(
-                        siteContext, lFile.getName());
+                ILocalizationFile tlFile = pathMgr.getLocalizationFile(
+                        siteContext, lFile.getPath());
                 lFile = tlFile;
             }
             saveArchiveConfig(lFile, archiveConfig);
@@ -891,7 +891,7 @@ public class ArchiveConfigManager {
      * @throws LocalizationException
      */
     private void marshalArchiveConfigToXmlFile(ArchiveConfig archiveConfig,
-            LocalizationFile lFile) throws IOException, LocalizationException {
+            ILocalizationFile lFile) throws IOException, LocalizationException {
         try (SaveableOutputStream sos = lFile.openOutputStream()) {
             JAXB.marshal(archiveConfig, sos);
             sos.save();
@@ -908,7 +908,7 @@ public class ArchiveConfigManager {
      * @throws LocalizationException
      */
     private ArchiveConfig unmarshalArhiveConfigFromXmlFile(
-            LocalizationFile lFile) throws IOException, LocalizationException,
+            ILocalizationFile lFile) throws IOException, LocalizationException,
             DataBindingException {
         ArchiveConfig archiveConfig = null;
         try (InputStream stream = lFile.openInputStream()) {
@@ -921,13 +921,12 @@ public class ArchiveConfigManager {
      * Delete the selection localized site configuration file.
      * 
      * @param fileName
-     * @throws LocalizationOpFailedException
+     * @throws LocalizationException
      */
-    public void deleteSelection(String fileName)
-            throws LocalizationOpFailedException {
+    public void deleteSelection(String fileName) throws LocalizationException {
         LocalizationContext siteContext = pathMgr.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-        LocalizationFile lFile = pathMgr.getLocalizationFile(siteContext,
+        ILocalizationFile lFile = pathMgr.getLocalizationFile(siteContext,
                 ARCHIVE_DIR + "/" + fileName);
         lFile.delete();
     }
@@ -942,15 +941,12 @@ public class ArchiveConfigManager {
         SelectConfig selections = null;
         LocalizationContext siteContext = pathMgr.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-        LocalizationFile lFile = pathMgr.getLocalizationFile(siteContext,
+        ILocalizationFile lFile = pathMgr.getLocalizationFile(siteContext,
                 ARCHIVE_DIR + "/" + fileName);
         if (lFile.exists()) {
             try (InputStream stream = lFile.openInputStream()) {
                 selections = unmarshallSelectionStream(stream);
-            } catch (LocalizationException e) {
-                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
-                        e);
-            } catch (IOException e) {
+            } catch (LocalizationException | IOException e) {
                 statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
                         e);
             }
@@ -995,16 +991,16 @@ public class ArchiveConfigManager {
      * @return selectNames
      */
     public String[] getSelectionNames(ArchiveConstants.Type type) {
-        LocalizationFile[] files = pathMgr.listStaticFiles(ARCHIVE_DIR
+        ILocalizationFile[] files = pathMgr.listStaticFiles(ARCHIVE_DIR
                 + IPathManager.SEPARATOR + type.selectionDir,
                 new String[] { ArchiveConstants.configFileExt }, false, true);
         String[] names = new String[files.length];
         int extLen = ArchiveConstants.configFileExt.length();
         int i = 0;
         StringBuilder sb = new StringBuilder();
-        for (LocalizationFile lFile : files) {
+        for (ILocalizationFile lFile : files) {
             sb.setLength(0);
-            sb.append(lFile.getName());
+            sb.append(lFile.getPath());
             sb.setLength(sb.length() - extLen);
             names[i] = sb.substring(sb.lastIndexOf(IPathManager.SEPARATOR) + 1);
             ++i;
@@ -1025,7 +1021,7 @@ public class ArchiveConfigManager {
             throws LocalizationException, IOException {
         LocalizationContext siteContext = pathMgr.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-        LocalizationFile lFile = pathMgr.getLocalizationFile(siteContext,
+        ILocalizationFile lFile = pathMgr.getLocalizationFile(siteContext,
                 ARCHIVE_DIR + IPathManager.SEPARATOR + fileName);
 
         try (SaveableOutputStream sos = lFile.openOutputStream()) {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosData.java
index 2f63e28033..0b3aacc72a 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosData.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosData.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -55,7 +55,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * May 14, 2013 1869       bsteffen    Remove DataURI column from bufrmos.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * Nov 04, 2013 2361       njensen     Remove XML annotations
- * Jul 22, 1015 4360       rferrel     Make location not nullable.
+ * Jul 22, 2015 4360       rferrel     Make location not nullable.
+ * Feb 09, 2016 5283       nabowle     Remove NGM MOS support.
  * 
  * </pre>
  * 
@@ -70,7 +71,7 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
         IPersistable, IPointData {
 
     public static enum MOSType {
-        ETA, GFS, AVN, LAMP, HPC, MRF, NGM
+        ETA, GFS, AVN, LAMP, HPC, MRF
     };
 
     private static final long serialVersionUID = 1L;
@@ -101,7 +102,7 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
     /**
      * Constructor for DataURI construction through base class. This is used by
      * the notification service.
-     * 
+     *
      * @param uri
      *            A data uri applicable to this class.
      * @param tableDef
@@ -113,7 +114,7 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
 
     /**
      * Get the geometry latitude.
-     * 
+     *
      * @return The geometry latitude.
      */
     public double getLatitude() {
@@ -122,7 +123,7 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
 
     /**
      * Get the geometry longitude.
-     * 
+     *
      * @return The geometry longitude.
      */
     public double getLongitude() {
@@ -131,7 +132,7 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
 
     /**
      * Get the station identifier for this observation.
-     * 
+     *
      * @return the stationId
      */
     public String getStationId() {
@@ -159,7 +160,7 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
     }
 
     /**
-     * 
+     *
      * @param dataURI
      */
     @Override
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosDataLocation.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosDataLocation.java
index 05cacbb8ec..abd7d34ffa 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosDataLocation.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosDataLocation.java
@@ -21,12 +21,15 @@ package com.raytheon.uf.common.dataplugin.bufrmos.common;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
 
 import org.hibernate.annotations.Index;
 
+import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.annotations.NullFloat;
 import com.raytheon.uf.common.dataplugin.annotations.NullString;
@@ -50,6 +53,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Nov 04, 2013 2361       njensen     Remove XML annotations
  * Jul 22, 2015 4360       rferrel     Named unique constraint;
  *                                      stationid, latitude and longitude no longer nullable.
+ * Jan 12, 2016 4677       tgurney     Make id a sequence-generated field.
+ * Jan 19, 2016 4677       tgurney     Remove generateId method
  * 
  * </pre>
  * 
@@ -57,6 +62,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * @version 1.0
  */
 @Entity
+@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmos_locationseq", allocationSize = 1)
 @Table(name = "bufrmos_location", uniqueConstraints = { @UniqueConstraint(name = "uk_bufrmos_location_datauri_fields", columnNames = {
         "stationId", "latitude", "longitude" }) })
 @DynamicSerialize
@@ -64,8 +70,9 @@ public class BufrMosDataLocation extends PersistableDataObject {
     private static final long serialVersionUID = 1L;
 
     /** The id */
-    @Id
     @DynamicSerializeElement
+    @GeneratedValue(generator = PluginDataObject.ID_GEN)
+    @Id
     private Integer id;
 
     // Id of the station making this observation.
@@ -119,10 +126,6 @@ public class BufrMosDataLocation extends PersistableDataObject {
         this.stationId = stationId;
     }
 
-    public void generateId() {
-        this.id = hashCode();
-    }
-
     public Integer getId() {
         return id;
     }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosNgmData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosNgmData.java
deleted file mode 100644
index 832a393546..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmos/src/com/raytheon/uf/common/dataplugin/bufrmos/common/BufrMosNgmData.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.bufrmos.common;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import org.hibernate.annotations.Index;
-
-import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-
-/**
- * BUFR MOS NGM data.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * May 25, 2011            rjpeter     Initial creation
- * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
- * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
- * May 07, 2013 1869       bsteffen    Remove dataURI column from
- *                                     PluginDataObject.
- * Nov 04, 2013 2361       njensen     Remove XML annotations
- * Jul 17, 2015 4360       rferrel     Added name to unique constraint.
- * 
- * </pre>
- * 
- * @author rjpeter
- * @version 1.0
- */
-@Entity
-@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmosNgmseq")
-@Table(name = "bufrmosNgm", uniqueConstraints = { @UniqueConstraint(name = "uk_bufrmosNgm_datauri_fields", columnNames = { "dataURI" }) })
-/*
- * Both refTime and forecastTime are included in the refTimeIndex since
- * forecastTime is unlikely to be used.
- */
-@org.hibernate.annotations.Table(appliesTo = "bufrmosNgm", indexes = { @Index(name = "bufrmosngm_refTimeIndex", columnNames = {
-        "refTime", "forecastTime" }) })
-@DynamicSerialize
-public class BufrMosNgmData extends BufrMosData {
-    @Override
-    public MOSType getType() {
-        return MOSType.NGM;
-    }
-
-    @Override
-    @Column
-    @Access(AccessType.PROPERTY)
-    public String getDataURI() {
-        return super.getDataURI();
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/bufrncwf/BUFRncwf.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/bufrncwf/BUFRncwf.java
index 7975f12d57..e605eb41ce 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/bufrncwf/BUFRncwf.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/bufrncwf/BUFRncwf.java
@@ -19,9 +19,6 @@
  **/
 package com.raytheon.uf.common.dataplugin.bufrncwf;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
@@ -60,6 +57,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * Oct 15, 2013 2361       njensen     Remove XML annotations and IDecoderGettable
  * Jul 23, 2015 4360       rferrel     Add name to unique constraint.
+ * Feb 04, 2016 5310       tgurney     Drop dataURI column and update unique constraint.
  * 
  * </pre>
  * 
@@ -68,7 +66,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  */
 @Entity
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrncwfseq")
-@Table(name = "bufrncwf", uniqueConstraints = { @UniqueConstraint(name = "uk_bufrncwf_datauri_fields", columnNames = { "dataURI" }) })
+@Table(name = "bufrncwf", uniqueConstraints = { @UniqueConstraint(name = "uk_bufrncwf_datauri_fields", columnNames = {
+        "refTime", "latitude", "longitude", "stationId" }) })
 /*
  * Both refTime and forecastTime are included in the refTimeIndex since
  * forecastTime is unlikely to be used.
@@ -224,29 +223,16 @@ public class BUFRncwf extends PersistablePluginDataObject implements
         return location;
     }
 
-    /**
-     * 
-     */
     @Override
     public PointDataView getPointDataView() {
         return pointDataView;
     }
 
-    /**
-     * 
-     */
     @Override
     public void setPointDataView(PointDataView pointDataView) {
         this.pointDataView = pointDataView;
     }
 
-    @Override
-    @Column
-    @Access(AccessType.PROPERTY)
-    public String getDataURI() {
-        return super.getDataURI();
-    }
-
     @Override
     public String getPluginName() {
         return "bufrncwf";
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF
deleted file mode 100644
index 53d3cde7b9..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Bufrquikscat Plug-in
-Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrquikscat
-Bundle-Version: 1.12.1174.qualifier
-Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.raytheon.uf.common.dataplugin.bufrquikscat
-Require-Bundle: com.raytheon.uf.common.pointdata,
- javax.persistence,
- javax.measure,
- com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.serialization
-Import-Package: com.raytheon.uf.common.status
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/com.raytheon.uf.common.dataplugin.bufrquikscat.ecl b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/com.raytheon.uf.common.dataplugin.bufrquikscat.ecl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
deleted file mode 100644
index 4f00d227c3..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.bufrquikscat;
-
-import java.util.Calendar;
-
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.Column;
-import javax.persistence.Embedded;
-import javax.persistence.Entity;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-import javax.persistence.UniqueConstraint;
-
-import org.hibernate.annotations.Index;
-
-import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.annotations.DataURI;
-import com.raytheon.uf.common.dataplugin.persist.IPersistable;
-import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
-import com.raytheon.uf.common.geospatial.ISpatialEnabled;
-import com.raytheon.uf.common.geospatial.ISpatialObject;
-import com.raytheon.uf.common.pointdata.IPointData;
-import com.raytheon.uf.common.pointdata.PointDataView;
-import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-import com.vividsolutions.jts.geom.Geometry;
-
-/**
- * Observation from QUIKScat
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jun 18, 2009 2520       jkorman     Initial creation
- * Apr 04, 2013 1846       bkowal      Added an index on refTime and
- *                                     forecastTime
- * Apr 12, 2013 1857       bgonzale    Added SequenceGenerator annotation.
- * May 07, 2013 1869       bsteffen    Remove dataURI column from
- *                                     PluginDataObject.
- * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
- * Oct 14, 2013 2361       njensen     Removed XML annotations
- * Jul 23, 2015 2360       rferrel     Add name to unique constraint.
- * 
- * </pre>
- * 
- * @author jkorman
- * @version 1.0
- */
-@Entity
-@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrquikscatseq")
-@Table(name = "bufrquikscat", uniqueConstraints = { @UniqueConstraint(name = "uk_bufrquikscat_datauri_fields", columnNames = { "dataURI" }) })
-/*
- * Both refTime and forecastTime are included in the refTimeIndex since
- * forecastTime is unlikely to be used.
- */
-@org.hibernate.annotations.Table(appliesTo = "bufrquikscat", indexes = { @Index(name = "bufrquikscat_refTimeIndex", columnNames = {
-        "refTime", "forecastTime" }) })
-@DynamicSerialize
-public class QUIKScatObs extends PersistablePluginDataObject implements
-        ISpatialEnabled, IPointData, IPersistable {
-
-    private static final long serialVersionUID = 1L;
-
-    @Embedded
-    @DynamicSerializeElement
-    private PointDataView pointDataView;
-
-    @DataURI(position = 1)
-    @DynamicSerializeElement
-    private Integer satId;
-
-    @Embedded
-    @DataURI(position = 2, embedded = true)
-    @DynamicSerializeElement
-    private SurfaceObsLocation location;
-
-    // Text of the WMO header
-    @Column(length = 32)
-    @DynamicSerializeElement
-    private String wmoHeader;
-
-    @DynamicSerializeElement
-    @Transient
-    private Integer orbitNumber;
-
-    // The observation time.
-    @DynamicSerializeElement
-    @Transient
-    private Calendar timeObs;
-
-    @DynamicSerializeElement
-    @Transient
-    private Double windDir;
-
-    @DynamicSerializeElement
-    @Transient
-    private Double windSpd;
-
-    @DynamicSerializeElement
-    @Transient
-    private Double probRain;
-
-    @DynamicSerializeElement
-    @Transient
-    private Integer rainIndex;
-
-    /**
-     * Empty constructor.
-     */
-    public QUIKScatObs() {
-    }
-
-    /**
-     * Constructor for DataURI construction through base class. This is used by
-     * the notification service.
-     * 
-     * @param uri
-     *            A data uri applicable to this class.
-     * @param tableDef
-     *            The table definitions for this class.
-     */
-    public QUIKScatObs(String uri) {
-        super(uri);
-    }
-
-    /**
-     * Get this observation's geometry.
-     * 
-     * @return The geometry for this observation.
-     */
-    public Geometry getGeometry() {
-        return location.getGeometry();
-    }
-
-    /**
-     * Get the geometry latitude.
-     * 
-     * @return The geometry latitude.
-     */
-    public double getLatitude() {
-        return location.getLatitude();
-    }
-
-    /**
-     * Get the geometry longitude.
-     * 
-     * @return The geometry longitude.
-     */
-    public double getLongitude() {
-        return location.getLongitude();
-    }
-
-    /**
-     * Get the elevation, in meters, of the observing platform or location.
-     * 
-     * @return The observation elevation, in meters.
-     */
-    public Integer getElevation() {
-        return location.getElevation();
-    }
-
-    /**
-     * Was this location defined from the station catalog? False if not.
-     * 
-     * @return Was this location defined from the station catalog?
-     */
-    public Boolean getLocationDefined() {
-        return location.getLocationDefined();
-    }
-
-    /**
-     * @return the location
-     */
-    public SurfaceObsLocation getLocation() {
-        return location;
-    }
-
-    /**
-     * @param location
-     *            the location to set
-     */
-    public void setLocation(SurfaceObsLocation location) {
-        this.location = location;
-    }
-
-    /**
-     * @return the satId
-     */
-    public Integer getSatId() {
-        return satId;
-    }
-
-    /**
-     * @param satId
-     *            the satId to set
-     */
-    public void setSatId(Integer satId) {
-        this.satId = satId;
-    }
-
-    /**
-     * @return the orbitNumber
-     */
-    public Integer getOrbitNumber() {
-        return orbitNumber;
-    }
-
-    /**
-     * @param orbitNumber
-     *            the orbitNumber to set
-     */
-    public void setOrbitNumber(Integer orbitNumber) {
-        this.orbitNumber = orbitNumber;
-    }
-
-    /**
-     * @return the wmoHeader
-     */
-    public String getWmoHeader() {
-        return wmoHeader;
-    }
-
-    /**
-     * @param wmoHeader
-     *            the wmoHeader to set
-     */
-    public void setWmoHeader(String wmoHeader) {
-        this.wmoHeader = wmoHeader;
-    }
-
-    /**
-     * @return the windDir
-     */
-    public Double getWindDir() {
-        return windDir;
-    }
-
-    /**
-     * @param windDir
-     *            the windDir to set
-     */
-    public void setWindDir(Double windDir) {
-        this.windDir = windDir;
-    }
-
-    /**
-     * @return the windSpd
-     */
-    public Double getWindSpd() {
-        return windSpd;
-    }
-
-    /**
-     * @param windSpd
-     *            the windSpd to set
-     */
-    public void setWindSpd(Double windSpd) {
-        this.windSpd = windSpd;
-    }
-
-    /**
-     * @return the probRain
-     */
-    public Double getProbRain() {
-        return probRain;
-    }
-
-    /**
-     * @param probRain
-     *            the probRain to set
-     */
-    public void setProbRain(Double probRain) {
-        this.probRain = probRain;
-    }
-
-    /**
-     * @return the rainIndex
-     */
-    public Integer getRainIndex() {
-        return rainIndex;
-    }
-
-    /**
-     * @param rainIndex
-     *            the rainIndex to set
-     */
-    public void setRainIndex(Integer rainIndex) {
-        this.rainIndex = rainIndex;
-    }
-
-    /**
-     * Get the observation time for this data.
-     * 
-     * @return The data observation time.
-     */
-    public Calendar getTimeObs() {
-        return timeObs;
-    }
-
-    /**
-     * Set the observation time for this data.
-     * 
-     * @param timeObs
-     *            The data observation time.
-     */
-    public void setTimeObs(Calendar timeObs) {
-        this.timeObs = timeObs;
-    }
-
-    @Override
-    public ISpatialObject getSpatialObject() {
-        return location;
-    }
-
-    /**
-     * 
-     */
-    @Override
-    public PointDataView getPointDataView() {
-        return pointDataView;
-    }
-
-    /**
-     * 
-     */
-    @Override
-    public void setPointDataView(PointDataView pointDataView) {
-        this.pointDataView = pointDataView;
-    }
-
-    @Override
-    @Column
-    @Access(AccessType.PROPERTY)
-    public String getDataURI() {
-        return super.getDataURI();
-    }
-
-    @Override
-    public String getPluginName() {
-        return "bufrquikscat";
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
index 05d03a36a6..04d851541a 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java
@@ -19,8 +19,6 @@
  **/
 package com.raytheon.uf.common.dataplugin.bufrsigwx;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -60,6 +58,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * Oct 14, 2013 2361       njensen     Removed XML annotations and IDecoderGettable
  * Jul 23, 2015 2360       rferrel     Add name to unique constraint.
+ * Feb 04, 2015 5309       tgurney     Drop dataURI column and update unique constraint.
  * 
  * </pre>
  * 
@@ -68,7 +67,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  */
 @Entity
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrsigwxseq")
-@Table(name = "bufrsigwx", uniqueConstraints = { @UniqueConstraint(name = "uk_bufrsigwx_datauri_fields", columnNames = { "dataURI" }) })
+@Table(name = "bufrsigwx", uniqueConstraints = { @UniqueConstraint(name = "uk_bufrsigwx_datauri_fields", columnNames = {
+        "refTime", "wxLayer", "wxType", "key" }) })
 /*
  * Both refTime and forecastTime are included in the refTimeIndex since
  * forecastTime is unlikely to be used.
@@ -81,17 +81,17 @@ public class SigWxData extends PersistablePluginDataObject implements
 
     private static final long serialVersionUID = 1L;
 
-    @Column
+    @Column(nullable = false)
     @DataURI(position = 1)
     @DynamicSerializeElement
     private SigWxLayer wxLayer;
 
-    @Column
+    @Column(nullable = false)
     @DataURI(position = 2)
     @DynamicSerializeElement
     private SigWxType wxType;
 
-    @Column
+    @Column(nullable = false)
     @DataURI(position = 3)
     @DynamicSerializeElement
     private Integer key;
@@ -275,13 +275,6 @@ public class SigWxData extends PersistablePluginDataObject implements
         return obs;
     }
 
-    @Override
-    @Column
-    @Access(AccessType.PROPERTY)
-    public String getDataURI() {
-        return super.getDataURI();
-    }
-
     @Override
     public String getPluginName() {
         return "bufrsigwx";
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
index 65a12b3b25..6d90e6a124 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java
@@ -21,8 +21,6 @@ package com.raytheon.uf.common.dataplugin.cwa;
 
 import java.util.Calendar;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -61,6 +59,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Oct 15, 2013 2361       njensen     Removed XML annotations
  * Feb 27, 2014 2638       njensen     Corrected dataURI annotation for eventId
  * Jul 23, 2015 2360       rferrel     Add name to unique constraint.
+ * Jan 25, 2016 5254       tgurney     Remove dataURI column and update unique
+ *                                     constraint.
  * 
  * </pre>
  * 
@@ -69,7 +69,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  */
 @Entity
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "cwaseq")
-@Table(name = "cwa", uniqueConstraints = { @UniqueConstraint(name = "uk_cwa_datauri_fields", columnNames = { "dataURI" }) })
+@Table(name = "cwa", uniqueConstraints = { @UniqueConstraint(name = "uk_cwa_datauri_fields", columnNames = {
+        "refTime", "eventId" }) })
 /*
  * Both refTime and forecastTime are included in the refTimeIndex since
  * forecastTime is unlikely to be used.
@@ -96,6 +97,7 @@ public class CWARecord extends PersistablePluginDataObject implements
     private CWADimension dimension;
 
     @DataURI(position = 1)
+    @Column(nullable = false)
     @DynamicSerializeElement
     private String eventId;
 
@@ -139,17 +141,6 @@ public class CWARecord extends PersistablePluginDataObject implements
         this.eventId = eventId;
     }
 
-    /**
-     * Set the data uri for this observation.
-     * 
-     * @param dataURI
-     */
-    @Override
-    public void setDataURI(String dataURI) {
-        super.setDataURI(dataURI);
-        identifier = dataURI;
-    }
-
     public String getText() {
         return text;
     }
@@ -181,13 +172,6 @@ public class CWARecord extends PersistablePluginDataObject implements
         return sb.toString();
     }
 
-    @Override
-    @Column
-    @Access(AccessType.PROPERTY)
-    public String getDataURI() {
-        return super.getDataURI();
-    }
-
     @Override
     public String getPluginName() {
         return "cwa";
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/META-INF/MANIFEST.MF
index 841535b801..98df745783 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: FFMP common Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.ffmp
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.16.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.raytheon.uf.common.dataplugin.ffmp,
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
index 6571c56940..5d5e0472b8 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
@@ -32,6 +32,7 @@ import com.raytheon.uf.common.dataplugin.ffmp.collections.ArrayBackedMap;
 import com.raytheon.uf.common.dataplugin.ffmp.collections.BasinMapFactory;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
+import com.raytheon.uf.common.time.util.TimeUtil;
 
 /**
  * FFMP basin/aggregated value holder
@@ -53,6 +54,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Aug 08, 2015 4722        dhladky     Dynamic serialize imp not needed.
  * Oct 10, 2015 4756        dhladky     Prevent null values from being inserted.
  * Oct 26, 2015 5056        dhladky     Better debugging info.
+ * Feb 11, 2016 5273        tjensen     Fixed getAccumValue not tracking latest time.
  * 
  * </pre>
  * 
@@ -70,12 +72,12 @@ public class FFMPBasin implements Cloneable {
     @DynamicSerializeElement
     protected boolean aggregated = false;
 
-    /** object used in calculations 
-     *  not serialized!
+    /**
+     * object used in calculations not serialized!
      **/
     @Transient
     protected NavigableMap<Date, Float> values;
-    
+
     /**
      * Set to either the values map or the BasinMapFactory that was used to
      * create it to enable correct synchronization.
@@ -93,6 +95,7 @@ public class FFMPBasin implements Cloneable {
 
     /**
      * Get the float array of serialized values
+     * 
      * @return
      */
     public float[] getSerializedValues() {
@@ -131,7 +134,7 @@ public class FFMPBasin implements Cloneable {
     public void setAggregated(boolean aggregated) {
         this.aggregated = aggregated;
     }
-    
+
     public boolean contains(Date date) {
         return values.containsKey(date);
     }
@@ -182,7 +185,7 @@ public class FFMPBasin implements Cloneable {
             long expirationTime, boolean rate) {
         float dvalue = 0.0f;
         Date prevDate = null;
-      
+
         // map ordered newest first, so grab from newest date to oldest date
         if (afterDate.before(beforeDate) && (!values.isEmpty())) {
 
@@ -191,7 +194,7 @@ public class FFMPBasin implements Cloneable {
                 float factor = 0.0f;
 
                 for (Entry<Date, Float> entry : values.subMap(beforeDate,
-                        false, afterDate, false).entrySet()) {
+                        false, afterDate, true).entrySet()) {
                     Date tdate = entry.getKey();
                     float val = entry.getValue();
 
@@ -201,25 +204,23 @@ public class FFMPBasin implements Cloneable {
                             prevDate = beforeDate;
                         }
 
-						if (val > 0.0f) {
-							
-							if ((prevDate.getTime() - tdate.getTime()) > expirationTime) {
-								// handle the gap and accumulate the book ends
-								// of it
-								factor = ((prevDate.getTime() - (prevDate
-										.getTime() - expirationTime)) / (1000.0f * 60.0f * 60.0f));
+                        if (val > 0.0f) {
 
-							} else {
-								factor = ((prevDate.getTime() - tdate
-										.getTime()) / (1000.0f * 60.0f * 60.0f));
-							}
-							// do absolute values so it dosen't matter which way
-							// you traverse the list
-							val = val * Math.abs(factor);
-							
-						}
+                            if ((prevDate.getTime() - tdate.getTime()) > expirationTime) {
+                                // handle the gap and accumulate the book ends
+                                // of it
+                                factor = ((prevDate.getTime() - (prevDate
+                                        .getTime() - expirationTime)) / TimeUtil.MILLIS_PER_HOUR);
+                            } else {
+                                factor = ((prevDate.getTime() - tdate.getTime()) / TimeUtil.MILLIS_PER_HOUR);
+                            }
+                            // do absolute values so it dosen't matter which way
+                            // you traverse the list
+                            val = val * Math.abs(factor);
+
+                        }
                     }
-  
+
                     dvalue += val;
                     prevDate = tdate;
                 }
@@ -247,20 +248,22 @@ public class FFMPBasin implements Cloneable {
 
         return val;
     }
-    
+
     /**
      * Used for mosaic sources where the times come in irregularly (QPF)
+     * 
      * @param date
      * @param buffer
      * @return
      */
     public Float getAverageValue(Date date, long buffer) {
-    	Date afterDate = new Date(date.getTime()-(buffer/2));
-    	Date beforeDate = new Date(date.getTime()+(buffer/2));
-    	//System.out.println("AfterDate: "+afterDate+ " BeforeDate: "+beforeDate);
-    	return getAverageValue(afterDate, beforeDate);
+        Date afterDate = new Date(date.getTime() - (buffer / 2));
+        Date beforeDate = new Date(date.getTime() + (buffer / 2));
+        // System.out.println("AfterDate: "+afterDate+
+        // " BeforeDate: "+beforeDate);
+        return getAverageValue(afterDate, beforeDate);
     }
-    
+
     /**
      * Gets the average value within a time window, used for mosaic
      * 
@@ -268,54 +271,53 @@ public class FFMPBasin implements Cloneable {
      * @param beforeDate
      * @return
      */
-	public Float getAverageValue(Date afterDate, Date beforeDate) {
-		Float val = 0.0f;
-		int i = 0;
+    public Float getAverageValue(Date afterDate, Date beforeDate) {
+        Float val = 0.0f;
+        int i = 0;
 
         synchronized (valuesSynchronization) {
 
-			for (Date date : values.keySet()) {
-				if (date.before(beforeDate) && date.after(afterDate)) {
-					float val1 = values.get(date);
-					if (val1 > 0.0) {
-						val += val1;
-						i++;
-					}
-				}
-			}
+            for (Date date : values.keySet()) {
+                if (date.before(beforeDate) && date.after(afterDate)) {
+                    float val1 = values.get(date);
+                    if (val1 > 0.0) {
+                        val += val1;
+                        i++;
+                    }
+                }
+            }
 
-			if (i != 0) {
-				val = val / i;
-			}
-		}
+            if (i != 0) {
+                val = val / i;
+            }
+        }
 
-		return val;
-	}
-	
-	/**
+        return val;
+    }
+
+    /**
      * Gets the average value within a time window, used for mosaic
      * 
      * @param afterDate
      * @param beforeDate
      * @return
      */
-	public Float getMaxValue(Date afterDate, Date beforeDate) {
-		Float val = 0.0f;
+    public Float getMaxValue(Date afterDate, Date beforeDate) {
+        Float val = 0.0f;
 
         synchronized (valuesSynchronization) {
 
-			for (Date date : values.keySet()) {
-				if (date.before(beforeDate) && date.after(afterDate)) {
-					if (val > values.get(date)) {
-						val = values.get(date);
-					}
-				}
-			}
-		}
-
-		return val;
-	}
+            for (Date date : values.keySet()) {
+                if (date.before(beforeDate) && date.after(afterDate)) {
+                    if (val > values.get(date)) {
+                        val = values.get(date);
+                    }
+                }
+            }
+        }
 
+        return val;
+    }
 
     /**
      * Adds a date/value pair
@@ -324,12 +326,12 @@ public class FFMPBasin implements Cloneable {
      * @param value
      */
     public void setValue(Date date, Float dvalue) {
-        
-        // Do not allow null values to be added! 
+
+        // Do not allow null values to be added!
         if (dvalue == null) {
             return;
         }
-        
+
         synchronized (valuesSynchronization) {
             values.put(date, dvalue);
         }
@@ -365,6 +367,7 @@ public class FFMPBasin implements Cloneable {
 
     /**
      * Useful constructor
+     * 
      * @param pfaf
      * @param aggregated
      */
@@ -374,7 +377,7 @@ public class FFMPBasin implements Cloneable {
         values = new TreeMap<Date, Float>(Collections.reverseOrder());
         valuesSynchronization = values;
     }
-    
+
     public FFMPBasin(Long pfaf, boolean aggregated,
             BasinMapFactory<Date> mapFactory) {
         setPfaf(pfaf);
@@ -401,20 +404,20 @@ public class FFMPBasin implements Cloneable {
         }
         serializedValues = null;
     }
-    
+
     /**
      * populates the serialized array
      */
     public void serialize() {
-        
+
         serializedValues = new float[values.size()];
         int i = 0;
-        
-        for (Date date: values.descendingKeySet()) {
+
+        for (Date date : values.descendingKeySet()) {
             serializedValues[i] = values.get(date);
             i++;
         }
-        //System.out.println("wrote :"+i+" pfaf : "+pfaf);
+        // System.out.println("wrote :"+i+" pfaf : "+pfaf);
     }
 
     /**
@@ -427,9 +430,9 @@ public class FFMPBasin implements Cloneable {
             synchronized (valuesSynchronization) {
                 ArrayList<Date> removes = new ArrayList<Date>();
                 for (Date mdate : values.keySet()) {
-                	if (mdate.before(date)) {
-                		removes.add(mdate);
-                	}
+                    if (mdate.before(date)) {
+                        removes.add(mdate);
+                    }
                 }
 
                 for (Date rdate : removes) {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
index 36099d1618..230299f352 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -23,6 +23,7 @@ import java.awt.Rectangle;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -35,18 +36,21 @@ import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 import com.raytheon.uf.common.datastorage.StorageException;
 import com.raytheon.uf.common.gridcoverage.GridCoverage;
 import com.raytheon.uf.common.hydro.spatial.HRAPCoordinates;
 import com.raytheon.uf.common.hydro.spatial.HRAPSubGrid;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.monitor.config.FFMPRunConfigurationManager;
 import com.raytheon.uf.common.monitor.config.FFMPSourceConfigurationManager;
 import com.raytheon.uf.common.monitor.config.FFMPTemplateConfigurationManager;
@@ -60,7 +64,6 @@ import com.raytheon.uf.common.serialization.SerializationUtil;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.common.util.FileUtil;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
@@ -73,18 +76,18 @@ import com.vividsolutions.jts.io.WKBReader;
 
 /**
  * FFMPHucTemplate maker/factory
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
  * 07/29/09      2152       D. Hladky   Initial release
  * 07/09/10      3914       D. Hladky   Localization work
  * 12/13/10      7484       D. Hladky   Service Backup
  * 02/01/13      1569       D.Hladky    Constants
- * 03/01/13      DR13228    G. Zhang    Add VGB county and related code 
+ * 03/01/13      DR13228    G. Zhang    Add VGB county and related code
  * 02/20/13      1635       D. Hladky   Constants
  * 03/18/13      1817       D. Hladky   Fixed issue with BOX where only 1 HUC was showing up.
  * 04/15/13      1902       M. Duff     Generic List
@@ -93,8 +96,11 @@ import com.vividsolutions.jts.io.WKBReader;
  * 07/15/13      2184       dhladky     Remove all HUC's for storage except ALL
  * Nov 18, 2014  3831       dhladky     StatusHandler logging. Proper list sizing. Geometry chunk sizing.
  * Aug 08, 2015  4722       dhladky     Improved Grid support.
+ * Nov 12, 2015  4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 15, 2016  5244       nabowle     Replace deprecated LocalizationFile methods.
+ *
  * </pre>
- * 
+ *
  * @author dhladky
  * @version 1
  */
@@ -163,10 +169,10 @@ public class FFMPTemplates {
             .getHandler(FFMPTemplates.class);
 
     private final IPathManager pathManager;
-    
+
     /**
      * Single constructor
-     * 
+     *
      * @return
      */
     public static synchronized FFMPTemplates getInstance(DomainXML domain,
@@ -181,7 +187,7 @@ public class FFMPTemplates {
 
     /**
      * Multiple constructor loads multiple
-     * 
+     *
      * @return
      */
     public static synchronized FFMPTemplates getInstance(DomainXML primaryCWA,
@@ -196,11 +202,9 @@ public class FFMPTemplates {
 
     /**
      * EDEX constructor
-     * 
-     * @param awipsShare
-     *            DIR
-     * @param shareDir
-     * @param cwa
+     *
+     * @param primaryCWA
+     * @param mode
      */
     public FFMPTemplates(DomainXML primaryCWA, MODE mode) {
         this.pathManager = PathManagerFactory.getPathManager();
@@ -222,7 +226,7 @@ public class FFMPTemplates {
         public String getMode() {
             return mode;
         }
-    };
+    }
 
     /**
      * localization and such
@@ -323,7 +327,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the FFMPBasinData template file/object
-     * 
+     *
      * @param hucName
      * @param cwa
      * @return
@@ -355,18 +359,19 @@ public class FFMPTemplates {
 
     /**
      * Gets the FFMPBasinData template file/object
-     * 
+     *
      * @param hucName
      * @param cwa
      * @return
      */
     private LinkedHashMap<String, FFMPVirtualGageBasinMetaData> readVGBFile(
             String name, String cwa, String dataKey) {
-        
+
         HashMap<String, FFMPVirtualGageBasinMetaData> protoMap = readVGBDomainMap(
                 dataKey, cwa);
         String[] list = readVGBDomainList(dataKey, cwa);
-        LinkedHashMap<String, FFMPVirtualGageBasinMetaData> map = new LinkedHashMap<String, FFMPVirtualGageBasinMetaData>(list.length, 1.0f);
+        LinkedHashMap<String, FFMPVirtualGageBasinMetaData> map = new LinkedHashMap<>(
+                list.length, 1.0f);
 
         // construct ordered map
         for (String lid : list) {
@@ -378,7 +383,7 @@ public class FFMPTemplates {
 
     /**
      * Writes out the byte array from thrift
-     * 
+     *
      * @param map
      * @param cwa
      * @param dataKey
@@ -397,38 +402,49 @@ public class FFMPTemplates {
         }
 
         try {
-
             LocalizationContext lc = pathManager.getContext(
                     LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-            LocalizationFile lfmap = pathManager.getLocalizationFile(lc,
+            ILocalizationFile lfmap = pathManager.getLocalizationFile(lc,
                     getAbsoluteFileName(dataKey, "VIRTUAL", cwa, "map"));
-            LocalizationFile lflist = pathManager.getLocalizationFile(lc,
+            ILocalizationFile lflist = pathManager.getLocalizationFile(lc,
                     getAbsoluteFileName(dataKey, "VIRTUAL", cwa, "list"));
 
-            FileUtil.bytes2File(SerializationUtil.transformToThrift(list),
-                    lflist.getFile(), true);
-            lflist.save();
+            try (SaveableOutputStream listSos = lflist.openOutputStream();
+                    GZIPOutputStream listGos = new GZIPOutputStream(listSos);
+                    SaveableOutputStream mapSos = lfmap.openOutputStream();
+                    GZIPOutputStream mapGos = new GZIPOutputStream(mapSos)) {
 
-            FileUtil.bytes2File(SerializationUtil.transformToThrift(map),
-                    lfmap.getFile(), true);
-            lfmap.save();
+                listGos.write(SerializationUtil.transformToThrift(list));
+                listGos.finish();
+                listGos.flush();
+                listSos.save();
+
+                mapGos.write(SerializationUtil.transformToThrift(map));
+                mapGos.finish();
+                mapGos.flush();
+                mapSos.save();
+            }
 
             list = null;
 
         } catch (SerializationException se) {
-            statusHandler.error("Serialization Exception: Write VGB: cwa: "+cwa+" dataKey: "+dataKey, se);
+            statusHandler.error("Serialization Exception: Write VGB: cwa: "
+                    + cwa + " dataKey: " + dataKey, se);
         } catch (FileNotFoundException fnfe) {
-            statusHandler.error("File Not found Exception: Write VGB: cwa: "+cwa+" dataKey: "+dataKey, fnfe);
+            statusHandler.error("File Not found Exception: Write VGB: cwa: "
+                    + cwa + " dataKey: " + dataKey, fnfe);
         } catch (IOException ioe) {
-            statusHandler.error("IO Exception: Write VGB: cwa: "+cwa+" dataKey: "+dataKey, ioe);
-        } catch (LocalizationOpFailedException e) {
-            statusHandler.error("Localization Exception: Write VGB: cwa: "+cwa+" dataKey: "+dataKey, e);
+            statusHandler.error("IO Exception: Write VGB: cwa: " + cwa
+                    + " dataKey: " + dataKey, ioe);
+        } catch (LocalizationException e) {
+            statusHandler.error("Localization Exception: Write VGB: cwa: "
+                    + cwa + " dataKey: " + dataKey, e);
         }
     }
 
     /**
      * Writes out the byte array from thrift
-     * 
+     *
      * @param huc
      * @param cwa
      * @param map
@@ -446,62 +462,58 @@ public class FFMPTemplates {
         }
 
         try {
-            if (huc.equals(FFMPRecord.ALL)) {
+            LocalizationContext lc = pathManager.getContext(
+                    LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
 
-                LocalizationContext lc = pathManager.getContext(
-                        LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
+            ILocalizationFile lflist = pathManager.getLocalizationFile(lc,
+                    getAbsoluteFileName(dataKey, huc, cwa, "list"));
+            ILocalizationFile lfmap = pathManager.getLocalizationFile(lc,
+                    getAbsoluteFileName(dataKey, huc, cwa, "map"));
 
-                LocalizationFile lflist = pathManager.getLocalizationFile(lc,
-                        getAbsoluteFileName(dataKey, huc, cwa, "list"));
-                LocalizationFile lfmap = pathManager.getLocalizationFile(lc,
-                        getAbsoluteFileName(dataKey, huc, cwa, "map"));
+            try (SaveableOutputStream listSos = lflist.openOutputStream();
+                    GZIPOutputStream listGos = new GZIPOutputStream(listSos);
+                    SaveableOutputStream mapSos = lfmap.openOutputStream();
+                    GZIPOutputStream mapGos = new GZIPOutputStream(mapSos)) {
 
-                FileUtil.bytes2File(SerializationUtil.transformToThrift(list),
-                        lflist.getFile(), true);
-                FileUtil.bytes2File(SerializationUtil.transformToThrift(map),
-                        lfmap.getFile(), true);
+                listGos.write(SerializationUtil.transformToThrift(list));
+                listGos.finish();
+                listGos.flush();
 
-                lflist.save();
-                lfmap.save();
-
-            } else {
-
-                LocalizationContext lc = pathManager.getContext(
-                        LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-
-                LocalizationFile lfmap = pathManager.getLocalizationFile(lc,
-                        getAbsoluteFileName(dataKey, huc, cwa, "map"));
-                LocalizationFile lflist = pathManager.getLocalizationFile(lc,
-                        getAbsoluteFileName(dataKey, huc, cwa, "list"));
-
-                FileUtil.bytes2File(
-                        SerializationUtil
-                                .transformToThrift(toPrimitive((LinkedHashMap<Long, ArrayList<Long>>) map)),
-                        lfmap.getFile(), true);
-                FileUtil.bytes2File(SerializationUtil.transformToThrift(list),
-                        lflist.getFile(), true);
-
-                lfmap.save();
-                lflist.save();
+                if (huc.equals(FFMPRecord.ALL)) {
+                    mapGos.write(SerializationUtil.transformToThrift(map));
+                } else {
+                    mapGos.write(SerializationUtil
+                            .transformToThrift(toPrimitive((LinkedHashMap<Long, ArrayList<Long>>) map)));
+                }
+                mapGos.finish();
+                mapGos.flush();
 
+                listSos.save();
+                mapSos.save();
             }
 
             list = null;
 
         } catch (SerializationException se) {
-            statusHandler.error("Serialization Exception: Write Template: cwa: "+cwa+" dataKey:"+dataKey+" huc: "+huc, se);
+            statusHandler.error(
+                    "Serialization Exception: Write Template: cwa: " + cwa
+                            + " dataKey:" + dataKey + " huc: " + huc, se);
         } catch (FileNotFoundException fnfe) {
-            statusHandler.error("File Not found Exception: Write Template: cwa: "+cwa+" dataKey:"+dataKey+" huc: "+huc, fnfe);
+            statusHandler.error(
+                    "File Not found Exception: Write Template: cwa: " + cwa
+                            + " dataKey:" + dataKey + " huc: " + huc, fnfe);
         } catch (IOException ioe) {
-            statusHandler.error("IO Exception: Write Template: cwa: "+cwa+" dataKey:"+dataKey+" huc: "+huc, ioe);
-        } catch (LocalizationOpFailedException e) {
-            statusHandler.error("Localization Exception: Write Template: cwa: "+cwa+" dataKey:"+dataKey+" huc: "+huc, e);
+            statusHandler.error("IO Exception: Write Template: cwa: " + cwa
+                    + " dataKey:" + dataKey + " huc: " + huc, ioe);
+        } catch (LocalizationException e) {
+            statusHandler.error("Localization Exception: Write Template: cwa: "
+                    + cwa + " dataKey:" + dataKey + " huc: " + huc, e);
         }
     }
 
     /**
      * Gets the completed filename
-     * 
+     *
      * @return
      */
 
@@ -521,7 +533,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the template file directory
-     * 
+     *
      * @return
      */
     public String getTemplateFileLocation() {
@@ -530,7 +542,7 @@ public class FFMPTemplates {
 
     /**
      * Double for max Extent of the radar
-     * 
+     *
      * @return
      */
     public double getMaxExtent() {
@@ -539,7 +551,7 @@ public class FFMPTemplates {
 
     /**
      * This maxExtent
-     * 
+     *
      * @param maxExtent
      */
     public void setMaxExtent(Double maxExtent) {
@@ -548,7 +560,7 @@ public class FFMPTemplates {
 
     /**
      * Gets a basin
-     * 
+     *
      * @param pfaf
      * @return
      */
@@ -567,7 +579,7 @@ public class FFMPTemplates {
 
     /**
      * Gets a basin in terms of total loaded domains and sites
-     * 
+     *
      * @param pfaf
      * @return
      */
@@ -628,7 +640,7 @@ public class FFMPTemplates {
 
     /**
      * Finds the aggregated pfaf of a given pfaf
-     * 
+     *
      * @param pfaf
      * @return
      */
@@ -637,14 +649,20 @@ public class FFMPTemplates {
         try {
             rpfaf = getAggregatedPfaf(pfaf, dataKey, huc);
         } catch (NullPointerException npe) {
+            // FIXME
+            npe.printStackTrace();
+            System.err.println("NPE for pfaf=" + pfaf + ", dataKey=" + dataKey
+                    + ", huc=" + huc);
         }
         return rpfaf;
     }
 
     /**
      * Finds the aggregated pfaf of a given VGB
-     * 
-     * @param pfaf
+     *
+     * @param lid
+     * @param dataKey
+     * @param huc
      * @return
      */
     public Long findAggregatedVGB(String lid, String dataKey, String huc) {
@@ -681,7 +699,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the aggregate mappings for all domains
-     * 
+     *
      * @param pfaf
      * @return
      */
@@ -708,7 +726,7 @@ public class FFMPTemplates {
     /**
      * Gets the aggregate mappings for all domains, used by the FFFG dialog If
      * you want ALL and I mean ALL of the basins in a given coverage
-     * 
+     *
      * @param pfaf
      * @return
      */
@@ -748,7 +766,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the aggreagate mappings by domain
-     * 
+     *
      * @param pfaf
      * @param domain
      * @param huc
@@ -786,7 +804,7 @@ public class FFMPTemplates {
 
     /**
      * Don't ever call this for anything other than FFTI or FFFG calls
-     * 
+     *
      * @param pfaf
      * @param huc
      * @return
@@ -813,7 +831,7 @@ public class FFMPTemplates {
 
     /**
      * Get the basin by Lat/Lon
-     * 
+     *
      * @param coor
      * @return
      */
@@ -846,7 +864,8 @@ public class FFMPTemplates {
                 }
             }
         } catch (Exception e) {
-            statusHandler.error("Find Basin by lon lat failed: dataKey: "+dataKey+ " coor:"+coor.toString(), e);
+            statusHandler.error("Find Basin by lon lat failed: dataKey: "
+                    + dataKey + " coor:" + coor.toString(), e);
         }
 
         return null;
@@ -854,7 +873,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the pfaf by basinId
-     * 
+     *
      * @param basinId
      * @return
      */
@@ -876,8 +895,10 @@ public class FFMPTemplates {
 
     /**
      * Finds the center of an aggregation of basins (Roughly)
-     * 
-     * @param arrayList
+     *
+     * @param pfaf
+     * @param dataKey
+     * @param huc
      * @return
      */
     public Coordinate findAggregationCenter(Long pfaf, String dataKey,
@@ -917,7 +938,7 @@ public class FFMPTemplates {
 
     /**
      * Check to see if file is there
-     * 
+     *
      * @param hucName
      * @return
      */
@@ -929,9 +950,9 @@ public class FFMPTemplates {
 
             LocalizationContext lc = pathManager.getContext(
                     LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-            LocalizationFile listf = pathManager.getLocalizationFile(lc,
+            ILocalizationFile listf = pathManager.getLocalizationFile(lc,
                     getAbsoluteFileName(dataKey, huc, cwa, "list"));
-            LocalizationFile mapf = pathManager.getLocalizationFile(lc,
+            ILocalizationFile mapf = pathManager.getLocalizationFile(lc,
                     getAbsoluteFileName(dataKey, huc, cwa, "map"));
 
             if (listf.exists()) {
@@ -959,7 +980,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the starting index for searching
-     * 
+     *
      * @return
      */
     public int getHucDepthStart() {
@@ -967,9 +988,9 @@ public class FFMPTemplates {
     }
 
     /**
-     * Gets the starting index for searching
-     * 
-     * @return
+     * Sets the starting index for searching
+     *
+     * @param hucDepthStart
      */
     public void setHucDepthStart(int hucDepthStart) {
         this.hucDepthStart = hucDepthStart;
@@ -977,7 +998,7 @@ public class FFMPTemplates {
 
     /**
      * Get a listing of the counties in the FFMP monitored area
-     * 
+     *
      * @return
      */
     public FFMPCounties getCounties(String dataKey) {
@@ -1010,7 +1031,8 @@ public class FFMPTemplates {
             }
 
         } catch (Exception e) {
-            statusHandler.error("Failed to lookup County: dataKey: "+dataKey, e);
+            statusHandler.error("Failed to lookup County: dataKey: " + dataKey,
+                    e);
         }
 
         FFMPCounties counties = new FFMPCounties(countyList);
@@ -1020,8 +1042,9 @@ public class FFMPTemplates {
 
     /**
      * Finds the parent aggregated pfaf of a given pfaf.
-     * 
-     * @param pfaf
+     *
+     * @param key
+     * @param dataKey
      * @param huc
      * @return
      */
@@ -1050,7 +1073,7 @@ public class FFMPTemplates {
 
     /**
      * Find the extents of this domain
-     * 
+     *
      * @param cwa
      * @return
      */
@@ -1063,7 +1086,7 @@ public class FFMPTemplates {
 
     /**
      * Find the extents of the collective sites
-     * 
+     *
      * @param cwa
      * @return
      */
@@ -1085,16 +1108,16 @@ public class FFMPTemplates {
 
             Rectangle rect = null;
 
-                rect = HRAPCoordinates.getHRAPCoordinates();
-                rect.setBounds(rect.x * primeSource.getHrapGridFactor(), rect.y
-                        * primeSource.getHrapGridFactor(), rect.width
-                        * primeSource.getHrapGridFactor(), rect.height
-                        * primeSource.getHrapGridFactor());
+            rect = HRAPCoordinates.getHRAPCoordinates();
+            rect.setBounds(rect.x * primeSource.getHrapGridFactor(), rect.y
+                    * primeSource.getHrapGridFactor(),
+                    rect.width * primeSource.getHrapGridFactor(), rect.height
+                            * primeSource.getHrapGridFactor());
 
-                HRAPSubGrid hrapgrid = new HRAPSubGrid(rect,
-                        primeSource.getHrapGridFactor());
-                Geometry geo = hrapgrid.getGeometry();
-                siteExtents = FFMPUtils.getGeometryText(geo);
+            HRAPSubGrid hrapgrid = new HRAPSubGrid(rect,
+                    primeSource.getHrapGridFactor());
+            Geometry geo = hrapgrid.getGeometry();
+            siteExtents = FFMPUtils.getGeometryText(geo);
 
         } else if (primeSource.getDataType().equals(
                 FFMPSourceConfigurationManager.DATA_TYPE.RADAR.getDataType())) {
@@ -1108,7 +1131,8 @@ public class FFMPTemplates {
         } else if (primeSource.getDataType().equals(
                 FFMPSourceConfigurationManager.DATA_TYPE.GRID.getDataType())) {
             // extract the Grid Coverage for use in site extents creation
-            GridCoverage coverage = FFMPUtils.getGridCoverageRecord(primeSource.getDataPath());
+            GridCoverage coverage = FFMPUtils.getGridCoverageRecord(primeSource
+                    .getDataPath());
             siteExtents = FFMPUtils.getGeometryText(coverage.getGeometry());
         } else if (primeSource.getDataType().equals(
                 FFMPSourceConfigurationManager.DATA_TYPE.PDO.getDataType())) {
@@ -1126,8 +1150,8 @@ public class FFMPTemplates {
 
     /**
      * Sets the extents
-     * 
-     * @param extents
+     *
+     * @param maxExtent
      */
     public void setExtents(double maxExtent) {
         this.maxExtent = maxExtent;
@@ -1139,7 +1163,7 @@ public class FFMPTemplates {
 
     /**
      * gets the virtuals or not
-     * 
+     *
      * @return
      */
     public boolean getVirtual() {
@@ -1148,7 +1172,7 @@ public class FFMPTemplates {
 
     /**
      * Get the maps from storage or create them
-     * 
+     *
      * @param huc
      * @param cwa
      * @return
@@ -1170,7 +1194,9 @@ public class FFMPTemplates {
                                 getMaxExtent(), getSiteExtents(dataKey),
                                 mode.getMode()));
                     } catch (Exception e) {
-                        statusHandler.handle(Priority.PROBLEM, "Unable to create FFMP Template for this dataKey: "+dataKey, e);
+                        statusHandler.handle(Priority.PROBLEM,
+                                "Unable to create FFMP Template for this dataKey: "
+                                        + dataKey, e);
                     }
                 } else if (huc.equals(FFMPRecord.COUNTY)) {
                     list = getCountyFips(cwa, dataKey);
@@ -1304,7 +1330,7 @@ public class FFMPTemplates {
 
     /**
      * load up the maps
-     * 
+     *
      * @param huc
      * @return
      */
@@ -1338,7 +1364,7 @@ public class FFMPTemplates {
 
     /**
      * Find the list of pfafs for this HUC level
-     * 
+     *
      * @param siteKey
      * @param huc
      * @param domains
@@ -1359,7 +1385,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the template config manager
-     * 
+     *
      * @return
      */
     public FFMPTemplateConfigurationManager getTemplateMgr() {
@@ -1368,7 +1394,7 @@ public class FFMPTemplates {
 
     /**
      * Read the file or generate VGB's for primary domain
-     * 
+     *
      * @param cwa
      * @return
      */
@@ -1443,7 +1469,7 @@ public class FFMPTemplates {
 
     /**
      * Generate the Virtual Gage Basins Meta Data for primary domain
-     * 
+     *
      * @return
      */
     public synchronized LinkedHashMap<String, FFMPVirtualGageBasinMetaData> getVirtualGageBasins(
@@ -1526,7 +1552,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the Virtual Gage Basin MetaData
-     * 
+     *
      * @param lid
      * @return
      */
@@ -1547,8 +1573,10 @@ public class FFMPTemplates {
 
     /**
      * Gets the Virtual Gage Basin MetaData
-     * 
-     * @param pfaf
+     *
+     * @param dataKey
+     * @param cwa
+     * @param parentPfaf
      * @return
      */
     public synchronized ArrayList<FFMPVirtualGageBasinMetaData> getVirtualGageBasinMetaData(
@@ -1578,7 +1606,7 @@ public class FFMPTemplates {
 
     /**
      * Finds the Lid string used by the aggregated VGB's
-     * 
+     *
      * @param fbmd
      * @param huc
      * @return
@@ -1597,7 +1625,7 @@ public class FFMPTemplates {
     /**
      * Gets you the list of pfafs that have VGB's for a given HUC level DONT
      * EVER CALL THIS WITH "ALL" HUC level use getVirtualGageBasins() for that
-     * 
+     *
      * @param huc
      * @return
      */
@@ -1618,7 +1646,7 @@ public class FFMPTemplates {
 
     /**
      * Check for VGB's in aggregate pfaf
-     * 
+     *
      * @param pfaf
      * @param dataKey
      * @param huc
@@ -1635,7 +1663,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the Virtual Gage Basin MetaData
-     * 
+     *
      * @param pfaf
      * @return
      */
@@ -1662,7 +1690,7 @@ public class FFMPTemplates {
     /**
      * Gets you the list of pfafs that have VGB's for a given HUC level DONT
      * EVER CALL THIS WITH "ALL" HUC level use getVirtualGageBasins() for that
-     * 
+     *
      * @param huc
      * @return
      */
@@ -1673,14 +1701,14 @@ public class FFMPTemplates {
      * getAggregatePfafs(pfaf, dataKey, huc)) { if
      * (getVirtualGageBasinMetaData(dataKey, iPfaf) != null) { if (vgbPfafs ==
      * null) { vgbPfafs = new ArrayList<Long>(); } vgbPfafs.add(iPfaf); } }
-     * 
+     *
      * return vgbPfafs; }
      */
 
     /**
      * Gets list of aggregate pfafs that have VGB's within them * DONT EVER CALL
      * THIS WITH "ALL" HUC level
-     * 
+     *
      * @param huc
      * @param cwa
      * @return
@@ -1692,13 +1720,13 @@ public class FFMPTemplates {
      * getMap(dataKey, domain.getCwa(), huc).keySet()) { if
      * (getVGBsInAggregate(iPfaf, dataKey, huc) != null) { if (vgbPfafs == null)
      * { vgbPfafs = new ArrayList<Long>(); } vgbPfafs.add(iPfaf); } } }
-     * 
+     *
      * return vgbPfafs; }
      */
 
     /**
      * Gets the Virtual Gage Basin MetaData
-     * 
+     *
      * @param pfaf
      * @return
      */
@@ -1732,7 +1760,7 @@ public class FFMPTemplates {
 
     /**
      * Writes out all basins from DB by CWA
-     * 
+     *
      * @param results
      */
     private LinkedHashMap<Long, FFMPBasinMetaData> loadBasins(String siteKey,
@@ -1745,19 +1773,20 @@ public class FFMPTemplates {
         SoftReference<Map<Long, Geometry>> rawGeomRef = cwaRawGeometries
                 .get(compositeKey);
         Map<Long, Geometry> pfafGeometries = null;
-        
+
         if (rawGeomRef != null) {
             pfafGeometries = rawGeomRef.get();
         }
 
         if (results != null && results.length > 0) {
-                       
+
             if (pfafGeometries == null) {
-                pfafGeometries = new HashMap<Long, Geometry>(results.length, 1.0f);
+                pfafGeometries = new HashMap<Long, Geometry>(results.length,
+                        1.0f);
                 cwaRawGeometries.put(compositeKey,
                         new SoftReference<Map<Long, Geometry>>(pfafGeometries));
             }
-            
+
             for (int i = 0; i < results.length; i++) {
                 Object[] row = (Object[]) results[i];
                 basin = FFMPUtils.getMetaDataBasin(row, mode.getMode());
@@ -1772,12 +1801,14 @@ public class FFMPTemplates {
                 if ((row.length >= (upstreamDepth + 9))
                         && (row[upstreamDepth + 9] != null)) {
                     try {
-                        pfafGeometries.put(basin.getPfaf(), reader
-                                .read((byte[]) row[upstreamDepth + 9])
-                                .buffer(0));
-                   
+                        pfafGeometries.put(basin.getPfaf(),
+                                reader.read((byte[]) row[upstreamDepth + 9])
+                                        .buffer(0));
+
                     } catch (Exception e) {
-                        statusHandler.error("Failure to add rawGeometry in loadBasins: "+siteKey, e);
+                        statusHandler.error(
+                                "Failure to add rawGeometry in loadBasins: "
+                                        + siteKey, e);
                     }
                 }
             }
@@ -1795,7 +1826,7 @@ public class FFMPTemplates {
 
     /**
      * compress to primitive
-     * 
+     *
      * @param list
      * @return
      */
@@ -1814,7 +1845,7 @@ public class FFMPTemplates {
 
     /**
      * back to LinkedHash
-     * 
+     *
      * @param longs
      * @return
      */
@@ -1834,8 +1865,9 @@ public class FFMPTemplates {
 
     /**
      * Get the basin ID of the county
-     * 
-     * @param name
+     *
+     * @param dataKey
+     * @param nameState
      * @return
      */
     @SuppressWarnings("unchecked")
@@ -1861,7 +1893,7 @@ public class FFMPTemplates {
 
     /**
      * Sets the domains to load for this template instance
-     * 
+     *
      * @param domains
      */
     public synchronized void setDomains(ArrayList<DomainXML> domains) {
@@ -1870,7 +1902,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the domains in this template
-     * 
+     *
      * @return
      */
     public synchronized ArrayList<DomainXML> getDomains() {
@@ -1879,7 +1911,7 @@ public class FFMPTemplates {
 
     /**
      * Add domains to the templates, This method is used by EDEX to add domains
-     * 
+     *
      * @param domain
      */
     public synchronized void addDomain(DomainXML domain) {
@@ -1918,7 +1950,7 @@ public class FFMPTemplates {
 
     /**
      * Add domains to the templates, This method is used by EDEX to add domains
-     * 
+     *
      * @param domain
      */
     public synchronized void addDomain(String dataKey, DomainXML domain) {
@@ -1933,7 +1965,7 @@ public class FFMPTemplates {
 
     /**
      * dump a domain on the fly, CAVE side
-     * 
+     *
      * @param domainName
      */
     public synchronized void removeDomain(String dataKey, String domainName) {
@@ -1951,7 +1983,7 @@ public class FFMPTemplates {
 
     /**
      * dump a dataKey
-     * 
+     *
      * @param domainName
      */
     public synchronized void removeDataKey(String dataKey) {
@@ -1968,7 +2000,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the primary
-     * 
+     *
      * @return
      */
     public DomainXML getPrimaryDomain() {
@@ -1977,7 +2009,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the list for all of the pfafs
-     * 
+     *
      * @param huc
      * @param cwa
      * @return
@@ -1988,16 +2020,16 @@ public class FFMPTemplates {
 
         LocalizationContext lc = pathManager.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-        LocalizationFile f = pathManager.getLocalizationFile(lc,
+        ILocalizationFile f = pathManager.getLocalizationFile(lc,
                 getAbsoluteFileName(dataKey, huc, cwa, "list"));
 
-        try {
-            list = SerializationUtil.transformFromThrift(long[].class,
-                    FileUtil.file2bytes(f.getFile(), true));
-        } catch (SerializationException se) {
-            statusHandler.error("Serialization Exception: Read Domain: cwa: "+cwa+" dataKey: "+dataKey+" huc: "+huc, se);
-        } catch (IOException e) {
-            statusHandler.error("IO Exception: Read Domain: cwa: "+cwa+" dataKey: "+dataKey+" huc: "+huc, e);
+        try (InputStream is = f.openInputStream();
+                GZIPInputStream gis = new GZIPInputStream(is)) {
+            list = SerializationUtil.transformFromThrift(long[].class, gis);
+        } catch (SerializationException | IOException | LocalizationException e) {
+            statusHandler.error(
+                    "Exception reading domain list: Read Domain. cwa: " + cwa
+                            + " dataKey: " + dataKey + " huc: " + huc, e);
         }
 
         return list;
@@ -2005,7 +2037,7 @@ public class FFMPTemplates {
 
     /**
      * Reads the actual domain map
-     * 
+     *
      * @param huc
      * @param cwa
      * @return
@@ -2017,24 +2049,15 @@ public class FFMPTemplates {
 
         LocalizationContext lc = pathManager.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-        LocalizationFile f = pathManager.getLocalizationFile(lc,
+        ILocalizationFile f = pathManager.getLocalizationFile(lc,
                 getAbsoluteFileName(dataKey, huc, cwa, "map"));
 
-        try {
-            if (huc.equals(FFMPRecord.ALL)) {
-
-                map = (HashMap<Long, FFMPBasinMetaData>) SerializationUtil
-                        .transformFromThrift(HashMap.class,
-                                FileUtil.file2bytes(f.getFile(), true));
-            } else {
-                map = (HashMap<Long, long[]>) SerializationUtil
-                        .transformFromThrift(HashMap.class,
-                                FileUtil.file2bytes(f.getFile(), true));
-            }
-        } catch (SerializationException se) {
-            statusHandler.error("Serialization Exception: Domain Map: "+dataKey+" cwa:"+cwa+" huc: "+huc, se);
-        } catch (IOException e) {
-            statusHandler.error("IO Exception: Domain Map: "+dataKey+" cwa:"+cwa+" huc: "+huc, e);
+        try (InputStream is = f.openInputStream();
+                GZIPInputStream gis = new GZIPInputStream(is)) {
+            map = SerializationUtil.transformFromThrift(HashMap.class, gis);
+        } catch (SerializationException | IOException | LocalizationException e) {
+            statusHandler.error("Exception reading domain map. Domain Map: "
+                    + dataKey + " cwa:" + cwa + " huc: " + huc, e);
         }
 
         return map;
@@ -2042,7 +2065,7 @@ public class FFMPTemplates {
 
     /**
      * Reads the actual VGB domain map
-     * 
+     *
      * @param huc
      * @param cwa
      * @return
@@ -2055,25 +2078,24 @@ public class FFMPTemplates {
 
         LocalizationContext lc = pathManager.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-        LocalizationFile f = pathManager.getLocalizationFile(lc,
+        ILocalizationFile f = pathManager.getLocalizationFile(lc,
                 getAbsoluteFileName(dataKey, FFMPRecord.VIRTUAL, cwa, "map"));
 
-        try {
-            map = (HashMap<String, FFMPVirtualGageBasinMetaData>) SerializationUtil
-                    .transformFromThrift(HashMap.class,
-                            FileUtil.file2bytes(f.getFile(), true));
-        } catch (SerializationException se) {
-            statusHandler.error("Serialization Exception: Virtual Basins: "+dataKey+" cwa: "+cwa, se);
-        } catch (IOException e) {
-            statusHandler.error("IO Exception: Virtual Basins: "+dataKey+" cwa: "+cwa, e);
+        try (InputStream is = f.openInputStream();
+                GZIPInputStream gis = new GZIPInputStream(is)) {
+            map = SerializationUtil.transformFromThrift(HashMap.class, gis);
+        } catch (SerializationException | IOException | LocalizationException e) {
+            statusHandler.error(
+                    "Exception reading VHB Domain map. Virtual Basins: "
+                            + dataKey + " cwa: " + cwa, e);
         }
 
         return map;
     }
 
     /**
-     * Reads the actual VGB domain map
-     * 
+     * Reads the actual VGB domain list
+     *
      * @param huc
      * @param cwa
      * @return
@@ -2084,16 +2106,16 @@ public class FFMPTemplates {
 
         LocalizationContext lc = pathManager.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-        LocalizationFile f = pathManager.getLocalizationFile(lc,
+        ILocalizationFile f = pathManager.getLocalizationFile(lc,
                 getAbsoluteFileName(dataKey, FFMPRecord.VIRTUAL, cwa, "list"));
 
-        try {
-            list = SerializationUtil.transformFromThrift(String[].class,
-                    FileUtil.file2bytes(f.getFile(), true));
-        } catch (SerializationException se) {
-            statusHandler.error("Serialization Exception: : Read Virtual Domain: cwa: "+cwa+" dataKey: "+dataKey, se);
-        } catch (IOException e) {
-            statusHandler.error("IO Exception: : Read Virtual Domain: cwa: "+cwa+" dataKey: "+dataKey, e);
+        try (InputStream is = f.openInputStream();
+                GZIPInputStream gis = new GZIPInputStream(is)) {
+            list = SerializationUtil.transformFromThrift(String[].class, gis);
+        } catch (SerializationException | IOException | LocalizationException e) {
+            statusHandler.error(
+                    "Exception reading VGB Domain List. Read Virtual Domain: cwa: "
+                            + cwa + " dataKey: " + dataKey, e);
         }
 
         return list;
@@ -2138,7 +2160,7 @@ public class FFMPTemplates {
     }
 
     /**
-     * 
+     *
      * @param cwa
      * @return
      */
@@ -2167,7 +2189,7 @@ public class FFMPTemplates {
 
     /**
      * Look for overlaps
-     * 
+     *
      * @param pfaf
      * @param huc
      * @return
@@ -2188,7 +2210,7 @@ public class FFMPTemplates {
 
     /**
      * Get the areas for a list of pfafs
-     * 
+     *
      * @param pfafs
      * @return
      */
@@ -2202,7 +2224,7 @@ public class FFMPTemplates {
 
     /**
      * gets all up and down stream basins for a given pfaf
-     * 
+     *
      * @param dataKey
      * @param pfaf
      * @return
@@ -2230,7 +2252,7 @@ public class FFMPTemplates {
 
     /**
      * Gets the down stream trace
-     * 
+     *
      * @param dataKey
      * @param pfaf
      * @return
@@ -2263,7 +2285,7 @@ public class FFMPTemplates {
 
     /**
      * Get the FIPS for the pfaf being looked at
-     * 
+     *
      * @param dataKey
      * @param pfaf
      * @return
@@ -2299,9 +2321,9 @@ public class FFMPTemplates {
 
     /**
      * Gets a metadata basin contained within the domain listed.
-     * 
+     *
      * @param dataKey
-     * @param domainName
+     * @param domains
      * @param pfafs
      * @return
      */
@@ -2331,7 +2353,7 @@ public class FFMPTemplates {
 
     /**
      * Check for site load or not
-     * 
+     *
      * @param siteKey
      * @return
      */
@@ -2345,7 +2367,7 @@ public class FFMPTemplates {
 
     /**
      * Work around for bad shape files
-     * 
+     *
      * @param cwa
      * @param dataKey
      * @return
@@ -2362,10 +2384,14 @@ public class FFMPTemplates {
             if (res >= 0.004) {
 
                 try {
-                    list = FFMPUtils.getUniqueCountyFips(cwa, getMaxExtent(),
-                            getSiteExtents(dataKey), mode.getMode(), resolution);
+                    list = FFMPUtils
+                            .getUniqueCountyFips(cwa, getMaxExtent(),
+                                    getSiteExtents(dataKey), mode.getMode(),
+                                    resolution);
                 } catch (Exception e) {
-                    statusHandler.handle(Priority.PROBLEM, "Unable to create FFMP Template for this dataKey: "+dataKey, e);
+                    statusHandler.handle(Priority.PROBLEM,
+                            "Unable to create FFMP Template for this dataKey: "
+                                    + dataKey, e);
                 }
 
                 if (list.size() > 0) {
@@ -2379,7 +2405,7 @@ public class FFMPTemplates {
 
     /**
      * Get the county info
-     * 
+     *
      * @param siteKey
      * @param countyPfaf
      * @return
@@ -2416,37 +2442,36 @@ public class FFMPTemplates {
 
         LocalizationContext lc = pathManager.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-        LocalizationFile lfTemplateDir = pathManager.getLocalizationFile(lc,
-                "ffmp/");
+        ILocalizationFile[] lfs = pathManager.listFiles(lc, "ffmp/", null,
+                false, false);
 
-        if (lfTemplateDir != null) {
-            File templateDirFile = lfTemplateDir.getFile();
-            if (templateDirFile != null) {
-                File[] files = templateDirFile.listFiles();
-                if (files.length > 0) {
-                    synchronized (files) {
-                        for (File file : files) {
-                            if (file.isDirectory()
-                                    && file.listFiles().length > 0) {
-                                for (File iFile : file.listFiles()) {
-                                    iFile.delete();
-                                }
-                                statusHandler.handle(
-                                        Priority.INFO,
-                                        "Deleted Template directory..."
-                                                + file.getName());
-                            }
+        if (lfs != null) {
+            for (ILocalizationFile lf : lfs) {
+                if (lf.isDirectory()) {
+                    ILocalizationFile[] files = pathManager.listFiles(lc,
+                            lf.getPath(), null, false, true);
+                    for (ILocalizationFile file : files) {
+                        try {
+                            file.delete();
+                        } catch (LocalizationException e) {
+                            statusHandler
+                                    .handle(Priority.PROBLEM,
+                                    "Error deleting " + file.getPath(), e);
                         }
-
-                        // write out the config XML so templates
-                        // don't keep regening
-                        ftcm.setRegenerate(false);
-                        ftcm.saveConfigXml();
-                        template = null;
                     }
+                    statusHandler.handle(
+                            Priority.INFO,
+                            "Deleted Template directory..."
+                                    + lf.getPath());
                 }
             }
         }
+
+            // write out the config XML so templates
+            // don't keep regening
+            ftcm.setRegenerate(false);
+            ftcm.saveConfigXml();
+            template = null;
     }
 
     /**
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
index f55c00dcd3..126ff48cab 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/HucLevelGeometriesFactory.java
@@ -1,27 +1,25 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
 package com.raytheon.uf.common.dataplugin.ffmp;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.SoftReference;
 import java.util.ArrayList;
@@ -33,6 +31,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
@@ -40,12 +39,12 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.serialization.SerializationUtil;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.common.util.FileUtil;
 import com.vividsolutions.jts.geom.Envelope;
 import com.vividsolutions.jts.geom.Geometry;
 import com.vividsolutions.jts.geom.GeometryFactory;
@@ -58,11 +57,11 @@ import com.vividsolutions.jts.simplify.TopologyPreservingSimplifier;
  * The first time FFMP is loaded the geometries will be simplified and stored to
  * localization for faster retrieval. All geometries and envelopes are held in
  * memory by a soft reference or until they are explicitly cleared.
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 9, 2010             rjpeter     Initial creation
@@ -70,9 +69,11 @@ import com.vividsolutions.jts.simplify.TopologyPreservingSimplifier;
  *                                     loading them.
  * Apr 25, 2013 1954       bsteffen    Undo last commit to avoid invalid geoms.
  * Jul 03, 2013 2152       rjpeter     Use streams for serialization
- * 
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 15, 2016 5244       nabowle     Replace deprecated LocalizationFile methods.
+ *
  * </pre>
- * 
+ *
  * @author rjpeter
  * @version 1.0
  */
@@ -132,23 +133,19 @@ public class HucLevelGeometriesFactory {
                     getGeomPath(dataKey, cwa, huc));
 
             if (f.exists()) {
-                InputStream is = null;
                 boolean deleteFile = false;
+                long length = f.getFile().length();
 
-                try {
-                    File file = f.getFile();
-                    long length = file.length();
+                // read from disk in 8k chunks
+                int bufferSize = 8 * 1024;
+                if (bufferSize > length) {
+                    bufferSize = (int) length;
+                }
 
-                    // read from disk in 8k chunks
-                    int bufferSize = 8 * 1024;
-                    if (bufferSize > length) {
-                        bufferSize = (int) length;
-                    }
+                try (InputStream is = f.openInputStream();
+                        GZIPInputStream gis = new GZIPInputStream(is, bufferSize)) {
 
-                    is = new GZIPInputStream(new FileInputStream(file),
-                            bufferSize);
-
-                    map = SerializationUtil.transformFromThrift(Map.class, is);
+                    map = SerializationUtil.transformFromThrift(Map.class, gis);
                     int sizeGuess = Math.max(
                             Math.abs(pfafs.size() - map.size()), 10);
                     pfafsToGenerate = new ArrayList<Long>(sizeGuess);
@@ -165,18 +162,10 @@ public class HucLevelGeometriesFactory {
                     deleteFile = true;
                     pfafsToGenerate = pfafs;
                 } finally {
-                    if (is != null) {
-                        try {
-                            is.close();
-                        } catch (IOException e1) {
-                            // ignore
-                        }
-                    }
-
                     if (deleteFile) {
                         try {
                             f.delete();
-                        } catch (LocalizationOpFailedException lope) {
+                        } catch (LocalizationException lope) {
                             statusHandler.handle(Priority.WARN,
                                     "Can't delete file.");
                         }
@@ -213,7 +202,7 @@ public class HucLevelGeometriesFactory {
 
     protected synchronized Map<Long, Geometry> generateSimplifiedGeometry(
             FFMPTemplates template, String dataKey, String cwa,
-            Collection<Long> pfafs) throws Exception {
+            Collection<Long> pfafs) {
         Map<Long, Geometry> rawGeometries = template.getRawGeometries(dataKey,
                 cwa);
         Map<Long, Geometry> simplifiedGeometries = new HashMap<Long, Geometry>(
@@ -291,7 +280,7 @@ public class HucLevelGeometriesFactory {
     /**
      * Attempts to remove interior holes on a polygon. Will take up to 3 passes
      * over the polygon expanding any interior rings and merging rings back in.
-     * 
+     *
      * @param gf
      * @param p
      * @return
@@ -316,7 +305,7 @@ public class HucLevelGeometriesFactory {
 
     /**
      * Gets the huc that is one aggregation smaller.
-     * 
+     *
      * @param tempate
      * @param huc
      * @return
@@ -336,7 +325,7 @@ public class HucLevelGeometriesFactory {
 
     /**
      * Returns a map of pfafs to a collection of child pfafs for the child huc.
-     * 
+     *
      * @param template
      * @param cwa
      * @param huc
@@ -386,9 +375,14 @@ public class HucLevelGeometriesFactory {
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
         LocalizationFile lf = pathManager.getLocalizationFile(lc,
                 getGeomPath(dataKey, cwa, huc));
-        FileUtil.bytes2File(SerializationUtil.transformToThrift(map),
-                lf.getFile(), true);
-        lf.save();
+
+        try (SaveableOutputStream mapSos = lf.openOutputStream();
+                GZIPOutputStream mapGos = new GZIPOutputStream(mapSos)) {
+            mapGos.write(SerializationUtil.transformToThrift(map));
+            mapGos.finish();
+            mapGos.flush();
+            mapSos.save();
+        }
     }
 
     protected synchronized String getGeomPath(String dataKey, String cwa,
@@ -422,8 +416,7 @@ public class HucLevelGeometriesFactory {
     }
 
     public synchronized Envelope getEnvelope(FFMPTemplates template,
-            String dataKey, String cwa, String huc, Long pfafId)
-            throws Exception {
+            String dataKey, String cwa, String huc, Long pfafId) {
         return getEnvelopes(template, dataKey, cwa, huc).get(pfafId);
     }
 
@@ -448,23 +441,18 @@ public class HucLevelGeometriesFactory {
                     getEnvelopePath(dataKey, cwa, huc));
 
             if (f.exists()) {
-                InputStream is = null;
                 boolean deleteFile = false;
+                long length = f.getFile().length();
 
-                try {
-                    File file = f.getFile();
-                    long length = file.length();
+                // read from disk in 8k chunks
+                int bufferSize = 8 * 1024;
+                if (bufferSize > length) {
+                    bufferSize = (int) length;
+                }
+                try (InputStream is = f.openInputStream();
+                        GZIPInputStream gis = new GZIPInputStream(is, bufferSize)) {
 
-                    // read from disk in 8k chunks
-                    int bufferSize = 8 * 1024;
-                    if (bufferSize > length) {
-                        bufferSize = (int) length;
-                    }
-
-                    is = new GZIPInputStream(new FileInputStream(file),
-                            bufferSize);
-
-                    map = SerializationUtil.transformFromThrift(Map.class, is);
+                    map = SerializationUtil.transformFromThrift(Map.class, gis);
                     int sizeGuess = Math.max(
                             Math.abs(pfafs.size() - map.size()), 10);
                     pfafsToGenerate = new ArrayList<Long>(sizeGuess);
@@ -481,18 +469,10 @@ public class HucLevelGeometriesFactory {
                     deleteFile = true;
                     pfafsToGenerate = pfafs;
                 } finally {
-                    if (is != null) {
-                        try {
-                            is.close();
-                        } catch (IOException e1) {
-                            // ignore
-                        }
-                    }
-
                     if (deleteFile) {
                         try {
                             f.delete();
-                        } catch (LocalizationOpFailedException lope) {
+                        } catch (LocalizationException lope) {
                             statusHandler.handle(Priority.WARN,
                                     "Can't delete file.");
                         }
@@ -534,8 +514,14 @@ public class HucLevelGeometriesFactory {
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
         LocalizationFile lf = pathManager.getLocalizationFile(lc,
                 getEnvelopePath(dataKey, cwa, huc));
-        FileUtil.bytes2File(SerializationUtil.transformToThrift(map),
-                lf.getFile(), true);
+
+        try (SaveableOutputStream sos = lf.openOutputStream();
+                GZIPOutputStream gos = new GZIPOutputStream(sos)) {
+            SerializationUtil.transformToThriftUsingStream(map, gos);
+            gos.finish();
+            gos.flush();
+            sos.save();
+        }
     }
 
     public synchronized void clear() {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
index fb6396a77a..ea82788813 100755
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
@@ -144,61 +144,61 @@ public class FSSObsRecord extends PersistablePluginDataObject implements
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float windSpeed = -9999;
+    private float windSpeed = -9999f;
 
     // Wind gust in knots
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float windGust = -9999;
+    private float windGust = -9999f;
 
     // Observed maximum wind speed in knots
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float maxWindSpeed = -9999;
+    private float maxWindSpeed = -9999f;
 
     // Observed wind direction in azimuth degrees
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float windDir;
+    private float windDir = -9999f;
 
     // Observed wind chill in Fahrenheit
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float windChill = -9999;
+    private float windChill = -9999f;
 
     // Observed high resolution wave height in
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float highResWaveHeight = -9999;
+    private float highResWaveHeight = -9999f;
 
     // Observed wave steepness in seconds ??? None
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float waveSteepness = -9999;
+    private float waveSteepness = -9999f;
 
     // Observed visibility in Statute miles
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float visibility = -9999;
+    private float visibility = -9999f;
 
     // Observed visibility in meters for Maritime obs.
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float horzVisibility = -9999;
+    private float horzVisibility = -9999f;
 
     // Observed temperature in degrees in Farenheit
     @Transient
     @DynamicSerializeElement
     @XmlElement
-    private float temperature = -9999;
+    private float temperature = -9999f;
 
     // in feet
     @Transient
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/discrete/DiscreteDefinition.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/discrete/DiscreteDefinition.java
index 373ae7ad40..4152a5958d 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/discrete/DiscreteDefinition.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/discrete/DiscreteDefinition.java
@@ -40,6 +40,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 10, 2011            randerso     Initial creation
+ * Jan 05, 2015  #5184     dgilling     Added getHazardDescription.
  * 
  * </pre>
  * 
@@ -484,4 +485,35 @@ public class DiscreteDefinition {
         sb.append("]");
         return sb.toString();
     }
+
+    /**
+     * Get a hazard description for a phen.sig value. This code was essentially
+     * copied from MakeHazardDialog.
+     * 
+     * @param parmNameAndLevel
+     *            Parm name in the parmName_Level format.
+     * @param phenSig
+     *            The phensig whose description is needed.
+     * 
+     * @return the description for the phensig.
+     */
+    public String getHazardDescription(String parmNameAndLevel, String phenSig) {
+        String sdesc = keyDesc(parmNameAndLevel, phenSig);
+
+        if (sdesc.isEmpty()) {
+            if ("CF.S".equals(phenSig)) {
+                sdesc = "Coastal Flood Statement";
+            } else if ("LS.S".equals(phenSig)) {
+                sdesc = "Lakeshore Flood Statement";
+            } else if ("MA.S".equals(phenSig)) {
+                sdesc = "Marine Weather Statement";
+            } else if ("HU.S".equals(phenSig)) {
+                sdesc = "Hurricane Local Statement";
+            } else {
+                sdesc = "UNKNOWN PHENOMENON.SIGNIFICANCE";
+            }
+        }
+
+        return sdesc;
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
index e4c0c8b1be..87afe5d450 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
@@ -19,6 +19,10 @@
  **/
 package com.raytheon.uf.common.dataplugin.gfe.python;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
@@ -43,6 +47,9 @@ import com.raytheon.uf.common.util.FileUtil;
  * Nov 11, 2014      #4953 randerso    Changed COMMON_GFE to public
  * Jan 23, 2015      #4027 randerso    added configured and site to getCommonGfeIncludePath
  * Mar 12, 2015      #4246 randerso    Changes to support VCModules at base, site, and user levels
+ * Jan 29, 2016      #5137 dgilling    Ensure all directory levels exist for 
+ *                                     smart tools, procedures, text products, 
+ *                                     utilities and text utilities.
  * </pre>
  * 
  * @author njensen
@@ -96,6 +103,69 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
     public static final String VCMOD_UTILS = FileUtil
             .join(VCMODULES, "utility");
 
+    /**
+     * Get all available localization levels, while optionally including or
+     * excluding the {@code USER} level and levels considered to be "higher"
+     * than it.
+     * <p>
+     * When it comes to {@code LocalizationLevel}, a higher level means one more
+     * specific than the other (e.g., SITE is higher than BASE, USER is higher
+     * than SITE).
+     * 
+     * @param includeUser
+     *            If {@code true} include level {@code USER} and levels higher
+     *            than it. If {@code false}, exclude those levels.
+     * @return The requested list of levels.
+     */
+    protected static List<LocalizationLevel> getLocalizationLevels(
+            boolean includeUser) {
+        LocalizationLevel[] levels = PATH_MANAGER.getAvailableLevels();
+        List<LocalizationLevel> retVal = new ArrayList<>(levels.length);
+        for (LocalizationLevel level : levels) {
+            /*
+             * A reminder: the natural ordering of LocalizationLevel is such
+             * that BASE < SITE < USER. So when we perform
+             * USER.compareTo(level), we have 2 scenarios:
+             * 
+             * 1. We automatically take any level less than USER
+             * 
+             * 2. If the includeUser flag is set, we also include any level
+             * which is greater than or equal to USER.
+             */
+            int compareToUser = level.compareTo(LocalizationLevel.USER);
+            if ((compareToUser < 0) || (includeUser)) {
+                retVal.add(0, level);
+            }
+        }
+
+        return retVal;
+    }
+
+    /**
+     * Builds a python-style include path for the given localization path in
+     * highest to lowest order (i.e., {@code USER} level appears in the path
+     * before {@code SITE} level appears before {@code BASE} level).
+     * 
+     * @param locType
+     *            The {@code LocalizationType} to use for the include path.
+     * @param locPath
+     *            The path to the folder in the localization store.
+     * @param includeUser
+     *            If {@code true} include level {@code USER} and levels higher
+     *            than it. If {@code false}, exclude those levels.
+     * @return The python include path
+     */
+    protected static String buildIncludePath(LocalizationType locType,
+            String locPath, boolean includeUser) {
+        Collection<LocalizationLevel> levels = getLocalizationLevels(includeUser);
+        Collection<String> paths = new ArrayList<>(levels.size());
+        for (LocalizationLevel level : levels) {
+            paths.add(getPath(PATH_MANAGER.getContext(locType, level), locPath));
+        }
+
+        return PyUtil.buildJepIncludePath(true, paths.toArray(new String[0]));
+    }
+
     public static LocalizationFile getCommonGfeLF(LocalizationContext ctx) {
         return PATH_MANAGER.getLocalizationFile(ctx, COMMON_GFE);
     }
@@ -147,18 +217,11 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
     // Include Path getters
 
     public static String getCommonGfeIncludePath() {
+        String commonGfeIncludePath = buildIncludePath(
+                LocalizationType.COMMON_STATIC, COMMON_GFE, false);
+
         String pythonDir = getCommonPythonIncludePath();
-        String baseDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.COMMON_STATIC, LocalizationLevel.BASE),
-                COMMON_GFE);
-        String configDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.COMMON_STATIC, LocalizationLevel.CONFIGURED),
-                COMMON_GFE);
-        String siteDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.COMMON_STATIC, LocalizationLevel.SITE),
-                COMMON_GFE);
-        return PyUtil.buildJepIncludePath(pythonDir, siteDir, configDir,
-                baseDir);
+        return PyUtil.buildJepIncludePath(pythonDir, commonGfeIncludePath);
     }
 
     public static String getProceduresIncludePath() {
@@ -166,20 +229,8 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
     }
 
     public static String getProceduresIncludePath(boolean includeUser) {
-        String baseDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE),
-                PROCEDURES);
-        String siteDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.SITE),
-                PROCEDURES);
-        if (includeUser) {
-            String userDir = getPath(PATH_MANAGER.getContext(
-                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER),
-                    PROCEDURES);
-            return PyUtil.buildJepIncludePath(userDir, siteDir, baseDir);
-        } else {
-            return PyUtil.buildJepIncludePath(siteDir, baseDir);
-        }
+        return buildIncludePath(LocalizationType.CAVE_STATIC, PROCEDURES,
+                includeUser);
     }
 
     public static String getTextUtilitiesIncludePath() {
@@ -187,22 +238,8 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
     }
 
     public static String getTextUtilitiesIncludePath(boolean includeUser) {
-        String baseDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE), REGULAR);
-        String configDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.CONFIGURED),
-                REGULAR);
-        String siteDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.SITE), REGULAR);
-        if (includeUser) {
-            String userDir = getPath(PATH_MANAGER.getContext(
-                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER),
-                    REGULAR);
-            return PyUtil.buildJepIncludePath(userDir, siteDir, configDir,
-                    baseDir);
-        } else {
-            return PyUtil.buildJepIncludePath(siteDir, configDir, baseDir);
-        }
+        return buildIncludePath(LocalizationType.CAVE_STATIC, REGULAR,
+                includeUser);
     }
 
     public static String getTextProductsIncludePath() {
@@ -210,24 +247,8 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
     }
 
     public static String getTextProductsIncludePath(boolean includeUser) {
-        String baseDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE),
-                TEXT_PRODUCTS);
-        String configDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.CONFIGURED),
-                TEXT_PRODUCTS);
-        String siteDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.SITE),
-                TEXT_PRODUCTS);
-        if (includeUser) {
-            String userDir = getPath(PATH_MANAGER.getContext(
-                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER),
-                    TEXT_PRODUCTS);
-            return PyUtil.buildJepIncludePath(userDir, siteDir, configDir,
-                    baseDir);
-        } else {
-            return PyUtil.buildJepIncludePath(siteDir, configDir, baseDir);
-        }
+        return buildIncludePath(LocalizationType.CAVE_STATIC, TEXT_PRODUCTS,
+                includeUser);
     }
 
     public static String getSmartToolsIncludePath() {
@@ -235,20 +256,8 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
     }
 
     public static String getSmartToolsIncludePath(boolean includeUser) {
-        String baseDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE),
-                SMART_TOOLS);
-        String siteDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.SITE),
-                SMART_TOOLS);
-        if (includeUser) {
-            String userDir = getPath(PATH_MANAGER.getContext(
-                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER),
-                    SMART_TOOLS);
-            return PyUtil.buildJepIncludePath(userDir, siteDir, baseDir);
-        } else {
-            return PyUtil.buildJepIncludePath(siteDir, baseDir);
-        }
+        return buildIncludePath(LocalizationType.CAVE_STATIC, SMART_TOOLS,
+                includeUser);
     }
 
     public static String getUtilitiesIncludePath() {
@@ -256,20 +265,8 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
     }
 
     public static String getUtilitiesIncludePath(boolean includeUser) {
-        String baseDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE),
-                UTILITIES);
-        String siteDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.SITE),
-                UTILITIES);
-        if (includeUser) {
-            String userDir = getPath(PATH_MANAGER.getContext(
-                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER),
-                    UTILITIES);
-            return PyUtil.buildJepIncludePath(userDir, siteDir, baseDir);
-        } else {
-            return PyUtil.buildJepIncludePath(siteDir, baseDir);
-        }
+        return buildIncludePath(LocalizationType.CAVE_STATIC, UTILITIES,
+                includeUser);
     }
 
     public static String getVtecIncludePath() {
@@ -293,20 +290,11 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
     }
 
     public static String getConfigIncludePath(boolean includeUser) {
+        String configIncludePath = buildIncludePath(
+                LocalizationType.CAVE_STATIC, CONFIG, includeUser);
+
         String pythonPath = GfePyIncludeUtil.getCommonPythonIncludePath();
-        String baseDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.BASE), CONFIG);
-        String siteDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.SITE), CONFIG);
-        if (includeUser) {
-            String userDir = getPath(PATH_MANAGER.getContext(
-                    LocalizationType.CAVE_STATIC, LocalizationLevel.USER),
-                    CONFIG);
-            return PyUtil.buildJepIncludePath(userDir, siteDir, baseDir,
-                    pythonPath);
-        } else {
-            return PyUtil.buildJepIncludePath(siteDir, baseDir, pythonPath);
-        }
+        return PyUtil.buildJepIncludePath(configIncludePath, pythonPath);
     }
 
     public static String getIToolIncludePath() {
@@ -359,15 +347,7 @@ public class GfePyIncludeUtil extends PythonIncludePathUtil {
     }
 
     public static String getVCModulesIncludePath(String siteId) {
-        String baseDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.COMMON_STATIC, LocalizationLevel.BASE),
-                VCMODULES);
-        String siteDir = getPath(PATH_MANAGER.getContextForSite(
-                LocalizationType.COMMON_STATIC, siteId), VCMODULES);
-        String userDir = getPath(PATH_MANAGER.getContext(
-                LocalizationType.COMMON_STATIC, LocalizationLevel.USER),
-                VCMODULES);
-        return PyUtil.buildJepIncludePath(userDir, siteDir, baseDir);
+        return buildIncludePath(LocalizationType.COMMON_STATIC, VCMODULES, true);
     }
 
     public static String getVCModUtilsIncludePath() {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.java
index 27dabf6d30..5c14e1313d 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.java
@@ -19,10 +19,14 @@
  **/
 package com.raytheon.uf.common.dataplugin.gfe.request;
 
+import java.util.List;
+
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
+import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
 /**
- * TODO Add Description
+ * Request to retrieve the configured time zone for the specified 3-character
+ * site identifiers.
  * 
  * <pre>
  * 
@@ -31,6 +35,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jan 19, 2011            dgilling     Initial creation
+ * Nov 17, 2015  #5129     dgilling     Accept multiple site IDs to better match A1.
  * 
  * </pre>
  * 
@@ -41,4 +46,21 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 @DynamicSerialize
 public class GetSiteTimeZoneInfoRequest extends AbstractGfeRequest {
 
+    @DynamicSerializeElement
+    private List<String> requestedSiteIDs;
+
+    public GetSiteTimeZoneInfoRequest() {
+    }
+
+    public GetSiteTimeZoneInfoRequest(List<String> siteIDs) {
+        this.requestedSiteIDs = siteIDs;
+    }
+
+    public List<String> getRequestedSiteIDs() {
+        return requestedSiteIDs;
+    }
+
+    public void setRequestedSiteIDs(List<String> requestedSiteIDs) {
+        this.requestedSiteIDs = requestedSiteIDs;
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/IscRequestQueryRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/IscRequestQueryRequest.java
index 857c8c3693..557c4493c3 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/IscRequestQueryRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/IscRequestQueryRequest.java
@@ -19,10 +19,17 @@
  **/
 package com.raytheon.uf.common.dataplugin.gfe.request;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
+import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
 /**
- * TODO Add Description
+ * Request to retrieve ISC configuration (requested parms) and information about
+ * the ISC neighbors for the specified site.
  * 
  * <pre>
  * 
@@ -30,6 +37,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 22, 2009 3058       rjpeter     Initial creation
+ * Nov 30, 2015 5129       dgilling    Add IscQueryResponse.
  * 
  * </pre>
  * 
@@ -40,4 +48,57 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 @DynamicSerialize
 public class IscRequestQueryRequest extends AbstractGfeRequest {
 
+    @DynamicSerialize
+    public static class IscQueryResponse {
+
+        @DynamicSerializeElement
+        private Map<String, Map<String, List<Map<String, String>>>> domainDict;
+
+        @DynamicSerializeElement
+        private Map<String, Map<String, String>> serverDictT2S;
+
+        @DynamicSerializeElement
+        private Collection<String> requestedParms;
+
+        public IscQueryResponse() {
+            this.domainDict = Collections.emptyMap();
+            this.serverDictT2S = Collections.emptyMap();
+            this.requestedParms = Collections.emptyList();
+        }
+
+        public IscQueryResponse(
+                Map<String, Map<String, List<Map<String, String>>>> domainDict,
+                Map<String, Map<String, String>> serverDictT2S,
+                Collection<String> requestedParms) {
+            this.domainDict = domainDict;
+            this.serverDictT2S = serverDictT2S;
+            this.requestedParms = requestedParms;
+        }
+
+        public Collection<String> getRequestedParms() {
+            return requestedParms;
+        }
+
+        public void setRequestedParms(Collection<String> requestedParms) {
+            this.requestedParms = requestedParms;
+        }
+
+        public Map<String, Map<String, List<Map<String, String>>>> getDomainDict() {
+            return domainDict;
+        }
+
+        public void setDomainDict(
+                Map<String, Map<String, List<Map<String, String>>>> domainDict) {
+            this.domainDict = domainDict;
+        }
+
+        public Map<String, Map<String, String>> getServerDictT2S() {
+            return serverDictT2S;
+        }
+
+        public void setServerDictT2S(
+                Map<String, Map<String, String>> serverDictT2S) {
+            this.serverDictT2S = serverDictT2S;
+        }
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoLookup.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoLookup.java
index 8835b01e67..28067af773 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoLookup.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/dataset/DatasetInfoLookup.java
@@ -1,24 +1,26 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
 package com.raytheon.uf.common.dataplugin.grid.dataset;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -28,28 +30,30 @@ import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 
 /**
- * 
+ *
  * Provides logic to read datasetInfo files from localization and provide lookup
  * by datasetId.
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date          Ticket#  Engineer    Description
  * ------------- -------- ----------- --------------------------
  * Feb 27, 2012           bsteffen     Initial creation
  * Dec 16, 2013  2574     bsteffen     Update deprecated method call.
  * Jul 21, 2014  3373     bclement     changed to use single type JAXB manager
- * 
+ * Feb 15, 2016  5244     nabowle      Replace deprecated LocalizationFile methods.
+ *
  * </pre>
- * 
+ *
  * @author bsteffen
  * @version 1.0
  */
@@ -99,15 +103,15 @@ public class DatasetInfoLookup {
             if (file == null || !file.exists()) {
                 return;
             }
-            try {
-                DatasetInfoSet set = manager.unmarshalFromXmlFile(file
-                        .getFile());
+            try (InputStream is = file.openInputStream()) {
+                DatasetInfoSet set = manager.unmarshalFromInputStream(is);
                 for (DatasetInfo info : set.getInfos()) {
                     infoMap.put(info.getDatasetId(), info);
                 }
-            } catch (SerializationException e) {
+            } catch (SerializationException | IOException
+                    | LocalizationException e) {
                 statusHandler.error(
-                        "Error reading dataset info: " + file.getName()
+                        "Error reading dataset info: " + file.getPath()
                                 + " has been ignored.", e);
             }
         }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/pwpf_frzr.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/pwpf_frzr.cmap
new file mode 100644
index 0000000000..1efcd4f480
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/pwpf_frzr.cmap
@@ -0,0 +1,1140 @@
+<?xml version="1.0" ?>
+<colorMap>
+    <color r="0.0" g="0.0" b="0.0" a="0"></color>
+    <!-- .01 to .1 -->
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <!-- .1 to .25 -->
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <!-- .25 to .5 -->
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <!-- .5 to .75 -->
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <!-- .75 to 1 -->
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <!-- 1 to 1.5 -->
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <!-- 1.5 to 2 -->
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <!-- 2 to 2.5 -->
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <!-- 2.5 to 3 -->
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <!-- 3 to 4 -->
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <!-- 4 to 5 -->
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <!-- 5 to 6 -->
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <!-- 6 to 7 -->
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <!-- 7 to 8 -->
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <!-- 8 to 9 -->
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <!-- 9 to 10 -->
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <!-- 10+ -->
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+</colorMap>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/pwpf_prob.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/pwpf_prob.cmap
new file mode 100644
index 0000000000..da6a3228d1
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/pwpf_prob.cmap
@@ -0,0 +1,217 @@
+<?xml version="1.0" ?>
+<colorMap>
+    <color r="0.0" g="0.0" b="0.0" a="0"></color>
+    <color r="0.0" g="0.0" b="0.0" a="0"></color>
+    <!-- 1 - 5 -->
+    <color r="0.54509807" g="0.2784314" b="0.14901961" a="1"></color>
+    <color r="0.54509807" g="0.2784314" b="0.14901961" a="1"></color>
+    <color r="0.54509807" g="0.2784314" b="0.14901961" a="1"></color>
+    <color r="0.54509807" g="0.2784314" b="0.14901961" a="1"></color>
+    <color r="0.54509807" g="0.2784314" b="0.14901961" a="1"></color>
+    <color r="0.54509807" g="0.2784314" b="0.14901961" a="1"></color>
+    <color r="0.54509807" g="0.2784314" b="0.14901961" a="1"></color>
+    <color r="0.54509807" g="0.2784314" b="0.14901961" a="1"></color>
+    <!-- 5 - 10 -->
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+    <!-- 10 - 20 -->
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <!-- 20 - 30 -->
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <color r="0.0" g="0.80392157" b="0.0" a="1"></color>
+    <!-- 30 - 40 -->
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <!-- 40 - 50 -->
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <!-- 50 - 60 -->
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <!-- 60 - 70 -->
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <!-- 70 - 80 -->
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+     <!-- 80 - 90 -->
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <color r="1.0" g="0.50980395" b="0.2784314" a="1"></color>
+    <!-- 90 - 95 -->
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <color r="0.93333334" g="0.17254902" b="0.17254902" a="1"></color>
+    <!-- 95 - 100 -->
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+</colorMap>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/pwpf_snow.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/pwpf_snow.cmap
new file mode 100644
index 0000000000..0b1ee61c71
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/pwpf_snow.cmap
@@ -0,0 +1,70 @@
+<?xml version="1.0" ?>
+<colorMap>
+    <!-- 0 to 1 -->
+    <color r="0.0" g="0.0" b="0.0" a="0"></color>
+    <!-- 1 to 2 -->
+    <color r="0.49803922" g="1.0" b="0.0" a="1"></color>
+    <!-- 2 to 4 -->
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <color r="0.0" g="0.8039216" b="0.0" a="1"></color>
+    <!-- 4 to 6 -->
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <color r="0.0" g="0.54509807" b="0.0" a="1"></color>
+    <!-- 6 to 8 -->
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <color r="0.0627451" g="0.30588236" b="0.54509807" a="1"></color>
+    <!-- 8 to 10 -->
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <color r="0.11764706" g="0.5647059" b="1.0" a="1"></color>
+    <!-- 10 to 12 -->
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.69803923" b="0.93333334" a="1"></color>
+    <!-- 12 to 15 -->
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <color r="0.0" g="0.93333334" b="0.93333334" a="1"></color>
+    <!-- 15 to 18 -->
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <color r="0.5372549" g="0.40784314" b="0.8039216" a="1"></color>
+    <!-- 18 to 21 -->
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <color r="0.5686275" g="0.17254902" b="0.93333334" a="1"></color>
+    <!-- 21 to 24 -->
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.54509807" a="1"></color>
+    <!-- 24 to 27 -->
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <color r="0.54509807" g="0.0" b="0.0" a="1"></color>
+    <!-- 27 to 30 -->
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.0" b="0.0" a="1"></color>
+    <!-- 30 to 33 -->
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <color r="0.93333334" g="0.2509804" b="0.0" a="1"></color>
+    <!-- 33 to 36 -->
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <color r="1.0" g="0.49803922" b="0.0" a="1"></color>
+    <!-- 36 to 42 -->
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <color r="0.8039216" g="0.52156866" b="0.0" a="1"></color>
+    <!-- 42 to 48 -->
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <color r="1.0" g="0.84313726" b="0.0" a="1"></color>
+    <!-- 48 to 49 -->
+    <color r="0.93333334" g="0.93333334" b="0.0" a="1"></color>
+</colorMap>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/grid/dataset/alias/d2d-title.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/grid/dataset/alias/d2d-title.xml
index 823532a8db..3edce04d13 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/grid/dataset/alias/d2d-title.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/grid/dataset/alias/d2d-title.xml
@@ -105,10 +105,6 @@
 	<alias base="MRF26">gfsLR26</alias>
 	<alias base="MRF">gfsLR</alias>
 	<alias base="mrfNH">gfsLR</alias>
-	<alias base="NGM202">NGM180</alias>
-	<alias base="NGM207">NGM95</alias>
-	<alias base="NGM213">NGM90</alias>
-	<alias base="NGM">NGM80</alias>
 	<alias base="OPCWave180">OPCWave-W-ATL</alias>
 	<alias base="OPCWave181">OPCWave-NE-PAC</alias>
 	<alias base="OPCWave182">OPCWave-TE-PAC</alias>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
index d07921f6b2..71991e0ebf 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
@@ -4785,4 +4785,153 @@ in | .03937 | 0 |  4 |    |   |..|8000F0FF| | 16 | \
       <displayUnits>ft</displayUnits>
     </contourStyle>
   </styleRule>
+
+<!-- WPC Probablistic Winter Prediction Forecast (PWPF) -->
+  <styleRule>
+    <paramLevelMatches>
+      <parameter>TOTSN5pct12hr</parameter>
+      <parameter>TOTSN10pct12hr</parameter>
+      <parameter>TOTSN25pct12hr</parameter>
+      <parameter>TOTSN50pct12hr</parameter>
+      <parameter>TOTSN75pct12hr</parameter>
+      <parameter>TOTSN90pct12hr</parameter>
+      <parameter>TOTSN95pct12hr</parameter>
+
+      <parameter>TOTSN5pct24hr</parameter>
+      <parameter>TOTSN10pct24hr</parameter>
+      <parameter>TOTSN25pct24hr</parameter>
+      <parameter>TOTSN50pct24hr</parameter>
+      <parameter>TOTSN75pct24hr</parameter>
+      <parameter>TOTSN90pct24hr</parameter>
+      <parameter>TOTSN95pct24hr</parameter>
+
+      <parameter>TOTSN5pct48hr</parameter>
+      <parameter>TOTSN10pct48hr</parameter>
+      <parameter>TOTSN25pct48hr</parameter>
+      <parameter>TOTSN50pct48hr</parameter>
+      <parameter>TOTSN75pct48hr</parameter>
+      <parameter>TOTSN90pct48hr</parameter>
+      <parameter>TOTSN95pct48hr</parameter>
+
+      <parameter>TOTSN5pct72hr</parameter>
+      <parameter>TOTSN10pct72hr</parameter>
+      <parameter>TOTSN25pct72hr</parameter>
+      <parameter>TOTSN50pct72hr</parameter>
+      <parameter>TOTSN75pct72hr</parameter>
+      <parameter>TOTSN90pct72hr</parameter>
+      <parameter>TOTSN95pct72hr</parameter>
+    </paramLevelMatches>
+    <contourStyle>
+      <displayUnits label="in">in</displayUnits>
+      <contourLabeling labelSpacing="4">
+        <values>1 2 4 6 8 10 12 15 18 21 24 27 30 33 36 42 48</values>
+     </contourLabeling>
+    </contourStyle>
+  </styleRule>
+
+  <styleRule>
+    <paramLevelMatches>
+      <parameter>FRZR5pct12hr</parameter>
+      <parameter>FRZR10pct12hr</parameter>
+      <parameter>FRZR25pct12hr</parameter>
+      <parameter>FRZR50pct12hr</parameter>
+      <parameter>FRZR75pct12hr</parameter>
+      <parameter>FRZR90pct12hr</parameter>
+      <parameter>FRZR95pct12hr</parameter>
+
+      <parameter>FRZR5pct24hr</parameter>
+      <parameter>FRZR10pct24hr</parameter>
+      <parameter>FRZR25pct24hr</parameter>
+      <parameter>FRZR50pct24hr</parameter>
+      <parameter>FRZR75pct24hr</parameter>
+      <parameter>FRZR90pct24hr</parameter>
+      <parameter>FRZR95pct24hr</parameter>
+
+      <parameter>FRZR5pct48hr</parameter>
+      <parameter>FRZR10pct48hr</parameter>
+      <parameter>FRZR25pct48hr</parameter>
+      <parameter>FRZR50pct48hr</parameter>
+      <parameter>FRZR75pct48hr</parameter>
+      <parameter>FRZR90pct48hr</parameter>
+      <parameter>FRZR95pct48hr</parameter>
+
+      <parameter>FRZR5pct72hr</parameter>
+      <parameter>FRZR10pct72hr</parameter>
+      <parameter>FRZR25pct72hr</parameter>
+      <parameter>FRZR50pct72hr</parameter>
+      <parameter>FRZR75pct72hr</parameter>
+      <parameter>FRZR90pct72hr</parameter>
+      <parameter>FRZR95pct72hr</parameter>
+    </paramLevelMatches>
+    <contourStyle>
+      <displayUnits label="in">in</displayUnits>
+      <contourLabeling labelSpacing="4">
+        <values>.01 .1 .25 .5 .75 1 1.5 2 2.5 3 4 5 6 7 8 9 10</values>
+     </contourLabeling>
+    </contourStyle>
+  </styleRule>
+
+  <styleRule>
+    <paramLevelMatches>
+      <parameter>FRZR0.01in12hr</parameter>
+      <parameter>FRZR0.1in12hr</parameter>
+      <parameter>FRZR0.25in12hr</parameter>
+      <parameter>FRZR0.5in12hr</parameter>
+      <parameter>FRZR1in12hr</parameter>
+
+      <parameter>FRZR0.01in24hr</parameter>
+      <parameter>FRZR0.1in24hr</parameter>
+      <parameter>FRZR0.25in24hr</parameter>
+      <parameter>FRZR0.5in24hr</parameter>
+      <parameter>FRZR1in24hr</parameter>
+
+      <parameter>FRZR0.1in48hr</parameter>
+      <parameter>FRZR0.25in48hr</parameter>
+      <parameter>FRZR0.5in48hr</parameter>
+      <parameter>FRZR1in48hr</parameter>
+
+      <parameter>FRZR0.1in72hr</parameter>
+      <parameter>FRZR0.25in72hr</parameter>
+      <parameter>FRZR0.5in72hr</parameter>
+      <parameter>FRZR1in72hr</parameter>
+
+      <parameter>TOTSN1in12hr</parameter>
+      <parameter>TOTSN2in12hr</parameter>
+      <parameter>TOTSN4in12hr</parameter>
+      <parameter>TOTSN6in12hr</parameter>
+      <parameter>TOTSN8in12hr</parameter>
+      <parameter>TOTSN12in12hr</parameter>
+      <parameter>TOTSN18in12hr</parameter>
+
+      <parameter>TOTSN1in24hr</parameter>
+      <parameter>TOTSN2in24hr</parameter>
+      <parameter>TOTSN4in24hr</parameter>
+      <parameter>TOTSN6in24hr</parameter>
+      <parameter>TOTSN8in24hr</parameter>
+      <parameter>TOTSN12in24hr</parameter>
+      <parameter>TOTSN18in24hr</parameter>
+
+      <parameter>TOTSN2in48hr</parameter>
+      <parameter>TOTSN4in48hr</parameter>
+      <parameter>TOTSN8in48hr</parameter>
+      <parameter>TOTSN12in48hr</parameter>
+      <parameter>TOTSN18in48hr</parameter>
+      <parameter>TOTSN24in48hr</parameter>
+      <parameter>TOTSN30in48hr</parameter>
+
+      <parameter>TOTSN2in72hr</parameter>
+      <parameter>TOTSN4in72hr</parameter>
+      <parameter>TOTSN8in72hr</parameter>
+      <parameter>TOTSN12in72hr</parameter>
+      <parameter>TOTSN18in72hr</parameter>
+      <parameter>TOTSN24in72hr</parameter>
+      <parameter>TOTSN30in72hr</parameter>
+    </paramLevelMatches>
+    <contourStyle>
+      <displayUnits label="%">%/100</displayUnits>
+      <contourLabeling labelSpacing="4">
+        <values>1 5 10 20 30 40 50 60 70 80 90 95</values>
+     </contourLabeling>
+    </contourStyle>
+  </styleRule>
 </styleRuleset>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
index da67696335..ea19d57364 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
@@ -5606,4 +5606,169 @@
             <displayUnits>kts</displayUnits>
         </imageStyle>
     </styleRule>
+
+<!-- WPC Probablistic Winter Prediction Forecast (PWPF) -->
+    <styleRule>
+        <paramLevelMatches>
+            <parameter>TOTSN5pct12hr</parameter>
+            <parameter>TOTSN10pct12hr</parameter>
+            <parameter>TOTSN25pct12hr</parameter>
+            <parameter>TOTSN50pct12hr</parameter>
+            <parameter>TOTSN75pct12hr</parameter>
+            <parameter>TOTSN90pct12hr</parameter>
+            <parameter>TOTSN95pct12hr</parameter>
+
+            <parameter>TOTSN5pct24hr</parameter>
+            <parameter>TOTSN10pct24hr</parameter>
+            <parameter>TOTSN25pct24hr</parameter>
+            <parameter>TOTSN50pct24hr</parameter>
+            <parameter>TOTSN75pct24hr</parameter>
+            <parameter>TOTSN90pct24hr</parameter>
+            <parameter>TOTSN95pct24hr</parameter>
+
+            <parameter>TOTSN5pct48hr</parameter>
+            <parameter>TOTSN10pct48hr</parameter>
+            <parameter>TOTSN25pct48hr</parameter>
+            <parameter>TOTSN50pct48hr</parameter>
+            <parameter>TOTSN75pct48hr</parameter>
+            <parameter>TOTSN90pct48hr</parameter>
+            <parameter>TOTSN95pct48hr</parameter>
+
+            <parameter>TOTSN5pct72hr</parameter>
+            <parameter>TOTSN10pct72hr</parameter>
+            <parameter>TOTSN25pct72hr</parameter>
+            <parameter>TOTSN50pct72hr</parameter>
+            <parameter>TOTSN75pct72hr</parameter>
+            <parameter>TOTSN90pct72hr</parameter>
+            <parameter>TOTSN95pct72hr</parameter>
+        </paramLevelMatches>
+        <imageStyle>
+            <displayUnits label="in">in</displayUnits>
+            <range scale="LINEAR"> 
+                <minValue>0</minValue>
+                <maxValue>49</maxValue> 
+            </range>
+            <colorbarLabeling>
+                <increment>2</increment>
+            </colorbarLabeling>
+            <defaultColormap>Grid/pwpf_snow</defaultColormap>
+            <interpolate>false</interpolate>
+        </imageStyle>
+    </styleRule>
+    <styleRule>
+        <paramLevelMatches>
+            <parameter>FRZR5pct12hr</parameter>
+            <parameter>FRZR10pct12hr</parameter>
+            <parameter>FRZR25pct12hr</parameter>
+            <parameter>FRZR50pct12hr</parameter>
+            <parameter>FRZR75pct12hr</parameter>
+            <parameter>FRZR90pct12hr</parameter>
+            <parameter>FRZR95pct12hr</parameter>
+
+            <parameter>FRZR5pct24hr</parameter>
+            <parameter>FRZR10pct24hr</parameter>
+            <parameter>FRZR25pct24hr</parameter>
+            <parameter>FRZR50pct24hr</parameter>
+            <parameter>FRZR75pct24hr</parameter>
+            <parameter>FRZR90pct24hr</parameter>
+            <parameter>FRZR95pct24hr</parameter>
+
+            <parameter>FRZR5pct48hr</parameter>
+            <parameter>FRZR10pct48hr</parameter>
+            <parameter>FRZR25pct48hr</parameter>
+            <parameter>FRZR50pct48hr</parameter>
+            <parameter>FRZR75pct48hr</parameter>
+            <parameter>FRZR90pct48hr</parameter>
+            <parameter>FRZR95pct48hr</parameter>
+
+            <parameter>FRZR5pct72hr</parameter>
+            <parameter>FRZR10pct72hr</parameter>
+            <parameter>FRZR25pct72hr</parameter>
+            <parameter>FRZR50pct72hr</parameter>
+            <parameter>FRZR75pct72hr</parameter>
+            <parameter>FRZR90pct72hr</parameter>
+            <parameter>FRZR95pct72hr</parameter>
+        </paramLevelMatches>
+        <imageStyle>
+            <displayUnits label="in">in</displayUnits>
+            <range scale="LINEAR"> 
+                <minValue>0</minValue>
+                <maxValue>11</maxValue> 
+            </range>
+            <colorbarLabeling>
+                <increment>1</increment>
+            </colorbarLabeling>
+            <defaultColormap>Grid/pwpf_frzr</defaultColormap>
+            <interpolate>false</interpolate>
+        </imageStyle>
+    </styleRule>
+	<styleRule>
+        <paramLevelMatches>
+            <parameter>FRZR0.01in12hr</parameter>
+            <parameter>FRZR0.1in12hr</parameter>
+            <parameter>FRZR0.25in12hr</parameter>
+            <parameter>FRZR0.5in12hr</parameter>
+            <parameter>FRZR1in12hr</parameter>
+
+            <parameter>FRZR0.01in24hr</parameter>
+            <parameter>FRZR0.1in24hr</parameter>
+            <parameter>FRZR0.25in24hr</parameter>
+            <parameter>FRZR0.5in24hr</parameter>
+            <parameter>FRZR1in24hr</parameter>
+
+            <parameter>FRZR0.1in48hr</parameter>
+            <parameter>FRZR0.25in48hr</parameter>
+            <parameter>FRZR0.5in48hr</parameter>
+            <parameter>FRZR1in48hr</parameter>
+
+            <parameter>FRZR0.1in72hr</parameter>
+            <parameter>FRZR0.25in72hr</parameter>
+            <parameter>FRZR0.5in72hr</parameter>
+            <parameter>FRZR1in72hr</parameter>
+
+            <parameter>TOTSN1in12hr</parameter>
+            <parameter>TOTSN2in12hr</parameter>
+            <parameter>TOTSN4in12hr</parameter>
+            <parameter>TOTSN6in12hr</parameter>
+            <parameter>TOTSN8in12hr</parameter>
+            <parameter>TOTSN12in12hr</parameter>
+            <parameter>TOTSN18in12hr</parameter>
+
+            <parameter>TOTSN1in24hr</parameter>
+            <parameter>TOTSN2in24hr</parameter>
+            <parameter>TOTSN4in24hr</parameter>
+            <parameter>TOTSN6in24hr</parameter>
+            <parameter>TOTSN8in24hr</parameter>
+            <parameter>TOTSN12in24hr</parameter>
+            <parameter>TOTSN18in24hr</parameter>
+
+            <parameter>TOTSN2in48hr</parameter>
+            <parameter>TOTSN4in48hr</parameter>
+            <parameter>TOTSN8in48hr</parameter>
+            <parameter>TOTSN12in48hr</parameter>
+            <parameter>TOTSN18in48hr</parameter>
+            <parameter>TOTSN24in48hr</parameter>
+            <parameter>TOTSN30in48hr</parameter>
+
+            <parameter>TOTSN2in72hr</parameter>
+            <parameter>TOTSN4in72hr</parameter>
+            <parameter>TOTSN8in72hr</parameter>
+            <parameter>TOTSN12in72hr</parameter>
+            <parameter>TOTSN18in72hr</parameter>
+            <parameter>TOTSN24in72hr</parameter>
+            <parameter>TOTSN30in72hr</parameter>
+        </paramLevelMatches>
+        <imageStyle>
+            <displayUnits label="%">%/100</displayUnits>
+            <range scale="LINEAR"> 
+                <minValue>0</minValue>
+                <maxValue>100</maxValue> 
+            </range>
+            <colorbarLabeling>
+                <increment>10</increment>
+            </colorbarLabeling>
+            <defaultColormap>Grid/pwpf_prob</defaultColormap>
+            <interpolate>false</interpolate>
+        </imageStyle>
+    </styleRule>
 </styleRuleset>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetConstants.java b/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetConstants.java
index ab03e8a788..1a1542495e 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetConstants.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetConstants.java
@@ -29,13 +29,13 @@ package com.raytheon.uf.common.dataplugin.pointset;
  * SOFTWARE HISTORY
  * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- --------------------
  * Aug 28, 2015  4709     bsteffen  Initial creation
+ * Jan 21, 2016  5208     bsteffen  Add scale and offset
  * 
  * </pre>
  * 
  * @author bsteffen
- * @version 1.0
  */
 public class PointSetConstants {
 
@@ -60,4 +60,8 @@ public class PointSetConstants {
 
     public static final String LEVEL_TWO = LEVEL + ".leveltwovalue";
 
+    public static final String ADD_OFFSET = "add_offset";
+
+    public static final String SCALE_FACTOR = "scale_factor";
+
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetData.java
new file mode 100644
index 0000000000..9cd8043471
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetData.java
@@ -0,0 +1,158 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.common.dataplugin.pointset;
+
+import java.nio.Buffer;
+import java.nio.ByteBuffer;
+import java.nio.FloatBuffer;
+import java.nio.IntBuffer;
+import java.nio.ShortBuffer;
+
+import javax.measure.converter.AddConverter;
+import javax.measure.converter.MultiplyConverter;
+import javax.measure.converter.RationalConverter;
+import javax.measure.converter.UnitConverter;
+
+/**
+ * 
+ * Store the raw data for pointset. The primary structure is a {@link Buffer}
+ * containing numeric data for each point. This also has support for products
+ * that use scale and offset values in addition to the raw numeric data(This is
+ * for packing the data into bytes or shorts).
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- --------------------------
+ * Jan 20, 2016  5208     bsteffen  Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bsteffen
+ */
+public class PointSetData {
+
+    private Buffer data;
+
+    private Float scale;
+
+    private Float offset;
+
+    public PointSetData() {
+
+    }
+
+    public PointSetData(Buffer data) {
+        this.data = data;
+    }
+
+    public Buffer getData() {
+        return data;
+    }
+
+    public void setData(Buffer data) {
+        this.data = data;
+    }
+
+    public Float getScale() {
+        return scale;
+    }
+
+    public void setScale(Float scale) {
+        this.scale = scale;
+    }
+
+    public Float getOffset() {
+        return offset;
+    }
+
+    public void setOffset(Float offset) {
+        this.offset = offset;
+    }
+
+    /**
+     * Converts the data using the specified converter. If there is a scale or
+     * offset present and the converter is a simple add or multiply then it is
+     * incorporated into the scale/offset and the data is left untouched, which
+     * keeps packed data small. For all other cases the data is converted to
+     * floats and the converter is applied to the data.
+     * 
+     * @param converter
+     */
+    public void convert(UnitConverter converter) {
+        if (data == null || converter == null
+                || converter == UnitConverter.IDENTITY) {
+            return;
+        }
+        if (scale != null
+                && (converter instanceof MultiplyConverter || converter instanceof RationalConverter)) {
+            this.scale = (float) converter.convert(this.scale);
+            if (this.offset != null) {
+                this.offset = (float) converter.convert(this.offset);
+            }
+        } else if (offset != null && converter instanceof AddConverter) {
+            this.offset = (float) converter.convert(this.offset);
+        } else {
+            FloatBuffer buffer = null;
+            if (this.data instanceof FloatBuffer) {
+                buffer = (FloatBuffer) this.data;
+            } else if (this.data instanceof ShortBuffer) {
+                ShortBuffer sbuffer = (ShortBuffer) this.data;
+                buffer = FloatBuffer.allocate(this.data.capacity());
+                for (int i = 0; i < buffer.capacity(); i += 1) {
+                    buffer.put(i, sbuffer.get(i));
+                }
+            } else if (this.data instanceof ByteBuffer) {
+                ByteBuffer bbuffer = (ByteBuffer) this.data;
+                buffer = FloatBuffer.allocate(this.data.capacity());
+                for (int i = 0; i < buffer.capacity(); i += 1) {
+                    buffer.put(i, bbuffer.get(i));
+                }
+            } else if (this.data instanceof IntBuffer) {
+                IntBuffer ibuffer = (IntBuffer) this.data;
+                buffer = FloatBuffer.allocate(this.data.capacity());
+                for (int i = 0; i < buffer.capacity(); i += 1) {
+                    buffer.put(i, ibuffer.get(i));
+                }
+            } else {
+                throw new IllegalStateException("Unsupported buffer of type: "
+                        + this.data.getClass().getSimpleName());
+            }
+            if (scale != null) {
+                for (int i = 0; i < buffer.capacity(); i += 1) {
+                    buffer.put(i, buffer.get(i) * scale);
+                }
+            }
+            if (offset != null) {
+                for (int i = 0; i < buffer.capacity(); i += 1) {
+                    buffer.put(i, buffer.get(i) + offset);
+                }
+            }
+            for (int i = 0; i < buffer.capacity(); i += 1) {
+                buffer.put(i, (float) converter.convert(buffer.get(i)));
+            }
+            this.scale = null;
+            this.offset = null;
+            this.data = buffer;
+        }
+    }
+}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetRecord.java
index 9855f568c1..92808c7604 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetRecord.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.pointset/src/com/raytheon/uf/common/dataplugin/pointset/PointSetRecord.java
@@ -19,7 +19,6 @@
  **/
 package com.raytheon.uf.common.dataplugin.pointset;
 
-import java.nio.Buffer;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -53,6 +52,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Date          Ticket#  Engineer  Description
  * ------------- -------- --------- --------------------------
  * Aug 11, 2015  4709     bsteffen  Initial creation
+ * Jan 21, 2016  5208     bsteffen  Store data in new object.
  * 
  * </pre>
  * 
@@ -89,7 +89,8 @@ public class PointSetRecord extends PersistablePluginDataObject {
     @DynamicSerializeElement
     private String locationId;
 
-    private transient Buffer data;
+    private transient PointSetData data;
+
 
     public String getDatasetId() {
         return datasetId;
@@ -123,11 +124,11 @@ public class PointSetRecord extends PersistablePluginDataObject {
         this.locationId = locationId;
     }
 
-    public Buffer getData() {
+    public PointSetData getData() {
         return data;
     }
 
-    public void setData(Buffer data) {
+    public void setData(PointSetData data) {
         this.data = data;
     }
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF
index 64a69705ea..6c69d8ac22 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Radar
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.radar
-Bundle-Version: 1.14.1.qualifier
+Bundle-Version: 1.16.0.qualifier
 Eclipse-RegisterBuddy: org.geotools
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/RadarsInUseUtil.java b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/RadarsInUseUtil.java
index e0ff752b60..22ce21ab09 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/RadarsInUseUtil.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/RadarsInUseUtil.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -21,8 +21,8 @@ package com.raytheon.uf.common.dataplugin.radar.util;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -36,6 +36,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManager;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -43,16 +44,18 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
 /**
  * Provides easy interface to grab configured sites for radar and various other
  * things
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jul 14, 2010            mnash     Initial creation
+ * Jul 14, 2010            mnash       Initial creation
+ * Feb 15, 2016 5244       nabowle     Replace deprecated LocalizationFile methods.
  * 
+ *
  * </pre>
- * 
+ *
  * @author mnash
  * @version 1.0
  */
@@ -118,25 +121,27 @@ public class RadarsInUseUtil {
                     + radarSite + ".  Using the base file.");
         }
         if (file != null) {
-            BufferedReader buf = new BufferedReader(new FileReader(
-                    file.getFile()));
-            String temp = buf.readLine();
-            temp = buf.readLine();
-            String radarType = "";
-            List<String> sites = new ArrayList<String>();
-            while (temp != null) {
-                temp = temp.trim();
-                if (temp.startsWith("#")) {
-                    sites = new ArrayList<String>();
-                    radarType = temp.substring(1, temp.indexOf(" ", 2));
-                    siteMap.put(radarType.trim(), sites);
-                } else if (!temp.trim().isEmpty()) {
-                    sites.add(temp);
-                }
+            try (BufferedReader buf = new BufferedReader(new InputStreamReader(
+                    file.openInputStream()))) {
+                String temp = buf.readLine();
                 temp = buf.readLine();
+                String radarType = "";
+                List<String> sites = new ArrayList<String>();
+                while (temp != null) {
+                    temp = temp.trim();
+                    if (temp.startsWith("#")) {
+                        sites = new ArrayList<String>();
+                        radarType = temp.substring(1, temp.indexOf(" ", 2));
+                        siteMap.put(radarType.trim(), sites);
+                    } else if (!temp.trim().isEmpty()) {
+                        sites.add(temp);
+                    }
+                    temp = buf.readLine();
+                }
+            } catch (LocalizationException e) {
+                throw new IOException("Error while reading " + file.getPath(),
+                        e);
             }
-            buf.close();
-
         }
     }
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/SsssRadarUtil.java b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/SsssRadarUtil.java
index 33579f2b58..ee0546ac45 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/SsssRadarUtil.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/util/SsssRadarUtil.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -21,53 +21,55 @@ package com.raytheon.uf.common.dataplugin.radar.util;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
 import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationFile;
-import com.raytheon.uf.common.localization.PathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
+import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.PathManager;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
  * TODO Add Description
- * 
+ *
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 03/07/13     DR15495    zwang       Handle SSSS radars
- * 
+ * Feb 15, 2016 5244       nabowle     Replace deprecated LocalizationFile methods.
+ *
  * </pre>
- * 
+ *
  * @author zwang
  * @version 1.0
  */
 
 public class SsssRadarUtil {
-    
-	private static final transient IUFStatusHandler statusHandler = UFStatus
-    .getHandler(RadarsInUseUtil.class);
-	
-	private static final IUFStatusHandler handler = UFStatus
-    .getHandler(RadarsInUseUtil.class);
-	
-	private static List<String> ssssRadars;
 
-	private static boolean parsed = false;
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+    .getHandler(RadarsInUseUtil.class);
+
+    private static final IUFStatusHandler handler = UFStatus
+    .getHandler(RadarsInUseUtil.class);
+
+    private static List<String> ssssRadars;
+
+    private static boolean parsed = false;
 
     private static synchronized void parseFile() throws IOException{
         PathManager pm = (PathManager) PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(LocalizationType.COMMON_STATIC,
                   LocalizationLevel.BASE);
-       
+
         if (parsed) {
             return;
         }
@@ -81,48 +83,50 @@ public class SsssRadarUtil {
             statusHandler.info("File ssssRadars.txt not found ");
         }
         else{
-            BufferedReader buf = new BufferedReader(new FileReader(
-                    file.getFile()));
-            String temp = buf.readLine();
-            while (temp != null) {
-                temp = temp.trim();
-                if (temp.startsWith("#")) {
-                    // Skip comment lines if any
-                	break;
-                } else if (!temp.trim().isEmpty()) {
-                    ssssRadars.add(temp);
+            try (BufferedReader buf = new BufferedReader(new InputStreamReader(
+                    file.openInputStream()))) {
+                String temp = buf.readLine();
+                while (temp != null) {
+                    temp = temp.trim();
+                    if (temp.startsWith("#")) {
+                        // Skip comment lines if any
+                        break;
+                    } else if (!temp.trim().isEmpty()) {
+                        ssssRadars.add(temp);
+                    }
+                    temp = buf.readLine();
                 }
-                temp = buf.readLine();
+            } catch (LocalizationException e) {
+                throw new IOException("Error reading " + file.getPath(), e);
             }
-            buf.close();
         }
     }
 
     public static List<String> getSsssRadars() {
         if (parsed)
-        	return ssssRadars;
+            return ssssRadars;
         else {
-    	    try {
-    	    	parseFile();
-    	    } catch (IOException e) {
-    	    	handler.handle(Priority.ERROR, "Error occurred looking up radars",
-    	    			e);
-    	    }
+            try {
+                parseFile();
+            } catch (IOException e) {
+                handler.handle(Priority.ERROR,
+                        "Error occurred looking up radars", e);
+            }
         }
         return ssssRadars;
     }
 
     public static boolean isSsssRadar(String radar) {
-    	if (!parsed) {
-    		try {
-    	    	parseFile();
-    	    } catch (IOException e) {
-    	    	handler.handle(Priority.ERROR, "Error occurred looking up radars",
-    	    			e);
-    	    }
-    	}
-    	
-    	return ssssRadars.contains(radar);
+        if (!parsed) {
+            try {
+                parseFile();
+            } catch (IOException e) {
+                handler.handle(Priority.ERROR,
+                        "Error occurred looking up radars", e);
+            }
+        }
+
+        return ssssRadars.contains(radar);
     }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/META-INF/MANIFEST.MF
index 04493f6167..20086fdc7e 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Satellite Common
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.satellite
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
  javax.persistence;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  javax.measure;bundle-version="1.0.0",
  com.raytheon.uf.common.dataaccess;bundle-version="1.0.0",
  com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatMapCoverage.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatMapCoverage.java
index 80c0339777..688cb1a678 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatMapCoverage.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatMapCoverage.java
@@ -36,7 +36,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.geotools.coverage.grid.GridEnvelope2D;
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.geotools.geometry.Envelope2D;
@@ -401,42 +401,56 @@ public class SatMapCoverage extends PersistableDataObject<Object> implements
 
     @Override
     public boolean equals(Object obj) {
-        if (this == obj)
+        if (this == obj) {
             return true;
-        if (obj == null)
+        }
+        if (obj == null) {
             return false;
-        if (getClass() != obj.getClass())
+        }
+        if (getClass() != obj.getClass()) {
             return false;
+        }
         SatMapCoverage other = (SatMapCoverage) obj;
-        if (projection != other.projection)
+        if (projection != other.projection) {
             return false;
+        }
         String crsWKT = getCrsWKT();
         String otherCrsWKT = other.getCrsWKT();
         if (crsWKT == null) {
-            if (otherCrsWKT != null)
+            if (otherCrsWKT != null) {
                 return false;
-        } else if (!crsWKT.equals(otherCrsWKT))
+            }
+        } else if (!crsWKT.equals(otherCrsWKT)) {
             return false;
-        if (Double.doubleToLongBits(dx) != Double.doubleToLongBits(other.dx))
+        }
+        if (Double.doubleToLongBits(dx) != Double.doubleToLongBits(other.dx)) {
             return false;
-        if (Double.doubleToLongBits(dy) != Double.doubleToLongBits(other.dy))
+        }
+        if (Double.doubleToLongBits(dy) != Double.doubleToLongBits(other.dy)) {
             return false;
+        }
         if (Double.doubleToLongBits(minX) != Double
-                .doubleToLongBits(other.minX))
+                .doubleToLongBits(other.minX)) {
             return false;
+        }
         if (Double.doubleToLongBits(minY) != Double
-                .doubleToLongBits(other.minY))
+                .doubleToLongBits(other.minY)) {
             return false;
+        }
         if (nx == null) {
-            if (other.nx != null)
+            if (other.nx != null) {
                 return false;
-        } else if (!nx.equals(other.nx))
+            }
+        } else if (!nx.equals(other.nx)) {
             return false;
+        }
         if (ny == null) {
-            if (other.ny != null)
+            if (other.ny != null) {
                 return false;
-        } else if (!ny.equals(other.ny))
+            }
+        } else if (!ny.equals(other.ny)) {
             return false;
+        }
         return true;
     }
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedTempToWVPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedTempToWVPixelConverter.java
index af26b019b8..cc8a94d44f 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedTempToWVPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedTempToWVPixelConverter.java
@@ -23,14 +23,14 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 public class DerivedTempToWVPixelConverter extends UnitConverter {
 
     private static final long serialVersionUID = 1L;
-    
+
     private static UnitConverter kelvinToCelsius = SI.KELVIN
-        .getConverterTo(SI.CELSIUS);
+            .getConverterTo(SI.CELSIUS);
 
     /*
      * (non-Javadoc)
@@ -40,15 +40,15 @@ public class DerivedTempToWVPixelConverter extends UnitConverter {
     @Override
     public double convert(double aTemp) throws ConversionException {
         aTemp = kelvinToCelsius.convert(aTemp);
-        
+
         double result = 145 - aTemp;
-        
+
         if (result < 0) {
             result = 0;
         } else if (result > 255) {
             result = 255;
         }
-        
+
         return result;
     }
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedWVPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedWVPixel.java
index eceac94f38..8ede425073 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedWVPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedWVPixel.java
@@ -25,7 +25,7 @@ import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 public class DerivedWVPixel extends DerivedUnit<Temperature> {
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedWVPixelToTempConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedWVPixelToTempConverter.java
index 7ea571f598..f3d46ce392 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedWVPixelToTempConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/counts/DerivedWVPixelToTempConverter.java
@@ -23,7 +23,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 public class DerivedWVPixelToTempConverter extends UnitConverter {
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericFromPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericFromPixelConverter.java
index 016ef0d242..03f7c53247 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericFromPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericFromPixelConverter.java
@@ -22,23 +22,23 @@ package com.raytheon.uf.common.dataplugin.satellite.units.generic;
 import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * TODO Add Description
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 16, 2010            jsanchez     Initial creation
- *
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
- * @version 1.0	
+ * @version 1.0
  */
 
 public class GenericFromPixelConverter extends UnitConverter {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericPixel.java
index 0db89a93d1..9883a863e0 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericPixel.java
@@ -23,23 +23,23 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.quantity.Dimensionless;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * TODO Add Description
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 16, 2010            jsanchez     Initial creation
- *
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
- * @version 1.0	
+ * @version 1.0
  */
 
 public class GenericPixel extends Unit<Dimensionless> {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericToPixelConverter.java
index 82d7da6f0d..0c2ce60d88 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/generic/GenericToPixelConverter.java
@@ -22,23 +22,23 @@ package com.raytheon.uf.common.dataplugin.satellite.units.generic;
 import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * TODO Add Description
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 16, 2010            jsanchez     Initial creation
- *
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
- * @version 1.0	
+ * @version 1.0
  */
 
 public class GenericToPixelConverter extends UnitConverter {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/PercentOfNormalTPWPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/PercentOfNormalTPWPixel.java
index feb3948edd..0a810d3ed8 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/PercentOfNormalTPWPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/PercentOfNormalTPWPixel.java
@@ -23,7 +23,7 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.quantity.Dimensionless;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.PixelToPercentConverter;
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/PolarPrecipWaterPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/PolarPrecipWaterPixel.java
index a470516e21..d56cb94551 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/PolarPrecipWaterPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/PolarPrecipWaterPixel.java
@@ -26,7 +26,7 @@ import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.PolarPrecipPixelToLengthConverter;
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderCloudAmountPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderCloudAmountPixel.java
index 573f8a4e4e..e400469c1c 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderCloudAmountPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderCloudAmountPixel.java
@@ -25,7 +25,7 @@ import javax.measure.quantity.Dimensionless;
 import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.CloudPixelToPercentConverter;
 
@@ -45,26 +45,26 @@ import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.CloudPixel
  */
 public class SounderCloudAmountPixel extends DerivedUnit<Dimensionless> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Override
-	public boolean equals(Object anObject) {
-		return (anObject instanceof SounderCloudAmountPixel);
-	}
+    @Override
+    public boolean equals(Object anObject) {
+        return (anObject instanceof SounderCloudAmountPixel);
+    }
 
-	@Override
-	public Unit<Dimensionless> getStandardUnit() {
-		return Unit.ONE;
-	}
+    @Override
+    public Unit<Dimensionless> getStandardUnit() {
+        return Unit.ONE;
+    }
 
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	@Override
-	public UnitConverter toStandardUnit() {
-		return new CloudPixelToPercentConverter();
-	}
+    @Override
+    public UnitConverter toStandardUnit() {
+        return new CloudPixelToPercentConverter();
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderCloudTopHeightPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderCloudTopHeightPixel.java
index 70e62dc664..7f5850817d 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderCloudTopHeightPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderCloudTopHeightPixel.java
@@ -26,7 +26,7 @@ import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.CloudPixelToHeightConverter;
 
@@ -46,26 +46,26 @@ import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.CloudPixel
  */
 public class SounderCloudTopHeightPixel extends DerivedUnit<Length> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Override
-	public boolean equals(Object anObject) {
-		return (anObject instanceof SounderCloudTopHeightPixel);
-	}
+    @Override
+    public boolean equals(Object anObject) {
+        return (anObject instanceof SounderCloudTopHeightPixel);
+    }
 
-	@Override
-	public Unit<Length> getStandardUnit() {
-		return SI.METRE;
-	}
+    @Override
+    public Unit<Length> getStandardUnit() {
+        return SI.METRE;
+    }
 
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	@Override
-	public UnitConverter toStandardUnit() {
-		return new CloudPixelToHeightConverter();
-	}
+    @Override
+    public UnitConverter toStandardUnit() {
+        return new CloudPixelToHeightConverter();
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderLiftedIndexPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderLiftedIndexPixel.java
index 06e26a5941..3577f88ac6 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderLiftedIndexPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderLiftedIndexPixel.java
@@ -26,7 +26,7 @@ import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.LiftedIndexPixelToTempConverter;
 
@@ -46,26 +46,26 @@ import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.LiftedInde
  */
 public class SounderLiftedIndexPixel extends DerivedUnit<Temperature> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Override
-	public boolean equals(Object anObject) {
-		return (anObject instanceof SounderLiftedIndexPixel);
-	}
+    @Override
+    public boolean equals(Object anObject) {
+        return (anObject instanceof SounderLiftedIndexPixel);
+    }
 
-	@Override
-	public Unit<Temperature> getStandardUnit() {
-		return SI.KELVIN;
-	}
+    @Override
+    public Unit<Temperature> getStandardUnit() {
+        return SI.KELVIN;
+    }
 
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	@Override
-	public UnitConverter toStandardUnit() {
-		return new LiftedIndexPixelToTempConverter();
-	}
+    @Override
+    public UnitConverter toStandardUnit() {
+        return new LiftedIndexPixelToTempConverter();
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderPrecipWaterPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderPrecipWaterPixel.java
index 03f1edbfea..43ab50f5ea 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderPrecipWaterPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderPrecipWaterPixel.java
@@ -26,7 +26,7 @@ import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.SounderPrecipPixelToLengthConverter;
 
@@ -46,26 +46,26 @@ import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.SounderPre
  */
 public class SounderPrecipWaterPixel extends DerivedUnit<Length> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Override
-	public boolean equals(Object anObject) {
-		return (anObject instanceof SounderPrecipWaterPixel);
-	}
+    @Override
+    public boolean equals(Object anObject) {
+        return (anObject instanceof SounderPrecipWaterPixel);
+    }
 
-	@Override
-	public Unit<Length> getStandardUnit() {
-		return SI.METRE;
-	}
+    @Override
+    public Unit<Length> getStandardUnit() {
+        return SI.METRE;
+    }
 
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	@Override
-	public UnitConverter toStandardUnit() {
-		return new SounderPrecipPixelToLengthConverter();
-	}
+    @Override
+    public UnitConverter toStandardUnit() {
+        return new SounderPrecipPixelToLengthConverter();
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderSkinTempPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderSkinTempPixel.java
index c83683b4e7..9561c0450d 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderSkinTempPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/SounderSkinTempPixel.java
@@ -26,7 +26,7 @@ import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.SkinTempPixelToTempConverter;
 
@@ -46,26 +46,26 @@ import com.raytheon.uf.common.dataplugin.satellite.units.goes.convert.SkinTempPi
  */
 public class SounderSkinTempPixel extends DerivedUnit<Temperature> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Override
-	public boolean equals(Object anObject) {
-		return (anObject instanceof SounderSkinTempPixel);
-	}
+    @Override
+    public boolean equals(Object anObject) {
+        return (anObject instanceof SounderSkinTempPixel);
+    }
 
-	@Override
-	public Unit<Temperature> getStandardUnit() {
-		return SI.KELVIN;
-	}
+    @Override
+    public Unit<Temperature> getStandardUnit() {
+        return SI.KELVIN;
+    }
 
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	@Override
-	public UnitConverter toStandardUnit() {
-		return new SkinTempPixelToTempConverter();
-	}
+    @Override
+    public UnitConverter toStandardUnit() {
+        return new SkinTempPixelToTempConverter();
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudHeightToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudHeightToPixelConverter.java
index 78a012375e..31baacd7ed 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudHeightToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudHeightToPixelConverter.java
@@ -25,7 +25,7 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.unit.NonSI;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a cloud height in meters to a pixel value (calculation is done in
@@ -44,90 +44,91 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class CloudHeightToPixelConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter meterToFoot = SI.METRE.getConverterTo(NonSI.FOOT);
+    private static UnitConverter meterToFoot = SI.METRE
+            .getConverterTo(NonSI.FOOT);
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert( double)
-	 */
-	@Override
-	public double convert(double aHeight) throws ConversionException {
-		double result = 0.0;
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert( double)
+     */
+    @Override
+    public double convert(double aHeight) throws ConversionException {
+        double result = 0.0;
 
-		// value is in meters, but below calculates pixel based on value being
-		// ft/100 MSL
-		aHeight = meterToFoot.convert(aHeight);
-		
-		if (aHeight < 1) {
-		    result = 0;
-		} else if (aHeight <= 17.7) {
-			result = (aHeight / 17.7) + 75.0;
-		} else if (aHeight <= 50) {
-			result = (24.0 / 32.3 * (aHeight - 17.7)) + 76.0;
-		} else if (aHeight <= 87.5) {
-			result = (25.0 / 37.5 * (aHeight - 50.0)) + 100.0;
-		} else if (aHeight <= 129.9) {
-			result = (25.0 / 42.4 * (aHeight - 87.5)) + 125.0;
-		} else if (aHeight <= 179.1) {
-			result = (25.0 / 49.2 * (aHeight - 129.9)) + 150.0;
-		} else if (aHeight <= 238) {
-			result = (25.0 / 58.9 * (aHeight - 179.1)) + 175.0;
-		} else if (aHeight <= 312.3) {
-			result = (25.0 / 74.3 * (aHeight - 238.0)) + 200.0;
-		} else {
-			result = (30.0 / 134.4 * (aHeight - 312.3)) + 225.0;
-		}
+        // value is in meters, but below calculates pixel based on value being
+        // ft/100 MSL
+        aHeight = meterToFoot.convert(aHeight);
 
-		if (result < 0) {
-			result = 0;
-		} else if (result > 255) {
-			result = 255;
-		}
+        if (aHeight < 1) {
+            result = 0;
+        } else if (aHeight <= 17.7) {
+            result = (aHeight / 17.7) + 75.0;
+        } else if (aHeight <= 50) {
+            result = (24.0 / 32.3 * (aHeight - 17.7)) + 76.0;
+        } else if (aHeight <= 87.5) {
+            result = (25.0 / 37.5 * (aHeight - 50.0)) + 100.0;
+        } else if (aHeight <= 129.9) {
+            result = (25.0 / 42.4 * (aHeight - 87.5)) + 125.0;
+        } else if (aHeight <= 179.1) {
+            result = (25.0 / 49.2 * (aHeight - 129.9)) + 150.0;
+        } else if (aHeight <= 238) {
+            result = (25.0 / 58.9 * (aHeight - 179.1)) + 175.0;
+        } else if (aHeight <= 312.3) {
+            result = (25.0 / 74.3 * (aHeight - 238.0)) + 200.0;
+        } else {
+            result = (30.0 / 134.4 * (aHeight - 312.3)) + 225.0;
+        }
 
-		return result;
-	}
+        if (result < 0) {
+            result = 0;
+        } else if (result > 255) {
+            result = 255;
+        }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof CloudHeightToPixelConverter);
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof CloudHeightToPixelConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new CloudPixelToHeightConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return false;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new CloudPixelToHeightConverter();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return false;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPercentToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPercentToPixelConverter.java
index 478f5972ff..a402c4c98f 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPercentToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPercentToPixelConverter.java
@@ -23,7 +23,7 @@ package com.raytheon.uf.common.dataplugin.satellite.units.goes.convert;
 import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a cloud amount percent to a pixel value
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPixelToHeightConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPixelToHeightConverter.java
index e248cabf7d..0d18699944 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPixelToHeightConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPixelToHeightConverter.java
@@ -25,7 +25,7 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.unit.NonSI;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a pixel value representing cloud height to a height above MSL in
@@ -44,85 +44,85 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class CloudPixelToHeightConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
-	
-	private static UnitConverter footToMeter = (NonSI.FOOT)
-    .getConverterTo(SI.METRE);
+    private static final long serialVersionUID = 1L;
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aPixel) throws ConversionException {
-		double result = 0.0;
+    private static UnitConverter footToMeter = (NonSI.FOOT)
+            .getConverterTo(SI.METRE);
 
-		if (aPixel <= 75) {
-			result = 0.0;
-		} else if (aPixel <= 76) {
-			result = 17.7 * (aPixel - 75.0);
-		} else if (aPixel <= 100) {
-			result = (32.3 / 24.0 * (aPixel - 76.0)) + 17.7;
-		} else if (aPixel <= 125) {
-			result = (37.5 / 25.0 * (aPixel - 100.0)) + 50.0;
-		} else if (aPixel <= 150) {
-			result = (42.4 / 25.0 * (aPixel - 125.0)) + 87.5;
-		} else if (aPixel <= 175) {
-			result = (49.2 / 25.0 * (aPixel - 150.0)) + 129.9;
-		} else if (aPixel <= 200) {
-			result = (58.9 / 25.0 * (aPixel - 175.0)) + 179.1;
-		} else if (aPixel <= 225) {
-			result = (74.3 / 25.0 * (aPixel - 200.0)) + 238.0;
-		} else {
-			result = (134.4 / 30.0 * (aPixel - 225.0)) + 312.3;
-		}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aPixel) throws ConversionException {
+        double result = 0.0;
 
-		// above converts pixel to ft/100 MSL, but we need to change it to
-		// meters
-		result = footToMeter.convert(result);
+        if (aPixel <= 75) {
+            result = 0.0;
+        } else if (aPixel <= 76) {
+            result = 17.7 * (aPixel - 75.0);
+        } else if (aPixel <= 100) {
+            result = (32.3 / 24.0 * (aPixel - 76.0)) + 17.7;
+        } else if (aPixel <= 125) {
+            result = (37.5 / 25.0 * (aPixel - 100.0)) + 50.0;
+        } else if (aPixel <= 150) {
+            result = (42.4 / 25.0 * (aPixel - 125.0)) + 87.5;
+        } else if (aPixel <= 175) {
+            result = (49.2 / 25.0 * (aPixel - 150.0)) + 129.9;
+        } else if (aPixel <= 200) {
+            result = (58.9 / 25.0 * (aPixel - 175.0)) + 179.1;
+        } else if (aPixel <= 225) {
+            result = (74.3 / 25.0 * (aPixel - 200.0)) + 238.0;
+        } else {
+            result = (134.4 / 30.0 * (aPixel - 225.0)) + 312.3;
+        }
 
-		return result;
-	}
+        // above converts pixel to ft/100 MSL, but we need to change it to
+        // meters
+        result = footToMeter.convert(result);
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof CloudPixelToHeightConverter);
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof CloudPixelToHeightConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new CloudHeightToPixelConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return false;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new CloudHeightToPixelConverter();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return false;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPixelToPercentConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPixelToPercentConverter.java
index 358a740426..d7c566c437 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPixelToPercentConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/CloudPixelToPercentConverter.java
@@ -23,7 +23,7 @@ package com.raytheon.uf.common.dataplugin.satellite.units.goes.convert;
 import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a pixel value of cloud amount to a cloud amount in percent
@@ -41,74 +41,74 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class CloudPixelToPercentConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aPixel) throws ConversionException {
-		double result = 0.0;
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aPixel) throws ConversionException {
+        double result = 0.0;
 
-		if (aPixel <= 75) {
-			result = 0.0;
-		} else if (aPixel <= 76) {
-			result = aPixel - 75.0;
-		} else if (aPixel <= 166) {
-			result = (49.0 / 90.0 * (aPixel - 76.0)) + 1.0;
-		} else if (aPixel <= 167) {
-			result = aPixel - 116.0;
-		} else if (aPixel <= 253) {
-			result = (24.0 / 43.0 * (aPixel - 167.0)) + 51.0;
-		} else if (aPixel <= 254) {
-			result = aPixel - 154.0;
-		} else {
-			result = 100.0;
-		}
+        if (aPixel <= 75) {
+            result = 0.0;
+        } else if (aPixel <= 76) {
+            result = aPixel - 75.0;
+        } else if (aPixel <= 166) {
+            result = (49.0 / 90.0 * (aPixel - 76.0)) + 1.0;
+        } else if (aPixel <= 167) {
+            result = aPixel - 116.0;
+        } else if (aPixel <= 253) {
+            result = (24.0 / 43.0 * (aPixel - 167.0)) + 51.0;
+        } else if (aPixel <= 254) {
+            result = aPixel - 154.0;
+        } else {
+            result = 100.0;
+        }
 
-		return result / 100;
-	}
+        return result / 100;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof CloudPixelToPercentConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof CloudPixelToPercentConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new CloudPercentToPixelConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new CloudPercentToPixelConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return false;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return false;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/LiftedIndexPixelToTempConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/LiftedIndexPixelToTempConverter.java
index 295ed0839b..19ec7d8544 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/LiftedIndexPixelToTempConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/LiftedIndexPixelToTempConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a pixel representing Lifted Index to temperature in Celsius
@@ -41,65 +41,65 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class LiftedIndexPixelToTempConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter celsiusToKelvin = SI.CELSIUS
-			.getConverterTo(SI.KELVIN);
+    private static UnitConverter celsiusToKelvin = SI.CELSIUS
+            .getConverterTo(SI.KELVIN);
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aPixel) throws ConversionException {
-		double result = 25 - (aPixel / 5);
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aPixel) throws ConversionException {
+        double result = 25 - (aPixel / 5);
 
-		// above converts pixel to Celsius, but we need to change it to
-		// Kelvin
-		result = celsiusToKelvin.convert(result);
+        // above converts pixel to Celsius, but we need to change it to
+        // Kelvin
+        result = celsiusToKelvin.convert(result);
 
-		return result;
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof LiftedIndexPixelToTempConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof LiftedIndexPixelToTempConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new LiftedIndexTempToPixelConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new LiftedIndexTempToPixelConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return true;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return true;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/LiftedIndexTempToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/LiftedIndexTempToPixelConverter.java
index 269bc8fae8..15a4fb91bc 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/LiftedIndexTempToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/LiftedIndexTempToPixelConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a Lifted Index in temperature Kelvin to a pixel value
@@ -41,71 +41,71 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class LiftedIndexTempToPixelConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter kelvinToCelsius = SI.KELVIN
-			.getConverterTo(SI.CELSIUS);
+    private static UnitConverter kelvinToCelsius = SI.KELVIN
+            .getConverterTo(SI.CELSIUS);
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aTemp) throws ConversionException {
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aTemp) throws ConversionException {
 
-		// value is in kelvin, but below calculates pixel based on value being
-		// celsius
-		aTemp = kelvinToCelsius.convert(aTemp);
+        // value is in kelvin, but below calculates pixel based on value being
+        // celsius
+        aTemp = kelvinToCelsius.convert(aTemp);
 
-		double result = -5 * (aTemp - 25);
-		if (result < 0) {
-			result = 0.0;
-		} else if (result > 255) {
-			result = 255;
-		}
+        double result = -5 * (aTemp - 25);
+        if (result < 0) {
+            result = 0.0;
+        } else if (result > 255) {
+            result = 255;
+        }
 
-		return result;
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof LiftedIndexTempToPixelConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof LiftedIndexTempToPixelConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new LiftedIndexPixelToTempConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new LiftedIndexPixelToTempConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return true;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return true;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PercentToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PercentToPixelConverter.java
index 425e8a3d01..27ae6e7577 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PercentToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PercentToPixelConverter.java
@@ -22,23 +22,23 @@ package com.raytheon.uf.common.dataplugin.satellite.units.goes.convert;
 import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * TODO Add Description
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 11, 2010            jsanchez     Initial creation
- *
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
- * @version 1.0	
+ * @version 1.0
  */
 
 public class PercentToPixelConverter extends UnitConverter {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PixelToPercentConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PixelToPercentConverter.java
index 30de0a87b5..6e357ddb08 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PixelToPercentConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PixelToPercentConverter.java
@@ -22,23 +22,23 @@ package com.raytheon.uf.common.dataplugin.satellite.units.goes.convert;
 import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * TODO Add Description
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 11, 2010            jsanchez     Initial creation
- *
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
- * @version 1.0	
+ * @version 1.0
  */
 
 public class PixelToPercentConverter extends UnitConverter {
@@ -51,7 +51,7 @@ public class PixelToPercentConverter extends UnitConverter {
      */
     @Override
     public double convert(double aPixel) throws ConversionException {
-        return aPixel/100;
+        return aPixel / 100;
     }
 
     /*
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PolarPrecipLengthToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PolarPrecipLengthToPixelConverter.java
index c35848c56d..e8378d66ea 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PolarPrecipLengthToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PolarPrecipLengthToPixelConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts meters of total precipitation of water to a pixel value
@@ -59,19 +59,17 @@ public class PolarPrecipLengthToPixelConverter extends UnitConverter {
         aLength = meterToMillimeter.convert(aLength);
 
         double result = 0.0;
-        
-        if (aLength < 1 ) {
+
+        if (aLength < 1) {
             result = 0.0;
         } else if (aLength <= 70) {
             result = aLength + 176;
-        }
-        else if (aLength <= 75) {
+        } else if (aLength <= 75) {
             result = (18900 - aLength) / 75;
-        }
-        else {
+        } else {
             result = 255;
         }
-        
+
         if (result < 0) {
             result = 0;
         } else if (result > 255) {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PolarPrecipPixelToLengthConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PolarPrecipPixelToLengthConverter.java
index 77b00bef88..762a26d7d5 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PolarPrecipPixelToLengthConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/PolarPrecipPixelToLengthConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a pixel representation of total precipitation of water to meters
@@ -39,7 +39,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  * 
  * @author jsanchez
  */
-public class PolarPrecipPixelToLengthConverter extends UnitConverter  {
+public class PolarPrecipPixelToLengthConverter extends UnitConverter {
 
     private static final long serialVersionUID = 1L;
 
@@ -55,7 +55,7 @@ public class PolarPrecipPixelToLengthConverter extends UnitConverter  {
     public double convert(double aPixel) throws ConversionException {
 
         double result = 0.0;
-        
+
         if (aPixel < 1) {
             result = 0.0;
         } else if (aPixel <= 251) {
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SkinTempPixelToTempConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SkinTempPixelToTempConverter.java
index 030fbe2731..4d4b102c89 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SkinTempPixelToTempConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SkinTempPixelToTempConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a skin temperature pixel to a temperature in Kelvin
@@ -41,65 +41,65 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class SkinTempPixelToTempConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter celsiusToKelvin = SI.CELSIUS
-			.getConverterTo(SI.KELVIN);
+    private static UnitConverter celsiusToKelvin = SI.CELSIUS
+            .getConverterTo(SI.KELVIN);
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aPixel) throws ConversionException {
-		double result = 63.0 - (aPixel / 2.0);
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aPixel) throws ConversionException {
+        double result = 63.0 - (aPixel / 2.0);
 
-		// above converts pixel to Celsius, but we need to change it to
-		// Kelvin
-		result = celsiusToKelvin.convert(result);
+        // above converts pixel to Celsius, but we need to change it to
+        // Kelvin
+        result = celsiusToKelvin.convert(result);
 
-		return result;
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof SkinTempPixelToTempConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof SkinTempPixelToTempConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new SkinTempTempToPixelConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new SkinTempTempToPixelConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return true;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return true;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SkinTempTempToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SkinTempTempToPixelConverter.java
index 0b9f19d8ab..ef11658cd7 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SkinTempTempToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SkinTempTempToPixelConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a skin temperature in Kelvin to a pixel value
@@ -41,71 +41,71 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class SkinTempTempToPixelConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter kelvinToCelsius = SI.KELVIN
-			.getConverterTo(SI.CELSIUS);
+    private static UnitConverter kelvinToCelsius = SI.KELVIN
+            .getConverterTo(SI.CELSIUS);
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aTemp) throws ConversionException {
-		// value is in kelvin, but below calculates pixel based on value being
-		// celsius
-		aTemp = kelvinToCelsius.convert(aTemp);
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aTemp) throws ConversionException {
+        // value is in kelvin, but below calculates pixel based on value being
+        // celsius
+        aTemp = kelvinToCelsius.convert(aTemp);
 
-		double result = (63.0 - aTemp) * 2.0;
+        double result = (63.0 - aTemp) * 2.0;
 
-		if (result < 0) {
-			result = 0;
-		} else if (result > 255) {
-			result = 255;
-		}
+        if (result < 0) {
+            result = 0;
+        } else if (result > 255) {
+            result = 255;
+        }
 
-		return result;
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof SkinTempTempToPixelConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof SkinTempTempToPixelConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new SkinTempPixelToTempConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new SkinTempPixelToTempConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return true;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return true;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SounderPrecipLengthToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SounderPrecipLengthToPixelConverter.java
index d88f3305d6..c9098a9457 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SounderPrecipLengthToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SounderPrecipLengthToPixelConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts meters of total precipitation of water to a pixel value
@@ -41,72 +41,72 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class SounderPrecipLengthToPixelConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter meterToMillimeter = SI.METRE.getConverterTo(SI
-			.MILLI(SI.METRE));
+    private static UnitConverter meterToMillimeter = SI.METRE.getConverterTo(SI
+            .MILLI(SI.METRE));
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aLength) throws ConversionException {
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aLength) throws ConversionException {
 
-		// value is in meters, but below calculates pixel based on value being
-		// millimeters
-		aLength = meterToMillimeter.convert(aLength);
+        // value is in meters, but below calculates pixel based on value being
+        // millimeters
+        aLength = meterToMillimeter.convert(aLength);
 
-		double result = aLength * 200.0 / 67.0;
+        double result = aLength * 200.0 / 67.0;
 
-		if (result < 0) {
-			result = 0;
-		} else if (result > 255) {
-			result = 255;
-		}
+        if (result < 0) {
+            result = 0;
+        } else if (result > 255) {
+            result = 255;
+        }
 
-		return result;
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof SounderPrecipLengthToPixelConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof SounderPrecipLengthToPixelConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new SounderPrecipPixelToLengthConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new SounderPrecipPixelToLengthConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return true;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return true;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SounderPrecipPixelToLengthConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SounderPrecipPixelToLengthConverter.java
index d4cec96f19..94937a9a5c 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SounderPrecipPixelToLengthConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/goes/convert/SounderPrecipPixelToLengthConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a pixel representation of total precipitation of water to meters
@@ -41,65 +41,65 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class SounderPrecipPixelToLengthConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter millimeterToMeter = (SI.MILLI(SI.METRE))
-			.getConverterTo(SI.METRE);
+    private static UnitConverter millimeterToMeter = (SI.MILLI(SI.METRE))
+            .getConverterTo(SI.METRE);
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aPixel) throws ConversionException {
-		double result = aPixel * 67.0 / 200.0;
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aPixel) throws ConversionException {
+        double result = aPixel * 67.0 / 200.0;
 
-		// above converts pixel to millimeters, but we need to change it to
-		// meters
-		result = millimeterToMeter.convert(result);
+        // above converts pixel to millimeters, but we need to change it to
+        // meters
+        result = millimeterToMeter.convert(result);
 
-		return result;
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof SounderPrecipPixelToLengthConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof SounderPrecipPixelToLengthConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new SounderPrecipLengthToPixelConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new SounderPrecipLengthToPixelConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return true;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return true;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRPixel.java
index f90a017de5..8df34d24ce 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRPixel.java
@@ -26,7 +26,7 @@ import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Represents a pixel value on a satellite IR image
@@ -43,26 +43,26 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class IRPixel extends DerivedUnit<Temperature> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Override
-	public boolean equals(Object anObject) {
-		return (anObject instanceof IRPixel);
-	}
+    @Override
+    public boolean equals(Object anObject) {
+        return (anObject instanceof IRPixel);
+    }
 
-	@Override
-	public Unit<Temperature> getStandardUnit() {
-		return SI.KELVIN;
-	}
+    @Override
+    public Unit<Temperature> getStandardUnit() {
+        return SI.KELVIN;
+    }
 
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	@Override
-	public UnitConverter toStandardUnit() {
-		return new IRPixelToTempConverter();
-	}
+    @Override
+    public UnitConverter toStandardUnit() {
+        return new IRPixelToTempConverter();
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRPixelToTempConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRPixelToTempConverter.java
index 9eba7e2bb0..6df53a0428 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRPixelToTempConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRPixelToTempConverter.java
@@ -23,7 +23,7 @@ package com.raytheon.uf.common.dataplugin.satellite.units.ir;
 import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a pixel value from 0-255 into a temperature in Kelvin
@@ -40,64 +40,64 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class IRPixelToTempConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aPixel) throws ConversionException {
-		double result = 0.0;
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aPixel) throws ConversionException {
+        double result = 0.0;
 
-		if (aPixel >= 180) {
-			result = 418.15 - aPixel;
-		} else {
-			result = 328.15 - (aPixel / 2.0);
-		}
+        if (aPixel >= 180) {
+            result = 418.15 - aPixel;
+        } else {
+            result = 328.15 - (aPixel / 2.0);
+        }
 
-		return result;
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof IRPixelToTempConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof IRPixelToTempConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new IRTempToPixelConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new IRTempToPixelConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return false;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return false;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRTempToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRTempToPixelConverter.java
index 10e95725c2..30d6e18b1e 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRTempToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/ir/IRTempToPixelConverter.java
@@ -23,7 +23,7 @@ package com.raytheon.uf.common.dataplugin.satellite.units.ir;
 import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a temperature value in Kelvin to a pixel value.
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/BlendedTPWPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/BlendedTPWPixel.java
index 33af077670..2e7ab0e829 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/BlendedTPWPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/BlendedTPWPixel.java
@@ -26,7 +26,7 @@ import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Represents a pixel value on a satellite blended total precipitable water(TPW)
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipLengthToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipLengthToPixelConverter.java
index d6c73aa232..b1b67aa5c8 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipLengthToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipLengthToPixelConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * TODO class description
@@ -41,75 +41,75 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class PrecipLengthToPixelConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter meterToMillimeter = SI.METRE.getConverterTo(SI
-			.MILLI(SI.METRE));
+    private static UnitConverter meterToMillimeter = SI.METRE.getConverterTo(SI
+            .MILLI(SI.METRE));
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aPrecip) throws ConversionException {
-		double result = 0.0;
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aPrecip) throws ConversionException {
+        double result = 0.0;
 
-		// value is in meters, but below calculates pixel based on value being
-		// millimeters
-		aPrecip = meterToMillimeter.convert(aPrecip);
+        // value is in meters, but below calculates pixel based on value being
+        // millimeters
+        aPrecip = meterToMillimeter.convert(aPrecip);
 
-		if (aPrecip > 0 && aPrecip <= 75) {
-			result = aPrecip + 176.0;
-		}
+        if (aPrecip > 0 && aPrecip <= 75) {
+            result = aPrecip + 176.0;
+        }
 
-		if (result < 0) {
-			result = 0.0;
-		} else if (result > 255) {
-			result = 255;
-		}
+        if (result < 0) {
+            result = 0.0;
+        } else if (result > 255) {
+            result = 255;
+        }
 
-		return result;
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof PrecipLengthToPixelConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof PrecipLengthToPixelConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new PrecipPixelToLengthConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new PrecipPixelToLengthConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return false;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return false;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipPixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipPixel.java
index ef9637f826..f554f9ac59 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipPixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipPixel.java
@@ -26,7 +26,7 @@ import javax.measure.unit.DerivedUnit;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Represents a pixel value on a POES or DMSP satellite precipitation image
@@ -43,26 +43,26 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class PrecipPixel extends DerivedUnit<Length> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Override
-	public boolean equals(Object anObject) {
-		return (anObject instanceof PrecipPixel);
+    @Override
+    public boolean equals(Object anObject) {
+        return (anObject instanceof PrecipPixel);
 
-	}
+    }
 
-	@Override
-	public Unit<Length> getStandardUnit() {
-		return SI.METRE;
-	}
+    @Override
+    public Unit<Length> getStandardUnit() {
+        return SI.METRE;
+    }
 
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	@Override
-	public UnitConverter toStandardUnit() {
-		return new PrecipPixelToLengthConverter();
-	}
+    @Override
+    public UnitConverter toStandardUnit() {
+        return new PrecipPixelToLengthConverter();
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipPixelToLengthConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipPixelToLengthConverter.java
index 5ba69109bf..cd46f08eea 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipPixelToLengthConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/PrecipPixelToLengthConverter.java
@@ -24,7 +24,7 @@ import javax.measure.converter.ConversionException;
 import javax.measure.converter.UnitConverter;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * TODO class description
@@ -41,68 +41,68 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class PrecipPixelToLengthConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter millimeterToMeter = (SI.MILLI(SI.METRE))
-			.getConverterTo(SI.METRE);
+    private static UnitConverter millimeterToMeter = (SI.MILLI(SI.METRE))
+            .getConverterTo(SI.METRE);
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aPixel) throws ConversionException {
-		double result = 0.0;
-		if (aPixel > 176 && aPixel <= 251) {
-			result = aPixel - 176.0;
-		}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aPixel) throws ConversionException {
+        double result = 0.0;
+        if (aPixel > 176 && aPixel <= 251) {
+            result = aPixel - 176.0;
+        }
 
-		// above converts pixel to millimeters, but we need to change it to
-		// meters
-		result = millimeterToMeter.convert(result);
+        // above converts pixel to millimeters, but we need to change it to
+        // meters
+        result = millimeterToMeter.convert(result);
 
-		return result;
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof PrecipPixelToLengthConverter);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof PrecipPixelToLengthConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new PrecipLengthToPixelConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new PrecipLengthToPixelConverter();
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return false;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return false;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallPixelToRateConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallPixelToRateConverter.java
index e62d473a50..5eae4c3ecf 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallPixelToRateConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallPixelToRateConverter.java
@@ -25,7 +25,7 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.unit.NonSI;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a rainfall rate pixel from a satellite image to a rate of mm/hr
@@ -43,71 +43,72 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class RainfallPixelToRateConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-    private static UnitConverter milimtrPerHrToMtrPerSec = ((SI.MILLI(SI.METRE)).divide(NonSI.HOUR))
-            .getConverterTo((SI.METRE).divide(SI.SECOND));
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aPixel) throws ConversionException {
-		double result = 0.0;
+    private static UnitConverter milimtrPerHrToMtrPerSec = ((SI.MILLI(SI.METRE))
+            .divide(NonSI.HOUR)).getConverterTo((SI.METRE).divide(SI.SECOND));
 
-		if (aPixel <= 108) {
-			result = 0.0;
-		} else if (aPixel <= 133) {
-			result = (aPixel - 108.0) * 6.0 / 25.0;
-		} else if (aPixel <= 168) {
-			result = 6 + ((aPixel - 133.0) * 14.0 / 35.0);
-		} else {
-			result = (aPixel / 2.0) - 64.0;
-		}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aPixel) throws ConversionException {
+        double result = 0.0;
 
-		result = milimtrPerHrToMtrPerSec.convert(result);
-		return result;
-	}
+        if (aPixel <= 108) {
+            result = 0.0;
+        } else if (aPixel <= 133) {
+            result = (aPixel - 108.0) * 6.0 / 25.0;
+        } else if (aPixel <= 168) {
+            result = 6 + ((aPixel - 133.0) * 14.0 / 35.0);
+        } else {
+            result = (aPixel / 2.0) - 64.0;
+        }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof RainfallPixelToRateConverter);
-	}
+        result = milimtrPerHrToMtrPerSec.convert(result);
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof RainfallPixelToRateConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new RainfallRateToPixelConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return false;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new RainfallRateToPixelConverter();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return false;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallRatePixel.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallRatePixel.java
index 823e505f82..60aebfcdc2 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallRatePixel.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallRatePixel.java
@@ -27,7 +27,7 @@ import javax.measure.unit.NonSI;
 import javax.measure.unit.SI;
 import javax.measure.unit.Unit;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Represents a pixel value of a rainfall rate (mm/hr) on a POES or DMSP
@@ -46,27 +46,26 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class RainfallRatePixel extends DerivedUnit<Velocity> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@Override
-	public boolean equals(Object anObject) {
-		return (anObject instanceof RainfallRatePixel);
-	}
+    @Override
+    public boolean equals(Object anObject) {
+        return (anObject instanceof RainfallRatePixel);
+    }
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public Unit<Velocity> getStandardUnit() {
-		return (Unit<Velocity>) (SI.MILLI(SI.METRE))
-				.divide(NonSI.HOUR);
-	}
+    @SuppressWarnings("unchecked")
+    @Override
+    public Unit<Velocity> getStandardUnit() {
+        return (Unit<Velocity>) (SI.MILLI(SI.METRE)).divide(NonSI.HOUR);
+    }
 
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
 
-	@Override
-	public UnitConverter toStandardUnit() {
-		return new RainfallPixelToRateConverter();
-	}
+    @Override
+    public UnitConverter toStandardUnit() {
+        return new RainfallPixelToRateConverter();
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallRateToPixelConverter.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallRateToPixelConverter.java
index dc809f520c..3f6fbddc86 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallRateToPixelConverter.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/units/water/RainfallRateToPixelConverter.java
@@ -25,7 +25,7 @@ import javax.measure.converter.UnitConverter;
 import javax.measure.unit.NonSI;
 import javax.measure.unit.SI;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 /**
  * Converts a rainfall rate of mm/hr to a pixel value
@@ -43,77 +43,79 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
  */
 public class RainfallRateToPixelConverter extends UnitConverter {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private static UnitConverter mtrPerSecToMilimtrPerHr = ((SI.METRE).divide(SI.SECOND))
-	        .getConverterTo((SI.MILLI(SI.METRE)).divide(NonSI.HOUR));
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#convert(double)
-	 */
-	@Override
-	public double convert(double aRate) throws ConversionException {
-		double result = 0.0;
-		
-		aRate = mtrPerSecToMilimtrPerHr.convert(aRate);
-		if (aRate == 0) {
-			result = 0.0;
-		} else if (aRate <= 6.0) {
-			result = (aRate * 25.0 / 6.0) + 108.0;
-		} else if (aRate <= 20.0) {
-			result = 133.0 + (35.0 / 14.0 * (aRate - 6.0));
-		} else {
-			result = 2.0 * (aRate + 64.0);
-		}
+    private static UnitConverter mtrPerSecToMilimtrPerHr = ((SI.METRE)
+            .divide(SI.SECOND)).getConverterTo((SI.MILLI(SI.METRE))
+            .divide(NonSI.HOUR));
 
-		if (result < 0) {
-			result = 0.0;
-		} else if (result > 255) {
-			result = 255.0;
-		}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#convert(double)
+     */
+    @Override
+    public double convert(double aRate) throws ConversionException {
+        double result = 0.0;
 
-		return result;
-	}
+        aRate = mtrPerSecToMilimtrPerHr.convert(aRate);
+        if (aRate == 0) {
+            result = 0.0;
+        } else if (aRate <= 6.0) {
+            result = (aRate * 25.0 / 6.0) + 108.0;
+        } else if (aRate <= 20.0) {
+            result = 133.0 + (35.0 / 14.0 * (aRate - 6.0));
+        } else {
+            result = 2.0 * (aRate + 64.0);
+        }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
-	 */
-	@Override
-	public boolean equals(Object aConverter) {
-		return (aConverter instanceof RainfallRateToPixelConverter);
-	}
+        if (result < 0) {
+            result = 0.0;
+        } else if (result > 255) {
+            result = 255.0;
+        }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#hashCode()
-	 */
-	@Override
-	public int hashCode() {
-		return HashCodeBuilder.reflectionHashCode(this);
-	}
+        return result;
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#inverse()
-	 */
-	@Override
-	public UnitConverter inverse() {
-		return new RainfallPixelToRateConverter();
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object aConverter) {
+        return (aConverter instanceof RainfallRateToPixelConverter);
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.measure.converter.UnitConverter#isLinear()
-	 */
-	@Override
-	public boolean isLinear() {
-		return false;
-	}
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#inverse()
+     */
+    @Override
+    public UnitConverter inverse() {
+        return new RainfallPixelToRateConverter();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.measure.converter.UnitConverter#isLinear()
+     */
+    @Override
+    public boolean isLinear() {
+        return false;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
index 8a2b0ada5f..4b03143503 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java
@@ -21,8 +21,6 @@ package com.raytheon.uf.common.dataplugin.svrwx;
 
 import java.util.Calendar;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -61,7 +59,8 @@ import com.vividsolutions.jts.geom.Geometry;
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * Oct 14, 2013 2361       njensen     Remove XML annotations
- * Jul 28, 2015 4360      rferrel      Named unique constraint. Made reportType non-nullable.
+ * Jul 28, 2015 4360       rferrel     Named unique constraint. Made reportType non-nullable.
+ * Jan 14, 2016 5253       tgurney     Dropped dataUri column and updated unique constraint.
  * 
  * </pre>
  * 
@@ -70,7 +69,8 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @Entity
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "svrwxseq")
-@Table(name = "svrwx", uniqueConstraints = { @UniqueConstraint(name = "uk_svrwx_datauri_fields", columnNames = { "dataURI" }) })
+@Table(name = "svrwx", uniqueConstraints = { @UniqueConstraint(name = "uk_svrwx_datauri_fields", columnNames = {
+        "refTime", "reportType", "stationId", "latitude", "longitude" }) })
 /*
  * Both refTime and forecastTime are included in the refTimeIndex since
  * forecastTime is unlikely to be used.
@@ -145,17 +145,6 @@ public class SvrWxRecord extends PersistablePluginDataObject implements
         this.wmoHeader = wmoHeader;
     }
 
-    /**
-     * Set the data uri for this observation.
-     * 
-     * @param dataURI
-     */
-    @Override
-    public void setDataURI(String dataURI) {
-        super.setDataURI(dataURI);
-        identifier = dataURI;
-    }
-
     @Override
     public SurfaceObsLocation getSpatialObject() {
         return location;
@@ -279,13 +268,6 @@ public class SvrWxRecord extends PersistablePluginDataObject implements
         return sb.toString();
     }
 
-    @Override
-    @Column
-    @Access(AccessType.PROPERTY)
-    public String getDataURI() {
-        return super.getDataURI();
-    }
-
     @Override
     public String getPluginName() {
         return "svrwx";
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.taf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.taf/META-INF/MANIFEST.MF
index 993602be52..bd140cd5b6 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.taf/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.taf/META-INF/MANIFEST.MF
@@ -2,11 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 1
 Bundle-Name: Taf Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.taf
-Bundle-Version: 1.15.0.qualifier
+Bundle-Version: 1.15.1.qualifier
 Bundle-Vendor: RAYTHEON
 Export-Package: com.raytheon.uf.common.dataplugin.taf
-Require-Bundle: org.apache.commons.lang,
- javax.persistence
+Require-Bundle: javax.persistence
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.raytheon.uf.common.dataplugin,
  com.raytheon.uf.common.dataplugin.annotations,
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java b/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
index 55a866aab2..48efdb8f6d 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java
@@ -21,8 +21,6 @@ package com.raytheon.uf.common.dataplugin.tcg;
 
 import java.util.Calendar;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -62,6 +60,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * Oct 15, 2013 2361       njensen     Removed XML annotations
  * Jul 28, 2015 4360       rferrel     Named unique constraint. Made productType and modelName non-nullable.
+ * Jan 28, 2016 5286       tgurney     Drop dataURI column and update unique constraint.
  * 
  * </pre>
  * 
@@ -70,7 +69,9 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @Entity
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "tcgseq")
-@Table(name = "tcg", uniqueConstraints = { @UniqueConstraint(name = "uk_tcg_datauri_fields", columnNames = { "dataURI" }) })
+@Table(name = "tcg", uniqueConstraints = { @UniqueConstraint(name = "uk_tcg_datauri_fields", columnNames = {
+        "refTime", "productType", "modelName", "latitude", "longitude",
+        "stationId" }) })
 /*
  * Both refTime and forecastTime are included in the refTimeIndex since
  * forecastTime is unlikely to be used.
@@ -155,17 +156,6 @@ public class TropicalCycloneGuidance extends PersistablePluginDataObject
         this.modelName = modelName;
     }
 
-    /**
-     * Set the data uri for this observation.
-     * 
-     * @param dataURI
-     */
-    @Override
-    public void setDataURI(String dataURI) {
-        super.setDataURI(dataURI);
-        identifier = dataURI;
-    }
-
     @Override
     public SurfaceObsLocation getSpatialObject() {
         return location;
@@ -281,13 +271,6 @@ public class TropicalCycloneGuidance extends PersistablePluginDataObject
         return sb.toString();
     }
 
-    @Override
-    @Column
-    @Access(AccessType.PROPERTY)
-    public String getDataURI() {
-        return super.getDataURI();
-    }
-
     @Override
     public String getPluginName() {
         return "tcg";
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
index 33c82b0d59..bad0bcdf7f 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java
@@ -22,8 +22,6 @@ package com.raytheon.uf.common.dataplugin.tcs;
 import java.util.ArrayList;
 import java.util.Calendar;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
 import javax.persistence.Column;
 import javax.persistence.Embedded;
 import javax.persistence.Entity;
@@ -64,6 +62,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * Oct 22, 2013 2361       njensen     Remove XML annotations
  * Jul 23, 2014 3410       bclement    location changed to floats
  * Jul 28, 2015 4360       rferrel     Named unique constraint. Made productType non-nullable.
+ * Jan 27, 2016 5285       tgurney     Remove dataURI column and update unique constraint.
  * 
  * </pre>
  * 
@@ -72,7 +71,8 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @Entity
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "tcsseq")
-@Table(name = "tcs", uniqueConstraints = { @UniqueConstraint(name = "uk_tcs_datauri_fields", columnNames = { "dataURI" }) })
+@Table(name = "tcs", uniqueConstraints = { @UniqueConstraint(name = "uk_tcs_datauri_fields", columnNames = {
+        "refTime", "productType", "latitude", "longitude", "stationId" }) })
 /*
  * Both refTime and forecastTime are included in the refTimeIndex since
  * forecastTime is unlikely to be used.
@@ -177,17 +177,6 @@ public class TropicalCycloneSummary extends PersistablePluginDataObject
         this.wmoHeader = wmoHeader;
     }
 
-    /**
-     * Set the data uri for this observation.
-     * 
-     * @param dataURI
-     */
-    @Override
-    public void setDataURI(String dataURI) {
-        super.setDataURI(dataURI);
-        identifier = dataURI;
-    }
-
     @Override
     public SurfaceObsLocation getSpatialObject() {
         return location;
@@ -321,13 +310,6 @@ public class TropicalCycloneSummary extends PersistablePluginDataObject
         return s;
     }
 
-    @Override
-    @Column
-    @Access(AccessType.PROPERTY)
-    public String getDataURI() {
-        return super.getDataURI();
-    }
-
     @Override
     public String getPluginName() {
         return "tcs";
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/util/Util.java b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/util/TcsUtil.java
similarity index 79%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/util/Util.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/util/TcsUtil.java
index 04f89ed389..dce6099184 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/util/Util.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/util/TcsUtil.java
@@ -28,26 +28,28 @@ import com.raytheon.uf.common.dataplugin.tcs.Radius;
 import com.raytheon.uf.common.dataplugin.tcs.TropicalCycloneSummary;
 import com.raytheon.uf.common.pointdata.PointDataView;
 import com.raytheon.uf.common.time.DataTime;
+import com.raytheon.uf.common.time.util.TimeUtil;
 
 /**
- * TODO Add Description
+ * Static Utility methods that are useful for parsing and displaying
+ * {@link TropicalCycloneSummary}s.
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Oct 30, 2010            jsanchez     Initial creation
- * Jul 23, 2014 3410       bclement    location changed to floats
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- -------------------------------------------
+ * Oct 30, 2010           jsanchez  Initial creation
+ * Jul 23, 2014  3410     bclement  location changed to floats
+ * Nov 24, 2015  5149     bsteffen  Handle case of forecast spanning midnight.
  * 
  * </pre>
  * 
  * @author jsanchez
  * @version 1.0
  */
-
-public class Util implements TCSConstants {
+public class TcsUtil implements TCSConstants {
     private static final Pattern tcmWindRadius = Pattern
             .compile(".*((\\d{2}) KT...|12 FT SEAS.)\\W{0,}\\s{0,}(\\d{1,3})NE\\s{1,}(\\d{1,3})SE\\s{1,}(\\d{1,3})SW\\s{1,}(\\d{1,3})NW.");
 
@@ -59,16 +61,6 @@ public class Util implements TCSConstants {
 
     public static TropicalCycloneSummary interplateStorm(PointDataView pdv,
             DataTime dataTime) {
-        TropicalCycloneSummary tcs = null;
-
-        float t1 = 0.0f, t2 = 0.0f, tf = 0.0f, dt = 0.0f, tc = 0.0f;
-
-        Calendar calendar = dataTime.getRefTimeAsCalendar();
-        int day = dataTime.getValidTime().get(Calendar.DAY_OF_MONTH);
-        int hour = dataTime.getValidTime().get(Calendar.HOUR_OF_DAY);
-
-        boolean tropical = true;
-        int wind = 0;
         float lat = 29.0f; // This came from TCMplotter.C
         float lon = -89.6f; // This came from TCMplotter.C
         String dTime = "Dissipated";
@@ -92,52 +84,46 @@ public class Util implements TCSConstants {
                     isTropical[size - 1].intValue() == 1 ? true : false);
         }
 
-        // Searching two storms with the time, s1 and s2 in the list.
-        // The time is between s1.time and s2.time. We need not do the
-        // interplattion
-        // if time == s1.time or time == s2.time.
-
-        // Convert the given forecast time to hours.
-        tf = dataTime.getValidTime().get(Calendar.HOUR_OF_DAY);
-
-        t1 = Integer.parseInt(displayTime[0].split("\\.")[1]);
-
-        // fore cast time is 0
-        if (dataTime.getValidTime().getTimeInMillis() == dataTime.getRefTime()
-                .getTime()) {
-            tcs = new TropicalCycloneSummary(name, pressure,
-                    longitude[0].floatValue(), latitude[0].floatValue(),
-                    displayTime[0], windSpeed[0].intValue(),
+        if (dataTime.getFcstTime() == 0) {
+            TropicalCycloneSummary tcs = new TropicalCycloneSummary(name,
+                    pressure, longitude[0].floatValue(),
+                    latitude[0].floatValue(), displayTime[0],
+                    windSpeed[0].intValue(),
                     isTropical[0].intValue() == 1 ? true : false);
             tcs.setRadiusList(loadRadiusList(pdv, 0));
             return tcs;
         }
 
+        /*
+         * Search for an index i such that the validTime falls between the time
+         * for displayTime[i - 1] and displayTime[i].
+         */
         int i = 1;
+        /*
+         * tc is a weight value(between 0 and 1) for the distance from i. So as
+         * validTime moves further from displayTime[i](and closer to
+         * displayTime[i - 1]) tc will get larger.
+         */
+        float tc = 0.0f;
+        Calendar refTime = dataTime.getRefTimeAsCalendar();
+        Calendar validTime = dataTime.getValidTime();
+        Calendar prevTime = parseTime(refTime, displayTime[0]);
         while (i < size) {
-
-            dt = Integer.parseInt(displayTime[i - 1].split("\\.")[1]);
-            t2 = Integer.parseInt(displayTime[i].split("\\.")[1]);
-
-            dt = t2 - dt; // dt is the delta between dt and t2
-            if (dt <= 0) {
-                dt += 24;
-            }
-
-            t2 = t1 + dt;
-
-            tc = Math.abs(t2 - tf);
-
-            if (tc < 0.01) {
-                tcs = new TropicalCycloneSummary(name, 0,
-                        longitude[i].floatValue(), latitude[i].floatValue(),
+            Calendar nextTime = parseTime(refTime, displayTime[i]);
+            if (nextTime.equals(validTime)) {
+                TropicalCycloneSummary tcs = new TropicalCycloneSummary(name,
+                        0, longitude[i].floatValue(), latitude[i].floatValue(),
                         displayTime[i], windSpeed[i].intValue(),
                         isTropical[i].intValue() == 1 ? true : false);
                 tcs.setRadiusList(loadRadiusList(pdv, i));
                 return tcs;
-            } else if (t2 < tf) {
-                t1 = t2; // shifting the base or t1 time
+            } else if (nextTime.before(validTime)) {
+                prevTime = nextTime;
             } else {
+                long t2 = nextTime.getTimeInMillis();
+                long t1 = prevTime.getTimeInMillis();
+                long tf = validTime.getTimeInMillis();
+                tc = (float) ((t2 - tf) / (double) (t2 - t1));
                 break;
             }
             i++;
@@ -155,32 +141,11 @@ public class Util implements TCSConstants {
                     isTropical[size - 1].intValue() == 1 ? true : false);
         }
 
-        tc = (t2 - tf) / (t2 - t1);
-        if (tc > 1 && t2 == 24) {
-            tc = -tf / (t2 - t1);
-        }
-        // Create the "dd.hh" string of the given time
-        dt = tf - t1;
+        Number isTrop = tc <= 0.5 ? isTropical[i] : isTropical[i - 1];
+        boolean tropical = (isTrop.intValue() == 1);
 
-        int isTrop = (dt / 2.0 + t1) >= tf ? isTropical[i].intValue()
-                : isTropical[i - 1].intValue();
-        tropical = isTrop == 1 ? true : false;
-
-        t1 = Integer.parseInt(displayTime[i - 1].split("\\.")[1]);
-        day = Integer.parseInt(displayTime[i - 1].split("\\.")[0]);
-        hour = (int) (t1 + dt + 0.5);
-        if (hour > 24) {
-            hour = hour - 24;
-            calendar.set(Calendar.DAY_OF_MONTH,
-                    Integer.parseInt(displayTime[i].split("\\.")[0]));
-            calendar.set(Calendar.HOUR_OF_DAY,
-                    Integer.parseInt(displayTime[i].split("\\.")[1]));
-            day++;
-        }
-
-        dTime = day + "." + (hour < 10 ? "0" + hour : hour);
-
-        // Interplating with the t1, t2 and tm.
+        dTime = String.format("%d.%02d", validTime.get(Calendar.DAY_OF_MONTH),
+                validTime.get(Calendar.HOUR_OF_DAY));
 
         // Location
         lat = latitude[i].floatValue() - tc
@@ -189,7 +154,7 @@ public class Util implements TCSConstants {
                 * (longitude[i].floatValue() - longitude[i - 1].floatValue());
 
         // Wind speed
-        wind = (int) (windSpeed[i].intValue() - tc
+        int wind = (int) (windSpeed[i].intValue() - tc
                 * (windSpeed[i].intValue() - windSpeed[i - 1].intValue()) + 0.6);
 
         // Loading the radius
@@ -201,7 +166,7 @@ public class Util implements TCSConstants {
 
         // Wind radius, we use longer one of the _list[i-1].radiusList(t1) and
         // _list[i].radiusList(t2) to loop. The distance is "0" if a wind radius
-        // is not exsiting in another list. How about it is "-1"?, we will
+        // is not existing in another list. How about it is "-1"?, we will
         // consider
         // it latter.
         int j = 0, rx1, rx2;
@@ -273,12 +238,26 @@ public class Util implements TCSConstants {
                 j++;
             }
         }
-        tcs = new TropicalCycloneSummary(name, 0, lon, lat, dTime, wind,
-                tropical);
+        TropicalCycloneSummary tcs = new TropicalCycloneSummary(name, 0, lon,
+                lat, dTime, wind, tropical);
         tcs.setRadiusList(radiusList);
         return tcs;
     }
 
+    private static Calendar parseTime(Calendar refTime, String displayTime) {
+        String[] halves = displayTime.split("\\.");
+        int year = refTime.get(Calendar.YEAR);
+        int month = refTime.get(Calendar.MONTH);
+        int day = Integer.parseInt(halves[0]);
+        int hour = Integer.parseInt(halves[1]);
+        Calendar c = TimeUtil.newGmtCalendar(year, month, day);
+        c.set(Calendar.HOUR_OF_DAY, hour);
+        if (c.before(refTime)) {
+            c.add(Calendar.MONTH, 1);
+        }
+        return c;
+    }
+
     private static ArrayList<Radius> loadRadiusList(PointDataView pdv, int index) {
         // Loading the radius
         int COLUMN_WIDTH = 4;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/.classpath b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/.classpath
similarity index 77%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/.classpath
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/.classpath
index 1fa3e6803d..098194ca4b 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/.classpath
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/.project b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/.project
new file mode 100644
index 0000000000..48aa171007
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.common.dataplugin.text.subscription</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..32233e86c9
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Subscription
+Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.text.subscription
+Bundle-Version: 1.16.0.qualifier
+Bundle-Vendor: RAYTHEON
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: com.raytheon.uf.common.serialization,
+ org.hibernate,
+ com.raytheon.uf.common.localization,
+ org.apache.commons.lang3;bundle-version="3.4.0"
+Import-Package: 
+ com.raytheon.uf.common.dataplugin.persist,
+ com.raytheon.uf.common.message,
+ com.raytheon.uf.common.serialization.comm,
+ javax.persistence
+Export-Package: com.raytheon.uf.common.dataplugin.text.subscription,
+ com.raytheon.uf.common.dataplugin.text.subscription.db,
+ com.raytheon.uf.common.dataplugin.text.subscription.request
+
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/build.properties b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/build.properties
similarity index 100%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/build.properties
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/build.properties
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/AutoFaxContainer.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/AutoFaxContainer.java
similarity index 93%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/AutoFaxContainer.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/AutoFaxContainer.java
index e328e8b7f1..9953c5c269 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/AutoFaxContainer.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/AutoFaxContainer.java
@@ -17,12 +17,12 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.text;
+package com.raytheon.uf.common.dataplugin.text.subscription;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.raytheon.uf.common.dataplugin.text.db.AutoFaxRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.AutoFaxRecord;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AutoFaxRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/AutoFaxRecord.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AutoFaxRecord.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/AutoFaxRecord.java
index 7d129846d6..07784b9537 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AutoFaxRecord.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/AutoFaxRecord.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.text.db;
+package com.raytheon.uf.common.dataplugin.text.subscription.db;
 
 import java.io.Serializable;
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AutoFaxRecordPK.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/AutoFaxRecordPK.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AutoFaxRecordPK.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/AutoFaxRecordPK.java
index e316ebdee1..ea6250f730 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AutoFaxRecordPK.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/AutoFaxRecordPK.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.text.db;
+package com.raytheon.uf.common.dataplugin.text.subscription.db;
 
 import java.io.Serializable;
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/ReplacementRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/ReplacementRecord.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/ReplacementRecord.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/ReplacementRecord.java
index 0a1a341e30..4da90d9176 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/ReplacementRecord.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/ReplacementRecord.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.text.db;
+package com.raytheon.uf.common.dataplugin.text.subscription.db;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/SubscriptionRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/SubscriptionRecord.java
similarity index 99%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/SubscriptionRecord.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/SubscriptionRecord.java
index 528c29fb85..90cc9dba7f 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/SubscriptionRecord.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/db/SubscriptionRecord.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.text.db;
+package com.raytheon.uf.common.dataplugin.text.subscription.db;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/AutoFaxRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/AutoFaxRequest.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/AutoFaxRequest.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/AutoFaxRequest.java
index aa7b3eab0c..a95f10d789 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/AutoFaxRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/AutoFaxRequest.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.text.request;
+package com.raytheon.uf.common.dataplugin.text.subscription.request;
 
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/GetAutoFaxRecordsRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/GetAutoFaxRecordsRequest.java
similarity index 94%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/GetAutoFaxRecordsRequest.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/GetAutoFaxRecordsRequest.java
index 76c47a8556..338107287e 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/GetAutoFaxRecordsRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/GetAutoFaxRecordsRequest.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.text.request;
+package com.raytheon.uf.common.dataplugin.text.subscription.request;
 
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.comm.IServerRequest;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/SendFaxRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/SendFaxRequest.java
similarity index 98%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/SendFaxRequest.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/SendFaxRequest.java
index c0b7a8707e..f80edfd8e6 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/SendFaxRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/SendFaxRequest.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.text.request;
+package com.raytheon.uf.common.dataplugin.text.subscription.request;
 
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/SubscriptionRequest.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/SubscriptionRequest.java
similarity index 96%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/SubscriptionRequest.java
rename to edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/SubscriptionRequest.java
index 58d4c8382e..7d51218824 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/request/SubscriptionRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text.subscription/src/com/raytheon/uf/common/dataplugin/text/subscription/request/SubscriptionRequest.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.common.dataplugin.text.request;
+package com.raytheon.uf.common.dataplugin.text.subscription.request;
 
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF
index 72e2868bbb..3146577bf8 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF
@@ -2,12 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Textdb Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.text
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.serialization,
  org.hibernate,
- com.raytheon.uf.common.localization;bundle-version="1.12.1174"
+ com.raytheon.uf.common.localization;bundle-version="1.12.1174",
+ org.apache.commons.lang3;bundle-version="3.4.0"
 Import-Package: com.raytheon.uf.common.dataplugin.persist,
  com.raytheon.uf.common.message,
  com.raytheon.uf.common.serialization,
@@ -17,8 +18,7 @@ Import-Package: com.raytheon.uf.common.dataplugin.persist,
  com.raytheon.uf.common.status,
  com.raytheon.uf.common.util,
  com.raytheon.uf.common.wmo,
- javax.persistence,
- org.apache.commons.lang.builder
+ javax.persistence
 Export-Package: com.raytheon.uf.common.dataplugin.text;uses:="com.raytheon.uf.common.dataplugin.text.db,com.raytheon.uf.common.serialization",
  com.raytheon.uf.common.dataplugin.text.alarms,
  com.raytheon.uf.common.dataplugin.text.db;uses:="com.raytheon.uf.common.dataplugin.persist,com.raytheon.uf.common.wmo,com.raytheon.uf.common.serialization",
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AfosToAwips.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AfosToAwips.java
index 319845e12f..a011afe25c 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AfosToAwips.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AfosToAwips.java
@@ -23,9 +23,9 @@ import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.hibernate.annotations.Index;
 
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
@@ -103,15 +103,18 @@ public class AfosToAwips extends PersistableDataObject implements
         id.setAfosid(afosid);
     }
 
+    @Override
     public String toString() {
         return new ToStringBuilder(this).append("afosid", getAfosid())
                 .append("wmottaaii", getWmottaaii())
                 .append("wmocccc", getWmocccc()).toString();
     }
 
+    @Override
     public boolean equals(Object other) {
-        if (!(other instanceof AfosToAwips))
+        if (!(other instanceof AfosToAwips)) {
             return false;
+        }
         AfosToAwips castOther = (AfosToAwips) other;
         return new EqualsBuilder()
                 .append(this.getAfosid(), castOther.getAfosid())
@@ -119,6 +122,7 @@ public class AfosToAwips extends PersistableDataObject implements
                 .append(this.getWmocccc(), castOther.getWmocccc()).isEquals();
     }
 
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getAfosid()).append(getWmottaaii())
                 .append(getWmocccc()).toHashCode();
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AfosToAwipsId.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AfosToAwipsId.java
index 737704f7e0..4421a15302 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AfosToAwipsId.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/AfosToAwipsId.java
@@ -22,9 +22,9 @@ package com.raytheon.uf.common.dataplugin.text.db;
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
 import com.raytheon.uf.common.serialization.ISerializableObject;
@@ -97,15 +97,18 @@ public class AfosToAwipsId extends PersistableDataObject implements
         this.afosid = afosid;
     }
 
+    @Override
     public String toString() {
         return new ToStringBuilder(this).append("afosid", getAfosid())
                 .append("wmottaaii", getWmottaaii())
                 .append("wmocccc", getWmocccc()).toString();
     }
 
+    @Override
     public boolean equals(Object other) {
-        if (!(other instanceof AfosToAwipsId))
+        if (!(other instanceof AfosToAwipsId)) {
             return false;
+        }
         AfosToAwipsId castOther = (AfosToAwipsId) other;
         return new EqualsBuilder()
                 .append(this.getAfosid(), castOther.getAfosid())
@@ -113,6 +116,7 @@ public class AfosToAwipsId extends PersistableDataObject implements
                 .append(this.getWmocccc(), castOther.getWmocccc()).isEquals();
     }
 
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getAfosid()).append(getWmottaaii())
                 .append(getWmocccc()).toHashCode();
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StateMatch.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StateMatch.java
index 85aba1877a..9b02f7b5e4 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StateMatch.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StateMatch.java
@@ -39,8 +39,9 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * ------------ ---------- ----------- --------------------------
  *                                     Initial Implementation
  * 15 Oct 2008  1538       jkorman     Core functions added.
- * 31 Aub 2010  2103       cjeanbap    Initialize member variable
- *                                      in constructor.    
+ * 31 Aug 2010  2103       cjeanbap    Initialize member variable
+ *                                      in constructor.
+ * 09 Dec 2015  5166       kbisanz     Override toString()
  * 
  * </pre>
  * 
@@ -78,4 +79,9 @@ public class StateMatch extends PersistableDataObject implements
     public void setPk(StateMatchPK pk) {
         this.pk = pk;
     }
+
+    @Override
+    public String toString() {
+        return "StateMatch[pk=" + pk + "]";
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StateMatchPK.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StateMatchPK.java
index f07ca7d8a7..63f6878b37 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StateMatchPK.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StateMatchPK.java
@@ -26,9 +26,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@@ -88,21 +88,25 @@ public class StateMatchPK extends PersistableDataObject {
         this.ccc = ccc;
     }
 
+    @Override
     public String toString() {
-        return new ToStringBuilder(this).append("state", getState()).append(
-                "xxx", getXxx()).append("ccc", getCcc()).toString();
+        return new ToStringBuilder(this).append("state", getState())
+                .append("xxx", getXxx()).append("ccc", getCcc()).toString();
     }
 
+    @Override
     public boolean equals(Object other) {
-        if (!(other instanceof StateMatchPK))
+        if (!(other instanceof StateMatchPK)) {
             return false;
+        }
         StateMatchPK castOther = (StateMatchPK) other;
         return new EqualsBuilder()
-                .append(this.getState(), castOther.getState()).append(
-                        this.getXxx(), castOther.getXxx()).append(
-                        this.getCcc(), castOther.getCcc()).isEquals();
+                .append(this.getState(), castOther.getState())
+                .append(this.getXxx(), castOther.getXxx())
+                .append(this.getCcc(), castOther.getCcc()).isEquals();
     }
 
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getState()).append(getXxx())
                 .append(getCcc()).toHashCode();
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StdTextProduct.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StdTextProduct.java
index 6707926d63..1e30d64e45 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StdTextProduct.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StdTextProduct.java
@@ -36,7 +36,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.hibernate.annotations.Index;
 import org.hibernate.annotations.Type;
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StdTextProductId.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StdTextProductId.java
index 3ccb969253..247c16026f 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StdTextProductId.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/StdTextProductId.java
@@ -26,9 +26,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
 import com.raytheon.uf.common.serialization.ISerializableObject;
@@ -171,27 +171,32 @@ public class StdTextProductId extends PersistableDataObject implements
         this.dataCrc = dataCrc;
     }
 
+    @Override
     public String toString() {
-        return new ToStringBuilder(this).append("wmoid", getWmoid()).append(
-                "site", getSite()).append("cccid", getCccid()).append("nnnid",
-                getNnnid()).append("xxxid", getXxxid()).append("hdrtime",
-                getHdrtime()).append("dataCrc", getDataCrc()).toString();
+        return new ToStringBuilder(this).append("wmoid", getWmoid())
+                .append("site", getSite()).append("cccid", getCccid())
+                .append("nnnid", getNnnid()).append("xxxid", getXxxid())
+                .append("hdrtime", getHdrtime())
+                .append("dataCrc", getDataCrc()).toString();
     }
 
+    @Override
     public boolean equals(Object other) {
-        if (!(other instanceof StdTextProductId))
+        if (!(other instanceof StdTextProductId)) {
             return false;
+        }
         StdTextProductId castOther = (StdTextProductId) other;
         return new EqualsBuilder()
-                .append(this.getWmoid(), castOther.getWmoid()).append(
-                        this.getSite(), castOther.getSite()).append(
-                        this.getCccid(), castOther.getCccid()).append(
-                        this.getNnnid(), castOther.getNnnid()).append(
-                        this.getXxxid(), castOther.getXxxid()).append(
-                        this.getHdrtime(), castOther.getHdrtime()).append(
-                        this.getDataCrc(), castOther.getDataCrc()).isEquals();
+                .append(this.getWmoid(), castOther.getWmoid())
+                .append(this.getSite(), castOther.getSite())
+                .append(this.getCccid(), castOther.getCccid())
+                .append(this.getNnnid(), castOther.getNnnid())
+                .append(this.getXxxid(), castOther.getXxxid())
+                .append(this.getHdrtime(), castOther.getHdrtime())
+                .append(this.getDataCrc(), castOther.getDataCrc()).isEquals();
     }
 
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getWmoid()).append(getSite())
                 .append(getCccid()).append(getNnnid()).append(getXxxid())
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/TextProductInfoPK.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/TextProductInfoPK.java
index 8f9390972f..cbf4b6ea6b 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/TextProductInfoPK.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/TextProductInfoPK.java
@@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@@ -91,21 +91,25 @@ public class TextProductInfoPK extends PersistableDataObject {
         this.xxxid = xxxid;
     }
 
+    @Override
     public String toString() {
         return new StringBuilder(cccid).append(":").append(nnnid).append(":")
                 .append(xxxid).toString();
     }
 
+    @Override
     public boolean equals(Object other) {
-        if (!(other instanceof TextProductInfoPK))
+        if (!(other instanceof TextProductInfoPK)) {
             return false;
+        }
         TextProductInfoPK castOther = (TextProductInfoPK) other;
         return new EqualsBuilder()
-                .append(this.getCccid(), castOther.getCccid()).append(
-                        this.getNnnid(), castOther.getNnnid()).append(
-                        this.getXxxid(), castOther.getXxxid()).isEquals();
+                .append(this.getCccid(), castOther.getCccid())
+                .append(this.getNnnid(), castOther.getNnnid())
+                .append(this.getXxxid(), castOther.getXxxid()).isEquals();
     }
 
+    @Override
     public int hashCode() {
         return new HashCodeBuilder().append(getCccid()).append(getNnnid())
                 .append(getXxxid()).toHashCode();
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/WatchWarn.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/WatchWarn.java
deleted file mode 100644
index 58d8b710ac..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/WatchWarn.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.text.db;
-
-import java.io.Serializable;
-
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-
-import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
-import com.raytheon.uf.common.serialization.ISerializableObject;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-
-/**
- * 
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#     Engineer    Description
- * ------------ ----------  ----------- --------------------------
- *                                      Initial Implementation
- * 15 Oct 2008        1538  jkorman     Core functions added.
- * </pre>
- */
-@Entity
-@Table
-@DynamicSerialize
-@XmlAccessorType(XmlAccessType.NONE)
-public class WatchWarn extends PersistableDataObject implements Serializable,
-        ISerializableObject {
-
-    private static final long serialVersionUID = 1L;
-
-    /** identifier field */
-    @EmbeddedId
-    @DynamicSerializeElement
-    @XmlElement
-    private WatchWarnPK pk;
-
-    /**
-     * Default no-arg constructor
-     */
-    public WatchWarn() {
-        pk = new WatchWarnPK();
-    }
-
-    /**
-     * Construct an instance with supplied product identifier and a script.
-     * 
-     * @param productid
-     *            A not null reference to the product identifier to store.
-     * @param script
-     *            A not null reference to the script to store.
-     */
-    public WatchWarn(String productid, String script) {
-        pk = new WatchWarnPK(productid, script);
-    }
-
-    /**
-     * Get the product identifier for this instance.
-     * 
-     * @return The product identifier for this instance.
-     * @hibernate.property column="productid"
-     */
-    public String getProductid() {
-        return pk.getProductid();
-    }
-
-    /**
-     * Get the script for this instance.
-     * 
-     * @return The script for this instance.
-     */
-    public String getScript() {
-        return pk.getScript();
-    }
-
-    public WatchWarnPK getPk() {
-        return pk;
-    }
-
-    public void setPk(WatchWarnPK pk) {
-        this.pk = pk;
-    }
-
-    /**
-     * 
-     * @param buffer
-     * @return
-     */
-    public StringBuilder toStringBuilder(StringBuilder buffer) {
-        if (buffer != null) {
-            buffer = new StringBuilder(90);
-        }
-        buffer.append(pk.getProductid());
-        buffer.append("=>{");
-        buffer.append(pk.getScript());
-        buffer.append("}");
-        return buffer;
-    }
-
-    /**
-     * Get the string representation of this class instance.
-     * 
-     * @return The string representation of this class instance.
-     */
-    @Override
-    public String toString() {
-        return toStringBuilder(null).toString();
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((pk == null) ? 0 : pk.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj)
-            return true;
-        if (obj == null)
-            return false;
-        if (getClass() != obj.getClass())
-            return false;
-        WatchWarn other = (WatchWarn) obj;
-        if (pk == null) {
-            if (other.pk != null)
-                return false;
-        } else if (!pk.equals(other.pk))
-            return false;
-        return true;
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/WatchWarnPK.java b/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/WatchWarnPK.java
deleted file mode 100644
index ff0806ee2e..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/src/com/raytheon/uf/common/dataplugin/text/db/WatchWarnPK.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.common.dataplugin.text.db;
-
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.builder.ToStringBuilder;
-
-import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
-import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-
-@Embeddable
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
-@DynamicSerialize
-public class WatchWarnPK extends PersistableDataObject {
-
-    private static final long serialVersionUID = 1L;
-
-    @Column(nullable = false, length = 9)
-    @DynamicSerializeElement
-    @XmlAttribute
-    private String productid;
-
-    @Column(nullable = false)
-    @DynamicSerializeElement
-    @XmlAttribute
-    private String script;
-
-    public WatchWarnPK(String productid, String script) {
-        this.productid = productid;
-        this.script = script;
-    }
-
-    public WatchWarnPK() {
-    }
-
-    public String getProductid() {
-        return this.productid;
-    }
-
-    public void setProductid(String productid) {
-        this.productid = productid;
-    }
-
-    public String getScript() {
-        return this.script;
-    }
-
-    public void setScript(String script) {
-        this.script = script;
-    }
-
-    public String toString() {
-        return new ToStringBuilder(this).append("productid", getProductid())
-                .append("script", getScript()).toString();
-    }
-
-    public boolean equals(Object other) {
-        if (!(other instanceof WatchWarnPK))
-            return false;
-        WatchWarnPK castOther = (WatchWarnPK) other;
-        return new EqualsBuilder().append(this.getProductid(),
-                castOther.getProductid()).append(this.getScript(),
-                castOther.getScript()).isEquals();
-    }
-
-    public int hashCode() {
-        return new HashCodeBuilder().append(getProductid()).append(getScript())
-                .toHashCode();
-    }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/META-INF/MANIFEST.MF
index 28df832155..f37556c718 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Warning
 Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.warning
-Bundle-Version: 1.15.0.qualifier
+Bundle-Version: 1.15.1.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.raytheon.uf.common.dataplugin.warning,
@@ -14,7 +14,6 @@ Export-Package: com.raytheon.uf.common.dataplugin.warning,
  com.raytheon.uf.common.dataplugin.warning.util
 Import-Package: com.raytheon.uf.common.time,
  javax.persistence,
- org.apache.commons.lang,
  org.hibernate.annotations
 Require-Bundle: org.geotools,
  com.raytheon.uf.common.dataplugin,
@@ -25,4 +24,5 @@ Require-Bundle: org.geotools,
  com.raytheon.uf.common.status,
  com.raytheon.uf.common.dataaccess,
  com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
- javax.measure;bundle-version="1.0.0"
+ javax.measure;bundle-version="1.0.0",
+ org.apache.commons.lang3;bundle-version="3.4.0"
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/GeospatialConfiguration.java b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/GeospatialConfiguration.java
index 6af9a71f2b..b3ffcdbb82 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/GeospatialConfiguration.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/GeospatialConfiguration.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 /**
  * 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/PathcastConfiguration.java b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/PathcastConfiguration.java
index dde516e1c0..78c267f05d 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/PathcastConfiguration.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/PathcastConfiguration.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 
-import org.apache.commons.lang.Validate;
+import org.apache.commons.lang3.Validate;
 
 /**
  * Pathcast
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
index eca007392e..1d5b4f6927 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
@@ -32,11 +32,11 @@ import com.raytheon.uf.common.dataplugin.warning.config.AreaSourceConfiguration;
 import com.raytheon.uf.common.dataplugin.warning.config.GeospatialConfiguration;
 import com.raytheon.uf.common.dataplugin.warning.config.WarngenConfiguration;
 import com.raytheon.uf.common.geospatial.SpatialException;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.serialization.SerializationException;
@@ -70,6 +70,7 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory;
  * Aug 21, 2014   3353     rferrel     Generating Geo Spatial data set no longer on the UI thread.
  * Feb 24, 2015   3978     njensen     Use openInputStream() for reading file contents
  * Dec  9, 2015 ASM #18209 D. Friedman Support cwaStretch.
+ * Jan 12, 2016 5244       njensen     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -240,11 +241,11 @@ public class GeospatialFactory {
                 LocalizationType.COMMON_STATIC, LocalizationLevel.CONFIGURED);
         context.setContextName(site);
 
-        LocalizationFile lf = pathMgr.getLocalizationFile(context,
+        ILocalizationFile lf = pathMgr.getLocalizationFile(context,
                 METADATA_FILE);
         if (lf.exists()) {
-            try {
-                return jaxb.unmarshalFromXmlFile(lf.getFile());
+            try (InputStream is = lf.openInputStream()) {
+                return jaxb.unmarshalFromInputStream(is);
             } catch (Exception e) {
                 statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
                         e);
@@ -305,7 +306,7 @@ public class GeospatialFactory {
                 LocalizationType.COMMON_STATIC, LocalizationLevel.CONFIGURED);
         context.setContextName(site);
 
-        LocalizationFile lf = pathMgr.getLocalizationFile(context, GEO_DIR
+        ILocalizationFile lf = pathMgr.getLocalizationFile(context, GEO_DIR
                 + fileName);
 
         if (lf.exists()) {
@@ -314,10 +315,10 @@ public class GeospatialFactory {
                         GeospatialDataSet.class, is);
             } catch (IOException e) {
                 throw new SerializationException("Error reading file "
-                        + lf.getName(), e);
+                        + lf.getPath(), e);
             }
         } else {
-            System.out.println("Attempted to load: " + lf.getName()
+            statusHandler.info("Attempted to load: " + lf.getPath()
                     + " for site " + site + ", but file does not exist.");
         }
 
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/util/WarnFileUtil.java b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/util/WarnFileUtil.java
index adafb372a7..3d17b9d29a 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/util/WarnFileUtil.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/util/WarnFileUtil.java
@@ -1,10 +1,9 @@
 package com.raytheon.uf.common.dataplugin.warning.util;
 
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 
 import com.raytheon.uf.common.dataplugin.warning.WarningConstants;
 import com.raytheon.uf.common.localization.IPathManager;
@@ -13,6 +12,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 
 /**
  * Utility class to retrieve the appropriate file in localization and in backup
@@ -26,6 +26,7 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
  * ------------ ---------- ----------- --------------------------
  * Apr 28, 2014 3033       jsanchez    Searches the backup site directory before the localized site directory.
  * Jul 02, 2014 DR 17450   D. Friedman Support using list of templates from backup site.
+ * Feb 15, 2016 5244       nabowle     Replace deprecated LocalizationFile methods.
  * </pre>
  * 
  * @author jsanchez
@@ -45,7 +46,7 @@ public class WarnFileUtil {
      * the issuingSiteID is applied. For example, if a file exists in the
      * issuingSiteID directory then that the file with the returned. Otherwise,
      * the base level version of the file will be returned.
-     * 
+     *
      * @param filename
      * @param issuingSiteID
      *            (optional)
@@ -115,7 +116,7 @@ public class WarnFileUtil {
      * Locates the appropriate file in the localization hierarchy including the
      * backupSite directory (if provided) and converts the content of the file
      * into a string.
-     * 
+     *
      * @param filename
      * @param localizedSite
      * @param backupSite
@@ -126,38 +127,29 @@ public class WarnFileUtil {
     public static String convertFileContentsToString(String filename,
             String localizedSite, String backupSite)
             throws FileNotFoundException, IOException {
-        File file = findFileInLocalizationIncludingBackupSite(filename, localizedSite, backupSite)
-                .getFile();
+        LocalizationFile file = findFileInLocalizationIncludingBackupSite(
+                filename, localizedSite, backupSite);
         return convertFileContentsToString(file);
     }
 
     public static String convertFileContentsToStringNoUser(String filename,
             String site) throws FileNotFoundException {
-        File file = findFileInLocalizationIncludingBackupSite(filename, site, null, false).getFile();
+        LocalizationFile file = findFileInLocalizationIncludingBackupSite(
+                filename, site, null, false);
         return convertFileContentsToString(file);
     }
 
-    private static String convertFileContentsToString(File file) {
+    private static String convertFileContentsToString(LocalizationFile file) {
         StringBuffer sb = new StringBuffer();
-        BufferedReader input = null;
-        try {
-            input = new BufferedReader(new FileReader(file));
+        try (BufferedReader input = new BufferedReader(new InputStreamReader(
+                file.openInputStream()))) {
 
             String line = null;
             while ((line = input.readLine()) != null) {
                 sb.append(line + "\n");
             }
-        } catch (IOException e) {
+        } catch (IOException | LocalizationException e) {
 
-        } finally {
-            if (input != null) {
-                try {
-                    input.close();
-                    input = null;
-                } catch (Exception e) {
-                    input = null;
-                }
-            }
         }
         return sb.toString();
     }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/.classpath b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/.classpath
similarity index 77%
rename from edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/.classpath
rename to edexOsgi/com.raytheon.uf.common.gfe.ifpclient/.classpath
index 1fa3e6803d..098194ca4b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/.classpath
+++ b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/.project b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/.project
similarity index 91%
rename from edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/.project
rename to edexOsgi/com.raytheon.uf.common.gfe.ifpclient/.project
index 3696cff9b0..be6d372adb 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/.project
+++ b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.raytheon.uf.edex.plugin.bufrquikscat</name>
+	<name>com.raytheon.uf.common.gfe.ifpclient</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..e507de6c70
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: IFP Client
+Bundle-SymbolicName: com.raytheon.uf.common.gfe.ifpclient
+Bundle-Version: 1.15.0.qualifier
+Bundle-Vendor: RAYTHEON
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: com.raytheon.uf.common.dataplugin.gfe;bundle-version="1.15.0",
+ com.raytheon.uf.common.serialization.comm;bundle-version="1.14.0",
+ com.raytheon.uf.common.message;bundle-version="1.14.1",
+ com.raytheon.uf.common.activetable;bundle-version="1.14.0",
+ com.raytheon.uf.common.localization;bundle-version="1.15.0",
+ com.raytheon.uf.common.site;bundle-version="1.14.0",
+ com.raytheon.uf.common.status;bundle-version="1.15.0",
+ com.raytheon.uf.common.serialization;bundle-version="1.15.1",
+ com.raytheon.uf.common.time;bundle-version="1.15.0"
+Export-Package: com.raytheon.uf.common.gfe.ifpclient,
+ com.raytheon.uf.common.gfe.ifpclient.exception
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.product/build.properties b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/build.properties
similarity index 100%
rename from javaUtilities/com.raytheon.wes2bridge.utility.product/build.properties
rename to edexOsgi/com.raytheon.uf.common.gfe.ifpclient/build.properties
diff --git a/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/src/com/raytheon/uf/common/gfe/ifpclient/IFPClient.java b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/src/com/raytheon/uf/common/gfe/ifpclient/IFPClient.java
new file mode 100644
index 0000000000..13a9b515a7
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/src/com/raytheon/uf/common/gfe/ifpclient/IFPClient.java
@@ -0,0 +1,1137 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.common.gfe.ifpclient;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import com.raytheon.uf.common.activetable.ActiveTableMode;
+import com.raytheon.uf.common.activetable.ActiveTableRecord;
+import com.raytheon.uf.common.activetable.request.ClearPracticeVTECTableRequest;
+import com.raytheon.uf.common.dataplugin.gfe.GridDataHistory;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
+import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteDefinition;
+import com.raytheon.uf.common.dataplugin.gfe.discrete.DiscreteKey;
+import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
+import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
+import com.raytheon.uf.common.dataplugin.gfe.request.AbstractGfeRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.CommitGridsRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.CreateNewDbRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetActiveTableRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetClientsRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetDbInventoryRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetDiscreteDefinitionRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetGridDataRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetGridHistoryRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetGridInventoryRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetGridParmInfoRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetIscSendStatusRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetIscSendStatusRequest.IscSendStatus;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetKnownOfficeTypesRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetKnownSitesRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetLockTablesRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetOfficialDbNameRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetParmListRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetSingletonDbIdsRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetSiteTimeZoneInfoRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetTopoDataRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GetWXDefinitionRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.GridLocRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.IscMakeRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.IscRequestQueryRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.IscRequestQueryRequest.IscQueryResponse;
+import com.raytheon.uf.common.dataplugin.gfe.request.LockChangeRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.SaveGfeGridRequest;
+import com.raytheon.uf.common.dataplugin.gfe.request.SendIscGridRequest;
+import com.raytheon.uf.common.dataplugin.gfe.sample.SampleData;
+import com.raytheon.uf.common.dataplugin.gfe.sample.SampleId;
+import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.CommitGridRequest;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.GetGridRequest;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.LockRequest;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.LockTableRequest;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.SaveGridRequest;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.SendISCRequest;
+import com.raytheon.uf.common.dataplugin.gfe.slice.IGridSlice;
+import com.raytheon.uf.common.dataplugin.gfe.slice.ScalarGridSlice;
+import com.raytheon.uf.common.dataplugin.gfe.weather.WeatherSubKey;
+import com.raytheon.uf.common.dataplugin.gfe.weather.WxDefinition;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.IPathManager;
+import com.raytheon.uf.common.localization.LocalizationContext;
+import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
+import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
+import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.LocalizationUtil;
+import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
+import com.raytheon.uf.common.message.WsId;
+import com.raytheon.uf.common.serialization.comm.IServerRequest;
+import com.raytheon.uf.common.serialization.comm.RequestRouter;
+import com.raytheon.uf.common.site.SiteMap;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.time.TimeRange;
+
+/**
+ * Client class for the IFP database server.
+ * <p>
+ * For release 16.2.2, this code was re-ported from A1 so that all methods
+ * return {@code ServerResponse} objects instead of arbitrarily returning a
+ * {@code ServerResponse} or the inner payload.
+ * <p>
+ * {@code PyFPClient} provides an IFPClient implementation that more closely
+ * matches the behavior of IFPClient prior to 16.2.2. Call
+ * {@code getPythonClient} to retrieve a PyFPClient instance or construct one
+ * manually.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Nov 13, 2015  #5129     dgilling     Initial creation
+ * Feb 05, 2016  #5242     dgilling     Replace calls to deprecated Localization APIs.
+ * 
+ * </pre>
+ * 
+ * @author dgilling
+ * @version 1.0
+ */
+
+public class IFPClient {
+
+    private final IUFStatusHandler statusHandler = UFStatus
+            .getHandler(getClass());
+
+    private static final String EDIT_AREAS_DIR = "gfe" + IPathManager.SEPARATOR
+            + "editAreas";
+
+    private static final String SAMPLE_SETS_DIR = "gfe"
+            + IPathManager.SEPARATOR + "sampleSets";
+
+    private final WsId myWsId;
+
+    private final String siteId;
+
+    private final GridLocation gridLocation;
+
+    /**
+     * Constructor.
+     * 
+     * @param wsId
+     *            {@code WsId} instance to associate with this client.
+     * @param siteId
+     *            Site ID of this client.
+     */
+    public IFPClient(WsId wsId, String siteId) {
+        this.myWsId = wsId;
+        this.siteId = siteId;
+
+        // get and set the WxDefinition
+        ServerResponse<WxDefinition> sr = getWxDefinition();
+        WxDefinition wxDef = sr.getPayload();
+        if (!sr.isOkay()) {
+            statusHandler.error(sr.message());
+        }
+        WeatherSubKey.setWxDefinition(siteId, wxDef);
+
+        // get and set the DiscreteDefinition
+        ServerResponse<DiscreteDefinition> sr2 = getDiscreteDefinition();
+        DiscreteDefinition dDef = sr2.getPayload();
+        if (!sr2.isOkay()) {
+            statusHandler.error(sr2.message());
+        }
+        DiscreteKey.setDiscreteDefinition(siteId, dDef);
+
+        ServerResponse<GridLocation> sr3 = getDBGridLocation();
+        GridLocation gLoc = sr3.getPayload();
+        if (!sr3.isOkay()) {
+            statusHandler.error(sr3.message());
+        }
+        this.gridLocation = gLoc;
+    }
+
+    /**
+     * Command to commit grids to the official database. This function accepts
+     * only a single {@code CommitGridRequest}.
+     * 
+     * @param request
+     *            The commit request.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> commitGrid(CommitGridRequest request) {
+        return commitGrid(Arrays.asList(request));
+    }
+
+    /**
+     * Command to commit grids to the official database. This function accepts
+     * multiple {@code CommitGridRequest}s.
+     * 
+     * @param requests
+     *            The commit requests.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> commitGrid(List<CommitGridRequest> requests) {
+        CommitGridsRequest request = new CommitGridsRequest();
+        request.setCommits(requests);
+
+        return makeRequest(request);
+    }
+
+    /**
+     * Command to send ISC grids.
+     * 
+     * @param requests
+     *            The ISC send requests.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> sendISC(List<SendISCRequest> requests) {
+        SendIscGridRequest request = new SendIscGridRequest();
+        request.setRequests(requests);
+
+        return makeRequest(request);
+    }
+
+    /**
+     * Gets the database inventory.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the inventory.
+     */
+    public ServerResponse<List<DatabaseID>> getDbInventory() {
+        GetDbInventoryRequest request = new GetDbInventoryRequest();
+
+        return (ServerResponse<List<DatabaseID>>) makeRequest(request);
+    }
+
+    /**
+     * Requests the creation of a new database.
+     * 
+     * @param id
+     *            The {@code DatabaseID} of the database to create.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> createNewDb(DatabaseID id) {
+        CreateNewDbRequest request = new CreateNewDbRequest(id);
+
+        return makeRequest(request);
+    }
+
+    /**
+     * Returns the parameter list for the given database.
+     * 
+     * @param id
+     *            {@code DatabaseID} for the database to get parm list for.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the database's list of parms.
+     */
+    public ServerResponse<List<ParmID>> getParmList(DatabaseID id) {
+        return getParmList(Arrays.asList(id));
+    }
+
+    /**
+     * Returns the parameter list for the given databases.
+     * 
+     * @param ids
+     *            Databases to retrieve parm lists for, identified by
+     *            {@code DatabaseID}.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the inventory for all requested databases in one list.
+     */
+    public ServerResponse<List<ParmID>> getParmList(List<DatabaseID> ids) {
+        GetParmListRequest request = new GetParmListRequest();
+        request.setDbIds(ids);
+
+        return (ServerResponse<List<ParmID>>) makeRequest(request);
+    }
+
+    /**
+     * Returns the grid inventory for the given parameter.
+     * 
+     * @param parmID
+     *            Parm to request inventory for, identified by {@code ParmID}.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the inventory as a list of grid times as
+     *         {@code TimeRange}s.
+     */
+    public ServerResponse<List<TimeRange>> getGridInventory(ParmID parmID) {
+        ServerResponse<Map<ParmID, List<TimeRange>>> sr = getGridInventory(Arrays
+                .asList(parmID));
+        List<TimeRange> trs = Collections.emptyList();
+        Map<ParmID, List<TimeRange>> inv = sr.getPayload();
+        if ((sr.isOkay()) && (inv.containsKey(parmID))) {
+            trs = inv.get(parmID);
+        }
+
+        ServerResponse<List<TimeRange>> ssr = new ServerResponse<>();
+        ssr.setPayload(trs);
+        ssr.addMessages(sr);
+        return ssr;
+    }
+
+    /**
+     * Returns the grid inventory for the given parameters.
+     * 
+     * @param parmIDs
+     *            Parms to request inventory for, identified by {@code ParmID}.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the inventory as a Map of {@code ParmID} to list of grid
+     *         times as {@code TimeRange}s.
+     */
+    public ServerResponse<Map<ParmID, List<TimeRange>>> getGridInventory(
+            List<ParmID> parmIDs) {
+        GetGridInventoryRequest request = new GetGridInventoryRequest();
+        request.setParmIds(parmIDs);
+
+        return (ServerResponse<Map<ParmID, List<TimeRange>>>) makeRequest(request);
+    }
+
+    /**
+     * Returns the grid parameter information for the specified parm.
+     * 
+     * @param parmID
+     *            Parm to retrieve info for identified by {@code ParmID}.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains {@code GridParmInfo} for the requested parm.
+     */
+    public ServerResponse<GridParmInfo> getGridParmInfo(ParmID parmID) {
+        ServerResponse<List<GridParmInfo>> sr = getGridParmInfo(Arrays
+                .asList(parmID));
+        List<GridParmInfo> gpi = sr.getPayload();
+        GridParmInfo info = null;
+        if ((sr.isOkay()) && (!gpi.isEmpty())) {
+            info = gpi.get(0);
+        }
+
+        ServerResponse<GridParmInfo> ssr = new ServerResponse<>();
+        ssr.setPayload(info);
+        ssr.addMessages(sr);
+        return ssr;
+    }
+
+    /**
+     * Returns the grid parameter information for the specified list of parms.
+     * 
+     * @param parmIDs
+     *            List of parms to retrieve info for identified by
+     *            {@code ParmID}.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains {@code GridParmInfo} for each requested parm.
+     */
+    public ServerResponse<List<GridParmInfo>> getGridParmInfo(
+            List<ParmID> parmIDs) {
+        GetGridParmInfoRequest request = new GetGridParmInfoRequest();
+        request.setParmIds(parmIDs);
+
+        return (ServerResponse<List<GridParmInfo>>) makeRequest(request);
+    }
+
+    /**
+     * Returns the grid history information for the specified parm and grid
+     * time.
+     * 
+     * @param parmID
+     *            {@code ParmID} of the parm to retrieve grid history for.
+     * @param trs
+     *            Grid time to retrieve history for.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains history for the grid.
+     */
+    public ServerResponse<List<GridDataHistory>> getGridHistory(ParmID parmID,
+            TimeRange tr) {
+        ServerResponse<Map<TimeRange, List<GridDataHistory>>> sr = getGridHistory(
+                parmID, Arrays.asList(tr));
+        Map<TimeRange, List<GridDataHistory>> his = sr.getPayload();
+        List<GridDataHistory> info = Collections.emptyList();
+        if ((sr.isOkay()) && (his.containsKey(tr))) {
+            info = his.get(tr);
+        }
+
+        ServerResponse<List<GridDataHistory>> ssr = new ServerResponse<>();
+        ssr.setPayload(info);
+        ssr.addMessages(sr);
+        return ssr;
+    }
+
+    /**
+     * Returns the grid history information for the parm at the specified time
+     * ranges.
+     * 
+     * @param parmID
+     *            {@code ParmID} of the parm to retrieve grid history for.
+     * @param trs
+     *            Grid times to retrieve histories for.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains histories keyed by grid time.
+     */
+    public ServerResponse<Map<TimeRange, List<GridDataHistory>>> getGridHistory(
+            ParmID parmID, List<TimeRange> trs) {
+        GetGridHistoryRequest request = new GetGridHistoryRequest();
+        request.setParmID(parmID);
+        request.setTimeRanges(trs);
+
+        return (ServerResponse<Map<TimeRange, List<GridDataHistory>>>) makeRequest(request);
+    }
+
+    /**
+     * Saves grid data identified by the save grid request. This function is for
+     * a single grid request.
+     * 
+     * @param saveGridRequest
+     *            The save request.
+     * @param iscSendStatus
+     *            Whether or not ISC send is enabled for this client session.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> saveGridData(SaveGridRequest saveGridRequest,
+            boolean iscSendStatus) {
+        return saveGridData(Arrays.asList(saveGridRequest), iscSendStatus);
+    }
+
+    /**
+     * Saves grid data identified by the sequence of save grid requests.
+     * 
+     * @param saveGridRequest
+     *            The save requests.
+     * @param iscSendStatus
+     *            Whether or not ISC send is enabled for this client session.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> saveGridData(
+            List<SaveGridRequest> saveGridRequest, boolean iscSendStatus) {
+        SaveGfeGridRequest request = new SaveGfeGridRequest(iscSendStatus,
+                saveGridRequest);
+
+        return makeRequest(request);
+    }
+
+    /**
+     * Retrieves grid data identified by the get grid request.
+     * 
+     * @param request
+     *            The get grid request.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the data as {@code IGridSlice}s.
+     */
+    public ServerResponse<List<IGridSlice>> getGridData(GetGridRequest request) {
+        return getGridData(Arrays.asList(request));
+    }
+
+    /**
+     * Retrieves grid data identified by the sequence of get grid requests.
+     * 
+     * @param getRequest
+     *            The get grid requests.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the data as {@code IGridSlice}s.
+     */
+    public ServerResponse<List<IGridSlice>> getGridData(
+            List<GetGridRequest> getRequest) {
+        GetGridDataRequest request = new GetGridDataRequest();
+        request.setRequests(getRequest);
+
+        return (ServerResponse<List<IGridSlice>>) makeRequest(request);
+    }
+
+    /**
+     * Retrieves the lock table based on the lock table request. Note that more
+     * than one lock table may be returned.
+     * 
+     * @param request
+     *            the lock table request
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested lock table (more than one lock table may
+     *         be returned).
+     */
+    public ServerResponse<List<LockTable>> getLockTable(LockTableRequest request) {
+        return getLockTable(Arrays.asList(request));
+    }
+
+    /**
+     * Retrieves the lock table based on the lock table requests.
+     * 
+     * @param requests
+     *            the lock table requests
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested lock tables.
+     */
+    public ServerResponse<List<LockTable>> getLockTable(
+            List<LockTableRequest> requests) {
+        GetLockTablesRequest request = new GetLockTablesRequest();
+        request.setRequests(requests);
+
+        return (ServerResponse<List<LockTable>>) makeRequest(request);
+    }
+
+    /**
+     * Requests a lock change.
+     * 
+     * @param lockRequest
+     *            The lock request.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the affected lock tables.
+     */
+    public ServerResponse<List<LockTable>> requestLockChange(
+            LockRequest lockRequest) {
+        return requestLockChange(Arrays.asList(lockRequest));
+    }
+
+    /**
+     * Requests lock changes.
+     * 
+     * @param lockRequests
+     *            The lock requests.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the affected lock tables.
+     */
+    public ServerResponse<List<LockTable>> requestLockChange(
+            List<LockRequest> lockRequests) {
+        LockChangeRequest request = new LockChangeRequest();
+        request.setRequests(lockRequests);
+
+        return (ServerResponse<List<LockTable>>) makeRequest(request);
+    }
+
+    /**
+     * Returns the database id for the official database.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested database id.
+     */
+    public ServerResponse<List<DatabaseID>> getOfficialDBName() {
+        GetOfficialDbNameRequest request = new GetOfficialDbNameRequest();
+
+        return (ServerResponse<List<DatabaseID>>) makeRequest(request);
+    }
+
+    /**
+     * Returns the database ids that correspond to the singleton-type of
+     * database, i.e., the ones without model time stamps.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested database ids.
+     */
+    public ServerResponse<List<DatabaseID>> getSingletonDBName() {
+        GetSingletonDbIdsRequest request = new GetSingletonDbIdsRequest();
+
+        return (ServerResponse<List<DatabaseID>>) makeRequest(request);
+    }
+
+    /**
+     * Returns the topography data set for the given {@code GridLocation}.
+     * 
+     * @param loc
+     *            {@code GridLocation} to request topography data for.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested data as a {@code ScalarGridSlice}.
+     */
+    public ServerResponse<ScalarGridSlice> getTopoData(GridLocation loc) {
+        GetTopoDataRequest request = new GetTopoDataRequest(loc);
+
+        return (ServerResponse<ScalarGridSlice>) makeRequest(request);
+    }
+
+    /**
+     * Gets the sample set inventory.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the inventory in {@code SampleId} form.
+     */
+    public ServerResponse<List<SampleId>> getSampleInventory() {
+        ServerResponse<List<SampleId>> sr = new ServerResponse<>();
+        List<SampleId> inv = new ArrayList<>();
+
+        IPathManager pathMgr = PathManagerFactory.getPathManager();
+        LocalizationFile[] files = pathMgr.listStaticFiles(
+                LocalizationType.COMMON_STATIC, SAMPLE_SETS_DIR,
+                new String[] { ".xml" }, false, true);
+        for (LocalizationFile lf : files) {
+            String name = LocalizationUtil.extractName(lf.getPath()).replace(
+                    ".xml", "");
+            inv.add(new SampleId(name, false, lf.getContext()
+                    .getLocalizationLevel()));
+        }
+
+        sr.setPayload(inv);
+        return sr;
+    }
+
+    /**
+     * Gets the reference set inventory. The inventory is returned through
+     * {@code ReferenceID}.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the inventory.
+     */
+    public ServerResponse<List<ReferenceID>> getReferenceInventory() {
+        ServerResponse<List<ReferenceID>> sr = new ServerResponse<>();
+
+        List<ReferenceID> refIDs = new ArrayList<>();
+        IPathManager pm = PathManagerFactory.getPathManager();
+        LocalizationFile[] contents = pm.listStaticFiles(
+                LocalizationType.COMMON_STATIC, EDIT_AREAS_DIR,
+                new String[] { ".xml" }, false, true);
+        if (contents != null) {
+            for (LocalizationFile lf : contents) {
+                String area = LocalizationUtil.extractName(lf.getPath())
+                        .replace(".xml", "");
+                refIDs.add(new ReferenceID(area, false, lf.getContext()
+                        .getLocalizationLevel()));
+            }
+        }
+
+        sr.setPayload(refIDs);
+        return sr;
+    }
+
+    /**
+     * Saves sample set data identified by the sequence of {@code SampleData}.
+     * 
+     * @param sampleData
+     *            Sample set data to save. Files will be written to USER
+     *            localization level.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> saveSampleData(List<SampleData> sampleData) {
+        ServerResponse<Object> sr = new ServerResponse<>();
+
+        IPathManager pm = PathManagerFactory.getPathManager();
+        LocalizationContext ctx = pm.getContext(LocalizationType.COMMON_STATIC,
+                LocalizationLevel.USER);
+        for (SampleData sample : sampleData) {
+            ILocalizationFile lf = pm.getLocalizationFile(ctx, SAMPLE_SETS_DIR
+                    + IPathManager.SEPARATOR + sample.getSampleId().getName()
+                    + ".xml");
+            try (SaveableOutputStream out = lf.openOutputStream()) {
+                SampleData.getJAXBManager().marshalToStream(sample, out);
+                out.save();
+            } catch (Exception e) {
+                String message = String
+                        .format("Unable to write output file [%s] for sample data [%s]: %s",
+                                lf.toString(), sample.getSampleId().getName(),
+                                e.getLocalizedMessage());
+                sr.addMessage(message);
+                break;
+            }
+        }
+
+        return sr;
+    }
+
+    /**
+     * Saves reference data identified by the sequence of {@code ReferenceData}
+     * s.
+     * 
+     * @param referenceData
+     *            Reference data to save. Files will be written to USER
+     *            localization level.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> saveReferenceData(List<ReferenceData> referenceData) {
+        ServerResponse<?> sr = new ServerResponse<>();
+
+        IPathManager pm = PathManagerFactory.getPathManager();
+        LocalizationContext ctx = pm.getContext(LocalizationType.COMMON_STATIC,
+                LocalizationLevel.USER);
+        for (ReferenceData refData : referenceData) {
+            ILocalizationFile lf = pm.getLocalizationFile(ctx, EDIT_AREAS_DIR
+                    + IPathManager.SEPARATOR + refData.getId().getName()
+                    + ".xml");
+            try (SaveableOutputStream out = lf.openOutputStream()) {
+                ReferenceData.getJAXBManager().marshalToStream(refData, out);
+                out.save();
+            } catch (Exception e) {
+                String message = String
+                        .format("Unable to write output file [%s] for reference data [%s]: %s",
+                                lf.toString(), refData.getId().getName(),
+                                e.getLocalizedMessage());
+                sr.addMessage(message);
+                break;
+            }
+        }
+
+        return sr;
+    }
+
+    /**
+     * Deletes sample data identified by the sequence of {@code SampleID}.
+     * 
+     * @param ids
+     *            The sample sets to delete, identified by {@code SampleID}.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> deleteSampleData(List<SampleId> ids) {
+        ServerResponse<?> sr = new ServerResponse<>();
+
+        IPathManager pm = PathManagerFactory.getPathManager();
+        LocalizationContext ctx = pm.getContext(LocalizationType.COMMON_STATIC,
+                LocalizationLevel.USER);
+        for (SampleId id : ids) {
+            try {
+                ILocalizationFile lf = pm.getLocalizationFile(ctx,
+                        SAMPLE_SETS_DIR + IPathManager.SEPARATOR + id.getName()
+                                + ".xml");
+                lf.delete();
+            } catch (LocalizationException e) {
+                String message = String.format("Deletion for [%s] failed: %s",
+                        id.getName(), e.getLocalizedMessage());
+                sr.addMessage(message);
+            }
+        }
+        return sr;
+    }
+
+    /**
+     * Deletes reference data identified by the sequence of {@code ReferenceID}.
+     * 
+     * @param ids
+     *            The sample sets to delete, identified by {@code ReferenceID}.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> deleteReferenceData(List<ReferenceID> ids) {
+        ServerResponse<?> sr = new ServerResponse<>();
+
+        IPathManager pm = PathManagerFactory.getPathManager();
+        LocalizationContext ctx = pm.getContext(LocalizationType.COMMON_STATIC,
+                LocalizationLevel.USER);
+        for (ReferenceID id : ids) {
+            try {
+                ILocalizationFile lf = pm.getLocalizationFile(ctx,
+                        EDIT_AREAS_DIR + IPathManager.SEPARATOR + id.getName()
+                                + ".xml");
+                lf.delete();
+            } catch (LocalizationException e) {
+                String message = String.format("Deletion for [%s] failed: %s",
+                        id.getName(), e.getLocalizedMessage());
+                sr.addMessage(message);
+            }
+        }
+        return sr;
+    }
+
+    /**
+     * Retrieves sample data identified by a sample id.
+     * 
+     * @param id
+     *            The {@code SampleId} for the sample set to retrieve.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested {@code SampleData} object.
+     */
+    public ServerResponse<SampleData> getSampleData(SampleId id) {
+        SampleData data = null;
+
+        ServerResponse<List<SampleData>> sr = getSampleData(Arrays.asList(id));
+        List<SampleData> seq = sr.getPayload();
+        if ((sr.isOkay()) && (!seq.isEmpty())) {
+            data = seq.get(0);
+        }
+
+        ServerResponse<SampleData> ssr = new ServerResponse<>();
+        ssr.addMessages(sr);
+        ssr.setPayload(data);
+        return ssr;
+    }
+
+    /**
+     * Retrieves sample data identified by the sequence of sample ids.
+     * 
+     * @param ids
+     *            {@code SampleId}s to retrieve sample set data for.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested {@code SampleData} objects.
+     */
+    public ServerResponse<List<SampleData>> getSampleData(List<SampleId> ids) {
+        ServerResponse<List<SampleData>> sr = new ServerResponse<>();
+        List<SampleData> data = new ArrayList<>();
+
+        for (SampleId id : ids) {
+            String filePath = SAMPLE_SETS_DIR + IPathManager.SEPARATOR
+                    + id.getName() + ".xml";
+            ILocalizationFile lf = PathManagerFactory.getPathManager()
+                    .getStaticLocalizationFile(LocalizationType.COMMON_STATIC,
+                            filePath);
+
+            if (lf != null) {
+                try (InputStream in = lf.openInputStream()) {
+                    SampleData sampleData = SampleData.getJAXBManager()
+                            .unmarshalFromInputStream(in);
+                    sampleData.setSampleId(id);
+                    data.add(sampleData);
+                } catch (Exception e) {
+                    String message = String.format(
+                            "Unable to read sample data [%s] from file [%s].",
+                            id, lf.toString());
+                    sr.addMessage(message);
+                    data = Collections.emptyList();
+                    break;
+                }
+            } else {
+                String message = String.format(
+                        "Unable to find sample data [%s].", id);
+                sr.addMessage(message);
+                data = Collections.emptyList();
+                break;
+            }
+        }
+
+        sr.setPayload(data);
+        return sr;
+    }
+
+    /**
+     * Retrieves reference data identified by a reference id.
+     * 
+     * @param id
+     *            The {@code ReferenceID} for the reference set to retrieve.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested reference data.
+     */
+    public ServerResponse<ReferenceData> getReferenceData(ReferenceID id) {
+        ReferenceData data = null;
+
+        ServerResponse<List<ReferenceData>> sr = getReferenceData(Arrays
+                .asList(id));
+        List<ReferenceData> seq = sr.getPayload();
+        if ((sr.isOkay()) && (seq.size() == 1)) {
+            data = seq.get(0);
+        }
+
+        ServerResponse<ReferenceData> ssr = new ServerResponse<>();
+        ssr.addMessages(sr);
+        ssr.setPayload(data);
+        return ssr;
+    }
+
+    /**
+     * Retrieves reference data identified by the sequence of reference ids.
+     * 
+     * @param id
+     *            {@code ReferenceID}s to retrieve reference data for.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested {@code ReferenceData} objects.
+     */
+    public ServerResponse<List<ReferenceData>> getReferenceData(
+            List<ReferenceID> ids) {
+        ServerResponse<List<ReferenceData>> sr = new ServerResponse<>();
+        List<ReferenceData> data = new ArrayList<>();
+
+        for (ReferenceID id : ids) {
+            String filePath = EDIT_AREAS_DIR + IPathManager.SEPARATOR
+                    + id.getName() + ".xml";
+            ILocalizationFile lf = PathManagerFactory.getPathManager()
+                    .getStaticLocalizationFile(LocalizationType.COMMON_STATIC,
+                            filePath);
+            if (lf != null) {
+                try (InputStream in = lf.openInputStream()) {
+                    ReferenceData refData = ReferenceData.getJAXBManager()
+                            .unmarshalFromInputStream(in);
+                    refData.setId(new ReferenceID(id.getName(), false, lf
+                            .getContext().getLocalizationLevel()));
+                    refData.setGloc(gridLocation);
+                    data.add(refData);
+                } catch (Exception e) {
+                    String message = String
+                            .format("Unable to read reference data [%s] from file [%s].",
+                                    id, lf.toString());
+                    sr.addMessage(message);
+                    data = Collections.emptyList();
+                    break;
+                }
+            } else {
+                String message = String.format(
+                        "Unable to find reference data [%s].", id);
+                sr.addMessage(message);
+                data = Collections.emptyList();
+                break;
+            }
+        }
+
+        sr.setPayload(data);
+        return sr;
+    }
+
+    /**
+     * Gets the WxDefinition.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the {@code WxDefinition}.
+     */
+    public ServerResponse<WxDefinition> getWxDefinition() {
+        GetWXDefinitionRequest request = new GetWXDefinitionRequest();
+
+        return (ServerResponse<WxDefinition>) makeRequest(request);
+    }
+
+    /**
+     * Gets the DiscreteDefinition.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the {@code DiscreteDefinition}.
+     */
+    public ServerResponse<DiscreteDefinition> getDiscreteDefinition() {
+        GetDiscreteDefinitionRequest request = new GetDiscreteDefinitionRequest();
+
+        return (ServerResponse<DiscreteDefinition>) makeRequest(request);
+    }
+
+    /**
+     * Gets the site identifier associated with the server.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the site identifier.
+     */
+    public ServerResponse<String> getSiteID() {
+        ServerResponse<String> sr = new ServerResponse<>();
+        sr.setPayload(siteId);
+        return sr;
+    }
+
+    /**
+     * Retrieves site time zone associated with the given site.
+     * 
+     * @param site
+     *            Site to get time zone for, identified by 3-character site
+     *            identifier.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the site's time zone.
+     */
+    public ServerResponse<String> getSiteTimeZone(String site) {
+        ServerResponse<Map<String, String>> sr = getSiteTimeZone(Arrays
+                .asList(site));
+        Map<String, String> tzMap = sr.getPayload();
+
+        String timeZone;
+        if ((sr.isOkay()) && (tzMap.containsKey(site))) {
+            timeZone = tzMap.get(site);
+        } else {
+            timeZone = "";
+        }
+
+        ServerResponse<String> ssr = new ServerResponse<>();
+        ssr.addMessages(sr);
+        ssr.setPayload(timeZone);
+        return ssr;
+    }
+
+    /**
+     * Retrieves site time zone associated with the list of sites.
+     * 
+     * @param ids
+     *            Sites to get time zone for, identified by 3-character site
+     *            identifier.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested sites and time zones.
+     */
+    public ServerResponse<Map<String, String>> getSiteTimeZone(List<String> ids) {
+        GetSiteTimeZoneInfoRequest request = new GetSiteTimeZoneInfoRequest(ids);
+
+        return (ServerResponse<Map<String, String>>) makeRequest(request);
+    }
+
+    /**
+     * Retrieves the list of known sites that the server is configured for by
+     * site ID.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the list of known site identifiers.
+     */
+    public ServerResponse<List<String>> getKnownSites() {
+        GetKnownSitesRequest request = new GetKnownSitesRequest();
+
+        return (ServerResponse<List<String>>) makeRequest(request);
+    }
+
+    /**
+     * Retrieves the list of known sites that the server is configured for.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the a {@code Map} of site IDs to office types.
+     */
+    public ServerResponse<Map<String, String>> getKnownSitesWithOfficeType() {
+        GetKnownOfficeTypesRequest request = new GetKnownOfficeTypesRequest();
+
+        return (ServerResponse<Map<String, String>>) makeRequest(request);
+    }
+
+    /**
+     * Retrieves the database grid location that is common to all weather
+     * elements.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the site's {@code GridLocation}.
+     */
+    public ServerResponse<GridLocation> getDBGridLocation() {
+        GridLocRequest request = new GridLocRequest();
+
+        return (ServerResponse<GridLocation>) makeRequest(request);
+    }
+
+    /**
+     * Returns the current list of clients that the server is connected to.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the list of connected clients.
+     */
+    public ServerResponse<List<String>> getClientList() {
+        GetClientsRequest request = new GetClientsRequest();
+
+        return (ServerResponse<List<String>>) makeRequest(request);
+    }
+
+    /**
+     * Gets the VTEC Active Table based on the table name.
+     * 
+     * @param tableName
+     *            The active table to retrieve.
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested active table records.
+     */
+    public ServerResponse<List<ActiveTableRecord>> getVTECActiveTable(
+            ActiveTableMode tableName) {
+        GetActiveTableRequest request = new GetActiveTableRequest();
+        request.setRequestedSiteId(SiteMap.getInstance().getSite4LetterId(
+                siteId));
+        request.setMode(tableName);
+
+        return (ServerResponse<List<ActiveTableRecord>>) makeRequest(request);
+    }
+
+    /**
+     * Clears the specified VTEC table. Note that only the PRACTICE active table
+     * can be successfully cleared.
+     * 
+     * @param tableName
+     *            The active table to clear.
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> clearVTECTable(ActiveTableMode tableName) {
+        ServerResponse<?> sr = new ServerResponse<>();
+
+        if (ActiveTableMode.PRACTICE == tableName) {
+            try {
+                makeRequestInternal(new ClearPracticeVTECTableRequest(SiteMap
+                        .getInstance().getSite4LetterId(siteId), myWsId));
+            } catch (Exception e) {
+                statusHandler.error(
+                        "Server error processing clear VTEC table request.", e);
+                sr.addMessage(String.format(
+                        "Server error processing clear VTEC table request: %s",
+                        e.getLocalizedMessage()));
+            }
+        } else {
+            sr.addMessage("Can only clear PRACTICE active table.");
+        }
+
+        return sr;
+    }
+
+    /**
+     * Queries the ISC routing table for the known ISC sites. Returns data about
+     * the servers (mhsid, server, port, protocol, welist, and other
+     * information). Returns a list of weather elements that normally are
+     * requested.
+     * 
+     * @return Status of the request as a {@code ServerResponse}. Payload
+     *         contains the requested ISC information.
+     */
+    public ServerResponse<IscQueryResponse> iscRequestQuery() {
+        IscRequestQueryRequest request = new IscRequestQueryRequest();
+
+        return (ServerResponse<IscQueryResponse>) makeRequest(request);
+    }
+
+    /**
+     * Makes an ISC data request based on the information in the XML. The XML
+     * contains the servers (mhsid, server, port, protocol, welist, and other
+     * information) from which to request the information.
+     * 
+     * @param xmlRequest
+     *            XML for the request
+     * @return Status of the request as a {@code ServerResponse}.
+     */
+    public ServerResponse<?> iscRequestMake(String xmlRequest) {
+        IscMakeRequest request = new IscMakeRequest();
+        request.setXml(xmlRequest);
+
+        return makeRequest(request);
+    }
+
+    /**
+     * Returns the current ISC send status for the sendISCOnSave and the
+     * sendISCOnPublish and request ISC states for the IFP Server.
+     * 
+     * @return The configuration values for requestISC, sendISCOnSave and
+     *         sendISCOnPublish on the IFP server.
+     */
+    public ServerResponse<IscSendStatus> iscSendStatus() {
+        GetIscSendStatusRequest request = new GetIscSendStatusRequest();
+
+        return (ServerResponse<IscSendStatus>) makeRequest(request);
+    }
+
+    /**
+     * To get a "legacy-style" (prior to A2 release 16.2.2) IFPClient
+     * implementation. Instead of returning ServerResponse objects, the
+     * legacy-style IFPClient will return the inner payload and throw Exceptions
+     * if there are error messages in the ServerResponse returned from the
+     * request server.
+     * 
+     * @return a {@code PyFPClient} instance.
+     */
+    public PyFPClient getPythonClient() {
+        return new PyFPClient(myWsId, siteId);
+    }
+
+    public ServerResponse<?> makeRequest(AbstractGfeRequest request) {
+        request.setWorkstationID(myWsId);
+        request.setSiteID(siteId);
+
+        ServerResponse<Object> ssr = new ServerResponse<>();
+        try {
+            ServerResponse<?> sr = (ServerResponse<?>) makeRequestInternal(request);
+            ssr.addMessages(sr);
+            ssr.setPayload(sr.getPayload());
+        } catch (Exception e) {
+            statusHandler.error(String.format(
+                    "Server error processing %s request.", request.getClass()
+                            .getName()), e);
+            ssr.addMessage(String.format(
+                    "Server error processing %s request: %s", request
+                            .getClass().getName(), e.getLocalizedMessage()));
+        }
+
+        return ssr;
+    }
+
+    private Object makeRequestInternal(IServerRequest request) throws Exception {
+        return RequestRouter.route(request);
+    }
+}
diff --git a/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/src/com/raytheon/uf/common/gfe/ifpclient/PyFPClient.java b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/src/com/raytheon/uf/common/gfe/ifpclient/PyFPClient.java
new file mode 100644
index 0000000000..d46ff2434c
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/src/com/raytheon/uf/common/gfe/ifpclient/PyFPClient.java
@@ -0,0 +1,202 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.common.gfe.ifpclient;
+
+import java.util.Arrays;
+import java.util.List;
+
+import com.raytheon.uf.common.activetable.ActiveTableMode;
+import com.raytheon.uf.common.activetable.ActiveTableRecord;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.DatabaseID;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridLocation;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.GridParmInfo;
+import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
+import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceData;
+import com.raytheon.uf.common.dataplugin.gfe.reference.ReferenceID;
+import com.raytheon.uf.common.dataplugin.gfe.server.lock.LockTable;
+import com.raytheon.uf.common.dataplugin.gfe.server.message.ServerResponse;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.LockRequest;
+import com.raytheon.uf.common.dataplugin.gfe.server.request.LockTableRequest;
+import com.raytheon.uf.common.gfe.ifpclient.exception.GfeServerRequestException;
+import com.raytheon.uf.common.message.WsId;
+
+/**
+ * An IFPClient that matches the "legacy" A2 IFPClient implementation where the
+ * ServerResponse's payload were returned and exceptions were thrown if the
+ * ServerResponse contained an error message.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 04, 2015  #5129     dgilling     Initial creation
+ * 
+ * </pre>
+ * 
+ * @author dgilling
+ * @version 1.0
+ */
+
+public class PyFPClient {
+
+    private final IFPClient client;
+
+    /**
+     * @param wsId
+     * @param siteId
+     */
+    public PyFPClient(WsId wsId, String siteId) {
+        this.client = new IFPClient(wsId, siteId);
+    }
+
+    private static void checkSR(final String operation,
+            final ServerResponse<?> sr) throws GfeServerRequestException {
+        if (!sr.isOkay()) {
+            throw new GfeServerRequestException(String.format("%s failed: %s",
+                    operation, sr.message()));
+        }
+    }
+
+    public List<ParmID> getParmList(final DatabaseID id)
+            throws GfeServerRequestException {
+        ServerResponse<List<ParmID>> sr = client.getParmList(id);
+        checkSR("IFPClient::getParmList()", sr);
+        return sr.getPayload();
+    }
+
+    public List<String> getSiteID() throws GfeServerRequestException {
+        ServerResponse<String> sr = client.getSiteID();
+        checkSR("IFPClient::getSiteID()", sr);
+        return Arrays.asList(sr.getPayload());
+    }
+
+    public List<ActiveTableRecord> getVTECActiveTable(
+            final ActiveTableMode tableName) throws GfeServerRequestException {
+        ServerResponse<List<ActiveTableRecord>> sr = client
+                .getVTECActiveTable(tableName);
+        checkSR("IFPClient::getVTECActiveTable()", sr);
+        return sr.getPayload();
+    }
+
+    public void clearVTECTable(final String tableName)
+            throws GfeServerRequestException {
+        ServerResponse<?> sr = client.clearVTECTable(ActiveTableMode
+                .valueOf(tableName));
+        checkSR("IFPClient::clearVTECTable()", sr);
+    }
+
+    public String getSiteTimeZone() throws GfeServerRequestException {
+        return getSiteTimeZone(getSiteID().get(0));
+    }
+
+    public String getSiteTimeZone(final String id)
+            throws GfeServerRequestException {
+        ServerResponse<String> sr = client.getSiteTimeZone(id);
+        checkSR("IFPClient::getSiteTimeZone()", sr);
+        return sr.getPayload();
+    }
+
+    public List<ReferenceID> getReferenceInventory()
+            throws GfeServerRequestException {
+        ServerResponse<List<ReferenceID>> sr = client.getReferenceInventory();
+        checkSR("IFPClient::getReferenceInventory()", sr);
+        return sr.getPayload();
+    }
+
+    public List<ReferenceData> getReferenceData(final List<ReferenceID> ids)
+            throws GfeServerRequestException {
+        ServerResponse<List<ReferenceData>> sr = client.getReferenceData(ids);
+        checkSR("IFPClient::getReferenceData()", sr);
+        return sr.getPayload();
+    }
+
+    public void saveReferenceData(final List<ReferenceData> data)
+            throws GfeServerRequestException {
+        ServerResponse<?> sr = client.saveReferenceData(data);
+        checkSR("IFPClient::saveReferenceData()", sr);
+    }
+
+    public void deleteReferenceData(final List<ReferenceID> ids)
+            throws GfeServerRequestException {
+        ServerResponse<?> sr = client.deleteReferenceData(ids);
+        checkSR("IFPClient::deleteReferenceData()", sr);
+    }
+
+    public GridParmInfo getGridParmInfo(final ParmID id)
+            throws GfeServerRequestException {
+        ServerResponse<GridParmInfo> sr = client.getGridParmInfo(id);
+        checkSR("IFPClient::getGridParmInfo()", sr);
+        return sr.getPayload();
+    }
+
+    public GridLocation getDBGridLocation() throws GfeServerRequestException {
+        ServerResponse<GridLocation> sr = client.getDBGridLocation();
+        checkSR("IFPClient::getDBGridLocation()", sr);
+        return sr.getPayload();
+    }
+
+    public List<DatabaseID> getOfficialDBName()
+            throws GfeServerRequestException {
+        ServerResponse<List<DatabaseID>> sr = client.getOfficialDBName();
+        checkSR("IFPClient::getOfficialDBName()", sr);
+        return sr.getPayload();
+    }
+
+    public List<String> getClientList() throws GfeServerRequestException {
+        ServerResponse<List<String>> sr = client.getClientList();
+        checkSR("IFPClient::getClientList()", sr);
+        return sr.getPayload();
+    }
+
+    public List<String> getKnownSites() throws GfeServerRequestException {
+        ServerResponse<List<String>> sr = client.getKnownSites();
+        checkSR("IFPClient::getKnownSites()", sr);
+        return sr.getPayload();
+    }
+
+    /*
+     * PyObject *getKnownSitesWithOfficeType(void) { SeqOf<TextString> sites,
+     * officeTypes; checkSR("IFPClient::getKnownSitesWithOfficeType()",
+     * self->getKnownSitesWithOfficeType(sites, officeTypes)); Dictionary d; for
+     * (int i = 0; i < sites.length(); i++) d.add(Object(sites[i].stringPtr()),
+     * Object(officeTypes[i].stringPtr())); return d.asRef(); }
+     */
+
+    public List<LockTable> getLockTables() throws GfeServerRequestException {
+        ServerResponse<List<LockTable>> sr = client
+                .getLockTable(new LockTableRequest());
+        checkSR("IFPClient::getLockTable()", sr);
+        return sr.getPayload();
+    }
+
+    public List<LockTable> requestLockChange(final List<LockRequest> lockRequest)
+            throws GfeServerRequestException {
+        ServerResponse<List<LockTable>> sr = client
+                .requestLockChange(lockRequest);
+        checkSR("IFPClient::requestLockChange()", sr);
+        return sr.getPayload();
+    }
+
+    public IFPClient getJavaClient() {
+        return client;
+    }
+}
diff --git a/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/src/com/raytheon/uf/common/gfe/ifpclient/exception/GfeServerRequestException.java b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/src/com/raytheon/uf/common/gfe/ifpclient/exception/GfeServerRequestException.java
new file mode 100644
index 0000000000..fcda74dd25
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.gfe.ifpclient/src/com/raytheon/uf/common/gfe/ifpclient/exception/GfeServerRequestException.java
@@ -0,0 +1,74 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.common.gfe.ifpclient.exception;
+
+import com.raytheon.uf.common.dataplugin.gfe.exception.GfeException;
+
+/**
+ * GFE exception type when an error occurs while processing a GFE request on the
+ * EDEX server.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 04, 2015  #5129     dgilling     Initial creation
+ * 
+ * </pre>
+ * 
+ * @author dgilling
+ * @version 1.0
+ */
+
+public class GfeServerRequestException extends GfeException {
+
+    private static final long serialVersionUID = 8249693117179046717L;
+
+    /**
+     * 
+     */
+    public GfeServerRequestException() {
+        super();
+    }
+
+    /**
+     * @param aCause
+     */
+    public GfeServerRequestException(String aCause) {
+        super(aCause);
+    }
+
+    /**
+     * @param aCause
+     * @param anException
+     */
+    public GfeServerRequestException(String aCause, Throwable anException) {
+        super(aCause, anException);
+    }
+
+    /**
+     * @param anException
+     */
+    public GfeServerRequestException(Throwable anException) {
+        super(anException);
+    }
+}
diff --git a/edexOsgi/com.raytheon.uf.common.gridcoverage/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.gridcoverage/META-INF/MANIFEST.MF
index e60e3af0e1..bc43e6a7bd 100644
--- a/edexOsgi/com.raytheon.uf.common.gridcoverage/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.gridcoverage/META-INF/MANIFEST.MF
@@ -19,5 +19,5 @@ Require-Bundle: com.raytheon.uf.common.serialization,
  com.raytheon.uf.common.status,
  com.raytheon.uf.common.dataplugin,
  com.raytheon.uf.common.dataquery,
- org.apache.commons.lang,
+ org.apache.commons.lang3;bundle-version="3.4.0",
  org.apache.commons.beanutils
diff --git a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
index 8d9e5a161a..209771edc7 100644
--- a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
+++ b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
@@ -41,7 +41,7 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.hibernate.annotations.Type;
 import org.opengis.metadata.spatial.PixelOrientation;
diff --git a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/LambertConformalGridCoverage.java b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/LambertConformalGridCoverage.java
index a044e8b487..9cfd99d02d 100644
--- a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/LambertConformalGridCoverage.java
+++ b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/LambertConformalGridCoverage.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.geospatial.MapUtil;
diff --git a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/MercatorGridCoverage.java b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/MercatorGridCoverage.java
index 496a815acd..d04a24feb3 100644
--- a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/MercatorGridCoverage.java
+++ b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/MercatorGridCoverage.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.geotools.geometry.DirectPosition2D;
 import org.opengis.metadata.spatial.PixelOrientation;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
diff --git a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/PolarStereoGridCoverage.java b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/PolarStereoGridCoverage.java
index 8e7d263f0b..75385bbe9a 100644
--- a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/PolarStereoGridCoverage.java
+++ b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/PolarStereoGridCoverage.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.geospatial.MapUtil;
diff --git a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/StereographicGridCoverage.java b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/StereographicGridCoverage.java
index e94ce3bec1..a2fd04b300 100644
--- a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/StereographicGridCoverage.java
+++ b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/StereographicGridCoverage.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.geospatial.MapUtil;
diff --git a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/lookup/GridCoverageSpatialMap.java b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/lookup/GridCoverageSpatialMap.java
index b43e5461c1..0245f2bd5b 100644
--- a/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/lookup/GridCoverageSpatialMap.java
+++ b/edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/lookup/GridCoverageSpatialMap.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.gridcoverage.GridCoverage;
 
diff --git a/edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/spatial/HRAPCoordinates.java b/edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/spatial/HRAPCoordinates.java
index b3c81d5b21..6df27846bc 100644
--- a/edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/spatial/HRAPCoordinates.java
+++ b/edexOsgi/com.raytheon.uf.common.hydro/src/com/raytheon/uf/common/hydro/spatial/HRAPCoordinates.java
@@ -27,7 +27,9 @@ import java.io.FileReader;
 import java.io.IOException;
 
 import com.raytheon.uf.common.ohd.AppsDefaults;
+import com.raytheon.uf.common.ohd.AppsDefaultsDirKeys;
 import com.raytheon.uf.common.util.FileUtil;
+
 /**
  * TODO Returns HRAP Coordinates
  * 
@@ -37,6 +39,7 @@ import com.raytheon.uf.common.util.FileUtil;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 18, 2014  17067      snaples     Added trim to readline to prevent parsing issues.
+ * Jan 26, 2016  5264       bkowal      Use the apps defaults dir constant.
  * 
  * </pre>
  * 
@@ -49,7 +52,7 @@ public class HRAPCoordinates {
         // read the coord file
         AppsDefaults appsDefaults = AppsDefaults.getInstance();
 
-        String geoDataDir = appsDefaults.getToken("geo_data");
+        String geoDataDir = appsDefaults.getToken(AppsDefaultsDirKeys.GEO_DATA);
         String officeId = appsDefaults.getToken("st3_rfc");
         String coordFilename = FileUtil.join(geoDataDir, officeId, "ascii",
                 "coord_" + officeId + ".dat");
diff --git a/edexOsgi/com.raytheon.uf.common.monitor.cpg/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.monitor.cpg/META-INF/MANIFEST.MF
index 602ffcf324..92ef3a3494 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor.cpg/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.monitor.cpg/META-INF/MANIFEST.MF
@@ -2,11 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Cpg Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.monitor.cpg
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.16.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.common.monitor.cpg
 Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.11.17",
  com.raytheon.uf.common.serialization;bundle-version="1.11.26",
- com.raytheon.uf.common.serialization.comm;bundle-version="1.11.26"
+ com.raytheon.uf.common.serialization.comm;bundle-version="1.11.26",
+ com.raytheon.uf.common.status;bundle-version="1.15.0"
diff --git a/edexOsgi/com.raytheon.uf.common.monitor.cpg/src/com/raytheon/uf/common/monitor/cpg/MonitorStateConfigurationManager.java b/edexOsgi/com.raytheon.uf.common.monitor.cpg/src/com/raytheon/uf/common/monitor/cpg/MonitorStateConfigurationManager.java
index 8e57b2e6a6..752f94b527 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor.cpg/src/com/raytheon/uf/common/monitor/cpg/MonitorStateConfigurationManager.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor.cpg/src/com/raytheon/uf/common/monitor/cpg/MonitorStateConfigurationManager.java
@@ -1,25 +1,26 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
 package com.raytheon.uf.common.monitor.cpg;
 
 import java.io.File;
+import java.io.InputStream;
 
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
@@ -28,6 +29,9 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
  * Monitor State Configuration XML File Manager.
@@ -39,6 +43,9 @@ import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
  * ------------ ---------- ----------- --------------------------
  * Jan 05, 2009            dhladky     Initial creation
  * Oct 01, 2013 2361       njensen     Use JAXBManager for XML
+ * Feb 15, 2016 5244       nabowle     Replace deprecated LocalizationFile methods.
+ *                                     Replace system.out with UFStatus.
+ * 
  * 
  * </pre>
  * 
@@ -48,6 +55,9 @@ import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
 
 public class MonitorStateConfigurationManager {
 
+    private static final IUFStatusHandler statusHandler = UFStatus
+            .getHandler(MonitorStateConfigurationManager.class);
+
     /** Path to Monitoring Area Configuration XML. */
     private static final String CONFIG_FILE_NAME = "monitoring"
             + File.separatorChar + "MonitorPluginState.xml";
@@ -71,7 +81,7 @@ public class MonitorStateConfigurationManager {
 
     /**
      * Get an instance of this singleton.
-     * 
+     *
      * @return Instance of this class
      */
     public static synchronized MonitorStateConfigurationManager getInstance() {
@@ -82,38 +92,6 @@ public class MonitorStateConfigurationManager {
         return instance;
     }
 
-    /**
-     * Save the XML configuration data to the current XML file name.
-     */
-    public void saveConfigXml() {
-        // Save the xml object to disk
-        IPathManager pm = PathManagerFactory.getPathManager();
-        LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
-                LocalizationLevel.BASE);
-        LocalizationFile newXmlFile = pm.getLocalizationFile(lc,
-                CONFIG_FILE_NAME);
-
-        if (newXmlFile.getFile().getParentFile().exists() == false) {
-            System.out.println("Creating new directory");
-
-            if (newXmlFile.getFile().getParentFile().mkdirs() == false) {
-                System.out.println("Could not create new directory...");
-            }
-        }
-
-        try {
-            System.out.println("Saving -- "
-                    + newXmlFile.getFile().getAbsolutePath());
-            jaxb.marshalToXmlFile(configXml, newXmlFile.getFile()
-                    .getAbsolutePath());
-            newXmlFile.save();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        readConfigXml();
-    }
-
     /**
      * Read the XML configuration data for the current XML file name.
      */
@@ -122,21 +100,24 @@ public class MonitorStateConfigurationManager {
             IPathManager pm = PathManagerFactory.getPathManager();
             LocalizationContext lc = pm.getContext(
                     LocalizationType.COMMON_STATIC, LocalizationLevel.BASE);
-            File file = pm.getFile(lc, CONFIG_FILE_NAME);
-            System.out.println("Reading -- " + file.getAbsolutePath());
-            MonitorStateXML configXmltmp = jaxb.unmarshalFromXmlFile(file
-                    .getAbsolutePath());
-            configXml = configXmltmp;
+            LocalizationFile lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
+
+            statusHandler.handle(Priority.INFO, "Reading -- " + lf.getPath());
+            try (InputStream is = lf.openInputStream()) {
+                MonitorStateXML configXmltmp = jaxb
+                        .unmarshalFromInputStream(is);
+                configXml = configXmltmp;
+            }
 
         } catch (Exception e) {
-            e.printStackTrace();
-            System.err.println("No configuration file found");
+            statusHandler.handle(Priority.INFO, "No configuration file found",
+                    e);
         }
     }
 
     /**
      * FFMP state
-     * 
+     *
      * @return
      */
     public boolean getFFMPState() {
@@ -145,7 +126,7 @@ public class MonitorStateConfigurationManager {
 
     /**
      * CWAT state
-     * 
+     *
      * @return
      */
     public boolean getCWATState() {
@@ -154,7 +135,7 @@ public class MonitorStateConfigurationManager {
 
     /**
      * VIL state
-     * 
+     *
      * @return
      */
     public boolean getVILState() {
@@ -163,7 +144,7 @@ public class MonitorStateConfigurationManager {
 
     /**
      * QPF state
-     * 
+     *
      * @return
      */
     public boolean getQPFState() {
@@ -172,7 +153,7 @@ public class MonitorStateConfigurationManager {
 
     /**
      * Fog state
-     * 
+     *
      * @return
      */
     public boolean getFogState() {
@@ -181,7 +162,7 @@ public class MonitorStateConfigurationManager {
 
     /**
      * Fog state
-     * 
+     *
      * @return
      */
     public boolean getPrecipRateState() {
@@ -195,10 +176,10 @@ public class MonitorStateConfigurationManager {
     public boolean getHydroDualPolState() {
         return configXml.isHydroDualPol();
     }
-    
+
     /**
      * Fog state
-     * 
+     *
      * @return
      */
     public boolean getScanState() {
@@ -207,7 +188,7 @@ public class MonitorStateConfigurationManager {
 
     /**
      * Fog state
-     * 
+     *
      * @return
      */
     public boolean getFSSState() {
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.monitor/META-INF/MANIFEST.MF
index 7743c6c07e..e7069663e5 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.monitor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Monitor Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.monitor
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.16.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/CWATLocationConfigManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/CWATLocationConfigManager.java
index da6342aaa9..636cc11bd4 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/CWATLocationConfigManager.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/CWATLocationConfigManager.java
@@ -26,13 +26,12 @@ import java.util.ArrayList;
 
 import org.opengis.referencing.crs.ProjectedCRS;
 
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
@@ -59,6 +58,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Oct 02, 2013 2361       njensen     Use JAXBManager for XML
  * Oct 08, 2015 4912       rferrel     Update configXml when configuration file changes
  *                                      and removed deprecated code.
+ * Jan 12, 2016 5244       njensen     Replaced calls to deprecated LocalizationFile methods                                     
  * 
  * </pre>
  * 
@@ -66,6 +66,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * @version 1.0
  */
 public class CWATLocationConfigManager {
+
     private static final IUFStatusHandler statusHandler = UFStatus
             .getHandler(CWATLocationConfigManager.class);
 
@@ -108,10 +109,9 @@ public class CWATLocationConfigManager {
     /**
      * Observer to force updating the configXml.
      */
-    private ILocalizationFileObserver configXmlObserver = new ILocalizationFileObserver() {
-
+    private ILocalizationPathObserver configXmlObserver = new ILocalizationPathObserver() {
         @Override
-        public void fileUpdated(FileUpdatedMessage message) {
+        public void fileChanged(ILocalizationFile file) {
             readConfigXml();
         }
     };
@@ -122,14 +122,11 @@ public class CWATLocationConfigManager {
     private CWATLocationConfigManager() {
         configXml = new CWATLocationsXML();
         IPathManager pm = PathManagerFactory.getPathManager();
-        LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
-                LocalizationLevel.SITE);
         /*
          * No need to remove the observer since the instance of this class
          * remains until the JRE is shutdown.
          */
-        pm.getLocalizationFile(lc, CWAT_DIR).addFileUpdatedObserver(
-                configXmlObserver);
+        pm.addLocalizationPathObserver(CWAT_DIR, configXmlObserver);
     }
 
     /**
@@ -145,7 +142,7 @@ public class CWATLocationConfigManager {
         return instance;
     }
 
-    private LocalizationFile getConfigFile() {
+    private ILocalizationFile getConfigFile() {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
@@ -169,21 +166,21 @@ public class CWATLocationConfigManager {
      * Read the XML configuration data for the current XML file name.
      */
     public void readConfigXml() {
-        LocalizationFile lFile = getConfigFile();
+        ILocalizationFile lFile = getConfigFile();
         try {
             if (lFile.exists()) {
                 statusHandler.info("Reading CWAT configuration file: "
-                        + lFile.getName());
+                        + lFile.getPath());
                 try (InputStream stream = lFile.openInputStream()) {
                     // This closes the stream
-                    CWATLocationsXML configXmltmp = (CWATLocationsXML) jaxb
+                    CWATLocationsXML configXmltmp = jaxb
                             .unmarshalFromInputStream(stream);
                     configXml = configXmltmp;
                 }
             } else {
                 statusHandler.handle(Priority.WARN,
                         "No CWAT locations file found. Generating the file: "
-                                + lFile.getName());
+                                + lFile.getPath());
                 // create a new one
                 ArrayList<ThreatLocation> locations = ScanUtils.getCWASites(
                         getSiteCoor(), getCRS());
@@ -195,7 +192,7 @@ public class CWATLocationConfigManager {
 
         } catch (Exception e) {
             statusHandler.handle(Priority.WARN,
-                    "Unable to load location file: " + lFile.getName(), e);
+                    "Unable to load location file: " + lFile.getPath(), e);
         }
     }
 
@@ -204,15 +201,15 @@ public class CWATLocationConfigManager {
      */
     public void saveConfigXml() {
         // Save the xml object to disk
-        LocalizationFile lFile = getConfigFile();
+        ILocalizationFile lFile = getConfigFile();
         statusHandler
-                .info("Saving CWAT configuration file: " + lFile.getName());
+                .info("Saving CWAT configuration file: " + lFile.getPath());
         try (SaveableOutputStream stream = lFile.openOutputStream()) {
             jaxb.marshalToStream(configXml, stream);
             stream.save();
-        } catch (LocalizationException | SerializationException | IOException e1) {
+        } catch (LocalizationException | SerializationException | IOException e) {
             statusHandler.handle(Priority.PROBLEM,
-                    "Unable to save localized file: " + lFile.getName(), e1);
+                    "Unable to save localized file: " + lFile.getPath(), e);
         }
     }
 
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFFGXmlMgr.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFFGXmlMgr.java
index 11faa51b0d..a54696f70a 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFFGXmlMgr.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFFGXmlMgr.java
@@ -21,37 +21,46 @@ package com.raytheon.uf.common.monitor.config;
 
 import java.util.ArrayList;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.monitor.xml.FFFGDataXML;
 import com.raytheon.uf.common.monitor.xml.FFFGSourceItemXML;
 import com.raytheon.uf.common.monitor.xml.FFFGSourceXML;
 import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
- * 
+ *
  * FFFG XML manager for the master data and the user data.
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 10, 2010 #4517      lvenable    Initial creation
  * Oct 02, 2013  2361      njensen     Use JAXBManager for XML
- * 
+ * Feb 15, 2016  5244      nabowle     Replace deprecated LocalizationFile methods.
+ *                                     Replace System.out calls.
+ *
  * </pre>
- * 
+ *
  * @author lvenable
  * @version 1.0
  */
 public class FFFGXmlMgr {
 
+    private static final IUFStatusHandler statusHandler = UFStatus
+            .getHandler(FFFGXmlMgr.class);
+
     private static final SingleTypeJAXBManager<FFFGDataXML> jaxb = SingleTypeJAXBManager
             .createWithoutException(FFFGDataXML.class);
 
@@ -89,7 +98,7 @@ public class FFFGXmlMgr {
 
     /**
      * Constructor.
-     * 
+     *
      * @param dataFileName
      *            Data file name.
      * @param dataFilePath
@@ -105,7 +114,7 @@ public class FFFGXmlMgr {
 
     /**
      * Get the data file name.
-     * 
+     *
      * @return The data file name.
      */
     public String getDataFileName() {
@@ -114,7 +123,7 @@ public class FFFGXmlMgr {
 
     /**
      * Set the data XML.
-     * 
+     *
      * @param newDataXML
      *            New data XML.
      */
@@ -124,7 +133,7 @@ public class FFFGXmlMgr {
 
     /**
      * Get the data XML.
-     * 
+     *
      * @return The data XML.
      */
     public FFFGDataXML getXMLData() {
@@ -133,7 +142,7 @@ public class FFFGXmlMgr {
 
     /**
      * Load the data file.
-     * 
+     *
      * @param dataFileName
      *            Data file name.
      */
@@ -154,20 +163,19 @@ public class FFFGXmlMgr {
             IPathManager pm = PathManagerFactory.getPathManager();
             String path = pm.getStaticFile(fullPathAndFileName)
                     .getAbsolutePath();
-            // System.out.println("*** reading XML path = " + path);
 
             dataXML = jaxb.unmarshalFromXmlFile(path);
             setForcingConfigured();
         } catch (Exception e) {
-            // e.printStackTrace();
-            System.out.println("*** FFFGMasterData.xml not available.");
+            statusHandler.handle(Priority.WARN,
+                    "*** FFFGMasterData.xml not available.", e);
             dataXML = null;
         }
     }
 
     /**
      * Save the XML to a different file name.
-     * 
+     *
      * @param newFileName
      *            New file name.
      */
@@ -186,22 +194,15 @@ public class FFFGXmlMgr {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-        LocalizationFile locFile = pm.getLocalizationFile(context,
+        ILocalizationFile locFile = pm.getLocalizationFile(context,
                 fullPathAndFileName);
 
-        if (locFile.getFile().getParentFile().exists() == false) {
-            System.out.println("Creating new directory");
+        statusHandler.handle(Priority.INFO,
+                "--- Saving XML path = " + locFile.getPath());
 
-            if (locFile.getFile().getParentFile().mkdirs() == false) {
-                System.out.println("Could not create new directory...");
-            }
-        }
-
-        try {
-            System.out.println("--- Saving XML path = "
-                    + locFile.getFile().getAbsolutePath());
-            jaxb.marshalToXmlFile(dataXML, locFile.getFile().getAbsolutePath());
-            locFile.save();
+        try (SaveableOutputStream sos = locFile.openOutputStream()) {
+            jaxb.marshalToStream(dataXML, sos);
+            sos.save();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -214,41 +215,47 @@ public class FFFGXmlMgr {
      */
     public void printData() {
         if (xmlType == FFFGXmlType.MASTER) {
-            System.out.println("******* Master XML Data *********");
+            statusHandler.handle(Priority.INFO,
+                    "******* Master XML Data *********");
         } else {
-            System.out.println("******* User XML Data *********");
+            statusHandler.handle(Priority.INFO,
+                    "******* User XML Data *********");
         }
 
-        System.out.println("Experation Time = " + dataXML.getExpTimeInMillis());
+        statusHandler.handle(Priority.INFO,
+                "Expiration Time = " + dataXML.getExpTimeInMillis());
 
         ArrayList<FFFGSourceXML> sources = dataXML.getSources();
 
         for (FFFGSourceXML src : sources) {
             if (src.getSourceName() == null) {
-                System.out.println("+++ Source Name is null ");
+                statusHandler.handle(Priority.INFO, "+++ Source Name is null ");
             } else {
-                System.out.println("+++ Source Name = " + src.getSourceName());
+                statusHandler.handle(Priority.INFO,
+                        "+++ Source Name = " + src.getSourceName());
             }
 
             if (src.getAreaFFGValue() == null) {
-                System.out.println("+++ Area FFG is null");
+                statusHandler.handle(Priority.INFO, "+++ Area FFG is null");
             } else {
-                System.out
-                        .println("+++ Area FFG    = " + src.getAreaFFGValue());
+                statusHandler.handle(Priority.INFO,
+                        "+++ Area FFG    = " + src.getAreaFFGValue());
             }
 
             ArrayList<FFFGSourceItemXML> srcItems = src.getSourceItems();
 
             if (srcItems == null) {
-                System.out.println("Source Items are null");
+                statusHandler.handle(Priority.INFO, "Source Items are null");
                 return;
             }
 
             for (FFFGSourceItemXML si : srcItems) {
-                System.out.println("------ type = " + si.getType());
-                System.out.println("------ name = " + si.getName());
-                System.out.println("------ id   = " + si.getId());
-                System.out.println("------ val  = " + si.getValue());
+                statusHandler.handle(
+                        Priority.INFO,
+                        "------ type = " + si.getType() + "\n------ name = "
+                                + si.getName() + "\n------ id   = "
+                                + si.getId() + "\n------ val  = "
+                                + si.getValue());
             }
         }
     }
@@ -261,7 +268,7 @@ public class FFFGXmlMgr {
 
     /**
      * Are any forcings configured?
-     * 
+     *
      * @return true if forcings are configured
      */
     public boolean isForcingConfigured() {
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPRunConfigurationManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPRunConfigurationManager.java
index c328065ef1..ae449f1c4c 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPRunConfigurationManager.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPRunConfigurationManager.java
@@ -1,37 +1,39 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
 package com.raytheon.uf.common.monitor.config;
 
-import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
 import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
 import com.raytheon.uf.common.monitor.xml.DomainXML;
@@ -48,9 +50,9 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
  * FFMPRunConfigurationManager
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
@@ -58,12 +60,13 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Apr 26, 2013 1954       bsteffen    Minor code cleanup throughout FFMP.
  * Aug 13, 2013 1742       dhladky     Concurrent mod exception on update fixed
  * Oct 02, 2013 2361       njensen     Use JAXBManager for XML
- * 
+ * Feb 15, 2016 5244       nabowle     Replace deprecated LocalizationFile methods.
+ *
  * </pre>
- * 
+ *
  */
 
-public class FFMPRunConfigurationManager implements ILocalizationFileObserver {
+public class FFMPRunConfigurationManager implements ILocalizationPathObserver {
 
     /** Path to FFMP Source config. */
     private static final String CONFIG_FILE_NAME = "ffmp"
@@ -82,14 +85,12 @@ public class FFMPRunConfigurationManager implements ILocalizationFileObserver {
 
     protected boolean isPopulated;
 
-    private LocalizationFile lf = null;
-
     private CopyOnWriteArrayList<MonitorConfigListener> listeners = new CopyOnWriteArrayList<MonitorConfigListener>();
 
     /** Singleton instance of this class */
     private static FFMPRunConfigurationManager instance = new FFMPRunConfigurationManager();
 
-    /* Private Constructor */
+    /** Private Constructor */
     private FFMPRunConfigurationManager() {
         isPopulated = false;
 
@@ -103,7 +104,7 @@ public class FFMPRunConfigurationManager implements ILocalizationFileObserver {
 
     /**
      * Get an instance of this singleton.
-     * 
+     *
      * @return Instance of this class
      * @throws FileNotFoundException
      */
@@ -136,19 +137,23 @@ public class FFMPRunConfigurationManager implements ILocalizationFileObserver {
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
 
-        lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
-        lf.addFileUpdatedObserver(this);
-        File file = lf.getFile();
+        ILocalizationFile lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
+        pm.addLocalizationPathObserver(CONFIG_FILE_NAME, this);
         // System.out.println("Reading -- " + file.getAbsolutePath());
-        if (!file.exists()) {
-            System.out.println("WARNING [FFMP] FFMPRunConfigurationManager: "
-                    + file.getAbsolutePath() + " does not exist.");
+        if (!lf.exists()) {
+            statusHandler.handle(Priority.WARN, lf.getPath()
+                    + " does not exist.");
             return;
         }
 
         FFMPRunConfigXML configXmltmp = null;
 
-        configXmltmp = jaxb.unmarshalFromXmlFile(file.getAbsolutePath());
+        try (InputStream is = lf.openInputStream()) {
+            configXmltmp = jaxb.unmarshalFromInputStream(is);
+        } catch (IOException | LocalizationException e) {
+            throw new SerializationException("Error unmarshalling "
+                    + lf.getPath(), e);
+        }
 
         configXml = configXmltmp;
         isPopulated = true;
@@ -164,25 +169,12 @@ public class FFMPRunConfigurationManager implements ILocalizationFileObserver {
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
 
-        LocalizationFile newXmlFile = pm.getLocalizationFile(lc,
+        ILocalizationFile newXmlFile = pm.getLocalizationFile(lc,
                 CONFIG_FILE_NAME);
 
-        if (newXmlFile.getFile().getParentFile().exists() == false) {
-            // System.out.println("Creating new directory");
-
-            if (newXmlFile.getFile().getParentFile().mkdirs() == false) {
-                // System.out.println("Could not create new directory...");
-            }
-        }
-
-        try {
-            // System.out.println("Saving -- "
-            // + newXmlFile.getFile().getAbsolutePath());
-            jaxb.marshalToXmlFile(configXml, newXmlFile.getFile()
-                    .getAbsolutePath());
-            newXmlFile.save();
-
-            lf = newXmlFile;
+        try (SaveableOutputStream sos = newXmlFile.openOutputStream()) {
+            jaxb.marshalToStream(configXml, sos);
+            sos.save();
         } catch (Exception e) {
             statusHandler.handle(Priority.ERROR, "Couldn't save config file.",
                     e);
@@ -191,7 +183,7 @@ public class FFMPRunConfigurationManager implements ILocalizationFileObserver {
 
     /**
      * Get the FFMP runners
-     * 
+     *
      * @return
      */
     public ArrayList<FFMPRunXML> getFFMPRunners() {
@@ -204,7 +196,7 @@ public class FFMPRunConfigurationManager implements ILocalizationFileObserver {
 
     /**
      * Sets the run configuration for FFMP
-     * 
+     *
      * @param runners
      */
     public void setFFMPRunners(ArrayList<FFMPRunXML> runners) {
@@ -272,9 +264,8 @@ public class FFMPRunConfigurationManager implements ILocalizationFileObserver {
     }
 
     @Override
-    public void fileUpdated(FileUpdatedMessage message) {
-
-        if (message.getFileName().equals(CONFIG_FILE_NAME)) {
+    public void fileChanged(ILocalizationFile file) {
+        if (file.getPath().equals(CONFIG_FILE_NAME)) {
             try {
                 readConfigXml();
 
@@ -285,7 +276,7 @@ public class FFMPRunConfigurationManager implements ILocalizationFileObserver {
 
             } catch (SerializationException e) {
                 statusHandler.handle(Priority.WARN,
-                        "FFMPRunConfigurationManager: " + message.getFileName()
+                        "FFMPRunConfigurationManager: " + file.getPath()
                                 + " couldn't be updated.", e);
             }
         }
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPSourceConfigurationManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPSourceConfigurationManager.java
index c56c8ff9c4..da75cf9d35 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPSourceConfigurationManager.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPSourceConfigurationManager.java
@@ -1,37 +1,39 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
 package com.raytheon.uf.common.monitor.config;
 
-import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
 import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
 import com.raytheon.uf.common.monitor.xml.FFMPSourceConfigXML;
@@ -45,9 +47,9 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
  * FFMPSourceConfigurationManager
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
@@ -57,13 +59,14 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Oct 02, 2013  2361      njensen     Use JAXBManager for XML
  * Aug 15, 2015  4722      dhladky     Added new types to be used for new Guidance sources, etc
  * Sep 17, 2015  4756      dhladky     Fixed bugs for multiple guidance sources.
- * 
+ * Feb 15, 2016 5244       nabowle     Replace deprecated LocalizationFile methods.
+ *
  * </pre>
- * 
+ *
  */
 
 public class FFMPSourceConfigurationManager implements
-        ILocalizationFileObserver {
+        ILocalizationPathObserver {
 
     /** Path to FFMP Source config. */
     private static final String CONFIG_FILE_NAME = "ffmp"
@@ -72,10 +75,11 @@ public class FFMPSourceConfigurationManager implements
     private static final IUFStatusHandler statusHandler = UFStatus
             .getHandler(FFMPSourceConfigurationManager.class);
 
-    // This needs to initialize before the instance since the constructor will
-    // makes use of JAXB. JVM spec 12.4.2 step 9 indicates this will
-    // initialize ahead of the instance since it is earlier in
-    // in the text source.
+    /*
+     * This needs to initialize before the instance since the constructor will
+     * makes use of JAXB. JVM spec 12.4.2 step 9 indicates this will initialize
+     * ahead of the instance since it is earlier in in the text source.
+     */
     private static final SingleTypeJAXBManager<FFMPSourceConfigXML> jaxb = SingleTypeJAXBManager
             .createWithoutException(FFMPSourceConfigXML.class);
 
@@ -97,19 +101,19 @@ public class FFMPSourceConfigurationManager implements
 
     private List<String> accumulators = null;
 
-    private LocalizationFile lf = null;
-
     private List<MonitorConfigListener> listeners = new CopyOnWriteArrayList<MonitorConfigListener>();
 
     /* Private Constructor */
     private FFMPSourceConfigurationManager() {
         configXml = new FFMPSourceConfigXML();
+        IPathManager pm = PathManagerFactory.getPathManager();
+        pm.addLocalizationPathObserver(CONFIG_FILE_NAME, this);
         readConfigXml();
     }
 
     /**
      * Get an instance of this singleton.
-     * 
+     *
      * @return Instance of this class
      */
     public static FFMPSourceConfigurationManager getInstance() {
@@ -129,32 +133,32 @@ public class FFMPSourceConfigurationManager implements
      */
     public synchronized void readConfigXml() {
         IPathManager pm = PathManagerFactory.getPathManager();
-
         try {
             LocalizationContext lc = pm.getContext(
                     LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-            lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
-            lf.addFileUpdatedObserver(this);
-            File file = lf.getFile();
+            ILocalizationFile lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
 
-            FFMPSourceConfigXML configXmltmp = jaxb.unmarshalFromXmlFile(file);
-
-            configXml = configXmltmp;
+            try (InputStream is = lf.openInputStream()) {
+                FFMPSourceConfigXML configXmltmp = jaxb
+                        .unmarshalFromInputStream(is);
 
+                configXml = configXmltmp;
+            }
         } catch (Exception e) {
             statusHandler.error("No SITE FFMP Source configuration file found");
 
             // fall back to BASE
             LocalizationContext lc = pm.getContext(
                     LocalizationType.COMMON_STATIC, LocalizationLevel.BASE);
-            lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
-            lf.addFileUpdatedObserver(this);
-            File file = lf.getFile();
+            ILocalizationFile lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
 
             FFMPSourceConfigXML configXmltmp = null;
-            try {
-                configXmltmp = jaxb.unmarshalFromXmlFile(file);
-            } catch (SerializationException e1) {
+            try (InputStream is = lf.openInputStream()) {
+                configXmltmp = jaxb.unmarshalFromInputStream(is);
+
+                configXml = configXmltmp;
+            } catch (SerializationException | LocalizationException
+                    | IOException e1) {
                 statusHandler.handle(Priority.ERROR,
                         "Couldn't deserialize file.", e1);
             }
@@ -173,19 +177,12 @@ public class FFMPSourceConfigurationManager implements
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
-        LocalizationFile newXmlFile = pm.getLocalizationFile(lc,
+        ILocalizationFile newXmlFile = pm.getLocalizationFile(lc,
                 CONFIG_FILE_NAME);
-        File file = newXmlFile.getFile();
 
-        if (file.getParentFile().exists() == false) {
-            file.getParentFile().mkdirs();
-        }
-
-        try {
-            jaxb.marshalToXmlFile(configXml, file.getAbsolutePath());
-            newXmlFile.save();
-            lf = newXmlFile;
-            lf.addFileUpdatedObserver(this);
+        try (SaveableOutputStream sos = newXmlFile.openOutputStream()) {
+            jaxb.marshalToStream(configXml, sos);
+            sos.save();
         } catch (Exception e) {
             statusHandler.handle(Priority.ERROR, "Couldn't save config file.",
                     e);
@@ -195,7 +192,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Gets you your sources for this product
-     * 
+     *
      * @param productName
      * @return
      */
@@ -205,7 +202,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Get the rate sourceXML by product
-     * 
+     *
      * @return
      */
     public SourceXML getSource(String source) {
@@ -214,7 +211,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * source by display name
-     * 
+     *
      * @param displayName
      * @return
      */
@@ -224,7 +221,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Get the virtual gage basin implementations
-     * 
+     *
      * @param name
      * @return
      */
@@ -243,7 +240,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Get the Guidance sources
-     * 
+     *
      * @return
      */
     public ArrayList<String> getGuidances() {
@@ -262,7 +259,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Get the Guidance Display Names
-     * 
+     *
      * @return List of display names
      */
     public ArrayList<String> getGuidanceDisplayNames() {
@@ -282,7 +279,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Get the QPE sources
-     * 
+     *
      * @return
      */
     public List<String> getQPESources() {
@@ -300,7 +297,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Get the Rate sources
-     * 
+     *
      * @return
      */
     public List<String> getRates() {
@@ -319,7 +316,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Get the QPF sources
-     * 
+     *
      * @return
      */
     public ArrayList<String> getQPFSources() {
@@ -334,10 +331,10 @@ public class FFMPSourceConfigurationManager implements
         }
         return forecasts;
     }
-    
+
     /**
      * Get sources with the same family, used for source bins in FFMPGenerator
-     * 
+     *
      * @return
      */
     public ArrayList<String> getFamilySources(String family) {
@@ -354,9 +351,9 @@ public class FFMPSourceConfigurationManager implements
     }
 
     /**
-     * 
+     *
      * Enumeration of the types of FFMP can process
-     * 
+     *
      * @author dhladky
      * @version 1.0
      */
@@ -377,9 +374,9 @@ public class FFMPSourceConfigurationManager implements
     };
 
     /**
-     * 
+     *
      * Enumeration of the types of data types
-     * 
+     *
      * @author dhladky
      * @version 1.0
      */
@@ -399,9 +396,9 @@ public class FFMPSourceConfigurationManager implements
     };
 
     /**
-     * 
+     *
      * Enumeration of the types of data types
-     * 
+     *
      * @author dhladky
      * @version 1.0
      */
@@ -421,9 +418,9 @@ public class FFMPSourceConfigurationManager implements
     };
 
     /**
-     * 
+     *
      * Enumeration of Guidance data types
-     * 
+     *
      * @author dhladky
      * @version 1.0
      */
@@ -443,9 +440,9 @@ public class FFMPSourceConfigurationManager implements
     };
 
     /**
-     * 
+     *
      * Enumeration of the types of data FFMP can process
-     * 
+     *
      * @author dhladky
      * @version 1.0
      */
@@ -477,7 +474,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Gets the product XML
-     * 
+     *
      * @param productName
      * @return
      */
@@ -500,7 +497,7 @@ public class FFMPSourceConfigurationManager implements
 
     /**
      * Finds the primary source this source is within
-     * 
+     *
      * @param source
      * @return
      */
@@ -514,8 +511,8 @@ public class FFMPSourceConfigurationManager implements
     }
 
     @Override
-    public void fileUpdated(FileUpdatedMessage message) {
-        if (message.getFileName().equals(CONFIG_FILE_NAME)) {
+    public void fileChanged(ILocalizationFile file) {
+        if (file.getPath().equals(CONFIG_FILE_NAME)) {
             try {
                 readConfigXml();
                 // inform listeners
@@ -526,11 +523,10 @@ public class FFMPSourceConfigurationManager implements
                 statusHandler.handle(
                         Priority.WARN,
                         "FFMPSourceConfigurationManager: "
-                                + message.getFileName()
+                                + file.getPath()
                                 + " couldn't be updated.", e);
             }
         }
-
     }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPTemplateConfigurationManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPTemplateConfigurationManager.java
index 4f90df0533..d213090661 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPTemplateConfigurationManager.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFMPTemplateConfigurationManager.java
@@ -1,36 +1,37 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
 package com.raytheon.uf.common.monitor.config;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
 import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
 import com.raytheon.uf.common.monitor.xml.FFMPTemplateXML;
@@ -42,9 +43,9 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
  * Template area configuration xml.
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
@@ -52,14 +53,15 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Oct 25, 2012 DR 15514   gzhang       Adding getHucLevelsInArray()
  * Aug 18, 2013  1742      dhladky      Concurrent mod exception on update fixed
  * Oct 02, 2013  2361      njensen      Use JAXBManager for XML
+ * Feb 15, 2016 5244       nabowle      Replace deprecated LocalizationFile methods.
  * </pre>
- * 
+ *
  * @author dhladky
  * @version 1.0
  */
 
 public class FFMPTemplateConfigurationManager implements
-        ILocalizationFileObserver {
+        ILocalizationPathObserver {
 
     /** Path to FFMP Template config. */
     private static final String CONFIG_FILE_NAME = "ffmp" + File.separatorChar
@@ -78,8 +80,6 @@ public class FFMPTemplateConfigurationManager implements
 
     private ArrayList<String> hucLevels = null;
 
-    private LocalizationFile lf = null;
-
     private CopyOnWriteArrayList<MonitorConfigListener> listeners = new CopyOnWriteArrayList<MonitorConfigListener>();
 
     private static final IUFStatusHandler statusHandler = UFStatus
@@ -91,13 +91,12 @@ public class FFMPTemplateConfigurationManager implements
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
-        lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
-        lf.addFileUpdatedObserver(this);
+        pm.addLocalizationPathObserver(CONFIG_FILE_NAME, this);
     }
 
     /**
      * Get an instance of this singleton.
-     * 
+     *
      * @return Instance of this class
      */
     public static synchronized FFMPTemplateConfigurationManager getInstance() {
@@ -121,18 +120,15 @@ public class FFMPTemplateConfigurationManager implements
      */
     public void readConfigXml() throws Exception {
 
-        if (lf == null) {
-            IPathManager pm = PathManagerFactory.getPathManager();
-            LocalizationContext lc = pm.getContext(
-                    LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-            lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
-            lf.addFileUpdatedObserver(this);
-        }
+        IPathManager pm = PathManagerFactory.getPathManager();
+        LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
+                LocalizationLevel.SITE);
+        ILocalizationFile lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
 
-        File file = lf.getFile();
-        FFMPTemplateXML configXmltmp = jaxb.unmarshalFromXmlFile(file
-                .getAbsolutePath());
-        configXml = configXmltmp;
+        try (InputStream is = lf.openInputStream()) {
+            FFMPTemplateXML configXmltmp = jaxb.unmarshalFromInputStream(is);
+            configXml = configXmltmp;
+        }
     }
 
     /**
@@ -143,25 +139,12 @@ public class FFMPTemplateConfigurationManager implements
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
-        LocalizationFile newXmlFile = pm.getLocalizationFile(lc,
+        ILocalizationFile newXmlFile = pm.getLocalizationFile(lc,
                 CONFIG_FILE_NAME);
 
-        if (newXmlFile.getFile().getParentFile().exists() == false) {
-            // System.out.println("Creating new directory");
-
-            if (newXmlFile.getFile().getParentFile().mkdirs() == false) {
-                // System.out.println("Could not create new directory...");
-            }
-        }
-
-        try {
-            // System.out.println("Saving -- "
-            // + newXmlFile.getFile().getAbsolutePath());
-            jaxb.marshalToXmlFile(configXml, newXmlFile.getFile()
-                    .getAbsolutePath());
-            newXmlFile.save();
-
-            lf = newXmlFile;
+        try (SaveableOutputStream sos = newXmlFile.openOutputStream()) {
+            jaxb.marshalToStream(configXml, sos);
+            sos.save();
         } catch (Exception e) {
             statusHandler.handle(Priority.ERROR, "Couldn't save config file.",
                     e);
@@ -170,7 +153,7 @@ public class FFMPTemplateConfigurationManager implements
 
     /**
      * Gets the Huc Depth
-     * 
+     *
      * @return
      */
     public int getHucDepth() {
@@ -183,7 +166,7 @@ public class FFMPTemplateConfigurationManager implements
 
     /**
      * Do we have virtual basins?
-     * 
+     *
      * @return
      */
     public boolean getVirtual() {
@@ -196,7 +179,7 @@ public class FFMPTemplateConfigurationManager implements
 
     /**
      * Gets you the number of HUC levels
-     * 
+     *
      * @return
      */
     public int getNumberOfHuc() {
@@ -209,7 +192,7 @@ public class FFMPTemplateConfigurationManager implements
 
     /**
      * Get HUC Levels. Ordered for template and geometry unification order.
-     * 
+     *
      * @return
      */
     public ArrayList<String> getHucLevels() {
@@ -256,9 +239,9 @@ public class FFMPTemplateConfigurationManager implements
     }
 
     @Override
-    public void fileUpdated(FileUpdatedMessage message) {
+    public void fileChanged(ILocalizationFile localizationFile) {
 
-        if (message.getFileName().equals(CONFIG_FILE_NAME)) {
+        if (localizationFile.getPath().equals(CONFIG_FILE_NAME)) {
             try {
                 readConfigXml();
                 // inform listeners
@@ -271,7 +254,7 @@ public class FFMPTemplateConfigurationManager implements
                 statusHandler.handle(
                         Priority.WARN,
                         "FFMPTemplateConfigurationManager: "
-                                + message.getFileName()
+                                + localizationFile.getPath()
                                 + " couldn't be updated.", e);
             }
         }
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFTIDataManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFTIDataManager.java
index a2e17e509c..8fbb90b776 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFTIDataManager.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FFTIDataManager.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -21,38 +21,47 @@
 package com.raytheon.uf.common.monitor.config;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.ArrayList;
 
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.monitor.xml.FFTIDataXML;
 import com.raytheon.uf.common.monitor.xml.FFTISettingXML;
 import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
  * Singleton data manager for FFTI.
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * --/--/----                          Initial creation
  * Oct 02, 2013 2361       njensen     Use JAXBManager for XML
- * 
+ * Feb 15, 2016 5244       nabowle     Replace deprecated LocalizationFile methods.
+ *                                     Replace system.out with UFStatus.
+ *
  * </pre>
- * 
+ *
  * @author lvenable
  * @version 1.0
  */
-public class FFTIDataManager implements ILocalizationFileObserver {
+public class FFTIDataManager implements ILocalizationPathObserver {
+
+    private static final IUFStatusHandler statusHandler = UFStatus
+            .getHandler(FFTIDataManager.class);
 
     /** Path to FFTI config. */
     private static final String CONFIG_FILE_NAME = "ffmp" + File.separatorChar
@@ -73,17 +82,17 @@ public class FFTIDataManager implements ILocalizationFileObserver {
      */
     protected FFTIDataXML configXml;
 
-    private LocalizationFile lf = null;
-
     /* Private Constructor */
     private FFTIDataManager() {
         configXml = new FFTIDataXML();
+        IPathManager pm = PathManagerFactory.getPathManager();
+        pm.addLocalizationPathObserver(CONFIG_FILE_NAME, this);
         readConfigXml();
     }
 
     /**
      * Get an instance of this singleton.
-     * 
+     *
      * @return Instance of this class
      */
     public static FFTIDataManager getInstance() {
@@ -98,18 +107,16 @@ public class FFTIDataManager implements ILocalizationFileObserver {
             IPathManager pm = PathManagerFactory.getPathManager();
             LocalizationContext lc = pm.getContext(
                     LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
-            lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
-            lf.addFileUpdatedObserver(this);
+            ILocalizationFile lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
 
-            File file = lf.getFile();
-
-            FFTIDataXML configXmltmp = jaxb.unmarshalFromXmlFile(file
-                    .getAbsolutePath());
-
-            configXml = configXmltmp;
+            try (InputStream is = lf.openInputStream()) {
+                FFTIDataXML configXmltmp = jaxb.unmarshalFromInputStream(is);
+                configXml = configXmltmp;
+            }
 
         } catch (Exception e) {
-            System.err.println("No SITE FFTI Source configuration file found.");
+            statusHandler.handle(Priority.WARN,
+                    "No SITE FFTI Source configuration file found.");
         }
     }
 
@@ -121,28 +128,15 @@ public class FFTIDataManager implements ILocalizationFileObserver {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
-        LocalizationFile newXmlFile = pm.getLocalizationFile(lc,
+        ILocalizationFile newXmlFile = pm.getLocalizationFile(lc,
                 CONFIG_FILE_NAME);
 
-        if (newXmlFile.getFile().getParentFile().exists() == false) {
-            // System.out.println("Creating new directory");
-
-            if (newXmlFile.getFile().getParentFile().mkdirs() == false) {
-                // System.out.println("Could not create new directory...");
-            }
-        }
-
-        try {
-            // System.out.println("Saving -- "
-            // + newXmlFile.getFile().getAbsolutePath());
-            jaxb.marshalToXmlFile(configXml, newXmlFile.getFile()
-                    .getAbsolutePath());
-            newXmlFile.save();
-
-            lf = newXmlFile;
+        try (SaveableOutputStream sos = newXmlFile.openOutputStream()) {
+            jaxb.marshalToStream(configXml, sos);
+            sos.save();
         } catch (Exception e) {
-            System.err
-                    .println("Failed to save SITE FFTI Source configuration file.");
+            statusHandler.handle(Priority.WARN,
+                    "Failed to save SITE FFTI Source configuration file.");
         }
     }
 
@@ -171,14 +165,15 @@ public class FFTIDataManager implements ILocalizationFileObserver {
     }
 
     @Override
-    public void fileUpdated(FileUpdatedMessage message) {
+    public void fileChanged(ILocalizationFile file) {
 
         try {
-            if (message.getFileName().equals(CONFIG_FILE_NAME)) {
+            if (file.getPath().equals(CONFIG_FILE_NAME)) {
                 readConfigXml();
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            statusHandler.handle(Priority.WARN, "Error handling file changed.",
+                    e);
         }
     }
 
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
index e79ebabffb..c835f3cfeb 100755
--- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
@@ -41,6 +41,7 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.monitor.MonitorAreaUtils;
 import com.raytheon.uf.common.monitor.data.AdjacentWfoMgr;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
 import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
 import com.raytheon.uf.common.monitor.xml.AreaIdXML;
@@ -78,8 +79,7 @@ import com.vividsolutions.jts.io.ParseException;
  * Sep 17 2015  3873      skorolev   Corrected getInstance, addArea, addAdjArea and added getAdjAreaConfigXml.
  * Oct 20 2015  3841      skorolev   Changed save method.
  * Dec 02 2015  3873      dhladky    Pulled 3841 changes to 16.1.1.
- * 
- * 
+ * Jan 04 2016  5115      skorolev   Replaced Mon.Name with App.Name.
  * 
  * </pre>
  * 
@@ -132,11 +132,6 @@ public class FSSObsMonitorConfigurationManager implements
     /** Current site */
     private String currentSite;
 
-    /** Monitor Name **/
-    public enum MonName {
-        ss, fog, snow
-    };
-
     /** Default value for Timewindow in hours */
     private static final double DEFAULT_TIME = 2;
 
@@ -147,20 +142,15 @@ public class FSSObsMonitorConfigurationManager implements
     protected boolean isPopulated;
 
     /** Map for current configuration managers. */
-    private final static Map<MonName, FSSObsMonitorConfigurationManager> instanceMap = new HashMap<>();
+    private final static Map<AppName, FSSObsMonitorConfigurationManager> instanceMap = new HashMap<>();
 
     /**
      * Private Constructor
      * 
      * @param monitorName
      */
-    private FSSObsMonitorConfigurationManager(MonName monitorName) {
-        // Avoid confusion in file path
-        if (monitorName == MonName.ss) {
-            pluginName = "safeseas";
-        } else {
-            pluginName = monitorName.name();
-        }
+    private FSSObsMonitorConfigurationManager(AppName monitorName) {
+        pluginName = monitorName.name().toLowerCase();
         /** Path to Monitoring Area Configuration XML. */
         setConfigFileName(pluginName + File.separatorChar + "monitoringArea"
                 + File.separatorChar + "monitorAreaConfig.xml");
@@ -182,7 +172,7 @@ public class FSSObsMonitorConfigurationManager implements
      * @return
      */
     public static synchronized FSSObsMonitorConfigurationManager getInstance(
-            MonName monitor) {
+            AppName monitor) {
         FSSObsMonitorConfigurationManager instance = instanceMap.get(monitor);
         if (instance == null) {
             instance = new FSSObsMonitorConfigurationManager(monitor);
@@ -207,8 +197,7 @@ public class FSSObsMonitorConfigurationManager implements
         this.currentSite = lc.getContextName();
         lacf = pm.getLocalizationFile(lc, configFileName);
         try (InputStream inStrm = lacf.openInputStream()) {
-            configXml = (MonAreaConfigXML) jaxb
-                    .unmarshalFromInputStream(inStrm);
+            configXml = jaxb.unmarshalFromInputStream(inStrm);
         } catch (Exception e) {
             statusHandler
                     .handle(Priority.WARN,
@@ -387,7 +376,7 @@ public class FSSObsMonitorConfigurationManager implements
                 LocalizationLevel.SITE);
         LocalizationFile newXmlFile = pm.getLocalizationFile(lc,
                 getAdjAreaConfigFileName());
-        
+
         try {
             String path = newXmlFile.getFile().getAbsolutePath();
             jaxb.marshalToXmlFile(adjAreaConfigXml, path);
@@ -1092,7 +1081,7 @@ public class FSSObsMonitorConfigurationManager implements
      * @return
      */
     public static FSSObsMonitorConfigurationManager getObsManager(
-            MonName monitor) {
+            AppName monitor) {
         FSSObsMonitorConfigurationManager instance = getInstance(monitor);
         instance.readConfigXml();
         return instance;
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SCANRunSiteConfigurationManager.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SCANRunSiteConfigurationManager.java
index 952e734ad6..4f96dd6648 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SCANRunSiteConfigurationManager.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SCANRunSiteConfigurationManager.java
@@ -1,19 +1,21 @@
 package com.raytheon.uf.common.monitor.config;
 
-import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import com.raytheon.uf.common.dataplugin.radar.util.RadarsInUseUtil;
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
 import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
 import com.raytheon.uf.common.monitor.xml.SCANModelParameterXML;
@@ -27,9 +29,9 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
  * ScanRunSiteConfigurationManager
- *
+ * 
  * Holds the SCAN configuration
- *
+ * 
  * <pre>
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
@@ -40,30 +42,33 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Oct 02, 2013 2361       njensen     Use JAXBManager for XML
  * Jan 20, 2015 3949       nabowle     Add lightning source.
  * Mar 27, 2015 4260       dhladky     Updated default model.
+ * Jan 12, 2016 5244       njensen     Replaced calls to deprecated LocalizationFile methods
  *
  * </pre>
- *
+ * 
  * @author dhladky
  * @version 1.0
  */
 
 public class SCANRunSiteConfigurationManager implements
-        ILocalizationFileObserver {
+        ILocalizationPathObserver {
 
     /** Path to FFMP Source config. */
-    private static final String CONFIG_FILE_NAME = "scan" + File.separatorChar
-            + "SCANRunSiteConfig.xml";
-    
+    private static final String CONFIG_FILE_NAME = "scan"
+            + IPathManager.SEPARATOR + "SCANRunSiteConfig.xml";
+
     /** default model to set in XML **/
     private static final String DEFAULT_MODEL = "HRRR";
 
     private static final IUFStatusHandler statusHandler = UFStatus
             .getHandler(SCANRunSiteConfigurationManager.class);
 
-    // This needs to initialize before the instance since the constructor will
-    // makes use of JAXB. JVM spec 12.4.2 step 9 indicates this will
-    // initialize ahead of the instance since it is earlier in
-    // in the text source.
+    /*
+     * This jaxb variable needs to be declared before the instance variable
+     * since the constructor makes use of JAXB. JVM spec 12.4.2 step 9 indicates
+     * jaxb will initialize ahead of instance since it is earlier in the text
+     * source.
+     */
     private static final SingleTypeJAXBManager<SCANSiteRunConfigXML> jaxb = SingleTypeJAXBManager
             .createWithoutException(SCANSiteRunConfigXML.class);
 
@@ -75,8 +80,6 @@ public class SCANRunSiteConfigurationManager implements
      */
     protected SCANSiteRunConfigXML configXml;
 
-    private LocalizationFile lf = null;
-
     private List<MonitorConfigListener> listeners = new CopyOnWriteArrayList<MonitorConfigListener>();
 
     protected boolean isPopulated;
@@ -84,6 +87,8 @@ public class SCANRunSiteConfigurationManager implements
     /* Private Constructor */
     private SCANRunSiteConfigurationManager() {
         isPopulated = false;
+        IPathManager pm = PathManagerFactory.getPathManager();
+        pm.addLocalizationPathObserver(CONFIG_FILE_NAME, this);
 
         try {
             readConfigXml();
@@ -95,7 +100,7 @@ public class SCANRunSiteConfigurationManager implements
 
     /**
      * Get an instance of this singleton.
-     *
+     * 
      * @return Instance of this class
      */
     public static SCANRunSiteConfigurationManager getInstance() {
@@ -106,20 +111,14 @@ public class SCANRunSiteConfigurationManager implements
      * Read the XML configuration data for the current XML file name.
      */
     public synchronized void readConfigXml() throws SerializationException {
-
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
-
-        lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
-        lf.addFileUpdatedObserver(this);
-        File file = lf.getFile();
-        // System.out.println("Reading -- " + file.getAbsolutePath());
-        if (!file.exists()) {
-            statusHandler.handle(
-                    Priority.WARN,
-                    "SCANRunSiteConfigurationManager: "
-                            + file.getAbsolutePath() + " does not exist.");
+        ILocalizationFile lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
+        if (!lf.exists()) {
+            statusHandler.handle(Priority.WARN,
+                    "SCANRunSiteConfigurationManager: " + lf.getPath()
+                            + " does not exist. Creating default...");
             try {
                 createValidConfig();
             } catch (Exception e) {
@@ -129,12 +128,13 @@ public class SCANRunSiteConfigurationManager implements
             }
         }
 
-        SCANSiteRunConfigXML configXmltmp = null;
-
-        configXmltmp = jaxb.unmarshalFromXmlFile(file.getAbsolutePath());
-
-        configXml = configXmltmp;
-        isPopulated = true;
+        try (InputStream is = lf.openInputStream()) {
+            configXml = jaxb.unmarshalFromInputStream(is);
+            isPopulated = true;
+        } catch (IOException | LocalizationException e) {
+            throw new SerializationException("Error reading config file "
+                    + lf.getPath(), e);
+        }
     }
 
     public void addListener(MonitorConfigListener fl) {
@@ -153,50 +153,32 @@ public class SCANRunSiteConfigurationManager implements
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
-
-        LocalizationFile newXmlFile = pm.getLocalizationFile(lc,
+        ILocalizationFile newXmlFile = pm.getLocalizationFile(lc,
                 CONFIG_FILE_NAME);
 
-        if (newXmlFile.getFile().getParentFile().exists() == false) {
-            // System.out.println("Creating new directory");
-
-            if (newXmlFile.getFile().getParentFile().mkdirs() == false) {
-                // System.out.println("Could not create new directory...");
-            }
-        }
-
-        try {
-            // System.out.println("Saving -- "
-            // + newXmlFile.getFile().getAbsolutePath());
-            jaxb.marshalToXmlFile(configXml, newXmlFile.getFile()
-                    .getAbsolutePath());
-            newXmlFile.save();
+        try (SaveableOutputStream sos = newXmlFile.openOutputStream()) {
+            jaxb.marshalToStream(configXml, sos);
+            sos.save();
             setPopulated(true);
-
-            lf = newXmlFile;
         } catch (Exception e) {
             statusHandler.handle(Priority.WARN,
-                    "SCANRunSiteConfigurationManager: " + newXmlFile.getName()
+                    "SCANRunSiteConfigurationManager: " + newXmlFile.getPath()
                             + " couldn't be saved.", e);
         }
     }
 
     @Override
-    public void fileUpdated(FileUpdatedMessage message) {
-
-        if (message.getFileName().equals(CONFIG_FILE_NAME)) {
+    public void fileChanged(ILocalizationFile file) {
+        if (file.getPath().equals(CONFIG_FILE_NAME)) {
             try {
                 readConfigXml();
                 // inform listeners
                 for (MonitorConfigListener fl : listeners) {
                     fl.configChanged(new MonitorConfigEvent(this));
                 }
-
             } catch (Exception e) {
-                statusHandler.handle(
-                        Priority.WARN,
-                        "SCANRunSiteConfigurationManager: "
-                                + message.getFileName()
+                statusHandler.handle(Priority.WARN,
+                        "SCANRunSiteConfigurationManager: " + file.getPath()
                                 + " couldn't be updated.", e);
             }
         }
@@ -216,7 +198,7 @@ public class SCANRunSiteConfigurationManager implements
 
     /**
      * Get a site listing
-     *
+     * 
      * @return
      */
     public ArrayList<String> getSiteNames() {
@@ -228,7 +210,7 @@ public class SCANRunSiteConfigurationManager implements
 
     /**
      * Get a local site listing
-     *
+     * 
      * @return
      */
     public ArrayList<String> getLocalSiteNames() {
@@ -240,7 +222,7 @@ public class SCANRunSiteConfigurationManager implements
 
     /**
      * Get a dial site listing
-     *
+     * 
      * @return
      */
     public ArrayList<String> getDialSiteNames() {
@@ -252,7 +234,7 @@ public class SCANRunSiteConfigurationManager implements
 
     /**
      * Get the lightning source.
-     *
+     * 
      * @return
      */
     public String getLightningSource() {
@@ -264,7 +246,7 @@ public class SCANRunSiteConfigurationManager implements
 
     /**
      * Get the Site you are seeking
-     *
+     * 
      * @param name
      * @return
      */
@@ -284,9 +266,8 @@ public class SCANRunSiteConfigurationManager implements
     /**
      * Creates a valid configuration based on radar config
      */
-    public void createValidConfig() throws Exception {
-
-        /**
+    public void createValidConfig() {
+        /*
          * Don't have one, so create an EDEX generated default
          */
         List<String> localsites = RadarsInUseUtil.getSite(null,
@@ -319,10 +300,10 @@ public class SCANRunSiteConfigurationManager implements
     }
 
     /**
-     *
+     * 
      * Enumeration for which type of ModelData. CAPE is: Convective Available
      * Potential Energy. HELI is: storm relative HELIcity.
-     *
+     * 
      * @author dhladky
      * @version 1.0
      */
@@ -340,6 +321,6 @@ public class SCANRunSiteConfigurationManager implements
         public String getType() {
             return type;
         }
-    };
+    }
 
 }
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/ThresholdMgr.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/ThresholdMgr.java
similarity index 73%
rename from cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/ThresholdMgr.java
rename to edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/ThresholdMgr.java
index 9ba02b0d25..3258884dec 100755
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/thresholds/ThresholdMgr.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/ThresholdMgr.java
@@ -17,9 +17,11 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.viz.monitor.thresholds;
+package com.raytheon.uf.common.monitor.config;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,12 +33,16 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
+import com.raytheon.uf.common.monitor.xml.AreaThresholdXML;
+import com.raytheon.uf.common.monitor.xml.AreaXML;
+import com.raytheon.uf.common.monitor.xml.ThresholdsXML;
+import com.raytheon.uf.common.serialization.SerializationException;
+import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.viz.monitor.xml.AreaThresholdXML;
-import com.raytheon.uf.viz.monitor.xml.AreaXML;
-import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
 
 /**
  * This is a "generic" threshold manager class that handles display and monitor
@@ -51,6 +57,7 @@ import com.raytheon.uf.viz.monitor.xml.ThresholdsXML;
  * Dec 15, 2009 #3963      lvenable     Initial creation
  * Dec 4,  2012 #1351      skorolev     Cleaned code
  * Sep 18, 2015 #3873      skorolev     Added error message for corrupted or empty default threshold file.
+ * Dec 26, 2015 #5115      skorolev     Moved from com.raytheon.uf.viz.monitor.thresholds. Added getMonitorParameters().
  * 
  * </pre>
  * 
@@ -72,6 +79,10 @@ public class ThresholdMgr {
      */
     private String currFullPathAndFileName;
 
+    /** Single Type JAXB Manager */
+    private static final SingleTypeJAXBManager<ThresholdsXML> jaxb = SingleTypeJAXBManager
+            .createWithoutException(ThresholdsXML.class);
+
     /**
      * Constructor.
      * 
@@ -89,11 +100,14 @@ public class ThresholdMgr {
         try {
             ThresholdsXML newCfgXML = null;
             IPathManager pm = PathManagerFactory.getPathManager();
-            File path = pm.getStaticFile(currFullPathAndFileName);
+            File path = pm.getStaticFile(LocalizationType.COMMON_STATIC,
+                    currFullPathAndFileName);
             newCfgXML = JAXB.unmarshal(path, ThresholdsXML.class);
             this.setThresholdXML(newCfgXML);
         } catch (Exception e) {
-            statusHandler.handle(Priority.ERROR, e.getMessage());
+            statusHandler.handle(Priority.ERROR,
+                    "Problem reading the XML file: " + currFullPathAndFileName,
+                    e);
         }
     }
 
@@ -103,17 +117,19 @@ public class ThresholdMgr {
     public void saveThresholdXml() {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(
-                LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
+                LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
         LocalizationFile locFile = pm.getLocalizationFile(context,
                 currFullPathAndFileName);
         if (locFile.getFile().getParentFile().exists() == false) {
             locFile.getFile().getParentFile().mkdirs();
         }
-        try {
-            JAXB.marshal(cfgXML, locFile.getFile());
-            locFile.save();
-        } catch (Exception e) {
-            statusHandler.handle(Priority.ERROR, e.getMessage());
+        try (SaveableOutputStream outStrm = locFile.openOutputStream()) {
+            jaxb.marshalToStream(getThresholdXML(), outStrm);
+            outStrm.save();
+        } catch (SerializationException | IOException | LocalizationException e) {
+            statusHandler.handle(Priority.ERROR,
+                    "Problem saving the XML file: " + currFullPathAndFileName,
+                    e);
         }
     }
 
@@ -127,7 +143,7 @@ public class ThresholdMgr {
     }
 
     /**
-     * Create the configuration XML using the default values.
+     * Creates the Display configuration XML using the default values.
      * 
      * @param fullDefaultPathName
      *            Full default path and filename of the default XML file.
@@ -138,7 +154,7 @@ public class ThresholdMgr {
      *            values.
      * @return True if the configuration XML was successfully created.
      */
-    public boolean createConfigFromDefaults(String fullDefaultPathName,
+    public boolean createDisplayConfigFromDefaults(String fullDefaultPathName,
             List<String> areaIDs, ArrayList<String> keys) {
         try {
             IPathManager pm = PathManagerFactory.getPathManager();
@@ -157,6 +173,35 @@ public class ThresholdMgr {
         return true;
     }
 
+    /**
+     * Creates the Monitor configuration XML using the default values.
+     * 
+     * @param fullDefaultPathName
+     * @param areaIDs
+     * @param threshKeys
+     * @return
+     */
+    public boolean createMonitorConfigFromDefaults(String fullDefaultPathName,
+            List<String> areaIDs, List<String> list) {
+        IPathManager pm = PathManagerFactory.getPathManager();
+        LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
+                LocalizationLevel.BASE);
+        LocalizationFile lacf = pm.getLocalizationFile(lc, fullDefaultPathName);
+        try (InputStream inStrm = lacf.openInputStream()) {
+            ThresholdsXML cfgXmlDefaults = jaxb
+                    .unmarshalFromInputStream(inStrm);
+            createXmlFromDefaults(cfgXmlDefaults, areaIDs, list);
+        } catch (Exception e) {
+            statusHandler
+                    .handle(Priority.ERROR,
+                            "Default threshold configuration file "
+                                    + fullDefaultPathName
+                                    + " is corrupted.\nDelete the files in the folder on the server side and restart CAVE.");
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Create the configuration XML from the default values read in.
      * 
@@ -169,9 +214,9 @@ public class ThresholdMgr {
      *            values.
      */
     private void createXmlFromDefaults(ThresholdsXML cfgXmlDefaults,
-            List<String> areaIDs, ArrayList<String> keys) {
+            List<String> areaIDs, List<String> list) {
         cfgXML = new ThresholdsXML();
-        createAreas(cfgXmlDefaults, areaIDs, keys);
+        createAreas(cfgXmlDefaults, areaIDs, list);
     }
 
     /**
@@ -182,12 +227,12 @@ public class ThresholdMgr {
      * @param keys
      */
     private void createAreas(ThresholdsXML defaultThreshXML,
-            List<String> areaIDs, ArrayList<String> keys) {
+            List<String> areaIDs, List<String> list) {
         ArrayList<AreaXML> areas = new ArrayList<AreaXML>();
         for (String areaID : areaIDs) {
             AreaXML area = new AreaXML();
             area.setAreaId(areaID);
-            createAreaThreshold(area, defaultThreshXML, keys);
+            createAreaThreshold(area, defaultThreshXML, list);
             areas.add(area);
         }
         cfgXML.setAreas(areas);
@@ -205,9 +250,9 @@ public class ThresholdMgr {
      *            value.
      */
     private void createAreaThreshold(AreaXML area,
-            ThresholdsXML defaultThreshXML, ArrayList<String> keys) {
+            ThresholdsXML defaultThreshXML, List<String> list) {
         ArrayList<AreaThresholdXML> areaThreshArray = new ArrayList<AreaThresholdXML>();
-        for (String key : keys) {
+        for (String key : list) {
             AreaThresholdXML areaThresh = new AreaThresholdXML();
             areaThresh.setKey(key);
             areaThresh.setRed(defaultThreshXML.getAreas().get(0)
@@ -329,4 +374,20 @@ public class ThresholdMgr {
         newThreshXML.setAreas(newAreas);
         return newThreshXML;
     }
+
+    /**
+     * Gets parameters from current ThresholdXML.
+     * 
+     * @return params
+     */
+    public List<String> getMonitorParameters() {
+        List<String> retVal = new ArrayList<String>();
+        List<AreaThresholdXML> xmls = cfgXML.getAreas().get(0)
+                .getAreaThresholds();
+        for (AreaThresholdXML xml : xmls) {
+            retVal.add(xml.getKey());
+        }
+        return retVal;
+    }
+
 }
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/util/MonitorConfigConstants.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data/MonitorConfigConstants.java
old mode 100644
new mode 100755
similarity index 88%
rename from cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/util/MonitorConfigConstants.java
rename to edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data/MonitorConfigConstants.java
index 8eb136ad77..404aad3987
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/util/MonitorConfigConstants.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/data/MonitorConfigConstants.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.viz.monitor.util;
+package com.raytheon.uf.common.monitor.data;
 
 import java.util.HashMap;
 
@@ -33,6 +33,7 @@ import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
  * ------------ ---------- ----------- --------------------------
  * Mar 16, 2009 2076       avarani     Initial creation
  * Sep 18, 2015 3873       skorolev    Corrected appName.
+ * Jan 04, 2016 5115       skorolev    Moved from com.raytheon.uf.viz.monitor.util. Corrected misspelling.
  * 
  * </pre>
  * 
@@ -48,6 +49,41 @@ public class MonitorConfigConstants {
 
     private static boolean rankSwellPeriodHigh = false;
 
+    /**
+     * Monitoring parameters
+     */
+    public final static String MON_METEO_WIND_SPEED = "Monitor.Meteo.wind_speed";
+
+    public final static String MON_METEO_GUST_SPEED = "Monitor.Meteo.gust_speed";
+
+    public final static String MON_METEO_PEAK_WIND = "Monitor.Meteo.peak_wind_speed";
+
+    public final static String MON_METEO_WAVE_HT = "Monitor.Meteo.wave_height";
+
+    public final static String MON_METEO_VIS = "Monitor.Meteo.visibility";
+
+    public final static String MON_SWELL_PRIM_HT = "Monitor.Swell.Primary.height";
+
+    public final static String MON_SWELL_PRIM_PD = "Monitor.Swell.Primary.period";
+
+    public final static String MON_SWELL_PRIM_DIR_FROM = "Monitor.Swell.Primary.dirFrom";
+
+    public final static String MON_SWELL_PRIM_DIR_TO = "Monitor.Swell.Primary.dirTo";
+
+    public final static String MON_SWELL_SEC_HT = "Monitor.Swell.Secondary.height";
+
+    public final static String MON_SWELL_SEC_PD = "Monitor.Swell.Secondary.period";
+
+    public final static String MON_SWELL_SEC_DIR_FROM = "Monitor.Swell.Secondary.dirFrom";
+
+    public final static String MON_SWELL_SEC_DIR_TO = "Monitor.Swell.Secondary.dirTo";
+
+    public final static String MON_METEO_TEMP = "Monitor.Meteo.temperature";
+
+    public final static String MON_METEO_WIND_CHILL = "Monitor.Meteo.wind_chill";
+
+    public final static String MON_METEO_SNOW_DEPTH = "Monitor.Meteo.snow_depth";
+
     /*
      * SAFESEAS
      */
@@ -98,19 +134,16 @@ public class MonitorConfigConstants {
     }
 
     public static enum SafeSeasMonitor {
-        SS_MON_METEO_WIND_SPEED("Monitor.Meteo.wind_speed"), SS_MON_METEO_PEAK_WIND(
-                "Monitor.Meteo.peak_wind_speed"), SS_MON_METEO_GUST_SPEED(
-                "Monitor.Meteo.gust_speed"), SS_MON_METEO_WAVE_HT(
-                "Monitor.Meteo.wave_height"), SS_MON_METEO_VIS(
-                "Monitor.Meteo.visibility"), SS_MON_SWELL_PRIM_HT(
-                "Monitor.Swell.Primary.height"), SS_MON_SWELL_PRIM_PD(
-                "Monitor.Swell.Primary.period"), SS_MON_SWELL_PRIM_DIR_FROM(
-                "Monitor.Swell.Primary.dirFrom"), SS_MON_SWELL_PRIM_DIR_TO(
-                "Monitor.Swell.Primary.dirTo"), SS_MON_SWELL_SEC_HT(
-                "Monitor.Swell.Secondary.height"), SS_MON_SWELL_SEC_PD(
-                "Monitor.Swell.Secondary.period"), SS_MON_SWELL_SEC_DIR_FROM(
-                "Monitor.Swell.Secondary.dirFrom"), SS_MON_SWELL_SEC_DIR_TO(
-                "Monitor.Swell.Secondary.dirTo");
+        SS_MON_METEO_WIND_SPEED(MON_METEO_WIND_SPEED), SS_MON_METEO_PEAK_WIND(
+                MON_METEO_PEAK_WIND), SS_MON_METEO_GUST_SPEED(
+                MON_METEO_GUST_SPEED), SS_MON_METEO_WAVE_HT(MON_METEO_WAVE_HT), SS_MON_METEO_VIS(
+                MON_METEO_VIS), SS_MON_SWELL_PRIM_HT(MON_SWELL_PRIM_HT), SS_MON_SWELL_PRIM_PD(
+                MON_SWELL_PRIM_PD), SS_MON_SWELL_PRIM_DIR_FROM(
+                MON_SWELL_PRIM_DIR_FROM), SS_MON_SWELL_PRIM_DIR_TO(
+                MON_SWELL_PRIM_DIR_TO), SS_MON_SWELL_SEC_HT(MON_SWELL_SEC_HT), SS_MON_SWELL_SEC_PD(
+                MON_SWELL_SEC_PD), SS_MON_SWELL_SEC_DIR_FROM(
+                MON_SWELL_SEC_DIR_FROM), SS_MON_SWELL_SEC_DIR_TO(
+                MON_SWELL_SEC_DIR_TO);
 
         String XMLKey;
 
@@ -164,13 +197,11 @@ public class MonitorConfigConstants {
     }
 
     public static enum SnowMonitor {
-        SNOW_MON_METEO_WIND_SPEED("Monitor.Meteo.wind_speed"), SNOW_MON_METEO_PEAK_WIND(
-                "Monitor.Meteo.peak_wind_speed"), SNOW_MON_METEO_GUST_SPEED(
-                "Monitor.Meteo.gust_speed"), SNOW_MON_METEO_TEMP(
-                "Monitor.Meteo.temperature"), SNOW_MON_METEO_WIND_CHILL(
-                "Monitor.Meteo.wind_chill"), SNOW_MON_METEO_VIS(
-                "Monitor.Meteo.visibility"), SNOW_MON_METEO_SNOW_DEPTH(
-                "Monitor.Meteo.snow_depth");
+        SNOW_MON_METEO_WIND_SPEED(MON_METEO_WIND_SPEED), SNOW_MON_METEO_PEAK_WIND(
+                MON_METEO_PEAK_WIND), SNOW_MON_METEO_GUST_SPEED(
+                MON_METEO_GUST_SPEED), SNOW_MON_METEO_TEMP(MON_METEO_TEMP), SNOW_MON_METEO_WIND_CHILL(
+                MON_METEO_WIND_CHILL), SNOW_MON_METEO_VIS(MON_METEO_VIS), SNOW_MON_METEO_SNOW_DEPTH(
+                MON_METEO_SNOW_DEPTH);
 
         String XMLKey;
 
@@ -209,7 +240,7 @@ public class MonitorConfigConstants {
     }
 
     public static enum FogMonitor {
-        FOG_MONITOR_METEO_VIS("Monitor.Meteo.visiblity");
+        FOG_MONITOR_METEO_VIS(MON_METEO_VIS);
 
         String XMLKey;
 
diff --git a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/TrendSetConfigMgr.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/TrendSetConfigMgr.java
index a4e8e953e7..28038d3155 100644
--- a/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/TrendSetConfigMgr.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/scan/config/TrendSetConfigMgr.java
@@ -1,60 +1,70 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
 package com.raytheon.uf.common.monitor.scan.config;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Set;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.monitor.scan.xml.SCANTrendSetXML;
 import com.raytheon.uf.common.monitor.scan.xml.SCANTrendSetsXML;
 import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
 
 /**
- * 
+ *
  * Manages the Trend Sets configuration. This will handle either CELL or DMD
  * trend sets.
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 3, 2009  #3039      lvenable    Initial creation
  * Oct 2, 2013   2361      njensen     Use JAXBManager for XML
- * 
+ * Feb 15, 2016 5244       nabowle     Replace deprecated LocalizationFile methods.
+ *                                     Add statusHandler.
+ *
  * </pre>
- * 
+ *
  * @author lvenable
  * @version 1.0
  */
 public class TrendSetConfigMgr {
 
+    private static final IUFStatusHandler statusHandler = UFStatus
+            .getHandler(TrendSetConfigMgr.class);
+
     private static final SingleTypeJAXBManager<SCANTrendSetsXML> jaxb = SingleTypeJAXBManager
             .createWithoutException(SCANTrendSetsXML.class);
 
@@ -63,10 +73,6 @@ public class TrendSetConfigMgr {
      */
     private String configXml = null;
 
-    /**
-     * Full XML file path.
-     */
-    private String fullXMLFilePath = null;
 
     /**
      * Trend sets XML.
@@ -80,7 +86,7 @@ public class TrendSetConfigMgr {
 
     /**
      * Constructor.
-     * 
+     *
      * @param defCfgXML
      *            Default configuration XML name.
      */
@@ -106,11 +112,14 @@ public class TrendSetConfigMgr {
     private void readDefaultConfig() {
         try {
             IPathManager pm = PathManagerFactory.getPathManager();
-            fullXMLFilePath = pm.getStaticFile(getFullConfigFileNameStr())
-                    .getAbsolutePath();
-            trendSets = jaxb.unmarshalFromXmlFile(fullXMLFilePath);
+            ILocalizationFile file = pm
+                    .getStaticLocalizationFile(getFullConfigFileNameStr());
+            try (InputStream is = file.openInputStream()) {
+                trendSets = jaxb.unmarshalFromInputStream(is);
+            }
         } catch (Exception e) {
-            e.printStackTrace();
+            statusHandler.handle(Priority.WARN,
+                    "Error reading default config.", e);
         }
     }
 
@@ -130,7 +139,7 @@ public class TrendSetConfigMgr {
 
     /**
      * Get the full path/file name of the configuration XML.
-     * 
+     *
      * @return Full file name and path.
      */
     private String getFullConfigFileNameStr() {
@@ -143,7 +152,7 @@ public class TrendSetConfigMgr {
 
     /**
      * Get the trend sets map.
-     * 
+     *
      * @return The trend sets map.
      */
     public final LinkedHashMap<String, String> getTrendSetMap() {
@@ -152,7 +161,7 @@ public class TrendSetConfigMgr {
 
     /**
      * Get the trend sets configuration XML.
-     * 
+     *
      * @return The trend sets configuration XML.
      */
     public SCANTrendSetsXML getTrendSets() {
@@ -186,29 +195,20 @@ public class TrendSetConfigMgr {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext context = pm.getContext(
                 LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
-        LocalizationFile locFile = pm.getLocalizationFile(context,
+        ILocalizationFile locFile = pm.getLocalizationFile(context,
                 getFullConfigFileNameStr());
 
-        if (locFile.getFile().exists() == false) {
-            if (locFile.getFile().getParentFile().mkdirs() == false) {
-                System.out.println("Did not not create directory(ies): "
-                        + locFile.getFile().getAbsolutePath());
-            }
-        }
-
-        try {
-            jaxb.marshalToXmlFile(trendSets, locFile.getFile()
-                    .getAbsolutePath());
-
-            locFile.save();
+        try (SaveableOutputStream sos = locFile.openOutputStream()) {
+            jaxb.marshalToStream(trendSets, sos);
+            sos.save();
         } catch (Exception e) {
-            e.printStackTrace();
+            statusHandler.handle(Priority.WARN, "Error saving trend sets.", e);
         }
     }
 
     /**
      * Remove a trend set.
-     * 
+     *
      * @param name
      *            Trend set name to remove.
      */
@@ -218,7 +218,7 @@ public class TrendSetConfigMgr {
 
     /**
      * Add/Update a trend set.
-     * 
+     *
      * @param name
      * @param attibute
      */
@@ -228,7 +228,7 @@ public class TrendSetConfigMgr {
 
     /**
      * Get a list of trend sets that do not have at least 2 attributes.
-     * 
+     *
      * @return Array on trend set names.
      */
     public String[] getInvalidAttributeNumber() {
@@ -248,7 +248,7 @@ public class TrendSetConfigMgr {
 
     /**
      * Get a string array of attributes for the specified trend set name.
-     * 
+     *
      * @param trendName
      *            Trend set name.
      * @return String array of attributes.
@@ -264,7 +264,7 @@ public class TrendSetConfigMgr {
 
     /**
      * Get an array on trend set names.
-     * 
+     *
      * @return Array of trend set names.
      */
     public String[] getTrendSetNames() {
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/xml/AreaThresholdXML.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaThresholdXML.java
old mode 100644
new mode 100755
similarity index 75%
rename from cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/xml/AreaThresholdXML.java
rename to edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaThresholdXML.java
index 1a1f081305..e4487bf0bc
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/xml/AreaThresholdXML.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaThresholdXML.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.viz.monitor.xml;
+package com.raytheon.uf.common.monitor.xml;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -26,65 +26,58 @@ import javax.xml.bind.annotation.XmlAttribute;
 import com.raytheon.uf.common.serialization.ISerializableObject;
 
 /**
- * Class containing the XML data specifying the threshold key, red,
- * and yellow values. 
+ * Class containing the XML data specifying the threshold key, red, and yellow
+ * values.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
+ * 
+ * Date         Ticket#    Engineer     Description
  * ------------ ---------- ----------- --------------------------
  * Dec 15, 2009 #3963      lvenable     Initial creation
- *
+ * Jan 04, 2016  5115      skorolev     moved from com.raytheon.uf.viz.monitor.xml
+ * 
  * </pre>
- *
+ * 
  * @author lvenable
  * @version 1.0
  */
 @XmlAccessorType(XmlAccessType.NONE)
-public class AreaThresholdXML implements ISerializableObject
-{
+public class AreaThresholdXML implements ISerializableObject {
     @XmlAttribute(name = "key")
     private String key;
-    
+
     @XmlAttribute(name = "red")
     private double red;
-    
+
     @XmlAttribute(name = "yellow")
     private double yellow;
-    
-    public AreaThresholdXML()
-    {        
+
+    public AreaThresholdXML() {
     }
 
-    public String getKey()
-    {
+    public String getKey() {
         return key;
     }
 
-    public void setKey(String key)
-    {
+    public void setKey(String key) {
         this.key = key;
     }
 
-    public double getRed()
-    {
+    public double getRed() {
         return red;
     }
 
-    public void setRed(double red)
-    {
+    public void setRed(double red) {
         this.red = red;
     }
 
-    public double getYellow()
-    {
+    public double getYellow() {
         return yellow;
     }
 
-    public void setYellow(double yellow)
-    {
+    public void setYellow(double yellow) {
         this.yellow = yellow;
     }
 }
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/xml/AreaXML.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaXML.java
old mode 100644
new mode 100755
similarity index 71%
rename from cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/xml/AreaXML.java
rename to edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaXML.java
index 7c9e42bad0..cc4046fc7b
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/xml/AreaXML.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaXML.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.viz.monitor.xml;
+package com.raytheon.uf.common.monitor.xml;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,109 +34,93 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
  * AreaThresholdXML data.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 15, 2009 #3963      lvenable     Initial creation
- *
+ * Jan 04, 2016  5115      skorolev     moved from com.raytheon.uf.viz.monitor.xml
+ * 
  * </pre>
- *
+ * 
  * @author lvenable
  * @version 1.0
  */
 @XmlAccessorType(XmlAccessType.NONE)
-public class AreaXML implements ISerializableObject
-{
+public class AreaXML implements ISerializableObject {
     @XmlElement(name = "AreaID")
     private String areaId;
-    
-    @XmlElements( { @XmlElement(name = "AreaThreshold", type = AreaThresholdXML.class) })
+
+    @XmlElements({ @XmlElement(name = "AreaThreshold", type = AreaThresholdXML.class) })
     private ArrayList<AreaThresholdXML> areaThresholds;
-    
+
     private HashMap<String, Integer> areaThreshIdxMap;
-    
-    public AreaXML()
-    {        
+
+    public AreaXML() {
     }
 
-    public String getAreaId()
-    {
+    public String getAreaId() {
         return areaId;
     }
 
-    public void setAreaId(String areaId)
-    {
+    public void setAreaId(String areaId) {
         this.areaId = areaId;
     }
 
-    public ArrayList<AreaThresholdXML> getAreaThresholds()
-    {
+    public ArrayList<AreaThresholdXML> getAreaThresholds() {
         return areaThresholds;
     }
 
-    public void setAreaThresholds(ArrayList<AreaThresholdXML> areaThresholds)
-    {
+    public void setAreaThresholds(ArrayList<AreaThresholdXML> areaThresholds) {
         this.areaThresholds = areaThresholds;
     }
 
-    public double getRedValue(String key)
-    {
-        if (areaThreshIdxMap == null)
-        {
+    public double getRedValue(String key) {
+        if (areaThreshIdxMap == null) {
             createIndexMap();
         }
-        
+
         int idx = areaThreshIdxMap.get(key);
         return areaThresholds.get(idx).getRed();
     }
-    
-    public void setRedValue(String key, double value)
-    {
-        if (areaThreshIdxMap == null)
-        {
+
+    public void setRedValue(String key, double value) {
+        if (areaThreshIdxMap == null) {
             createIndexMap();
         }
-        
+
         int idx = areaThreshIdxMap.get(key);
         areaThresholds.get(idx).setRed(value);
     }
-    
-    public double getYellowValue(String key)
-    {
-        if (areaThreshIdxMap == null)
-        {
+
+    public double getYellowValue(String key) {
+        if (areaThreshIdxMap == null) {
             createIndexMap();
         }
-        
+
         int idx = areaThreshIdxMap.get(key);
         return areaThresholds.get(idx).getYellow();
     }
-    
-    public void setYellowValue(String key, double value)
-    {
-        if (areaThreshIdxMap == null)
-        {
+
+    public void setYellowValue(String key, double value) {
+        if (areaThreshIdxMap == null) {
             createIndexMap();
         }
-        
+
         int idx = areaThreshIdxMap.get(key);
         areaThresholds.get(idx).setYellow(value);
     }
-    
-    public AreaThresholdXML getAreaThresholdXML(String key)
-    {
+
+    public AreaThresholdXML getAreaThresholdXML(String key) {
         int idx = areaThreshIdxMap.get(key);
         return areaThresholds.get(idx);
     }
-    
-    private void createIndexMap()
-    {
+
+    private void createIndexMap() {
         areaThreshIdxMap = new HashMap<String, Integer>();
-        
-        for (int i = 0; i < areaThresholds.size(); i++)
-        {
+
+        for (int i = 0; i < areaThresholds.size(); i++) {
             areaThreshIdxMap.put(areaThresholds.get(i).getKey(), i);
         }
     }
diff --git a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/xml/ThresholdsXML.java b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/ThresholdsXML.java
old mode 100644
new mode 100755
similarity index 96%
rename from cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/xml/ThresholdsXML.java
rename to edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/ThresholdsXML.java
index 2073016a45..367ce8df99
--- a/cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/xml/ThresholdsXML.java
+++ b/edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/ThresholdsXML.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.viz.monitor.xml;
+package com.raytheon.uf.common.monitor.xml;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -40,6 +40,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 15, 2009 #3963      lvenable     Initial creation
+ * Jan 04, 2016  5115      skorolev     moved from com.raytheon.uf.viz.monitor.xml
  *
  * </pre>
  *
diff --git a/cave/com.raytheon.uf.viz.monitor.fog/localization/fog/threshold/monitor/DefaultFogMonitorThresholds.xml b/edexOsgi/com.raytheon.uf.common.monitor/utility/common_static/base/monitoring/fog/DefaultFogMonitorThresholds.xml
old mode 100644
new mode 100755
similarity index 92%
rename from cave/com.raytheon.uf.viz.monitor.fog/localization/fog/threshold/monitor/DefaultFogMonitorThresholds.xml
rename to edexOsgi/com.raytheon.uf.common.monitor/utility/common_static/base/monitoring/fog/DefaultFogMonitorThresholds.xml
index 4f1908fbee..7a0a323598
--- a/cave/com.raytheon.uf.viz.monitor.fog/localization/fog/threshold/monitor/DefaultFogMonitorThresholds.xml
+++ b/edexOsgi/com.raytheon.uf.common.monitor/utility/common_static/base/monitoring/fog/DefaultFogMonitorThresholds.xml
@@ -21,6 +21,6 @@
 <Thresholds>
     <Area>
         <AreaID>DefaultValues</AreaID>
-        <AreaThreshold key = "Monitor.Meteo.visiblity" red = "4" yellow = "8"/>
+        <AreaThreshold key = "Monitor.Meteo.visibility" red = "4" yellow = "8"/>
     </Area>
 </Thresholds>
\ No newline at end of file
diff --git a/cave/com.raytheon.uf.viz.monitor.safeseas/localization/safeseas/threshold/monitor/DefaultSSMonitorThresholds.xml b/edexOsgi/com.raytheon.uf.common.monitor/utility/common_static/base/monitoring/safeseas/DefaultSSMonitorThresholds.xml
old mode 100644
new mode 100755
similarity index 100%
rename from cave/com.raytheon.uf.viz.monitor.safeseas/localization/safeseas/threshold/monitor/DefaultSSMonitorThresholds.xml
rename to edexOsgi/com.raytheon.uf.common.monitor/utility/common_static/base/monitoring/safeseas/DefaultSSMonitorThresholds.xml
diff --git a/cave/com.raytheon.uf.viz.monitor.snow/localization/snow/threshold/monitor/DefaultSnowMonitorThresholds.xml b/edexOsgi/com.raytheon.uf.common.monitor/utility/common_static/base/monitoring/snow/DefaultSnowMonitorThresholds.xml
old mode 100644
new mode 100755
similarity index 100%
rename from cave/com.raytheon.uf.viz.monitor.snow/localization/snow/threshold/monitor/DefaultSnowMonitorThresholds.xml
rename to edexOsgi/com.raytheon.uf.common.monitor/utility/common_static/base/monitoring/snow/DefaultSnowMonitorThresholds.xml
diff --git a/edexOsgi/com.raytheon.uf.common.mpe/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.mpe/META-INF/MANIFEST.MF
index c181cf4ba4..ef683faaf1 100644
--- a/edexOsgi/com.raytheon.uf.common.mpe/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.mpe/META-INF/MANIFEST.MF
@@ -2,10 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mpe Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.mpe
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: org.geotools,
- org.apache.commons.lang,
  javax.persistence;bundle-version="1.0.0",
  javax.measure;bundle-version="1.0.0",
  com.raytheon.uf.common.serialization.comm,
diff --git a/edexOsgi/com.raytheon.uf.common.nc4/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.nc4/META-INF/MANIFEST.MF
index f7624137d6..713fbba0e4 100644
--- a/edexOsgi/com.raytheon.uf.common.nc4/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.nc4/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nc4
 Bundle-SymbolicName: com.raytheon.uf.common.nc4
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.uf.common.nc4,
  com.raytheon.uf.common.nc4.cf
 Require-Bundle: edu.mit.ll.netcdf;bundle-version="1.3.0",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.common.status;bundle-version="1.12.1174"
diff --git a/edexOsgi/com.raytheon.uf.common.nc4/src/com/raytheon/uf/common/nc4/NcBase.java b/edexOsgi/com.raytheon.uf.common.nc4/src/com/raytheon/uf/common/nc4/NcBase.java
index 873de732fe..4adf40ac62 100644
--- a/edexOsgi/com.raytheon.uf.common.nc4/src/com/raytheon/uf/common/nc4/NcBase.java
+++ b/edexOsgi/com.raytheon.uf.common.nc4/src/com/raytheon/uf/common/nc4/NcBase.java
@@ -11,7 +11,7 @@ package com.raytheon.uf.common.nc4;
 
 import java.util.Arrays;
 
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 
 import edu.mit.ll.netcdf.LLNetcdfAttrJNI;
 import edu.mit.ll.netcdf.LLNetcdfException;
@@ -20,20 +20,20 @@ import edu.mit.ll.netcdf.LLNetcdfException;
  * TODO Add Description
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 7, 2013            bclement     Initial creation
- *
+ * 
  * </pre>
- *
+ * 
  * @author bclement
- * @version 1.0	
+ * @version 1.0
  */
 public abstract class NcBase {
-    
+
     protected int fileId;
 
     protected int varId;
@@ -44,7 +44,7 @@ public abstract class NcBase {
         this.fileId = fileId;
         this.varId = varId;
     }
-   
+
     /**
      * Add attribute. This method can only be called when file is in define mode
      * before {@link Netcdf#endFileDefinition()} is called.
diff --git a/edexOsgi/com.raytheon.uf.common.ohd/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.ohd/META-INF/MANIFEST.MF
index 6f89eba875..48ad16a6cd 100644
--- a/edexOsgi/com.raytheon.uf.common.ohd/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.ohd/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ohd Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.ohd
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.16.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.localization,
- javax.persistence
+ javax.persistence,
+ org.slf4j;bundle-version="1.7.12"
 Export-Package: com.raytheon.uf.common.ohd
 Import-Package: com.raytheon.uf.common.localization,
- com.raytheon.uf.common.util,
- org.apache.commons.logging
+ com.raytheon.uf.common.util
 
 
diff --git a/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaults.java b/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaults.java
index ebe857a8cf..f0a15803fc 100644
--- a/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaults.java
+++ b/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaults.java
@@ -23,21 +23,21 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.lang.reflect.Method;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
-import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.util.FileUtil;
 
@@ -67,6 +67,9 @@ import com.raytheon.uf.common.util.FileUtil;
  * Apr  1, 2009            jelkins      added getTokens
  * Oct 19, 2012            bgonzale     App Context variable setup and token access.
  * Sep 22, 2014 3356       njensen      Fix constructor usage in viz finding VizApp class
+ * Jan 26, 2016 5264       bkowal       Added validation of certain directories. Fixed
+ *                                      warnings.
+ * Feb 01, 2016 5264       bkowal       Replace status handler with slf4j logging.
  * 
  * </pre>
  * 
@@ -74,10 +77,10 @@ import com.raytheon.uf.common.util.FileUtil;
  * @version 1.0
  */
 public class AppsDefaults {
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private static final String Apps_defaults_FILENAME = FileUtil.join("hydro",
-            "Apps_defaults");
+    private static final String Apps_defaults_FILENAME = Paths.get("hydro",
+            "Apps_defaults").toString();
 
     private static final String RFR_OPEN = "$(";
 
@@ -93,7 +96,7 @@ public class AppsDefaults {
 
     private static final int RECUR_LIMIT = 40;
 
-    private static Set<String> _trueSet = new HashSet<String>();
+    private static Set<String> _trueSet = new HashSet<>();
 
     private static AppsDefaults instance;
 
@@ -101,13 +104,15 @@ public class AppsDefaults {
 
     private final Properties _envProperties;
 
-    private LocalizationFile _appsDefaultsUserFile;
+    private ILocalizationFile _appsDefaultsUserFile;
 
-    private LocalizationFile _appsDefaultsSiteFile;
+    private ILocalizationFile _appsDefaultsSiteFile;
 
-    private LocalizationFile _appsDefaultsNationalFile;
+    private ILocalizationFile _appsDefaultsNationalFile;
 
-    private Set<String> tokens = new HashSet<String>();
+    private ILocalizationPathObserver appsDefaultsObserver;
+
+    private Set<String> tokens = new HashSet<>();
 
     private Map<String, String> userMap;
 
@@ -132,6 +137,7 @@ public class AppsDefaults {
      */
     private AppsDefaults() {
         _envProperties = new Properties();
+        this.checkAppsDefaults(System.getenv(), "Environment");
         _envProperties.putAll(System.getenv());
 
         /*
@@ -148,7 +154,9 @@ public class AppsDefaults {
                 _envProperties.put("apps_dir",
                         FileUtil.join(shareDir, "hydroapps"));
             } catch (Exception e) {
-                e.printStackTrace();
+                logger.error(
+                        "Failed to determine the location of the hydroapps share directory.",
+                        e);
             }
         }
 
@@ -161,30 +169,74 @@ public class AppsDefaults {
         // force a file read.
         synchronized (LOCK) {
             Set<String> tokenSet = new HashSet<String>();
-            userMap = new HashMap<String, String>();
+            userMap = new HashMap<>();
             if (_appsDefaultsUserFile.exists()) {
-                System.err.println("USER file exists, updating map...");
+                logger.info("USER file exists, updating map...");
                 update(userMap, _appsDefaultsUserFile);
                 tokenSet.addAll(userMap.keySet());
             }
 
-            siteMap = new HashMap<String, String>();
+            siteMap = new HashMap<>();
             if (_appsDefaultsSiteFile.exists()) {
-                System.err.println("SITE file exists, updating map...");
+                logger.info("SITE file exists, updating map...");
                 update(siteMap, _appsDefaultsSiteFile);
                 tokenSet.addAll(siteMap.keySet());
             }
 
-            baseMap = new HashMap<String, String>();
+            baseMap = new HashMap<>();
             if (_appsDefaultsNationalFile.exists()) {
-                System.err.println("BASE file exists, updating map...");
+                logger.info("BASE file exists, updating map...");
                 update(baseMap, _appsDefaultsNationalFile);
                 tokenSet.addAll(baseMap.keySet());
             }
+
+            if (userMap.isEmpty() == false) {
+                checkAppsDefaults(userMap, _appsDefaultsUserFile.toString());
+            }
+            if (siteMap.isEmpty() == false) {
+                checkAppsDefaults(siteMap, _appsDefaultsSiteFile.toString());
+            }
+            if (baseMap.isEmpty() == false) {
+                checkAppsDefaults(baseMap, _appsDefaultsNationalFile.toString());
+            }
+
             tokens = tokenSet;
         }
     }
 
+    private void checkAppsDefaults(Map<String, String> propertiesMap,
+            String containingFile) {
+        logger.info("Validating Apps Defaults properties in: " + containingFile
+                + " ...");
+        for (String key : AppsDefaultsDirKeys.DIR_KEYS_TO_VALIDATE) {
+            String valueToValidate = propertiesMap.get(key);
+            if (valueToValidate == null) {
+                continue;
+            }
+            if (AppsDefaultsDirKeys.validateDirectory(expandReferBacks(
+                    valueToValidate, 0))) {
+                continue;
+            }
+            /*
+             * invalid value specified. sanitize the input and inform the users
+             * that apps defaults requires an update.
+             */
+            propertiesMap.remove(key);
+            StringBuilder sb = new StringBuilder("Illegal property: ")
+                    .append(valueToValidate)
+                    .append(" specified for Apps Defaults key: ")
+                    .append(key)
+                    .append(" in file: ")
+                    .append(containingFile)
+                    .append(". Property has been ignored. Valid values must map to a location within one of the specified directories: ")
+                    .append(AppsDefaultsDirKeys.getValidRootsAsString())
+                    .append(".");
+            logger.error(sb.toString());
+        }
+        logger.info("Finished validation of Apps Defaults properties in: "
+                + containingFile + ".");
+    }
+
     private void updateDirectories() {
         _appsDefaultsUserFile = null;
         _appsDefaultsSiteFile = null;
@@ -194,21 +246,6 @@ public class AppsDefaults {
         _appsDefaultsUserFile = pm.getLocalizationFile(pm.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.USER),
                 Apps_defaults_FILENAME);
-
-        _appsDefaultsUserFile
-                .addFileUpdatedObserver(new ILocalizationFileObserver() {
-                    @Override
-                    public void fileUpdated(FileUpdatedMessage message) {
-                        if (message.getContext().equals(
-                                _appsDefaultsUserFile.getContext())) {
-                            System.err
-                                    .println("Detected change in USER Apps_defaults file: "
-                                            + message.getChangeType());
-                            initialize();
-                        }
-                    }
-                });
-
         if (_appsDefaultsUserFile.exists()) {
             logger.info("Setting user Apps_defaults file: "
                     + _appsDefaultsUserFile);
@@ -219,21 +256,6 @@ public class AppsDefaults {
         _appsDefaultsSiteFile = pm.getLocalizationFile(pm.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE),
                 Apps_defaults_FILENAME);
-
-        _appsDefaultsSiteFile
-                .addFileUpdatedObserver(new ILocalizationFileObserver() {
-                    @Override
-                    public void fileUpdated(FileUpdatedMessage message) {
-                        if (message.getContext().equals(
-                                _appsDefaultsSiteFile.getContext())) {
-                            System.err
-                                    .println("Detected change in SITE Apps_defaults file: "
-                                            + message.getChangeType());
-                            initialize();
-                        }
-                    }
-                });
-
         if (_appsDefaultsSiteFile.exists()) {
             logger.info("Setting site Apps_defaults file: "
                     + _appsDefaultsSiteFile);
@@ -244,13 +266,25 @@ public class AppsDefaults {
         _appsDefaultsNationalFile = pm.getLocalizationFile(pm.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.BASE),
                 Apps_defaults_FILENAME);
-
         if (_appsDefaultsNationalFile.exists()) {
             logger.info("Setting base Apps_defaults file: "
                     + _appsDefaultsNationalFile);
         } else {
             logger.error("No base Apps_defaults file found.");
         }
+
+        if (this.appsDefaultsObserver == null) {
+            appsDefaultsObserver = new ILocalizationPathObserver() {
+                @Override
+                public void fileChanged(ILocalizationFile file) {
+                    logger.info("Detected change in Apps_defaults file: "
+                            + file.toString() + " ...");
+                    initialize();
+                }
+            };
+            pm.addLocalizationPathObserver(Apps_defaults_FILENAME,
+                    appsDefaultsObserver);
+        }
     }
 
     /**
@@ -269,11 +303,11 @@ public class AppsDefaults {
      * @param map
      * @param file
      */
-    private void update(Map<String, String> map, LocalizationFile file) {
+    private void update(Map<String, String> map, ILocalizationFile file) {
         if (file != null && file.exists()) {
             BufferedReader reader = null;
             try {
-                System.err.println("Reading " + file + " into AppsDefaults");
+                logger.info("Reading " + file + " into AppsDefaults");
                 reader = new BufferedReader(new InputStreamReader(
                         file.openInputStream()));
                 String line = null;
@@ -448,13 +482,6 @@ public class AppsDefaults {
 
     // -----------------------------------------------------
 
-    // /**
-    // *
-    // */
-    // public String getToken(String tokenName) {
-    // return getToken(tokenName, 0);
-    // }
-
     /**
      * 
      * @param tokenName
@@ -491,7 +518,6 @@ public class AppsDefaults {
         tokenValue = expandReferBacks(tokenValue, 0);
 
         return tokenValue;
-
     } // end getToken()
 
     // -----------------------------------------------------
@@ -553,8 +579,7 @@ public class AppsDefaults {
                 recursionCount--;
             } else {
                 middle = "ERROR_ERROR_ERROR";
-                System.err
-                        .println("You probably have a cycle in your Apps Defaults File's  refer backs, please check it");
+                logger.error("You probably have a cycle in your Apps Defaults File's refer backs, please check it");
             }
             if ((referBackEndIndex + RFR_CLOSE.length()) < tokenValue.length()) {
                 end = tokenValue.substring(
@@ -769,8 +794,6 @@ public class AppsDefaults {
             else // part of the tokenValue
             {
                 tokenValueBuffer.append(c);
-                // System.out.println("tokenValueBuffer =" +
-                // tokenValueBuffer.toString());
                 foundStartOfTokenValue = true;
             }
 
@@ -847,44 +870,6 @@ public class AppsDefaults {
 
     } // isDoubleQuote
 
-    // -----------------------------------------------------
-    public static void main(String[] args) {
-        AppsDefaults ad = new AppsDefaults();
-        String tokenName = null;
-        String tokenValue = null;
-
-        // tokenName = "shef_procobs";
-        // tokenValue = ad.getToken(tokenName);
-
-        // System.out.println("tokenName = " + tokenName +
-        // " tokenValue = " + tokenValue);
-
-        tokenName = "ffg_out_dir";
-        tokenValue = ad.getToken(tokenName);
-
-        System.out.println("tokenName = " + tokenName + " tokenValue = "
-                + tokenValue);
-
-        tokenName = "testToken1";
-        // tokenRawValue = "#hank:me:'llhank' "
-        tokenValue = ad.getToken(tokenName);
-        System.out.println("tokenName = " + tokenName + " tokenValue = "
-                + tokenValue);
-
-        tokenName = "testToken2";
-        // tokenRawValue = "dd#hank:me:'llhank' "
-        tokenValue = ad.getToken(tokenName);
-        System.out.println("tokenName = " + tokenName + " tokenValue = "
-                + tokenValue);
-
-        tokenName = "testToken3";
-        // tokenRawValue = 'dd#hank:me:"llhank" '
-        tokenValue = ad.getToken(tokenName);
-        System.out.println("tokenName = " + tokenName + " tokenValue = "
-                + tokenValue);
-
-    }
-
     /**
      * <pre>
      * Set context using the callingContext in the APP_CONTEXT variable.
diff --git a/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaultsDirKeys.java b/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaultsDirKeys.java
new file mode 100644
index 0000000000..09754ca44f
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.common.ohd/src/com/raytheon/uf/common/ohd/AppsDefaultsDirKeys.java
@@ -0,0 +1,196 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.common.ohd;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Defines the apps defaults key associated with directories that must be
+ * validated.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 25, 2016 5264       bkowal      Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bkowal
+ * @version 1.0
+ */
+
+public final class AppsDefaultsDirKeys {
+
+    public static final String APPS_DIR = "apps_dir";
+
+    public static final String MPE_QMOSAIC_DIR = "mpe_qmosaic_dir";
+
+    public static final String WHFS_LOCAL_DATA_DIR = "whfs_local_data_dir";
+
+    public static final String BIAS_MESSAGE_DIR = "bias_message_dir";
+
+    public static final String MPE_SATPRE_DIR = "mpe_satpre_dir";
+
+    public static final String GAFF_MOSAIC_DIR = "gaff_mosaic_dir";
+
+    public static final String GEO_DATA = "geo_data";
+
+    /*
+     * HPE Directories - many of which can be referenced within the FFMP Source
+     * Config xml.
+     */
+    public static final String HPE_GRIB_INPUT_DIR = "hpe_grib_input_dir";
+
+    public static final String HPE_SATPRE_DIR = "hpe_satpre_dir";
+
+    public static final String HPE_INPUT_DIR = "hpe_input_dir";
+
+    public static final String HPE_OUTPUT_DIR = "hpe_output_dir";
+
+    public static final String HPE_SAT_STATEVAR_DIR = "hpe_sat_statevar_dir";
+
+    public static final String HPE_LOG_DIR = "hpe_log_dir";
+
+    public static final String HPE_DHRMOSAIC_DIR = "hpe_dhrmosaic_dir";
+
+    public static final String HPE_BDHRMOSAIC_DIR = "hpe_bdhrmosaic_dir";
+
+    public static final String HPE_ERMOSAIC_DIR = "hpe_ermosaic_dir";
+
+    public static final String HPE_EBMOSAIC_DIR = "hpe_ebmosaic_dir";
+
+    public static final String HPE_AVG_ERMOSAIC_DIR = "hpe_avg_ermosaic_dir";
+
+    public static final String HPE_LSATPRE_DIR = "hpe_lsatpre_dir";
+
+    public static final String HPE_DSPHEIGHT_DIR = "hpe_dspheight_dir";
+
+    public static final String HPE_DSPINDEX_DIR = "hpe_dspindex_dir";
+
+    public static final String HPE_HEIGHT_DIR = "hpe_height_dir";
+
+    public static final String HPE_INDEX_DIR = "hpe_index_dir";
+
+    public static final String HPE_DHRMOSAIC_GRIB_DIR = "hpe_dhrmosaic_grib_dir";
+
+    public static final String HPE_ERMOSAIC_GRIB_DIR = "hpe_ermosaic_grib_dir";
+
+    public static final String HPE_EBMOSAIC_GRIB_DIR = "hpe_ebmosaic_grib_dir";
+
+    public static final String HPE_GIF_DIR = "hpe_gif_dir";
+
+    public static final String HPE_JPEG_DIR = "hpe_jpeg_dir";
+
+    public static final String HPE_NETCDF_DIR = "hpe_netcdf_dir";
+
+    public static final String HPE_GRIB_DIR = "hpe_grib_dir";
+
+    public static final String HPE_XMRG_DIR = "hpe_xmrg_dir";
+
+    public static final String[] DIR_KEYS_TO_VALIDATE = { APPS_DIR,
+            MPE_QMOSAIC_DIR, WHFS_LOCAL_DATA_DIR, BIAS_MESSAGE_DIR,
+            MPE_SATPRE_DIR, GAFF_MOSAIC_DIR, GEO_DATA, HPE_GRIB_INPUT_DIR,
+            HPE_SATPRE_DIR, HPE_INPUT_DIR, HPE_OUTPUT_DIR,
+            HPE_SAT_STATEVAR_DIR, HPE_LOG_DIR, HPE_DHRMOSAIC_DIR,
+            HPE_BDHRMOSAIC_DIR, HPE_ERMOSAIC_DIR, HPE_EBMOSAIC_DIR,
+            HPE_AVG_ERMOSAIC_DIR, HPE_LSATPRE_DIR, HPE_DSPHEIGHT_DIR,
+            HPE_DSPINDEX_DIR, HPE_HEIGHT_DIR, HPE_INDEX_DIR,
+            HPE_DHRMOSAIC_GRIB_DIR, HPE_ERMOSAIC_GRIB_DIR,
+            HPE_EBMOSAIC_GRIB_DIR, HPE_GIF_DIR, HPE_JPEG_DIR, HPE_NETCDF_DIR,
+            HPE_GRIB_DIR, HPE_XMRG_DIR };
+
+    private static final List<Path> validRootPaths;
+
+    private static String validPathString;
+
+    static {
+        /*
+         * For now, we will whitelist /tmp and the EDEX data directory.
+         * EDEX_HOME is set by both the EDEX start.sh and the CAVE cave.sh.
+         */
+        validRootPaths = new ArrayList<>();
+        validRootPaths.add(Paths.get(File.separator + "tmp"));
+        validRootPaths
+                .add(Paths.get(File.separator + "awips2", "edex", "data"));
+    }
+
+    protected AppsDefaultsDirKeys() {
+    }
+
+    /**
+     * Validates that the specified directory is associated with an approved
+     * location on the file system.
+     * 
+     * @param directory
+     *            the directory to validate
+     * @return true, if the directory is valid; false, otherwise.
+     */
+    public static boolean validateDirectory(final String directory) {
+        return validatePath(Paths.get(directory));
+    }
+
+    /**
+     * Validates that the specified {@link Path} is associated with an approved
+     * location on the file system.
+     * 
+     * @param path
+     *            the {@link Path} to validate
+     * @return true, if the path is valid; false, otherwise.
+     */
+    public static boolean validatePath(Path path) {
+        /*
+         * Normalize the {@link Path} to resolve any path navigation.
+         */
+        path = path.normalize();
+        for (Path validPath : validRootPaths) {
+            if (path.startsWith(validPath)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static String getValidRootsAsString() {
+        if (validPathString == null) {
+            StringBuilder sb = new StringBuilder("[");
+            boolean first = true;
+            for (Path validPath : validRootPaths) {
+                if (first) {
+                    first = false;
+                } else {
+                    sb.append(", ");
+                }
+                sb.append(validPath.toString());
+            }
+            sb.append("]");
+            validPathString = sb.toString();
+        }
+
+        return validPathString;
+    }
+}
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
index 8d6776a1e2..0b3625a9e2 100644
--- a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Nws Auth Plug-in
 Bundle-SymbolicName: com.raytheon.uf.common.plugin.nwsauth
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.2",
@@ -10,7 +10,7 @@ Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.2",
  com.raytheon.uf.common.status;bundle-version="1.12.1174",
  com.raytheon.uf.common.localization;bundle-version="1.12.1174",
  com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
- org.apache.commons.lang;bundle-version="2.3.0"
+ org.apache.commons.lang3;bundle-version="3.4.0"
 Export-Package: com.raytheon.uf.common.plugin.nwsauth,
  com.raytheon.uf.common.plugin.nwsauth.exception,
  com.raytheon.uf.common.plugin.nwsauth.xml
diff --git a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/UserXML.java b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/UserXML.java
index 15827c47e0..9aeccacbfe 100644
--- a/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/UserXML.java
+++ b/edexOsgi/com.raytheon.uf.common.plugin.nwsauth/src/com/raytheon/uf/common/plugin/nwsauth/xml/UserXML.java
@@ -28,8 +28,8 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElements;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.auth.user.IAuthenticationData;
 import com.raytheon.uf.common.auth.user.IUser;
diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.registry.ebxml/META-INF/MANIFEST.MF
index c4dc384bb0..6cbe1a9ce7 100644
--- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.registry.ebxml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.raytheon.uf.common.registry.ebxml
 Bundle-SymbolicName: com.raytheon.uf.common.registry.ebxml
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.raytheon.uf.common.registry,
@@ -29,7 +29,7 @@ Require-Bundle: org.apache.commons.codec;bundle-version="1.4.0",
  org.apache.http;bundle-version="4.1.2",
  com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  org.springframework;bundle-version="2.5.6",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  org.apache.commons.cxf;bundle-version="1.0.0",
  com.raytheon.uf.common.localization;bundle-version="1.12.1174"
 Import-Package: com.sun.xml.bind.marshaller,
diff --git a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/encoder/ContentSlotBasedEncoder.java b/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/encoder/ContentSlotBasedEncoder.java
index 1ff369ba68..37df836c62 100644
--- a/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/encoder/ContentSlotBasedEncoder.java
+++ b/edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/ebxml/encoder/ContentSlotBasedEncoder.java
@@ -26,8 +26,8 @@ import oasis.names.tc.ebxml.regrep.xsd.rim.v4.SlotType;
 import oasis.names.tc.ebxml.regrep.xsd.rim.v4.ValueType;
 import oasis.names.tc.ebxml.regrep.xsd.rim.v4.VersionInfoType;
 
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import com.raytheon.uf.common.registry.ebxml.RegistryUtil;
 import com.raytheon.uf.common.serialization.SerializationException;
@@ -67,7 +67,7 @@ abstract class ContentSlotBasedEncoder<SLOT_VALUE_TYPE extends ValueType, CONTEN
      * The type of encoder it is.
      */
     private final RegistryEncoders.Type type;
-    
+
     /**
      * Constructor. Intentionally package-private.
      */
@@ -85,7 +85,8 @@ abstract class ContentSlotBasedEncoder<SLOT_VALUE_TYPE extends ValueType, CONTEN
         List<SlotType> returnedSlots = registryObjectType.getSlot();
         // Figure out which version we have and it's class
         VersionInfoType vit = registryObjectType.getVersionInfo();
-        String className = registryObjectType.getSlotValue(RegistryUtil.registryObjectClassName);
+        String className = registryObjectType
+                .getSlotValue(RegistryUtil.registryObjectClassName);
 
         // Walk the returned slots looking for the "content" slot
         for (SlotType s : returnedSlots) {
@@ -93,7 +94,8 @@ abstract class ContentSlotBasedEncoder<SLOT_VALUE_TYPE extends ValueType, CONTEN
                 SLOT_VALUE_TYPE sv = getSlotValueTypeClass().cast(
                         s.getSlotValue());
                 CONTENT_TYPE content = getContent(sv);
-                object = decodeContent(content, className, vit.getUserVersionName());
+                object = decodeContent(content, className,
+                        vit.getUserVersionName());
                 break;
             }
         }
@@ -173,14 +175,16 @@ abstract class ContentSlotBasedEncoder<SLOT_VALUE_TYPE extends ValueType, CONTEN
      * 
      * @param content
      *            the content
-     * @param the className
-     * @param the version for serialization
+     * @param the
+     *            className
+     * @param the
+     *            version for serialization
      * @return the decoded object
      * @throws SerializationException
      *             on error decoding the string into an object
      */
-    abstract Object decodeContent(CONTENT_TYPE content, String className, String version)
-            throws SerializationException;
+    abstract Object decodeContent(CONTENT_TYPE content, String className,
+            String version) throws SerializationException;
 
     /**
      * Encodes the object into the type specified by the implementation.
diff --git a/edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/query/v4/QueryRequest.java b/edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/query/v4/QueryRequest.java
index 93ecd9f0b8..78ad6d6224 100644
--- a/edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/query/v4/QueryRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.registry.schemas.ebxml/src/oasis/names/tc/ebxml/regrep/xsd/query/v4/QueryRequest.java
@@ -85,6 +85,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * 10/17/2013    1682       bphillip    Added software history
  * 10/23/2013    1538       bphillip    Removed unused constructors
  * 12/2/2013     1829       bphillip    Added Hibernate annotations
+ * 12/4/2015     4993       bphillip    Added formateResponse option
  * </pre>
  * 
  * @author bphillip
@@ -145,6 +146,8 @@ public class QueryRequest extends RegistryRequestType {
 
     public static final Boolean DEFAULT_MATCH_OLDER_VERSIONS = new Boolean(
             false);
+    
+    public static final String FORMAT_RESPONSE = "formatResponse";
 
     @XmlElement(name = "ResponseOption", required = true)
     @DynamicSerializeElement
diff --git a/edexOsgi/com.raytheon.uf.common.remote.script/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.remote.script/META-INF/MANIFEST.MF
index 7b7b7ab21c..83e23f5a55 100644
--- a/edexOsgi/com.raytheon.uf.common.remote.script/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.remote.script/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common
 Bundle-SymbolicName: com.raytheon.uf.common.remote.script
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RATHEON
 Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
  com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
  com.raytheon.uf.common.localization;bundle-version="1.12.1174",
  com.raytheon.uf.common.auth;bundle-version="1.12.1174",
- org.apache.commons.lang;bundle-version="2.3.0"
+ org.apache.commons.lang3;bundle-version="3.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.common.remote.script
diff --git a/edexOsgi/com.raytheon.uf.common.remote.script/src/com/raytheon/uf/common/remote/script/RemoteScriptListResponse.java b/edexOsgi/com.raytheon.uf.common.remote.script/src/com/raytheon/uf/common/remote/script/RemoteScriptListResponse.java
index 3170d31999..395c19515b 100644
--- a/edexOsgi/com.raytheon.uf.common.remote.script/src/com/raytheon/uf/common/remote/script/RemoteScriptListResponse.java
+++ b/edexOsgi/com.raytheon.uf.common.remote.script/src/com/raytheon/uf/common/remote/script/RemoteScriptListResponse.java
@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
@@ -41,6 +41,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 11, 2014 2742       rferrel     Initial creation
+ * Jan 12, 2016 5244       njensen     Replaced calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -50,11 +51,12 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
 @DynamicSerialize
 public class RemoteScriptListResponse {
+
     /**
      * Map of contexts with sorted list of scripts as keys.
      */
     @DynamicSerializeElement
-    private Map<String, List<LocalizationContext>> scripts = new TreeMap<String, List<LocalizationContext>>(
+    private Map<String, List<LocalizationContext>> scripts = new TreeMap<>(
             String.CASE_INSENSITIVE_ORDER);
 
     /**
@@ -101,7 +103,7 @@ public class RemoteScriptListResponse {
      * @param lFile
      * @return true if not already in the set
      */
-    public boolean add(LocalizationFile lFile) {
+    public boolean add(ILocalizationFile lFile) {
         String script = getName(lFile);
         LocalizationContext context = lFile.getContext();
 
@@ -119,11 +121,12 @@ public class RemoteScriptListResponse {
     }
 
     /**
-     * Convince method to remove the file's context from scripts.
+     * Convenience method to remove the file's context from scripts.
      * 
-     * @param true - if file's script and context was in scripts.
+     * @param lFile
+     * @return true if file's script and context was in scripts
      */
-    public boolean remove(LocalizationFile lFile) {
+    public boolean remove(ILocalizationFile lFile) {
         String name = getName(lFile);
         List<LocalizationContext> contexts = scripts.get(name);
         if (contexts == null) {
@@ -146,16 +149,12 @@ public class RemoteScriptListResponse {
      * @param lFile
      * @return name
      */
-    private String getName(LocalizationFile lFile) {
-        String name = lFile.getName().trim();
+    private String getName(ILocalizationFile lFile) {
+        String name = lFile.getPath().trim();
         return name.substring(name.lastIndexOf(IPathManager.SEPARATOR) + 1);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see java.lang.Object#toString()
-     */
+    @Override
     public String toString() {
         return String.format("RemoteScriptListResponse: {scripts: %s}",
                 getScripts());
diff --git a/edexOsgi/com.raytheon.uf.common.remote.script/src/com/raytheon/uf/common/remote/script/RemoteScriptRunRequest.java b/edexOsgi/com.raytheon.uf.common.remote.script/src/com/raytheon/uf/common/remote/script/RemoteScriptRunRequest.java
index ad58f806b2..a21e91f5c8 100644
--- a/edexOsgi/com.raytheon.uf.common.remote.script/src/com/raytheon/uf/common/remote/script/RemoteScriptRunRequest.java
+++ b/edexOsgi/com.raytheon.uf.common.remote.script/src/com/raytheon/uf/common/remote/script/RemoteScriptRunRequest.java
@@ -25,8 +25,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.text.StrMatcher;
-import org.apache.commons.lang.text.StrTokenizer;
+import org.apache.commons.lang3.text.StrMatcher;
+import org.apache.commons.lang3.text.StrTokenizer;
 
 import com.raytheon.uf.common.localization.LocalizationContext;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
diff --git a/edexOsgi/com.raytheon.uf.common.tafqueue/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.tafqueue/META-INF/MANIFEST.MF
index eac67c2e03..bc25eac467 100644
--- a/edexOsgi/com.raytheon.uf.common.tafqueue/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.tafqueue/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tafqueue
 Bundle-SymbolicName: com.raytheon.uf.common.tafqueue
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.uf.common.serialization.comm,
  javax.persistence;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.common.status,
  com.raytheon.uf.common.auth,
  com.raytheon.uf.common.serialization,
- org.hibernate;bundle-version="3.5.6"
+ org.hibernate;bundle-version="3.5.6",
+ org.apache.commons.configuration;bundle-version="1.10.0"
 Export-Package: com.raytheon.uf.common.tafqueue
 Import-Package: com.raytheon.uf.common.dataplugin.persist,
- com.raytheon.uf.common.localization,
- org.apache.commons.configuration
+ com.raytheon.uf.common.localization
diff --git a/edexOsgi/com.raytheon.uf.common.tafqueue/src/com/raytheon/uf/common/tafqueue/TafQueueVftConfigMgr.java b/edexOsgi/com.raytheon.uf.common.tafqueue/src/com/raytheon/uf/common/tafqueue/TafQueueVftConfigMgr.java
index 003ca751df..7b803d8f9f 100644
--- a/edexOsgi/com.raytheon.uf.common.tafqueue/src/com/raytheon/uf/common/tafqueue/TafQueueVftConfigMgr.java
+++ b/edexOsgi/com.raytheon.uf.common.tafqueue/src/com/raytheon/uf/common/tafqueue/TafQueueVftConfigMgr.java
@@ -24,7 +24,7 @@ import java.io.File;
 
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.HierarchicalINIConfiguration;
-import org.apache.commons.lang.math.NumberUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
index 3708e1183b..e7440623dc 100644
--- a/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Import-Package: com.raytheon.uf.common.activetable,
  com.raytheon.uf.common.status,
  com.vividsolutions.jts.geom,
  javax.persistence,
- org.apache.log4j
+ org.slf4j
 Require-Bundle: com.raytheon.uf.common.localization;bundle-version="1.11.1",
  org.jep;bundle-version="1.0.0",
  com.raytheon.uf.common.serialization;bundle-version="1.11.1",
diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java b/edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
index 736e6a6a1f..4faf438bf9 100644
--- a/edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
+++ b/edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
@@ -35,8 +35,9 @@ import java.util.TimeZone;
 
 import jep.JepException;
 
-import org.apache.log4j.Logger;
 import org.hibernate.NonUniqueObjectException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.site.SiteUtil;
 import com.raytheon.uf.common.activetable.ActiveTableKey;
@@ -118,6 +119,7 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
  *                                     fixed next ETN query to query for >= Jan 1
  * May 22, 2015 4522       randerso    Create proper primary key for ActiveTableRecord
  * Jul 09, 2015 4500       rjpeter     Fix SQL Injection concern.
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author njensen
@@ -128,7 +130,7 @@ public class ActiveTable {
     private static final transient IUFStatusHandler statusHandler = UFStatus
             .getHandler(ActiveTable.class);
 
-    private static final Logger changeLog = Logger
+    private static final Logger changeLog = LoggerFactory
             .getLogger("ActiveTableChange");
 
     private static final String ACTIVE_TABLE_LOCK_NAME = "ActiveTableWriteLock";
diff --git a/edexOsgi/com.raytheon.uf.edex.bufr.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.bufr.feature/feature.xml
index a41fd78db5..d939b73731 100644
--- a/edexOsgi/com.raytheon.uf.edex.bufr.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.bufr.feature/feature.xml
@@ -45,13 +45,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.edex.plugin.bufrquikscat"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.edex.plugin.bufrsigwx"
          download-size="0"
@@ -115,13 +108,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.raytheon.uf.common.dataplugin.bufrquikscat"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.dataplugin.bufrssmi"
          download-size="0"
diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF
index 09dd23e26f..ab4d35801d 100644
--- a/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Export-Package: com.raytheon.uf.edex.bufrtools,
  com.raytheon.uf.edex.bufrtools.packets
 Import-Package: com.raytheon.edex.esb,
  com.raytheon.uf.common.wmo,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/AbstractBUFRDecoder.java b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/AbstractBUFRDecoder.java
index cfc6e69061..00d8fdac42 100644
--- a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/AbstractBUFRDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/AbstractBUFRDecoder.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.bufrtools;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
@@ -47,6 +47,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
  * ------------ ---------- ----------- --------------------------
  * Jun 19, 2009       2519 jkorman     Initial creation
  * May 14, 2014 2536       bclement    moved WMO Header to common
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -57,7 +58,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
 public abstract class AbstractBUFRDecoder implements IDescriptorFactorySelector {
 
     /** The logger */
-    protected Log logger = LogFactory.getLog(getClass());
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 
     protected String pluginName;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/BUFRFile.java b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/BUFRFile.java
index 3e391500ec..daa1333e5a 100755
--- a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/BUFRFile.java
+++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/BUFRFile.java
@@ -28,8 +28,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.edex.bufrtools.descriptors.IDescriptorFactoryDelegate;
 import com.raytheon.uf.edex.decodertools.core.DecoderTools;
@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.decodertools.core.DecoderTools;
  * 20080204            862 jkorman     Initial development. Factored from
  *                                     BUFRSeparator.
  * 9/16/2014    #3628      mapeters    Moved from uf.edex.decodertools plugin.
+ * 12/14/2015   5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -54,7 +55,7 @@ import com.raytheon.uf.edex.decodertools.core.DecoderTools;
 
 public class BUFRFile implements Iterable<BUFRDocument> {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private List<BUFRDocument> documents;
 
@@ -183,10 +184,10 @@ public class BUFRFile implements Iterable<BUFRDocument> {
             if (offsets.size() > 0) {
                 documents = new ArrayList<BUFRDocument>();
                 for (BUFROffsets offset : offsets) {
-                    ByteBuffer buf = ByteBuffer.wrap(fileData, offset
-                            .getStartPos(), offset.getLength());
-                    BUFRDocument doc = new BUFRDocument(factoryDelegate
-                            .getInstance(), buf);
+                    ByteBuffer buf = ByteBuffer.wrap(fileData,
+                            offset.getStartPos(), offset.getLength());
+                    BUFRDocument doc = new BUFRDocument(
+                            factoryDelegate.getInstance(), buf);
                     if (doc != null) {
                         documents.add(doc);
                     }
diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/BUFRPointDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/BUFRPointDataAdapter.java
index f6a5ea47e5..f1c805f6d9 100644
--- a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/BUFRPointDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/BUFRPointDataAdapter.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.pointdata.PointDataContainer;
@@ -48,6 +48,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * ------------ ---------- ----------- --------------------------
  * 20090629           2519 jkorman     Initial implementation.
  * May 14, 2014 2536       bclement    moved WMO Header to common, added breaks/default to switch
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -57,31 +58,32 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
 public abstract class BUFRPointDataAdapter<T extends PluginDataObject> {
 
     public int PDV_FILL_INT = -9999;
-    
+
     public double PDV_FILL_DBL = -9999.0;
-    
+
     /** The logger */
-    protected Log logger = LogFactory.getLog(getClass());
+    protected Logger logger = LoggerFactory.getLogger(getClass());
 
     private final PointDataDescription pointDataDescription;
 
     private final PointDataPluginDao<T> pointDataDao;
 
     private Map<File, PointDataContainer> containerMap;
-    
+
     private String pluginName;
-    
+
     /**
      * 
      * @param container
      */
-    public BUFRPointDataAdapter(PointDataDescription pdd, PointDataPluginDao<T> dao, String pluginName) {
+    public BUFRPointDataAdapter(PointDataDescription pdd,
+            PointDataPluginDao<T> dao, String pluginName) {
         pointDataDescription = pdd;
         pointDataDao = dao;
         this.pluginName = pluginName;
-        containerMap = new HashMap<File,PointDataContainer>();
+        containerMap = new HashMap<File, PointDataContainer>();
     }
-    
+
     /**
      * @return the pointDataDescription
      */
@@ -95,7 +97,7 @@ public abstract class BUFRPointDataAdapter<T extends PluginDataObject> {
      * @return
      */
     public PointDataContainer getContainer(T obsData) {
-        
+
         File file = pointDataDao.getFullFilePath(obsData);
         PointDataContainer container = containerMap.get(file);
         if (container == null) {
@@ -111,7 +113,7 @@ public abstract class BUFRPointDataAdapter<T extends PluginDataObject> {
      * @return
      */
     public PointDataContainer getContainer(T obsData, int size) {
-        
+
         File file = pointDataDao.getFullFilePath(obsData);
         PointDataContainer container = containerMap.get(file);
         if (container == null) {
@@ -121,10 +123,9 @@ public abstract class BUFRPointDataAdapter<T extends PluginDataObject> {
         return container;
     }
 
-    
     /**
-     * Construct a single observation instance from the BUFR decoded data contained in
-     * the specified separator.
+     * Construct a single observation instance from the BUFR decoded data
+     * contained in the specified separator.
      * 
      * @param iterator
      *            An iterator containing decoded BUFR data.
@@ -132,18 +133,21 @@ public abstract class BUFRPointDataAdapter<T extends PluginDataObject> {
      *            a wmoHeader
      * @return A ProfilerObs instance, or null in the event of an error.
      */
-    public abstract T createData(Iterator<BUFRDataDocument> iterator, WMOHeader wmoHeader);
-    
+    public abstract T createData(Iterator<BUFRDataDocument> iterator,
+            WMOHeader wmoHeader);
+
     /**
-     * Construct a list of observation instances from the BUFR decoded data contained in
-     * the specified separator.
+     * Construct a list of observation instances from the BUFR decoded data
+     * contained in the specified separator.
      * 
-     * @param iterator Iterator to the data document to be decoded.
+     * @param iterator
+     *            Iterator to the data document to be decoded.
      * @param wmoHeader
      * @return
      */
-    public abstract List<T> createDataList(Iterator<BUFRDataDocument> iterator, WMOHeader wmoHeader);
-    
+    public abstract List<T> createDataList(Iterator<BUFRDataDocument> iterator,
+            WMOHeader wmoHeader);
+
     /**
      * @return the pluginName
      */
@@ -152,7 +156,8 @@ public abstract class BUFRPointDataAdapter<T extends PluginDataObject> {
     }
 
     /**
-     * @param pluginName the pluginName to set
+     * @param pluginName
+     *            the pluginName to set
      */
     public void setPluginName(String pluginName) {
         this.pluginName = pluginName;
@@ -166,13 +171,13 @@ public abstract class BUFRPointDataAdapter<T extends PluginDataObject> {
      */
     public double getDouble(IBUFRDataPacket packet, double defaultValue) {
         double retValue = defaultValue;
-        if(packet != null) {
+        if (packet != null) {
             Object o = packet.getValue();
-            if(o instanceof Double) {
+            if (o instanceof Double) {
                 retValue = ((Double) o).doubleValue();
-            } else if(o instanceof Long) {
+            } else if (o instanceof Long) {
                 retValue = ((Long) o).doubleValue();
-            } 
+            }
         }
         return retValue;
     }
@@ -185,25 +190,26 @@ public abstract class BUFRPointDataAdapter<T extends PluginDataObject> {
      */
     public int getInt(IBUFRDataPacket packet, int defaultValue) {
         int retValue = defaultValue;
-        if(packet != null) {
+        if (packet != null) {
             Object o = packet.getValue();
-            if(o instanceof Double) {
+            if (o instanceof Double) {
                 retValue = ((Double) o).intValue();
-            } else if(o instanceof Long) {
+            } else if (o instanceof Long) {
                 retValue = ((Long) o).intValue();
-            } 
+            }
         }
         return retValue;
     }
-    
+
     /**
      * 
      * @param parmName
      * @param view
      * @param packet
      */
-    public void setViewData(String parmName, PointDataView view, IBUFRDataPacket packet) {
-        setViewData(parmName,view,packet, 0);
+    public void setViewData(String parmName, PointDataView view,
+            IBUFRDataPacket packet) {
+        setViewData(parmName, view, packet, 0);
     }
 
     /**
@@ -211,37 +217,39 @@ public abstract class BUFRPointDataAdapter<T extends PluginDataObject> {
      * @param view
      * @param packet
      */
-    public void setViewData(String parmName, PointDataView view, IBUFRDataPacket packet, int index) {
-        if(packet != null) {
+    public void setViewData(String parmName, PointDataView view,
+            IBUFRDataPacket packet, int index) {
+        if (packet != null) {
             Type t = view.getType(parmName);
             Object o = packet.getValue();
-            if(o != null) {
+            if (o != null) {
                 switch (t) {
                 case STRING:
-                    if(o instanceof String) {
-                        view.setString(parmName,(String) o, index);
-                    } 
+                    if (o instanceof String) {
+                        view.setString(parmName, (String) o, index);
+                    }
                     break;
                 case INT:
-                    if(o instanceof Double) {
-                        view.setInt(parmName,((Double) o).intValue(), index);
-                    } else if(o instanceof Long) {
-                        view.setInt(parmName,((Long) o).intValue(), index);
-                    } 
+                    if (o instanceof Double) {
+                        view.setInt(parmName, ((Double) o).intValue(), index);
+                    } else if (o instanceof Long) {
+                        view.setInt(parmName, ((Long) o).intValue(), index);
+                    }
                     break;
                 case LONG:
-                    if(o instanceof Double) {
-                        view.setLong(parmName,((Double) o).longValue(), index);
-                    } else if(o instanceof Long) {
-                        view.setLong(parmName,(Long) o, index);
-                    } 
+                    if (o instanceof Double) {
+                        view.setLong(parmName, ((Double) o).longValue(), index);
+                    } else if (o instanceof Long) {
+                        view.setLong(parmName, (Long) o, index);
+                    }
                     break;
                 case FLOAT:
-                    if(o instanceof Double) {
-                        view.setFloat(parmName,((Double) o).floatValue(), index);
-                    } else if(o instanceof Long) {
-                        view.setFloat(parmName,((Long) o).floatValue(), index);
-                    } 
+                    if (o instanceof Double) {
+                        view.setFloat(parmName, ((Double) o).floatValue(),
+                                index);
+                    } else if (o instanceof Long) {
+                        view.setFloat(parmName, ((Long) o).floatValue(), index);
+                    }
                     break;
                 default:
                     logger.warn("Unsupported point data view type: " + t);
diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/ExecuteEngine.java b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/ExecuteEngine.java
index 4853dbfd81..0f52ed9035 100644
--- a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/ExecuteEngine.java
+++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/ExecuteEngine.java
@@ -22,7 +22,7 @@ package com.raytheon.uf.edex.bufrtools;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 import com.raytheon.uf.edex.bufrtools.descriptors.BUFRDescriptor;
 import com.raytheon.uf.edex.bufrtools.descriptors.BUFRTableB;
@@ -37,13 +37,14 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
+ * Date         Ticket#     Engineer    Description
  * --------     ----------  ----------- ---------------
  * 20071127     382         jkorman     Initial coding
  * 07/2009      55          T. Lee      Added number of bits to skip
  *                                      for Table C
  * 04/21/2010   208         F. J. Yen   Added compressedBit for Associated Field handling
- * 9/16/2014    #3628      mapeters    Moved from uf.edex.decodertools plugin.
+ * 9/16/2014    #3628       mapeters    Moved from uf.edex.decodertools plugin.
+ * 12/14/2015   5166        kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -64,17 +65,17 @@ public abstract class ExecuteEngine {
     protected int readOverChar = -1;
 
     protected int readOverBits = -1;
-    
+
     private int dataBitOverride = 0;
-    
+
     private int dataScaleOverride = 0;
-    
+
     // changes made by NCEP/NCO/SIB for Tamdar
     private int skipBits = 0;
-    
+
     // changes made by NCEP for compressed data (bufrsgwh)
     private int compressedBit = 0;
-    
+
     protected BUFRSection3 section3;
 
     // Index the current descriptor to execute.
@@ -111,9 +112,11 @@ public abstract class ExecuteEngine {
         ExecuteEngine engineImpl = null;
 
         if (section.isCompressed()) {
-            engineImpl = new CompressedExecuteEngine(section.getDescriptorList(), section.getNumSubSets());
+            engineImpl = new CompressedExecuteEngine(
+                    section.getDescriptorList(), section.getNumSubSets());
         } else {
-            engineImpl = new NonCompressedExecuteEngine(section.getDescriptorList(), section.getNumSubSets());
+            engineImpl = new NonCompressedExecuteEngine(
+                    section.getDescriptorList(), section.getNumSubSets());
         }
         engineImpl.documentRoot = true;
         engineImpl.descriptors = section.getDescriptorList();
@@ -147,35 +150,35 @@ public abstract class ExecuteEngine {
     /**
      * @return the number of skipped bits
      */
-    public int getSkipBits () {
+    public int getSkipBits() {
         return skipBits;
     }
 
     // NCEP changes
     /**
      * @param skipBits
-     *                  number of skipped bits to set
+     *            number of skipped bits to set
      */
-    public void setSkipBits ( int skipBits ) {
+    public void setSkipBits(int skipBits) {
         this.skipBits = skipBits;
-    }  
-    
+    }
+
     // Changes made by NCEP/NCO/SIB for Compressed data
     /**
      * @return value of compressed bit
      */
-    public int getCompressedBit () {
+    public int getCompressedBit() {
         return compressedBit;
     }
-   
+
     // NCEP/NCO/SIB changes added for compressed data
     /**
-    * @param compressedBit
-    *                  value of compressed bit
-    */
-    public void setCompressedBit ( int compressedBit ) {
+     * @param compressedBit
+     *            value of compressed bit
+     */
+    public void setCompressedBit(int compressedBit) {
         this.compressedBit = compressedBit;
-    }  
+    }
 
     /**
      * @return the descriptors
@@ -234,7 +237,8 @@ public abstract class ExecuteEngine {
     }
 
     /**
-     * @param dataBitOverride the dataBitOverride to set
+     * @param dataBitOverride
+     *            the dataBitOverride to set
      */
     public void setDataBitOverride(int dataBitOverride) {
         this.dataBitOverride = dataBitOverride;
@@ -248,46 +252,48 @@ public abstract class ExecuteEngine {
     }
 
     /**
-     * @param dataScaleOverride the dataScaleOverride to set
+     * @param dataScaleOverride
+     *            the dataScaleOverride to set
      */
     public void setDataScaleOverride(int dataScaleOverride) {
         this.dataScaleOverride = dataScaleOverride;
     }
-    
+
     /**
      * 
      * @param descriptor
      * @param indent
      */
     @SuppressWarnings("unchecked")
-    private static void displayDescriptor(IBUFRDataPacket packet, String indent, Log logger) {
-        
-        if(packet instanceof BUFRSublistPacket) {
+    private static void displayDescriptor(IBUFRDataPacket packet,
+            String indent, Logger logger) {
+
+        if (packet instanceof BUFRSublistPacket) {
             BUFRSublistPacket p = (BUFRSublistPacket) packet;
             List<IBUFRDataPacket> dList = (List<IBUFRDataPacket>) p.getValue();
             StringBuilder sb = new StringBuilder();
-            for(int i = 0;i < dList.size();i++) {
-                sb.append(String.format("%30s",dList.get(i)));
+            for (int i = 0; i < dList.size(); i++) {
+                sb.append(String.format("%30s", dList.get(i)));
                 sb.append("   ");
                 BUFRDescriptor d = dList.get(i).getReferencingDescriptor();
-                if(d instanceof BUFRTableB) {
+                if (d instanceof BUFRTableB) {
                     BUFRTableB b = (BUFRTableB) d;
                     sb.append(b.getComments());
                 }
-                logger.debug(sb);
+                logger.debug(sb.toString());
             }
         }
 
-    
     }
 
     /**
      * 
      */
-    public static void display(List<IBUFRDataPacket> list, String indent, Log logger) {
+    public static void display(List<IBUFRDataPacket> list, String indent,
+            Logger logger) {
         for (IBUFRDataPacket p : list) {
             displayDescriptor(p, indent, logger);
         }
     }
-    
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/descriptors/DescriptorFactory.java b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/descriptors/DescriptorFactory.java
index fc57d0769b..738eb52587 100644
--- a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/descriptors/DescriptorFactory.java
+++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/descriptors/DescriptorFactory.java
@@ -29,8 +29,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * <pre>
@@ -42,6 +42,7 @@ import org.apache.commons.logging.LogFactory;
  * 20071127            382 jkorman     Initial Coding.
  * 20080214            862 jkorman     BUFRMOS implementation changes.
  * 9/16/2014    #3628      mapeters    Moved from uf.edex.decodertools plugin.
+ * 12/14/2015   5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -49,7 +50,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class DescriptorFactory {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private static Pattern DESC_PATTERN = Pattern
             .compile("[0-3] \\d{2} \\d{3}");
@@ -173,7 +174,8 @@ public class DescriptorFactory {
         }
         readTableD(resourceClassReference, DEFAULT_TABLE_D, false);
         if (tableD != null) {
-            readTableD(resourceClassReference, "/res/bufrtables/" + tableD, true);
+            readTableD(resourceClassReference, "/res/bufrtables/" + tableD,
+                    true);
         }
     }
 
@@ -182,7 +184,8 @@ public class DescriptorFactory {
      * @param resourceClassReference
      * @param tableD
      */
-    private void readTableD(Class<?> resourceClassReference, String tableD, boolean allowOverwrites) {
+    private void readTableD(Class<?> resourceClassReference, String tableD,
+            boolean allowOverwrites) {
         InputStream strm = null;
         BufferedReader bf = null;
 
@@ -199,13 +202,17 @@ public class DescriptorFactory {
                         switch (line.charAt(0)) {
 
                         case ' ': {
-                            if(tableDInstance != null) {
+                            if (tableDInstance != null) {
                                 BUFRDescriptor desc = getDescriptor(line);
                                 if (desc != null) {
-                                    if(tableDInstance.isDefined()) {
-                                        logger.debug("Attempting to add [" + line + "] to a defined descriptor");
+                                    if (tableDInstance.isDefined()) {
+                                        logger.debug("Attempting to add ["
+                                                + line
+                                                + "] to a defined descriptor");
                                     } else {
-                                        logger.debug("Adding [" + desc + "] to [" + tableDInstance + "]");
+                                        logger.debug("Adding [" + desc
+                                                + "] to [" + tableDInstance
+                                                + "]");
                                         tableDInstance.addDescriptor(desc);
                                     }
                                 }
@@ -213,24 +220,25 @@ public class DescriptorFactory {
                             break;
                         }
                         case '3': {
-                            if(tableDInstance != null) {
+                            if (tableDInstance != null) {
                                 // we were defining an entry
                                 tableDInstance.setDefined(true);
                             }
                             tableDInstance = null;
-                            
+
                             Matcher m = DESC_PATTERN.matcher(line);
                             if (m.find()) {
-                                String s = line.substring(m.start(),
-                                        m.end()).trim();
+                                String s = line.substring(m.start(), m.end())
+                                        .trim();
                                 tableDInstance = getDescriptor(s);
-                                if(tableDInstance.isDefined() && allowOverwrites) {
-                                    tableDInstance.setSubList(new ArrayList<BUFRDescriptor>());
+                                if (tableDInstance.isDefined()
+                                        && allowOverwrites) {
+                                    tableDInstance
+                                            .setSubList(new ArrayList<BUFRDescriptor>());
                                 }
                             } else {
-                                logger
-                                        .debug("Could not create descriptor for ["
-                                                + line + "]");
+                                logger.debug("Could not create descriptor for ["
+                                        + line + "]");
                             }
                             break;
                         }
@@ -388,13 +396,13 @@ public class DescriptorFactory {
     // return factoryInstance;
     // }
 
-    
     /**
      * 
      * @param descriptor
      * @param indent
      */
-    private static void displayDescriptor(BUFRDescriptor descriptor, String indent, Log logger) {
+    private static void displayDescriptor(BUFRDescriptor descriptor,
+            String indent, Logger logger) {
         if (descriptor.getSubList() != null) {
             logger.debug(descriptor.getStringDescriptor());
             logger.debug(indent + "  [");
@@ -408,7 +416,8 @@ public class DescriptorFactory {
     /**
      * 
      */
-    public static void display(List<BUFRDescriptor> list, String indent, Log logger) {
+    public static void display(List<BUFRDescriptor> list, String indent,
+            Logger logger) {
         for (BUFRDescriptor d : list) {
             displayDescriptor(d, indent, logger);
         }
diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/CompressedExecuteEngine.java b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/CompressedExecuteEngine.java
index e7a32e96c5..511218d4d8 100644
--- a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/CompressedExecuteEngine.java
+++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/CompressedExecuteEngine.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.bufrtools.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.edex.bufrtools.EngineData;
 import com.raytheon.uf.edex.bufrtools.ExecuteEngine;
@@ -53,6 +53,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
  * 07/2009              55 T. Lee      Added number of bits to skip for Table C
  * 04/2010             208 F. J. Yen   Updated arguments for execute in processTableB
  * 9/16/2014    #3628      mapeters    Moved from uf.edex.decodertools plugin, replaced static imports.
+ * 12/14/2015   5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -62,12 +63,13 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
 
 public class CompressedExecuteEngine extends ExecuteEngine {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     /**
-     * Construct an instance of a BUFR decode engine for data stored in compressed
-     * format. After construction, the processBUFR method is called to actually
-     * decode the data.
+     * Construct an instance of a BUFR decode engine for data stored in
+     * compressed format. After construction, the processBUFR method is called
+     * to actually decode the data.
+     * 
      * @param subList
      *            The list of descriptors to execute.
      * @param repCount
@@ -77,10 +79,10 @@ public class CompressedExecuteEngine extends ExecuteEngine {
         super(subList, repCount);
     }
 
-    
     /**
      * 
-     * @param bitStrm The bit input stream to read data from.
+     * @param bitStrm
+     *            The bit input stream to read data from.
      * @return The data read from the input stream.
      */
     protected EngineData processBUFR(BUFRBitInputStream bitStrm) {
@@ -92,8 +94,8 @@ public class CompressedExecuteEngine extends ExecuteEngine {
 
         // We need to visit each descriptor, repetitionCount times
         for (BUFRDescriptor descriptor : descriptors) {
-            if(logger.isDebugEnabled()) {
-                
+            if (logger.isDebugEnabled()) {
+
                 logger.debug(descriptor.getStringDescriptor());
             }
             try {
@@ -104,13 +106,13 @@ public class CompressedExecuteEngine extends ExecuteEngine {
                 } else if (descriptor instanceof BUFRTableC) {
                     processTableC(descriptor, packetData);
                     if (readOverChar > 0) {
-                        for(int i = 0;i < repetitionCount;i++) {
+                        for (int i = 0; i < repetitionCount; i++) {
                             bitStrm.read(readOverChar * 8);
                         }
                         readOverChar = -1;
                     }
                 } else if (descriptor instanceof BUFRReplicationDescriptor) {
-                    executeReplication(descriptor,packetData);
+                    executeReplication(descriptor, packetData);
                 } else if (descriptor instanceof BUFRNullDescriptor) {
                     // We can hit this if the Table B descriptor is not in
                     // the descriptor table.
@@ -119,7 +121,8 @@ public class CompressedExecuteEngine extends ExecuteEngine {
                         readOverChar = -1;
                     }
                     if (readOverBits > 0) {
-                        ((BUFRNullDescriptor) descriptor).setBitWidth(readOverBits);
+                        ((BUFRNullDescriptor) descriptor)
+                                .setBitWidth(readOverBits);
                         processUnknown(descriptor, packetData);
                         readOverBits = -1;
                     }
@@ -129,19 +132,19 @@ public class CompressedExecuteEngine extends ExecuteEngine {
                     logger.debug("Error processing " + descriptor);
                     display(packetData, "", logger);
                 }
-                //throw bde;
+                // throw bde;
                 break;
             }
 
         } // for()
-        // package all of the data into a SubListPacket
+          // package all of the data into a SubListPacket
         BUFRSublistPacket p = new BUFRSublistPacket(packetData,
                 DataPacketTypes.SubSetList.getPacketType(),
                 new BUFRSublistDescriptor(
                         BUFRSublistDescriptor.SUBSET_LIST_DESC, 0));
         data.addPacket(p);
 
-        if(documentRoot) {
+        if (documentRoot) {
             data = normalizeData(data);
         }
 
@@ -161,17 +164,19 @@ public class CompressedExecuteEngine extends ExecuteEngine {
         // This will be the compression minimum value
         // changed made by NCEP/NCO/SIB for Tamdar.
         //
-        // NCEP/NCO/SIB added boolean argument for compressed flag and repetition count
+        // NCEP/NCO/SIB added boolean argument for compressed flag and
+        // repetition count
         // (number of subsets) to method execute. (4/2010)
         IBUFRDataPacket packet = descriptor.execute(bitStream,
-                getDataScaleOverride(), getDataBitOverride(), getSkipBits(), true, repetitionCount);
+                getDataScaleOverride(), getDataBitOverride(), getSkipBits(),
+                true, repetitionCount);
 
-        if(getDataScaleOverride() != 0) {
+        if (getDataScaleOverride() != 0) {
             int scale = descriptor.getScale();
             descriptor.setScale(scale + getDataScaleOverride());
-            
+
             packet.readCompressed(repetitionCount, bitStream);
-            
+
             descriptor.setScale(scale);
         } else {
             packet.readCompressed(repetitionCount, bitStream);
@@ -182,9 +187,12 @@ public class CompressedExecuteEngine extends ExecuteEngine {
 
     /**
      * Process the occurrence of an UNKNOWN descriptor, i.e. 2_06_Y followed by
-     * a descriptor not defined in Table B. An 
-     * @param descriptor The descriptor to execute.
-     * @param packets List of data packets to receive the decoded data. 
+     * a descriptor not defined in Table B. An
+     * 
+     * @param descriptor
+     *            The descriptor to execute.
+     * @param packets
+     *            List of data packets to receive the decoded data.
      */
     private List<IBUFRDataPacket> processUnknown(BUFRDescriptor descriptor,
             List<IBUFRDataPacket> packets) {
@@ -199,8 +207,11 @@ public class CompressedExecuteEngine extends ExecuteEngine {
 
     /**
      * Process a Table C descriptor.
-     * @param descriptor The Table C descriptors to "execute".
-     * @param packets List of Data Packets that may receive the descriptor.
+     * 
+     * @param descriptor
+     *            The Table C descriptors to "execute".
+     * @param packets
+     *            List of Data Packets that may receive the descriptor.
      */
     private List<IBUFRDataPacket> processTableC(BUFRDescriptor descriptor,
             List<IBUFRDataPacket> packets) {
@@ -227,7 +238,7 @@ public class CompressedExecuteEngine extends ExecuteEngine {
             // TODO : Add change reference values.
             // Change reference values
             // changes made by NCEP/NCO/SIB: set associated fields, e.g.,
-            // quality control information.  Currently it is set to be the
+            // quality control information. Currently it is set to be the
             // bits to skip for Tamdar.
             setSkipBits(descriptor.getY());
             break;
@@ -236,7 +247,7 @@ public class CompressedExecuteEngine extends ExecuteEngine {
             // TODO : Add processing for associated fields.
             // Associated field
             // changes made by NCEP/NCO/SIB: set associated fields, e.g.,
-            // quality control information.  Currently it is set to be the
+            // quality control information. Currently it is set to be the
             // bits to skip for Tamdar.
             setSkipBits(descriptor.getY());
             break;
@@ -270,7 +281,7 @@ public class CompressedExecuteEngine extends ExecuteEngine {
      */
     private List<IBUFRDataPacket> executeReplication(BUFRDescriptor descriptor,
             List<IBUFRDataPacket> packets) {
-        
+
         List<BUFRDescriptor> subList = descriptor.getSubList();
         List<IBUFRDataPacket> sList = new ArrayList<IBUFRDataPacket>();
         for (int i = 0; i < descriptor.getY(); i++) {
@@ -283,7 +294,7 @@ public class CompressedExecuteEngine extends ExecuteEngine {
             EngineData data = engine.descriptorExecutor(bitStream);
 
             List<IBUFRDataPacket> t = data.getPacketData();
-            if(t.size() == 1) {
+            if (t.size() == 1) {
                 sList.add(t.get(0));
             }
         }
@@ -293,7 +304,6 @@ public class CompressedExecuteEngine extends ExecuteEngine {
                         BUFRSublistDescriptor.REP_SUBLIST_DESC, 0));
         packets.add(p);
 
-        
         return packets;
     }
 
@@ -316,8 +326,8 @@ public class CompressedExecuteEngine extends ExecuteEngine {
                 normalizeList((List<IBUFRDataPacket>) p.getValue(), nReceiver,
                         index);
 
-                BUFRSublistPacket packet = new BUFRSublistPacket(nReceiver, p
-                        .getUnits(), p.getReferencingDescriptor());
+                BUFRSublistPacket packet = new BUFRSublistPacket(nReceiver,
+                        p.getUnits(), p.getReferencingDescriptor());
                 receiver.add(packet);
 
             } else if (p instanceof BUFROperatorPacket) {
@@ -327,7 +337,7 @@ public class CompressedExecuteEngine extends ExecuteEngine {
             }
         } // for()
     }
-    
+
     /**
      * 
      * @param data
@@ -338,24 +348,22 @@ public class CompressedExecuteEngine extends ExecuteEngine {
         EngineData tdata = new EngineData();
 
         List<IBUFRDataPacket> sList = data.getPacketData();
-        if(sList != null) {
-            for(int i = 0;i < repetitionCount;i++) {
-                
+        if (sList != null) {
+            for (int i = 0; i < repetitionCount; i++) {
+
                 List<IBUFRDataPacket> receiver = new ArrayList<IBUFRDataPacket>();
 
-                normalizeList(sList,receiver,i);
+                normalizeList(sList, receiver, i);
 
-                if(receiver.size() == 1) {
+                if (receiver.size() == 1) {
                     tdata.addPacket(receiver.get(0));
                 } else {
                     // what does this mean?
                 }
-                
+
             } // for()
         }
         return tdata;
     }
-    
-    
-    
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/NonCompressedExecuteEngine.java b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/NonCompressedExecuteEngine.java
index 6b01adac02..52203e8ef8 100644
--- a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/NonCompressedExecuteEngine.java
+++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/NonCompressedExecuteEngine.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.bufrtools.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.edex.bufrtools.EngineData;
 import com.raytheon.uf.edex.bufrtools.ExecuteEngine;
@@ -54,6 +54,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
  * 07/2009      55          T. Lee      Added number of bits to skip for Table C
  * 04/21/2010   208         F. J. Yen   Updated arguments for execute in processTableB
  * 9/16/2014    #3628      mapeters    Moved from uf.edex.decodertools plugin, replaced static imports.
+ * 12/14/2015   5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -62,7 +63,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
  */
 public class NonCompressedExecuteEngine extends ExecuteEngine {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private int readOverChar = -1;
 
@@ -127,9 +128,9 @@ public class NonCompressedExecuteEngine extends ExecuteEngine {
                         }
                     }
                 } catch (BUFRDecoderException bde) {
-                    if(logger.isDebugEnabled()) {
+                    if (logger.isDebugEnabled()) {
                         logger.debug("Error processing " + descriptor);
-                        display(packetData,"", logger);
+                        display(packetData, "", logger);
                     }
                     throw bde;
                 }
@@ -158,7 +159,7 @@ public class NonCompressedExecuteEngine extends ExecuteEngine {
     private List<IBUFRDataPacket> processTableB(BUFRTableB descriptor,
             List<IBUFRDataPacket> packets) {
         packets.add(descriptor.execute(bitStream, getDataScaleOverride(),
-                getDataBitOverride(),getSkipBits(),false,0));
+                getDataBitOverride(), getSkipBits(), false, 0));
         return packets;
     }
 
@@ -193,7 +194,7 @@ public class NonCompressedExecuteEngine extends ExecuteEngine {
         case 4: {
             // Associated field
             // changes made by NCEP/NCO/SIB: set associated fields, e.g.,
-            // quality control information.  Currently it is set to be the 
+            // quality control information. Currently it is set to be the
             // bits to skip for Tamdar
             setSkipBits(descriptor.getY());
             break;
@@ -218,8 +219,10 @@ public class NonCompressedExecuteEngine extends ExecuteEngine {
 
     /**
      * 
-     * @param descriptor The replication descriptor to execute.
-     * @param packets Data packet list to receive data.
+     * @param descriptor
+     *            The replication descriptor to execute.
+     * @param packets
+     *            Data packet list to receive data.
      * @return
      */
     private List<IBUFRDataPacket> executeReplication(
@@ -262,7 +265,7 @@ public class NonCompressedExecuteEngine extends ExecuteEngine {
 
                     break;
                 }
-                    // Repetition sequences
+                // Repetition sequences
                 case 11:
                 case 12: {
                     // Get the delayed count.
diff --git a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
index 07571a90af..7447442c05 100644
--- a/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
@@ -105,6 +105,13 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.common.dataplugin.text.subscription"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="com.raytheon.uf.edex.decodertools"
          download-size="0"
diff --git a/edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
index 6a65172bb7..4b5fe462e6 100644
--- a/edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
@@ -168,4 +168,10 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.apache.commons.ssl"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF
index 3c357b0d15..f43bda25c0 100644
--- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.cpgsrv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Composite Product Generator (CPG) Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.cpgsrv
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.common.status;bundle-version="1.10.13",
@@ -10,8 +10,8 @@ Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.common.stats;bundle-version="1.0.0",
  com.raytheon.uf.edex.event;bundle-version="1.0.0",
  com.raytheon.uf.common.event;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.edex.cpgsrv
 Import-Package: com.raytheon.uf.common.monitor.cpg,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CPGDispatcher.java b/edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CPGDispatcher.java
index 06bb5ad754..516c0a4a14 100644
--- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CPGDispatcher.java
+++ b/edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CPGDispatcher.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.cpgsrv;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
 
@@ -38,8 +38,9 @@ import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jan 5, 2010            chammack     Initial creation
+ * Jan 5, 2010             chammack    Initial creation
  * Feb 15, 2013 1638       mschenke    Moved DataURINotificationMessage to uf.common.dataplugin
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -49,7 +50,7 @@ import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
 
 public class CPGDispatcher {
 
-    private Log log = LogFactory.getLog(CPGDispatcher.class);
+    private Logger log = LoggerFactory.getLogger(CPGDispatcher.class);
 
     private List<CompositeProductGenerator> generatorSet;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CompositeProductGenerator.java b/edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CompositeProductGenerator.java
index a96946c578..ee46e4f78c 100644
--- a/edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CompositeProductGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.cpgsrv/src/com/raytheon/uf/edex/cpgsrv/CompositeProductGenerator.java
@@ -21,8 +21,8 @@ package com.raytheon.uf.edex.cpgsrv;
 
 import java.util.concurrent.Executor;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.urifilter.IURIFilter;
 import com.raytheon.edex.urifilter.URIFilter;
@@ -58,14 +58,15 @@ import com.raytheon.uf.edex.database.plugin.PluginDao;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 02/07/2009   1981       dhladky    Initial Creation.
- * 30NOV2012    1372       dhladky    Added statistics.
- * 02/05/2013   1580       mpduff     EventBus refactor.
- * 02/12/2013   1615       bgonzale   Changed ProcessEvent pluginName to dataType.
+ * 02/07/2009   1981       dhladky     Initial Creation.
+ * 30NOV2012    1372       dhladky     Added statistics.
+ * 02/05/2013   1580       mpduff      EventBus refactor.
+ * 02/12/2013   1615       bgonzale    Changed ProcessEvent pluginName to dataType.
  * Feb 15, 2013 1638       mschenke    Moved DataURINotificationMessage to uf.common.dataplugin
  * Apr 17, 2014 2726       rjpeter     Updated to send alerts directly to notification route.
  * Aug 26, 2014 3503       bclement    moved initialization to context state processor pre-start method
  * Sep.09, 2015 4756       dhladky     Check for possible null filters indicating bad configurations.
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author dhladky
@@ -104,7 +105,7 @@ public abstract class CompositeProductGenerator implements
     public DataTime productTime = null;
 
     /** The logger */
-    public final Log logger = LogFactory.getLog(getClass());
+    public final Logger logger = LoggerFactory.getLogger(getClass());
 
     /** monitor config **/
     public MonitorStateConfigurationManager msc = null;
@@ -116,7 +117,7 @@ public abstract class CompositeProductGenerator implements
 
     /** Allowed interval between filter config errors **/
     protected static final long ERROR_COUNT_INTERVAL_TIME = TimeUtil.MILLIS_PER_MINUTE * 2;
-    
+
     /** Keeps track of last config error message time */
     protected long last_error_time = 0l;
 
@@ -222,7 +223,8 @@ public abstract class CompositeProductGenerator implements
                         }
                     } else {
                         long time = System.currentTimeMillis();
-                        if (((time - last_error_time) > ERROR_COUNT_INTERVAL_TIME) || last_error_time == 0l) {
+                        if (((time - last_error_time) > ERROR_COUNT_INTERVAL_TIME)
+                                || last_error_time == 0l) {
                             last_error_time = time;
                             logger.error(getGeneratorName()
                                     + ": Filter for this generator is null, check configuration!");
diff --git a/edexOsgi/com.raytheon.uf.edex.dat.utils/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.dat.utils/META-INF/MANIFEST.MF
index d74ea2f075..34ef9fae57 100644
--- a/edexOsgi/com.raytheon.uf.edex.dat.utils/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.dat.utils/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Import-Package: com.raytheon.uf.common.dataplugin.grid,
  com.raytheon.uf.common.localization,
  com.raytheon.uf.common.monitor.xml,
  com.raytheon.uf.common.status,
- org.apache.commons.logging
+ org.slf4j
 Export-Package: com.raytheon.uf.edex.dat.utils
 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.2",
  com.raytheon.uf.common.monitor;bundle-version="1.12.2",
diff --git a/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/DATUtils.java b/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/DATUtils.java
index 26caaa4a6f..e425cb3122 100644
--- a/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/DATUtils.java
+++ b/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/DATUtils.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.uf.edex.dat.utils;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.PluginException;
@@ -47,6 +47,7 @@ import com.raytheon.uf.edex.database.plugin.PluginFactory;
  * 06/22/09      2152       D. Hladky   Initial release
  * Apr 24, 2014  2060       njensen     Updates for removal of grid dataURI column
  * 09 Feb 2015   3077       dhladky     Updated cache logic
+ * 11 Dec 2015   5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -56,7 +57,8 @@ import com.raytheon.uf.edex.database.plugin.PluginFactory;
 
 public class DATUtils {
 
-    private transient final static Log logger = LogFactory.getLog("DATUtils");
+    private transient final static Logger logger = LoggerFactory
+            .getLogger("DATUtils");
 
     /**
      * Populate the PDO record
@@ -143,7 +145,7 @@ public class DATUtils {
                 // get the old record for comparison
                 GridRecord oldRec = cache.getModelData().getGridRecord(
                         param.getModelName(), param.getParameterName());
-                
+
                 if (newRec != null) {
                     if (newRec.getDataTime().getRefTime()
                             .after(oldRec.getDataTime().getRefTime())) {
@@ -163,29 +165,31 @@ public class DATUtils {
                     // new record is null, do not overwrite
                     rec = oldRec;
                 }
-            // if you get here this means that no grid exists in cache currently
+                // if you get here this means that no grid exists in cache
+                // currently
             } else {
                 // new record is good, insert it
                 if (newRec != null) {
                     // fully populate new record
                     populateGridRecord(newRec);
                     // insert new record
-                    cache.getModelData().setGridRecord(
-                            param.getModelName(), param.getParameterName(),
-                            newRec);
+                    cache.getModelData().setGridRecord(param.getModelName(),
+                            param.getParameterName(), newRec);
                     rec = newRec;
-                // no records for this grid exist at all
+                    // no records for this grid exist at all
                 } else {
                     logger.warn("No record(s) found matching these criteria. Model:"
-                        + param.getModelName()
-                        + " Param:"
-                        + param.getParameterName() + " Interval:" + interval);
+                            + param.getModelName()
+                            + " Param:"
+                            + param.getParameterName()
+                            + " Interval:"
+                            + interval);
                 }
             }
 
         } catch (Exception e) {
-            logger.error("Error in grid retrieval: " + param.getModelName() + ": "
-                    + param.getParameterName() + " record: " + newRec, e);
+            logger.error("Error in grid retrieval: " + param.getModelName()
+                    + ": " + param.getParameterName() + " record: " + newRec, e);
         }
 
         return rec;
diff --git a/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/DatMenuUtil.java b/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/DatMenuUtil.java
index a7054c6089..7842c4b242 100755
--- a/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/DatMenuUtil.java
+++ b/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/DatMenuUtil.java
@@ -44,8 +44,8 @@ import com.raytheon.uf.common.monitor.config.FFMPRunConfigurationManager;
 import com.raytheon.uf.common.monitor.config.FFMPSourceConfigurationManager;
 import com.raytheon.uf.common.monitor.config.FFMPSourceConfigurationManager.DATA_TYPE;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
 import com.raytheon.uf.common.monitor.config.SCANRunSiteConfigurationManager;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.monitor.xml.FFMPRunXML;
 import com.raytheon.uf.common.monitor.xml.ProductRunXML;
 import com.raytheon.uf.common.monitor.xml.ProductXML;
@@ -70,6 +70,7 @@ import com.raytheon.uf.edex.menus.AbstractMenuUtil;
  * Sep 04, 2014 3220       skorolev  Updated menu creation for Fog, Safeseas and Snow monitors.
  * Sep 18, 2015 3873       skorolev  Corrected Fog, Safeseas and Snow monitor's names.
  * Oct 15, 2015 4897       bkowal    Update the base fog, snow, and safeseas menu xml.
+ * Jan 04, 2016 5115       skorolev  Replaced Mon.Name with App.Name for Fog, Safeseas and Snow monitors
  * 
  * </pre>
  * 
@@ -503,7 +504,7 @@ public class DatMenuUtil extends AbstractMenuUtil {
      */
     private void createSafeseasMenu() {
         FSSObsMonitorConfigurationManager ssConfig = FSSObsMonitorConfigurationManager
-                .getInstance(MonName.ss);
+                .getInstance(AppName.SAFESEAS);
         Set<String> ssStns = ssConfig.getStationIDs();
         StringBuilder stations = new StringBuilder();
         for (String s : ssStns) {
@@ -546,7 +547,7 @@ public class DatMenuUtil extends AbstractMenuUtil {
      */
     private void createFogMenu() {
         FSSObsMonitorConfigurationManager fogConfig = FSSObsMonitorConfigurationManager
-                .getInstance(MonName.fog);
+                .getInstance(AppName.FOG);
         Set<String> fogStns = fogConfig.getStationIDs();
         StringBuilder stations = new StringBuilder();
         for (String s : fogStns) {
@@ -569,7 +570,7 @@ public class DatMenuUtil extends AbstractMenuUtil {
      */
     private void createSnowMenu() {
         FSSObsMonitorConfigurationManager snowConfig = FSSObsMonitorConfigurationManager
-                .getInstance(MonName.snow);
+                .getInstance(AppName.SNOW);
         Set<String> snowStns = snowConfig.getStationIDs();
         StringBuilder stations = new StringBuilder();
         for (String s : snowStns) {
diff --git a/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java b/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
index ffea0c9a02..33001c8dec 100644
--- a/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
+++ b/edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
@@ -30,11 +30,11 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.TreeSet;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.geotools.geometry.DirectPosition2D;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.grid.GridConstants;
 import com.raytheon.uf.common.dataplugin.grid.GridRecord;
@@ -62,7 +62,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * 19Nov 2011              dhladky     Initial creation
  * 29 Jan 2013  15729      wkwock      fix the algorithm
  * Jan 07, 2013            njensen     Change some logs to debug
- * Apr 24, 2014  2060      njensen     Updates for removal of grid dataURI column
+ * Apr 24, 2014 2060       njensen     Updates for removal of grid dataURI column
+ * Dec 11, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -94,7 +95,7 @@ public class FreezingLevel {
     // reference time
     Calendar refTime = null;
 
-    private transient final Log logger = LogFactory.getLog(getClass());
+    private transient final Logger logger = LoggerFactory.getLogger(getClass());
 
     public FreezingLevel(String modelName) {
         this.modelName = modelName;
@@ -107,7 +108,8 @@ public class FreezingLevel {
         // only for get data for hour 00z,06z,12z, or 18z
         int adjustedHour = (refTime.get(Calendar.HOUR_OF_DAY) / 6) * 6;
         refTime.set(Calendar.HOUR_OF_DAY, adjustedHour);
-        TimeUtil.minCalendarFields(refTime, Calendar.MINUTE, Calendar.SECOND, Calendar.MILLISECOND);
+        TimeUtil.minCalendarFields(refTime, Calendar.MINUTE, Calendar.SECOND,
+                Calendar.MILLISECOND);
 
         // populates what ever is missing, sets prevalent forecast hour
         for (Entry<String, Integer> entry : getGHLevelMap().entrySet()) {
diff --git a/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF
index 7d94063f31..a18ac186b4 100644
--- a/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF
@@ -17,4 +17,4 @@ Export-Package: com.raytheon.uf.edex.decodertools.aircraft,
  com.raytheon.uf.edex.decodertools.core.filterimpl,
  com.raytheon.uf.edex.decodertools.time
 Import-Package: com.raytheon.uf.common.wmo,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/AbstractFilterElement.java b/edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/AbstractFilterElement.java
index 05d426ed76..f84e5f041c 100644
--- a/edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/AbstractFilterElement.java
+++ b/edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/AbstractFilterElement.java
@@ -31,17 +31,19 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * TODO Add Description
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 25, 2009            jkorman     Initial creation
- *
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
+ *                                     and implement toString()
+ * 
  * </pre>
- *
+ * 
  * @author jkorman
- * @version 1.0	
+ * @version 1.0
  */
 @XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
@@ -54,11 +56,12 @@ public abstract class AbstractFilterElement {
     @XmlElement
     @DynamicSerializeElement
     private String filterType;
-    
+
     /**
      * Executes this filter element against the supplied report data. The
      * supplied report is returned if it matches the filter criteria. A null
      * report reference is returned if the report fails.
+     * 
      * @param report
      * @return
      */
@@ -72,7 +75,8 @@ public abstract class AbstractFilterElement {
     }
 
     /**
-     * @param filterElementName the filterElementName to set
+     * @param filterElementName
+     *            the filterElementName to set
      */
     public void setFilterElementName(String filterElementName) {
         this.filterElementName = filterElementName;
@@ -86,10 +90,16 @@ public abstract class AbstractFilterElement {
     }
 
     /**
-     * @param filterType the filterType to set
+     * @param filterType
+     *            the filterType to set
      */
     public void setFilterType(String filterType) {
         this.filterType = filterType;
     }
 
+    @Override
+    public String toString() {
+        return "AbstractFilterElement[filterElementName=" + filterElementName
+                + ", filterType=" + filterType + "]";
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/PluginDataObjectFilter.java b/edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/PluginDataObjectFilter.java
index 0ae5d880e0..9b7d77236a 100644
--- a/edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/PluginDataObjectFilter.java
+++ b/edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/PluginDataObjectFilter.java
@@ -27,8 +27,8 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.geospatial.ISpatialEnabled;
@@ -52,11 +52,12 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * Jul 16, 2009           jkorman     Initial creation
  * Aug 30, 2013  2298     rjpeter     Make getPluginName abstract
  * Jun 11, 2014  2061     bsteffen    Remove IDecoderGettable
- * Jul 23, 2014 3410      bclement    location changed to floats
+ * Jul 23, 2014  3410     bclement    location changed to floats
  * Sep 09, 2014  3548     mapeters    Improved constructor's error messages.
  * Sep 11, 2014  3548     mapeters    Replaced use of SerializationUtil
  *                                    with JAXBManager.
  * Sep 18, 2014  3627     mapeters    Removed unused getInputStream().
+ * Dec 14, 2015  5166     kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -74,7 +75,7 @@ public class PluginDataObjectFilter extends AbstractObsFilter {
 
     public static final String FILTERS_DIR = "plugin-filters";
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private String filterConfigFile = null;
 
@@ -125,7 +126,7 @@ public class PluginDataObjectFilter extends AbstractObsFilter {
         }
         logger.info("Filter name = " + getFilterName());
         for (AbstractFilterElement element : getFilterElements()) {
-            logger.info(element);
+            logger.info("" + element);
         }
     }
 
diff --git a/edexOsgi/com.raytheon.uf.edex.menus/src/com/raytheon/uf/edex/menus/AbstractMenuUtil.java b/edexOsgi/com.raytheon.uf.edex.menus/src/com/raytheon/uf/edex/menus/AbstractMenuUtil.java
index 8629fa9bd7..693c5d1d9a 100644
--- a/edexOsgi/com.raytheon.uf.edex.menus/src/com/raytheon/uf/edex/menus/AbstractMenuUtil.java
+++ b/edexOsgi/com.raytheon.uf.edex.menus/src/com/raytheon/uf/edex/menus/AbstractMenuUtil.java
@@ -20,6 +20,7 @@
 package com.raytheon.uf.edex.menus;
 
 import java.io.File;
+import java.io.IOException;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -32,8 +33,8 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManager;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.menus.MenuSerialization;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -50,7 +51,9 @@ import com.raytheon.uf.common.status.UFStatus;
  * ------------ ---------- ----------- --------------------------
  * Nov 08, 2012            mschenke    Initial javadoc creation
  * Mar 11, 2014    2858    mpduff      javadoc updates
- * Oct 15, 2015    4897    bkowal      Made {@link #pm} protected.
+ * Oct 15, 2015    4897    bkowal      Made PathManager pm protected.
+ * Nov 12, 2015    4834    njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Feb 10, 2016    5237    tgurney     Remove calls to deprecated LocalizationFile methods
  * 
  * </pre>
  * 
@@ -118,9 +121,7 @@ public abstract class AbstractMenuUtil {
 
             marshaller.marshal(object, pm.getFile(caveConfigured, path));
             file.save();
-        } catch (JAXBException e) {
-            statusHandler.error("Unable to process the menu: " + path, e);
-        } catch (LocalizationOpFailedException e) {
+        } catch (JAXBException | LocalizationException e) {
             statusHandler.error("Unable to process the menu: " + path, e);
         }
     }
@@ -195,11 +196,11 @@ public abstract class AbstractMenuUtil {
         long writeTime = olFile.getFile().lastModified();
 
         if (writeTime < useTime) {
-            try {
+            try (SaveableOutputStream olFileStream = olFile.openOutputStream()) {
                 // Update menu creation time file
-                olFile.write(new byte[0]);
-                olFile.save();
-            } catch (LocalizationException e) {
+                olFileStream.write(new byte[0]);
+                olFileStream.save();
+            } catch (LocalizationException | IOException e) {
                 statusHandler.error("Error saving menu creation time file", e);
             }
             return false;
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/META-INF/MANIFEST.MF
index ed1414b87b..45ef84515e 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.1",
 Import-Package: com.raytheon.edex.plugin.obs.metar,
  com.raytheon.uf.common.dataplugin.obs.metar,
  com.raytheon.uf.common.wmo,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
index 5a11a12a80..6eded427cb 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-plugin.xml
@@ -4,11 +4,10 @@
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
     <bean id="metarToHMDB" class="com.raytheon.uf.edex.metartohmdb.MetarToHMDBSrv" />
-    
+
     <camelContext id="metarToHMDB-camel"
         xmlns="http://camel.apache.org/schema/spring"
         errorHandlerRef="errorHandler">
-        <endpoint id="metarToHMDBEndpoint" />
 
         <route id="metarToHMDBRoute">
             <from uri="direct-vm:metarToHMDB"/>
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-spring.xml b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-spring.xml
index 1ac707788e..7a867e7601 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-spring.xml
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/res/spring/metartohmdb-spring.xml
@@ -3,6 +3,22 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
 
+
+    <bean id="hmdbBloatMonitor" class="com.raytheon.uf.edex.database.health.DatabaseBloatMonitor">
+        <constructor-arg>
+            <bean class="com.raytheon.uf.edex.database.health.PostgresBloatDao">
+                <constructor-arg value="hmdb"/>
+            </bean>
+        </constructor-arg>
+        <constructor-arg ref="warningThresholds"/>
+        <constructor-arg ref="criticalThresholds"/>
+    </bean>
+
+    <bean factory-bean="dbMonitorRegistry" factory-method="registerMonitor">
+        <constructor-arg value="hmdbBloatMonitor" />
+        <constructor-arg ref="hmdbBloatMonitor" />
+    </bean>
+
     <bean id="metarToHMDBPurger" class="com.raytheon.uf.edex.metartohmdb.HMDBPurger">
         <property name="purgeHours" value="48" />
     </bean>
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/HMDBPurger.java b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/HMDBPurger.java
index 003ed7f0e1..65d04bfd57 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/HMDBPurger.java
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/HMDBPurger.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.uf.edex.metartohmdb;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.edex.metartohmdb.dao.HMDBRptDao;
 
@@ -28,22 +28,23 @@ import com.raytheon.uf.edex.metartohmdb.dao.HMDBRptDao;
  * Created to extract purge method from MetarToHMDBSrv.
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 17, 2009            jkorman     Initial creation
- *
+ * Dec 11, 2015 5166       kbisanz     Update logging to use SLF4J
+ * 
  * </pre>
- *
+ * 
  * @author jkorman
- * @version 1.0	
+ * @version 1.0
  */
 
 public class HMDBPurger {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private HMDBRptDao dao = null;
 
@@ -52,7 +53,7 @@ public class HMDBPurger {
     private boolean failSafe = false;
 
     private int purgeHours = 8;
-    
+
     /**
      * Construct an instance of this transformer.
      */
@@ -77,7 +78,7 @@ public class HMDBPurger {
             logger.info("In failsafe mode. No purge performed.");
             return;
         }
-        if(dao != null) {
+        if (dao != null) {
             dao.purgeTable(purgeHours);
         }
     }
@@ -90,11 +91,11 @@ public class HMDBPurger {
     }
 
     /**
-     * @param purgeHours the purgeHours to set
+     * @param purgeHours
+     *            the purgeHours to set
      */
     public void setPurgeHours(int purgeHours) {
         this.purgeHours = purgeHours;
     }
 
-    
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/MetarToHMDBSrv.java b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/MetarToHMDBSrv.java
index 07d3680c7d..df294fc436 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/MetarToHMDBSrv.java
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/MetarToHMDBSrv.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.uf.edex.metartohmdb;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
@@ -40,6 +40,7 @@ import com.raytheon.uf.edex.metartohmdb.dao.HMDBRptDao;
  * ------------ ---------- ----------- --------------------------
  * ????                                Initial creation
  * May 14, 2014 2536       bclement    moved WMO Header to common
+ * Dec 11, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -47,7 +48,7 @@ import com.raytheon.uf.edex.metartohmdb.dao.HMDBRptDao;
  */
 public class MetarToHMDBSrv {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private HMDBRptDao dao = null;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/dao/HMDBReport.java b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/dao/HMDBReport.java
index 623d41f50e..af2a9ff483 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/dao/HMDBReport.java
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/dao/HMDBReport.java
@@ -20,6 +20,8 @@
 package com.raytheon.uf.edex.metartohmdb.dao;
 
 import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
@@ -28,7 +30,6 @@ import javax.xml.bind.annotation.XmlAttribute;
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
-import com.raytheon.uf.common.time.util.TimeUtil;
 
 /**
  * Data record class for HMDB
@@ -41,6 +42,7 @@ import com.raytheon.uf.common.time.util.TimeUtil;
  * ------------ ---------- ----------- --------------------------
  * Jun 29, 2009            jkorman     Initial creation
  * May 14, 2014 2536       bclement    removed TimeTools usage and ISerializableObject
+ * Oct 30, 2015 5035       bclement    replaced toInsertSQL with getColumnValues
  * 
  * </pre>
  * 
@@ -52,73 +54,71 @@ import com.raytheon.uf.common.time.util.TimeUtil;
 public class HMDBReport extends PersistableDataObject<String> {
 
     private static final long serialVersionUID = 1L;
-    
-    public static final String DTFMT = "'%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS'";
 
     @DynamicSerializeElement
     @XmlAttribute
-    private String report_type;   // not null
-    
+    private String report_type; // not null
+
     @DynamicSerializeElement
     @XmlAttribute
     private Integer mode;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
-    private String icao_loc_id;   // not null
-    
+    private String icao_loc_id; // not null
+
     @DynamicSerializeElement
     @XmlAttribute
-    private String wmo_dd;        // not null
-    
+    private String wmo_dd; // not null
+
     @DynamicSerializeElement
     @XmlAttribute
     private String afos_dd;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
     private Calendar origin;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
-    private Calendar date;       // not null
-    
+    private Calendar date; // not null
+
     @DynamicSerializeElement
     @XmlAttribute
-    private Calendar nominal;    // not null
-    
+    private Calendar nominal; // not null
+
     @DynamicSerializeElement
     @XmlAttribute
     private String report;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
     private Integer prior;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
     private Double lat;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
     private Double lon;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
     private Double elev;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
     private String state;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
     private String country;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
     private String name;
-    
+
     @DynamicSerializeElement
     @XmlAttribute
     private Integer sequence_num;
@@ -126,9 +126,9 @@ public class HMDBReport extends PersistableDataObject<String> {
     @DynamicSerializeElement
     @XmlAttribute
     private Integer status;
-    
+
     public HMDBReport() {
-        
+
     }
 
     /**
@@ -139,7 +139,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param report_type the report_type to set
+     * @param report_type
+     *            the report_type to set
      */
     public void setReport_type(String report_type) {
         this.report_type = report_type;
@@ -153,7 +154,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param mode the mode to set
+     * @param mode
+     *            the mode to set
      */
     public void setMode(Integer mode) {
         this.mode = mode;
@@ -167,7 +169,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param icao_loc_id the icao_loc_id to set
+     * @param icao_loc_id
+     *            the icao_loc_id to set
      */
     public void setIcao_loc_id(String icao_loc_id) {
         this.icao_loc_id = icao_loc_id;
@@ -181,7 +184,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param wmo_dd the wmo_dd to set
+     * @param wmo_dd
+     *            the wmo_dd to set
      */
     public void setWmo_dd(String wmo_dd) {
         this.wmo_dd = wmo_dd;
@@ -195,7 +199,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param afos_dd the afos_dd to set
+     * @param afos_dd
+     *            the afos_dd to set
      */
     public void setAfos_dd(String afos_dd) {
         this.afos_dd = afos_dd;
@@ -209,7 +214,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param origin the origin to set
+     * @param origin
+     *            the origin to set
      */
     public void setOrigin(Calendar origin) {
         this.origin = origin;
@@ -223,7 +229,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param date the date to set
+     * @param date
+     *            the date to set
      */
     public void setDate(Calendar date) {
         this.date = date;
@@ -237,7 +244,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param nominal the nominal to set
+     * @param nominal
+     *            the nominal to set
      */
     public void setNominal(Calendar nominal) {
         this.nominal = nominal;
@@ -251,12 +259,13 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param report the report to set
+     * @param report
+     *            the report to set
      */
     public void setReport(String report) {
-        if(report != null) {
-            if(report.length() > 255) {
-                report = report.substring(0,255);
+        if (report != null) {
+            if (report.length() > 255) {
+                report = report.substring(0, 255);
             }
         }
         this.report = report;
@@ -270,7 +279,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param prior the prior to set
+     * @param prior
+     *            the prior to set
      */
     public void setPrior(Integer prior) {
         this.prior = prior;
@@ -284,7 +294,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param lat the lat to set
+     * @param lat
+     *            the lat to set
      */
     public void setLat(Double lat) {
         this.lat = lat;
@@ -298,7 +309,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param lon the lon to set
+     * @param lon
+     *            the lon to set
      */
     public void setLon(Double lon) {
         this.lon = lon;
@@ -312,7 +324,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param elev the elev to set
+     * @param elev
+     *            the elev to set
      */
     public void setElev(Double elev) {
         this.elev = elev;
@@ -326,7 +339,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param state the state to set
+     * @param state
+     *            the state to set
      */
     public void setState(String state) {
         this.state = state;
@@ -340,7 +354,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param country the country to set
+     * @param country
+     *            the country to set
      */
     public void setCountry(String country) {
         this.country = country;
@@ -354,7 +369,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param name the name to set
+     * @param name
+     *            the name to set
      */
     public void setName(String name) {
         this.name = name;
@@ -368,7 +384,8 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param sequence_num the sequence_num to set
+     * @param sequence_num
+     *            the sequence_num to set
      */
     public void setSequence_num(Integer sequence_num) {
         this.sequence_num = sequence_num;
@@ -382,156 +399,92 @@ public class HMDBReport extends PersistableDataObject<String> {
     }
 
     /**
-     * @param status the status to set
+     * @param status
+     *            the status to set
      */
     public void setStatus(Integer status) {
         this.status = status;
     }
-    
-    /**
-     * 
-     * @return
-     */
-    public String toInsertSQL() {
-
-        
-        String retValue = null;
-        
-        StringBuilder sb = new StringBuilder("insert into rpt values(");
-        if(report_type != null) {
-            sb.append("'");
-            sb.append(report_type);
-            sb.append("',0");
-        } else {
-            return retValue;
-        }
-        if(icao_loc_id != null) { // not null
-            sb.append(",'");
-            sb.append(icao_loc_id);
-            sb.append("'");
-        } else {
-            return retValue;
-        }
-        if(wmo_dd != null) { // not null
-            sb.append(",'");
-            sb.append(wmo_dd);
-            sb.append("'");
-        } else {
-            return retValue;
-        }
-        if(afos_dd != null) {
-            sb.append(",'");
-            sb.append(afos_dd);
-            sb.append("'");
-        } else {
-            sb.append(",''");
-        }
-        if(origin != null) {
-            sb.append(",");
-            sb.append(String.format(DTFMT, date));
-        } else {
-            sb.append(",");
-        }
-        if(date != null) { // not null
-            sb.append(",");
-            sb.append(String.format(DTFMT, date));
-        } else {
-            return retValue;
-        }
-        if(nominal != null) { // not null
-            sb.append(",");
-            sb.append(String.format(DTFMT, date));
-        } else {
-            return retValue;
-        }
-        if(report != null) { // not null
-            sb.append(",'");
-            sb.append(report);
-            sb.append("',0");
-        } else {
-            sb.append(",,0");
-        }
-
-        if(lat != null) {
-            sb.append(String.format(",%f",lat));
-        } else {
-            sb.append(",");
-        }
-        if(lon != null) {
-            sb.append(String.format(",%f",lon));
-        } else {
-            sb.append(",");
-        }
-        if(elev != null) {
-            sb.append(String.format(",%f",elev));
-        } else {
-            sb.append(",0");
-        }
-        if(state != null) {
-            sb.append(String.format(",'%s'",state));
-        } else {
-            sb.append(",''");
-        }
-        if(country != null) {
-            sb.append(String.format(",'%s'",country));
-        } else {
-            sb.append(",''");
-        }
-        if(name != null) {
-            sb.append(String.format(",'%s'",name));
-        } else {
-            sb.append(",''");
-        }
-        if(sequence_num != null) {
-            sb.append(String.format(",%d",sequence_num));
-        } else {
-            sb.append(",0");
-        }
-        if(status != null) {
-            sb.append(String.format(",%d",status));
-        } else {
-            sb.append(",0");
-        }
-        sb.append(");");
-        return sb.toString();
-    }
 
     /**
-     * Use to test the toInsertSQL method.
-     * @param args
+     * @return a mapping of report column names to their values
      */
-    public static final void main(String [] args) {
-        
-        HMDBReport rpt = new HMDBReport();
-        rpt.setDate(TimeUtil.newGmtCalendar(2009, 06, 30));
-        rpt.date.set(Calendar.HOUR_OF_DAY, 14);
-        rpt.date.set(Calendar.MINUTE, 56);
-        
-        rpt.setOrigin(TimeUtil.newGmtCalendar(2009, 06, 30));
-        rpt.origin.set(Calendar.HOUR_OF_DAY, 14);
-        rpt.date.set(Calendar.MINUTE, 54);
+    public Map<String, Object> getColumnValues() {
+        Map<String, Object> rval = new HashMap<>();
 
-        rpt.setNominal(TimeUtil.newGmtCalendar(2009, 06, 30));
-        rpt.nominal.set(Calendar.HOUR_OF_DAY, 15);
-        rpt.nominal.set(Calendar.MINUTE,0);
-        rpt.nominal.set(Calendar.SECOND,0);
-        
-        rpt.setReport_type("METAR");
-        rpt.setIcao_loc_id("KOMA");
-        rpt.setWmo_dd("SAUS70");
-        
-        rpt.setLat(45.123);
-        rpt.setLon(-95.321);
-        rpt.setElev(391d);
-
-        //rpt.setCountry("US");
-        //rpt.setState("NE");
-        //rpt.setName("OMAHA");
-        
-        rpt.setReport("METAR KOFF 301454 xxxxxxxxxx");
-        
-        System.out.println(rpt.toInsertSQL());
-        
+        if (report_type != null) {
+            rval.put("report_type", report_type);
+        }
+        if (mode != null) {
+            rval.put("mode", mode);
+        }else {
+            rval.put("mode", 0);
+        }
+        if (icao_loc_id != null) {
+            rval.put("icao_loc_id", icao_loc_id);
+        }
+        if (wmo_dd != null) {
+            rval.put("wmo_dd", wmo_dd);
+        }
+        if (afos_dd != null) {
+            rval.put("afos_dd", afos_dd);
+        } else {
+            rval.put("afos_dd", "");
+        }
+        if (origin != null) {
+            rval.put("origin", origin);
+        }
+        if (date != null) {
+            rval.put("date", date);
+        }
+        if (nominal != null) {
+            rval.put("nominal", nominal);
+        }
+        if (report != null) {
+            rval.put("report", report);
+        }
+        if (prior != null) {
+            rval.put("prior", prior);
+        } else {
+            rval.put("prior", 0);
+        }
+        if (lat != null) {
+            rval.put("lat", lat);
+        }
+        if (lon != null) {
+            rval.put("lon", lon);
+        }
+        if (elev != null) {
+            rval.put("elev", elev);
+        } else {
+            rval.put("elev", 0.0);
+        }
+        if (state != null) {
+            rval.put("state", state);
+        } else {
+            rval.put("state", "");
+        }
+        if (country != null) {
+            rval.put("country", country);
+        } else {
+            rval.put("country", "");
+        }
+        if (name != null) {
+            rval.put("name", name);
+        } else {
+            rval.put("name", "");
+        }
+        if (sequence_num != null) {
+            rval.put("sequence_num", sequence_num);
+        } else {
+            rval.put("sequence_num", 0);
+        }
+        if (status != null) {
+            rval.put("status", status);
+        } else {
+            rval.put("status", 0);
+        }
+        return rval;
     }
-    
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/dao/HMDBRptDao.java b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/dao/HMDBRptDao.java
index f5fe87e703..909e9d2242 100644
--- a/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/dao/HMDBRptDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.metartohmdbsrv/src/com/raytheon/uf/edex/metartohmdb/dao/HMDBRptDao.java
@@ -20,12 +20,16 @@
 package com.raytheon.uf.edex.metartohmdb.dao;
 
 import java.util.Calendar;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
 
 import org.hibernate.Query;
 import org.hibernate.Session;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;
 
+import com.raytheon.uf.common.status.UFStatus.Priority;
 import com.raytheon.uf.common.time.util.TimeUtil;
 import com.raytheon.uf.edex.database.dao.CoreDao;
 import com.raytheon.uf.edex.database.dao.DaoConfig;
@@ -43,6 +47,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
  * Jun 29, 2009            jkorman     Initial creation
  * Sep 18, 2014 #3627      mapeters    Updated deprecated {@link TimeTools} usage.
  * Jun 18, 2015 4500       rjpeter     Fix SQL Injection concern.
+ * Oct 30, 2015 5035       bclement    added getInsertStatement
  * </pre>
  * 
  * @author jkorman
@@ -50,6 +55,8 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
  */
 public class HMDBRptDao extends CoreDao {
 
+    public static final String REPORT_TABLE_NAME = "rpt";
+
     private static final Object LOCK = new Object();
 
     public HMDBRptDao() {
@@ -64,17 +71,55 @@ public class HMDBRptDao extends CoreDao {
     public boolean storeToTable(HMDBReport report) {
         boolean status = true;
         synchronized (LOCK) {
-            logger.debug("SQL = " + report.toInsertSQL());
+            Map<String, Object> parameters = report.getColumnValues();
+            String sql = getInsertStatement(REPORT_TABLE_NAME,
+                    parameters.keySet());
+            if (logger.isPriorityEnabled(Priority.DEBUG)) {
+                /* avoid formatting parameters if not in debug */
+                logger.debug("SQL = " + sql + " PARAMETERS = " + parameters);
+            }
             try {
-                status = (executeSQLUpdate(report.toInsertSQL()) == 1);
+                status = (executeSQLUpdate(sql, parameters) == 1);
             } catch (Exception e) {
-                logger.error("Insert query = " + report.toInsertSQL());
+                logger.error("SQL = " + sql + " PARAMETERS = " + parameters);
                 logger.error("Error writing to rpt table", e);
             }
         }
         return status;
     }
 
+    /**
+     * Create a parameterized insert statement that can be passed to
+     * {@link CoreDao#executeSQLUpdate(String, Map)}
+     * 
+     * @param table
+     * @param columns
+     * @return
+     */
+    private static String getInsertStatement(String table,
+            Collection<String> columns) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("INSERT INTO ").append(table);
+        sb.append(" (");
+        if (!columns.isEmpty()) {
+            Iterator<String> iter = columns.iterator();
+            sb.append(iter.next());
+            while (iter.hasNext()) {
+                sb.append(',').append(iter.next());
+            }
+        }
+        sb.append(") VALUES (");
+        if (!columns.isEmpty()) {
+            Iterator<String> iter = columns.iterator();
+            sb.append(':').append(iter.next());
+            while (iter.hasNext()) {
+                sb.append(",:").append(iter.next());
+            }
+        }
+        sb.append(");");
+        return sb.toString();
+    }
+
     /**
      * 
      * @return
diff --git a/edexOsgi/com.raytheon.uf.edex.netcdf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.netcdf/META-INF/MANIFEST.MF
index b0c19c5a65..955e401863 100644
--- a/edexOsgi/com.raytheon.uf.edex.netcdf/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.netcdf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Netcdf
 Bundle-SymbolicName: com.raytheon.uf.edex.netcdf
-Bundle-Version: 1.15.0.qualifier
+Bundle-Version: 1.15.1.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: ucar.nc2;bundle-version="4.2.0",
diff --git a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/AbstractFieldDescription.java b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/AbstractFieldDescription.java
index caadd02e6b..3e4dab6739 100644
--- a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/AbstractFieldDescription.java
+++ b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/AbstractFieldDescription.java
@@ -30,19 +30,21 @@ import com.raytheon.uf.edex.netcdf.description.exception.InvalidDescriptionExcep
 
 /**
  * Base class for field descriptions.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Aug 26, 2015 4699       nabowle     Initial creation
- * Sep 09, 2015 4696       nabowle     Add retrieval at different indices and
- *                                     getLength().
- *
+ * 
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- --------------------------------------------
+ * Aug 26, 2015  4699     nabowle   Initial creation
+ * Sep 09, 2015  4696     nabowle   Add retrieval at different indices and
+ *                                  getLength().
+ * Dec 08, 2015  5059     nabowle   Add isNumeric() and isPresent().
+ * Jan 25, 2016  5208     bsteffen  Add validation.
+ * 
  * </pre>
- *
+ * 
  * @author nabowle
  * @version 1.0
  */
@@ -95,4 +97,32 @@ public abstract class AbstractFieldDescription {
      */
     public abstract long getLength(NetcdfFile file);
 
+    /**
+     * Indicates if the described field is numeric.
+     * 
+     * @throws InvalidDescriptionException
+     *             if this description is incorrectly configured, or if
+     *             isPresent() would return false
+     */
+    public abstract boolean isNumeric(NetcdfFile file)
+            throws InvalidDescriptionException;
+
+    /**
+     * Indicates if the described field is present in the file. This should
+     * indicate if at least one of the getString or getNumber methods will
+     * return a value.
+     *
+     * @throws InvalidDescriptionException
+     *             if this description is incorrectly configured.
+     */
+    public abstract boolean isPresent(NetcdfFile file)
+            throws InvalidDescriptionException;
+
+    public void validate() throws InvalidDescriptionException {
+        if (name == null) {
+            throw new InvalidDescriptionException(
+                    "The name attribute is not present.");
+        }
+    }
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/AttributeDescription.java b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/AttributeDescription.java
index 624611519e..837b97de1c 100644
--- a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/AttributeDescription.java
+++ b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/AttributeDescription.java
@@ -28,26 +28,27 @@ import ucar.nc2.NetcdfFile;
 import com.raytheon.uf.edex.netcdf.description.exception.InvalidDescriptionException;
 
 /**
- *
+ * 
  * An attribute value is loaded from XML and then combined with a
  * {@link NetcdfFile} to extract a desired value. Normally the XML specifies an
  * attribute to read from the netCDF file but in some cases the netcdf file does
  * not have enough information so values can be directly in the xml.
- *
- *
+ * 
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date          Ticket#  Engineer  Description
  * ------------- -------- --------- --------------------------
  * Aug 11, 2015  4709     bsteffen  Initial creation
  * Aug 25, 2015  4699     nabowle   Extracted from Pointset netcdf plugin,
  *                                  renamed, and refactored.
  * Sep 09, 2015  4696     nabowle   Override new methods.
- *
+ * Dec 08, 2015  5059     nabowle   Add isNumeric() and isPresent().
+ * 
  * </pre>
- *
+ * 
  * @author bsteffen
  */
 @XmlAccessorType(XmlAccessType.NONE)
@@ -123,4 +124,27 @@ public class AttributeDescription extends AbstractFieldDescription {
         }
         return 0;
     }
+
+    @Override
+    public boolean isNumeric(NetcdfFile file)
+            throws InvalidDescriptionException {
+        if (this.name == null) {
+            throw new InvalidDescriptionException("name is null");
+        }
+        Attribute attr = file.findGlobalAttribute(this.name);
+        if (attr == null) {
+            throw new InvalidDescriptionException(
+                    "Coudld not find a global attribute for " + this.name);
+        }
+        return attr.getDataType().isNumeric();
+    }
+
+    @Override
+    public boolean isPresent(NetcdfFile file)
+            throws InvalidDescriptionException {
+        if (name == null) {
+            throw new InvalidDescriptionException("name is null");
+        }
+        return file.findGlobalAttribute(this.name) != null;
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/LevelDescription.java b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/LevelDescription.java
index 0941f1f63d..633139452e 100644
--- a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/LevelDescription.java
+++ b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/LevelDescription.java
@@ -31,22 +31,23 @@ import com.raytheon.uf.common.dataplugin.level.LevelFactory;
 import com.raytheon.uf.edex.netcdf.description.exception.InvalidDescriptionException;
 
 /**
- *
+ * 
  * Contains the information necessary to extract a {@link Level} from the global
  * attributes of a {@link NetcdfFile}.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- --------------------------------------------
  * Aug 11, 2015  4709     bsteffen  Initial creation
  * Aug 25, 2015  4699     nabowle   Extracted from Pointset netcdf plugin and
  *                                  refactored.
- *
+ * Jan 25, 2016  5208     bsteffen  Add validation.
+ * 
  * </pre>
- *
+ * 
  * @author bsteffen
  */
 @XmlAccessorType(XmlAccessType.NONE)
@@ -140,4 +141,27 @@ public class LevelDescription {
         return factory.getLevel(masterLevel, levelOneValue.doubleValue(),
                 levelTwoValue.doubleValue());
     }
+
+    public void validate() throws InvalidDescriptionException {
+        if (masterLevel == null) {
+            throw new InvalidDescriptionException(
+                    "A maseter level element is not present.");
+        }
+        if (levelOneValue == null) {
+            throw new InvalidDescriptionException(
+                    "A level one value element is not present.");
+        }
+        try {
+            masterLevel.validate();
+        } catch (InvalidDescriptionException e) {
+            throw new InvalidDescriptionException("Invalid master level: "
+                    + e.getMessage(), e);
+        }
+        try {
+            levelOneValue.validate();
+        } catch (InvalidDescriptionException e) {
+            throw new InvalidDescriptionException("Invalid level one value: "
+                    + e.getMessage(), e);
+        }
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/ValueDescription.java b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/ValueDescription.java
index 74024da1b2..8fb557e6a2 100644
--- a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/ValueDescription.java
+++ b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/ValueDescription.java
@@ -28,24 +28,26 @@ import ucar.nc2.NetcdfFile;
 import com.raytheon.uf.edex.netcdf.description.exception.InvalidDescriptionException;
 
 /**
- *
+ * 
  * Specifies a fixed value in the XML. Normally the XML would specify an
  * attribute or variable to read from the netCDF file but in some cases the
  * netcdf file does not have enough information so values can be directly in the
  * xml using this class.
- *
- *
+ * 
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- ---------------------------------------
  * Aug 26, 2015  4699     nabowle   Initial creation
  * Sep 09, 2015  4696     nabowle   Add indexed retrieval and getLength().
- *
+ * Dec 08, 2015  5059     nabowle   Add isNumeric() and isPresent().
+ * Jan 25, 2016  5208     bsteffen  Add validation.
+ * 
  * </pre>
- *
+ * 
  * @author nabowle
  */
 @XmlAccessorType(XmlAccessType.NONE)
@@ -62,8 +64,7 @@ public class ValueDescription extends AbstractFieldDescription {
         this.value = value;
     }
 
-    public String getString(NetcdfFile file)
-            throws InvalidDescriptionException {
+    public String getString(NetcdfFile file) throws InvalidDescriptionException {
         if (value != null) {
             return value;
         }
@@ -75,10 +76,14 @@ public class ValueDescription extends AbstractFieldDescription {
         return getString(file);
     }
 
-    public Number getNumber(NetcdfFile file)
-            throws InvalidDescriptionException {
+    public Number getNumber(NetcdfFile file) throws InvalidDescriptionException {
         if (value != null) {
-            return Double.parseDouble(value);
+            try {
+                return Double.parseDouble(value);
+            } catch (NumberFormatException e) {
+                throw new InvalidDescriptionException(this.value
+                        + " cannot be parsed as a Number.", e);
+            }
         }
         return null;
     }
@@ -92,4 +97,32 @@ public class ValueDescription extends AbstractFieldDescription {
     public long getLength(NetcdfFile file) {
         return value == null ? 0 : 1;
     }
+
+    @Override
+    public boolean isNumeric(NetcdfFile file)
+            throws InvalidDescriptionException {
+        if (this.value == null) {
+            throw new InvalidDescriptionException("value is null");
+        }
+        try {
+            getNumber(file);
+            return true;
+        } catch (InvalidDescriptionException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean isPresent(NetcdfFile file)
+            throws InvalidDescriptionException {
+        return this.value != null;
+    }
+
+    @Override
+    public void validate() throws InvalidDescriptionException {
+        if (value == null) {
+            throw new InvalidDescriptionException(
+                    "The value attribute is not present.");
+        }
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/VariableDescription.java b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/VariableDescription.java
index 369f3ab168..6c34f686c7 100644
--- a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/VariableDescription.java
+++ b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/VariableDescription.java
@@ -33,20 +33,21 @@ import com.raytheon.uf.edex.netcdf.description.exception.InvalidDescriptionExcep
 /**
  * Contains the name of a variable in a {@link NetcdfFile} that holds needed
  * values, and provides means to extract scalar values from the variable.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date          Ticket#  Engineer  Description
  * ------------- -------- --------- --------------------------
  * Aug 11, 2015  4709     bsteffen  Initial creation
  * Aug 25, 2015  4699     nabowle   Extracted from Pointset netcdf plugin and
  *                                  refactored.
  * Sep 09, 2015  4696     nabowle   Add indexed retrieval and getLength().
- *
+ * Dec 08, 2015  5059     nabowle   Add isNumeric() and isPresent().
+ * 
  * </pre>
- *
+ * 
  * @author bsteffen
  */
 @XmlAccessorType(XmlAccessType.NONE)
@@ -184,4 +185,27 @@ public class VariableDescription extends AbstractFieldDescription {
         return 0;
     }
 
+    @Override
+    public boolean isNumeric(NetcdfFile file)
+            throws InvalidDescriptionException {
+        if (this.name == null) {
+            throw new InvalidDescriptionException("name is null");
+        }
+        Variable var = file.findVariable(this.name);
+        if (var == null) {
+            throw new InvalidDescriptionException(
+                    "Coudld not find a variable for " + this.name);
+        }
+        return var.getDataType().isNumeric();
+    }
+
+    @Override
+    public boolean isPresent(NetcdfFile file)
+            throws InvalidDescriptionException {
+        if (name == null) {
+            throw new InvalidDescriptionException("name is null");
+        }
+        return file.findVariable(this.name) != null;
+    }
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/AbstractDateValue.java b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/AbstractDateValue.java
index 1a84d1ef06..e53d0b1495 100644
--- a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/AbstractDateValue.java
+++ b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/AbstractDateValue.java
@@ -29,26 +29,27 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 
 import ucar.nc2.NetcdfFile;
 
-import com.raytheon.uf.edex.netcdf.description.AttributeDescription;
 import com.raytheon.uf.edex.netcdf.description.AbstractFieldDescription;
+import com.raytheon.uf.edex.netcdf.description.AttributeDescription;
 import com.raytheon.uf.edex.netcdf.description.ValueDescription;
 import com.raytheon.uf.edex.netcdf.description.VariableDescription;
 import com.raytheon.uf.edex.netcdf.description.exception.InvalidDescriptionException;
 
 /**
- *
+ * 
  * Base class to extract a {@link Date} from a {@link NetcdfFile}.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- -----------------
  * Aug 25, 2015  4699     nabowle   Initial creation
- *
+ * Jan 25, 2016  5208     bsteffen  Add validation.
+ * 
  * </pre>
- *
+ * 
  * @author nabowle
  */
 @XmlSeeAlso({ FormattedDateValue.class, EpochOffsetDateValue.class })
@@ -70,4 +71,17 @@ public abstract class AbstractDateValue {
 
     public abstract Date getDate(NetcdfFile file)
             throws InvalidDescriptionException;
+
+    public void validate() throws InvalidDescriptionException {
+        if (field == null) {
+            throw new InvalidDescriptionException(
+                    "A field element is not present.");
+        }
+        try {
+            field.validate();
+        } catch (InvalidDescriptionException e) {
+            throw new InvalidDescriptionException("Invalid field: "
+                    + e.getMessage(), e);
+        }
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/DataTimeDescription.java b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/DataTimeDescription.java
index 6a2e2e67ae..8f13b1253c 100644
--- a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/DataTimeDescription.java
+++ b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/DataTimeDescription.java
@@ -32,22 +32,23 @@ import com.raytheon.uf.common.time.DataTime;
 import com.raytheon.uf.edex.netcdf.description.exception.InvalidDescriptionException;
 
 /**
- *
+ * 
  * Contains the information necessary to extract a {@link DataTime} from the
  * global attributes of a {@link NetcdfFile}.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- --------------------------------------------
  * Aug 11, 2015  4709     bsteffen  Initial creation
  * Aug 25, 2015  4699     nabowle   Extracted from Pointset netcdf plugin and
  *                                  refactored.
- *
+ * Jan 25, 2016  5208     bsteffen  Add validation.
+ * 
  * </pre>
- *
+ * 
  * @author bsteffen
  */
 @XmlAccessorType(XmlAccessType.NONE)
@@ -91,4 +92,17 @@ public class DataTimeDescription {
         }
     }
 
+    public void validate() throws InvalidDescriptionException {
+        if (refTime == null) {
+            throw new InvalidDescriptionException(
+                    "A ref time element is not present.");
+        }
+        try {
+            refTime.validate();
+        } catch (InvalidDescriptionException e) {
+            throw new InvalidDescriptionException("Invalid ref time: "
+                    + e.getMessage(), e);
+        }
+    }
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/FormattedDateValue.java b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/FormattedDateValue.java
index e7824e7482..65cebcd3bf 100644
--- a/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/FormattedDateValue.java
+++ b/edexOsgi/com.raytheon.uf.edex.netcdf/src/com/raytheon/uf/edex/netcdf/description/date/FormattedDateValue.java
@@ -32,22 +32,23 @@ import ucar.nc2.NetcdfFile;
 import com.raytheon.uf.edex.netcdf.description.exception.InvalidDescriptionException;
 
 /**
- *
+ * 
  * Contains the information necessary to extract a {@link Date} from a
  * {@link NetcdfFile} in a specific format.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- --------------------------------------------
  * Aug 11, 2015  4709     bsteffen  Initial creation
  * Aug 25, 2015  4699     nabowle   Extracted from Pointset netcdf plugin,
  *                                  renamed, and refactored.
- *
+ * Jan 25, 2016  5208     bsteffen  Add validation.
+ * 
  * </pre>
- *
+ * 
  * @author bsteffen
  */
 @XmlAccessorType(XmlAccessType.NONE)
@@ -66,19 +67,41 @@ public class FormattedDateValue extends AbstractDateValue {
         this.dateFormat = dateFormat;
     }
 
+    private SimpleDateFormat getSimpleDateFormat()
+            throws InvalidDescriptionException {
+        if (sdf == null) {
+            try {
+                sdf = new SimpleDateFormat(dateFormat);
+            } catch (IllegalArgumentException e) {
+                throw new InvalidDescriptionException(
+                        "Unable to parse date format", e);
+            }
+        }
+        return sdf;
+    }
+
+    @Override
     public synchronized Date getDate(NetcdfFile file)
             throws InvalidDescriptionException {
         String dateString = getField().getString(file);
         if (dateString == null) {
             return null;
         }
-        if (sdf == null) {
-            sdf = new SimpleDateFormat(dateFormat);
-        }
         try {
-            return sdf.parse(dateString);
+            return getSimpleDateFormat().parse(dateString);
         } catch (ParseException e) {
             throw new InvalidDescriptionException(e);
         }
     }
+
+    @Override
+    public synchronized void validate() throws InvalidDescriptionException {
+        super.validate();
+        if (dateFormat == null) {
+            throw new InvalidDescriptionException(
+                    "The data format attribute is not present.");
+        }
+        getSimpleDateFormat();
+    }
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF
index 5badd8b359..26069af137 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ohd Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.ohd
-Bundle-Version: 1.15.0.qualifier
+Bundle-Version: 1.16.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.raytheon.edex.util,
@@ -17,8 +17,6 @@ Import-Package: com.raytheon.edex.util,
  com.raytheon.uf.edex.database,
  com.raytheon.uf.edex.database.dao,
  com.raytheon.uf.edex.database.plugin,
- com.raytheon.uf.edex.plugin.text.db,
- com.raytheon.uf.edex.plugin.text.dbsrv.impl,
  org.quartz
 Export-Package: com.raytheon.uf.edex.ohd,
  com.raytheon.uf.edex.ohd.reportalarm,
@@ -33,4 +31,5 @@ Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.common.units;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.shef,
  com.raytheon.uf.common.dataplugin.text,
- com.raytheon.uf.edex.decodertools
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.edex.plugin.text
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-database-ingest.xml b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-database-ingest.xml
new file mode 100644
index 0000000000..be776ee1c6
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/res/spring/ohd-database-ingest.xml
@@ -0,0 +1,34 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+  
+    <bean id="ihfsBloatMonitor" class="com.raytheon.uf.edex.database.health.DatabaseBloatMonitor">
+        <constructor-arg>
+            <bean class="com.raytheon.uf.edex.database.health.PostgresBloatDao">
+                <constructor-arg value="ihfs"/>
+            </bean>
+        </constructor-arg>
+        <constructor-arg ref="warningThresholds"/>
+        <constructor-arg ref="criticalThresholds"/>
+    </bean>
+
+    <bean id="damBloatMonitor" class="com.raytheon.uf.edex.database.health.DatabaseBloatMonitor">
+        <constructor-arg>
+            <bean class="com.raytheon.uf.edex.database.health.PostgresBloatDao">
+                <constructor-arg value="dam"/>
+            </bean>
+        </constructor-arg>
+        <constructor-arg ref="warningThresholds"/>
+        <constructor-arg ref="criticalThresholds"/>
+    </bean>
+
+    <bean factory-bean="dbMonitorRegistry" factory-method="registerMonitor">
+        <constructor-arg value="ihfsBloatMonitor" />
+        <constructor-arg ref="ihfsBloatMonitor" />
+    </bean>
+
+    <bean factory-bean="dbMonitorRegistry" factory-method="registerMonitor">
+        <constructor-arg value="damBloatMonitor" />
+        <constructor-arg ref="damBloatMonitor" />
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/SetupSrv.java b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/SetupSrv.java
index 43e458a16d..e2c09d1f6a 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/SetupSrv.java
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/SetupSrv.java
@@ -29,6 +29,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.ohd.AppsDefaults;
+import com.raytheon.uf.common.ohd.AppsDefaultsDirKeys;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.util.FileUtil;
@@ -43,6 +44,7 @@ import com.raytheon.uf.edex.core.EdexException;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 28, 2014   2952     mpduff      Changed to use UFStatus for logging.
+ * Jan 26, 2016   5264     bkowal      Use the apps defaults dir constant.
  * 
  * </pre>
  * 
@@ -93,7 +95,8 @@ public class SetupSrv implements ServiceInterface {
     private void copyLocalizationFiles() throws EdexException {
         IPathManager pm = PathManagerFactory.getPathManager();
 
-        String apps_dir = AppsDefaults.getInstance().getToken("apps_dir");
+        String apps_dir = AppsDefaults.getInstance().getToken(
+                AppsDefaultsDirKeys.APPS_DIR);
 
         File[] hydroappsSourceDirectories = {
                 pm.getFile(pm.getContext(LocalizationType.COMMON_STATIC,
@@ -125,7 +128,7 @@ public class SetupSrv implements ServiceInterface {
 
         String[] asciiFiles = { "rfc_boundary.dat", "state.dat" };
 
-        List<String[]> setupScripts = new ArrayList<String[]>();
+        List<String[]> setupScripts = new ArrayList<>();
 
         String geo_util = appsDefaults.getToken("geo_util");
         String create_bas_bound = FileUtil.join(geo_util,
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/Q2FileUnzip.java b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/Q2FileUnzip.java
index 4ecab21400..3461be6e6d 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/Q2FileUnzip.java
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/Q2FileUnzip.java
@@ -31,6 +31,7 @@ import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
 import com.raytheon.uf.common.ohd.AppsDefaults;
+import com.raytheon.uf.common.ohd.AppsDefaultsDirKeys;
 
 /**
  * TODO Add Description
@@ -41,6 +42,7 @@ import com.raytheon.uf.common.ohd.AppsDefaults;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 2, 2009            snaples     Initial creation
+ * Jan 26, 2016 5264      bkowal      Use the apps defaults dir constant.
  * 
  * </pre>
  * 
@@ -61,7 +63,7 @@ public class Q2FileUnzip {
 
         File filename = null;
         AppsDefaults appsDefaults = AppsDefaults.getInstance();
-        pathName = appsDefaults.getToken("mpe_qmosaic_dir");
+        pathName = appsDefaults.getToken(AppsDefaultsDirKeys.MPE_QMOSAIC_DIR);
 
         File pn = new File(pathName);
         if (pn.exists() == false) {
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/SatPrecipFileBuilder.java b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/SatPrecipFileBuilder.java
index 6ba1a77223..5d1d016dbb 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/SatPrecipFileBuilder.java
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/pproc/SatPrecipFileBuilder.java
@@ -39,6 +39,7 @@ import com.raytheon.uf.common.hydro.spatial.HRAPCoordinates;
 import com.raytheon.uf.common.mpe.util.XmrgFile;
 import com.raytheon.uf.common.mpe.util.XmrgFile.XmrgHeader;
 import com.raytheon.uf.common.ohd.AppsDefaults;
+import com.raytheon.uf.common.ohd.AppsDefaultsDirKeys;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.time.util.TimeUtil;
@@ -58,6 +59,7 @@ import com.raytheon.uf.edex.database.plugin.PluginFactory;
  * Feb 15, 2013 1638       mschenke    Moved DataURINotificationMessage to uf.common.dataplugin
  * Mar 19, 2014 17109      snaples     Removed code that adds 1 hour to grid reftime, was not needed.
  * May 05, 2014 2060       njensen     Major cleanup and remove dependency on grid dataURI
+ * Jan 26, 2016 5264       bkowal      Use the apps defaults dir constant.
  * 
  * 
  * </pre>
@@ -111,7 +113,7 @@ public class SatPrecipFileBuilder {
         sdf.setTimeZone(TimeUtil.GMT_TIME_ZONE);
 
         AppsDefaults appsDefaults = AppsDefaults.getInstance();
-        outputPath = appsDefaults.getToken("mpe_satpre_dir");
+        outputPath = appsDefaults.getToken(AppsDefaultsDirKeys.MPE_SATPRE_DIR);
         File outputDir = new File(outputPath);
         if (!outputDir.exists()) {
             outputDir.mkdirs();
diff --git a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java
index 00946dbe15..6484ab8704 100644
--- a/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java
+++ b/edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java
@@ -30,8 +30,8 @@ import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.time.util.TimeUtil;
 import com.raytheon.uf.common.util.FileUtil;
+import com.raytheon.uf.edex.plugin.text.AlarmAlertUtil;
 import com.raytheon.uf.edex.plugin.text.db.TextDB;
-import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 /**
  * Provides SHEF with the ability to generate alert/alarms report products and
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/META-INF/MANIFEST.MF
index 791e60b515..c5eb2081a7 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/META-INF/MANIFEST.MF
@@ -17,5 +17,5 @@ Import-Package: com.raytheon.uf.common.dataplugin.acars,
  com.raytheon.uf.common.dataplugin.acarssounding,
  com.raytheon.uf.common.pointdata.spatial,
  com.raytheon.uf.common.wmo,
- org.apache.commons.logging
+ org.slf4j
 Export-Package: com.raytheon.uf.edex.plugin.acarssounding
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
index b3dbe997cd..2068c0df8a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/res/spring/acarssounding-ingest.xml
@@ -5,7 +5,7 @@
 
     <bean id="acarsAirports" class="com.raytheon.uf.edex.plugin.acarssounding.tools.AirportsBean" depends-on="acarsSoundingPluginName" >
     </bean>
-    
+
     <bean id="acarsPersistObs" class="com.raytheon.uf.edex.plugin.acarssounding.ACARSPersistObs" depends-on="acarsRegistered, acarsAirports" >
         <constructor-arg ref="acarsAirports" />
     </bean>
@@ -21,16 +21,15 @@
     <camelContext id="acarsSoundingSrv-camel" 
                   xmlns="http://camel.apache.org/schema/spring" 
                   errorHandlerRef="errorHandler">
-        <endpoint id="acarsSoundingEndpoint"/>
-        
+
         <endpoint id="scheduledSoundingCron" uri="clusteredquartz://acars/createSounding/?cron=${acarssounding.cron}"/>        
-                
+
         <!-- Schedule sounding creation -->
         <route id="scheduledSounding">
             <!-- Set the minutes explicitly -->
             <!-- Deployed time slots -->
             <from uri="scheduledSoundingCron" />
-            
+
             <!-- Development time slots 
             <from uri="clusteredquartz://acars/createSounding/?cron=00+0,5,10,15,20,25,30,35,40,45,50,55+*+*+*+?" />
            -->
@@ -53,7 +52,7 @@
               </doTry>
            </split>
         </route>
-        
+
         <route id="acarsSoundingProcessing">
            <from uri="jms-durable:queue:acarssounding" />
            <doTry>
@@ -68,7 +67,7 @@
            </doTry>
         </route>
 
-		<route id="acarsSoundingRoute">
+        <route id="acarsSoundingRoute">
             <from uri="direct-vm:acarsSounding"/>
             <bean ref="acarsPersistObs" method="process" />
         </route>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSPersistObs.java b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSPersistObs.java
index 637673c541..1c5edfe602 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSPersistObs.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSPersistObs.java
@@ -23,8 +23,8 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
@@ -51,6 +51,7 @@ import com.raytheon.uf.edex.plugin.acarssounding.tools.SoundingBuilder;
  * Nov 17, 2009            jkorman     Initial creation
  * Jan 07, 2014 2658       rferrel     Ignore cut off time when allowing archive data.
  * May 14, 2014 2536       bclement    removed TimeTools usage
+ * Dec 10, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -68,7 +69,7 @@ public class ACARSPersistObs {
 
     public static final int NO_DATA_DIR = 4;
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private SoundingBuilder builder;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSSounding.java b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSSounding.java
index 9e86dc37fb..474a06ad93 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSSounding.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSSounding.java
@@ -30,8 +30,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.acars.ACARSRecord;
@@ -60,6 +60,7 @@ import com.raytheon.uf.edex.plugin.acarssounding.tools.SoundingBuilder;
  * ------------ ---------- ----------- --------------------------
  * Jan 21, 2009       1939 jkorman     Initial creation
  * Aug 18, 2014 3530       bclement    removed TimeTools usage
+ * Dec 10, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -69,7 +70,7 @@ import com.raytheon.uf.edex.plugin.acarssounding.tools.SoundingBuilder;
 
 public class ACARSSounding {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private String pluginName = ACARSSoundingTools.ACARS_SNDG_PLUGIN_NAME;
 
@@ -125,7 +126,7 @@ public class ACARSSounding {
      * @return
      */
     public PluginDataObject[] processSounding(ACARSAircraftInfo acftInfo) {
-        ACARSSoundingRecord [] soundings = null;
+        ACARSSoundingRecord[] soundings = null;
         try {
             if (!failSafe) {
                 if (logger.isDebugEnabled()) {
@@ -138,9 +139,11 @@ public class ACARSSounding {
                 // Did we get any potential soundings back?
                 int numSoundings = (tSoundings != null) ? tSoundings.size() : 0;
                 // TODO : Change this to a debug later!
-                logger.info(acftInfo.getTailNumber() + " Read [" + numSoundings + "] soundings");
+                logger.info(acftInfo.getTailNumber() + " Read [" + numSoundings
+                        + "] soundings");
                 // Go create soundings
-                soundings = builder.createSoundings(loadObs(acftInfo),tSoundings);
+                soundings = builder.createSoundings(loadObs(acftInfo),
+                        tSoundings);
             } else {
                 soundings = EMPTY_SOUNDING;
             }
@@ -148,7 +151,7 @@ public class ACARSSounding {
             logger.error("Error processing acars sounding ", e);
             soundings = EMPTY_SOUNDING;
         }
-        if(soundings == null) {
+        if (soundings == null) {
             soundings = EMPTY_SOUNDING;
         }
         return soundings;
@@ -200,12 +203,12 @@ public class ACARSSounding {
                 // Do we have enough data to consider this data?
                 if ((uris.size() >= ACARSSoundingTools.MIN_OBS_FOR_SOUNDING)) {
                     String s = uris.get(0);
-                    Long startTime = Long.parseLong(s.substring(0,20).trim());
+                    Long startTime = Long.parseLong(s.substring(0, 20).trim());
                     Calendar start = TimeUtil
                             .newGmtCalendar(new Date(startTime));
-                    
+
                     s = uris.get(uris.size() - 1);
-                    Long stopTime = Long.parseLong(s.substring(0,20).trim());
+                    Long stopTime = Long.parseLong(s.substring(0, 20).trim());
                     Calendar end = TimeUtil.newGmtCalendar(new Date(stopTime));
 
                     List<ACARSRecord> obs = acarsDAO.getReports(
@@ -231,19 +234,19 @@ public class ACARSSounding {
      * @return
      */
     private List<ACARSSoundingRecord> checkSoundings(ACARSAircraftInfo acftInfo) {
-        
+
         String msg = "attempting " + acftInfo.getTailNumber() + " ";
         String tailNumber = acftInfo.getTailNumber();
 
         Calendar c = TimeUtil.newGmtCalendar(new Date(acftInfo.getStartTime()));
-        msg += String.format(ACARSSoundingTools.STD_TM_FMT,c);
+        msg += String.format(ACARSSoundingTools.STD_TM_FMT, c);
 
         c.setTimeInMillis(acftInfo.getStopTime());
         msg += "->";
-        msg += String.format(ACARSSoundingTools.STD_TM_FMT,c);
-        
+        msg += String.format(ACARSSoundingTools.STD_TM_FMT, c);
+
         logger.info(msg);
-        
+
         List<ACARSSoundingRecord> sndgs = soundingDAO.queryByTimeLimits(
                 tailNumber, acftInfo.getStartTime(), acftInfo.getStopTime());
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSSoundingSplitter.java b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSSoundingSplitter.java
index 48fcab6f6f..3e5cbf2231 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSSoundingSplitter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/ACARSSoundingSplitter.java
@@ -35,8 +35,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.acars.ACARSRecord;
 import com.raytheon.uf.common.localization.LocalizationContext;
@@ -61,6 +61,7 @@ import com.raytheon.uf.edex.plugin.acarssounding.tools.ACARSSoundingTools;
  * Sep 23, 2010            jkorman     Initial creation
  * May 14, 2014 2536       bclement    removed TimeTools usage
  * Aug 18, 2014 3530       bclement    removed rest of TimeTools usage
+ * Dec 10, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -70,20 +71,21 @@ import com.raytheon.uf.edex.plugin.acarssounding.tools.ACARSSoundingTools;
 
 public class ACARSSoundingSplitter implements Iterator<Object> {
 
-    private Log logger = LogFactory.getLog(getClass());
-    
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
     // Cutoff time for cleaning files
     private static final int FILE_CLEANUP_CUTOFF = 7;
-    
+
     public static final String CREATE_PROCESS_BEAN = "TRUE";
 
     public static final int BASE_DIR_NULL = 1;
+
     public static final int DATA_DIR_NULL = 2;
-    
+
     public static final int NO_BASE_DIR = 3;
+
     public static final int NO_DATA_DIR = 4;
-    
-    
+
     private File baseDir = null;
 
     private File dataDir = null;
@@ -95,9 +97,9 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
     private List<ACARSAircraftInfo> acftInfo = null;
 
     private boolean failSafe = false;
-    
+
     private int failReason = 0;
-    
+
     /**
      * 
      */
@@ -110,7 +112,7 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
      * 
      */
     private ACARSSoundingSplitter(String process, boolean failSafe) {
-        if(failSafe) {
+        if (failSafe) {
             iterator = new Iterator<ACARSAircraftInfo>() {
 
                 @Override
@@ -129,7 +131,7 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
             };
         } else {
             cleanUpAcftObs();
-            
+
             if (CREATE_PROCESS_BEAN.equals(process)) {
                 logger.info("Creating process bean");
 
@@ -195,12 +197,13 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
 
     /**
      * Get the failure reason.
+     * 
      * @return
      */
     public int getFailReason() {
         return failReason;
     }
-    
+
     /**
      * 
      */
@@ -315,7 +318,8 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
                         // We've combined and sorted all the data, so overwrite
                         // the
                         // existing file.
-                        writer = new FileWriter(out, ACARSSoundingTools.NO_APPEND);
+                        writer = new FileWriter(out,
+                                ACARSSoundingTools.NO_APPEND);
 
                         long startObs = Long.MAX_VALUE;
                         long stopObs = Long.MIN_VALUE;
@@ -388,14 +392,14 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
         final String END_FMT = "ACARS aircraft info cleanup [complete] deleted [%6d] files";
 
         int tries = 3;
-        while ((dataDir == null)&&(tries > 0)) {
+        while ((dataDir == null) && (tries > 0)) {
             setupFiles();
-            if(dataDir == null) {
+            if (dataDir == null) {
                 ACARSSoundingTools.delay(10000L);
                 tries--;
             }
         }
-        if(tries > 0) {
+        if (tries > 0) {
             int deletedFiles = 0;
             if (dataDir.exists() && dataDir.isDirectory()) {
                 File[] files = ACARSSoundingTools.getDataFiles(dataDir);
@@ -406,23 +410,29 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
                         if (f.isFile()) {
                             String fName = f.getName();
                             if (fName.endsWith(".acft")) {
-                                List<String> newList = processFile(f);;
+                                List<String> newList = processFile(f);
                                 if (newList.size() > 0) {
                                     ACARSSoundingTools.writeAircraftData(f,
                                             newList, logger);
                                 } else {
-                                    logger.info("Deleting empty tailnumber file " + fName);
+                                    logger.info("Deleting empty tailnumber file "
+                                            + fName);
                                     // come here to delete the tailnumberfile
-                                    deleted = ACARSSoundingTools.deleteFile(f, logger, "Attempt to delete %s failed");
+                                    deleted = ACARSSoundingTools.deleteFile(f,
+                                            logger,
+                                            "Attempt to delete %s failed");
                                 }
                             } else {
                                 // a garbage file got into the directory
                                 // remove it.
-                                deleted = ACARSSoundingTools.deleteFile(f, logger, "Attempt to delete ill-formed file %s failed");
+                                deleted = ACARSSoundingTools
+                                        .deleteFile(f, logger,
+                                                "Attempt to delete ill-formed file %s failed");
                             }
                         }
                     } catch (Throwable t) {
-                        deleted = ACARSSoundingTools.deleteFile(f, logger, "Attempt to delete %s failed");
+                        deleted = ACARSSoundingTools.deleteFile(f, logger,
+                                "Attempt to delete %s failed");
                     }
                     if (deleted) {
                         deletedFiles++;
@@ -432,15 +442,16 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
             }
         }
     }
-    
+
     /**
-     * Age out any old data. 
+     * Age out any old data.
+     * 
      * @param obs
      * @return
      */
     private List<String> processFile(File tailNumberFile) {
         long cTime = ACARSSoundingTools.getCutoffTime(FILE_CLEANUP_CUTOFF);
-        
+
         Set<String> uris = new HashSet<String>();
         ArrayList<String> newList = new ArrayList<String>();
         BufferedReader bf = null;
@@ -454,13 +465,13 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
                         s = ACARSSoundingTools.removeTrailingSpace(s);
                         if (uris.contains(s)) {
                             if (logger.isDebugEnabled()) {
-                                logger.debug("Removing duplicate ["
-                                        + s + "]");
+                                logger.debug("Removing duplicate [" + s + "]");
                             }
                         } else {
                             uris.add(s);
                             if (s.length() > ACARSSoundingTools.OBS_TIME_SIZE) {
-                                long oTime = ACARSSoundingTools.parseLong(s.substring(0,20), 0);
+                                long oTime = ACARSSoundingTools.parseLong(
+                                        s.substring(0, 20), 0);
                                 if (oTime > 0) {
                                     if (logger.isDebugEnabled()) {
                                         logger.debug("Ill-formed datauri entry ["
@@ -470,8 +481,8 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
                                         newList.add(s);
                                     } else {
                                         if (logger.isDebugEnabled()) {
-                                            logger.debug("Aging out datauri [" + s
-                                                    + "]");
+                                            logger.debug("Aging out datauri ["
+                                                    + s + "]");
                                         }
                                     }
                                 }
@@ -479,7 +490,7 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
                         }
                     }
                 } catch (Exception e) {
-                    logger.error("Exception in processList",e);
+                    logger.error("Exception in processList", e);
                     // nothing else. The URI will go away.
                 }
             }
@@ -505,7 +516,8 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
     private void setupFiles() {
         failSafe = true;
         try {
-            PathManager pathMgr = (PathManager) PathManagerFactory.getPathManager();
+            PathManager pathMgr = (PathManager) PathManagerFactory
+                    .getPathManager();
 
             LocalizationContext ctx = pathMgr.getContext(
                     LocalizationType.EDEX_STATIC, LocalizationLevel.BASE);
@@ -516,16 +528,16 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
             dataDir = pathMgr.getFile(ctx, ACARSSoundingTools.BASE_PATH
                     + ACARSSoundingTools.DATA_PATH);
 
-            if(baseDir != null) {
+            if (baseDir != null) {
                 if (!baseDir.exists()) {
                     baseDir.mkdirs();
                 }
-                if(baseDir.exists()) {
-                    if(dataDir != null) {
+                if (baseDir.exists()) {
+                    if (dataDir != null) {
                         if (!dataDir.exists()) {
                             dataDir.mkdirs();
                         }
-                        if(dataDir.exists()) {
+                        if (dataDir.exists()) {
                             // Ok, resources exist
                             failSafe = false;
                         } else {
@@ -541,7 +553,7 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
                 failReason = BASE_DIR_NULL;
             }
         } catch (Exception e) {
-            logger.error("Attempting to setup files",e);
+            logger.error("Attempting to setup files", e);
         }
     }
 
@@ -571,7 +583,7 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
      * @param logger
      *            Logger to receive possible error messages.
      */
-    private static void deleteFile(File file, Log logger) {
+    private static void deleteFile(File file, Logger logger) {
         if ((file != null) && (file.exists())) {
             if (file.isFile()) {
                 // Now that we've processed out this file, see if it
@@ -603,8 +615,9 @@ public class ACARSSoundingSplitter implements Iterator<Object> {
      * @return
      */
     public ACARSSoundingSplitter getSeparator() {
-        ACARSSoundingSplitter splitter = new ACARSSoundingSplitter(CREATE_PROCESS_BEAN, failSafe); 
-        
+        ACARSSoundingSplitter splitter = new ACARSSoundingSplitter(
+                CREATE_PROCESS_BEAN, failSafe);
+
         return splitter;
     }
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/ACARSSoundingTools.java b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/ACARSSoundingTools.java
index 8d233014cc..2c229d708e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/ACARSSoundingTools.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/ACARSSoundingTools.java
@@ -13,7 +13,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.TimeZone;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 import com.raytheon.uf.common.dataplugin.acars.ACARSRecord;
 import com.raytheon.uf.common.dataplugin.acarssounding.ACARSSoundingLayer;
@@ -31,6 +31,7 @@ import com.raytheon.uf.common.time.util.TimeUtil;
  *                                      based on altitude here
  * Aug 18, 2014 3530       bclement     removed TimeTools usage and dead code
  * Sep 02, 2014 3549       njensen      Improve error message
+ * Dec 10, 2015 5166       kbisanz      Update logging to use SLF4J
  * 
  * </pre>
  */
@@ -70,7 +71,7 @@ public final class ACARSSoundingTools {
     public static final int CUTOFF_HOURS = 6;
 
     public static final int OBS_TIME_SIZE = 20;
-    
+
     // Only use 100 for size of the dataURI - ACARS dataURIs don't get much
     // bigger than about 90 at most.
     public static final String OUT_FMT = ACARS_NEW_OBS + "X:%"
@@ -178,7 +179,6 @@ public final class ACARSSoundingTools {
         }
     };
 
-    
     /**
      * Don't allow this class to be instantiated.
      */
@@ -218,7 +218,7 @@ public final class ACARSSoundingTools {
      * @return
      */
     public static final List<String> getAircraftData(File tailNumberFile,
-            Log logger) {
+            Logger logger) {
 
         ArrayList<String> uris = new ArrayList<String>();
         BufferedReader bf = null;
@@ -229,7 +229,8 @@ public final class ACARSSoundingTools {
                 uris.add(s);
             }
         } catch (IOException ioe) {
-            logger.error("Error reading data for tailnumber "
+            logger.error(
+                    "Error reading data for tailnumber "
                             + tailNumberFile.getName(), ioe);
         } finally {
             if (bf != null) {
@@ -251,7 +252,7 @@ public final class ACARSSoundingTools {
      * @param logger
      */
     public static final void writeAircraftData(File tailNumberFile,
-            List<String> acarsDataURIs, Log logger) {
+            List<String> acarsDataURIs, Logger logger) {
         if (acarsDataURIs != null) {
             // Check if there is at least one not null data item to write.
             boolean writeData = false;
@@ -297,16 +298,16 @@ public final class ACARSSoundingTools {
      * @return
      */
     public static final List<ACARSRecord> readAircraftData(File tailNumberFile,
-            List<ACARSRecord> obs, HashSet<String> dups, Log logger) {
+            List<ACARSRecord> obs, HashSet<String> dups, Logger logger) {
 
-        if(obs == null) {
+        if (obs == null) {
             obs = new ArrayList<ACARSRecord>();
         }
 
-        if(dups == null) {
+        if (dups == null) {
             dups = new HashSet<String>();
         }
-        
+
         if ((tailNumberFile != null) && (tailNumberFile.exists())) {
             BufferedReader bf = null;
             try {
@@ -314,9 +315,9 @@ public final class ACARSSoundingTools {
                 String s = null;
                 while ((s = bf.readLine()) != null) {
                     s = removeTrailingSpace(s);
-                    long obsTime = parseLong(s.substring(0,20),0);
+                    long obsTime = parseLong(s.substring(0, 20), 0);
                     // Don't process if bad obstime.
-                    if(obsTime > 0) {
+                    if (obsTime > 0) {
                         String uri = s.substring(21);
 
                         if (!dups.contains(uri)) {
@@ -479,33 +480,40 @@ public final class ACARSSoundingTools {
 
     /**
      * Does a time tB lie between times tA and tC.
+     * 
      * @param tA
      * @param tB
      * @param tC
      * @return
      */
-    public static final boolean betweenTimes(Calendar tA, Calendar tB, Calendar tC) {
-        return (tB.compareTo(tA) > 0)&&(tB.compareTo(tC) < 0);
-    }
-    
-    /**
-     * Does a time tB lie between times tA and tC.
-     * @param tA
-     * @param tB
-     * @param tC
-     * @return
-     */
-    public static final boolean betweenFlightLevel(Integer fA, Integer fB, Integer fC) {
-        boolean result = (fB.compareTo(fA) > 0)&&(fB.compareTo(fC) < 0); 
-        return result |= (fB.compareTo(fA) < 0)&&(fB.compareTo(fC) > 0);
+    public static final boolean betweenTimes(Calendar tA, Calendar tB,
+            Calendar tC) {
+        return (tB.compareTo(tA) > 0) && (tB.compareTo(tC) < 0);
     }
 
     /**
-     * Determine if a target ACARS observation lies between two
-     * given layers based on observation time and flight level. 
-     * @param layerA First layer.
+     * Does a time tB lie between times tA and tC.
+     * 
+     * @param tA
+     * @param tB
+     * @param tC
+     * @return
+     */
+    public static final boolean betweenFlightLevel(Integer fA, Integer fB,
+            Integer fC) {
+        boolean result = (fB.compareTo(fA) > 0) && (fB.compareTo(fC) < 0);
+        return result |= (fB.compareTo(fA) < 0) && (fB.compareTo(fC) > 0);
+    }
+
+    /**
+     * Determine if a target ACARS observation lies between two given layers
+     * based on observation time and flight level.
+     * 
+     * @param layerA
+     *            First layer.
      * @param rec
-     * @param layerB Second layer.
+     * @param layerB
+     *            Second layer.
      * @return Does the observation lie between the given layers.
      */
     public static boolean checkBetween(ACARSSoundingLayer layerA,
@@ -520,25 +528,25 @@ public final class ACARSSoundingTools {
         }
         return result;
     }
-    
+
     public static final String removeTrailingSpace(String target) {
         String value = null;
-        if(target != null) {
-            int i = target.length()-1;
-            for(;i > -1;i--) {
-                if(!Character.isWhitespace(target.charAt(i))) {
+        if (target != null) {
+            int i = target.length() - 1;
+            for (; i > -1; i--) {
+                if (!Character.isWhitespace(target.charAt(i))) {
                     break;
                 }
             }
-            if(i == -1) {
+            if (i == -1) {
                 value = new String();
-            } else if(i > -1) {
-                value = target.substring(0,i+1);
+            } else if (i > -1) {
+                value = target.substring(0, i + 1);
             }
         }
         return value;
     }
-    
+
     /**
      * 
      * @param s
@@ -547,33 +555,35 @@ public final class ACARSSoundingTools {
      */
     public static final long parseLong(String s, long defValue) {
         long value = defValue;
-        if(s != null) {
+        if (s != null) {
             try {
-                value = Long.parseLong(s.trim()); 
-            } catch(Exception e) {
+                value = Long.parseLong(s.trim());
+            } catch (Exception e) {
                 // nothing
             }
-            
+
         }
         return value;
     }
+
     /**
      * 
      * @param file
      * @param logger
      * @return
      */
-    public static final boolean deleteFile(File file, Log logger, String logMessage) {
+    public static final boolean deleteFile(File file, Logger logger,
+            String logMessage) {
         boolean deleted = false;
-        if(file != null) {
+        if (file != null) {
             deleted = file.delete();
             if (!deleted) {
-                logger.error(String.format(logMessage,file.getName()));
+                logger.error(String.format(logMessage, file.getName()));
             }
         }
         return deleted;
     }
-    
+
     /**
      * 
      * @param args
@@ -583,30 +593,30 @@ public final class ACARSSoundingTools {
         long start = System.currentTimeMillis();
         try {
             Thread.sleep(10000L);
-        } catch(Exception e) {
+        } catch (Exception e) {
             // nothing.
         }
         return (System.currentTimeMillis() - start);
     } // end
 
-    public static final void main(String [] args) {
-        
-//        System.out.println("Test betweenTimes() passed test [" + test_betweenTimes() + "]");
-//        System.out.println("Test betweenFlightLevel() passed test [" + test_betweenFlightLevel() + "]");
-//        
-//        String STD_TM_FMT = "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS";
-//        
-//        Calendar c = TimeTools.getSystemCalendar();
-//        System.out.println(String.format(STD_TM_FMT,c));
-        
+    public static final void main(String[] args) {
+
+        // System.out.println("Test betweenTimes() passed test [" + test_betweenTimes() + "]");
+        // System.out.println("Test betweenFlightLevel() passed test [" + test_betweenFlightLevel() + "]");
+        //
+        // String STD_TM_FMT = "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS";
+        //
+        // Calendar c = TimeTools.getSystemCalendar();
+        // System.out.println(String.format(STD_TM_FMT,c));
+
         System.out.println(removeTrailingSpace("   THIS IS A TEST   "));
         System.out.println(removeTrailingSpace("   THIS IS A TESTXXX"));
         System.out.println(removeTrailingSpace("   THIS IS A TEST  X"));
         System.out.println(removeTrailingSpace(" "));
         System.out.println(removeTrailingSpace("X"));
-        
+
         String s = removeTrailingSpace("       1307539490000:/acars/2011-06-08_13:24:50.0/0HKEILZA/null/14.73/-90.51/2807");
-        System.out.println(parseLong(s.substring(0,20),0));
-        
+        System.out.println(parseLong(s.substring(0, 20), 0));
+
     }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/Airports.java b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/Airports.java
index c3bb4d5557..00d850bb0a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/Airports.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/Airports.java
@@ -29,8 +29,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
 import com.raytheon.uf.edex.decodertools.core.LatLonPoint;
@@ -46,6 +46,7 @@ import com.raytheon.uf.edex.decodertools.core.LatLonPoint;
  * Apr 16, 2009            jkorman     Initial creation
  * Oct 22, 2013 2361       njensen     Use JAXBManager for XML
  * Aug 18, 2014 3530       bclement    moved from common to edex
+ * Dec 10, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -57,7 +58,7 @@ import com.raytheon.uf.edex.decodertools.core.LatLonPoint;
 @XmlAccessorType(XmlAccessType.NONE)
 public class Airports {
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     // Average earth radius, fine for what we are doing.
     private static final double E_RADIUS = 6371.2213;
@@ -170,7 +171,7 @@ public class Airports {
      * @return
      */
     public static Airports loadFromFile(String filePath, String fileName,
-            Log logger) {
+            Logger logger) {
 
         Airports airports = null;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/AirportsBean.java b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/AirportsBean.java
index 5b868de0cc..f9c8f0b1cb 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/AirportsBean.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/AirportsBean.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.uf.edex.plugin.acarssounding.tools;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.acars.ACARSRecord;
 import com.raytheon.uf.common.localization.IPathManager;
@@ -41,6 +41,7 @@ import com.raytheon.uf.edex.decodertools.core.LatLonPoint;
  * ------------ ---------- ----------- --------------------------
  * Sep 23, 2010            jkorman     Initial creation
  * Aug 18, 2014 3530       bclement    moved from common to edex
+ * Dec 10, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -50,7 +51,7 @@ import com.raytheon.uf.edex.decodertools.core.LatLonPoint;
 
 public class AirportsBean {
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private static final String PATH_EXT = "stations";
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/IntermediateData.java b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/IntermediateData.java
index 113c99cd37..9c388db8fb 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/IntermediateData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/IntermediateData.java
@@ -25,7 +25,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
+import org.slf4j.Logger;
 
 import com.raytheon.uf.common.dataplugin.acars.ACARSRecord;
 
@@ -40,6 +40,7 @@ import com.raytheon.uf.common.dataplugin.acars.ACARSRecord;
  * ------------ ---------- ----------- --------------------------
  * Nov 29, 2010            jkorman     Initial creation
  * Aug 18, 2014 3530       bclement    removed dead code
+ * Dec 10, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -121,53 +122,54 @@ public class IntermediateData {
     /**
      * Take a list of ACARSRecords and select only those records that have a
      * corresponding entry in the dataURI list.
+     * 
      * @param recordList
      * @param acarsDataURIs
      */
-    public void setAcarsData(List<ACARSRecord> recList,List<String> dataURIs) {
-        
+    public void setAcarsData(List<ACARSRecord> recList, List<String> dataURIs) {
+
         Set<String> uris = new HashSet<String>();
-        for(String s : dataURIs) {
-            if(s.length() > 21) {
+        for (String s : dataURIs) {
+            if (s.length() > 21) {
                 uris.add(s.substring(21));
             }
         }
         this.recordList = new ArrayList<ACARSRecord>();
-        for(ACARSRecord rec : recList) {
-            if(uris.contains(rec.getDataURI())) {
+        for (ACARSRecord rec : recList) {
+            if (uris.contains(rec.getDataURI())) {
                 recordList.add(rec);
             }
         }
         acarsDataURIs = dataURIs;
     }
-    
+
     /**
      * Remove any ACARSRecords and corresponding datauri that were used to
      * create a sounding.
      */
-    public final void reconcile(Log logger) {
-        
+    public final void reconcile(Logger logger) {
+
         if ((recordList != null) && (acarsDataURIs != null)) {
             List<Integer> deletions = new ArrayList<Integer>();
-            for(int i = 0;i < recordList.size();i++) {
+            for (int i = 0; i < recordList.size(); i++) {
                 ACARSRecord r = recordList.get(i);
-                if(r.isUsedInSounding()) {
-                    int pos = findDataUri(r.getDataURI(),acarsDataURIs);
-                    if(pos >= 0) {
+                if (r.isUsedInSounding()) {
+                    int pos = findDataUri(r.getDataURI(), acarsDataURIs);
+                    if (pos >= 0) {
                         deletions.add(pos);
-                        if(logger.isDebugEnabled()) {
+                        if (logger.isDebugEnabled()) {
                             logger.debug("removing dataURI " + r.getDataURI());
                         }
                     }
                 }
             }
-            
+
             for (ACARSRecord r : recordList) {
                 if (r.isUsedInSounding()) {
 
                 }
             } // for
-            // Now run the list of deletions
+              // Now run the list of deletions
             for (Integer n : deletions) {
                 acarsDataURIs.set(n, null);
             }
@@ -179,33 +181,32 @@ public class IntermediateData {
      * 
      * @param uri
      * @param dataURIs
-     * @return Returns the index where the uri was found. Returns -1
-     * if the uri is not found.
+     * @return Returns the index where the uri was found. Returns -1 if the uri
+     *         is not found.
      */
     private static int findDataUri(String uri, List<String> dataURIs) {
         int pos = -1;
-        
-        if(uri != null) {
-            pos = search(uri,dataURIs);
+
+        if (uri != null) {
+            pos = search(uri, dataURIs);
             if (pos < 0) {
                 // We may have modified the dataURI so need additional
                 // checks to make sure. Zero out the seconds and try
                 // again.
-                uri = uri.substring(0, 24) + "00"
-                        + uri.substring(26);
+                uri = uri.substring(0, 24) + "00" + uri.substring(26);
                 // and try again
-                pos = search(uri,dataURIs);
+                pos = search(uri, dataURIs);
             }
         }
-        
+
         return pos;
     }
-    
+
     private static int search(String uri, List<String> uris) {
         int pos = -1;
-        if((uris != null) && (uri != null)) {
-            for(int i = 0;i < uris.size();i++) {
-                if(uri.equals(uris.get(i).substring(21))) {
+        if ((uris != null) && (uri != null)) {
+            for (int i = 0; i < uris.size(); i++) {
+                if (uri.equals(uris.get(i).substring(21))) {
                     pos = i;
                     break;
                 }
@@ -213,24 +214,25 @@ public class IntermediateData {
         }
         return pos;
     }
-    
+
     /**
      * 
      */
-    private final void writeACARSDataUris(Log logger) {
+    private final void writeACARSDataUris(Logger logger) {
         if ((acftInfo != null) && (acftInfo.getFilePath() != null)) {
             if (acarsDataURIs != null) {
                 File out = new File(acftInfo.getFilePath());
 
                 boolean writeURIs = false;
-                for(String s : acarsDataURIs) {
-                    if(s != null) {
+                for (String s : acarsDataURIs) {
+                    if (s != null) {
                         writeURIs = true;
                         break;
                     }
                 }
-                if(writeURIs) {
-                    ACARSSoundingTools.writeAircraftData(out, acarsDataURIs, logger);
+                if (writeURIs) {
+                    ACARSSoundingTools.writeAircraftData(out, acarsDataURIs,
+                            logger);
                 } else {
                     if (out.exists()) {
                         if (!out.delete()) {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/SoundingBuilder.java b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/SoundingBuilder.java
index b2f47c7efa..2d7b7755ae 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/SoundingBuilder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.acarssounding/src/com/raytheon/uf/edex/plugin/acarssounding/tools/SoundingBuilder.java
@@ -28,8 +28,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.acars.ACARSRecord;
 import com.raytheon.uf.common.dataplugin.acarssounding.ACARSSoundingConstants;
@@ -60,6 +60,7 @@ import com.raytheon.uf.common.time.util.TimeUtil;
  *                                      to determine which airport
  *                                      to use
  * Aug 18, 2014 3530       bclement    removed dead code
+ * Dec 10, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -69,7 +70,7 @@ import com.raytheon.uf.common.time.util.TimeUtil;
 
 public class SoundingBuilder {
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     File dataDir = null;
 
@@ -225,7 +226,7 @@ public class SoundingBuilder {
                     }
                 }
             }
- // If we have an airport we'll use that to create the sounding
+            // If we have an airport we'll use that to create the sounding
             if (airport != null) {
                 sounding = new ACARSSoundingRecord();
                 Calendar soundingTime = recObs.getTimeObs();
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF
index 4f867d4d37..b1c441190c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrascat/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bufrascat Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrascat
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrascat,
  com.raytheon.uf.edex.decodertools,
  com.raytheon.uf.common.pointdata,
@@ -23,4 +23,4 @@ Import-Package: com.raytheon.uf.common.datastorage,
  com.raytheon.uf.edex.bufrtools.descriptors,
  com.raytheon.uf.edex.bufrtools.packets,
  com.raytheon.uf.edex.core,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF
index 5599670160..f52f4d7005 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrhdw/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bufrhdw Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrhdw
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrhdw;bundle-version="1.0.0",
  com.raytheon.uf.edex.decodertools,
  com.raytheon.uf.common.pointdata,
@@ -22,4 +22,4 @@ Import-Package: com.raytheon.uf.common.datastorage,
  com.raytheon.uf.edex.bufrtools.descriptors,
  com.raytheon.uf.edex.bufrtools.packets,
  com.raytheon.uf.edex.core,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/META-INF/MANIFEST.MF
index 9d3ef7b894..4bf9de898f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/META-INF/MANIFEST.MF
@@ -22,4 +22,4 @@ Import-Package: com.raytheon.edex.esb,
  com.raytheon.uf.edex.bufrtools,
  com.raytheon.uf.edex.bufrtools.descriptors,
  com.raytheon.uf.edex.bufrtools.packets,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/MnemonicDescriptorMapping.txt b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/MnemonicDescriptorMapping.txt
index 44737c6eac..d2fbbcd206 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/MnemonicDescriptorMapping.txt
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/MnemonicDescriptorMapping.txt
@@ -9,6 +9,7 @@
 #  ------------ ---------- ----------- --------------------------
 #  20080226            861 jkorman     Initial Development
 #  20111026          11393 jkorman     Updated AVN mapping
+#  20160209           5283 nabowle     Remove NGM support.
 #  @author jkorman
 #
 #*******************************************************************************
@@ -332,81 +333,4 @@
   MRF|0 60 146|    43|QPF24hr_cat1     
   MRF|0 60 090|    45|QPF24hr_bestCat  
   MRF|0 60 059|    46|tstorm12hr       
-  MRF|0 60 060|    47|tstorm24hr       
-#---------------------------------------
-#Model|Descrip | Index|Mnemonic         
-#---------------------------------------
-  NGM|0 12 200|    11|maxTemp24Hour    
-  NGM|0 12 201|    12|minTemp24Hour    
-  NGM|0 12 001|    13|temperature      
-  NGM|0 12 003|    14|dewpoint         
-  NGM|0 11 001|    15|windDir          
-  NGM|0 11 002|    16|windSpeed        
-  NGM|0 11 200|    17|windSpeedInflated
-  NGM|0 11 003|    18|uwind            
-  NGM|0 11 004|    19|vwind            
-  NGM|0 60 001|    20|POP6hr           
-  NGM|0 60 002|    21|POP12hr          
-  NGM|0 60 058|    22|tstorm6hr        
-  NGM|0 60 059|    23|tstorm12hr       
-  NGM|0 60 060|    24|tstorm24hr       
-  NGM|0 60 061|    25|severe6hr        
-  NGM|0 60 062|    26|severe12hr       
-  NGM|0 60 063|    27|severe24hr       
-  NGM|0 60 020|    28|precipFreezing   
-  NGM|0 60 021|    29|precipSnow       
-  NGM|0 60 022|    30|precipRain       
-  NGM|0 60 091|    31|precipType       
-  NGM|0 60 071|    32|PQPF6hr          
-  NGM|0 60 004|    33|QPF6hr_cat4      
-  NGM|0 60 007|    34|QPF6hr_cat3      
-  NGM|0 60 010|    35|QPF6hr_cat2      
-  NGM|0 60 013|    36|QPF6hr_cat1      
-  NGM|0 60 090|    38|QPF6hr_bestCat   
-  NGM|0 60 072|    39|PQPF12hr         
-  NGM|0 60 005|    40|QPF12hr_cat5     
-  NGM|0 60 008|    41|QPF12hr_cat4     
-  NGM|0 60 011|    42|QPF12hr_cat3     
-  NGM|0 60 014|    43|QPF12hr_cat2     
-  NGM|0 60 016|    44|QPF12hr_cat1     
-  NGM|0 60 090|    46|QPF12hr_bestCat  
-  NGM|0 60 026|    47|snow6hr_cat2     
-  NGM|0 60 029|    48|snow6hr_cat1     
-  NGM|0 60 093|    50|snow6hr_bestCat  
-  NGM|0 60 027|    51|snow12hr_cat4    
-  NGM|0 60 030|    52|snow12hr_cat3    
-  NGM|0 60 032|    53|snow12hr_cat2    
-  NGM|0 60 034|    54|snow12hr_cat1    
-  NGM|0 60 093|    56|snow12hr_bestCat 
-  NGM|0 60 038|    57|clouds_CL        
-  NGM|0 60 039|    58|clouds_SC        
-  NGM|0 60 040|    59|clouds_BK        
-  NGM|0 60 041|    60|clouds_OV        
-  NGM|0 20 011|    61|clouds_bestCat   
-  NGM|0 60 042|    62|ceiling_cat1     
-  NGM|0 60 043|    63|ceiling_cat2     
-  NGM|0 60 044|    64|ceiling_cat3     
-  NGM|0 60 045|    65|ceiling_cat4     
-  NGM|0 60 046|    66|ceiling_cat5     
-  NGM|0 60 047|    67|ceiling_cat6     
-  NGM|0 60 048|    68|ceiling_cat7     
-  NGM|0 60 094|    69|ceiling_bestCat  
-  NGM|0 60 049|    70|vis_cat1         
-  NGM|0 60 050|    71|vis_cat2         
-  NGM|0 60 051|    72|vis_cat3         
-  NGM|0 60 052|    73|vis_cat4         
-  NGM|0 60 053|    74|vis_cat5         
-  NGM|0 60 095|    75|vis_bestCat      
-  NGM|0 60 054|    76|obVis_cat1       
-  NGM|0 60 055|    77|obVis_cat2       
-  NGM|0 60 056|    78|obVis_cat3       
-  NGM|0 60 057|    79|obVis_cat4       
-  NGM|0 60 096|    80|obVis_bestCat    
-  NGM|0 14 032|    81|sunHours         
-  NGM|0 14 200|    82|sunPop           
-  NGM|0 14 020|    83|solarRad         
-  NGM|0 60 023|    84|POP_drizzle      
-  NGM|0 60 024|    85|POP_rain         
-  NGM|0 60 025|    86|POP_showers      
-  NGM|0 60 092|    87|POP_bestCat      
-  NGM|0 60 099|    88|Cig_Vis          
\ No newline at end of file
+  MRF|0 60 060|    47|tstorm24hr       
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/NGMBufrTableB b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/NGMBufrTableB
deleted file mode 100644
index 5a21b20c69..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/NGMBufrTableB
+++ /dev/null
@@ -1,157 +0,0 @@
-0	0	1	  0	   0	 24	CCITT IA5     	TABLE A ENTRY                          *
-0	0	2	  0	   0	256	CCITT IA5     	TABLE A DATA CATEGORY DESCRIPTION LN 1 *
-0	0	3	  0	   0	256	CCITT IA5     	TABLE A DATA CATEGORY DESCRIPTION LN 2 *
-0	0	5	  0	   0	 24	CCITT IA5     	BUFR EDITION NUMBER                    *
-0	0	10	  0	   0	  8	CCITT IA5     	F DESCRIPTOR TO BE ADDED OR DEFINED    *
-0	0	11	  0	   0	 16	CCITT IA5     	X DESCRIPTOR TO BE ADDED OR DEFINED    *
-0	0	12	  0	   0	 24	CCITT IA5     	Y DESCRIPTOR TO BE ADDED OR DEFINED    *
-0	0	13	  0	   0	256	CCITT IA5     	ELEMENT NAME LN 1                      *
-0	0	14	  0	   0	256	CCITT IA5     	ELEMENT NAME LN 2                      *
-0	0	15	  0	   0	192	CCITT IA5     	UNITS NAME                             *
-0	0	16	  0	   0	  8	CCITT IA5     	UNITS SCALE SIGN                       *
-0	0	17	  0	   0	 24	CCITT IA5     	UNITS SCALE                            *
-0	0	18	  0	   0	  8	CCITT IA5     	UNITS REFERENCE SIGN                   *
-0	0	19	  0	   0	 80	CCITT IA5     	UNITS REFERENCE VALUE                  *
-0	0	20	  0	   0	 24	CCITT IA5     	ELEMENT DATA WIDTH                     *
-0	0	30	  0	   0	 48	CCITT IA5     	DESCRIPTOR DEFINING SEQUENCE           *
-0	1	1	  0	   0	  7	NUMERIC       	WMO BLOCK NUMBER                        
-0	1	2	  0	   0	 10	NUMERIC       	WMO STATION NUMBER                      
-0	1	3	  0	   0	  3	NUMERIC       	WMO REGION NUMBER                       
-0	1	4	  0	   0	  3	NUMERIC       	WMO REGION SUB-AREA                     
-0	1	5	  0	   0	 17	NUMERIC       	BUOY/PLATFORM IDENTIFIER                
-0	1	6	  0	   0	 64	CCITT IA5     	AIRCRAFT IDENTIFIER (FLIGHT NUMBER)    *
-0	1	7	  0	   0	 10	CODE TABLE    	SATELLITE IDENTIFIER                    
-0	1	8	  0	   0	 64	CCITT IA5     	AIRCRAFT REGISTRATION NUMBER (TAIL NR) *
-0	1	9	  0	   0	 64	CCITT IA5     	TYPE OF COMMERCIAL ACFT                *
-0	1	10	  0	   0	 64	CCITT IA5     	STATIONARY BOUY PLATFORM IDENTIFIER    *
-0	1	11	  0	   0	 72	CCITT IA5     	SHIP CALL SIGN                         *
-0	1	12	  0	   0	  9	DEGREES TRUE  	DIRECTION OF MOTION OBSERVING PLATFORM  
-0	1	13	  0	   0	 10	METER/SECOND  	SPEED OF MOTION OF OBSERVING PLATFORM   
-0	1	14	  2	   0	 10	METER/SECOND  	PLATFORM DRIFT SPEED (HIGH PRECISION)   
-0	1	15	  0	   0	  4	CODE TABLE    	TRUE DIR OF MOVING PLATFORM PAST 3 HRS  
-0	1	16	  0	   0	  4	CODE TABLE    	AVG SPD MOVING PLATFORM PAST 3 HOURS    
-0	1	21	  0	   0	 14	NUMERIC       	SYNOPTIC FEATURE ID                     
-0	1	25	  0	   0	 24	CCITT IA5     	STORM IDENTIFIER                       *
-0	1	26	  0	   0	 64	CCITT IA5     	WMO STORM NAME                         *
-0	1	31	  0	   0	 16	CODE TABLE    	GENERATING CENTER                       
-0	1	32	  0	   0	  8	CODE TABLE    	GENERATING APPLICATION                  
-0	1	50	  0	   0	 48	CCITT IA5     	NMC REPORT IDENTIFIER                  *
-0	1	62	  0	   0	 40	CCITT IA5     	NAT'L ASSIGNED STATION IDENTIFIER      *
-0	1	63	  0	   0	 64	CCITT IA5     	ICAO LOCATION IDENTIFIER               *
-0	2	200	  0	   0	  4	CODE TABLE    	OBJECTIVE FORECAST TECHNIQUE USED       
-0	4	1	  0	   0	 12	YEAR          	YEAR                                    
-0	4	2	  0	   0	  4	MONTH         	MONTH                                   
-0	4	3	  0	   0	  6	DAY           	DAY                                     
-0	4	4	  0	   0	  5	HOUR          	HOUR                                    
-0	4	5	  0	   0	  6	MINUTE        	MINUTE                                  
-0	4	6	  0	   0	  6	SECOND        	SECOND                                  
-0	4	21	  0	-1024	11	YEARS         	TIME PERIOD OR DISPLACEMENT             
-0	4	22	  0	-1024	11	MONTHS        	TIME PERIOD OR DISPLACEMENT             
-0	4	23	  0	-1024	11	DAYS          	TIME PERIOD OR DISPLACEMENT             
-0	4	24	  0	-2048	12	HOURS         	TIME PERIOD OR DISPLACEMENT             
-0	4	25	  0	-2048	12	MINUTES       	TIME PERIOD OR DISPLACEMENT             
-0	4	26	  0	-4096	13	SECONDS       	TIME PERIOD OR DISPLACEMENT             
-0	4	31	  0	   0	  8	HOUR          	DUR OF TIME REL TO FOLLOWING VALUE      
-0	5	2	  2	-9000	15	DEGREES       	LATITUDE(COARSE ACCURACY)               
-0	6	2	  2	-18000	16	DEGREES       	LONGITUDE (COARSE ACCURACY)             
-0	8	21	  0	   0	  5	CODE TABLE    	TIME SIGNIFICANCE                       
-0	11	1	  0	   0	  9	DEGREES TRUE  	WIND DIRECTION                          
-0	11	2	  1	   0	 12	METERS/SECOND 	WIND SPEED                              
-0	11	3	  1	-4096	13	METERS/SECOND 	U-COMPONENT                             
-0	11	4	  1	-4096	13	METERS/SECOND 	V-COMPONENT                             
-0	11	5	  1	 -512	10	PASCALS/SECOND	W-COMPONENT                             
-0	11	6	  2	-4096	13	METERS/SECOND 	W-COMPONENT                             
-0	11	200	  1	    0	 12	METERS/SECOND 	INFLATED WIND SPEED (MOS)               
-0	11	201	  1	    0	 12	METERS/SECOND 	MEAN WIND SPEED PAST 12 HRS             
-0	12	1	  1	    0	 12	DEGREES KELVIN	TEMPERATURE/DRY BULB TEMPERATURE        
-0	12	2	  1	    0	 12	DEGREES KELVIN	WET BULB TEMPERATURE                    
-0	12	3	  1	    0	 12	DEGREES KELVIN	DEW POINT TEMPERATURE                   
-0	12	200	  1	    0	 12	DEGREES KELVIN	DAYTIME MAX TEMPERATURE                 
-0	12	201	  1	    0	 12	DEGREES KELVIN	NIGHTTIME MIN TEMPERATURE               
-0	14	20	 -4	    0	 15	JOULES/METER**2	 GLOBAL SOLAR RAD INTEG OVER  24 HRS    
-0	14	31	  0	    0	 11	MIN           	TOTAL SUNSHINE                          
-0	14	32	  0	    0	 10	HOURS         	TOTAL SUNSHINE                          
-0	14	33	  0	    0	  9	%             	TOTAL SUNSHINE(PERCENTAGE)              
-0	14	200	  0	    0	  7	%             	PERCENT OF POSSIBLE SUNSHINE            
-0	20	11	  0	    0	  4	CODE TABLE    	CLOUD AMOUNT                            
-0	20	200	  0	    0	  7	%             	MEAN CLD COVER (OPAQUE) PAST 12 HRS     
-0	60	1	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .01 INCH PAST 6HRS 
-0	60	2	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .01 INCH PAST 12HRS
-0	60	3	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .01 INCH PAST 24HRS
-0	60	4	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .10 INCH PAST 6HRS 
-0	60	5	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .10 INCH PAST 12HRS
-0	60	6	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .10 INCH PAST 24HRS
-0	60	7	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .25 INCH PAST 6HRS 
-0	60	8	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .25 INCH PAST 12HRS
-0	60	9	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .25 INCH PAST 24HRS
-0	60	10	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .50 INCH PAST 6HRS 
-0	60	11	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .50 INCH PAST 12HRS
-0	60	12	  0	    0	  7	%             	PROB. OF LIQ PCPN GE .50 INCH PAST 24HRS
-0	60	13	  0	    0	  7	%             	PROB. OF LIQ PCP GE 1.00 INCH PAST 6 HRS
-0	60	14	  0	    0	  7	%             	PROB. OF LIQ PCP GE 1.00 INCH PAST 12HRS
-0	60	15	  0	    0	  7	%             	PROB. OF LIQ PCP GE 1.00 INCH PAST 24HRS
-0	60	16	  0	    0	  7	%             	PROB. OF LIQ PCP GE 2.00 INCH PAST 12HRS
-0	60	17	  0	    0	  7	%             	PROB. OF LIQ PCP GE 2.00 INCH PAST 24HRS
-0	60	18	  0	    0	  7	%             	REL FRQ GE .01 LQ EQV PCP PAST 12HRS    
-0	60	19	  0	    0	  7	%             	REL FRQ GE .01 LQ EQV PCP PAST 24HRS    
-0	60	20	  0	    0	  7	%             	COND PROB PCP TYPE FREEZING             
-0	60	21	  0	    0	  7	%             	COND PROB PCP TYPE SNOW                 
-0	60	22	  0	    0	  7	%             	COND PROB PCP TYPE LIQUID               
-0	60	23	  0	    0	  7	%             	COND PROB PCP TYPE DRIZZLE              
-0	60	24	  0	    0	  7	%             	COND PROB PCP TYPE CONTINUOUS           
-0	60	25	  0	    0	  7	%             	COND PROB PCP TYPE SHOWERS              
-0	60	26	  0	    0	  7	%             	PROB SNOW AMT GE TRACE PAST 6HRS        
-0	60	27	  0	    0	  7	%             	PROB SNOW AMT GE TRACE PAST 12HRS       
-0	60	28	  0	    0	  7	%             	PROB SNOW AMT GE TRACE PAST 24HRS       
-0	60	29	  0	    0	  7	%             	PROB SNOW AMT GE 2.0IN PAST 6HRS        
-0	60	30	  0	    0	  7	%             	PROB SNOW AMT GE 2.0IN PAST 12HRS       
-0	60	31	  0	    0	  7	%             	PROB SNOW AMT GE 2.0IN PAST 24HRS       
-0	60	32	  0	    0	  7	%             	PROB SNOW AMT GE 4.0IN PAST 12HRS       
-0	60	33	  0	    0	  7	%             	PROB SNOW AMT GE 4.0IN PAST 24HRS       
-0	60	34	  0	    0	  7	%             	PROB SNOW AMT GE 6.0IN PAST 12HRS       
-0	60	35	  0	    0	  7	%             	PROB SNOW AMT GE 6.0IN PAST 24HRS       
-0	60	36	  0	    0	  7	%             	COND PROB SNOW PAST 12 HRS              
-0	60	37	  0	    0	  7	%             	COND REL FRQ PROB SNOW PAST 12 HRS      
-0	60	38	  0	    0	  7	%             	PROB OPAQUE SKY COVER  CLEAR            
-0	60	39	  0	    0	  7	%             	PROB OPAQUE SKY COVER  SCATTERED        
-0	60	40	  0	    0	  7	%             	PROB OPAQUE SKY COVER  BROKEN           
-0	60	41	  0	    0	  7	%             	PROB OPAQUE SKY COVER  OVERCAST         
-0	60	42	  0	    0	  7	%             	PROB CIG HGT < 200 FT                   
-0	60	43	  0	    0	  7	%             	PROB CIG HGT 200-400 FT                 
-0	60	44	  0	    0	  7	%             	PROB CIG HGT 500-900 FT                 
-0	60	45	  0	    0	  7	%             	PROB CIG HGT 1000-3000 FT               
-0	60	46	  0	    0	  7	%             	PROB CIG HGT 3100-6500 FT               
-0	60	47	  0	    0	  7	%             	PROB CIG HGT 6600-12000 FT              
-0	60	48	  0	    0	  7	%             	PROB CIG HGT GT 12000 FT                
-0	60	49	  0	    0	  7	%             	PROB VSBY < 0/2 MILES                   
-0	60	50	  0	    0	  7	%             	PROB VSBY < 0/2 - 7/8 MILES             
-0	60	51	  0	    0	  7	%             	PROB VSBY < 0 - 2 3/4 MILES             
-0	60	52	  0	    0	  7	%             	PROB VSBY < 3 - 5 MILES                 
-0	60	53	  0	    0	  7	%             	PROB VSBY > 5   MILES                   
-0	60	54	  0	    0	  7	%             	PROB OBS TO VISION  BLOWING PHENOM      
-0	60	55	  0	    0	  7	%             	PROB OBS TO VISION  HAZE                
-0	60	56	  0	    0	  7	%             	PROB OBS TO VISION  FOG                 
-0	60	57	  0	    0	  7	%             	PROB OBS TO VISION  NONE                
-0	60	58	  0	    0	  7	%             	PROB TSTM PAST 6 HRS                    
-0	60	59	  0	    0	  7	%             	PROB TSTM PAST 12HRS                    
-0	60	60	  0	    0	  7	%             	PROB TSTM PAST 24HRS                    
-0	60	61	  0	    0	  7	%             	PROB SVR WX PAST 6 HRS                  
-0	60	62	  0	    0	  7	%             	PROB SVR WX PAST 12HRS                  
-0	60	63	  0	    0	  7	%             	PROB SVR WX PAST 24HRS                  
-0	60	64	  0	    0	  7	%             	CLIM AVG CLD COVER (OPAQUE)             
-0	60	65	  1	    0	 12	METERS/SECOND 	CLIMATIC WIND SPEED                     
-0	60	66	  1	    0	 12	DEGREES KELVIN	CLIMATIC(NORMAL) DAY MAX TEMP           
-0	60	67	  1	    0	 12	DEGREES KELVIN	CLIMATIC(NORMAL) NIGHT MIN TEMP         
-0	60	71	  0	    0	  7	%             	PROB. OF PCPN AMT GE .01 INCH PAST 6HRS 
-0	60	72	  0	    0	  7	%             	PROB. OF PCPN AMT GE .01 INCH PAST 12HRS
-0	60	90	  0	    0	  4	CODE TABLE    	UANT PCP FCST (CATEGORIES)              
-0	60	91	  0	    0	  3	CODE TABLE    	COND PCP TYPE FCST (CATS)               
-0	60	92	  0	    0	  3	CODE TABLE    	COND PCP CHARACTER FCST (CATS)          
-0	60	93	  0	    0	  3	CODE TABLE    	QUANT SNOW AMT FCST (CATS)              
-0	60	94	  0	    0	  4	CODE TABLE    	CIG HEIGHT FCST (CATS)                  
-0	60	95	  0	    0	  3	CODE TABLE    	VISIBILITY FCST (CATS)                  
-0	60	96	  0	    0	  3	CODE TABLE    	OBSTRUCT TO VISION FCST (CATS)          
-0	60	97	  0	    0	  2	CODE TABLE    	THUNDERSTORM FCST (CATS)                
-0	60	98	  0	    0	  2	CODE TABLE    	SEVERE WEATHER FCST (CATS)              
-0	60	99	  0	    0	  3	CODE TABLE    	COMBINED CEILING/VISIBILITY (CATS)      
-0	63	255	  0	    0	  1	NUMERIC       	FILL BIT                                
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/NGMBufrTableD b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/NGMBufrTableD
deleted file mode 100644
index 55d60d5a2f..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/NGMBufrTableD
+++ /dev/null
@@ -1,1199 +0,0 @@
-3 00 002:
- 0 00 002,
- 0 00 003
-3 00 003:
- 0 00 010,
- 0 00 011,
- 0 00 012
-3 00 004:
- 3 00 003,
- 0 00 013,
- 0 00 014,
- 0 00 015,
- 0 00 016,
- 0 00 017,
- 0 00 018,
- 0 00 019,
- 0 00 020
-3 00 010:
- 3 00 003,
- 1 01 000,
- 0 31 001,
- 0 00 030
-3 01 001:
- 0 01 001,
- 0 01 002
-3 01 002:
- 0 01 003,
- 0 01 004,
- 0 01 005
-3 01 003:
- 0 01 011,
- 0 01 012,
- 0 01 013
-3 01 011:
- 0 04 001,
- 0 04 002,
- 0 04 003
-3 01 012:
- 0 04 004,
- 0 04 005
-3 01 013:
- 3 01 012,
- 0 04 006
-3 01 021:
- 0 05 001,
- 0 06 001
-3 01 022:
- 3 01 021,
- 0 07 001
-3 01 023:
- 0 05 002,
- 0 06 002
-3 01 024:
- 3 01 023,
- 0 07 001
-3 01 025:
- 3 01 023,
- 0 04 003,
- 3 01 012
-3 01 026:
- 3 01 021,
- 0 04 003,
- 0 04 003,
- 0 04 004,
- 0 04 004,
- 0 04 005,
- 0 04 005
-3 01 031:
- 3 01 001,
- 0 02 001,
- 3 01 011,
- 3 01 012,
- 3 01 022
-3 01 032:
- 3 01 001,
- 0 02 001,
- 3 01 011,
- 3 01 012,
- 3 01 024
-3 01 033:
- 0 01 005,
- 0 02 001,
- 3 01 011,
- 3 01 012,
- 3 01 021
-3 01 034:
- 0 01 005,
- 0 02 001,
- 3 01 011,
- 3 01 012,
- 3 01 023
-3 01 035:
- 0 01 005,
- 0 01 012,
- 0 01 013,
- 0 02 001,
- 3 01 011,
- 3 01 012,
- 3 01 023
-3 01 036:
- 3 01 003,
- 0 02 001,
- 3 01 011,
- 3 01 012,
- 3 01 023
-3 01 037:
- 3 01 001,
- 0 02 011,
- 0 02 012,
- 3 01 011,
- 3 01 012,
- 3 01 022
-3 01 038:
- 3 01 001,
- 0 02 011,
- 0 02 012,
- 3 01 011,
- 3 01 012,
- 3 01 024
-3 01 039:
- 3 01 003,
- 0 01 011,
- 0 01 012,
- 3 01 011,
- 3 01 012,
- 3 01 023
-3 01 040:
- 3 01 003,
- 0 02 011,
- 0 02 012,
- 3 01 011,
- 3 01 012,
- 3 01 024
-3 01 041:
- 0 01 007,
- 0 02 021,
- 0 02 022,
- 3 01 011,
- 3 01 012
-3 01 042:
- 3 01 041,
- 3 01 021
-3 01 043:
- 0 01 007,
- 0 02 023,
- 3 01 011,
- 3 01 013,
- 3 01 021
-3 01 044:
- 0 01 007,
- 0 02 024,
- 3 01 011
-3 01 051:
- 0 01 006,
- 0 02 061,
- 3 01 011,
- 3 01 012,
- 3 01 021,
- 0 08 004
-3 01 062:
- 1 01 000,
- 0 31 001,
- 3 01 001
-3 01 190:
- 0 04 192,
- 0 04 193
-3 01 191:
- 0 08 192,
- 0 08 193,
- 0 08 194,
- 0 08 195,
- 0 08 196
-3 01 192:
- 3 01 011,
- 0 04 004,
- 3 01 023
-3 02 001:
- 0 10 004,
- 0 10 051,
- 0 10 061,
- 0 10 063
-3 02 002:
- 0 10 004,
- 0 07 004,
- 0 10 003,
- 0 10 061,
- 0 10 063
-3 02 003:
- 0 11 011,
- 0 11 012,
- 0 12 004,
- 0 12 006,
- 0 13 003,
- 0 20 001,
- 0 20 003,
- 0 20 004,
- 0 20 005
-3 02 004:
- 0 20 010,
- 0 08 002,
- 0 20 011,
- 0 20 013,
- 0 20 012,
- 0 20 012,
- 0 20 012
-3 02 005:
- 0 08 002,
- 0 20 011,
- 0 20 012,
- 0 20 013
-3 02 011:
- 3 02 001,
- 3 02 003,
- 3 02 004
-3 02 012:
- 3 02 002,
- 3 02 003,
- 3 02 004
-3 02 021:
- 0 22 001,
- 0 22 011,
- 0 22 021
-3 02 022:
- 0 22 002,
- 0 22 012,
- 0 22 022
-3 02 023:
- 0 22 003,
- 0 22 013,
- 0 22 023
-3 02 024:
- 3 02 022,
- 3 02 023,
- 3 02 023
-3 02 190:
- 0 10 051,
- 0 10 061,
- 0 10 063,
- 0 11 001,
- 0 11 002,
- 0 12 001,
- 0 12 003
-3 02 191:
- 0 12 011,
- 0 12 012,
- 0 20 062,
- 0 20 063
-3 02 192:
- 0 20 001,
- 3 02 193
-3 02 193:
- 0 20 001,
- 3 02 197
-3 02 194:
- 0 04 031,
- 0 13 011
-3 02 195:
- 0 02 002,
- 0 11 041,
- 0 10 052,
- 0 04 031,
- 0 13 012,
- 0 13 013,
- 0 10 192,
- 0 10 062
-3 02 196:
- 0 10 004,
- 3 02 193
-3 02 197:
- 0 20 003,
- 0 20 004,
- 0 20 005
-3 02 199:
- 3 01 032,
- 3 01 190,
- 3 01 191,
- 3 02 190
-3 03 001:
- 0 07 003,
- 0 11 001,
- 0 11 002
-3 03 002:
- 0 07 004,
- 0 11 001,
- 0 11 002
-3 03 003:
- 0 07 004,
- 0 10 003,
- 0 12 001,
- 0 12 003
-3 03 004:
- 3 03 003,
- 0 11 001,
- 0 11 002
-3 03 011:
- 0 07 003,
- 0 08 001,
- 0 11 001,
- 0 11 002
-3 03 012:
- 0 07 004,
- 0 08 001,
- 0 11 001,
- 0 11 002
-3 03 013:
- 0 07 004,
- 0 08 001,
- 0 10 003,
- 0 12 001,
- 0 13 003,
- 0 11 001,
- 0 11 002
-3 03 014:
- 0 07 004,
- 0 08 001,
- 0 10 003,
- 0 12 001,
- 0 12 003,
- 0 11 001,
- 0 11 002
-3 03 021:
- 0 07 004,
- 0 07 004,
- 2 04 007,
- 0 31 021
-3 03 022:
- 3 03 021,
- 0 10 003,
- 2 04 000
-3 03 023:
- 3 03 021,
- 0 12 001,
- 2 04 000
-3 03 024:
- 3 03 021,
- 0 13 016,
- 2 04 000
-3 03 025:
- 0 02 025,
- 2 04 007,
- 0 31 021,
- 0 12 063,
- 2 04 000
-3 03 026:
- 0 07 004,
- 0 08 003,
- 2 04 007,
- 0 31 021,
- 0 12 001,
- 2 04 000
-3 03 027:
- 0 07 004,
- 2 04 007,
- 0 31 021,
- 0 10 003,
- 2 04 000
-3 03 031:
- 0 07 004,
- 0 08 003,
- 0 07 021,
- 0 07 022,
- 0 08 012,
- 0 12 061
-3 03 032:
- 0 20 011,
- 0 20 016
-3 03 192:
- 0 01 007,
- 3 01 011,
- 3 01 013,
- 3 01 023,
- 3 03 193,
- 3 03 194,
- 3 03 195,
- 3 03 196,
- 3 03 197
-3 03 193:
- 0 05 022,
- 0 08 012,
- 0 12 061,
- 0 08 003,
- 0 07 004,
- 0 02 022,
- 0 27 020,
- 0 22 042,
- 0 08 003
-3 03 194:
- 1 03 015,
- 0 07 004,
- 0 07 004,
- 0 12 007,
- 0 08 003,
- 1 03 003,
- 0 07 004,
- 0 07 004,
- 0 13 016,
- 0 08 003
-3 03 195:
- 0 07 004,
- 0 12 007,
- 0 08 003,
- 0 15 001,
- 0 08 003,
- 0 07 004,
- 0 20 010,
- 0 02 021
-3 03 196:
- 1 01 020,
- 0 12 062,
- 0 02 021,
- 1 01 004,
- 0 12 062,
- 0 02 021
-3 03 197:
- 1 01 003,
- 0 12 062,
- 1 03 020,
- 0 10 004,
- 0 12 007,
- 0 10 002,
- 1 02 005,
- 0 10 004,
- 0 12 003
-3 04 001:
- 0 08 003,
- 0 10 004,
- 0 12 001,
- 0 11 001,
- 0 11 002
-3 04 002:
- 0 08 003,
- 0 10 004,
- 0 11 001,
- 0 11 002
-3 04 003:
- 0 08 003,
- 0 12 001
-3 04 004:
- 0 08 003,
- 0 10 004,
- 0 20 010,
- 0 12 001
-3 04 005:
- 0 02 024,
- 0 07 004,
- 0 07 004,
- 0 13 003
-3 04 006:
- 0 14 001,
- 0 14 001,
- 0 14 003
-3 06 001:
- 0 02 032,
- 1 02 000,
- 0 31 001,
- 0 07 062,
- 0 22 042
-3 06 002:
- 0 02 031,
- 0 22 004,
- 0 22 031
-3 06 003:
- 0 02 002,
- 0 11 011,
- 0 11 012,
- 0 12 004
-3 06 004:
- 0 02 032,
- 0 02 033,
- 1 03 000,
- 0 31 001,
- 0 07 062,
- 0 22 042,
- 0 22 062
-3 06 005:
- 0 02 031,
- 1 03 000,
- 0 31 001,
- 0 07 062,
- 0 22 004,
- 0 22 031
-3 06 006:
- 3 06 003,
- 3 06 002,
- 0 22 063
-3 06 007:
- 0 01 012,
- 0 01 014,
- 3 06 008,
- 0 04 024,
- 0 27 003,
- 0 28 003
-3 06 008:
- 0 02 034,
- 0 02 035,
- 0 02 036
-3 06 009:
- 0 10 004,
- 0 10 061,
- 0 10 063,
- 0 11 001,
- 0 11 002,
- 0 12 004,
- 0 13 003,
- 0 22 042
-3 07 001:
- 3 01 031,
- 3 02 011
-3 07 002:
- 3 01 032,
- 3 02 011
-3 07 003:
- 3 07 001,
- 1 01 000,
- 0 31 001,
- 3 02 005
-3 07 004:
- 3 07 002,
- 1 01 000,
- 0 31 001,
- 3 02 005
-3 07 005:
- 3 07 001,
- 1 01 004,
- 3 02 005
-3 07 006:
- 3 07 002,
- 1 01 004,
- 3 02 005
-3 07 007:
- 3 01 031,
- 3 02 012
-3 07 008:
- 3 01 032,
- 3 02 012
-3 07 192:
- 0 20 011,
- 0 20 012,
- 0 20 013
-3 07 193:
- 3 02 199,
- 0 20 001,
- 0 20 010,
- 0 12 011,
- 0 12 012,
- 0 20 062,
- 3 02 194
-3 07 194:
- 3 02 199,
- 0 20 001,
- 3 02 004,
- 3 02 005,
- 3 02 191,
- 3 02 194
-3 07 195:
- 3 02 199,
- 0 10 004,
- 3 02 193,
- 3 02 004,
- 1 01 002,
- 3 02 005,
- 3 02 191,
- 3 02 194
-3 07 196:
- 3 02 199,
- 3 02 196,
- 3 02 004,
- 1 01 004,
- 3 02 005,
- 3 02 191,
- 1 01 002,
- 3 02 194,
- 3 02 195
-3 07 197:
- 3 02 199,
- 3 02 194
-3 08 001:
- 3 01 033,
- 3 02 011,
- 0 22 042
-3 08 002:
- 3 01 034,
- 3 02 011,
- 0 22 042
-3 08 003:
- 3 01 035,
- 3 02 011,
- 0 22 042
-3 08 004:
- 3 01 036,
- 3 02 011,
- 0 22 042
-3 08 005:
- 3 08 004,
- 3 02 024
-3 08 006:
- 0 10 004,
- 0 10 061,
- 0 10 063,
- 0 11 001,
- 0 11 002,
- 0 12 004,
- 0 13 003,
- 0 22 042
-3 09 001:
- 3 01 037,
- 1 01 000,
- 0 31 001,
- 3 03 011
-3 09 002:
- 3 01 038,
- 1 01 000,
- 0 31 001,
- 3 03 011
-3 09 003:
- 3 01 037,
- 1 01 000,
- 0 31 001,
- 3 03 012
-3 09 004:
- 3 01 038,
- 1 01 000,
- 0 31 001,
- 3 03 012
-3 09 005:
- 3 01 037,
- 3 02 004,
- 1 01 000,
- 0 31 001,
- 3 03 013
-3 09 006:
- 3 01 038,
- 3 02 004,
- 1 01 000,
- 0 31 001,
- 3 03 013
-3 09 007:
- 3 01 004,
- 3 02 004,
- 1 01 000,
- 0 31 001,
- 3 03 014
-3 09 008:
- 3 01 038,
- 3 02 004,
- 1 01 000,
- 0 31 001,
- 3 03 014
-3 09 011:
- 3 01 039,
- 1 01 000,
- 0 31 001,
- 3 03 011
-3 09 012:
- 3 01 039,
- 1 01 000,
- 0 31 001,
- 3 03 012
-3 09 013:
- 3 01 039,
- 3 02 004,
- 1 01 000,
- 0 31 001,
- 3 03 013
-3 09 014:
- 3 01 039,
- 3 02 004,
- 1 01 000,
- 0 31 001,
- 3 03 014
-3 09 015:
- 3 09 016,
- 3 09 017,
- 3 09 018
-3 09 016:
- 3 01 040,
- 1 01 000,
- 0 31 001,
- 3 03 012
-3 09 017:
- 3 01 040,
- 3 02 004,
- 1 01 000,
- 0 31 001,
- 3 03 013
-3 09 018:
- 3 01 040,
- 3 02 004,
- 1 01 000,
- 0 31 001,
- 3 03 014
-3 09 019:
- 3 01 031,
- 0 02 003,
- 1 01 000,
- 0 31 001,
- 3 03 011
-3 09 020:
- 3 01 031,
- 0 02 003,
- 1 04 000,
- 0 31 001,
- 0 07 003,
- 0 11 003,
- 0 11 004,
- 0 11 005
-3 10 001:
- 3 01 042,
- 3 03 031,
- 3 03 032,
- 1 01 026,
- 3 03 025
-3 10 002:
- 3 01 042,
- 3 03 031,
- 3 03 032,
- 1 01 009,
- 3 03 023
-3 10 003:
- 3 01 042,
- 3 03 031,
- 3 03 032,
- 1 01 006,
- 3 03 023
-3 10 004:
- 3 01 042,
- 3 03 031,
- 3 03 032,
- 1 01 003,
- 3 03 024
-3 11 001:
- 3 01 051,
- 0 07 002,
- 0 12 001,
- 0 11 001,
- 0 11 002,
- 0 11 031,
- 0 11 032,
- 0 11 033,
- 0 20 041
-3 12 001:
- 3 01 043,
- 3 04 001
-3 12 002:
- 3 01 043,
- 3 04 002
-3 12 003:
- 3 01 042,
- 3 04 003
-3 12 004:
- 3 01 042,
- 3 04 004
-3 12 005:
- 3 01 042,
- 0 20 014
-3 12 006:
- 3 01 042,
- 3 04 005
-3 12 007:
- 3 01 042,
- 3 04 006
-3 12 010:
- 0 01 007,
- 0 05 040,
- 0 02 021,
- 0 05 041,
- 0 04 001,
- 0 04 043
-3 12 011:
- 2 02 131,
- 2 01 149,
- 0 04 006,
- 2 01 000,
- 2 02 132,
- 0 10 002,
- 2 02 000,
- 0 05 043,
- 0 05 053
-3 12 012:
- 2 02 130,
- 2 01 132,
- 1 01 019,
- 0 12 063,
- 2 01 000,
- 2 02 000
-3 12 013:
- 0 05 042,
- 2 02 130,
- 2 01 135,
- 0 12 063,
- 2 01 000,
- 2 02 000
-3 12 014:
- 3 12 010,
- 3 12 011,
- 1 05 056,
- 3 01 023,
- 0 05 042,
- 0 05 052,
- 3 12 012,
- 3 12 013
-3 12 015:
- 1 09 011,
- 3 01 023,
- 0 05 042,
- 0 05 052,
- 2 02 129,
- 2 01 132,
- 1 01 004,
- 0 12 063,
- 2 02 000,
- 2 01 000
-3 12 016:
- 3 12 010,
- 3 12 011,
- 3 12 015
-3 12 017:
- 1 09 008,
- 3 01 023,
- 0 05 042,
- 0 05 052,
- 2 02 129,
- 2 01 132,
- 1 01 003,
- 0 12 063,
- 2 02 000,
- 2 01 000
-3 12 018:
- 3 12 010,
- 3 12 011,
- 3 12 017
-3 13 009:
- 0 21 001,
- 1 01 000,
- 0 31 001,
- 0 21 001
-3 13 010:
- 0 21 036,
- 1 01 000,
- 0 31 001,
- 0 21 036
-3 13 031:
- 0 06 002,
- 0 06 012,
- 1 01 000,
- 0 31 002,
- 0 30 001
-3 13 032:
- 0 05 002,
- 0 05 012,
- 1 01 000,
- 0 31 002,
- 3 13 031
-3 13 041:
- 0 06 002,
- 0 06 012,
- 1 06 000,
- 0 31 001,
- 1 01 000,
- 0 31 011,
- 0 30 001,
- 1 01 000,
- 0 31 001,
- 0 30 001
-3 13 042:
- 0 05 002,
- 0 05 012,
- 1 01 000,
- 0 31 002,
- 3 13 041
-3 15 001:
- 0 08 003,
- 3 01 011,
- 3 01 012,
- 3 01 023,
- 3 06 001
-3 15 002:
- 0 08 003,
- 3 01 011,
- 3 01 012,
- 3 01 023,
- 3 06 004
-3 16 001:
- 3 01 192,
- 0 01 021,
- 0 02 041,
- 0 19 001,
- 0 10 051,
- 0 19 002,
- 0 19 003,
- 0 19 004
-3 18 001:
- 3 01 025,
- 0 24 011
-3 18 003:
- 3 01 026,
- 0 24 005,
- 0 24 004,
- 0 24 021
-3 18 004:
- 3 01 025,
- 0 04 031,
- 0 13 011,
- 0 24 005,
- 0 24 004,
- 0 24 022
-3 21 001:
- 0 02 101,
- 0 02 114,
- 0 02 105,
- 0 02 106,
- 0 02 107,
- 0 02 121
-3 21 003:
- 0 21 051,
- 0 21 014,
- 0 21 017,
- 0 21 030
-3 21 004:
- 3 01 031,
- 0 02 003,
- 1 01 000,
- 0 31 001,
- 3 21 003
-3 21 005:
- 0 25 004,
- 0 02 121,
- 0 02 122,
- 0 02 123,
- 0 02 124,
- 0 02 125,
- 0 02 126,
- 0 02 127,
- 3 21 192
-3 21 006:
- 0 25 001,
- 0 25 002,
- 0 25 003,
- 0 25 005
-3 21 007:
- 0 25 009,
- 0 25 010,
- 0 25 011,
- 0 25 012,
- 0 25 013,
- 0 25 015,
- 0 25 016,
- 0 25 017
-3 21 008:
- 0 25 006,
- 0 25 007,
- 0 25 008
-3 21 009:
- 0 25 018,
- 0 25 019
-3 21 010:
- 0 02 101,
- 0 07 002,
- 0 02 102,
- 0 02 103,
- 0 02 104,
- 0 02 105,
- 0 02 106,
- 0 02 107,
- 0 02 108,
- 3 21 193
-3 21 011:
- 0 30 031,
- 0 30 032,
- 0 29 002
-3 21 012:
- 1 01 000,
- 0 31 001,
- 0 02 135
-3 21 192:
- 0 02 128,
- 0 02 129,
- 0 02 130,
- 0 02 131
-3 21 193:
- 0 02 109,
- 0 02 110,
- 0 02 132,
- 0 02 133
-3 55 001:
- 3 55 004,
- 3 55 005,
- 0 12 192,
- 0 12 001,
- 0 11 001,
- 0 11 002,
- 0 02 061,
- 0 10 194
-3 55 002:
- 0 11 031,
- 0 11 032,
- 0 11 033
-3 55 003:
- 0 20 041,
- 0 58 003,
- 0 58 004
-3 55 004:
- 0 58 001,
- 0 58 002,
- 0 01 008,
- 0 01 006,
- 3 01 011,
- 3 01 012,
- 0 04 192,
- 0 04 193,
- 3 01 023
-3 55 005:
- 0 02 043,
- 0 08 193,
- 0 08 194,
- 0 08 195,
- 0 08 196,
- 0 02 042,
- 0 07 192,
- 0 07 004
-3 58 001:
- 0 58 001,
- 0 01 011,
- 0 01 008,
- 0 01 006,
- 3 01 011,
- 3 01 012,
- 0 04 192,
- 0 04 193,
- 3 58 002,
- 3 58 003
-3 58 002:
- 0 02 043,
- 0 08 193,
- 0 08 194,
- 0 08 195,
- 0 08 196,
- 0 02 042,
- 0 07 192,
- 0 07 004,
- 0 08 004,
- 0 12 192
-3 58 003:
- 0 12 001,
- 0 11 001,
- 0 11 002,
- 0 02 061,
- 0 10 194
-3 58 004:
- 0 11 031,
- 0 11 032,
- 0 11 033
-3 58 005:
- 0 20 041,
- 0 58 003,
- 0 58 004
-3 59 001:
- 3 59 002,
- 3 59 003,
- 3 59 004,
- 3 59 005,
- 3 59 006,
- 3 59 007,
- 3 59 008
-3 59 002:
- 0 58 001,
- 0 01 011,
- 3 01 011,
- 3 01 012,
- 3 01 023,
- 0 07 001
-3 59 003:
- 0 04 192,
- 0 04 193,
- 0 08 193,
- 0 08 194,
- 0 08 195,
- 0 08 196,
- 0 02 002
-3 59 004:
- 0 01 012,
- 0 01 013,
- 0 10 004,
- 0 10 051,
- 0 04 031,
- 0 10 063,
- 0 10 061,
- 0 10 062,
- 0 12 001,
- 0 12 003
-3 59 005:
- 0 11 001,
- 0 11 002,
- 0 04 031,
- 0 11 041,
- 0 12 011,
- 0 12 012,
- 0 04 031,
- 0 13 011,
- 0 04 031,
- 0 13 011
-3 59 006:
- 0 20 001,
- 0 20 003,
- 0 20 004,
- 0 20 005,
- 0 20 010,
- 0 20 063,
- 0 20 063,
- 0 08 002,
- 0 20 011,
- 0 10 013
-3 59 007:
- 0 20 012,
- 0 20 012,
- 0 20 012,
- 1 04 004,
- 0 08 002,
- 0 20 011,
- 0 20 012,
- 0 20 013
-3 59 008:
- 0 22 042,
- 0 22 012,
- 0 22 022,
- 1 01 002,
- 3 02 023,
- 0 20 031,
- 0 20 032,
- 0 20 032
-3 60 001:
- 3 60 002,
- 3 60 003,
- 3 60 004,
- 3 60 005,
- 3 60 006,
- 3 60 007,
- 3 60 008
-3 60 002:
- 0 58 001,
- 3 01 001,
- 3 01 011,
- 3 01 012,
- 3 01 023,
- 3 59 003
-3 60 003:
- 0 07 004,
- 0 10 004,
- 0 10 192,
- 0 10 051,
- 0 04 031,
- 0 10 063,
- 0 10 061,
- 0 10 062,
- 0 12 001,
- 0 12 003
-3 60 004:
- 0 11 001,
- 0 11 002,
- 0 04 031,
- 0 11 041,
- 0 12 011,
- 0 12 012,
- 0 10 052
-3 60 005:
- 0 04 031,
- 0 13 011,
- 0 40 031,
- 0 13 011,
- 0 40 031,
- 0 13 012,
- 0 13 013
-3 60 006:
- 0 20 062,
- 0 20 003,
- 0 20 004,
- 0 20 005,
- 0 20 010,
- 0 20 063,
- 0 20 063
-3 60 007:
- 0 20 001,
- 0 08 002,
- 0 20 011,
- 0 20 013,
- 0 20 012,
- 0 20 012,
- 0 20 012
-3 60 008:
- 1 04 004,
- 0 08 002,
- 0 20 011,
- 0 20 012,
- 0 20 013,
- 0 22 042,
- 0 22 012,
- 0 22 022,
- 3 02 023,
- 0 02 001
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/mosFilenames.properties b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/mosFilenames.properties
index e291cf6060..7e148c319c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/mosFilenames.properties
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/bufrtables/mosFilenames.properties
@@ -44,18 +44,6 @@ JSMT35_KWNO=AVN
 JSMT36_KWNO=AVN
 JSMT37_KWNO=AVN
 #----------------------
-#- NGM
-#----------------------
-JSMT41_KWBC=NGM
-JSMT42_KWBC=NGM
-JSMT43_KWBC=NGM
-JSMT44_KWBC=NGM
-JSMT45_KWBC=NGM
-JSMT46_KWBC=NGM
-JSMT47_KWBC=NGM
-JSMT48_KWBC=NGM
-JSMT49_KWBC=NGM
-#----------------------
 #- HPC
 #----------------------
 JSMT71_KWNH=HPC
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/pointdata/bufrmosNGM.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/pointdata/bufrmosNGM.xml
deleted file mode 100644
index 0a772ed0b5..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/pointdata/bufrmosNGM.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-    <!--
-        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-        
-        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-        This_software_product_contains_export-restricted_data_whose
-        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-        an_export_license_or_other_authorization.
-        
-        Contractor_Name:________Raytheon_Company
-        Contractor_Address:_____6825_Pine_Street,_Suite_340
-        ________________________Mail_Stop_B8
-        ________________________Omaha,_NE_68106
-        ________________________402.291.0100
-        
-        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-        further_licensing_information.
-    -->
-<pointDataDescription>
-  <parameter name="snow12hr_cat2" numDims="1" type="INT" unit="%"/>
-  <parameter name="precipType" numDims="1" type="INT" />
-  <parameter name="ceiling_cat1" numDims="1" type="INT" unit="%"/>
-  <parameter name="ceiling_cat2" numDims="1" type="INT" unit="%"/>
-  <parameter name="snow12hr_cat3" numDims="1" type="INT" unit="%"/>
-  <parameter name="ceiling_cat4" numDims="1" type="INT" unit="%"/>
-  <parameter name="ceiling_cat5" numDims="1" type="INT" unit="%"/>
-  <parameter name="PQPF6hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="ceiling_cat7" numDims="1" type="INT" unit="%"/>
-  <parameter name="vis_bestCat" numDims="1" type="INT" />
-  <parameter name="vis_cat4" numDims="1" type="INT" unit="%"/>
-  <parameter name="vis_cat1" numDims="1" type="INT" unit="%"/>
-  <parameter name="precipSnow" numDims="1" type="INT" unit="%"/>
-  <parameter name="vis_cat3" numDims="1" type="INT" unit="%"/>
-  <parameter name="snow12hr_bestCat" numDims="1" type="INT" />
-  <parameter name="QPF6hr_cat3" numDims="1" type="INT" unit="%"/>
-  <parameter name="QPF6hr_cat2" numDims="1" type="INT" unit="%"/>
-  <parameter name="QPF6hr_cat1" numDims="1" type="INT" unit="%"/>
-  <parameter name="severe12hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="windSpeedInflated" numDims="1" type="FLOAT" unit="m/s" />
-  <parameter name="obVis_bestCat" numDims="1" type="INT" />
-  <parameter name="obVis_cat4" numDims="1" type="INT" unit="%"/>
-  <parameter name="clouds_SC" numDims="1" type="INT" unit="%"/>
-  <parameter name="QPF6hr_bestCat" numDims="1" type="INT" />
-  <parameter name="temperature" numDims="1" type="FLOAT" unit="K" />
-  <parameter name="snow12hr_cat1" numDims="1" type="INT" unit="%"/>
-  <parameter name="tstorm6hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="tstorm24hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="POP_rain" numDims="1" type="INT" unit="%"/>
-  <parameter name="snow6hr_bestCat" numDims="1" type="INT" />
-  <parameter name="POP_showers" numDims="1" type="INT" unit="%"/>
-  <parameter name="clouds_OV" numDims="1" type="INT" unit="%"/>
-  <parameter name="uwind" numDims="1" type="FLOAT" unit="m/s" />
-  <parameter name="clouds_BK" numDims="1" type="INT" unit="%"/>
-  <parameter name="QPF12hr_cat5" numDims="1" type="INT" unit="%"/>
-  <parameter name="QPF6hr_cat4" numDims="1" type="INT" unit="%"/>
-  <parameter name="QPF12hr_cat3" numDims="1" type="INT" unit="%"/>
-  <parameter name="POP12hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="QPF12hr_cat1" numDims="1" type="INT" unit="%"/>
-  <parameter name="ceiling_cat6" numDims="1" type="INT" unit="%"/>
-  <parameter name="ceiling_cat3" numDims="1" type="INT" unit="%"/>
-  <parameter name="POP6hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="dewpoint" numDims="1" type="FLOAT" unit="K" />
-  <parameter name="proj_hour" numDims="1" type="INT" />
-  <parameter name="obVis_cat3" numDims="1" type="INT" unit="%"/>
-  <parameter name="solarRad" numDims="1" type="FLOAT" unit="J/m**2" />
-  <parameter name="vis_cat2" numDims="1" type="INT" unit="%"/>
-  <parameter name="severe24hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="snow12hr_cat4" numDims="1" type="INT" unit="%"/>
-  <parameter name="POP_bestCat" numDims="1" type="INT" />
-  <parameter name="sunPop" numDims="1" type="INT" unit="%"/>
-  <parameter name="maxTemp24Hour" numDims="1" type="FLOAT" unit="K" />
-  <parameter name="precipFreezing" numDims="1" type="INT" unit="%"/>
-  <parameter name="ceiling_bestCat" numDims="1" type="INT" />
-  <parameter name="snow6hr_cat2" numDims="1" type="INT" unit="%"/>
-  <parameter name="clouds_bestCat" numDims="1" type="INT" />
-  <parameter name="tstorm12hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="vis_cat5" numDims="1" type="INT" unit="%"/>
-  <parameter name="QPF12hr_cat4" numDims="1" type="INT" unit="%"/>
-  <parameter name="PQPF12hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="vwind" numDims="1" type="FLOAT" unit="m/s" />
-  <parameter name="snow6hr_cat1" numDims="1" type="INT" unit="%"/>
-  <parameter name="QPF12hr_bestCat" numDims="1" type="INT" />
-  <parameter name="POP_drizzle" numDims="1" type="INT" unit="%"/>
-  <parameter name="Cig_Vis" numDims="1" type="INT" />
-  <parameter name="QPF12hr_cat2" numDims="1" type="INT" unit="%"/>
-  <parameter name="windDir" numDims="1" type="INT" unit="°"/>
-  <parameter name="windSpeed" numDims="1" type="FLOAT" unit="m/s" />
-  <parameter name="minTemp24Hour" numDims="1" type="FLOAT" unit="K" />
-  <parameter name="obVis_cat1" numDims="1" type="INT" unit="%"/>
-  <parameter name="obVis_cat2" numDims="1" type="INT" unit="%"/>
-  <parameter name="severe6hr" numDims="1" type="INT" unit="%"/>
-  <parameter name="sunHours" numDims="1" type="INT" unit="h"/>
-  <parameter name="clouds_CL" numDims="1" type="INT" unit="%"/>
-  <parameter name="precipRain" numDims="1" type="INT" unit="%"/>
-</pointDataDescription>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/spring/bufrmos-common-dataaccess.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/spring/bufrmos-common-dataaccess.xml
index 0004cfb3b7..8a1101ed1a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/spring/bufrmos-common-dataaccess.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/spring/bufrmos-common-dataaccess.xml
@@ -1,41 +1,36 @@
-<beans xmlns="http://www.springframework.org/schema/beans"	
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"    
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-	<bean id="bufrmosDataAccessFactory" class="com.raytheon.uf.common.pointdata.dataaccess.PointDataAccessFactory" />
-	
-	<bean factory-bean="dataAccessRegistry" factory-method="register">
-		<constructor-arg value="bufrmosAVN"/>
-		<constructor-arg ref="bufrmosDataAccessFactory"/>
-	</bean>	
-	
-	<bean factory-bean="dataAccessRegistry" factory-method="register">
-		<constructor-arg value="bufrmosETA"/>
-		<constructor-arg ref="bufrmosDataAccessFactory"/>
-	</bean>	
-	
-	<bean factory-bean="dataAccessRegistry" factory-method="register">
-		<constructor-arg value="bufrmosGFS"/>
-		<constructor-arg ref="bufrmosDataAccessFactory"/>
-	</bean>	
-	
-	<bean factory-bean="dataAccessRegistry" factory-method="register">
-		<constructor-arg value="bufrmosHPC"/>
-		<constructor-arg ref="bufrmosDataAccessFactory"/>
-	</bean>	
-	
-	<bean factory-bean="dataAccessRegistry" factory-method="register">
-		<constructor-arg value="bufrmosLAMP"/>
-		<constructor-arg ref="bufrmosDataAccessFactory"/>
-	</bean>	
-	
-	<bean factory-bean="dataAccessRegistry" factory-method="register">
-		<constructor-arg value="bufrmosMRF"/>
-		<constructor-arg ref="bufrmosDataAccessFactory"/>
-	</bean>	
-	
-	<bean factory-bean="dataAccessRegistry" factory-method="register">
-		<constructor-arg value="bufrmosNGM"/>
-		<constructor-arg ref="bufrmosDataAccessFactory"/>
-	</bean>	
+    <bean id="bufrmosDataAccessFactory" class="com.raytheon.uf.common.pointdata.dataaccess.PointDataAccessFactory" />
+
+    <bean factory-bean="dataAccessRegistry" factory-method="register">
+        <constructor-arg value="bufrmosAVN"/>
+        <constructor-arg ref="bufrmosDataAccessFactory"/>
+    </bean>
+
+    <bean factory-bean="dataAccessRegistry" factory-method="register">
+        <constructor-arg value="bufrmosETA"/>
+        <constructor-arg ref="bufrmosDataAccessFactory"/>
+    </bean>
+
+    <bean factory-bean="dataAccessRegistry" factory-method="register">
+        <constructor-arg value="bufrmosGFS"/>
+        <constructor-arg ref="bufrmosDataAccessFactory"/>
+    </bean>
+
+    <bean factory-bean="dataAccessRegistry" factory-method="register">
+        <constructor-arg value="bufrmosHPC"/>
+        <constructor-arg ref="bufrmosDataAccessFactory"/>
+    </bean>
+
+    <bean factory-bean="dataAccessRegistry" factory-method="register">
+        <constructor-arg value="bufrmosLAMP"/>
+        <constructor-arg ref="bufrmosDataAccessFactory"/>
+    </bean>
+
+    <bean factory-bean="dataAccessRegistry" factory-method="register">
+        <constructor-arg value="bufrmosMRF"/>
+        <constructor-arg ref="bufrmosDataAccessFactory"/>
+    </bean>
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/spring/bufrmos-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/spring/bufrmos-common.xml
index 86215648c7..63704fab5b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/spring/bufrmos-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/res/spring/bufrmos-common.xml
@@ -1,88 +1,76 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-	<bean id="bufrmosAvnProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-		<property name="pluginName" value="bufrmosAVN" />
-		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
-		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosAvnData" />
-	</bean>
-	
-	<bean factory-bean="pluginRegistry" factory-method="register">
-		<constructor-arg value="bufrmosAVN"/>
-		<constructor-arg ref="bufrmosAvnProperties"/>
-	</bean>
+    <bean id="bufrmosAvnProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
+        <property name="pluginName" value="bufrmosAVN" />
+        <property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+        <property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosAvnData" />
+    </bean>
 
-	<bean id="bufrmosEtaProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-		<property name="pluginName" value="bufrmosETA" />
-		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
-		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosEtaData" />
-	</bean>
-	
-	<bean factory-bean="pluginRegistry" factory-method="register">
-		<constructor-arg value="bufrmosETA"/>
-		<constructor-arg ref="bufrmosEtaProperties"/>
-	</bean>
+    <bean factory-bean="pluginRegistry" factory-method="register">
+        <constructor-arg value="bufrmosAVN"/>
+        <constructor-arg ref="bufrmosAvnProperties"/>
+    </bean>
 
-	<bean id="bufrmosGfsProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-		<property name="pluginName" value="bufrmosGFS" />
-		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
-		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosGfsData" />
-	</bean>
-	
-	<bean factory-bean="pluginRegistry" factory-method="register">
-		<constructor-arg value="bufrmosGFS"/>
-		<constructor-arg ref="bufrmosGfsProperties"/>
-	</bean>
+    <bean id="bufrmosEtaProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
+        <property name="pluginName" value="bufrmosETA" />
+        <property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+        <property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosEtaData" />
+    </bean>
 
-	<bean id="bufrmosHpcProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-		<property name="pluginName" value="bufrmosHPC" />
-		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
-		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosHpcData" />
-	</bean>
-	
-	<bean factory-bean="pluginRegistry" factory-method="register">
-		<constructor-arg value="bufrmosHPC"/>
-		<constructor-arg ref="bufrmosHpcProperties"/>
-	</bean>
+    <bean factory-bean="pluginRegistry" factory-method="register">
+        <constructor-arg value="bufrmosETA"/>
+        <constructor-arg ref="bufrmosEtaProperties"/>
+    </bean>
 
-	<bean id="bufrmosLampProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-		<property name="pluginName" value="bufrmosLAMP" />
-		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
-		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosLampData" />
-	</bean>
-	
-	<bean factory-bean="pluginRegistry" factory-method="register">
-		<constructor-arg value="bufrmosLAMP"/>
-		<constructor-arg ref="bufrmosLampProperties"/>
-	</bean>
+    <bean id="bufrmosGfsProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
+        <property name="pluginName" value="bufrmosGFS" />
+        <property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+        <property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosGfsData" />
+    </bean>
 
-	<bean id="bufrmosMrfProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-		<property name="pluginName" value="bufrmosMRF" />
-		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
-		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosMrfData" />
-	</bean>
-	
-	<bean factory-bean="pluginRegistry" factory-method="register">
-		<constructor-arg value="bufrmosMRF"/>
-		<constructor-arg ref="bufrmosMrfProperties"/>
-	</bean>
+    <bean factory-bean="pluginRegistry" factory-method="register">
+        <constructor-arg value="bufrmosGFS"/>
+        <constructor-arg ref="bufrmosGfsProperties"/>
+    </bean>
 
-	<bean id="bufrmosNgmProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-		<property name="pluginName" value="bufrmosNGM" />
-		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
-		<property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
-		<property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosNgmData" />
-	</bean>
-	
-	<bean factory-bean="pluginRegistry" factory-method="register">
-		<constructor-arg value="bufrmosNGM"/>
-		<constructor-arg ref="bufrmosNgmProperties"/>
-	</bean>
+    <bean id="bufrmosHpcProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
+        <property name="pluginName" value="bufrmosHPC" />
+        <property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+        <property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosHpcData" />
+    </bean>
+
+    <bean factory-bean="pluginRegistry" factory-method="register">
+        <constructor-arg value="bufrmosHPC"/>
+        <constructor-arg ref="bufrmosHpcProperties"/>
+    </bean>
+
+    <bean id="bufrmosLampProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
+        <property name="pluginName" value="bufrmosLAMP" />
+        <property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+        <property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosLampData" />
+    </bean>
+
+    <bean factory-bean="pluginRegistry" factory-method="register">
+        <constructor-arg value="bufrmosLAMP"/>
+        <constructor-arg ref="bufrmosLampProperties"/>
+    </bean>
+
+    <bean id="bufrmosMrfProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
+        <property name="pluginName" value="bufrmosMRF" />
+        <property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrmos" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMOSDao" />
+        <property name="record" value="com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosMrfData" />
+    </bean>
+
+    <bean factory-bean="pluginRegistry" factory-method="register">
+        <constructor-arg value="bufrmosMRF"/>
+        <constructor-arg ref="bufrmosMrfProperties"/>
+    </bean>
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosDecoder.java
index a42e3cb7dc..9e766f84e7 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosDecoder.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
@@ -56,6 +56,7 @@ import com.raytheon.uf.edex.plugin.bufrmos.decoder.BufrMOSDataAdapter;
  * Apr 08, 2008 1039       jkorman     Added traceId for tracing data.
  * Dec 08, 2008            chammack    Camel Refactor
  * May 14, 2013 1869       bsteffen    Remove DataURI column from bufrmos.
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -67,7 +68,7 @@ public class BufrMosDecoder extends AbstractDecoder {
     public static final String PLUGIN_NAME = "bufrmos";
 
     /** The logger */
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     /**
      * Empty constructor required by DecoderFactory.
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosSeparator.java
index bdfff7cb6f..fb1539af8d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/BufrMosSeparator.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.bufrmos;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.plugin.AbstractRecordSeparator;
@@ -55,6 +55,7 @@ import com.raytheon.uf.edex.plugin.bufrmos.decoder.MOSDescriptorDelegate;
  * May 14, 2014 2536       bclement    moved WMO Header to common
  * Jul 14, 2014 4543       dgilling    removed call to removed function in
  *                                     getSelector.
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * </pre>
  * 
  * @author jkorman
@@ -63,7 +64,7 @@ import com.raytheon.uf.edex.plugin.bufrmos.decoder.MOSDescriptorDelegate;
 public class BufrMosSeparator extends AbstractRecordSeparator implements
         IDescriptorFactorySelector {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private WMOHeader wmoHeader = null;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/MOSPointDataState.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/MOSPointDataState.java
index 8ef85298ea..3a62bca18b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/MOSPointDataState.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/MOSPointDataState.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.bufrmos;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
@@ -37,7 +37,8 @@ import com.raytheon.uf.common.serialization.SerializationException;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Apr 13, 2009            chammack     Initial creation
+ * Apr 13, 2009            chammack    Initial creation
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -47,7 +48,7 @@ import com.raytheon.uf.common.serialization.SerializationException;
 
 public class MOSPointDataState {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private Map<String, PointDataContainer> pointData;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMOSDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMOSDao.java
index 1241282ffb..85d8e50db1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMOSDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMOSDao.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -27,13 +27,12 @@ import javax.xml.bind.JAXBException;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosAvnData;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosData;
+import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosData.MOSType;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosEtaData;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosGfsData;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosHpcData;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosLampData;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosMrfData;
-import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosNgmData;
-import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosData.MOSType;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
 import com.raytheon.uf.common.datastorage.IDataStore;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -49,7 +48,8 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * 20080219            862 jkorman     Initial Coding.
+ * Feb 19, 2008 862        jkorman     Initial Coding.
+ * Feb 09, 2016 5283       nabowle     Remove NGM MOS support.
  * </pre>
  * 
  * @author jkorman
@@ -62,7 +62,7 @@ public class BufrMOSDao extends PointDataPluginDao<BufrMosData> {
 
     /**
      * Creates a new BufrMOSDao object.
-     * 
+     *
      * @throws PluginException
      */
     public BufrMOSDao(String pluginName) throws PluginException {
@@ -77,7 +77,7 @@ public class BufrMOSDao extends PointDataPluginDao<BufrMosData> {
 
     /**
      * Retrieves an MOS report using the datauri .
-     * 
+     *
      * @param dataURI
      *            The dataURI to match against.
      * @return The report record if it exists.
@@ -133,9 +133,6 @@ public class BufrMOSDao extends PointDataPluginDao<BufrMosData> {
         case MRF:
             rval = new BufrMosMrfData();
             break;
-        case NGM:
-            rval = new BufrMosNgmData();
-            break;
         }
         return rval;
     }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMosLocationDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMosLocationDao.java
index f74cf7c95b..6bcbc289e8 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMosLocationDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/dao/BufrMosLocationDao.java
@@ -20,6 +20,9 @@
 
 package com.raytheon.uf.edex.plugin.bufrmos.dao;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosDataLocation;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.database.dao.CoreDao;
@@ -35,6 +38,9 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
  * 4/7/09       1994        bphillip    Initial Creation
+ * Jan 19, 2016 4677        tgurney     Update checkLocation to search on
+ *                                      lat/lon/stationId instead of
+ *                                      primary key
  * 
  * </pre>
  * 
@@ -60,11 +66,23 @@ public class BufrMosLocationDao extends CoreDao {
      * @throws DataAccessLayerException
      *             If problems occur while querying
      */
+    @SuppressWarnings("unchecked")
     public BufrMosDataLocation checkLocation(BufrMosDataLocation location)
             throws DataAccessLayerException {
-        if (location.getId() == null) {
-            location.generateId();
+        List<String> fields = new ArrayList<String>();
+        List<Object> values = new ArrayList<Object>();
+        fields.add("latitude");
+        values.add(location.getLatitude());
+        fields.add("longitude");
+        values.add(location.getLongitude());
+        fields.add("stationId");
+        values.add(location.getStationId());
+        List<BufrMosDataLocation> results = (List<BufrMosDataLocation>) this
+                .queryByCriteria(fields, values);
+        if (results.isEmpty()) {
+            return null;
+        } else {
+            return results.get(0);
         }
-        return (BufrMosDataLocation) this.queryById(location.getId());
     }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BUFRMOSStaticData.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BUFRMOSStaticData.java
index 2b35f3cb0d..35937a3c16 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BUFRMOSStaticData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BUFRMOSStaticData.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -38,18 +38,19 @@ import com.raytheon.uf.edex.plugin.bufrmos.BufrMosSeparator;
 /**
  * BUFRMOS decoder static data loader class. Reads the mapping files for WMO
  * header to model name and BUFR descriptor to parameter name.
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Feb 21, 2002  861       jkorman      Initial creation
  * Jul 14, 2015  4543      dgilling     Refactor code.
- * 
+ * Feb 09, 2016  5283      nabowle      Remove NGM MOS support.
+ *
  * </pre>
- * 
+ *
  * @author jkorman
  * @version 1.0
  */
@@ -74,8 +75,6 @@ public class BUFRMOSStaticData {
 
     public static final Integer BUFRMOS_MRF = 1005;
 
-    public static final Integer BUFRMOS_NGM = 1006;
-
     public static final String MODEL_AVN = "AVN";
 
     public static final String MODEL_ETA = "ETA";
@@ -88,8 +87,6 @@ public class BUFRMOSStaticData {
 
     public static final String MODEL_MRF = "MRF";
 
-    public static final String MODEL_NGM = "NGM";
-
     private final Map<String, Map<String, BufrMOSElement>> elementMap;
 
     private final Map<String, Map<Integer, BufrMOSElement>> parameterMap;
@@ -103,8 +100,7 @@ public class BUFRMOSStaticData {
         this.fileNameTypes = getWMOHeaderMappings();
 
         List<String> modelNames = Arrays.asList(MODEL_AVN, MODEL_ETA,
-                MODEL_GFS, MODEL_GFS, MODEL_HPC, MODEL_LAMP, MODEL_MRF,
-                MODEL_NGM);
+                MODEL_GFS, MODEL_GFS, MODEL_HPC, MODEL_LAMP, MODEL_MRF);
 
         this.parameterMap = new HashMap<>();
         for (String modelName : modelNames) {
@@ -123,7 +119,7 @@ public class BUFRMOSStaticData {
 
     /**
      * Return the single instance of this class.
-     * 
+     *
      * @return The BUFRMOSStaticData instance.
      */
     public static synchronized BUFRMOSStaticData getInstance() {
@@ -135,7 +131,7 @@ public class BUFRMOSStaticData {
 
     /**
      * Map the WMO header for some data to a model name.
-     * 
+     *
      * @return The model name associated with the WMO header within the
      *         specified separator.
      */
@@ -150,7 +146,7 @@ public class BUFRMOSStaticData {
 
     /**
      * Get the BufrMOSElement definition for a specified parameter.
-     * 
+     *
      * @param model
      *            The model being used i.e. AVN.
      * @param parameter
@@ -226,7 +222,7 @@ public class BUFRMOSStaticData {
 
     /**
      * Convert a model name into its ordinal value.
-     * 
+     *
      * @param model
      *            A model name as a String.
      * @return The associated ordinal value for the model. Returns a null if no
@@ -246,15 +242,13 @@ public class BUFRMOSStaticData {
             modelType = BUFRMOS_LAMP;
         } else if (MODEL_MRF.equals(model)) {
             modelType = BUFRMOS_MRF;
-        } else if (MODEL_NGM.equals(model)) {
-            modelType = BUFRMOS_NGM;
         }
         return modelType;
     }
 
     /**
      * Convert a model ordinal value to its String name .
-     * 
+     *
      * @param modelType
      *            A model ordinal value.
      * @return The model name associated with a given ordinal value. Returns a
@@ -274,8 +268,6 @@ public class BUFRMOSStaticData {
             modelName = MODEL_LAMP;
         } else if (BUFRMOS_MRF.equals(modelType)) {
             modelName = MODEL_MRF;
-        } else if (BUFRMOS_NGM.equals(modelType)) {
-            modelName = MODEL_NGM;
         }
         return modelName;
     }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMOSDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMOSDataAdapter.java
index 739b75af57..5d57053bd4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMOSDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMOSDataAdapter.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -32,7 +32,6 @@ import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosGfsData;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosHpcData;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosLampData;
 import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosMrfData;
-import com.raytheon.uf.common.dataplugin.bufrmos.common.BufrMosNgmData;
 import com.raytheon.uf.common.pointdata.PointDataContainer;
 import com.raytheon.uf.common.pointdata.PointDataView;
 import com.raytheon.uf.common.time.DataTime;
@@ -50,11 +49,11 @@ import com.raytheon.uf.edex.plugin.bufrmos.MOSPointDataState;
 /**
  * This class creates a completed Model Output Statistics (MOS) entry from a
  * single "row" of data decoded from an input file.
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Feb 21, 2008 862        jkorman     Initial Coding.
@@ -65,8 +64,12 @@ import com.raytheon.uf.edex.plugin.bufrmos.MOSPointDataState;
  * May 14, 2014 2536       bclement    removed TimeTools usage
  * Jul 14, 2015 4543       dgilling    Stop using relative indexing to perform
  *                                     parameter mapping.
+ * Jan 19, 2016 4677       tgurney     Stop manually generating primary key
+ *                                     with generateId() (now using sequence
+ *                                     instead)
+ * Feb 09, 2016 5283       nabowle     Remove NGM MOS support.
  * </pre>
- * 
+ *
  * @author jkorman
  * @version 1.0
  */
@@ -105,7 +108,7 @@ public class BufrMOSDataAdapter {
 
     /**
      * Create a MOSData entry from the next available data in given iterator.
-     * 
+     *
      * @param iterator
      *            The iterator that was used to separate and decode the MOS
      *            data.
@@ -153,9 +156,6 @@ public class BufrMOSDataAdapter {
                 case MRF:
                     fcstData = new BufrMosMrfData();
                     break;
-                case NGM:
-                    fcstData = new BufrMosNgmData();
-                    break;
                 }
 
                 BufrMosDataLocation location = new BufrMosDataLocation();
@@ -188,7 +188,6 @@ public class BufrMOSDataAdapter {
                 } // for
 
                 // lookup mosLocation from cache
-                location.generateId();
                 location = locationCache.getLocation(location);
 
                 fcstData.setLocation(location);
@@ -241,7 +240,7 @@ public class BufrMOSDataAdapter {
     /**
      * Create a MOSElement entry from a decoded data packet and a definition
      * element.
-     * 
+     *
      * @param packet
      *            A packet containing the decoded data.
      * @param element
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMosLocationCache.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMosLocationCache.java
index 899be1d363..316d9ae2b3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMosLocationCache.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/BufrMosLocationCache.java
@@ -37,6 +37,8 @@ import com.raytheon.uf.edex.plugin.bufrmos.dao.BufrMosLocationDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 24, 2011            rjpeter     Initial creation
+ * Jan 19, 2016 4677       tgurney     Use hashCode instead of id
+ *                                     as key for caching
  * 
  * </pre>
  * 
@@ -59,11 +61,8 @@ public class BufrMosLocationCache {
 
     public BufrMosDataLocation getLocation(BufrMosDataLocation locationToLookup)
             throws DataAccessLayerException {
-        if (locationToLookup.getId() == null) {
-            locationToLookup.generateId();
-        }
 
-        Integer key = locationToLookup.getId();
+        Integer key = locationToLookup.hashCode();
 
         BufrMosDataLocation rval = null;
         WeakReference<BufrMosDataLocation> reference = null;
@@ -81,8 +80,8 @@ public class BufrMosLocationCache {
             }
 
             synchronized (locationCache) {
-                locationCache
-                        .put(key, new WeakReference<BufrMosDataLocation>(rval));
+                locationCache.put(key, new WeakReference<BufrMosDataLocation>(
+                        rval));
             }
         }
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/MOSDescriptorDelegate.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/MOSDescriptorDelegate.java
index 4b048ef3be..49e031a2fe 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/MOSDescriptorDelegate.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/MOSDescriptorDelegate.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -22,33 +22,35 @@ package com.raytheon.uf.edex.plugin.bufrmos.decoder;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.edex.bufrtools.descriptors.DescriptorFactory;
 import com.raytheon.uf.edex.bufrtools.descriptors.IDescriptorFactoryDelegate;
 import com.raytheon.uf.edex.bufrtools.descriptors.IDescriptorFactorySelector;
 
-
 /**
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  *                         jkorman     Initial creation.
  * Sep 16, 2014 #3628      mapeters    Replaced static imports.
- * 
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
+ * Feb 09, 2016 5283       nabowle     Remove NGM MOS support.
+ *
  * </pre>
- * 
+ *
  * @author jkorman
  * @version 1.0
  */
 
 public class MOSDescriptorDelegate implements IDescriptorFactoryDelegate {
-    private static Log logger = LogFactory.getLog(MOSDescriptorDelegate.class);
+    private static Logger logger = LoggerFactory
+            .getLogger(MOSDescriptorDelegate.class);
 
     IDescriptorFactorySelector factorySelector = null;
 
@@ -64,13 +66,9 @@ public class MOSDescriptorDelegate implements IDescriptorFactoryDelegate {
         factories.put(BUFRMOSStaticData.MODEL_HPC,
                 createFactory("HPCBufrTableB", "HPCBufrTableD"));
         factories.put(BUFRMOSStaticData.MODEL_LAMP,
-                createFactory("LAMPBufrTableB",
-                "LAMPBufrTableD"));
+                createFactory("LAMPBufrTableB", "LAMPBufrTableD"));
         factories.put(BUFRMOSStaticData.MODEL_MRF,
                 createFactory("MRFBufrTableB", "MRFBufrTableD"));
-        factories.put(BUFRMOSStaticData.MODEL_NGM,
-                createFactory("NGMBufrTableB", "NGMBufrTableD"));
-
     }
 
     public MOSDescriptorDelegate(IDescriptorFactorySelector selector) {
@@ -98,7 +96,7 @@ public class MOSDescriptorDelegate implements IDescriptorFactoryDelegate {
     }
 
     /**
-     * 
+     *
      */
     @Override
     public void setDescriptorFactorySelector(IDescriptorFactorySelector selector) {
@@ -106,7 +104,7 @@ public class MOSDescriptorDelegate implements IDescriptorFactoryDelegate {
     }
 
     /**
-     * 
+     *
      * @param resourceClassReference
      *            Class reference table resources will be loaded from.
      * @param tableB
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/utility/common_static/base/purge/bufrmosNGMPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/utility/common_static/base/purge/bufrmosNGMPurgeRules.xml
deleted file mode 100644
index 4ff68ba1a3..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/utility/common_static/base/purge/bufrmosNGMPurgeRules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<purgeRuleSet>
-	<defaultRule>
-		<versionsToKeep>5</versionsToKeep>
-		<delta>=00-01:00:00</delta>
-		<round>00-01:00:00</round>
-	</defaultRule>
-</purgeRuleSet>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF
index 95794df157..0614392eda 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmthdw/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bufrmthdw Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrmthdw
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrmthdw,
  com.raytheon.edex.common,
  com.raytheon.uf.edex.decodertools,
@@ -18,4 +18,4 @@ Import-Package: com.raytheon.uf.common.status,
  com.raytheon.uf.edex.bufrtools,
  com.raytheon.uf.edex.bufrtools.descriptors,
  com.raytheon.uf.edex.bufrtools.packets,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF
index 28eb82b6ab..6a0cb11c5b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bufrncwf Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrncwf
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrncwf,
  com.raytheon.uf.edex.decodertools,
  com.raytheon.uf.common.pointdata,
@@ -22,4 +22,4 @@ Import-Package: com.raytheon.uf.common.datastorage,
  com.raytheon.uf.edex.bufrtools.descriptors,
  com.raytheon.uf.edex.bufrtools.packets,
  com.raytheon.uf.edex.core,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDao.java
index 67672a6b31..8b7096da35 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/BUFRncwfDao.java
@@ -19,80 +19,39 @@
  **/
 package com.raytheon.uf.edex.plugin.bufrncwf;
 
-import java.util.List;
-
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.bufrncwf.BUFRncwf;
-import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
 
 /**
- * TODO Add Description
+ * DAO for BUFRncwf
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 17, 2009            jkorman     Initial creation
- *
+ * Feb 04, 2016 5310       tgurney     Remove dead code
+ * 
  * </pre>
- *
+ * 
  * @author jkorman
- * @version 1.0	
+ * @version 1.0
  */
 
 public class BUFRncwfDao extends PointDataPluginDao<BUFRncwf> {
 
-    
     /**
-     * Creates a new ReccoDao
-     * @throws PluginException 
+     * Creates a new BUFRncwfDao
+     * 
+     * @throws PluginException
      */
     public BUFRncwfDao(String pluginName) throws PluginException {
         super(pluginName);
     }
 
-    /**
-     * Retrieves an bufrua report using the datauri .
-     * 
-     * @param dataURI
-     *            The dataURI to match against.
-     * @return The report record if it exists.
-     */
-    public BUFRncwf queryByDataURI(String dataURI) {
-        BUFRncwf report = null;
-        List<?> obs = null;
-        try {
-            obs = queryBySingleCriteria("dataURI", dataURI);
-        } catch (DataAccessLayerException e) {
-            e.printStackTrace();
-        }
-        if((obs != null)&&(obs.size() > 0)) {
-            report = (BUFRncwf) obs.get(0);
-        }
-        return report;
-    }
-    
-    /**
-     * Queries for to determine if a given data uri exists on the bufrua table.
-     * 
-     * @param dataUri
-     *            The DataURI to find.
-     * @return An array of objects. If not null, there should only be a single
-     * element.
-     */
-    public Object[] queryDataUriColumn(final String dataUri) {
-
-        String sql = "select datauri from awips.bufrncwfua where datauri='"
-                + dataUri + "';";
-
-        Object[] results = executeSQLQuery(sql);
-
-        return results;
-    }
-
     @Override
     public String[] getKeysRequiredForFileName() {
         return new String[] { "dataTime.refTime" };
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF
deleted file mode 100644
index 9aa20a9bd6..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Bufrquikscat Plug-in
-Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrquikscat
-Bundle-Version: 1.12.1174.qualifier
-Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: com.raytheon.uf.common.dataplugin.bufrquikscat,
- com.raytheon.uf.edex.decodertools,
- com.raytheon.uf.common.pointdata,
- com.raytheon.uf.edex.pointdata,
- org.geotools,
- javax.persistence,
- javax.measure,
- com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.edex.database,
- com.raytheon.uf.common.serialization
-Import-Package: com.raytheon.uf.common.datastorage,
- com.raytheon.uf.common.status,
- com.raytheon.uf.common.wmo,
- com.raytheon.uf.edex.bufrtools,
- com.raytheon.uf.edex.bufrtools.descriptors,
- com.raytheon.uf.edex.bufrtools.packets,
- com.raytheon.uf.edex.core,
- org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/com.raytheon.uf.edex.plugin.bufrquikscat.ecl b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/com.raytheon.uf.edex.plugin.bufrquikscat.ecl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
deleted file mode 100644
index 66bfc0f295..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-common.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
-
-    <bean id="bufrquikscatPluginName" class="java.lang.String">
-        <constructor-arg type="java.lang.String" value="bufrquikscat" />
-    </bean>
-
-    <bean id="bufrquikscatProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-        <property name="pluginName" ref="bufrquikscatPluginName" />
-		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.bufrquikscat" />
-        <property name="dao" value="com.raytheon.uf.edex.plugin.bufrquikscat.QUIKScatObsDao" />
-        <property name="record" value="com.raytheon.uf.common.dataplugin.bufrquikscat.QUIKScatObs" />
-    </bean>
-    
-	<bean factory-bean="pluginRegistry" factory-method="register">
-		<constructor-arg value="bufrquikscat"/>
-		<constructor-arg ref="bufrquikscatProperties"/>
-	</bean>
-    
-</beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml
deleted file mode 100644
index 084f1deffe..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/res/spring/bufrquikscat-ingest.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-    <bean id="bufrquikscatDecoder" class="com.raytheon.uf.edex.plugin.bufrquikscat.QUIKScatDecoder">
-        <constructor-arg ref="bufrquikscatPluginName" />
-    </bean>
-
-   <!-- Filter out all southern hemisphere data -->
-   <bean id="quikscatSHFilter" class="com.raytheon.uf.edex.decodertools.core.filterimpl.PluginDataObjectFilter">
-        <constructor-arg type="java.lang.String" value="quikscat_filters.xml" />
-        <constructor-arg type="java.lang.String" value="BASE" />
-   </bean>
-
-    <bean id="bufrquikscatDistRegistry" factory-bean="distributionSrv"
-		factory-method="register">
-		<constructor-arg ref="bufrquikscatPluginName" />
-		<constructor-arg value="jms-durable:queue:Ingest.bufrquikscat"/>
-	</bean>
-
-    <camelContext id="bufrquikscat-camel"
-        xmlns="http://camel.apache.org/schema/spring"
-        errorHandlerRef="errorHandler">
-        <!--
-        <endpoint id="bufrquikscatFileEndpoint" uri="file:${edex.home}/data/sbn/bufrquikscat?noop=true&amp;idempotent=false" />
-
-        <route id="bufrquikscatFileConsumerRoute">
-            <from ref="bufrquikscatFileEndpoint" />
-            <bean ref="fileToString" />
-            <setHeader headerName="pluginName">
-                <constant>bufrquikscat</constant>
-            </setHeader>
-            <to uri="jms-durable:queue:Ingest.bufrquikscat" />
-        </route>
-        -->
-
-        <!-- Begin bufrquikscat routes -->
-        <route id="bufrquikscatIngestRoute">
-            <from uri="jms-durable:queue:Ingest.bufrquikscat"/>
-            <setHeader headerName="pluginName">
-                <constant>bufrquikscat</constant>
-            </setHeader>
-            <doTry>
-                <pipeline>
-		            <bean ref="stringToFile" />
-                    <bean ref="bufrquikscatDecoder" method="decode" />
-                    <bean ref="quikscatSHFilter" method="filter" />
-                    <to uri="direct-vm:persistIndexAlert" />
-                </pipeline>
-                <doCatch>
-                    <exception>java.lang.Throwable</exception>
-                    <to uri="log:bufrquikscat?level=ERROR"/>
-                </doCatch>
-            </doTry>
-        </route>
-    </camelContext>
-</beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatDecoder.java
deleted file mode 100644
index 1483333a4f..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatDecoder.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.edex.plugin.bufrquikscat;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.bufrquikscat.QUIKScatObs;
-import com.raytheon.uf.common.pointdata.PointDataDescription;
-import com.raytheon.uf.common.wmo.WMOHeader;
-import com.raytheon.uf.edex.bufrtools.AbstractBUFRDecoder;
-import com.raytheon.uf.edex.bufrtools.BUFRDataDocument;
-import com.raytheon.uf.edex.bufrtools.descriptors.DefaultDescriptorDelegate;
-import com.raytheon.uf.edex.plugin.bufrquikscat.decoder.QUIKScatDataAdapter;
-
-/**
- * Decodes Quick Scatterometer data for near-surface ocean windspeed and
- * direction
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jan 21, 2009       1939 jkorman     Initial creation
- * May 14, 2014 2536       bclement    moved WMO Header to common, removed constructDataURI() call
- * 
- * </pre>
- * 
- * @author jkorman
- * @version 1.0
- */
-
-public class QUIKScatDecoder extends AbstractBUFRDecoder {
-
-    private PointDataDescription pdd;
-
-    private QUIKScatObsDao dao;
-
-    /**
-     * 
-     * @param name
-     */
-    public QUIKScatDecoder(String name) {
-        super(name);
-        try {
-            pdd = PointDataDescription.fromStream(this.getClass()
-                    .getResourceAsStream("/res/pointdata/bufrquikscat.xml"));
-
-            logger.info("PointDataDescription loaded");
-        
-        } catch(Exception e) {
-            logger.error("PointDataDescription failed",e);
-            logger.error("Plugin set to failSafe mode");
-            setFailSafe(true);
-        }
-        setFactoryDelegate(new DefaultDescriptorDelegate(this));
-    }
-
-    /**
-     * 
-     */
-    @Override
-    public List<PluginDataObject> decodeData(List<BUFRDataDocument> document, String traceId, WMOHeader wmoHeader) {
-
-        List<PluginDataObject> decodedData = null;  
-        if(document != null) {
-            decodedData = new ArrayList<PluginDataObject>();
-            QUIKScatDataAdapter adapter = new QUIKScatDataAdapter(pdd, dao, pluginName);
-            
-            logger.debug("List contains " + document.size() + " BUFRDataDocuments");
-            
-            Iterator<BUFRDataDocument> iterator = document.iterator();
-            while (iterator.hasNext()) {
-                
-                logger.debug("Decoding one BUFRDataDocuments");
-                QUIKScatObs qscatObs = adapter.createData(iterator, wmoHeader);
-
-                if (qscatObs != null) {
-                    qscatObs.setTraceId(traceId);
-                    decodedData.add(qscatObs);
-                }
-            }
-        }
-        return decodedData;
-    }
-
-    /**
-     * 
-     * @param recreate
-     */
-    @Override
-    protected void createDAO(boolean recreate) {
-        if(recreate) {
-            dao = null;
-        }
-        try {
-            dao = new QUIKScatObsDao(pluginName);
-        } catch (Exception e) {
-            logger.error("QUIKScatObsDao creation failed",e);
-            logger.error("Plugin set to failSafe mode");
-            setFailSafe(true);
-        }
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatObsDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatObsDao.java
deleted file mode 100644
index 38ed7fd3c2..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/QUIKScatObsDao.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.edex.plugin.bufrquikscat;
-
-import java.util.List;
-import com.raytheon.uf.common.dataplugin.PluginException;
-import com.raytheon.uf.common.dataplugin.bufrquikscat.QUIKScatObs;
-import com.raytheon.uf.edex.database.DataAccessLayerException;
-import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
-
-/**
- * TODO Add Description
- * 
- * <pre>
- *
- * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jun 18, 2009            jkorman     Initial creation
- *
- * </pre>
- *
- * @author jkorman
- * @version 1.0 
- */
-public class QUIKScatObsDao extends PointDataPluginDao<QUIKScatObs> {
-
-    /**
-     * Creates a new BufrMOSDao object.
-     * 
-     * @throws PluginException
-     */
-    public QUIKScatObsDao(String pluginName) throws PluginException {
-        super(pluginName);
-    }
-
-    /**
-     * Retrieves an MOS report using the datauri .
-     * 
-     * @param dataURI
-     *            The dataURI to match against.
-     * @return The report record if it exists.
-     */
-    public QUIKScatObs queryByDataURI(String dataURI) {
-        QUIKScatObs report = null;
-        List<?> obs = null;
-        try {
-            obs = queryBySingleCriteria("dataURI", dataURI);
-        } catch (DataAccessLayerException e) {
-            e.printStackTrace();
-        }
-        if ((obs != null) && (obs.size() > 0)) {
-            report = (QUIKScatObs) obs.get(0);
-        }
-        return report;
-    }
-
-    /**
-     * Queries for to determine if a given data uri exists on the profiler
-     * table.
-     * 
-     * @param dataUri
-     *            The DataURI to find.
-     * @return An array of objects. If not null, there should only be a single
-     *         element.
-     */
-    public Object[] queryDataUriColumn(final String dataUri) {
-
-        String sql = "select datauri from awips.bufrquikscat where datauri='"
-                + dataUri + "';";
-
-        Object[] results = executeSQLQuery(sql);
-
-        return results;
-    }
-
-    @Override
-    public String[] getKeysRequiredForFileName() {
-        return new String[] { "dataTime.refTime" };
-    }
-
-    @Override
-    public String getPointDataFileName(QUIKScatObs p) {
-        return "quikscat.h5";
-    }
-
-    @Override
-    public QUIKScatObs newObject() {
-        return new QUIKScatObs();
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/decoder/QUIKScatDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/decoder/QUIKScatDataAdapter.java
deleted file mode 100644
index 494b72454e..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/src/com/raytheon/uf/edex/plugin/bufrquikscat/decoder/QUIKScatDataAdapter.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.edex.plugin.bufrquikscat.decoder;
-
-import java.util.Calendar;
-import java.util.Iterator;
-import java.util.List;
-
-import com.raytheon.uf.common.dataplugin.bufrquikscat.QUIKScatObs;
-import com.raytheon.uf.common.pointdata.PointDataContainer;
-import com.raytheon.uf.common.pointdata.PointDataDescription;
-import com.raytheon.uf.common.pointdata.PointDataView;
-import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
-import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.common.time.util.TimeUtil;
-import com.raytheon.uf.common.wmo.WMOHeader;
-import com.raytheon.uf.edex.bufrtools.BUFRDataDocument;
-import com.raytheon.uf.edex.bufrtools.BUFRPointDataAdapter;
-import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket;
-import com.raytheon.uf.edex.decodertools.core.IDecoderConstants;
-import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
-
-/**
- * This class contains several utility methods that construct a ProfilerObs
- * instance from the BUFR decoded data.
- * 
- * <pre>
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Mar 03, 2008 969        jkorman     Initial implementation.
- * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
- * May 14, 2014 2536       bclement    moved WMO Header to common, removed TimeTools usage
- * Jul 23, 2014 3410       bclement    location changed to floats
- * 
- * </pre>
- * 
- * @author jkorman
- * @version 1.0
- */
-public class QUIKScatDataAdapter extends BUFRPointDataAdapter<QUIKScatObs> {
-    // Note inverted logic
-    private static final int RAIN_FLAG_NOT_USABLE = 0x00001000;
-
-    private static final int RAIN_FLAG = 0x00002000;
-
-    private static final int RAIN_DATA_MASK = RAIN_FLAG_NOT_USABLE | RAIN_FLAG;
-
-    private static final int RAIN_NOT_PRESENT = 0x00000000;
-
-    private static final int RAIN_PRESENT = RAIN_FLAG;
-
-    private static final int YEAR_POS = 2;
-
-    private static final int MONTH_POS = 3;
-
-    private static final int DAY_POS = 4;
-
-    private static final int HOUR_POS = 5;
-
-    private static final int MINUTE_POS = 6;
-
-    private static final int SECOND_POS = 7;
-
-    private static final int SAT_ID_POS = 0;
-
-    private static final int ORBIT_N_POS = 1;
-
-    /**
-     * 
-     * @param pdd
-     * @param dao
-     * @param pluginName
-     */
-    public QUIKScatDataAdapter(PointDataDescription pdd,
-            PointDataPluginDao<QUIKScatObs> dao, String pluginName) {
-        super(pdd, dao, pluginName);
-    }
-
-    /**
-     * Construct a ProfilerObs instance from the BUFR decoded data contained in
-     * the specified separator.
-     * 
-     * @param iterator
-     *            An iterator containing decoded BUFR data.
-     * @param wmoHeader
-     *            a wmoHeader
-     * @return A ProfilerObs instance, or null in the event of an error.
-     */
-    @Override
-    public QUIKScatObs createData(Iterator<BUFRDataDocument> iterator,
-            WMOHeader wmoHeader) {
-
-        QUIKScatObs obsData = null;
-
-        BUFRDataDocument dataDoc = iterator.next();
-
-        if (dataDoc != null) {
-            // Get the primary data list.
-            List<IBUFRDataPacket> dataList = dataDoc.getList();
-
-            obsData = getHeaderData(dataList);
-            if (obsData != null) {
-                // pickup the data.
-                obsData.setWmoHeader(wmoHeader.getWmoHeader());
-                PointDataContainer container = getContainer(obsData);
-                if (container != null) {
-
-                    logger.debug("Creating obs data ");
-
-                    PointDataView view = container.append();
-                    //
-                    view.setInt("satelliteID", obsData.getSatId());
-                    view.setInt("orbitNumber", obsData.getOrbitNumber());
-                    view.setLong("validTime", obsData.getTimeObs()
-                            .getTimeInMillis());
-
-                    double lat = getDouble(dataList.get(8),
-                            IDecoderConstants.VAL_MISSING);
-                    double lon = getDouble(dataList.get(9),
-                            IDecoderConstants.VAL_MISSING);
-
-                    SurfaceObsLocation location = new SurfaceObsLocation();
-                    location.assignLocation((float) lat, (float) lon);
-                    obsData.setLocation(location);
-                    view.setFloat("latitude", (float) lat);
-                    view.setFloat("longitude", (float) lon);
-
-                    int rainFlag = getInt(dataList.get(10),
-                            IDecoderConstants.VAL_MISSING);
-                    switch ((rainFlag & RAIN_DATA_MASK)) {
-                    case RAIN_NOT_PRESENT: {
-                        rainFlag = 0;
-                        break;
-                    }
-                    case RAIN_PRESENT: {
-                        rainFlag = 1;
-                        break;
-                    }
-                    default: { //
-                        rainFlag = -9999;
-                        break;
-                    }
-                    }
-                    view.setInt("rainIndex", rainFlag);
-                    setViewData("probRain", view, dataList.get(11));
-                    // Wind data
-                    float val = (float) getDouble(dataList.get(12),
-                            PDV_FILL_DBL);
-                    if (val < 0) {
-                        val = (float) PDV_FILL_DBL;
-                    }
-                    view.setFloat("windSpd", val);
-                    val = (float) getDouble(dataList.get(13), PDV_FILL_DBL);
-                    if (val < 0) {
-                        val = (float) PDV_FILL_DBL;
-                    }
-                    view.setFloat("windDir", val);
-
-                    obsData.setPointDataView(view);
-                }
-            }
-        }
-
-        return obsData;
-    }
-
-    /**
-     * 
-     */
-    @Override
-    public List<QUIKScatObs> createDataList(
-            Iterator<BUFRDataDocument> iterator, WMOHeader wmoHeader) {
-        List<QUIKScatObs> obsList = null;
-
-        return obsList;
-    }
-
-    /**
-     * 
-     * @param dataList
-     * @return
-     */
-    private QUIKScatObs getHeaderData(List<IBUFRDataPacket> dataList) {
-        QUIKScatObs obsData = null;
-
-        Calendar obsTime = getTimeInfo(dataList);
-        if (obsTime != null) {
-            obsData = new QUIKScatObs();
-            obsData.setTimeObs(obsTime);
-            obsData.setDataTime(new DataTime((Calendar) obsTime.clone()));
-
-            int satId = getInt(dataList.get(SAT_ID_POS),
-                    IDecoderConstants.VAL_MISSING);
-            int orbNo = getInt(dataList.get(ORBIT_N_POS),
-                    IDecoderConstants.VAL_MISSING);
-
-            logger.debug("getHeaderData(" + satId + "," + orbNo + ")"
-                    + obsData.getDataTime());
-
-            if (satId != IDecoderConstants.VAL_MISSING) {
-                obsData.setSatId(satId);
-                if (orbNo != IDecoderConstants.VAL_MISSING) {
-                    obsData.setOrbitNumber(orbNo);
-                } else {
-                    obsData = null;
-                }
-            } else {
-                obsData = null;
-            }
-        }
-        return obsData;
-    }
-
-    /**
-     * 
-     * @param dataList
-     * @return
-     */
-    private Calendar getTimeInfo(List<IBUFRDataPacket> dataList) {
-
-        int year = getInt(dataList.get(YEAR_POS), IDecoderConstants.VAL_MISSING);
-        int month = getInt(dataList.get(MONTH_POS),
-                IDecoderConstants.VAL_MISSING);
-        int day = getInt(dataList.get(DAY_POS), IDecoderConstants.VAL_MISSING);
-        int hour = getInt(dataList.get(HOUR_POS), IDecoderConstants.VAL_MISSING);
-        int minute = getInt(dataList.get(MINUTE_POS),
-                IDecoderConstants.VAL_MISSING);
-        int second = getInt(dataList.get(SECOND_POS),
-                IDecoderConstants.VAL_MISSING);
-
-        Calendar baseTime = null;
-
-        // Ensure that we have all of the time info and create the
-        // date-time and datatime info.
-        if ((year > 0) && (month > 0) && (day > 0) && (hour >= 0)
-                && (minute >= 0) && (second >= 0)) {
-            baseTime = TimeUtil.newGmtCalendar(year, month, day);
-            baseTime.set(Calendar.HOUR_OF_DAY, hour);
-            baseTime.set(Calendar.MINUTE, minute);
-            baseTime.set(Calendar.SECOND, second);
-            baseTime.set(Calendar.MILLISECOND, 0);
-        }
-        return baseTime;
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/utility/common_static/base/purge/bufrquikscatPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/utility/common_static/base/purge/bufrquikscatPurgeRules.xml
deleted file mode 100644
index c2cb1258f6..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/utility/common_static/base/purge/bufrquikscatPurgeRules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<purgeRuleSet>
-	<defaultRule>
-		<versionsToKeep>12</versionsToKeep>
-		<delta>=00-01:00:00</delta>
-		<round>00-01:00:00</round>
-	</defaultRule>
-</purgeRuleSet>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF
index c0221068d2..6392877493 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bufrsigwx Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrsigwx
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrsigwx,
  com.raytheon.uf.edex.decodertools,
  com.raytheon.uf.common.pointdata,
@@ -22,4 +22,4 @@ Import-Package: com.raytheon.uf.common.datastorage,
  com.raytheon.uf.edex.bufrtools.descriptors,
  com.raytheon.uf.edex.bufrtools.packets,
  com.raytheon.uf.edex.core,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDataDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDataDao.java
index badaeac074..d0885fa971 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDataDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDataDao.java
@@ -19,7 +19,6 @@
  **/
 package com.raytheon.uf.edex.plugin.bufrsigwx;
 
-import java.util.List;
 import java.util.Map;
 
 import com.raytheon.uf.common.dataplugin.PluginException;
@@ -28,11 +27,10 @@ import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxLayer;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxType;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.common.serialization.SerializationException;
-import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
 
 /**
- * TODO Add Description
+ * DAO for bufrsigwx
  * 
  * <pre>
  * 
@@ -41,6 +39,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jun 18, 2009            jkorman     Initial creation
+ * Feb 04, 2016 5309       tgurney     Remove dead code
  * 
  * </pre>
  * 
@@ -50,7 +49,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
 public class SigWxDataDao extends PointDataPluginDao<SigWxData> {
 
     /**
-     * Creates a new BufrMOSDao object.
+     * Creates a new SigWxDataDao object.
      * 
      * @throws PluginException
      */
@@ -58,46 +57,6 @@ public class SigWxDataDao extends PointDataPluginDao<SigWxData> {
         super(pluginName);
     }
 
-    /**
-     * Retrieves an MOS report using the datauri .
-     * 
-     * @param dataURI
-     *            The dataURI to match against.
-     * @return The report record if it exists.
-     */
-    public SigWxData queryByDataURI(String dataURI) {
-        SigWxData report = null;
-        List<?> obs = null;
-        try {
-            obs = queryBySingleCriteria("dataURI", dataURI);
-        } catch (DataAccessLayerException e) {
-            e.printStackTrace();
-        }
-        if ((obs != null) && (obs.size() > 0)) {
-            report = (SigWxData) obs.get(0);
-        }
-        return report;
-    }
-
-    /**
-     * Queries for to determine if a given data uri exists on the profiler
-     * table.
-     * 
-     * @param dataUri
-     *            The DataURI to find.
-     * @return An array of objects. If not null, there should only be a single
-     *         element.
-     */
-    public Object[] queryDataUriColumn(final String dataUri) {
-
-        String sql = "select datauri from awips.bufrsigwx where datauri='"
-                + dataUri + "';";
-
-        Object[] results = executeSQLQuery(sql);
-
-        return results;
-    }
-
     @Override
     public String[] getKeysRequiredForFileName() {
         return new String[] { "dataTime.refTime", "wxType", "wxLayer" };
@@ -126,13 +85,6 @@ public class SigWxDataDao extends PointDataPluginDao<SigWxData> {
         return new SigWxData();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.edex.pointdata.PointDataPluginDao#getPointDataDescription
-     * (java.util.Map)
-     */
     @Override
     public PointDataDescription getPointDataDescription(Map<String, Object> obj) {
         SigWxLayer layer = (SigWxLayer) obj.get("wxLayer");
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDecoder.java
index 4ff6c33f05..ed7660c56b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/SigWxDecoder.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
-import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.common.wmo.WMOHeader;
@@ -43,6 +42,9 @@ import com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter;
  * ------------ ---------- ----------- --------------------------
  * Jan 21, 2009 1939       jkorman     Initial creation
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Feb 04, 2016 5309       tgurney     Remove call to constructDataURI and
+ *                                     check for null on dataURI component
+ *                                     fields
  * 
  * </pre>
  * 
@@ -87,13 +89,18 @@ public class SigWxDecoder extends AbstractBUFRDecoder {
                 if (sigwx != null) {
                     for (SigWxData d : sigwx) {
                         d.setTraceId(traceId);
-                        try {
-                            d.constructDataURI();
-                        } catch (PluginException e) {
-                            logger.error(traceId
-                                    + "- Unable to construct dataURI", e);
+                        if (d.getWxLayer() == null) {
+                            logger.warn("Discarding record with wxLayer == null: "
+                                    + d.toString());
+                        } else if (d.getWxType() == null) {
+                            logger.warn("Discarding record with wxType == null: "
+                                    + d.toString());
+                        } else if (d.getKey() == null) {
+                            logger.warn("Discarding record with key == null: "
+                                    + d.toString());
+                        } else {
+                            decodedData.add(d);
                         }
-                        decodedData.add(d);
                     }
                 } else {
                     logger.info("No data returned from createDataList");
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxCatData.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxCatData.java
index f438b11f87..57b083447e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxCatData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxCatData.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.bufrsigwx.decoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxType;
@@ -43,6 +43,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 14, 2009            jkorman     Initial creation
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -51,115 +52,115 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  */
 
 public class SigWxCatData extends SigWxDataAdapter {
-	private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
-	SigWxType wxType;
+    SigWxType wxType;
 
-	/**
-	 * 
-	 * @param container
-	 */
-	public SigWxCatData(PointDataDescription pdd,
-			PointDataPluginDao<SigWxData> dao, String pluginName) {
-		super(pdd, dao, pluginName);
-	}
+    /**
+     * 
+     * @param container
+     */
+    public SigWxCatData(PointDataDescription pdd,
+            PointDataPluginDao<SigWxData> dao, String pluginName) {
+        super(pdd, dao, pluginName);
+    }
 
-	/**
-	 * 
-	 * @param pointData
-	 * @param locPoint
-	 * @param dataPoint
-	 * @param index
-	 */
-	List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
-		List<SigWxData> sList = new ArrayList<SigWxData>();
+    /**
+     * 
+     * @param pointData
+     * @param locPoint
+     * @param dataPoint
+     * @param index
+     */
+    List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
+        List<SigWxData> sList = new ArrayList<SigWxData>();
 
-		if (sigWx != null) {
-			IBUFRDataPacket p1 = dataList.get(15);
-			List<IBUFRDataPacket> tropList = getPacketSubList(p1);
-			if (tropList != null) {
-				int key = 0;
-				for (IBUFRDataPacket pp : tropList) {
-					SigWxData front = getReport(pp, sigWx);
-					if (front != null) {
-						front.setKey(key++);
-						sList.add(front);
-					}
-				}
-			}
-		}
+        if (sigWx != null) {
+            IBUFRDataPacket p1 = dataList.get(15);
+            List<IBUFRDataPacket> tropList = getPacketSubList(p1);
+            if (tropList != null) {
+                int key = 0;
+                for (IBUFRDataPacket pp : tropList) {
+                    SigWxData front = getReport(pp, sigWx);
+                    if (front != null) {
+                        front.setKey(key++);
+                        sList.add(front);
+                    }
+                }
+            }
+        }
 
-		return sList;
-	}
+        return sList;
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private SigWxData getReport(IBUFRDataPacket packet, SigWxData sigWx) {
-		SigWxData currWx = null;
-		if (packet != null) {
-			// get a copy
-			List<IBUFRDataPacket> sList = getPacketSubList(packet);
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private SigWxData getReport(IBUFRDataPacket packet, SigWxData sigWx) {
+        SigWxData currWx = null;
+        if (packet != null) {
+            // get a copy
+            List<IBUFRDataPacket> sList = getPacketSubList(packet);
 
-			currWx = sigWx.copyObs();
+            currWx = sigWx.copyObs();
 
-			PointDataContainer container = getContainer(currWx, 1);
-			if (container != null) {
-				PointDataView view = container.append();
+            PointDataContainer container = getContainer(currWx, 1);
+            if (container != null) {
+                PointDataView view = container.append();
 
-				long vt = currWx.getDataTime().getValidTime().getTimeInMillis();
-				view.setLong("validTime", vt);
+                long vt = currWx.getDataTime().getValidTime().getTimeInMillis();
+                view.setLong("validTime", vt);
 
-				view.setFloat("baseHgt", currWx.getBaseHeight().floatValue());
-				view.setFloat("topHgt", currWx.getTopHeight().floatValue());
+                view.setFloat("baseHgt", currWx.getBaseHeight().floatValue());
+                view.setFloat("topHgt", currWx.getTopHeight().floatValue());
 
-				setViewData("catBase", view, sList.get(2));
-				setViewData("catTop", view, sList.get(3));
-				setViewData("degreeOfTurb", view, sList.get(5));
+                setViewData("catBase", view, sList.get(2));
+                setViewData("catTop", view, sList.get(3));
+                setViewData("degreeOfTurb", view, sList.get(5));
 
-				// pickup the CAT boundary
+                // pickup the CAT boundary
 
-				int numOfPoints = 0;
-				try {
+                int numOfPoints = 0;
+                try {
 
-					List<IBUFRDataPacket> dList = getPacketSubList(sList.get(4));
-					for (IBUFRDataPacket p : dList) {
-						List<IBUFRDataPacket> jetData = getPacketSubList(p);
+                    List<IBUFRDataPacket> dList = getPacketSubList(sList.get(4));
+                    for (IBUFRDataPacket p : dList) {
+                        List<IBUFRDataPacket> jetData = getPacketSubList(p);
 
-						setViewData("latitude", view, jetData.get(0),
-								numOfPoints);
-						setViewData("longitude", view, jetData.get(1),
-								numOfPoints);
-						numOfPoints++;
-					}
-				} catch (IllegalArgumentException e) {
-					logger.error("Frontal data truncated at " + numOfPoints
-							+ " features");
-				}
-				view.setInt("numOfPoints", numOfPoints);
-				currWx.setPointDataView(view);
-			}
-		}
-		return currWx;
-	}
+                        setViewData("latitude", view, jetData.get(0),
+                                numOfPoints);
+                        setViewData("longitude", view, jetData.get(1),
+                                numOfPoints);
+                        numOfPoints++;
+                    }
+                } catch (IllegalArgumentException e) {
+                    logger.error("Frontal data truncated at " + numOfPoints
+                            + " features");
+                }
+                view.setInt("numOfPoints", numOfPoints);
+                currWx.setPointDataView(view);
+            }
+        }
+        return currWx;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	SigWxType getType() {
-		return wxType;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    SigWxType getType() {
+        return wxType;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	void setType(SigWxType type) {
-		wxType = type;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    void setType(SigWxType type) {
+        wxType = type;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxCloudsData.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxCloudsData.java
index 11a2fb7dd2..82e321e539 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxCloudsData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxCloudsData.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.bufrsigwx.decoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxLayer;
@@ -44,6 +44,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 14, 2009            jkorman     Initial creation
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -52,263 +53,263 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  */
 
 public class SigWxCloudsData extends SigWxDataAdapter {
-	private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
-	SigWxType wxType;
+    SigWxType wxType;
 
-	/**
-	 * 
-	 * @param container
-	 */
-	public SigWxCloudsData(PointDataDescription pdd,
-			PointDataPluginDao<SigWxData> dao, String pluginName) {
-		super(pdd, dao, pluginName);
-	}
+    /**
+     * 
+     * @param container
+     */
+    public SigWxCloudsData(PointDataDescription pdd,
+            PointDataPluginDao<SigWxData> dao, String pluginName) {
+        super(pdd, dao, pluginName);
+    }
 
-	/**
-	 * 
-	 * @param pointData
-	 * @param locPoint
-	 * @param dataPoint
-	 * @param index
-	 */
-	List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
-		List<SigWxData> sList = new ArrayList<SigWxData>();
+    /**
+     * 
+     * @param pointData
+     * @param locPoint
+     * @param dataPoint
+     * @param index
+     */
+    List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
+        List<SigWxData> sList = new ArrayList<SigWxData>();
 
-		if (sigWx != null) {
-			if (SigWxLayer.SWM.equals(sigWx.getWxLayer())) {
-				sList = getSWMReport(dataList, sigWx);
-			} else {
-				IBUFRDataPacket p1 = dataList.get(15);
-				List<IBUFRDataPacket> tropList = getPacketSubList(p1);
-				if (tropList != null) {
-					int key = 0;
-					for (IBUFRDataPacket pp : tropList) {
-						SigWxData clouds = getSWHReport(pp, sigWx);
-						if (clouds != null) {
-							clouds.setKey(key++);
-							sList.add(clouds);
-						}
-					}
-				}
-			}
-		}
-		return sList;
-	}
+        if (sigWx != null) {
+            if (SigWxLayer.SWM.equals(sigWx.getWxLayer())) {
+                sList = getSWMReport(dataList, sigWx);
+            } else {
+                IBUFRDataPacket p1 = dataList.get(15);
+                List<IBUFRDataPacket> tropList = getPacketSubList(p1);
+                if (tropList != null) {
+                    int key = 0;
+                    for (IBUFRDataPacket pp : tropList) {
+                        SigWxData clouds = getSWHReport(pp, sigWx);
+                        if (clouds != null) {
+                            clouds.setKey(key++);
+                            sList.add(clouds);
+                        }
+                    }
+                }
+            }
+        }
+        return sList;
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private SigWxData getSWHReport(IBUFRDataPacket packet, SigWxData sigWx) {
-		SigWxData currWx = null;
-		if (packet != null) {
-			// get a copy
-			List<IBUFRDataPacket> cloudData = getPacketSubList(packet);
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private SigWxData getSWHReport(IBUFRDataPacket packet, SigWxData sigWx) {
+        SigWxData currWx = null;
+        if (packet != null) {
+            // get a copy
+            List<IBUFRDataPacket> cloudData = getPacketSubList(packet);
 
-			currWx = sigWx.copyObs();
+            currWx = sigWx.copyObs();
 
-			PointDataContainer container = getContainer(currWx, 1);
-			if (container != null) {
-				PointDataView view = container.append();
+            PointDataContainer container = getContainer(currWx, 1);
+            if (container != null) {
+                PointDataView view = container.append();
 
-				long vt = currWx.getDataTime().getValidTime().getTimeInMillis();
-				view.setLong("validTime", vt);
+                long vt = currWx.getDataTime().getValidTime().getTimeInMillis();
+                view.setLong("validTime", vt);
 
-				view.setFloat("baseHgt", currWx.getBaseHeight().floatValue());
-				view.setFloat("topHgt", currWx.getTopHeight().floatValue());
+                view.setFloat("baseHgt", currWx.getBaseHeight().floatValue());
+                view.setFloat("topHgt", currWx.getTopHeight().floatValue());
 
-				setViewData("cloudBase", view, cloudData.get(2));
-				setViewData("cloudTop", view, cloudData.get(3));
+                setViewData("cloudBase", view, cloudData.get(2));
+                setViewData("cloudTop", view, cloudData.get(3));
 
-				// pickup the Cloud boundary
+                // pickup the Cloud boundary
 
-				int numOfPoints = 0;
-				try {
-					List<IBUFRDataPacket> dList = getPacketSubList(cloudData
-							.get(4));
-					for (IBUFRDataPacket p : dList) {
-						List<IBUFRDataPacket> jetData = getPacketSubList(p);
+                int numOfPoints = 0;
+                try {
+                    List<IBUFRDataPacket> dList = getPacketSubList(cloudData
+                            .get(4));
+                    for (IBUFRDataPacket p : dList) {
+                        List<IBUFRDataPacket> jetData = getPacketSubList(p);
 
-						setViewData("latitude", view, jetData.get(0),
-								numOfPoints);
-						setViewData("longitude", view, jetData.get(1),
-								numOfPoints);
-						numOfPoints++;
-					}
-				} catch (IllegalArgumentException e) {
-					logger.error("Cloud outline truncated at " + numOfPoints
-							+ " points");
-				}
-				view.setInt("numOfPoints", numOfPoints);
+                        setViewData("latitude", view, jetData.get(0),
+                                numOfPoints);
+                        setViewData("longitude", view, jetData.get(1),
+                                numOfPoints);
+                        numOfPoints++;
+                    }
+                } catch (IllegalArgumentException e) {
+                    logger.error("Cloud outline truncated at " + numOfPoints
+                            + " points");
+                }
+                view.setInt("numOfPoints", numOfPoints);
 
-				setViewData("cloudDistribution", view, cloudData.get(5));
-				setViewData("cloudType", view, cloudData.get(6));
+                setViewData("cloudDistribution", view, cloudData.get(5));
+                setViewData("cloudType", view, cloudData.get(6));
 
-				currWx.setPointDataView(view);
-			}
-		}
-		return currWx;
-	}
+                currWx.setPointDataView(view);
+            }
+        }
+        return currWx;
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private List<SigWxData> getSWMReport(List<IBUFRDataPacket> sList,
-			SigWxData sigWx) {
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private List<SigWxData> getSWMReport(List<IBUFRDataPacket> sList,
+            SigWxData sigWx) {
 
-		List<SigWxData> wxList = new ArrayList<SigWxData>();
+        List<SigWxData> wxList = new ArrayList<SigWxData>();
 
-		SigWxData currWx = null;
-		if (sList != null) {
-			// get a copy
+        SigWxData currWx = null;
+        if (sList != null) {
+            // get a copy
 
-			int key = 0;
-			int base = 16;
-			while (base < sList.size()) {
+            int key = 0;
+            int base = 16;
+            while (base < sList.size()) {
 
-				currWx = sigWx.copyObs();
+                currWx = sigWx.copyObs();
 
-				PointDataContainer container = getContainer(currWx, 1);
-				if (container != null) {
-					PointDataView view = container.append();
+                PointDataContainer container = getContainer(currWx, 1);
+                if (container != null) {
+                    PointDataView view = container.append();
 
-					long vt = currWx.getDataTime().getValidTime()
-							.getTimeInMillis();
-					view.setLong("validTime", vt);
+                    long vt = currWx.getDataTime().getValidTime()
+                            .getTimeInMillis();
+                    view.setLong("validTime", vt);
 
-					setViewData("featureType", view, sList.get(15));
+                    setViewData("featureType", view, sList.get(15));
 
-					setViewData("dimensionSig", view, sList.get(base));
-					List<IBUFRDataPacket> dList = getPacketSubList(sList
-							.get(base + 1));
+                    setViewData("dimensionSig", view, sList.get(base));
+                    List<IBUFRDataPacket> dList = getPacketSubList(sList
+                            .get(base + 1));
 
-					int index = 0;
-					try {
-						for (IBUFRDataPacket p : dList) {
-							List<IBUFRDataPacket> featureOutline = getPacketSubList(p);
+                    int index = 0;
+                    try {
+                        for (IBUFRDataPacket p : dList) {
+                            List<IBUFRDataPacket> featureOutline = getPacketSubList(p);
 
-							setViewData("latitude", view,
-									featureOutline.get(0), index);
-							setViewData("longitude", view,
-									featureOutline.get(1), index);
-							index++;
-						}
-					} catch (IllegalArgumentException e) {
-						logger.error("Frontal data truncated at " + index
-								+ " features");
-					}
-					view.setInt("numOfVertices", index);
+                            setViewData("latitude", view,
+                                    featureOutline.get(0), index);
+                            setViewData("longitude", view,
+                                    featureOutline.get(1), index);
+                            index++;
+                        }
+                    } catch (IllegalArgumentException e) {
+                        logger.error("Frontal data truncated at " + index
+                                + " features");
+                    }
+                    view.setInt("numOfVertices", index);
 
-					dList = getPacketSubList(sList.get(base + 4));
-					getTurbData(dList, view);
+                    dList = getPacketSubList(sList.get(base + 4));
+                    getTurbData(dList, view);
 
-					dList = getPacketSubList(sList.get(base + 5));
-					getIcingData(dList, view);
+                    dList = getPacketSubList(sList.get(base + 5));
+                    getIcingData(dList, view);
 
-					dList = getPacketSubList(sList.get(base + 6));
-					getCloudLevelData(dList, view);
+                    dList = getPacketSubList(sList.get(base + 6));
+                    getCloudLevelData(dList, view);
 
-					currWx.setPointDataView(view);
-					base += 7;
+                    currWx.setPointDataView(view);
+                    base += 7;
 
-					if (currWx != null) {
-						currWx.setKey(key++);
-						wxList.add(currWx);
-					}
-				} // while
-			}
-		}
-		return wxList;
-	}
+                    if (currWx != null) {
+                        currWx.setKey(key++);
+                        wxList.add(currWx);
+                    }
+                } // while
+            }
+        }
+        return wxList;
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private void getTurbData(List<IBUFRDataPacket> dList, PointDataView view) {
-		int index = 0;
-		try {
-			for (IBUFRDataPacket p : dList) {
-				List<IBUFRDataPacket> featureOutline = getPacketSubList(p);
-				setViewData("turbBase", view, featureOutline.get(0), index);
-				setViewData("turbTop", view, featureOutline.get(1), index);
-				setViewData("turbType", view, featureOutline.get(2), index);
-				index++;
-			}
-		} catch (IllegalArgumentException e) {
-			logger.error("Cloud.turb data truncated at " + index + " features");
-		}
-		view.setInt("numOfTurbLevels", index);
-	}
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private void getTurbData(List<IBUFRDataPacket> dList, PointDataView view) {
+        int index = 0;
+        try {
+            for (IBUFRDataPacket p : dList) {
+                List<IBUFRDataPacket> featureOutline = getPacketSubList(p);
+                setViewData("turbBase", view, featureOutline.get(0), index);
+                setViewData("turbTop", view, featureOutline.get(1), index);
+                setViewData("turbType", view, featureOutline.get(2), index);
+                index++;
+            }
+        } catch (IllegalArgumentException e) {
+            logger.error("Cloud.turb data truncated at " + index + " features");
+        }
+        view.setInt("numOfTurbLevels", index);
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private void getIcingData(List<IBUFRDataPacket> dList, PointDataView view) {
-		int index = 0;
-		try {
-			for (IBUFRDataPacket p : dList) {
-				List<IBUFRDataPacket> icingData = getPacketSubList(p);
-				setViewData("icingBase", view, icingData.get(0), index);
-				setViewData("icingTop", view, icingData.get(1), index);
-				setViewData("icingType", view, icingData.get(2), index);
-				index++;
-			}
-		} catch (IllegalArgumentException e) {
-			logger.error("Cloud.icing data truncated at " + index + " features");
-		}
-		view.setInt("numOfIcingLevels", index);
-	}
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private void getIcingData(List<IBUFRDataPacket> dList, PointDataView view) {
+        int index = 0;
+        try {
+            for (IBUFRDataPacket p : dList) {
+                List<IBUFRDataPacket> icingData = getPacketSubList(p);
+                setViewData("icingBase", view, icingData.get(0), index);
+                setViewData("icingTop", view, icingData.get(1), index);
+                setViewData("icingType", view, icingData.get(2), index);
+                index++;
+            }
+        } catch (IllegalArgumentException e) {
+            logger.error("Cloud.icing data truncated at " + index + " features");
+        }
+        view.setInt("numOfIcingLevels", index);
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private void getCloudLevelData(List<IBUFRDataPacket> dList,
-			PointDataView view) {
-		int index = 0;
-		try {
-			for (IBUFRDataPacket p : dList) {
-				List<IBUFRDataPacket> cloudData = getPacketSubList(p);
-				setViewData("cloudBase", view, cloudData.get(0), index);
-				setViewData("cloudTop", view, cloudData.get(1), index);
-				setViewData("cloudDistribution", view, cloudData.get(2), index);
-				setViewData("cloudType", view, cloudData.get(3), index);
-				index++;
-			}
-		} catch (IllegalArgumentException e) {
-			logger.error("Cloud.cloud data truncated at " + index + " features");
-		}
-		view.setInt("numOfCloudLevels", index);
-	}
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private void getCloudLevelData(List<IBUFRDataPacket> dList,
+            PointDataView view) {
+        int index = 0;
+        try {
+            for (IBUFRDataPacket p : dList) {
+                List<IBUFRDataPacket> cloudData = getPacketSubList(p);
+                setViewData("cloudBase", view, cloudData.get(0), index);
+                setViewData("cloudTop", view, cloudData.get(1), index);
+                setViewData("cloudDistribution", view, cloudData.get(2), index);
+                setViewData("cloudType", view, cloudData.get(3), index);
+                index++;
+            }
+        } catch (IllegalArgumentException e) {
+            logger.error("Cloud.cloud data truncated at " + index + " features");
+        }
+        view.setInt("numOfCloudLevels", index);
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	SigWxType getType() {
-		return wxType;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    SigWxType getType() {
+        return wxType;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	void setType(SigWxType type) {
-		wxType = type;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    void setType(SigWxType type) {
+        wxType = type;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxDataAdapter.java
index 73a62d74b3..716e78f323 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxDataAdapter.java
@@ -23,8 +23,8 @@ import java.util.Calendar;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxLayer;
@@ -54,6 +54,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * May 14, 2014 2536       bclement    moved WMO Header to common, removed TimeTools usage
  * Sep 16, 2014 3628       mapeters    Replaced static imports.
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -62,7 +63,8 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  */
 public abstract class SigWxDataAdapter extends BUFRPointDataAdapter<SigWxData> {
 
-    private static Log logger = LogFactory.getLog(SigWxDataAdapter.class);
+    private static Logger logger = LoggerFactory
+            .getLogger(SigWxDataAdapter.class);
 
     private static final int YEAR_POS = 0;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxFrontsData.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxFrontsData.java
index 9c7d5e404b..3f043f6de9 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxFrontsData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxFrontsData.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.bufrsigwx.decoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxType;
@@ -43,6 +43,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 14, 2009            jkorman     Initial creation
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -51,113 +52,113 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  */
 
 public class SigWxFrontsData extends SigWxDataAdapter {
-	private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
-	SigWxType wxType;
+    SigWxType wxType;
 
-	/**
-	 * 
-	 * @param container
-	 */
-	public SigWxFrontsData(PointDataDescription pdd,
-			PointDataPluginDao<SigWxData> dao, String pluginName) {
-		super(pdd, dao, pluginName);
-	}
+    /**
+     * 
+     * @param container
+     */
+    public SigWxFrontsData(PointDataDescription pdd,
+            PointDataPluginDao<SigWxData> dao, String pluginName) {
+        super(pdd, dao, pluginName);
+    }
 
-	/**
-	 * 
-	 * @param pointData
-	 * @param locPoint
-	 * @param dataPoint
-	 * @param index
-	 */
-	List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
-		List<SigWxData> sList = new ArrayList<SigWxData>();
+    /**
+     * 
+     * @param pointData
+     * @param locPoint
+     * @param dataPoint
+     * @param index
+     */
+    List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
+        List<SigWxData> sList = new ArrayList<SigWxData>();
 
-		if (sigWx != null) {
-			IBUFRDataPacket p1 = dataList.get(15);
-			List<IBUFRDataPacket> tropList = getPacketSubList(p1);
-			if (tropList != null) {
-				int key = 0;
-				for (IBUFRDataPacket pp : tropList) {
-					SigWxData front = getReport(pp, sigWx);
-					if (front != null) {
-						front.setKey(key++);
-						sList.add(front);
-					}
-				}
-			}
-		}
+        if (sigWx != null) {
+            IBUFRDataPacket p1 = dataList.get(15);
+            List<IBUFRDataPacket> tropList = getPacketSubList(p1);
+            if (tropList != null) {
+                int key = 0;
+                for (IBUFRDataPacket pp : tropList) {
+                    SigWxData front = getReport(pp, sigWx);
+                    if (front != null) {
+                        front.setKey(key++);
+                        sList.add(front);
+                    }
+                }
+            }
+        }
 
-		return sList;
-	}
+        return sList;
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private SigWxData getReport(IBUFRDataPacket packet, SigWxData sigWx) {
-		SigWxData currWx = null;
-		if (packet != null) {
-			// get a copy
-			List<IBUFRDataPacket> sList = getPacketSubList(packet);
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private SigWxData getReport(IBUFRDataPacket packet, SigWxData sigWx) {
+        SigWxData currWx = null;
+        if (packet != null) {
+            // get a copy
+            List<IBUFRDataPacket> sList = getPacketSubList(packet);
 
-			currWx = sigWx.copyObs();
+            currWx = sigWx.copyObs();
 
-			PointDataContainer container = getContainer(currWx, 1);
-			if (container != null) {
-				PointDataView view = container.append();
+            PointDataContainer container = getContainer(currWx, 1);
+            if (container != null) {
+                PointDataView view = container.append();
 
-				long vt = currWx.getDataTime().getValidTime().getTimeInMillis();
-				view.setLong("validTime", vt);
+                long vt = currWx.getDataTime().getValidTime().getTimeInMillis();
+                view.setLong("validTime", vt);
 
-				view.setFloat("baseHgt", currWx.getBaseHeight().floatValue());
-				view.setFloat("topHgt", currWx.getTopHeight().floatValue());
+                view.setFloat("baseHgt", currWx.getBaseHeight().floatValue());
+                view.setFloat("topHgt", currWx.getTopHeight().floatValue());
 
-				setViewData("featureType", view, sList.get(0));
+                setViewData("featureType", view, sList.get(0));
 
-				// pickup the frontal feature info
+                // pickup the frontal feature info
 
-				int index = 0;
-				try {
+                int index = 0;
+                try {
 
-					List<IBUFRDataPacket> dList = getPacketSubList(sList.get(2));
-					for (IBUFRDataPacket p : dList) {
-						List<IBUFRDataPacket> jetData = getPacketSubList(p);
+                    List<IBUFRDataPacket> dList = getPacketSubList(sList.get(2));
+                    for (IBUFRDataPacket p : dList) {
+                        List<IBUFRDataPacket> jetData = getPacketSubList(p);
 
-						setViewData("latitude", view, jetData.get(0), index);
-						setViewData("longitude", view, jetData.get(1), index);
-						setViewData("featureDir", view, jetData.get(2), index);
-						setViewData("featureSpd", view, jetData.get(3), index);
-						index++;
-					}
-				} catch (IllegalArgumentException e) {
-					logger.error("Frontal data truncated at " + index
-							+ " features");
-				}
-				view.setInt("numOfPoints", index);
-				currWx.setPointDataView(view);
-			}
-		}
-		return currWx;
-	}
+                        setViewData("latitude", view, jetData.get(0), index);
+                        setViewData("longitude", view, jetData.get(1), index);
+                        setViewData("featureDir", view, jetData.get(2), index);
+                        setViewData("featureSpd", view, jetData.get(3), index);
+                        index++;
+                    }
+                } catch (IllegalArgumentException e) {
+                    logger.error("Frontal data truncated at " + index
+                            + " features");
+                }
+                view.setInt("numOfPoints", index);
+                currWx.setPointDataView(view);
+            }
+        }
+        return currWx;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	SigWxType getType() {
-		return wxType;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    SigWxType getType() {
+        return wxType;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	void setType(SigWxType type) {
-		wxType = type;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    void setType(SigWxType type) {
+        wxType = type;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxJetsData.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxJetsData.java
index 649a81babd..dc7a5b30ff 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxJetsData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxJetsData.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.bufrsigwx.decoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxType;
@@ -43,6 +43,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 14, 2009            jkorman     Initial creation
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -51,124 +52,124 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  */
 
 public class SigWxJetsData extends SigWxDataAdapter {
-	private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
-	SigWxType wxType;
+    SigWxType wxType;
 
-	/**
-	 * 
-	 * @param container
-	 */
-	public SigWxJetsData(PointDataDescription pdd,
-			PointDataPluginDao<SigWxData> dao, String pluginName) {
-		super(pdd, dao, pluginName);
-	}
+    /**
+     * 
+     * @param container
+     */
+    public SigWxJetsData(PointDataDescription pdd,
+            PointDataPluginDao<SigWxData> dao, String pluginName) {
+        super(pdd, dao, pluginName);
+    }
 
-	/**
-	 * 
-	 * @param pointData
-	 * @param locPoint
-	 * @param dataPoint
-	 * @param index
-	 */
-	List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
-		List<SigWxData> sList = new ArrayList<SigWxData>();
+    /**
+     * 
+     * @param pointData
+     * @param locPoint
+     * @param dataPoint
+     * @param index
+     */
+    List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
+        List<SigWxData> sList = new ArrayList<SigWxData>();
 
-		if (sigWx != null) {
-			IBUFRDataPacket p1 = dataList.get(15);
-			List<IBUFRDataPacket> tropList = getPacketSubList(p1);
-			if (tropList != null) {
-				int key = 0;
-				for (IBUFRDataPacket pp : tropList) {
-					SigWxData jet = getReport(pp, sigWx);
-					if (jet != null) {
-						jet.setKey(key++);
-						sList.add(jet);
-					}
-				}
-			}
-		}
+        if (sigWx != null) {
+            IBUFRDataPacket p1 = dataList.get(15);
+            List<IBUFRDataPacket> tropList = getPacketSubList(p1);
+            if (tropList != null) {
+                int key = 0;
+                for (IBUFRDataPacket pp : tropList) {
+                    SigWxData jet = getReport(pp, sigWx);
+                    if (jet != null) {
+                        jet.setKey(key++);
+                        sList.add(jet);
+                    }
+                }
+            }
+        }
 
-		return sList;
-	}
+        return sList;
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private SigWxData getReport(IBUFRDataPacket packet, SigWxData sigWx) {
-		SigWxData currWx = null;
-		if (packet != null) {
-			// get a copy
-			List<IBUFRDataPacket> sList = getPacketSubList(packet);
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private SigWxData getReport(IBUFRDataPacket packet, SigWxData sigWx) {
+        SigWxData currWx = null;
+        if (packet != null) {
+            // get a copy
+            List<IBUFRDataPacket> sList = getPacketSubList(packet);
 
-			int feature = getInt(sList.get(0), MISSING);
-			int dimensionSig = getInt(sList.get(1), MISSING);
-			if ((feature == 10) && (dimensionSig == 1)) {
+            int feature = getInt(sList.get(0), MISSING);
+            int dimensionSig = getInt(sList.get(1), MISSING);
+            if ((feature == 10) && (dimensionSig == 1)) {
 
-				currWx = sigWx.copyObs();
+                currWx = sigWx.copyObs();
 
-				PointDataContainer container = getContainer(currWx, 1);
-				if (container != null) {
-					PointDataView view = container.append();
+                PointDataContainer container = getContainer(currWx, 1);
+                if (container != null) {
+                    PointDataView view = container.append();
 
-					long vt = currWx.getDataTime().getValidTime()
-							.getTimeInMillis();
-					view.setLong("validTime", vt);
+                    long vt = currWx.getDataTime().getValidTime()
+                            .getTimeInMillis();
+                    view.setLong("validTime", vt);
 
-					view.setFloat("baseHgt", currWx.getBaseHeight()
-							.floatValue());
-					view.setFloat("topHgt", currWx.getTopHeight().floatValue());
+                    view.setFloat("baseHgt", currWx.getBaseHeight()
+                            .floatValue());
+                    view.setFloat("topHgt", currWx.getTopHeight().floatValue());
 
-					// pickup all of the tropopause level data
+                    // pickup all of the tropopause level data
 
-					int index = 0;
-					try {
+                    int index = 0;
+                    try {
 
-						List<IBUFRDataPacket> dList = getPacketSubList(sList
-								.get(2));
-						for (IBUFRDataPacket p : dList) {
-							List<IBUFRDataPacket> jetData = getPacketSubList(p);
+                        List<IBUFRDataPacket> dList = getPacketSubList(sList
+                                .get(2));
+                        for (IBUFRDataPacket p : dList) {
+                            List<IBUFRDataPacket> jetData = getPacketSubList(p);
 
-							setViewData("latitude", view, jetData.get(0), index);
-							setViewData("longitude", view, jetData.get(1),
-									index);
-							setViewData("jetAltitude", view, jetData.get(2),
-									index);
-							setViewData("jetSpeed", view, jetData.get(3), index);
-							setViewData("isotach80Blo", view, jetData.get(5),
-									index);
-							setViewData("isotach80Abv", view, jetData.get(7),
-									index);
-							index++;
-						}
-					} catch (IllegalArgumentException e) {
-						logger.error("Jet data truncated at " + index
-								+ " features");
-					}
-					view.setInt("numOfPoints", index);
-					currWx.setPointDataView(view);
-				}
-			}
-		}
-		return currWx;
-	}
+                            setViewData("latitude", view, jetData.get(0), index);
+                            setViewData("longitude", view, jetData.get(1),
+                                    index);
+                            setViewData("jetAltitude", view, jetData.get(2),
+                                    index);
+                            setViewData("jetSpeed", view, jetData.get(3), index);
+                            setViewData("isotach80Blo", view, jetData.get(5),
+                                    index);
+                            setViewData("isotach80Abv", view, jetData.get(7),
+                                    index);
+                            index++;
+                        }
+                    } catch (IllegalArgumentException e) {
+                        logger.error("Jet data truncated at " + index
+                                + " features");
+                    }
+                    view.setInt("numOfPoints", index);
+                    currWx.setPointDataView(view);
+                }
+            }
+        }
+        return currWx;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	SigWxType getType() {
-		return wxType;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    SigWxType getType() {
+        return wxType;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	void setType(SigWxType type) {
-		wxType = type;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    void setType(SigWxType type) {
+        wxType = type;
+    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxNullData.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxNullData.java
index 6beaed6a36..7a7c280f1b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxNullData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxNullData.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.bufrsigwx.decoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxType;
@@ -35,30 +35,32 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * TODO Add Description
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 14, 2009            jkorman     Initial creation
- *
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
+ * 
  * </pre>
- *
+ * 
  * @author jkorman
- * @version 1.0 
+ * @version 1.0
  */
 
 public class SigWxNullData extends SigWxDataAdapter {
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     SigWxType wxType;
-    
+
     /**
      * 
      * @param container
      */
-    public SigWxNullData(PointDataDescription pdd, PointDataPluginDao<SigWxData> dao, String pluginName) {
-        super(pdd,dao,pluginName);
+    public SigWxNullData(PointDataDescription pdd,
+            PointDataPluginDao<SigWxData> dao, String pluginName) {
+        super(pdd, dao, pluginName);
     }
 
     /**
@@ -69,9 +71,9 @@ public class SigWxNullData extends SigWxDataAdapter {
      * @param index
      */
     List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
-        
+
         logger.info("Unknown data " + sigWx.getTraceId());
-        
+
         return new ArrayList<SigWxData>();
     }
 
@@ -82,7 +84,7 @@ public class SigWxNullData extends SigWxDataAdapter {
     SigWxType getType() {
         return wxType;
     }
-    
+
     /**
      * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
      */
@@ -90,5 +92,5 @@ public class SigWxNullData extends SigWxDataAdapter {
     void setType(SigWxType type) {
         wxType = type;
     }
-    
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxTropData.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxTropData.java
index 20512fc6c4..ae4c4680f6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxTropData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxTropData.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.bufrsigwx.decoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxType;
@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 14, 2009            jkorman     Initial creation
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -53,148 +54,148 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  */
 
 public class SigWxTropData extends SigWxDataAdapter {
-	private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
-	private static final int STATS_TROP_HEIGHT = 63;
+    private static final int STATS_TROP_HEIGHT = 63;
 
-	SigWxType wxType;
+    SigWxType wxType;
 
-	/**
-	 * 
-	 * @param container
-	 */
-	public SigWxTropData(PointDataDescription pdd,
-			PointDataPluginDao<SigWxData> dao, String pluginName) {
-		super(pdd, dao, pluginName);
-	}
+    /**
+     * 
+     * @param container
+     */
+    public SigWxTropData(PointDataDescription pdd,
+            PointDataPluginDao<SigWxData> dao, String pluginName) {
+        super(pdd, dao, pluginName);
+    }
 
-	/**
-	 * 
-	 * @param pointData
-	 * @param locPoint
-	 * @param dataPoint
-	 * @param index
-	 */
-	List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
+    /**
+     * 
+     * @param pointData
+     * @param locPoint
+     * @param dataPoint
+     * @param index
+     */
+    List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
 
-		List<SigWxData> sList = new ArrayList<SigWxData>();
-		if (sigWx != null) {
-			IBUFRDataPacket p1 = dataList.get(15);
-			List<IBUFRDataPacket> tropList = getPacketSubList(p1);
-			if (tropList != null) {
-				for (IBUFRDataPacket pp : tropList) {
-					SigWxData tropLayer = getReport(pp, sigWx);
-					if (tropLayer != null) {
-						sList.add(tropLayer);
-					}
-				}
-			}
-		}
+        List<SigWxData> sList = new ArrayList<SigWxData>();
+        if (sigWx != null) {
+            IBUFRDataPacket p1 = dataList.get(15);
+            List<IBUFRDataPacket> tropList = getPacketSubList(p1);
+            if (tropList != null) {
+                for (IBUFRDataPacket pp : tropList) {
+                    SigWxData tropLayer = getReport(pp, sigWx);
+                    if (tropLayer != null) {
+                        sList.add(tropLayer);
+                    }
+                }
+            }
+        }
 
-		int maxEntries = -1;
-		Dimension[] dims = getPointDataDescription().dimensions;
-		for (Dimension d : dims) {
-			if ("maxEntries".equals(d.getDimensionName())) {
-				maxEntries = d.getDimensionLength();
-			}
-		}
+        int maxEntries = -1;
+        Dimension[] dims = getPointDataDescription().dimensions;
+        for (Dimension d : dims) {
+            if ("maxEntries".equals(d.getDimensionName())) {
+                maxEntries = d.getDimensionLength();
+            }
+        }
 
-		for (SigWxData s : sList) {
+        for (SigWxData s : sList) {
 
-			PointDataContainer container = getContainer(s, 1);
-			if (container != null) {
-				PointDataView view = container.append();
+            PointDataContainer container = getContainer(s, 1);
+            if (container != null) {
+                PointDataView view = container.append();
 
-				long vt = s.getDataTime().getValidTime().getTimeInMillis();
-				view.setLong("validTime", vt);
+                long vt = s.getDataTime().getValidTime().getTimeInMillis();
+                view.setLong("validTime", vt);
 
-				view.setFloat("baseHgt", s.getBaseHeight().floatValue());
-				view.setFloat("topHgt", s.getTopHeight().floatValue());
+                view.setFloat("baseHgt", s.getBaseHeight().floatValue());
+                view.setFloat("topHgt", s.getTopHeight().floatValue());
 
-				TropopauseLayerData trop = s.getTropData();
-				view.setInt("tropType", trop.getTropType());
-				s.setKey(trop.getTropType());
-				List<Double> la = trop.getLatitude();
-				List<Double> lo = trop.getLongitude();
-				List<Double> ht = trop.getHeight();
+                TropopauseLayerData trop = s.getTropData();
+                view.setInt("tropType", trop.getTropType());
+                s.setKey(trop.getTropType());
+                List<Double> la = trop.getLatitude();
+                List<Double> lo = trop.getLongitude();
+                List<Double> ht = trop.getHeight();
 
-				int size = Math.min(la.size(), maxEntries);
-				if (size < la.size()) {
-					logger.info("Tropopause data truncated at " + size
-							+ " needed " + la.size());
-				}
-				int numOfPoints = 0;
-				try {
-					for (int i = 0; i < size; i++) {
-						view.setFloat("latitude", la.get(i).floatValue(), i);
-						view.setFloat("longitude", lo.get(i).floatValue(), i);
-						view.setFloat("height", ht.get(i).floatValue(), i);
-						numOfPoints++;
-					}
-				} catch (IllegalArgumentException e) {
+                int size = Math.min(la.size(), maxEntries);
+                if (size < la.size()) {
+                    logger.info("Tropopause data truncated at " + size
+                            + " needed " + la.size());
+                }
+                int numOfPoints = 0;
+                try {
+                    for (int i = 0; i < size; i++) {
+                        view.setFloat("latitude", la.get(i).floatValue(), i);
+                        view.setFloat("longitude", lo.get(i).floatValue(), i);
+                        view.setFloat("height", ht.get(i).floatValue(), i);
+                        numOfPoints++;
+                    }
+                } catch (IllegalArgumentException e) {
 
-				}
-				view.setInt("numOfPoints", numOfPoints);
-				s.setPointDataView(view);
-			}
-		}
+                }
+                view.setInt("numOfPoints", numOfPoints);
+                s.setPointDataView(view);
+            }
+        }
 
-		return sList;
-	}
+        return sList;
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private SigWxData getReport(IBUFRDataPacket packet, SigWxData sigWx) {
-		SigWxData currWx = null;
-		if (packet != null) {
-			// get a copy
-			List<IBUFRDataPacket> sList = getPacketSubList(packet);
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private SigWxData getReport(IBUFRDataPacket packet, SigWxData sigWx) {
+        SigWxData currWx = null;
+        if (packet != null) {
+            // get a copy
+            List<IBUFRDataPacket> sList = getPacketSubList(packet);
 
-			int vertSoundingSig = getInt(sList.get(0), MISSING);
-			int dimensionSig = getInt(sList.get(1), MISSING);
-			if ((vertSoundingSig == 16) && (dimensionSig == 0)) {
-				int statistics = getInt(sList.get(2), MISSING);
-				if (statistics == MISSING) {
-					statistics = STATS_TROP_HEIGHT;
-				}
-				currWx = sigWx.copyObs();
-				// pickup all of the tropopause level data
-				TropopauseLayerData trop = new TropopauseLayerData(statistics);
+            int vertSoundingSig = getInt(sList.get(0), MISSING);
+            int dimensionSig = getInt(sList.get(1), MISSING);
+            if ((vertSoundingSig == 16) && (dimensionSig == 0)) {
+                int statistics = getInt(sList.get(2), MISSING);
+                if (statistics == MISSING) {
+                    statistics = STATS_TROP_HEIGHT;
+                }
+                currWx = sigWx.copyObs();
+                // pickup all of the tropopause level data
+                TropopauseLayerData trop = new TropopauseLayerData(statistics);
 
-				List<IBUFRDataPacket> dList = getPacketSubList(sList.get(3));
-				for (IBUFRDataPacket p : dList) {
-					List<IBUFRDataPacket> location = getPacketSubList(p);
+                List<IBUFRDataPacket> dList = getPacketSubList(sList.get(3));
+                for (IBUFRDataPacket p : dList) {
+                    List<IBUFRDataPacket> location = getPacketSubList(p);
 
-					double lat = getDouble(location.get(0), MISSING);
-					double lon = getDouble(location.get(1), MISSING);
-					double hgt = getDouble(location.get(2), MISSING);
+                    double lat = getDouble(location.get(0), MISSING);
+                    double lon = getDouble(location.get(1), MISSING);
+                    double hgt = getDouble(location.get(2), MISSING);
 
-					trop.addLevel(hgt, lat, lon);
-				}
-				currWx.setTropData(trop);
-			}
-		}
-		return currWx;
-	}
+                    trop.addLevel(hgt, lat, lon);
+                }
+                currWx.setTropData(trop);
+            }
+        }
+        return currWx;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	SigWxType getType() {
-		return wxType;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    SigWxType getType() {
+        return wxType;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	void setType(SigWxType type) {
-		wxType = type;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    void setType(SigWxType type) {
+        wxType = type;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxVTSData.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxVTSData.java
index 69b656fd0c..2cc3ad7f4b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxVTSData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxVTSData.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.bufrsigwx.decoder;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxType;
@@ -43,6 +43,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 14, 2009            jkorman     Initial creation
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -51,182 +52,182 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  */
 
 public class SigWxVTSData extends SigWxDataAdapter {
-	private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
-	private static final int POINT = 0;
+    private static final int POINT = 0;
 
-	SigWxType wxType;
+    SigWxType wxType;
 
-	private int key;
+    private int key;
 
-	/**
-	 * 
-	 * @param container
-	 */
-	public SigWxVTSData(PointDataDescription pdd,
-			PointDataPluginDao<SigWxData> dao, String pluginName) {
-		super(pdd, dao, pluginName);
-	}
+    /**
+     * 
+     * @param container
+     */
+    public SigWxVTSData(PointDataDescription pdd,
+            PointDataPluginDao<SigWxData> dao, String pluginName) {
+        super(pdd, dao, pluginName);
+    }
 
-	/**
-	 * 
-	 * @param pointData
-	 * @param locPoint
-	 * @param dataPoint
-	 * @param index
-	 */
-	List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
-		List<SigWxData> sList = new ArrayList<SigWxData>();
+    /**
+     * 
+     * @param pointData
+     * @param locPoint
+     * @param dataPoint
+     * @param index
+     */
+    List<SigWxData> getSigWxData(SigWxData sigWx, List<IBUFRDataPacket> dataList) {
+        List<SigWxData> sList = new ArrayList<SigWxData>();
 
-		key = 0;
-		sList.addAll(getStormReports(dataList.get(15), sigWx));
+        key = 0;
+        sList.addAll(getStormReports(dataList.get(15), sigWx));
 
-		sList.addAll(getVolcanoReports(dataList.get(16), sigWx));
+        sList.addAll(getVolcanoReports(dataList.get(16), sigWx));
 
-		sList.addAll(getIncidentReports(dataList.get(17), sigWx));
+        sList.addAll(getIncidentReports(dataList.get(17), sigWx));
 
-		return sList;
-	}
+        return sList;
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private List<SigWxData> getStormReports(IBUFRDataPacket packet,
-			SigWxData sigWx) {
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private List<SigWxData> getStormReports(IBUFRDataPacket packet,
+            SigWxData sigWx) {
 
-		List<SigWxData> wxList = new ArrayList<SigWxData>();
+        List<SigWxData> wxList = new ArrayList<SigWxData>();
 
-		if (packet != null) {
-			// get a copy
-			List<IBUFRDataPacket> stormData = getPacketSubList(packet);
-			for (IBUFRDataPacket s : stormData) {
-				List<IBUFRDataPacket> ss = getPacketSubList(s);
+        if (packet != null) {
+            // get a copy
+            List<IBUFRDataPacket> stormData = getPacketSubList(packet);
+            for (IBUFRDataPacket s : stormData) {
+                List<IBUFRDataPacket> ss = getPacketSubList(s);
 
-				SigWxData currWx = sigWx.copyObs();
+                SigWxData currWx = sigWx.copyObs();
 
-				PointDataContainer container = getContainer(currWx, 1);
-				if (container != null) {
-					PointDataView view = container.append();
+                PointDataContainer container = getContainer(currWx, 1);
+                if (container != null) {
+                    PointDataView view = container.append();
 
-					long vt = currWx.getDataTime().getValidTime()
-							.getTimeInMillis();
-					view.setLong("validTime", vt);
+                    long vt = currWx.getDataTime().getValidTime()
+                            .getTimeInMillis();
+                    view.setLong("validTime", vt);
 
-					setViewData("attribSig", view, ss.get(0));
-					setViewData("featureName", view, ss.get(2));
-					setViewData("latitude", view, ss.get(3));
-					setViewData("longitude", view, ss.get(4));
-					setViewData("synopticFeature", view, ss.get(5));
+                    setViewData("attribSig", view, ss.get(0));
+                    setViewData("featureName", view, ss.get(2));
+                    setViewData("latitude", view, ss.get(3));
+                    setViewData("longitude", view, ss.get(4));
+                    setViewData("synopticFeature", view, ss.get(5));
 
-					currWx.setKey(key++);
-					currWx.setPointDataView(view);
-					wxList.add(currWx);
-				}
-			}
-		}
+                    currWx.setKey(key++);
+                    currWx.setPointDataView(view);
+                    wxList.add(currWx);
+                }
+            }
+        }
 
-		return wxList;
-	}
+        return wxList;
+    }
 
-	/**
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private List<SigWxData> getVolcanoReports(IBUFRDataPacket packet,
-			SigWxData sigWx) {
+    /**
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private List<SigWxData> getVolcanoReports(IBUFRDataPacket packet,
+            SigWxData sigWx) {
 
-		List<SigWxData> wxList = new ArrayList<SigWxData>();
+        List<SigWxData> wxList = new ArrayList<SigWxData>();
 
-		if (packet != null) {
-			List<IBUFRDataPacket> volcanoData = getPacketSubList(packet);
-			for (IBUFRDataPacket v : volcanoData) {
-				List<IBUFRDataPacket> vv = getPacketSubList(v);
+        if (packet != null) {
+            List<IBUFRDataPacket> volcanoData = getPacketSubList(packet);
+            for (IBUFRDataPacket v : volcanoData) {
+                List<IBUFRDataPacket> vv = getPacketSubList(v);
 
-				SigWxData currWx = sigWx.copyObs();
+                SigWxData currWx = sigWx.copyObs();
 
-				PointDataContainer container = getContainer(currWx, 1);
-				if (container != null) {
-					PointDataView view = container.append();
+                PointDataContainer container = getContainer(currWx, 1);
+                if (container != null) {
+                    PointDataView view = container.append();
 
-					long vt = currWx.getDataTime().getValidTime()
-							.getTimeInMillis();
-					view.setLong("validTime", vt);
+                    long vt = currWx.getDataTime().getValidTime()
+                            .getTimeInMillis();
+                    view.setLong("validTime", vt);
 
-					setViewData("metFeature", view, vv.get(0));
-					setViewData("featureName", view, vv.get(1));
-					int dim = getInt(vv.get(2), MISSING);
-					if (dim == POINT) {
-						List<IBUFRDataPacket> dList = getPacketSubList(vv
-								.get(3));
-						List<IBUFRDataPacket> locData = getPacketSubList(dList
-								.get(0));
-						setViewData("latitude", view, locData.get(0));
-						setViewData("longitude", view, locData.get(1));
+                    setViewData("metFeature", view, vv.get(0));
+                    setViewData("featureName", view, vv.get(1));
+                    int dim = getInt(vv.get(2), MISSING);
+                    if (dim == POINT) {
+                        List<IBUFRDataPacket> dList = getPacketSubList(vv
+                                .get(3));
+                        List<IBUFRDataPacket> locData = getPacketSubList(dList
+                                .get(0));
+                        setViewData("latitude", view, locData.get(0));
+                        setViewData("longitude", view, locData.get(1));
 
-						setViewData("specialClouds", view, vv.get(10));
+                        setViewData("specialClouds", view, vv.get(10));
 
-						currWx.setKey(key++);
-						currWx.setPointDataView(view);
-						wxList.add(currWx);
-					} else {
+                        currWx.setKey(key++);
+                        currWx.setPointDataView(view);
+                        wxList.add(currWx);
+                    } else {
 
-					}
-				}
-			}
-		}
-		return wxList;
-	}
+                    }
+                }
+            }
+        }
+        return wxList;
+    }
 
-	/**
-	 * No implementation for now.
-	 * 
-	 * @param packet
-	 * @param sigWx
-	 * @return
-	 */
-	private List<SigWxData> getIncidentReports(IBUFRDataPacket packet,
-			SigWxData sigWx) {
+    /**
+     * No implementation for now.
+     * 
+     * @param packet
+     * @param sigWx
+     * @return
+     */
+    private List<SigWxData> getIncidentReports(IBUFRDataPacket packet,
+            SigWxData sigWx) {
 
-		List<SigWxData> wxList = new ArrayList<SigWxData>();
+        List<SigWxData> wxList = new ArrayList<SigWxData>();
 
-		if (packet != null) {
-			// get a copy
-			List<IBUFRDataPacket> incidentData = getPacketSubList(packet);
-			if ((incidentData != null) && (incidentData.size() == 13)) {
-				// SigWxData currWx = sigWx.copyObs();
-				//
-				// PointDataContainer container = getContainer(currWx, 1);
-				// if (container != null) {
-				// PointDataView view = container.append();
-				//
-				// long vt = currWx.getDataTime().getValidTime()
-				// .getTimeInMillis();
-				// view.setLong("validTime", vt);
-				// }
-			}
-		}
-		return wxList;
-	}
+        if (packet != null) {
+            // get a copy
+            List<IBUFRDataPacket> incidentData = getPacketSubList(packet);
+            if ((incidentData != null) && (incidentData.size() == 13)) {
+                // SigWxData currWx = sigWx.copyObs();
+                //
+                // PointDataContainer container = getContainer(currWx, 1);
+                // if (container != null) {
+                // PointDataView view = container.append();
+                //
+                // long vt = currWx.getDataTime().getValidTime()
+                // .getTimeInMillis();
+                // view.setLong("validTime", vt);
+                // }
+            }
+        }
+        return wxList;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	SigWxType getType() {
-		return wxType;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    SigWxType getType() {
+        return wxType;
+    }
 
-	/**
-	 * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
-	 */
-	@Override
-	void setType(SigWxType type) {
-		wxType = type;
-	}
+    /**
+     * @see com.raytheon.uf.edex.plugin.bufrsigwx.decoder.SigWxDataAdapter#getType()
+     */
+    @Override
+    void setType(SigWxType type) {
+        wxType = type;
+    }
 
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF
index 5081b82e02..ade9e349e2 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bufrssmi Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.bufrssmi
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.dataplugin.bufrssmi,
  com.raytheon.uf.edex.decodertools,
  com.raytheon.uf.common.pointdata,
@@ -22,4 +22,4 @@ Import-Package: com.raytheon.uf.common.datastorage,
  com.raytheon.uf.edex.bufrtools.descriptors,
  com.raytheon.uf.edex.bufrtools.packets,
  com.raytheon.uf.edex.core,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/pointdata/cwa.xml b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/pointdata/cwa.xml
index 34d45e2d3b..5fe2631a7c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/pointdata/cwa.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/res/pointdata/cwa.xml
@@ -25,7 +25,6 @@
   <parameter name="latitude" numDims="1" type="FLOAT" unit="degree_N" />
   <parameter name="longitude" numDims="1" type="FLOAT" unit="degree_E" />
   <parameter name="wmoHeader" numDims="1" type="STRING" />
-  <parameter name="dataURI" numDims="1" type="STRING" />
   <parameter name="dimension" numDims="1" type="STRING" />
   <parameter name="text" numDims="1" type="STRING" />
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWADecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWADecoder.java
index f85693ff7c..6535dad7a2 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWADecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWADecoder.java
@@ -45,6 +45,7 @@ import com.raytheon.uf.edex.plugin.cwa.util.TableLoader;
  * Apr 19, 2012  #457      dgilling     Minor code cleanup.
  * Mar 25, 2014  2930      skorolev     Fixed error in distance.
  * Apr 02, 2014  2930      skorolev     Corrected log message.
+ * Jan 26, 2016  5254      tgurney      Discard reports where eventId is null.
  * 
  * </pre>
  * 
@@ -119,7 +120,12 @@ public class CWADecoder {
             while (parser.hasNext()) {
                 report = parser.next();
                 if (report != null) {
-                    obsList.add(report);
+                    if (report.getEventId() == null) {
+                        logger.warn("Discarding report with eventId = null: "
+                                + report.toString());
+                    } else {
+                        obsList.add(report);
+                    }
                 }
                 if (!obsList.isEmpty()) {
                     decodedData = obsList.toArray(new PluginDataObject[obsList
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWARecordDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWARecordDao.java
index 27e44d64fc..3c8c9c6a0f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWARecordDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/CWARecordDao.java
@@ -19,77 +19,37 @@
  **/
 package com.raytheon.uf.edex.plugin.cwa;
 
-import java.util.List;
-
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.cwa.CWARecord;
-import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
 
 /**
  * 
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Feb 1, 2010            jsanchez     Initial creation
- *
+ * Feb 1, 2010             jsanchez    Initial creation
+ * Jan 25, 2016 5254       tgurney     Remove dead code
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
- * @version 1.0 
+ * @version 1.0
  */
 public class CWARecordDao extends PointDataPluginDao<CWARecord> {
     /**
-     * Creates a new CWARecordnDao
-     * @throws PluginException 
+     * Creates a new CWARecordDao
+     * 
+     * @throws PluginException
      */
     public CWARecordDao(String pluginName) throws PluginException {
         super(pluginName);
     }
 
-    /**
-     * Retrieves an sfcobs report using the datauri .
-     * 
-     * @param dataURI
-     *            The dataURI to match against.
-     * @return The report record if it exists.
-     */
-    public CWARecord queryByDataURI(String dataURI) {
-        CWARecord report = null;
-        List<?> obs = null;
-        try {
-            obs = queryBySingleCriteria("dataURI", dataURI);
-        } catch (DataAccessLayerException e) {
-            e.printStackTrace();
-        }
-        if ((obs != null) && (obs.size() > 0)) {
-            report = (CWARecord) obs.get(0);
-        }
-        return report;
-    }
-
-    /**
-     * Queries for to determine if a given data uri exists on the sfcobs table.
-     * 
-     * @param dataUri
-     *            The DataURI to find.
-     * @return An array of objects. If not null, there should only be a single
-     *         element.
-     */
-    public Object[] queryDataUriColumn(final String dataUri) {
-
-        String sql = "select datauri from awips.cwa where datauri='"
-                + dataUri + "';";
-
-        Object[] results = executeSQLQuery(sql);
-
-        return results;
-    }
-
     @Override
     public String[] getKeysRequiredForFileName() {
         return new String[] { "dataTime.refTime" };
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java
index e9c420e83d..320a1de080 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwa/src/com/raytheon/uf/edex/plugin/cwa/decoder/CWAParser.java
@@ -54,11 +54,11 @@ import com.vividsolutions.jts.geom.Coordinate;
 
 /**
  * The County Warning Area (CWA) text Parser.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Feb 01, 2010            jsanchez    Initial creation
@@ -70,9 +70,10 @@ import com.vividsolutions.jts.geom.Coordinate;
  * May 04, 2015 4379       nabowle     Set valid period. Support future end dates.
  *                                     Drop bad dates. Extract patterns. eventId
  *                                     is now only in the db.
- *
+ * Jan 25, 2016 5254       tgurney     Remove reference to dataURI column
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
  * @version 1.0
  */
@@ -148,7 +149,6 @@ public class CWAParser {
     private static Pattern DIR_DIST_PTRN = Pattern
             .compile(InternalReport.DIRDIST);
 
-
     static {
         dirToDeg.put("N", 0f);
         dirToDeg.put("NNE", 22.5f);
@@ -184,7 +184,7 @@ public class CWAParser {
 
     /**
      * Does this parser contain any more reports.
-     *
+     * 
      * @return Does this parser contain any more reports.
      */
     public boolean hasNext() {
@@ -202,7 +202,7 @@ public class CWAParser {
     /**
      * Get the next available report. Returns a null reference if no more
      * reports are available.
-     *
+     * 
      * @return The next available report.
      */
     public CWARecord next() {
@@ -230,7 +230,6 @@ public class CWAParser {
                 // Populate the point data.
                 PointDataView view = pdc.append();
                 view.setString("wmoHeader", report.getWmoHeader());
-                view.setString("dataURI", report.getDataURI());
                 view.setString("dimension", report.getDimension().toString());
                 view.setString("text", report.getText());
 
@@ -250,7 +249,7 @@ public class CWAParser {
     }
 
     /**
-     *
+     * 
      * @param obsData
      * @return
      */
@@ -324,7 +323,7 @@ public class CWAParser {
 
     /**
      * Validates the current report and adds valid reports to the list.
-     *
+     * 
      * @param reports
      *            The list to add valid reports to.
      */
@@ -340,7 +339,7 @@ public class CWAParser {
 
     /**
      * Set the message data and decode all message reports.
-     *
+     * 
      * @param message
      *            Raw message data.
      * @param traceId
@@ -528,7 +527,7 @@ public class CWAParser {
 
     /**
      * Get the issuance data time.
-     *
+     * 
      * @param timeStr
      *            The datatime string.
      * @return DataTime from header
@@ -545,7 +544,7 @@ public class CWAParser {
 
     /**
      * Get the Valid To data time.
-     *
+     * 
      * @param timeStr
      *            The datatime string.
      * @return The valid to DataTime.
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF
index 20c4f4b933..3899116326 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/META-INF/MANIFEST.MF
@@ -30,4 +30,4 @@ Import-Package: com.raytheon.edex.urifilter,
  com.raytheon.uf.common.util,
  com.raytheon.uf.edex.core,
  com.raytheon.uf.edex.plugin.scan.common,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/common/LocationCache.java b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/common/LocationCache.java
index d855f9d4b5..01490e874a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/common/LocationCache.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.cwat/src/com/raytheon/uf/edex/plugin/cwat/common/LocationCache.java
@@ -61,6 +61,8 @@ import com.vividsolutions.jts.geom.Coordinate;
  * ------------ ---------- ----------- --------------------------
  * Nov 17, 2010            rjpeter     Initial creation
  * Aug 26, 2014 3503       bclement    removed warning
+ * Jan 27, 2016 5237       tgurney     Remove deprecated LocalizationFile
+ *                                     method call
  * 
  * </pre>
  * 
@@ -214,7 +216,7 @@ public class LocationCache {
                     handler.handle(
                             Priority.WARN,
                             "Error deleting cwat location file ["
-                                    + localizationFile.getName() + "], "
+                                    + localizationFile.getPath() + "], "
                                     + e2.getMessage());
                 }
             } finally {
@@ -239,7 +241,7 @@ public class LocationCache {
             location.setLastModifiyTime(file.lastModified());
         } catch (Exception e) {
             handler.handle(Priority.ERROR, "Error saving cwat location file ["
-                    + locationFile.getName() + "], Error: " + e.getMessage());
+                    + locationFile.getPath() + "], Error: " + e.getMessage());
         }
     }
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/META-INF/MANIFEST.MF
index d40cace6a0..43cb9052cf 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Import-Package: com.raytheon.uf.common.dataplugin.grid,
  com.raytheon.uf.common.status,
  com.raytheon.uf.edex.dat.utils,
  com.raytheon.uf.edex.plugin.scan.common,
- org.apache.commons.logging
+ org.slf4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.edex.plugin.ffmp,
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
index 1010f2086b..63059358f4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
@@ -65,7 +65,6 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
 import com.raytheon.uf.common.monitor.config.FFMPRunConfigurationManager;
 import com.raytheon.uf.common.monitor.config.FFMPSourceConfigurationManager;
 import com.raytheon.uf.common.monitor.config.FFMPSourceConfigurationManager.DATA_TYPE;
@@ -142,6 +141,9 @@ import com.raytheon.uf.edex.plugin.ffmp.common.FFTIRatioDiff;
  * Aug 08, 2015 4722       dhladky     Generalized the processing of FFMP data types.
  * Sep 09, 2015 4756       dhladky     Further generalization of FFG processing.
  * Sep 21, 2015 4756       dhladky     Allow ARCHIVE types to not be purged out.
+ * Nov 12, 2015 4834       njensen     Changed LocalizationOpFailedException to LocalizationException
+ * Jan 27, 2016 5237       tgurney     Replace deprecated LocalizationFile method calls
+ * 
  * </pre>
  * 
  * @author dhladky
@@ -157,8 +159,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
     /**
      * Public constructor for FFMPGenerator
      * 
-     * @param name
-     * @param compositeProductType
+     * @param executor
      */
     public FFMPGenerator(Executor executor) {
 
@@ -397,7 +398,8 @@ public class FFMPGenerator extends CompositeProductGenerator implements
             DomainXML domain = runner.getPrimaryDomain();
             try {
                 tmp.add(new FFMPURIFilter(getSiteString(runner) + ":"
-                        + getGuidanceComparedString(runner) + ":" + domain.getCwa()));
+                        + getGuidanceComparedString(runner) + ":"
+                        + domain.getCwa()));
 
                 statusHandler.handle(Priority.INFO, "Created FFMP Filter.."
                         + " primary Domain: " + domain.getCwa());
@@ -560,7 +562,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
     /**
      * Set list of CWA's
      * 
-     * @param cwas
+     * @param domains
      */
     public void setDomains(ArrayList<DomainXML> domains) {
         this.domains = domains;
@@ -619,7 +621,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
 
             // process all of the dataKeys for this source
             for (String dataKey : dataHash.keySet()) {
-                
+
                 ArrayList<String> sites = new ArrayList<String>();
 
                 // is it a mosaic?
@@ -695,12 +697,13 @@ public class FFMPGenerator extends CompositeProductGenerator implements
 
                 // Go over all of the sites, if mosaic source, can be many.
                 for (String siteKey : sites) {
-                    
-                    // No dataKey hash?, dataKey comes from primary source (siteKey)
+
+                    // No dataKey hash?, dataKey comes from primary source
+                    // (siteKey)
                     if (dataKey == null) {
                         dataKey = siteKey;
                     }
-                    
+
                     FFMPRecord ffmpRec = new FFMPRecord();
                     ffmpRec.setSourceName(ffmpProduct.getSourceName());
                     ffmpRec.setDataKey(dataKey);
@@ -709,7 +712,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
                     FFMPProcessor ffmp = new FFMPProcessor(config, generator,
                             ffmpRec, template);
                     ffmpRec = ffmp.processFFMP(ffmpProduct);
-   
+
                     if (ffmpRec != null) {
 
                         persistRecord(ffmpRec);
@@ -812,7 +815,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
         /**
          * 
          * @param domain
-         * @return
          */
         public void createUnifiedGeometries(DomainXML domain) {
             ArrayList<String> hucsToGen = new ArrayList<String>();
@@ -895,7 +897,8 @@ public class FFMPGenerator extends CompositeProductGenerator implements
     }
 
     /**
-     * Gets the string buffer for the Guidance sources you wish to compare in FFMP
+     * Gets the string buffer for the Guidance sources you wish to compare in
+     * FFMP
      * 
      * @param run
      * @return
@@ -918,7 +921,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
                 }
                 break;
             }
-            // TODO:  Implement other types when available
+            // TODO: Implement other types when available
         }
         return buf.toString();
     }
@@ -970,14 +973,10 @@ public class FFMPGenerator extends CompositeProductGenerator implements
             statusHandler.handle(Priority.INFO, "Wrote FFMP source Bin File: "
                     + sourceList.getSourceId());
 
-        } catch (SerializationException se) {
-            se.printStackTrace();
-        } catch (FileNotFoundException fnfe) {
-            fnfe.printStackTrace();
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-        } catch (LocalizationOpFailedException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            statusHandler.error(
+                    "Error writing FFMP source bin file for source "
+                            + sourceList.getSourceId(), e);
         }
     }
 
@@ -1000,13 +999,13 @@ public class FFMPGenerator extends CompositeProductGenerator implements
                     FileUtil.file2bytes(f.getFile(), true));
         } catch (FileNotFoundException fnfe) {
             statusHandler.handle(Priority.ERROR,
-                    "Unable to locate file " + f.getName());
+                    "Unable to locate file " + f.getPath());
         } catch (SerializationException se) {
             statusHandler.handle(Priority.ERROR,
-                    "Unable to read file " + f.getName());
+                    "Unable to read file " + f.getPath());
         } catch (IOException ioe) {
             statusHandler.handle(Priority.ERROR,
-                    "General IO problem with file " + f.getName(), ioe);
+                    "General IO problem with file " + f.getPath(), ioe);
         }
 
         return sbl;
@@ -1056,8 +1055,8 @@ public class FFMPGenerator extends CompositeProductGenerator implements
     }
 
     /**
-     * Do pull strategy on FFG data, currently works with
-     * Gridded FFG sources only.  (There are only gridded sources so far)
+     * Do pull strategy on FFG data, currently works with Gridded FFG sources
+     * only. (There are only gridded sources so far)
      * 
      * @param filter
      * @return
@@ -1117,7 +1116,9 @@ public class FFMPGenerator extends CompositeProductGenerator implements
                                 uriComps[3], uriComps[7], plugin));
                     }
                 } catch (Exception e) {
-                    statusHandler.error("Problem with extracting guidance source URI's. source: "+guidSource, e);
+                    statusHandler.error(
+                            "Problem with extracting guidance source URI's. source: "
+                                    + guidSource, e);
                 }
             }
         }
@@ -1146,10 +1147,10 @@ public class FFMPGenerator extends CompositeProductGenerator implements
                                 filter.getSources().put(matchKey, dataUri);
                             }
                         } catch (Exception e) {
-                            statusHandler.handle(
-                                    Priority.ERROR,
-                                    "Unable to locate new FFG file. "
-                                            + dataUri, e);
+                            statusHandler
+                                    .handle(Priority.ERROR,
+                                            "Unable to locate new FFG file. "
+                                                    + dataUri, e);
                         }
                     }
                 }
@@ -1162,7 +1163,8 @@ public class FFMPGenerator extends CompositeProductGenerator implements
     /**
      * get the FFMP data container for this source
      * 
-     * @param sourceName
+     * @param siteSourceKey
+     * @param backDate
      * 
      * @return
      */
@@ -1293,8 +1295,9 @@ public class FFMPGenerator extends CompositeProductGenerator implements
                  */
                 if (source.getGuidanceType().equals(
                         GUIDANCE_TYPE.ARCHIVE.getGuidanceType())) {
-                    /** ARCHIVE types have the refTime of when it was loaded.
-                     * This will have it look back 1 day previous to the reftime 
+                    /**
+                     * ARCHIVE types have the refTime of when it was loaded.
+                     * This will have it look back 1 day previous to the reftime
                      * and purge anything older than that.
                      */
                     backDate = new Date(
@@ -1435,9 +1438,9 @@ public class FFMPGenerator extends CompositeProductGenerator implements
      * load existing container
      * 
      * @param sourceSiteDataKey
-     * @param hucs
      * @param siteKey
      * @param wfo
+     * @param backDate
      * @return
      */
     public FFMPDataContainer loadFFMPDataContainer(String sourceSiteDataKey,
@@ -1549,8 +1552,7 @@ public class FFMPGenerator extends CompositeProductGenerator implements
         /**
          * The actual work gets done here
          */
-        public void write() throws Exception {
-
+        public void write() {
             try {
 
                 FFMPAggregateRecord aggRecord = null;
@@ -1702,7 +1704,8 @@ public class FFMPGenerator extends CompositeProductGenerator implements
     /**
      * Write your FFTI Data files
      * 
-     * @param sourceList
+     * @param ffti
+     * @param fftiName
      */
     public void writeFFTIFile(FFTIData ffti, String fftiName) {
 
@@ -1721,21 +1724,15 @@ public class FFMPGenerator extends CompositeProductGenerator implements
             statusHandler.handle(Priority.DEBUG, "Wrote FFMP FFTI file: "
                     + fftiName);
 
-        } catch (SerializationException se) {
-            se.printStackTrace();
-        } catch (FileNotFoundException fnfe) {
-            fnfe.printStackTrace();
-        } catch (IOException ioe) {
-            ioe.printStackTrace();
-        } catch (LocalizationOpFailedException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
+            statusHandler.error("Error writing FFTI file " + fftiName, e);
         }
     }
 
     /**
      * Read out your FFTI Files
      * 
-     * @param sourceId
+     * @param fftiName
      * @return
      */
     public FFTIData readFFTIData(String fftiName) {
@@ -1751,16 +1748,16 @@ public class FFMPGenerator extends CompositeProductGenerator implements
                     FileUtil.file2bytes(f.getFile(), true));
         } catch (FileNotFoundException fnfe) {
             statusHandler.handle(Priority.ERROR,
-                    "Unable to locate file " + f.getName(), fnfe);
+                    "Unable to locate file " + f.getPath(), fnfe);
         } catch (SerializationException se) {
             statusHandler.handle(Priority.ERROR, "Unable to serialize file "
-                    + f.getName(), se);
+                    + f.getPath(), se);
         } catch (IOException ioe) {
             statusHandler.handle(Priority.ERROR,
-                    "IO problem reading file " + f.getName(), ioe);
+                    "IO problem reading file " + f.getPath(), ioe);
         } catch (Exception e) {
             statusHandler.handle(Priority.ERROR,
-                    "General Exception reading file " + f.getName(), e);
+                    "General Exception reading file " + f.getPath(), e);
         }
 
         return ffti;
@@ -2066,7 +2063,6 @@ public class FFMPGenerator extends CompositeProductGenerator implements
      * surge being sent to pypies.
      * 
      * @param record
-     * @return
      */
     private synchronized void persistRecord(FFMPRecord record) {
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/RadarSBLGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/RadarSBLGenerator.java
index 4886b17ba5..ccca04d0b6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/RadarSBLGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/RadarSBLGenerator.java
@@ -33,7 +33,6 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.logging.Log;
 import org.geotools.coverage.grid.GeneralGridEnvelope;
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.geotools.coverage.grid.InvalidGridGeometryException;
@@ -47,6 +46,7 @@ import org.opengis.referencing.crs.ProjectedCRS;
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransform2D;
 import org.opengis.referencing.operation.TransformException;
+import org.slf4j.Logger;
 
 import com.raytheon.uf.common.dataplugin.ffmp.SourceBin;
 import com.raytheon.uf.common.dataplugin.ffmp.SourceBinEntry;
@@ -76,7 +76,8 @@ import com.vividsolutions.jts.geom.TopologyException;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 6, 2011   10593     dfriedma    Initial creation
- * May 1, 2013   15684     zhao        Add code to handle possible TopologyException 
+ * May 1, 2013   15684     zhao        Add code to handle possible TopologyException
+ * Dec 14, 2015  5166      kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -88,61 +89,84 @@ public class RadarSBLGenerator {
     private enum MappingMethod {
         BIN_CENTER, ALL_BINS
     }
+
     private static final String DEBUG_FILE_NAME_PATTERN = "ffmp/sources/human-readable-%s.txt";
+
     private static final String CONFIG_FILE_NAME = "ffmp/RadarSBLGenerator.txt";
-    private Log logger;
+
+    private Logger logger;
+
     private boolean debug;
+
     private MappingMethod mappingMethod = MappingMethod.BIN_CENTER;
+
     private PrintStream debugStream;
-    
+
     public RadarSBLGenerator(FFMPConfig config) {
         logger = config.getGenerator().logger;
         loadConfiguration();
     }
-    
-    public SourceBinList generate(String sourceId, Set<Long> basinSet, Map<Long, Geometry> basinMap, RadarRecord radarRec) throws InvalidGridGeometryException, FactoryException, MismatchedDimensionException, TransformException {
+
+    public SourceBinList generate(String sourceId, Set<Long> basinSet,
+            Map<Long, Geometry> basinMap, RadarRecord radarRec)
+            throws InvalidGridGeometryException, FactoryException,
+            MismatchedDimensionException, TransformException {
         SourceBinList result = null;
-        logger.info(String.format("RadarSBLGenerator: Using %s method", mappingMethod));
+        logger.info(String.format("RadarSBLGenerator: Using %s method",
+                mappingMethod));
         if (debug)
             debugStream = getDebugStream(sourceId);
         try {
             long t0 = System.currentTimeMillis();
             if (mappingMethod == MappingMethod.BIN_CENTER)
-                result = generateWithBinCenters(sourceId, basinSet, basinMap, radarRec);
+                result = generateWithBinCenters(sourceId, basinSet, basinMap,
+                        radarRec);
             else if (mappingMethod == MappingMethod.ALL_BINS)
-                result = generateWithAllBins(sourceId, basinSet, basinMap, radarRec);
+                result = generateWithAllBins(sourceId, basinSet, basinMap,
+                        radarRec);
             else
                 return null;
             long t = System.currentTimeMillis();
-            logger.info(String.format("RadarSBLGenerator: source %s, %s: %1.1f seconds", sourceId, mappingMethod, 
-                    (double) (t-t0) / 1000));
+            logger.info(String.format(
+                    "RadarSBLGenerator: source %s, %s: %1.1f seconds",
+                    sourceId, mappingMethod, (double) (t - t0) / 1000));
         } finally {
             if (debugStream != null)
                 debugStream.close();
         }
         return result;
-            
+
     }
-    
-    private SourceBinList generateWithBinCenters(String sourceId, Set<Long> basinSet, Map<Long, Geometry> basinMap, RadarRecord radarRec) throws InvalidGridGeometryException, FactoryException, MismatchedDimensionException, TransformException {
+
+    private SourceBinList generateWithBinCenters(String sourceId,
+            Set<Long> basinSet, Map<Long, Geometry> basinMap,
+            RadarRecord radarRec) throws InvalidGridGeometryException,
+            FactoryException, MismatchedDimensionException, TransformException {
         SourceBinList sbl = new SourceBinList(sourceId);
-        
-        Map<Long, Geometry> xformedBasinMap = new HashMap<Long, Geometry>(basinSet.size());
-        
-        MathTransform mt = CRSCache.getInstance().getTransformFromLatLon(radarRec.getCRS());
-        MathTransform mtToLL = CRSCache.getInstance().getTransformToLatLon(radarRec.getCRS());
-        
-        int searchGridLen = Math.max(1, (int) (Math.sqrt(basinSet.size()) + 0.5));
-        GridGeometry2D searchGridGeometry = getSearchGridGeometry(radarRec, searchGridLen);
-        ArrayList<Long>[] searchGrid = new ArrayList[searchGridLen * searchGridLen];
+
+        Map<Long, Geometry> xformedBasinMap = new HashMap<Long, Geometry>(
+                basinSet.size());
+
+        MathTransform mt = CRSCache.getInstance().getTransformFromLatLon(
+                radarRec.getCRS());
+        MathTransform mtToLL = CRSCache.getInstance().getTransformToLatLon(
+                radarRec.getCRS());
+
+        int searchGridLen = Math.max(1,
+                (int) (Math.sqrt(basinSet.size()) + 0.5));
+        GridGeometry2D searchGridGeometry = getSearchGridGeometry(radarRec,
+                searchGridLen);
+        ArrayList<Long>[] searchGrid = new ArrayList[searchGridLen
+                * searchGridLen];
         for (int i = 0; i < searchGrid.length; i++)
             searchGrid[i] = new ArrayList<Long>(4);
-        
-        HashMap<Long,ArrayList<Short>> rblMap = null;
+
+        HashMap<Long, ArrayList<Short>> rblMap = null;
         if (debugStream != null)
             rblMap = new HashMap<Long, ArrayList<Short>>();
 
-        MathTransform2D w2g = searchGridGeometry.getCRSToGrid2D(PixelOrientation.UPPER_LEFT);
+        MathTransform2D w2g = searchGridGeometry
+                .getCRSToGrid2D(PixelOrientation.UPPER_LEFT);
         DirectPosition2D pw = new DirectPosition2D();
         DirectPosition2D pg = new DirectPosition2D();
         DirectPosition2D pe = new DirectPosition2D();
@@ -157,23 +181,23 @@ public class RadarSBLGenerator {
             Coordinate[] bbCoords = bb.getCoordinates();
             pw.x = bbCoords[0].x;
             pw.y = bbCoords[0].y;
-            w2g.transform((Point2D)pw, pg);
+            w2g.transform((Point2D) pw, pg);
             int minx = Math.max(0, (int) Math.floor(pg.x));
             int miny = Math.max(0, (int) Math.floor(pg.y));
 
             pw.x = bbCoords[2].x;
             pw.y = bbCoords[2].y;
-            w2g.transform((Point2D)pw, pg);
+            w2g.transform((Point2D) pw, pg);
             int maxx = Math.min(searchGridLen, (int) Math.floor(pg.x));
             int maxy = Math.min(searchGridLen, (int) Math.floor(pg.y));
-            
+
             // Grid y-coords are flipped.
             if (maxy < miny) {
-                int t = maxy; 
+                int t = maxy;
                 maxy = miny;
                 miny = t;
             }
-            
+
             int b = miny * searchGridLen;
             for (int j = miny; j <= maxy; ++j) {
                 for (int i = minx; i <= maxx; ++i) {
@@ -182,25 +206,28 @@ public class RadarSBLGenerator {
                 b += searchGridLen;
             }
         }
-        
+
         if (xformedBasinMap.isEmpty())
             return sbl;
-        
-        HashMap<Long, ArrayList<SourceBinEntry>> sbeMap = new HashMap<Long, ArrayList<SourceBinEntry>>(basinSet.size());
-        
-        GeometryFactory gf = xformedBasinMap.values().iterator().next().getFactory();
-        
-        double eFactor = Math.cos(Math.toRadians(radarRec.getTrueElevationAngle()));
+
+        HashMap<Long, ArrayList<SourceBinEntry>> sbeMap = new HashMap<Long, ArrayList<SourceBinEntry>>(
+                basinSet.size());
+
+        GeometryFactory gf = xformedBasinMap.values().iterator().next()
+                .getFactory();
+
+        double eFactor = Math.cos(Math.toRadians(radarRec
+                .getTrueElevationAngle()));
         double[] binSizes = new double[radarRec.getNumBins()];
         double cc = Math.PI / 180 / 2;
         double r0 = 0;
         for (int ib = 0; ib < radarRec.getNumBins(); ++ib) {
             double r1 = (ib + 1) * radarRec.getGateResolution() * eFactor;
-            binSizes[ib] = cc * (r1*r1 - r0*r0);
+            binSizes[ib] = cc * (r1 * r1 - r0 * r0);
             r0 = r1;
         }
 
-        //Long lastPfaf = null;
+        // Long lastPfaf = null;
         Geometry lastBasinGeometry = null;
         ArrayList<SourceBinEntry> lastSBEL = null;
         ArrayList<Short> lastRBL = null;
@@ -209,36 +236,39 @@ public class RadarSBLGenerator {
             double a = (ir + 0.5) * Math.PI / 180; // center of the radial
             double sin = Math.sin(a);
             double cos = Math.cos(a);
-            
+
             for (int ib = 0; ib < radarRec.getNumBins(); ++ib) {
                 double r = (ib + 0.5) * radarRec.getGateResolution() * eFactor;
                 pw.x = r * sin; // clockwise from north
                 pw.y = r * cos;
                 cw.x = pw.x;
                 cw.y = pw.y;
-                
+
                 Point p = gf.createPoint(cw);
                 if (lastBasinGeometry != null && lastBasinGeometry.contains(p)) {
                     // nothing
                 } else {
                     lastBasinGeometry = null;
-                    
-                    w2g.transform((Point2D)pw, pg);
+
+                    w2g.transform((Point2D) pw, pg);
                     int i = (int) pg.x;
                     int j = (int) pg.y;
-                    if (i >= 0 && i < searchGridLen && j >= 0 && j < searchGridLen) {
+                    if (i >= 0 && i < searchGridLen && j >= 0
+                            && j < searchGridLen) {
                         for (Long pfaf : searchGrid[j * searchGridLen + i]) {
                             Geometry geom = xformedBasinMap.get(pfaf);
-                            //DR15684
+                            // DR15684
                             boolean geomContainsPointP = false;
                             try {
-                            	geomContainsPointP = geom.contains(p);
+                                geomContainsPointP = geom.contains(p);
                             } catch (TopologyException e) {
-                            	logger.warn(String.format("RadarSBLGenerator: caught a TopologyException: %s", e.getMessage()));
-                            	throw e;
+                                logger.warn(String
+                                        .format("RadarSBLGenerator: caught a TopologyException: %s",
+                                                e.getMessage()));
+                                throw e;
                             }
                             if (geomContainsPointP) {
-                                //lastPfaf = pfaf;
+                                // lastPfaf = pfaf;
                                 lastBasinGeometry = geom;
                                 lastSBEL = sbeMap.get(pfaf);
                                 if (lastSBEL == null) {
@@ -257,7 +287,7 @@ public class RadarSBLGenerator {
                         }
                     }
                 }
-                
+
                 if (lastBasinGeometry != null) {
                     SourceBinEntry sbe = new SourceBinEntry();
                     mtToLL.transform(pw, pe);
@@ -271,7 +301,7 @@ public class RadarSBLGenerator {
                 }
             }
         }
-        
+
         // Assign a bin to any basins that were missed above
         for (Long key : basinSet) {
             ArrayList<SourceBinEntry> sbel = sbeMap.get(key);
@@ -279,26 +309,26 @@ public class RadarSBLGenerator {
             if (sbel == null && (geom = basinMap.get(key)) != null) {
                 sbel = new ArrayList<SourceBinEntry>();
                 sbeMap.put(key, sbel);
-                
+
                 SourceBinEntry sbe = new SourceBinEntry();
                 sbe.coor = new Coordinate(geom.getCentroid().getCoordinate());
                 sbe.area = 1;
                 sbel.add(sbe);
             }
         }
-        
+
         for (Entry<Long, ArrayList<SourceBinEntry>> entry : sbeMap.entrySet()) {
             sbl.addBin(entry.getKey(), new SourceBin(entry.getValue()));
         }
-        
-        if (debugStream != null) {            
+
+        if (debugStream != null) {
             PrintStream dbg = debugStream;
             for (Entry<Long, ArrayList<Short>> entry : rblMap.entrySet()) {
                 dbg.format("%012d : ", entry.getKey());
                 int lrp = -1;
                 ArrayList<Short> a = entry.getValue();
                 ArrayList<SourceBinEntry> sbel = sbeMap.get(entry.getKey());
-                for (int i = 0; i < a.size(); ) {
+                for (int i = 0; i < a.size();) {
                     int ir = a.get(i++);
                     int ib = a.get(i++);
                     if (lrp != ir) {
@@ -318,38 +348,45 @@ public class RadarSBLGenerator {
                 dbg.print('\n');
             }
         }
-        
+
         return sbl;
     }
 
-    private GridGeometry2D getSearchGridGeometry(RadarRecord radarRec, int gridLen) {
+    private GridGeometry2D getSearchGridGeometry(RadarRecord radarRec,
+            int gridLen) {
         ProjectedCRS crs = radarRec.getCRS();
         GeneralEnvelope generalEnvelope = new GeneralEnvelope(2);
         generalEnvelope.setCoordinateReferenceSystem(crs);
 
-        double range = radarRec.getGateResolution()
-                * radarRec.getNumBins()
+        double range = radarRec.getGateResolution() * radarRec.getNumBins()
                 * Math.cos(Math.toRadians(radarRec.getTrueElevationAngle()));
 
         generalEnvelope.setRange(0, -range, range);
         generalEnvelope.setRange(1, -range, range);
 
-        GridGeometry2D searchGridGeometry = new GridGeometry2D(new GeneralGridEnvelope(
-                new int[] { 0, 0 }, new int[] { gridLen, gridLen }, false), generalEnvelope);
+        GridGeometry2D searchGridGeometry = new GridGeometry2D(
+                new GeneralGridEnvelope(new int[] { 0, 0 }, new int[] {
+                        gridLen, gridLen }, false), generalEnvelope);
         return searchGridGeometry;
     }
-    
-    private SourceBinList generateWithAllBins(String sourceId, Set<Long> basinSet, Map<Long, Geometry> basinMap, RadarRecord radarRec) throws InvalidGridGeometryException, FactoryException, MismatchedDimensionException, TransformException {
+
+    private SourceBinList generateWithAllBins(String sourceId,
+            Set<Long> basinSet, Map<Long, Geometry> basinMap,
+            RadarRecord radarRec) throws InvalidGridGeometryException,
+            FactoryException, MismatchedDimensionException, TransformException {
         SourceBinList sbl = new SourceBinList(sourceId);
         int nRadials = radarRec.getNumRadials();
         int nBins = radarRec.getNumBins();
-        
-        MathTransform mt = CRSCache.getInstance().getTransformFromLatLon(radarRec.getCRS());
-        MathTransform mtToLL = CRSCache.getInstance().getTransformToLatLon(radarRec.getCRS());
-        
-        double eFactor = Math.cos(Math.toRadians(radarRec.getTrueElevationAngle()));
-        
-        GeometryFactory gf = new GeometryFactory(); //.values().iterator().next().getFactory();
+
+        MathTransform mt = CRSCache.getInstance().getTransformFromLatLon(
+                radarRec.getCRS());
+        MathTransform mtToLL = CRSCache.getInstance().getTransformToLatLon(
+                radarRec.getCRS());
+
+        double eFactor = Math.cos(Math.toRadians(radarRec
+                .getTrueElevationAngle()));
+
+        GeometryFactory gf = new GeometryFactory(); // .values().iterator().next().getFactory();
 
         Geometry[] radarBinGeometries = new Geometry[nRadials * nBins];
         Coordinate[] radarBinLLs = new Coordinate[nRadials * nBins];
@@ -362,14 +399,14 @@ public class RadarSBLGenerator {
             double a = ir * Math.PI / 180;
             double sin = Math.sin(a);
             double cos = Math.cos(a);
-            
+
             for (int ib = 0; ib <= nBins; ++ib) {
                 double r = ib * radarRec.getGateResolution() * eFactor;
-                radialCoords1[ib] = new Coordinate(
-                        r * sin, // clockwise from north
+                radialCoords1[ib] = new Coordinate(r * sin, // clockwise from
+                                                            // north
                         r * cos);
             }
-            
+
             if (ir > 0) {
                 double am = (ir + 0.5) * Math.PI / 180;
                 double sinm = Math.sin(am);
@@ -382,13 +419,14 @@ public class RadarSBLGenerator {
                     coors[3] = radialCoords1[ib - 1];
                     // make a closed object
                     coors[4] = coors[0];
-    
+
                     LinearRing lr = gf.createLinearRing(coors);
                     Polygon poly = gf.createPolygon(lr, null);
-    
+
                     int bidx = (ir - 1) * nBins + (ib - 1);
                     radarBinGeometries[bidx] = poly;
-                    double rm = (ib + 0.5) * radarRec.getGateResolution() * eFactor;
+                    double rm = (ib + 0.5) * radarRec.getGateResolution()
+                            * eFactor;
                     pw.x = rm * sinm;
                     pw.y = rm * cosm;
                     mtToLL.transform(pw, pe);
@@ -396,20 +434,20 @@ public class RadarSBLGenerator {
                 }
 
             }
-            
+
             tCoords = radialCoords0;
             radialCoords0 = radialCoords1;
             radialCoords1 = tCoords;
         }
-                
+
         int[] polarRange = new int[4]; // bin0,rad0, b1,r1, inclusive
         int[] binCoords = new int[80]; // b1,r1, b2,r2 ...
         Coordinate[] polarCoords = new Coordinate[4];
         for (int i = 0; i < 4; ++i)
             polarCoords[i] = new Coordinate();
-        
+
         PrintStream dbg = debugStream;
-        
+
         for (Long key : basinSet) {
             Geometry basinGeom = basinMap.get(key);
             if (basinGeom == null)
@@ -418,22 +456,25 @@ public class RadarSBLGenerator {
             Geometry xformedGeom = JTS.transform(basinGeom, mt);
             Coordinate[] shell;
             if (xformedGeom instanceof Polygon)
-                shell = ((Polygon) xformedGeom).getExteriorRing().getCoordinates();
+                shell = ((Polygon) xformedGeom).getExteriorRing()
+                        .getCoordinates();
             else
                 shell = xformedGeom.convexHull().getCoordinates();
-            
+
             if (binCoords.length < shell.length * 2)
                 binCoords = new int[shell.length * 2];
             for (int i = 0; i < shell.length; ++i) {
                 double x = shell[i].x;
                 double y = shell[i].y;
-                binCoords[i * 2] = (int) (Math.sqrt(x*x + y*y) / (radarRec.getGateResolution() * eFactor));
+                binCoords[i * 2] = (int) (Math.sqrt(x * x + y * y) / (radarRec
+                        .getGateResolution() * eFactor));
                 double atan = Math.atan2(x, y); // clockwise from north
-                /* Make the angle positive so that truncating results in 
+                /*
+                 * Make the angle positive so that truncating results in
                  * consistent rounding for all angles.
                  */
                 if (atan < 0)
-                    atan += 2 * Math.PI; 
+                    atan += 2 * Math.PI;
                 int b = (int) (atan * 180 / Math.PI);
                 binCoords[i * 2 + 1] = b;
             }
@@ -442,11 +483,11 @@ public class RadarSBLGenerator {
 
             ArrayList<SourceBinEntry> sbel = new ArrayList<SourceBinEntry>();
             double basinArea = xformedGeom.getArea();
-            
+
             if (dbg != null)
                 dbg.format("%012d : ", key);
             int lrp = -1;
-            
+
             int ir = polarRange[1] - 1;
             do {
                 ++ir;
@@ -455,13 +496,14 @@ public class RadarSBLGenerator {
                 for (int ib = polarRange[0]; ib <= polarRange[2]; ++ib) {
                     int bidx = ir * nBins + ib;
 
-                    Geometry intersectGeo = xformedGeom.intersection(radarBinGeometries[bidx]);
-                    if (! intersectGeo.isEmpty()) {
+                    Geometry intersectGeo = xformedGeom
+                            .intersection(radarBinGeometries[bidx]);
+                    if (!intersectGeo.isEmpty()) {
                         SourceBinEntry sbe = new SourceBinEntry();
                         sbe.coor = new Coordinate(radarBinLLs[bidx]);
-                        sbe.area = intersectGeo.getArea() / basinArea;;
+                        sbe.area = intersectGeo.getArea() / basinArea;
                         sbel.add(sbe);
-                        
+
                         if (dbg != null) {
                             if (lrp != ir) {
                                 if (lrp != -1)
@@ -475,7 +517,7 @@ public class RadarSBLGenerator {
                     }
                 }
             } while (ir != polarRange[3]);
-            
+
             if (dbg != null) {
                 if (lrp != -1)
                     dbg.print(") ");
@@ -484,40 +526,47 @@ public class RadarSBLGenerator {
                     dbg.format("%1.2f ", sbe.area);
                 dbg.print('\n');
             }
-                
+
             sbl.addBin(key, new SourceBin(sbel));
         }
-        
+
         return sbl;
     }
 
     private int[] a = new int[40];
+
     private int[] b = new int[40];
-    
-    /** Given a list of radar bin coordinates, return the range of radials/bins that
-     * contains all of them.
-     * @param binCoords Radar bin coordinates radial0, bin0, radial1, bin1, ...
-     * @param nCoords The number of (radial,bin) pairs in binCoords
-     * @param polarRange Upon return, contains startRadial, startBin, endRadial, endBin.  
-     * The values are inclusive.  startBin may be greater than endBin, indicating 
-     * wrap-around from 359 to 0.  
+
+    /**
+     * Given a list of radar bin coordinates, return the range of radials/bins
+     * that contains all of them.
+     * 
+     * @param binCoords
+     *            Radar bin coordinates radial0, bin0, radial1, bin1, ...
+     * @param nCoords
+     *            The number of (radial,bin) pairs in binCoords
+     * @param polarRange
+     *            Upon return, contains startRadial, startBin, endRadial,
+     *            endBin. The values are inclusive. startBin may be greater than
+     *            endBin, indicating wrap-around from 359 to 0.
      */
     private void calcPolarRange(int[] binCoords, int nCoords, int[] polarRange) {
-        /* Implementation: If all points fit within a less-than-180-degree 
-         * sector, we only need to examine bins within the sector (further 
-         * bounded by the min and max range.)  Otherwise, we must examine all
+        /*
+         * Implementation: If all points fit within a less-than-180-degree
+         * sector, we only need to examine bins within the sector (further
+         * bounded by the min and max range.) Otherwise, we must examine all
          * bins within the circle defined by the max range.
          * 
          * Actual test is "less than 179 degrees" to be safe.
          */
-        
+
         if (a.length < nCoords) {
             a = new int[nCoords];
             b = new int[nCoords];
         }
         int minr = binCoords[0];
         int maxr = minr;
-        
+
         int nc2 = nCoords * 2;
         for (int i = 2; i < nc2; i += 2) {
             minr = Math.min(minr, binCoords[i]);
@@ -525,26 +574,26 @@ public class RadarSBLGenerator {
         }
         polarRange[0] = minr;
         polarRange[2] = maxr;
-            
+
         int j = 0;
         for (int i = 1; i < nc2; i += 2)
             a[j++] = binCoords[i];
         Arrays.sort(a, 0, nCoords);
 
-        /* If there is a greater-than-179-degree gap between two points,
-         * try scanning from the other side.
+        /*
+         * If there is a greater-than-179-degree gap between two points, try
+         * scanning from the other side.
          */
         int trys = 0;
-        Ltry:
-        while (true) {
+        Ltry: while (true) {
             for (int i = 1; i < nCoords; ++i) {
-                if (a[i] - a[i-1] >= 179) {
+                if (a[i] - a[i - 1] >= 179) {
                     if (trys == 0) {
                         for (j = i; j < nCoords; ++j)
                             a[j] = a[j] - 360;
                         System.arraycopy(a, 0, b, nCoords - i, i);
                         System.arraycopy(a, i, b, 0, nCoords - i);
-                        System.arraycopy(b, 0, a, 0, nCoords);                        
+                        System.arraycopy(b, 0, a, 0, nCoords);
                         ++trys;
                         continue Ltry;
                     } else {
@@ -557,10 +606,10 @@ public class RadarSBLGenerator {
             }
             break;
         }
-        
+
         int an = a[nCoords - 1];
         if (an - a[0] < 179) {
-            polarRange[1] = a[0] >= 0 ? a[0] : a[0] + 360;            
+            polarRange[1] = a[0] >= 0 ? a[0] : a[0] + 360;
             polarRange[3] = an >= 0 ? an : an + 360;
         } else {
             polarRange[0] = 0;
@@ -574,11 +623,11 @@ public class RadarSBLGenerator {
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
 
-        LocalizationFile lf = pm.getLocalizationFile(lc, 
+        LocalizationFile lf = pm.getLocalizationFile(lc,
                 String.format(DEBUG_FILE_NAME_PATTERN, sourceId));
-        
+
         File file = lf.getFile();
-        
+
         try {
             logger.info(String.format("Saving human-readable bin list to %s",
                     lf));
@@ -588,19 +637,19 @@ public class RadarSBLGenerator {
             return null;
         }
     }
-    
+
     private void loadConfiguration() {
         IPathManager pm = PathManagerFactory.getPathManager();
         LocalizationContext lc = pm.getContext(LocalizationType.COMMON_STATIC,
                 LocalizationLevel.SITE);
 
         LocalizationFile lf = pm.getLocalizationFile(lc, CONFIG_FILE_NAME);
-        
+
         File file = lf.getFile();
-        if (! file.exists())
+        if (!file.exists())
             return;
         Properties p = new Properties();
-        
+
         try {
             InputStream inStream = new FileInputStream(file);
             try {
@@ -611,7 +660,7 @@ public class RadarSBLGenerator {
         } catch (IOException e) {
             logger.error(String.format("%s: %s", file, e.getMessage()));
         }
-        
+
         try {
             debug = Boolean.parseBoolean(p.getProperty("debug"));
         } catch (Exception e) {
@@ -623,5 +672,5 @@ public class RadarSBLGenerator {
             // ignore
         }
     }
-    
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/META-INF/MANIFEST.MF
index 748b1413da..12d84f9c42 100755
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/META-INF/MANIFEST.MF
@@ -9,7 +9,10 @@ Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.12.1153",
  com.raytheon.edex.common;bundle-version="1.12.1153",
  com.raytheon.uf.common.dataplugin.fssobs;bundle-version="1.0.0",
  com.raytheon.uf.edex.decodertools,
- com.raytheon.uf.common.monitor
+ com.raytheon.uf.common.monitor,
+ com.raytheon.uf.common.localization;bundle-version="1.15.1",
+ com.raytheon.uf.common.localization.python;bundle-version="1.0.0",
+ org.slf4j;bundle-version="1.7.12"
 Export-Package: com.raytheon.uf.edex.plugin.fssobs,
  com.raytheon.uf.edex.plugin.fssobs.common
 Import-Package: com.raytheon.uf.common.monitor.config,
@@ -24,5 +27,4 @@ Import-Package: com.raytheon.uf.common.monitor.config,
  com.raytheon.uf.edex.plugin.fssobs,
  com.raytheon.uf.edex.pointdata,
  javax.measure.converter,
- javax.measure.unit,
- org.apache.commons.logging
+ javax.measure.unit
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsAlarmMgr.java b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsAlarmMgr.java
new file mode 100755
index 0000000000..7fcd26e76a
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsAlarmMgr.java
@@ -0,0 +1,585 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.edex.plugin.fssobs;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.raytheon.uf.common.dataplugin.fssobs.FSSObsRecord;
+import com.raytheon.uf.common.localization.IPathManager;
+import com.raytheon.uf.common.localization.LocalizationContext;
+import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
+import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
+import com.raytheon.uf.common.localization.LocalizationFile;
+import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
+import com.raytheon.uf.common.monitor.config.ThresholdMgr;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.FogMonitor;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SafeSeasMonitor;
+import com.raytheon.uf.common.monitor.data.MonitorConfigConstants.SnowMonitor;
+import com.raytheon.uf.common.monitor.data.ObConst;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
+import com.raytheon.uf.common.time.util.TimeUtil;
+import com.raytheon.uf.edex.core.EDEXUtil;
+
+/**
+ * Creates AlarmViz messages for Fog, SAFESEAS and SNOW monitor.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 20, 2015 5115       skorolev    Initial creation
+ * 
+ * </pre>
+ * 
+ * @author skorolev
+ * @version 1.0
+ */
+
+public class FSSObsAlarmMgr {
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(FSSObsAlarmMgr.class);
+
+    private final static String FOG_THRESHOLDS = "DefaultFogMonitorThresholds.xml";
+
+    private final static String SS_THRESHOLDS = "DefaultSSMonitorThresholds.xml";
+
+    private final static String SNOW_THRESHOLDS = "DefaultSnowMonitorThresholds.xml";
+
+    private FSSObsMonitorConfigurationManager areaConfig = null;
+
+    private static FSSObsRecord fssRec = null;
+
+    protected ThresholdMgr fogThreshMgr = null;
+
+    protected ThresholdMgr ssThreshMgr = null;
+
+    protected ThresholdMgr snowThreshMgr = null;
+
+    /** Full path of Monitor threat configuration file */
+    private String fullThresholdFileName = null;
+
+    /** Name of plug-in */
+    private static String pluginName = null;
+
+    /** Map for current configuration managers. */
+    private final static Map<AppName, FSSObsAlarmMgr> instanceMap = new HashMap<>();
+
+    /** Monitoring parameters **/
+    private static List<String> threshKeys = new ArrayList<String>();
+
+    /** Monitoring areas **/
+    private static List<String> areaIDs;
+
+    /** List of threat priorities **/
+    private final static List<Priority> priorities = new ArrayList<Priority>();
+
+    /** Threat calculated last time **/
+    private static Map<String, Integer> lastThreat = new HashMap<String, Integer>();
+
+    /** Last observation time in milliseconds **/
+    private static long lastObsTime = 0;
+
+    /** Temporary place for red direction angle threat **/
+    private static float redFrom = 0;
+
+    /** Temporary place for yellow direction angle threat **/
+    private static float yellowFrom = 0;
+
+    /**
+     * Private constructor
+     */
+    public FSSObsAlarmMgr(AppName monitor) {
+        setAreaConfig(FSSObsMonitorConfigurationManager.getInstance(monitor));
+        setPluginName(monitor.name());
+        switch (monitor) {
+        case FOG:
+            threshKeys.clear();
+            for (FogMonitor fogMon : FogMonitor.values()) {
+                threshKeys.add(fogMon.getXmlKey());
+            }
+            this.fogThreshMgr = setThreasholdMgr(FOG_THRESHOLDS);
+            break;
+        case SAFESEAS:
+            threshKeys.clear();
+            for (SafeSeasMonitor ssMon : SafeSeasMonitor.values()) {
+                threshKeys.add(ssMon.getXmlKey());
+            }
+            this.ssThreshMgr = setThreasholdMgr(SS_THRESHOLDS);
+            break;
+        case SNOW:
+            threshKeys.clear();
+            for (SnowMonitor snowMon : SnowMonitor.values()) {
+                threshKeys.add(snowMon.getXmlKey());
+            }
+            this.snowThreshMgr = setThreasholdMgr(SNOW_THRESHOLDS);
+            break;
+        default:
+            statusHandler.handle(Priority.WARN,
+                    "Unknown monitor" + monitor.name());
+            break;
+        }
+        lastThreat.put(getPluginName(), 0);
+        initThreatPriorities();
+    }
+
+    /**
+     * Instance.
+     * 
+     * @param monitor
+     * @return
+     */
+    public final static synchronized FSSObsAlarmMgr getInstance(AppName monitor) {
+        FSSObsAlarmMgr instance = instanceMap.get(monitor);
+        if (instance == null) {
+            instance = new FSSObsAlarmMgr(monitor);
+            instanceMap.put(monitor, instance);
+        }
+        return instance;
+    }
+
+    /**
+     * Sets Threshold Manager for monitor.
+     * 
+     * @param defaultThresholdsFilename
+     * @return
+     */
+    private ThresholdMgr setThreasholdMgr(String defaultThresholdsFilename) {
+        fullThresholdFileName = getDefaultThresholdFilePath()
+                + defaultThresholdsFilename;
+        ThresholdMgr mgr = new ThresholdMgr(fullThresholdFileName);
+        if (fileNameValid(fullThresholdFileName) == true) {
+            mgr.readThresholdXml();
+        } else {
+            String defaultFile = getMonitorDefaultThresholdFilePath()
+                    + defaultThresholdsFilename;
+            areaIDs = getAreaConfig().getAreaList();
+            mgr.createMonitorConfigFromDefaults(defaultFile, areaIDs,
+                    getThreshKeys());
+            mgr.saveThresholdXml();
+        }
+        return mgr;
+    }
+
+    /**
+     * File validation.
+     * 
+     * @param thresholdFileName
+     * @return
+     */
+    private boolean fileNameValid(String thresholdFileName) {
+        IPathManager pm = PathManagerFactory.getPathManager();
+        LocalizationContext context = pm.getContext(
+                LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
+        LocalizationFile locFile = pm.getLocalizationFile(context,
+                thresholdFileName);
+        return locFile.getFile().exists();
+    }
+
+    /**
+     * Gets the path where the monitor thresholds XML file is contained.
+     * 
+     * @param plugin
+     *            Name of plug-in
+     * @return the defaultThresholdFilePath
+     */
+    public String getDefaultThresholdFilePath() {
+        // fog/threshold/monitor/
+        String fs = String.valueOf(File.separatorChar);
+        StringBuilder sb = new StringBuilder();
+        sb.append(pluginName.toLowerCase()).append(fs);
+        sb.append("threshold").append(fs);
+        sb.append("monitor").append(fs);
+        return sb.toString();
+    }
+
+    /**
+     * Gets the path where the default monitor thresholds XML file is contained.
+     * 
+     * @return File path.
+     */
+    public String getMonitorDefaultThresholdFilePath() {
+        // monitoring/fog/
+        String fs = String.valueOf(File.separatorChar);
+        StringBuilder sb = new StringBuilder("monitoring");
+        sb.append(fs);
+        sb.append(pluginName.toLowerCase()).append(fs);
+        return sb.toString();
+    }
+
+    /**
+     * Initiates Priorities for monitor's alarm images.
+     */
+    private void initThreatPriorities() {
+        // EVENTB - Suggested reading but non-required
+        // EVENTA - An important message, but non-crucial
+        // PROBLEM - A problem occurred
+        // SIGNIFICANT - May not be an "emergency" but still very important
+        priorities.add(0, Priority.EVENTB);
+        priorities.add(1, Priority.EVENTA);
+        priorities.add(2, Priority.PROBLEM);
+        priorities.add(3, Priority.SIGNIFICANT);
+
+    }
+
+    /**
+     * Sends AlertViz Message.
+     * 
+     * @param thMgr
+     *            ThresholdMgr
+     * @param fssObsRec
+     * @param winTime
+     *            TimeWindow from area config.
+     * @param areaList
+     *            List of areas from area config.
+     */
+    public void sendAlertVizMsg(ThresholdMgr thMgr, FSSObsRecord fssObsRec,
+            double winTime, List<String> areaList) {
+        // Hours to millis
+        long tw = (long) (TimeUtil.MILLIS_PER_HOUR * winTime);
+        setFssRec(fssObsRec);
+        String sourceKey = getPluginName();
+        String message = "";
+        Priority priority = calculateThreat(thMgr, fssObsRec, tw, areaList);
+        if (priority != null) {
+            // Threat has changed
+            switch (priority) {
+            case SIGNIFICANT:
+                message = "Data within hazardous levels";
+                break;
+            case PROBLEM:
+                message = "Data approaching hazardous levels";
+                break;
+            case EVENTA:
+                message = "Data below hazardous levels";
+                break;
+            case EVENTB:
+                message = "No data available";
+                break;
+            default:
+                statusHandler.warn("Get unused priority: " + priority.name());
+            }
+            EDEXUtil.sendMessageAlertViz(priority,
+                    "com.raytheon.uf.edex.plugin.fssobs", sourceKey, "MONITOR",
+                    message, null, null);
+            statusHandler.debug(sourceKey + ": " + message);
+        }
+    }
+
+    /**
+     * Calculates priority threat for monitor.
+     * 
+     * @param thMgr
+     *            monitor threshold manager
+     * @param fssObsRec
+     *            FSSObs record
+     * @param period
+     *            TimeWindow from area config in millis
+     * @param areaList
+     *            List of areas from area config.
+     * @return Priority
+     */
+    private static Priority calculateThreat(ThresholdMgr thMgr,
+            FSSObsRecord fssObsRec, long period, List<String> areaList) {
+        Priority retVal = null;
+        // Max threat for all zones
+        int finalThreat = 0;
+        for (String areaId : areaList) {
+            // Max threat for all monitor parameters
+            int areaThreat = 0;
+            List<String> params = thMgr.getMonitorParameters();
+            for (String param : params) {
+                double red = thMgr.getRedValue(areaId, param);
+                double yellow = thMgr.getYellowValue(areaId, param);
+                int pThreat = getParamThreat(param, red, yellow);
+                // skip not used threats
+                if (param.contains(".dirFrom")) {
+                    continue;
+                }
+                areaThreat = Math.max(areaThreat, pThreat);
+            }
+            finalThreat = Math.max(finalThreat, areaThreat);
+        }
+
+        if (lastThreat.get(getPluginName()) != finalThreat) {
+            // current observation time in milliseconds
+            long refTime = getFssRec().getTimeObs().getTimeInMillis();
+            if ((refTime - period) < getLastObsTime()) {
+                // got data inside time window
+                lastThreat.put(getPluginName(),
+                        Math.max(lastThreat.get(getPluginName()), finalThreat));
+            } else {
+                // start a new time window
+                lastThreat.put(getPluginName(), finalThreat);
+            }
+            setLastObsTime(refTime);
+            // 0 => EVENTB
+            // 1 => EVENTA
+            // 2 => PROBLEM
+            // 3 => SIGNIFICANT
+            retVal = priorities.get(lastThreat.get(getPluginName()));
+        }
+        return retVal;
+    }
+
+    /**
+     * Gets Parameter's Threat.
+     * 
+     * @param param
+     * @param red
+     * @param yellow
+     * @return
+     */
+    private static int getParamThreat(String param, double red, double yellow) {
+        int threat = 0;
+        float fred = (float) red;
+        float fyellow = (float) yellow;
+        FSSObsRecord rec = getFssRec();
+        switch (param) {
+        case MonitorConfigConstants.MON_METEO_WIND_SPEED:
+            threat = moreThan(rec.getWindSpeed(), fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_METEO_PEAK_WIND:
+            threat = moreThan(rec.getMaxWindSpeed(), fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_METEO_GUST_SPEED:
+            threat = moreThan(rec.getWindGust(), fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_METEO_WAVE_HT:
+            threat = moreThan(rec.getWaveHeight().floatValue(), fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_METEO_VIS:
+            // Visibility value in units of "nautical miles/16". Used to compare
+            // thresholds.
+            threat = lessThan(rec.getVisibility() * 16f, fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_SWELL_PRIM_HT:
+            threat = moreThan(rec.getPrimarySwellWaveHeight().floatValue(),
+                    fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_SWELL_PRIM_PD:
+            threat = moreThan(rec.getPrimarySwellWavePeriod(), fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_SWELL_PRIM_DIR_FROM:
+            // in Azimuth degrees
+            setRedFrom(fred);
+            setYellowFrom(fyellow);
+        case MonitorConfigConstants.MON_SWELL_PRIM_DIR_TO:
+            threat = dirThreat(rec.getPrimarySwellWaveDir().floatValue(),
+                    redFrom, yellowFrom, fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_SWELL_SEC_HT:
+            threat = moreThan(rec.getSecondarySwellWaveHeight().floatValue(),
+                    fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_SWELL_SEC_PD:
+            threat = moreThan(rec.getSecondarySwellWavePeriod(), fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_SWELL_SEC_DIR_FROM:
+            // in Azimuth degrees
+            setRedFrom(fred);
+            setYellowFrom(fyellow);
+        case MonitorConfigConstants.MON_SWELL_SEC_DIR_TO:
+            threat = dirThreat(rec.getSecondarySwellWaveDir().floatValue(),
+                    redFrom, yellowFrom, fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_METEO_TEMP:
+            threat = lessThan(rec.getTemperature(), fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_METEO_WIND_CHILL:
+            threat = moreThan(rec.getWindChill(), fred, fyellow);
+            break;
+        case MonitorConfigConstants.MON_METEO_SNOW_DEPTH:
+            threat = moreThan(rec.getSnowDepth(), fred, fyellow);
+            break;
+        default:
+            statusHandler.handle(Priority.WARN,
+                    "Unknown threat parameter detected: " + param);
+            break;
+        }
+        return threat;
+    }
+
+    /**
+     * Gets threat for max values
+     * 
+     * @param paramVal
+     * @param red
+     * @param yellow
+     * @return threat value
+     */
+    private static int moreThan(float paramVal, float red, float yellow) {
+        if (paramVal != ObConst.MISSING) {
+            if (paramVal >= red) {
+                return 3;
+            } else if (paramVal >= yellow) {
+                return 2;
+            } else {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    /**
+     * Gets threat for min values
+     * 
+     * @param paramVal
+     * @param red
+     * @param yellow
+     * @return threat value
+     */
+    private static int lessThan(float paramVal, float red, float yellow) {
+        if (paramVal != ObConst.MISSING) {
+            if (paramVal <= red) {
+                return 3;
+            } else if (paramVal <= yellow) {
+                return 2;
+            } else {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    /**
+     * Gets threat for directions.
+     * 
+     * @param paramVal
+     * @param redFrom
+     *            saved value
+     * @param yellowFrom
+     *            saved value
+     * @param redTo
+     * @param yellowTo
+     * @return threat value
+     */
+    private static int dirThreat(float paramVal, float redFrom,
+            float yellowFrom, float redTo, float yellowTo) {
+        if (paramVal != ObConst.MISSING) {
+            if (redFrom < redTo) {
+                if (paramVal > redFrom && paramVal < redTo) {
+                    return 3;
+                }
+            }
+            if (redFrom > redTo) {
+                if (paramVal > redFrom || paramVal < redTo) {
+                    return 3;
+                }
+            }
+            if (yellowFrom < yellowTo) {
+                if (paramVal > yellowFrom && paramVal < yellowTo) {
+                    return 2;
+                }
+            }
+            if (yellowFrom > yellowTo) {
+                if (paramVal > yellowFrom || paramVal < yellowTo) {
+                    return 2;
+                }
+            }
+            return 1;
+        }
+        return 0;
+    }
+
+    public ThresholdMgr getFogThreshMgr() {
+        return fogThreshMgr;
+    }
+
+    public ThresholdMgr getSsThreshMgr() {
+        return ssThreshMgr;
+    }
+
+    public ThresholdMgr getSnowThreshMgr() {
+        return snowThreshMgr;
+    }
+
+    public static FSSObsRecord getFssRec() {
+        return fssRec;
+    }
+
+    public FSSObsMonitorConfigurationManager getAreaConfig() {
+        return areaConfig;
+    }
+
+    public void setAreaConfig(FSSObsMonitorConfigurationManager areaConfig) {
+        this.areaConfig = areaConfig;
+    }
+
+    public void setFssRec(FSSObsRecord fssRec) {
+        FSSObsAlarmMgr.fssRec = fssRec;
+    }
+
+    public static String getPluginName() {
+        return pluginName;
+    }
+
+    public static void setPluginName(String pluginName) {
+        FSSObsAlarmMgr.pluginName = pluginName;
+    }
+
+    /**
+     * @return the threshKeys
+     */
+    public static List<String> getThreshKeys() {
+        return threshKeys;
+    }
+
+    public static long getLastObsTime() {
+        return lastObsTime;
+    }
+
+    public static void setLastObsTime(long lastObsTime) {
+        FSSObsAlarmMgr.lastObsTime = lastObsTime;
+    }
+
+    /**
+     * @return the areaIDs
+     */
+    public static List<String> getAreaIDs() {
+        return areaIDs;
+    }
+
+    public static float getRedFrom() {
+        return redFrom;
+    }
+
+    public static float getYellowFrom() {
+        return yellowFrom;
+    }
+
+    public static void setRedFrom(float redFrom) {
+        FSSObsAlarmMgr.redFrom = redFrom;
+    }
+
+    public static void setYellowFrom(float yellowFrom) {
+        FSSObsAlarmMgr.yellowFrom = yellowFrom;
+    }
+}
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
index aac8d28e19..7d83b80edf 100755
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
@@ -34,7 +34,8 @@ import com.raytheon.uf.common.dataplugin.fssobs.FSSObsRecord;
 import com.raytheon.uf.common.geospatial.SpatialException;
 import com.raytheon.uf.common.monitor.MonitorAreaUtils;
 import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager;
-import com.raytheon.uf.common.monitor.config.FSSObsMonitorConfigurationManager.MonName;
+import com.raytheon.uf.common.monitor.config.ThresholdMgr;
+import com.raytheon.uf.common.monitor.data.CommonConfig.AppName;
 import com.raytheon.uf.common.monitor.data.ObConst;
 import com.raytheon.uf.common.monitor.events.MonitorConfigEvent;
 import com.raytheon.uf.common.monitor.events.MonitorConfigListener;
@@ -65,6 +66,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * Oct 19, 2015 3841       skorolev     Corrected isNearZone.
  * Nov 12, 2015 3841       dhladky      Augmented Slav's moving platform fix.
  * Dec 02, 2015 3873       dhladky      Fixed performance problems, missing params.
+ * Jan 04, 2016 5115       skorolev     Added checkThresholds.
  * 
  * </pre>
  * 
@@ -102,6 +104,12 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
 
     public FSSObsMonitorConfigurationManager snowmcm = null;
 
+    private FSSObsAlarmMgr fogThMgr = null;
+
+    private FSSObsAlarmMgr ssThMgr = null;
+
+    private FSSObsAlarmMgr snowThMgr = null;
+
     /** Zone constant char */
     private static final char Z = 'Z';
 
@@ -123,7 +131,7 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
     public void generateProduct(URIGenerateMessage genMessage) {
 
         FSSObsConfig fss_config = null;
-               
+
         try {
             fss_config = new FSSObsConfig(genMessage, this);
             this.setPluginDao(new FSSObsDAO(productType));
@@ -133,11 +141,11 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
         }
         List<FSSObsRecord> fssRecs = new ArrayList<FSSObsRecord>();
         for (String uri : genMessage.getUris()) {
-            
+
             boolean isStationary = true;
             String reportType = null;
             boolean inRange = false;
-            
+
             // check if moving type
             for (String t : movingTypes) {
                 if (uri.contains(t)) {
@@ -160,7 +168,6 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
                         // If the location info is bad. we don't want it.
                         inRange = false;
                     }
-
                     break;
                 }
             }
@@ -178,13 +185,14 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
 
             // We only want what we know how to decode
             if (reportType != null && inRange) {
-                
-                FSSObsRecord fssObsRec = new FSSObsRecord();
-                fssObsRec.setReportType(reportType);
-                fssObsRec.setStationary(isStationary);
-                fssObsRec = fss_config.getTableRow(uri);
-                FSSObsDataTransform.buildView(fssObsRec);
-                fssRecs.add(fssObsRec);
+                try {
+                    FSSObsRecord fssObsRec = fss_config.getTableRow(uri);
+                    FSSObsDataTransform.buildView(fssObsRec);
+                    fssRecs.add(fssObsRec);
+                    checkThresholds(fssObsRec);
+                } catch (Exception e) {
+                    statusHandler.error("Error building FSSObsRecord", e);
+                }
             }
         }
 
@@ -195,7 +203,7 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
                     + fssRecs.size() + " records.");
         }
     }
-    
+
     /**
      * Checks if ship is near monitoring zones and should be included in FSSObs
      * data.
@@ -217,15 +225,15 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
             retVal = checkMarineZones(getSSConfig(), ssShipDist, latShip,
                     lonShip);
         }
-        
+
         double fogShipDist = getFogConfig().getShipDistance();
-        
+
         if (fogShipDist != 0.0 && !retVal) {
             // check Fog zones
             retVal = checkMarineZones(getFogConfig(), fogShipDist, latShip,
                     lonShip);
         }
-        
+
         return retVal;
     }
 
@@ -245,7 +253,6 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
      */
     private boolean checkMarineZones(FSSObsMonitorConfigurationManager cfg,
             double configDist, double lat, double lon) {
-        boolean retVal = false;
         for (String zone : cfg.getAreaList()) {
             if (zone.charAt(2) == Z) {
                 // initial distance
@@ -262,14 +269,52 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
                                 ssXML.getCLon());
                     }
                 } catch (SpatialException e) {
-                    statusHandler.handle(Priority.PROBLEM, "Couldn't find marine zone within distance. lon: "+lon+" lat: "+lat+" dist: "+configDist, e);
+                    statusHandler.handle(Priority.PROBLEM,
+                            "Couldn't find marine zone within distance. lon: "
+                                    + lon + " lat: " + lat + " dist: "
+                                    + configDist, e);
                 }
                 if (shipTozone < configDist) {
-                    retVal = true;
+                    // enough just one zone to include data
+                    return true;
                 }
             }
         }
-        return retVal;
+        return false;
+    }
+
+    /**
+     * Checks if parameters of FSSObs monitors exceed threshold values and sends
+     * AlertViz messages.
+     * 
+     * @param fssObsRec
+     */
+    private void checkThresholds(FSSObsRecord fssObsRec) {
+        String stnName = fssObsRec.getStationId();
+        List<String> fogAreaList = getFogConfig().getAreaByStationId(stnName);
+        List<String> ssAreaList = getSSConfig().getAreaByStationId(stnName);
+        List<String> snowAreaList = getSnowConfig().getAreaByStationId(stnName);
+        if (!fogAreaList.isEmpty()) {
+            FSSObsAlarmMgr.setPluginName(AppName.FOG.name());
+            ThresholdMgr fogMgr = getFogThMgr().getFogThreshMgr();
+            fogMgr.readThresholdXml();
+            getFogThMgr().sendAlertVizMsg(fogMgr, fssObsRec,
+                    getFogConfig().getTimeWindow(), fogAreaList);
+        }
+        if (!ssAreaList.isEmpty()) {
+            FSSObsAlarmMgr.setPluginName(AppName.SAFESEAS.name());
+            ThresholdMgr ssMgr = getSSThMgr().getSsThreshMgr();
+            ssMgr.readThresholdXml();
+            getSSThMgr().sendAlertVizMsg(ssMgr, fssObsRec,
+                    getSSConfig().getTimeWindow(), ssAreaList);
+        }
+        if (!snowAreaList.isEmpty()) {
+            FSSObsAlarmMgr.setPluginName(AppName.SNOW.name());
+            ThresholdMgr snowMgr = getSnowThMgr().getSnowThreshMgr();
+            snowMgr.readThresholdXml();
+            getSnowThMgr().sendAlertVizMsg(snowMgr, fssObsRec,
+                    getSnowConfig().getTimeWindow(), snowAreaList);
+        }
     }
 
     /*
@@ -381,7 +426,7 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
      */
     public FSSObsMonitorConfigurationManager getFogConfig() {
         if (fogmcm == null) {
-            fogmcm = FSSObsMonitorConfigurationManager.getInstance(MonName.fog);
+            fogmcm = FSSObsMonitorConfigurationManager.getInstance(AppName.FOG);
             fogmcm.addListener(this);
         }
         return fogmcm;
@@ -394,7 +439,8 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
      */
     public FSSObsMonitorConfigurationManager getSSConfig() {
         if (ssmcm == null) {
-            ssmcm = FSSObsMonitorConfigurationManager.getInstance(MonName.ss);
+            ssmcm = FSSObsMonitorConfigurationManager
+                    .getInstance(AppName.SAFESEAS);
             ssmcm.addListener(this);
         }
         return ssmcm;
@@ -408,9 +454,45 @@ public class FSSObsGenerator extends CompositeProductGenerator implements
     public FSSObsMonitorConfigurationManager getSnowConfig() {
         if (snowmcm == null) {
             snowmcm = FSSObsMonitorConfigurationManager
-                    .getInstance(MonName.snow);
+                    .getInstance(AppName.SNOW);
+            snowmcm.addListener(this);
         }
         return snowmcm;
     }
 
+    /**
+     * Gets Fog Alarm Threshold manager.
+     * 
+     * @return manager
+     */
+    private FSSObsAlarmMgr getFogThMgr() {
+        if (fogThMgr == null) {
+            this.fogThMgr = FSSObsAlarmMgr.getInstance(AppName.FOG);
+        }
+        return fogThMgr;
+    }
+
+    /**
+     * Gets SAFESEAS Alarm Threshold manager.
+     * 
+     * @return manager
+     */
+    private FSSObsAlarmMgr getSSThMgr() {
+        if (ssThMgr == null) {
+            this.ssThMgr = FSSObsAlarmMgr.getInstance(AppName.SAFESEAS);
+        }
+        return ssThMgr;
+    }
+
+    /**
+     * Gets Fog Alarm Threshold manager.
+     * 
+     * @return manager
+     */
+    private FSSObsAlarmMgr getSnowThMgr() {
+        if (snowThMgr == null) {
+            this.snowThMgr = FSSObsAlarmMgr.getInstance(AppName.SNOW);
+        }
+        return snowThMgr;
+    }
 }
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
old mode 100755
new mode 100644
index 1ed86dc9b7..2b1edfb3ea
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
@@ -61,6 +61,7 @@ import com.raytheon.uf.edex.pointdata.PointDataQuery;
  * Sep 04, 2014 3220       skorolev    Removed getStations method.
  * Sep 18, 2015 3873       skorolev    Removed identical constant definitions.
  * Dec 02, 2015 3873       dhladky     Logging change.
+ * Jan 05, 2016 5115       skorolev    Changed unit for Wind Chill to Fahrenheit.
  * 
  * </pre>
  * 
@@ -80,6 +81,10 @@ public class FSSObsUtils {
     private static final UnitConverter cToK = SI.CELSIUS
             .getConverterTo(SI.KELVIN);
 
+    /** CELSIUS --> FAHRENHEIT */
+    private static final UnitConverter cToF = SI.CELSIUS
+            .getConverterTo(NonSI.FAHRENHEIT);
+
     /** Knots --> kilometers per hour */
     private static final UnitConverter knotToKph = NonSI.KNOT
             .getConverterTo(NonSI.KILOMETERS_PER_HOUR);
@@ -427,8 +432,8 @@ public class FSSObsUtils {
         sc.close();
         if (temp != ObConst.MISSING && windspd != ObConst.MISSING) {
             float speedKPH = (float) knotToKph.convert(windspd);
-            // in Kelvin
-            retVal[3] = (float) cToK.convert(calcWindChill(
+            // in Fahrenheit
+            retVal[3] = (float) cToF.convert(calcWindChill(
                     (float) fToC.convert(temp), speedKPH));
             // in minutes
             retVal[4] = calcFrostbiteTime(speedKPH, (float) fToC.convert(temp));
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
index ed3d1e923e..f410c0b9b2 100755
--- a/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.uf.edex.plugin.fssobs.common;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.urifilter.URIGenerateMessage;
 import com.raytheon.uf.common.dataplugin.PluginException;
@@ -47,6 +47,7 @@ import com.raytheon.uf.edex.plugin.fssobs.FSSObsUtils;
  * Sep 04, 2014 3220       skorolev    Removed cwa and monitorUse from data set.
  * Sep 18, 2015 3873       skorolev    Removed identical constant definitions.
  * Dec 02, 2015 3873       dhladky     Logging change.
+ * Dec 14, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -69,11 +70,10 @@ public class FSSObsConfig {
     private FSSObsRecord tableRow;
 
     /** The logger */
-    protected transient final Log logger = LogFactory.getLog(getClass());
-
-    public FSSObsConfig(URIGenerateMessage genMessage, FSSObsGenerator generator)
-            throws Exception {
+    protected transient final Logger logger = LoggerFactory
+            .getLogger(getClass());
 
+    public FSSObsConfig(URIGenerateMessage genMessage, FSSObsGenerator generator) {
         this.fssgen = generator;
     }
 
@@ -82,13 +82,13 @@ public class FSSObsConfig {
      * 
      * @param uri
      * @return tableRow
+     * @throws Exception
      */
-    public FSSObsRecord getTableRow(String uri) {
+    public FSSObsRecord getTableRow(String uri) throws Exception {
         String dt = uri.substring(1)
                 .substring(0, uri.substring(1).indexOf("/"));
 
         try {
-            
             if (dt.equals("obs")) {
                 tableRow = FSSObsUtils.getRecordFromMetar(uri);
             } else if (dt.equals("sfcobs")) {
@@ -96,12 +96,16 @@ public class FSSObsConfig {
             } else if (dt.equals("ldadmesonet")) {
                 tableRow = FSSObsUtils.getRecordFromMesowest(uri);
             }
-
         } catch (PluginException e) {
             statusHandler.handle(Priority.PROBLEM, "Could not create type: "
                     + dt + " URI: " + uri, e);
         }
 
+        if (tableRow == null) {
+            throw new Exception("Couldn't make FSSObsRecord from type "
+                    + dt + " and URI: " + uri);
+        }
+
         if (tableRow.getRelativeHumidity() == ObConst.MISSING) {
             Float RH = FSSObsUtils.getRH(tableRow.getDewpoint(),
                tableRow.getTemperature());
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/src/com/raytheon/uf/edex/plugin/grid/netcdf/NetcdfGridDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/src/com/raytheon/uf/edex/plugin/grid/netcdf/NetcdfGridDecoder.java
index 05e5908ca1..09b1affbcd 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/src/com/raytheon/uf/edex/plugin/grid/netcdf/NetcdfGridDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/src/com/raytheon/uf/edex/plugin/grid/netcdf/NetcdfGridDecoder.java
@@ -44,8 +44,8 @@ import com.raytheon.uf.common.dataplugin.grid.GridRecord;
 import com.raytheon.uf.common.dataplugin.level.Level;
 import com.raytheon.uf.common.dataplugin.level.LevelFactory;
 import com.raytheon.uf.common.gridcoverage.GridCoverage;
+import com.raytheon.uf.common.localization.ILocalizationFile;
 import com.raytheon.uf.common.localization.IPathManager;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.parameter.Parameter;
 import com.raytheon.uf.common.serialization.SerializationException;
@@ -61,18 +61,20 @@ import com.raytheon.uf.edex.plugin.grid.netcdf.description.product.NetcdfGridPro
 
 /**
  * Base class for decoding NetCDF Grid files.
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 03, 2015 4696       nabowle     Initial creation
  * Sep 10, 2015 4696       nabowle     Refactored. Renamed. No longer abstract.
- *
+ * Jan 27, 2016 5237       tgurney     Replace LocalizationFile with
+ *                                     ILocalizationFile
+ * 
  * </pre>
- *
+ * 
  * @author nabowle
  * @version 1.0
  */
@@ -96,10 +98,10 @@ public class NetcdfGridDecoder {
      * Decodes the provided file. Note: This will like be memory intensive. If
      * the files are expected to create many records, it's better to split the
      * file, and decode and store records individually.
-     *
+     * 
      * This method will decode all the records together and return them for
      * batch storage.
-     *
+     * 
      * @param f
      *            The data file.
      * @return The decoded grid records, or an empty array if no records could
@@ -150,8 +152,8 @@ public class NetcdfGridDecoder {
             Variable dataVar = file.findVariable(product.getData().getName());
             if (dataVar == null) {
                 logger.error("No {} {} data in file: {}", descriptions
-                        .getDatasetId(), product.getData().getName(),
-                        f.getName());
+                        .getDatasetId(), product.getData().getName(), f
+                        .getName());
                 return EMPTY_RECORDS;
             }
 
@@ -268,7 +270,7 @@ public class NetcdfGridDecoder {
     /**
      * Does some preliminary decoding of common values and combines those with
      * the level index and a product description to specify individual records.
-     *
+     * 
      * @param f
      *            The file to split.
      * @return An iterator over the record descriptions.
@@ -299,8 +301,7 @@ public class NetcdfGridDecoder {
 
             DataTime dataTime = descriptions.getDataTime().getDataTime(file);
             if (dataTime == null) {
-                throw new NetcdfDecoderException(
-                        "Cannot decode the data time.");
+                throw new NetcdfDecoderException("Cannot decode the data time.");
             }
 
             GridCoverage location = getCoverage(file, descriptions);
@@ -323,7 +324,8 @@ public class NetcdfGridDecoder {
             }
 
             NetcdfGridRecordInfo info;
-            for (NetcdfGridProductDescription prod : descriptions.getDescriptions()) {
+            for (NetcdfGridProductDescription prod : descriptions
+                    .getDescriptions()) {
                 for (int i = 0; i < numLevels; i++) {
                     info = new NetcdfGridRecordInfo();
                     info.setDataTime(dataTime);
@@ -399,25 +401,25 @@ public class NetcdfGridDecoder {
     /**
      * The {@link IPathManager} is used to look up the configured description
      * file.
-     *
+     * 
      * @throws JAXBException
      * @throws SerializationException
      */
     public void setPathManager(IPathManager pathManager) {
-        LocalizationFile[] files = pathManager.listStaticFiles("grid/netcdf",
+        ILocalizationFile[] files = pathManager.listStaticFiles("grid/netcdf",
                 new String[] { ".xml" }, true, true);
 
         NetcdfGridProductDescriptions descriptions;
-        for (LocalizationFile file : files) {
+        for (ILocalizationFile file : files) {
             logger.info("Loading Netcdf Grid description from "
-                    + file.getName());
+                    + file.getPath());
             try (InputStream inputStream = file.openInputStream()) {
                 descriptions = JAXB.unmarshal(inputStream,
                         NetcdfGridProductDescriptions.class);
                 this.descriptionsList.add(descriptions);
             } catch (LocalizationException | IOException e) {
                 logger.error("Unable to load product descriptions from {}",
-                        file.getName(), e);
+                        file.getPath(), e);
             }
         }
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
index 7bb52b00f2..c9504036f3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
@@ -24,14 +24,9 @@
 		<versionsToKeep>24</versionsToKeep>
 	</rule>
 	<!-- Purge rule for the NAM40 (mesoEta212) model -->
-	<rule>
-		<keyValue>mesoEta212</keyValue>
-		<versionsToKeep>2</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
 	<!-- Purge rule for the NAM20 (mesoEta215) model -->
-	<rule>
-		<keyValue>mesoEta215</keyValue>
+	<rule regex="true">
+		<keyValue>mesoEta21[25]</keyValue>
 		<versionsToKeep>2</versionsToKeep>
 		<modTimeToWait>00-00:15:00</modTimeToWait>
 	</rule>
@@ -69,26 +64,16 @@
 		<modTimeToWait>00-00:15:00</modTimeToWait>
 	</rule>
 	<!-- Purge rule for the AK-NAM40 (mesoEta216) model -->
-	<rule>
-		<keyValue>mesoEta216</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
 	<!-- Purge rule for the AK-NAM20 (mesoEta217) model -->
-	<rule>
-		<keyValue>mesoEta217</keyValue>
+	<rule regex="true">
+		<keyValue>mesoEta21[67]</keyValue>
 		<versionsToKeep>1</versionsToKeep>
 		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
+	</rule>	
 	<!-- Purge rule for the NAM12 (ETA218) model -->
-	<rule>
-		<keyValue>ETA218</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
 	<!-- Purge rule for the AK-NAM12 (ETA242) model -->
-	<rule>
-		<keyValue>ETA242</keyValue>
+	<rule regex="true">
+		<keyValue>ETA2(?:18|42)</keyValue>
 		<versionsToKeep>1</versionsToKeep>
 		<modTimeToWait>00-00:15:00</modTimeToWait>
 	</rule>
@@ -122,29 +107,14 @@
 		<modTimeToWait>00-00:15:00</modTimeToWait>
 	</rule>
 	<!-- Purge rule for the GFS40 (GFS212) model -->
-	<rule>
-		<keyValue>GFS212</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
 	<!-- Purge rule for the AK-GFS (GFS160) model -->
-	<rule>
-		<keyValue>GFS160</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
 	<!-- Purge rule for the PR-GFS (GFS254) model -->
-	<rule>
-		<keyValue>GFS254</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
 	<!-- Purge rule for the SJU-GFS (GFS161) model -->
-	<rule>
-		<keyValue>GFS161</keyValue>
+	<rule regex="true">
+		<keyValue>GFS(?:212|160|254|161)</keyValue>
 		<versionsToKeep>1</versionsToKeep>
 		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
+	</rule>	
 	<!-- Purge rule for the MPE (MPE-Local) model -->
 	<rule>
 		<keyValue>MPE-Local</keyValue>
@@ -163,75 +133,31 @@
 		<modTimeToWait>00-00:15:00</modTimeToWait>
 	</rule>
     <!-- Purge rule for the QPE models -->
-    <rule>
-        <keyValue>QPE-ACR</keyValue>
+    <rule regex="true">
+        <keyValue>QPE-(?:ACR|STR|RSA|PTR|TUA|ORN|RHA|KRF|MSR|TAR|TIR|ALR|FWR)</keyValue>
         <versionsToKeep>72</versionsToKeep>
     </rule>
-    <rule>
-        <keyValue>QPE-STR</keyValue>
-        <versionsToKeep>72</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>QPE-RSA</keyValue>
-        <versionsToKeep>72</versionsToKeep>
-    </rule>
-        <rule>
-        <keyValue>QPE-PTR</keyValue>
-        <versionsToKeep>72</versionsToKeep>
-    </rule>
-	<rule>
-		<keyValue>QPE-TUA</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>QPE-ORN</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>QPE-RHA</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>QPE-KRF</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>QPE-MSR</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>QPE-TAR</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>QPE-TIR</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>QPE-ALR</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<rule>
-		<keyValue>QPE-FWR</keyValue>
-		<versionsToKeep>72</versionsToKeep>
-	</rule>
-	<!-- End RFC QPE models -->
     <!-- Purge rule for the OPCWave-W-ATL (OPCWave180) model -->
-    <rule>
-        <keyValue>OPCWave180</keyValue>
-        <versionsToKeep>8</versionsToKeep>
-        <modTimeToWait>00-00:15:00</modTimeToWait>
-    </rule>
     <!-- Purge rule for the OPCWave-NE-PAC (OPCWave181) model -->
-    <rule>
-        <keyValue>OPCWave181</keyValue>
+    <!-- Purge rule for the OPCWave-TE-PAC (OPCWave182) model -->
+    <rule regex="true">
+        <keyValue>OPCWave.*</keyValue>
         <versionsToKeep>8</versionsToKeep>
         <modTimeToWait>00-00:15:00</modTimeToWait>
     </rule>
-        <!-- Purge rule for the OPCWave-TE-PAC (OPCWave182) model -->
-    <rule>
-        <keyValue>OPCWave182</keyValue>
-        <versionsToKeep>8</versionsToKeep>
+    <!-- Purge rule for the GlobalWave (GlobalWave) model -->
+	<!-- Purge rule for the AKwave10 (AKwave10) model -->
+	<!-- Purge rule for the EPwave10 (EPwave10) model -->
+	<!-- Purge rule for the WCwave10 (WCwave10) model -->
+	<!-- Purge rule for the WNAwave10 (WNAwave10) model -->
+	<!-- Purge rule for the AKwave4 (AKwave4) model -->
+	<!-- Purge rule for the WCwave4 (WCwave4) model -->
+	<!-- Purge rule for the WNAwave4 (WNAwave4) model -->
+	<!-- Purge rule for the GRLKwave (GRLKwave) model -->
+	<!-- Purge rules for the Multi-grid Hurricane Wave Models -->
+    <rule regex="true">
+        <keyValue>.*[Ww]ave.*</keyValue>
+        <versionsToKeep>1</versionsToKeep>
         <modTimeToWait>00-00:15:00</modTimeToWait>
     </rule>
 	<!-- Purge rule for the RTMA (RTMA) model -->
@@ -303,72 +229,19 @@
 		<keyValue>BHPE</keyValue>
 		<period>00-12:00:00</period>
 		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
-	<!-- Purge rule for the GlobalWave (GlobalWave) model -->
-	<rule>
-		<keyValue>GlobalWave</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
-	<!-- Purge rule for the AKwave10 (AKwave10) model -->
-	<rule>
-		<keyValue>AKWave10</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
-	<!-- Purge rule for the AKwave4 (AKwave4) model -->
-	<rule>
-		<keyValue>AKWave4</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
-	<!-- Purge rule for the EPwave10 (EPwave10) model -->
-	<rule>
-		<keyValue>EPWave10</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
-	<!-- Purge rule for the WCwave10 (WCwave10) model -->
-	<rule>
-		<keyValue>WCWave10</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
-	<!-- Purge rule for the WCwave4 (WCwave4) model -->
-	<rule>
-		<keyValue>WCWave4</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
-	<!-- Purge rule for the WNAwave10 (WNAwave10) model -->
-	<rule>
-		<keyValue>WNAWave10</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
-	<!-- Purge rule for the WNAwave4 (WNAwave4) model -->
-	<rule>
-		<keyValue>WNAWave4</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
+	</rule>	
 	<!-- Purge rule for the AK-GriddedMOS (MOSGuide-AK) model -->
-	<rule>
-		<keyValue>MOSGuide-AK</keyValue>
+	<!-- Purge rule for the Hawaii 2.5km MOSGuide model -->
+	<rule regex="true">
+		<keyValue>MOSGuide-(?:AK|HI)</keyValue>
 		<versionsToKeep>2</versionsToKeep>
 		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
+	</rule>	
     <!-- Purge rule for the HI-RTMA (HI-RTMA) model -->
     <rule>
         <keyValue>HI_RTMA</keyValue>
         <versionsToKeep>24</versionsToKeep>
     </rule>
-        <!-- Purge rule for the Hawaii 2.5km MOSGuide model -->
-        <rule>
-                <keyValue>MOSGuide-HI</keyValue>
-                <versionsToKeep>2</versionsToKeep>
-        <modTimeToWait>00-00:15:00</modTimeToWait>
-        </rule>
     <!-- Purge rule for the HiResW-ARW-East (HiResW-ARW-East) model -->
     <rule>
         <keyValue>HiRes-ARW-East</keyValue>
@@ -376,14 +249,10 @@
         <modTimeToWait>00-00:15:00</modTimeToWait>
     </rule>
     <!-- Purge rule for the HiResW-ARW-West (HiResW-ARW-West) model -->
-    <rule>
-        <keyValue>HiRes-ARW-West</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-        <modTimeToWait>00-00:15:00</modTimeToWait>
-    </rule>
     <!-- Purge rule for the HiResW-ARW-AK (HiResW-ARW-AK) model -->
-    <rule>
-        <keyValue>HiRes-ARW-AK</keyValue>
+    <!-- Purge rule for the HiResW-ARW-SJU (HiResW-ARW-SJU) model -->
+    <rule regex="true">
+        <keyValue>HiRes-ARW-(?:West|AK|SJU)</keyValue>
         <versionsToKeep>1</versionsToKeep>
         <modTimeToWait>00-00:15:00</modTimeToWait>
     </rule>
@@ -393,12 +262,6 @@
         <versionsToKeep>2</versionsToKeep>
         <modTimeToWait>00-00:15:00</modTimeToWait>
     </rule>
-    <!-- Purge rule for the HiResW-ARW-SJU (HiResW-ARW-SJU) model -->
-    <rule>
-        <keyValue>HiRes-ARW-SJU</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-        <modTimeToWait>00-00:15:00</modTimeToWait>
-    </rule>
     <!-- Purge rule for the HiResW-NMM-East (HiResW-NMM-East) model -->
     <rule>
         <keyValue>HiRes-NMM-East</keyValue>
@@ -406,35 +269,19 @@
         <modTimeToWait>00-00:15:00</modTimeToWait>
     </rule>
     <!-- Purge rule for the HiResW-NMM-West (HiResW-NMM-West) model -->
-    <rule>
-        <keyValue>HiRes-NMM-West</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-        <modTimeToWait>00-00:15:00</modTimeToWait>
-    </rule>
     <!-- Purge rule for the HiResW-NMM-AK (HiResW-NMM-AK) model -->
-    <rule>
-        <keyValue>HiRes-NMM-AK</keyValue>
+    <!-- Purge rule for the HiResW-NMM-SJU (HiResW-NMM-SJU) model -->
+    <rule regex="true">
+        <keyValue>HiRes-NMM-(?:West|AK|SJU)</keyValue>
         <versionsToKeep>1</versionsToKeep>
         <modTimeToWait>00-00:15:00</modTimeToWait>
-    </rule>
+    </rule>        
     <!-- Purge rule for the HiResW-NMM-HI (HiResW-NMM-HI) model -->
     <rule>
         <keyValue>HiRes-NMM-HI</keyValue>
         <versionsToKeep>2</versionsToKeep>
         <modTimeToWait>00-00:15:00</modTimeToWait>
     </rule>
-    <!-- Purge rule for the HiResW-NMM-SJU (HiResW-NMM-SJU) model -->
-    <rule>
-        <keyValue>HiRes-NMM-SJU</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-        <modTimeToWait>00-00:15:00</modTimeToWait>
-    </rule>
-	<!-- Purge rule for the GRLKwave (GRLKwave) model -->
-	<rule>
-		<keyValue>GRLKwave</keyValue>
-		<versionsToKeep>1</versionsToKeep>
-		<modTimeToWait>00-00:15:00</modTimeToWait>
-	</rule>
 	<!-- Purge rule for the SPCGuide (SPCGuide) model -->
 	<rule>
 		<keyValue>SPCGuide</keyValue>
@@ -452,55 +299,9 @@
 		<versionsToKeep>4</versionsToKeep>
 		<modTimeToWait>00-01:00:00</modTimeToWait>
 	</rule>
-    <!-- Purge rules for the Multi-grid Hurricane Wave Models -->
-    <rule>
-        <keyValue>GLOBHwave</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>NAHwave15</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>NAHwave10</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>NAHwave4</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>NPHwave15</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>NPHwave10</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>NPHwave4</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>WPHwave10</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>AKHwave10</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
-    <rule>
-        <keyValue>AKHwave4</keyValue>
-        <versionsToKeep>1</versionsToKeep>
-    </rule>
     <!-- Purge rules for MRMS -->
-    <rule>
-        <keyValue>MRMS_1000</keyValue>
-        <versionsToKeep>120</versionsToKeep>
-        <period>03-00:00:00</period>
-    </rule>
-    <rule>
-        <keyValue>MRMS_0500</keyValue>
+    <rule regex="true">
+        <keyValue>MRMS_(?:05|10)00</keyValue>
         <versionsToKeep>120</versionsToKeep>
         <period>03-00:00:00</period>
     </rule>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LSRDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LSRDecoder.java
index 869149f968..7ce833d74c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LSRDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.lsr/src/com/raytheon/uf/edex/plugin/lsr/LSRDecoder.java
@@ -40,6 +40,7 @@ import com.raytheon.uf.edex.plugin.lsr.decoder.LSRParser;
  * ------------ ---------- ----------- --------------------------
  * Jan 21, 2009       1939 jkorman     Initial creation
  * Dec 09, 2013       2581 njensen     Updated javadoc
+ * Jan 08, 2016       5226 tgurney     Reject ob with bad location
  * 
  * </pre>
  * 
@@ -114,7 +115,13 @@ public class LSRDecoder {
                 while (parser.hasNext()) {
                     report = parser.next();
                     if (report != null) {
-                        obsList.add(report);
+                        if (report.getLocation() == null) {
+                            logger.warn(traceId
+                                    + " - Discarding report with bad location: "
+                                    + report);
+                        } else {
+                            obsList.add(report);
+                        }
                     }
                 }
             } catch (Exception e) {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/META-INF/MANIFEST.MF
index 573b1af846..f6567494db 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: VIIRS Edex Plugin
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.npp.viirs
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174",
  org.geotools;bundle-version="2.6.4",
  javax.measure;bundle-version="1.0.0",
  javax.persistence;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.npp.viirs;bundle-version="1.0.0",
  ucar.nc2;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.edex.plugin.npp;bundle-version="1.0.0",
  com.raytheon.uf.common.status;bundle-version="1.12.1174",
  com.raytheon.uf.common.localization;bundle-version="1.12.1174",
  com.raytheon.uf.common.numeric;bundle-version="1.14.0"
-Import-Package: org.apache.commons.logging
+Import-Package: org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSDecoder.java
index b15e2de145..eedd30c29d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/src/com/raytheon/uf/edex/plugin/npp/viirs/VIIRSDecoder.java
@@ -25,7 +25,9 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import ucar.ma2.Array;
 import ucar.nc2.Attribute;
@@ -64,6 +66,8 @@ import com.vividsolutions.jts.geom.GeometryFactory;
  *                                     instead of using WMO header
  * May 01, 2013 1962       bsteffen    Allow Viirs Decoder to accept numeric
  *                                     missing values.
+ * Dec 16, 2015 5166       kbisanz     Update logging to use SLF4J
+ *                                     by adding private logger
  * 
  * </pre>
  * 
@@ -73,6 +77,8 @@ import com.vividsolutions.jts.geom.GeometryFactory;
 
 public class VIIRSDecoder extends AbstractNPPDecoder {
 
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
     private static final GeometryFactory gf = new GeometryFactory();
 
     private static final String SPLIT_STRING = "[@]";
@@ -134,8 +140,7 @@ public class VIIRSDecoder extends AbstractNPPDecoder {
             LocalizationFile mappingFile = PathManagerFactory.getPathManager()
                     .getStaticLocalizationFile(VIIRS_MAPPING_FILE);
             in = mappingFile.openInputStream();
-            mapping = (VIIRSHeaderMapping) manager
-                    .unmarshalFromInputStream(in);
+            mapping = (VIIRSHeaderMapping) manager.unmarshalFromInputStream(in);
         } catch (Exception e) {
             throw new RuntimeException(
                     "Error deserializing VIIRS header mapping file", e);
@@ -247,15 +252,15 @@ public class VIIRSDecoder extends AbstractNPPDecoder {
                                     missingValues[i] = Float
                                             .parseFloat(split[i]);
                                 }
-                            } else if(attr.getDataType().isNumeric()){
-                                if(attr.isArray()){
+                            } else if (attr.getDataType().isNumeric()) {
+                                if (attr.isArray()) {
                                     missingValues = new float[attr.getLength()];
                                     for (int i = 0; i < missingValues.length; i += 1) {
                                         missingValues[i] = attr
                                                 .getNumericValue(i)
                                                 .floatValue();
                                     }
-                                }else{
+                                } else {
                                     missingValues = new float[] { attr
                                             .getNumericValue().floatValue() };
                                 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.npp/META-INF/MANIFEST.MF
index 08580cea7f..3ab81bd202 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp/META-INF/MANIFEST.MF
@@ -2,11 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NPP Common EDEX
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.npp
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174";visibility:=reexport,
  ucar.nc2;bundle-version="1.0.0";visibility:=reexport,
- org.geotools;bundle-version="2.6.4",
- org.apache.commons.lang;bundle-version="2.3.0"
+ org.geotools;bundle-version="2.6.4"
 Export-Package: com.raytheon.uf.edex.plugin.npp
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/FileManager.java b/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/FileManager.java
index 2604f5f076..d91a94c491 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/FileManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/FileManager.java
@@ -34,7 +34,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.plugin.nwsauth.xml.NwsRoleData;
 import com.raytheon.uf.common.plugin.nwsauth.xml.PermissionXML;
 import com.raytheon.uf.common.plugin.nwsauth.xml.RoleXML;
@@ -59,6 +59,8 @@ import com.raytheon.uf.common.time.util.TimeUtil;
  * Jan 17, 2013 1412       djohnson     Check files for having been modified each time data is requested, 
  *                                      in case they were written by another member of the cluster.
  * Mar 12, 2013 1646       mpduff       Format the output.
+ * Nov 12, 2015 4834       njensen      Changed LocalizationOpFailedException to LocalizationException
+ * Jan 27, 2016 5237       tgurney      Replace deprecated LocalizationFile method call
  * 
  * </pre>
  * 
@@ -104,9 +106,6 @@ class FileManager {
         return instance;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void save(String application) {
         NwsRoleData roleData = roleDataMap.get(application);
         LocalizationFile lf = roleFileMap.get(application);
@@ -115,7 +114,7 @@ class FileManager {
         LocalizationContext context = pm.getContext(
                 LocalizationType.COMMON_STATIC, LocalizationLevel.SITE);
         LocalizationFile locFile = pm
-                .getLocalizationFile(context, lf.getName());
+                .getLocalizationFile(context, lf.getPath());
         try {
             JAXBManager jaxbManager = getJaxbManager();
             Marshaller marshaller = jaxbManager.getJaxbContext()
@@ -123,10 +122,7 @@ class FileManager {
             marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
             marshaller.marshal(roleData, locFile.getFile());
             locFile.save();
-
-        } catch (JAXBException e) {
-            statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
-        } catch (LocalizationOpFailedException e) {
+        } catch (JAXBException | LocalizationException e) {
             statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
         }
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/NwsRoleStorage.java b/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/NwsRoleStorage.java
index 567b498d41..c91377e226 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/NwsRoleStorage.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.nwsauth/src/com/raytheon/uf/edex/plugin/nwsauth/NwsRoleStorage.java
@@ -28,6 +28,8 @@ import com.raytheon.uf.edex.auth.roles.IRoleStorage;
  * ------------ ---------- ----------- --------------------------
  * May 25, 2010            rgeorge     Initial creation
  * Oct 09, 2013 2361       njensen     Use JAXBManager for XML
+ * Jan 27, 2016 5237       tgurney     Replace deprecated LocalizationFile
+ *                                     method calls
  * 
  * </pre>
  * 
@@ -86,15 +88,15 @@ public class NwsRoleStorage implements IRoleStorage {
             if (locFile.exists()) {
                 file = locFile.getFile();
 
-                if (lastUsedFileMap.get(locFile.getName()) == null
+                if (lastUsedFileMap.get(locFile.getPath()) == null
                         || (file != null && (file.equals(lastUsedFileMap
-                                .get(locFile.getName())) == false || file
+                                .get(locFile.getPath())) == false || file
                                 .lastModified() > lastModificationTimeMap
-                                .get(locFile.getName())))) {
+                                .get(locFile.getPath())))) {
                     // First time we found a role file, or we have a different
                     // file to
                     // use or we were modified since our last check
-                    lastUsedFileMap.put(locFile.getName(), file);
+                    lastUsedFileMap.put(locFile.getPath(), file);
                     try {
                         roleData = jaxb.unmarshalFromXmlFile(file
                                 .getAbsolutePath());
@@ -105,7 +107,7 @@ public class NwsRoleStorage implements IRoleStorage {
                                 "Error loading file: " + file.getName(), e);
                     }
 
-                    lastModificationTimeMap.put(locFile.getName(),
+                    lastModificationTimeMap.put(locFile.getPath(),
                             file.lastModified());
                 }
             }
@@ -132,13 +134,6 @@ public class NwsRoleStorage implements IRoleStorage {
         return roleData;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.plugin.nwsauth.roles.IRoleStorage#isAuthorized
-     * (java.lang.String, java.lang.String, java.lang.String)
-     */
     @Override
     public boolean isAuthorized(String permission, String user,
             String application) throws AuthorizationException {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.pointset.netcdf/src/com/raytheon/uf/edex/plugin/pointset/netcdf/PointSetNetcdfDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.pointset.netcdf/src/com/raytheon/uf/edex/plugin/pointset/netcdf/PointSetNetcdfDecoder.java
index 04bd442fe3..264d0f4867 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.pointset.netcdf/src/com/raytheon/uf/edex/plugin/pointset/netcdf/PointSetNetcdfDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.pointset.netcdf/src/com/raytheon/uf/edex/plugin/pointset/netcdf/PointSetNetcdfDecoder.java
@@ -48,6 +48,7 @@ import ucar.nc2.NetcdfFile;
 import ucar.nc2.Variable;
 
 import com.raytheon.uf.common.dataplugin.level.LevelFactory;
+import com.raytheon.uf.common.dataplugin.pointset.PointSetData;
 import com.raytheon.uf.common.dataplugin.pointset.PointSetLocation;
 import com.raytheon.uf.common.dataplugin.pointset.PointSetRecord;
 import com.raytheon.uf.common.dataplugin.pointset.triangulate.DelauneyTriangulator;
@@ -56,8 +57,7 @@ import com.raytheon.uf.common.datastorage.StorageException;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.exception.LocalizationException;
-import com.raytheon.uf.common.parameter.lookup.ParameterLookup;
-import com.raytheon.uf.edex.netcdf.description.VariableDescription;
+import com.raytheon.uf.edex.netcdf.decoder.util.NetcdfDecoderUtils;
 import com.raytheon.uf.edex.netcdf.description.exception.InvalidDescriptionException;
 import com.raytheon.uf.edex.plugin.pointset.netcdf.description.PointSetProductDescriptions;
 import com.raytheon.uf.edex.plugin.pointset.netcdf.description.ProductDescription;
@@ -79,8 +79,10 @@ import com.raytheon.uf.edex.plugin.pointset.netcdf.description.TriangulationDesc
  * SOFTWARE HISTORY
  * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- --------------------------------------------
  * Aug 11, 2015  4709     bsteffen  Initial creation
+ * Jan 21, 2016  5208     bsteffen  Decode scale, offset, units, long_name when
+ *                                  they are present and extra validation.
  * 
  * </pre>
  * 
@@ -103,15 +105,10 @@ public class PointSetNetcdfDecoder {
 
     private LevelFactory levelFactory;
 
-    private ParameterLookup parameterLookup;
-
     public PointSetRecord[] decode(File file) {
         if (levelFactory == null) {
             levelFactory = LevelFactory.getInstance();
         }
-        if (parameterLookup == null) {
-            parameterLookup = ParameterLookup.getInstance();
-        }
         try {
             NetcdfFile netcdfFile = NetcdfFile.open(file.getAbsolutePath());
             Map<String, String> locationCache = new HashMap<String, String>();
@@ -244,8 +241,7 @@ public class PointSetNetcdfDecoder {
             }
         }
 
-        PointSetRecord record = description.getRecord(file, parameterLookup,
-                levelFactory);
+        PointSetRecord record = description.getRecord(file, levelFactory);
         if (record == null) {
             if (debug) {
                 logger.debug(
@@ -309,7 +305,27 @@ public class PointSetNetcdfDecoder {
                     dataVarName, dataType);
             return null;
         }
-        record.setData(numericData);
+
+        Attribute longNameAttribute = dataVariable.findAttribute("long_name");
+        if (longNameAttribute != null) {
+            record.getParameter().setName(longNameAttribute.getStringValue());
+        }
+        Attribute unitsAttribute = dataVariable.findAttribute("units");
+        if (unitsAttribute != null) {
+            record.getParameter()
+                    .setUnitString(unitsAttribute.getStringValue());
+        }
+        PointSetData data = new PointSetData(numericData);
+
+        Number scale = NetcdfDecoderUtils.getScaleFactor(dataVariable);
+        if (scale != NetcdfDecoderUtils.DEFAULT_SCALE_FACTOR) {
+            data.setScale(scale.floatValue());
+        }
+        Number offset = NetcdfDecoderUtils.getAddOffset(dataVariable);
+        if (offset != NetcdfDecoderUtils.DEFAULT_ADD_OFFSET) {
+            data.setOffset(offset.floatValue());
+        }
+        record.setData(data);
 
         StringBuilder locationKeyBuilder = new StringBuilder();
         lonVariable.getNameAndDimensions(locationKeyBuilder);
@@ -377,19 +393,23 @@ public class PointSetNetcdfDecoder {
         PointSetProductDescriptions descriptions = new PointSetProductDescriptions();
         for (LocalizationFile file : files) {
             logger.info("Loading pointset data description from "
-                    + file.getName());
+                    + file.getPath());
             try (InputStream inputStream = file.openInputStream()) {
                 PointSetProductDescriptions unmarshalled = JAXB.unmarshal(
                         inputStream, PointSetProductDescriptions.class);
                 for (ProductDescription description : unmarshalled
                         .getDescriptions()) {
-                    if (validate(file.getName(), description)) {
+                    try {
+                        description.validate();
                         descriptions.addDescription(description);
+                    } catch (InvalidDescriptionException e) {
+                        logger.warn("Discarding data description from {}: {}.",
+                                file.getPath(), e.getMessage(), e);
                     }
                 }
             } catch (LocalizationException | IOException e) {
                 logger.error("Unable to load product descriptions from {}",
-                        file.getName(), e);
+                        file.getPath(), e);
             }
         }
         this.descriptions = descriptions;
@@ -403,23 +423,4 @@ public class PointSetNetcdfDecoder {
         this.levelFactory = levelFactory;
     }
 
-    public void setParameterLookup(ParameterLookup parameterLookup) {
-        this.parameterLookup = parameterLookup;
-    }
-
-    protected boolean validate(String fileName, ProductDescription description) {
-        VariableDescription data = description.getData();
-        if (data == null) {
-            logger.warn(
-                    "Discarding data description from {} because no data element is present.",
-                    fileName);
-            return false;
-        } else if (data.getName() == null) {
-            logger.warn(
-                    "Discarding data description from {} because data element has no name.",
-                    fileName);
-            return false;
-        }
-        return true;
-    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.pointset.netcdf/src/com/raytheon/uf/edex/plugin/pointset/netcdf/description/ProductDescription.java b/edexOsgi/com.raytheon.uf.edex.plugin.pointset.netcdf/src/com/raytheon/uf/edex/plugin/pointset/netcdf/description/ProductDescription.java
index 0e9824e60d..f32c82344a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.pointset.netcdf/src/com/raytheon/uf/edex/plugin/pointset/netcdf/description/ProductDescription.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.pointset.netcdf/src/com/raytheon/uf/edex/plugin/pointset/netcdf/description/ProductDescription.java
@@ -30,7 +30,7 @@ import ucar.nc2.NetcdfFile;
 import com.raytheon.uf.common.dataplugin.level.Level;
 import com.raytheon.uf.common.dataplugin.level.LevelFactory;
 import com.raytheon.uf.common.dataplugin.pointset.PointSetRecord;
-import com.raytheon.uf.common.parameter.lookup.ParameterLookup;
+import com.raytheon.uf.common.parameter.Parameter;
 import com.raytheon.uf.common.time.DataTime;
 import com.raytheon.uf.edex.netcdf.description.AbstractFieldDescription;
 import com.raytheon.uf.edex.netcdf.description.AttributeDescription;
@@ -52,8 +52,10 @@ import com.raytheon.uf.edex.plugin.pointset.netcdf.PointSetNetcdfDecoder;
  * SOFTWARE HISTORY
  * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- --------------------------------------------
  * Aug 11, 2015  4709     bsteffen  Initial creation
+ * Jan 21, 2016  5208     bsteffen  Move parameter persistence to dao and
+ *                                  validate
  * 
  * </pre>
  * 
@@ -183,15 +185,14 @@ public class ProductDescription {
      * Extract the the datasetId, parameter, level and datatime from the file
      * using the attributes contained in this description.
      */
-    public PointSetRecord getRecord(NetcdfFile file,
-            ParameterLookup parameterLookup, LevelFactory levelFactory)
+    public PointSetRecord getRecord(NetcdfFile file, LevelFactory levelFactory)
             throws InvalidDescriptionException {
         String datasetId = this.datasetId.getString(file);
         if (datasetId == null) {
             return null;
         }
-        String parameter = this.parameter.getString(file);
-        if (parameter == null) {
+        String parameterAbbrev = this.parameter.getString(file);
+        if (parameterAbbrev == null) {
             return null;
         }
         Level level = this.level.getLevel(file, levelFactory);
@@ -204,7 +205,7 @@ public class ProductDescription {
         }
         PointSetRecord record = new PointSetRecord();
         record.setDatasetId(datasetId);
-        record.setParameter(parameterLookup.getParameter(parameter));
+        record.setParameter(new Parameter(parameterAbbrev));
         record.setLevel(level);
         record.setDataTime(dataTime);
         return record;
@@ -231,5 +232,58 @@ public class ProductDescription {
         return latitude.getName();
     }
 
+    public void validate() throws InvalidDescriptionException {
+        if (data == null) {
+            throw new InvalidDescriptionException(
+                    "A data element is not present.");
+        }
+        try {
+            data.validate();
+        } catch (InvalidDescriptionException e) {
+            throw new InvalidDescriptionException("Invalid data: "
+                    + e.getMessage(), e);
+        }
+        if (datasetId == null) {
+            throw new InvalidDescriptionException(
+                    "A dataset id element is not present.");
+        }
+        try {
+            datasetId.validate();
+        } catch (InvalidDescriptionException e) {
+            throw new InvalidDescriptionException("Invalid dataset id: "
+                    + e.getMessage(), e);
+        }
+        if (parameter == null) {
+            throw new InvalidDescriptionException(
+                    "A parameter element is not present.");
+        }
+        try {
+            parameter.validate();
+        } catch (InvalidDescriptionException e) {
+            throw new InvalidDescriptionException("Invalid parameter: "
+                    + e.getMessage(), e);
+        }
+        if (level == null) {
+            throw new InvalidDescriptionException(
+                    "A level element is not present.");
+        }
+        try {
+            level.validate();
+        } catch (InvalidDescriptionException e) {
+            throw new InvalidDescriptionException("Invalid level: "
+                    + e.getMessage(), e);
+        }
+        if (dataTime == null) {
+            throw new InvalidDescriptionException(
+                    "A data time element is not present.");
+        }
+        try {
+            dataTime.validate();
+        } catch (InvalidDescriptionException e) {
+            throw new InvalidDescriptionException("Invalid data time: "
+                    + e.getMessage(), e);
+        }
+    }
+
 
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.pointset/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.pointset/META-INF/MANIFEST.MF
index f9682e5058..e8b1a897fe 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.pointset/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.pointset/META-INF/MANIFEST.MF
@@ -8,4 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.14.0",
  com.raytheon.uf.common.dataplugin.pointset;bundle-version="1.15.0",
  com.raytheon.uf.common.datastorage;bundle-version="1.15.0",
- com.raytheon.uf.edex.database;bundle-version="1.15.0"
+ com.raytheon.uf.edex.database;bundle-version="1.15.0",
+ javax.measure;bundle-version="1.0.0",
+ com.raytheon.uf.common.status;bundle-version="1.15.0"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.pointset/src/com/raytheon/uf/edex/plugin/pointset/PointSetDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.pointset/src/com/raytheon/uf/edex/plugin/pointset/PointSetDao.java
index 23e7d03e2d..b693444c37 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.pointset/src/com/raytheon/uf/edex/plugin/pointset/PointSetDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.pointset/src/com/raytheon/uf/edex/plugin/pointset/PointSetDao.java
@@ -20,12 +20,25 @@
 package com.raytheon.uf.edex.plugin.pointset;
 
 import java.nio.Buffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
+import javax.measure.converter.UnitConverter;
+
+import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
+import com.raytheon.uf.common.dataplugin.pointset.PointSetConstants;
+import com.raytheon.uf.common.dataplugin.pointset.PointSetData;
 import com.raytheon.uf.common.dataplugin.pointset.PointSetRecord;
 import com.raytheon.uf.common.datastorage.DataStoreFactory;
 import com.raytheon.uf.common.datastorage.IDataStore;
+import com.raytheon.uf.common.datastorage.StorageStatus;
+import com.raytheon.uf.common.datastorage.records.IDataRecord;
+import com.raytheon.uf.common.parameter.Parameter;
+import com.raytheon.uf.common.parameter.lookup.ParameterLookup;
 import com.raytheon.uf.edex.database.plugin.PluginDao;
 
 /**
@@ -37,15 +50,16 @@ import com.raytheon.uf.edex.database.plugin.PluginDao;
  * SOFTWARE HISTORY
  * 
  * Date          Ticket#  Engineer  Description
- * ------------- -------- --------- --------------------------
+ * ------------- -------- --------- -----------------------
  * Aug 11, 2015  4709     bsteffen  Initial creation
+ * Jan 21, 2016  5208     bsteffen  Store scale and offset
  * 
  * </pre>
  * 
  * @author bsteffen
  */
 public class PointSetDao extends PluginDao {
-
+    
     public PointSetDao(String pluginName) throws PluginException {
         super(pluginName);
     }
@@ -54,14 +68,78 @@ public class PointSetDao extends PluginDao {
         super("pointset");
     }
 
+    @Override
+    public PluginDataObject[] persistToDatabase(PluginDataObject... records) {
+        return super.persistToDatabase(verifyRecords(records));
+    }
+
+    @Override
+    public StorageStatus persistToHDF5(PluginDataObject... records)
+            throws PluginException {
+        return super.persistToHDF5(verifyRecords(records));
+    }
+
+    private PluginDataObject[] verifyRecords(PluginDataObject... records) {
+        List<PluginDataObject> toPersist = new ArrayList<PluginDataObject>(
+                records.length);
+        for (PluginDataObject record : records) {
+            PointSetRecord rec = (PointSetRecord) record;
+            if (validateParameter(rec)) {
+                toPersist.add(rec);
+            }
+        }
+        return toPersist.toArray(new PointSetRecord[toPersist.size()]);
+    }
+
+    protected boolean validateParameter(PointSetRecord record) {
+        Parameter parameter = record.getParameter();
+        boolean result = true;
+        if (parameter == null) {
+            result = false;
+        } else if (parameter.getName() == null) {
+            result = false;
+        } else if (parameter.getName().equals("Missing")) {
+            result = false;
+        } else {
+            Parameter dbParameter = ParameterLookup.getInstance().getParameter(
+                    parameter, true);
+            if (!parameter.equals(dbParameter)) {
+                UnitConverter converter = Parameter.compareUnits(parameter,
+                        dbParameter);
+                    record.getData().convert(converter);
+            }
+            record.setParameter(dbParameter);
+        }
+        if (!result) {
+            logger.info("Discarding record due to missing or unknown parameter mapping: "
+                    + record);
+        }
+        return result;
+    }
+
     @Override
     protected IDataStore populateDataStore(IDataStore dataStore,
             IPersistable obj) throws Exception {
         if (obj instanceof PointSetRecord) {
             PointSetRecord points = (PointSetRecord) obj;
-            Buffer data = points.getData();
-            dataStore.addDataRecord(DataStoreFactory.createStorageRecord(
-                    "Data", points.getDataURI(), data.array()));
+            PointSetData data = points.getData();
+            Buffer buffer = data.getData();
+            IDataRecord dataRecord = DataStoreFactory.createStorageRecord(
+                    "Data", points.getDataURI(), buffer.array());
+            if (data.getOffset() != null || data.getScale() != null) {
+                Map<String, Object> dataAttributes = new HashMap<>();
+                if (data.getOffset() != null) {
+                    dataAttributes.put(PointSetConstants.ADD_OFFSET,
+                            data.getOffset());
+                }
+                if (data.getScale() != null) {
+                    dataAttributes.put(PointSetConstants.SCALE_FACTOR,
+                            data.getScale());
+                }
+
+                dataRecord.setDataAttributes(dataAttributes);
+            }
+            dataStore.addDataRecord(dataRecord);
         } else if (obj != null) {
             throw new IllegalArgumentException("Cannot handle "
                     + obj.getClass().getSimpleName());
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/META-INF/MANIFEST.MF
index 746b6e408a..424854f363 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.preciprate/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Preciprate Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.preciprate
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:=optional,
  com.raytheon.edex.common;bundle-version="1.11.7",
  com.raytheon.uf.common.monitor;bundle-version="1.11.7",
@@ -15,4 +15,4 @@ Require-Bundle: com.raytheon.uf.edex.cpgsrv;bundle-version="1.11.7";resolution:=
  com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
  com.raytheon.uf.common.localization;bundle-version="1.12.1174"
 Import-Package: com.raytheon.uf.edex.plugin.scan.common,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF
index 1734a35ac9..aa6a999c57 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.qpf/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Import-Package: com.raytheon.edex.urifilter,
  com.raytheon.uf.common.dataplugin.grid,
  com.raytheon.uf.edex.core,
  com.raytheon.uf.edex.plugin.scan.common,
- org.apache.commons.logging
+ org.slf4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.raytheon.uf.edex.plugin.qpf,
  com.raytheon.uf.edex.plugin.qpf.common
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/META-INF/MANIFEST.MF
index aca44efc8e..b43b639e08 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Redbook Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.redbook
-Bundle-Version: 1.15.0.qualifier
+Bundle-Version: 1.15.1.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common,
  javax.persistence,
@@ -11,7 +11,7 @@ Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.edex.ndm;bundle-version="1.14.0",
  com.raytheon.uf.edex.menus;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin.redbook;bundle-version="1.14.0",
- org.apache.commons.lang;bundle-version="2.3.0"
+ org.apache.commons.lang3;bundle-version="3.4.0"
 Export-Package: com.raytheon.uf.edex.plugin.redbook,
  com.raytheon.uf.edex.plugin.redbook.decoder
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/decoder/RedbookFcstMap.java b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/decoder/RedbookFcstMap.java
index ac7b00edf7..8d0dbff589 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/decoder/RedbookFcstMap.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/decoder/RedbookFcstMap.java
@@ -19,6 +19,7 @@
  **/
 package com.raytheon.uf.edex.plugin.redbook.decoder;
 
+import java.io.InputStream;
 import java.util.HashMap;
 
 import javax.xml.bind.JAXB;
@@ -28,11 +29,10 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.raytheon.uf.common.localization.FileUpdatedMessage;
-import com.raytheon.uf.common.localization.ILocalizationFileObserver;
+import com.raytheon.uf.common.localization.ILocalizationFile;
+import com.raytheon.uf.common.localization.ILocalizationPathObserver;
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext;
-import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
@@ -52,6 +52,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Nov 04, 2013        2361 njensen     Use JAXB for XML instead of SerializationUtil
  * Jun 25, 2015        4512 mapeters    Added addEntry(), check for redbookFcstMap.xml
  *                                      in common_static before edex_static
+ * Feb 16, 2016        5237 bsteffen    Replace deprecated localization API.
  * 
  * </pre>
  * 
@@ -93,10 +94,29 @@ public class RedbookFcstMap {
         mapping.put(key, value);
     }
 
-    private static RedbookFcstMap load(LocalizationFile xmlFile) {
+    private static RedbookFcstMap load() {
+        IPathManager pathMgr = PathManagerFactory.getPathManager();
+        /*
+         * Check common_static/configured first, as it is now being saved there.
+         * If not found, check edex_static/base, where it used to be stored (in
+         * the future edex_static should no longer need to be checked).
+         */
+        LocalizationContext context = pathMgr.getContext(
+                LocalizationContext.LocalizationType.COMMON_STATIC,
+                LocalizationContext.LocalizationLevel.CONFIGURED);
+        ILocalizationFile xmlFile = pathMgr.getLocalizationFile(context,
+                REDBOOK_FCST_MAP_XML);
+        if (xmlFile == null || !xmlFile.exists()) {
+            context = pathMgr.getContext(
+                    LocalizationContext.LocalizationType.EDEX_STATIC,
+                    LocalizationContext.LocalizationLevel.BASE);
+            xmlFile = pathMgr
+                    .getLocalizationFile(context, REDBOOK_FCST_MAP_XML);
+        }
+
         RedbookFcstMap loadedMap = null;
-        try {
-            loadedMap = JAXB.unmarshal(xmlFile.getFile(), RedbookFcstMap.class);
+        try (InputStream is = xmlFile.openInputStream()) {
+            loadedMap = JAXB.unmarshal(is, RedbookFcstMap.class);
         } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM, e.getMessage(), e);
         }
@@ -119,34 +139,14 @@ public class RedbookFcstMap {
      */
     public static synchronized RedbookFcstMap getInstance() {
         if (instance == null) {
-            IPathManager pathMgr = PathManagerFactory.getPathManager();
-            /*
-             * Check common_static/configured first, as it is now being saved
-             * there. If not found, check edex_static/base, where it used to be
-             * stored (in the future edex_static should no longer need to be
-             * checked).
-             */
-            LocalizationContext context = pathMgr.getContext(
-                    LocalizationContext.LocalizationType.COMMON_STATIC,
-                    LocalizationContext.LocalizationLevel.CONFIGURED);
-            LocalizationFile xmlFile = pathMgr.getLocalizationFile(context,
-                    REDBOOK_FCST_MAP_XML);
-            if (xmlFile == null || !xmlFile.exists()) {
-                context = pathMgr.getContext(
-                        LocalizationContext.LocalizationType.EDEX_STATIC,
-                        LocalizationContext.LocalizationLevel.BASE);
-                xmlFile = pathMgr.getLocalizationFile(context,
-                        REDBOOK_FCST_MAP_XML);
-            }
-
-            final LocalizationFile finalXmlFile = xmlFile;
-            instance = load(xmlFile);
-            xmlFile.addFileUpdatedObserver(new ILocalizationFileObserver() {
+            instance = load();
+            PathManagerFactory.getPathManager().addLocalizationPathObserver(REDBOOK_FCST_MAP_XML, new ILocalizationPathObserver() {
+                
                 @Override
-                public void fileUpdated(FileUpdatedMessage message) {
-                    RedbookFcstMap updatedMap = load(finalXmlFile);
+                public void fileChanged(ILocalizationFile file) {
+                    RedbookFcstMap updatedMap = load();
                     instance.mapping.clear();
-                    instance.mapping.putAll(updatedMap.mapping);
+                    instance.mapping.putAll(updatedMap.mapping);                    
                 }
             });
         }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/ingest/AbstractRedbookNdmSubscriber.java b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/ingest/AbstractRedbookNdmSubscriber.java
index a9539f116f..218f981cba 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/ingest/AbstractRedbookNdmSubscriber.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/ingest/AbstractRedbookNdmSubscriber.java
@@ -35,6 +35,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.localization.SaveableOutputStream;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -51,6 +52,8 @@ import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jun 25, 2015 4512       mapeters    Initial creation.
+ * Jan 08, 2016 5237       tgurney     Replace call to deprecated
+ *                                     LocalizationFile.write()
  * 
  * </pre>
  * 
@@ -96,7 +99,7 @@ public abstract class AbstractRedbookNdmSubscriber implements
         for (String line : dataKeys) {
             line = line.trim();
             // Skip comment/empty lines
-            if (line.startsWith("#") || line.length() == 0) {
+            if (line.startsWith("#") || (line.length() == 0)) {
                 continue;
             }
             String[] parts = line.split("\\|");
@@ -125,12 +128,13 @@ public abstract class AbstractRedbookNdmSubscriber implements
             locFile.getFile().getParentFile().mkdirs();
         }
 
-        try {
-            locFile.write(Files.readAllBytes(file.toPath()));
+        try (SaveableOutputStream locFileStream = locFile.openOutputStream()) {
+            locFileStream.write(Files.readAllBytes(file.toPath()));
+            locFileStream.save();
         } catch (Exception e) {
             statusHandler.handle(Priority.PROBLEM,
                     "Failed to write contents of " + file.getPath() + " to "
-                            + locFile.getFile().getPath(), e);
+                            + locFile.getPath(), e);
         }
     }
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/ingest/RedbookNdmMenuSubscriber.java b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/ingest/RedbookNdmMenuSubscriber.java
index 4d2104a999..4c082aa9a9 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/ingest/RedbookNdmMenuSubscriber.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/src/com/raytheon/uf/edex/plugin/redbook/ingest/RedbookNdmMenuSubscriber.java
@@ -25,7 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF
index bd61ea5495..4ec1b97bbd 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.mcidas/META-INF/MANIFEST.MF
@@ -2,13 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: McIDAS Satellite Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.satellite.mcidas
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: Raytheon
 Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
  org.geotools,
  javax.measure,
- org.apache.commons.lang,
  javax.persistence,
  com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.0.0",
  com.raytheon.edex.plugin.satellite;bundle-version="1.12.1174"
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF
index 8176c66d41..f7128ab55d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF
@@ -25,4 +25,4 @@ Export-Package: com.raytheon.uf.edex.plugin.scan,
 Import-Package: com.raytheon.uf.edex.menus,
  javax.measure.converter,
  javax.measure.unit,
- org.apache.commons.logging
+ org.slf4j
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF
index c4576f79d1..84f9bbd15e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Svrwx Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.svrwx
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.uf.common.dataplugin.svrwx;bundle-version="1.0.0",
@@ -19,5 +19,4 @@ Import-Package: com.raytheon.edex.esb,
  com.raytheon.uf.common.status,
  com.raytheon.uf.common.time,
  com.raytheon.uf.common.wmo,
- com.raytheon.uf.edex.core,
- org.apache.commons.logging
+ com.raytheon.uf.edex.core
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/pointdata/svrwxdb.xml b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/pointdata/svrwxdb.xml
index b1ac58a90b..9190ea2c48 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/pointdata/svrwxdb.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/res/pointdata/svrwxdb.xml
@@ -2,5 +2,5 @@
 <pointDataDbDescription>
   <parameter name="latitude" queryName="location.latitude" type="FLOAT" unit="°" />
   <parameter name="longitude" queryName="location.longitude" type="FLOAT" unit="°" />
-  <parameter name="dataURI" queryName="dataURI" type="STRING" />
-</pointDataDbDescription>
\ No newline at end of file
+  <parameter name="stationId" queryName="location.stationId" type="STRING" />
+</pointDataDbDescription>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxRecordDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxRecordDao.java
index f13f3613b6..f2ca4f4ddf 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxRecordDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/SvrWxRecordDao.java
@@ -19,11 +19,8 @@
  **/
 package com.raytheon.uf.edex.plugin.svrwx;
 
-import java.util.List;
-
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.svrwx.SvrWxRecord;
-import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
 
 /**
@@ -37,6 +34,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
  * ------------  ---------- ----------- --------------------------
  * Jan  4, 2010            jsanchez     Initial creation
  * Apr 10, 2014  2971      skorolev     Cleaned code.
+ * Jan 19, 2016  5253      tgurney      Remove dead code
  * 
  * </pre>
  * 
@@ -46,7 +44,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
 
 public class SvrWxRecordDao extends PointDataPluginDao<SvrWxRecord> {
     /**
-     * Creates a new TropicalCycloneGuidance Dao
+     * Creates a new SvrWxRecord Dao
      * 
      * @param pluginName
      * @throws PluginException
@@ -55,74 +53,16 @@ public class SvrWxRecordDao extends PointDataPluginDao<SvrWxRecord> {
         super(pluginName);
     }
 
-    /**
-     * Retrieves an tcg report using the datauri .
-     * 
-     * @param dataURI
-     *            The dataURI to match against.
-     * @return The report record if it exists.
-     */
-    public SvrWxRecord queryByDataURI(String dataURI) {
-        SvrWxRecord report = null;
-        List<?> obs = null;
-        try {
-            obs = queryBySingleCriteria("dataURI", dataURI);
-        } catch (DataAccessLayerException e) {
-            e.printStackTrace();
-        }
-        if ((obs != null) && (obs.size() > 0)) {
-            report = (SvrWxRecord) obs.get(0);
-        }
-        return report;
-    }
-
-    /**
-     * Queries for to determine if a given data uri exists on the tcg table.
-     * 
-     * @param dataUri
-     *            The DataURI to find.
-     * @return An array of objects. If not null, there should only be a single
-     *         element.
-     */
-    public Object[] queryDataUriColumn(final String dataUri) {
-
-        String sql = "select datauri from awips.svrwx where datauri='"
-                + dataUri + "';";
-
-        Object[] results = executeSQLQuery(sql);
-
-        return results;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.edex.pointdata.PointDataPluginDao#getKeysRequiredForFileName
-     * ()
-     */
     @Override
     public String[] getKeysRequiredForFileName() {
         return new String[] { "dataTime.refTime" };
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.edex.pointdata.PointDataPluginDao#getPointDataFileName
-     * (com.raytheon.uf.common.dataplugin.PluginDataObject)
-     */
     @Override
     public String getPointDataFileName(SvrWxRecord p) {
         return "svrwx.h5";
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see com.raytheon.uf.edex.pointdata.PointDataPluginDao#newObject()
-     */
     @Override
     public SvrWxRecord newObject() {
         return new SvrWxRecord();
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/EventReport.java b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/EventReport.java
index 639ea56c66..ee493c677d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/EventReport.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/EventReport.java
@@ -27,18 +27,19 @@ import java.util.regex.Pattern;
 /**
  * An InternalReport that contains an entire event report. The fields of a
  * report are parsed from the data, but not transformed in any way.
- *
- *
+ * 
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jun 25, 2014 3008       nabowle     Initial creation
- *
+ * Feb 11, 2016 5292       skorolev    Added setStationId
+ * 
  * </pre>
- *
+ * 
  * @author nabowle
  * @version 1.0
  */
@@ -67,7 +68,7 @@ public class EventReport extends InternalReport {
 
     /**
      * Constructor.
-     *
+     * 
      * @param event
      *            The event line.
      * @param pKey
@@ -126,7 +127,6 @@ public class EventReport extends InternalReport {
         return latLon;
     }
 
-
     /**
      * @return the stationId
      */
@@ -134,6 +134,12 @@ public class EventReport extends InternalReport {
         return stationId;
     }
 
+    /**
+     * @param stationId
+     */
+    public void setStationId(String stationId) {
+        this.stationId = stationId;
+    }
 
     /**
      * Builder for the EventReport to facilitate creating an EventReport from
@@ -154,7 +160,7 @@ public class EventReport extends InternalReport {
 
         /**
          * Creates an EventReport object from the event line and remarks.
-         *
+         * 
          * @return The built EventReport.
          */
         public EventReport build() {
@@ -165,7 +171,7 @@ public class EventReport extends InternalReport {
 
         /**
          * Sets the event line of the report.
-         *
+         * 
          * @param eventLine
          *            The event line.
          * @return This builder.
@@ -177,7 +183,7 @@ public class EventReport extends InternalReport {
 
         /**
          * Adds a remarks line to the report.
-         *
+         * 
          * @param rmks
          *            The remarks line.
          * @return This builder.
@@ -190,7 +196,7 @@ public class EventReport extends InternalReport {
         /**
          * Builds a String of the entire event, including the event line and all
          * remarks lines.
-         *
+         * 
          * @return The event string.
          */
         private String buildEventString() {
@@ -204,7 +210,7 @@ public class EventReport extends InternalReport {
 
         /**
          * Parses the event key field.
-         *
+         * 
          * @return The event key field.
          */
         private String parseEventKey() {
@@ -213,7 +219,7 @@ public class EventReport extends InternalReport {
 
         /**
          * Parses the time field.
-         *
+         * 
          * @return the time field.
          */
         private String parseTime() {
@@ -222,7 +228,7 @@ public class EventReport extends InternalReport {
 
         /**
          * Parses the station id field.
-         *
+         * 
          * @return The station id field.
          */
         private String parseStationId() {
@@ -237,20 +243,18 @@ public class EventReport extends InternalReport {
 
         /**
          * Parses the combined latitude/longitude field.
-         *
+         * 
          * @return The combined latitude/longitude field.
          */
         private String parseLatLon() {
             return parseFromRemarks(LATLON_PTRN);
         }
 
-
-
         /**
          * Parses the remarks field from the remarks lines. The first remarks
          * line contains other fields, starting with the station id, which are
          * not included in the remarks field.
-         *
+         * 
          * @return The parsed remarks fields.
          */
         private String parseRemarks() {
@@ -280,7 +284,7 @@ public class EventReport extends InternalReport {
 
         /**
          * Parses a field from a line.
-         *
+         * 
          * @param line
          *            The line to pull the field from.
          * @param pattern
@@ -305,7 +309,7 @@ public class EventReport extends InternalReport {
 
         /**
          * Parses a field from the first remarks line.
-         *
+         * 
          * @param pattern
          *            The pattern of the field.
          * @return The matched group, or null if the remarks or empty or the
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/SvrWxParser.java b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/SvrWxParser.java
index bd2f4ce12b..0d38300d25 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/SvrWxParser.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/src/com/raytheon/uf/edex/plugin/svrwx/decoder/SvrWxParser.java
@@ -59,6 +59,7 @@ import com.raytheon.uf.edex.plugin.svrwx.SvrWxRecordDao;
  * Jun 25, 2014 3008       nabowle     Refactor for EventReport type
  * Jul 23, 2014 3410       bclement    location changed to floats
  * Jul 30, 2014 3410       bclement    lat, lon and data uri moved to database point data desc
+ * Feb 11, 2016 5292       skorolev    Corrected findReports to fix a broken stationId
  * 
  * </pre>
  * 
@@ -117,7 +118,7 @@ public class SvrWxParser {
 
     /**
      * SvrWx Parser.
-     *
+     * 
      * @param dao
      * @param pdd
      * @param name
@@ -130,7 +131,7 @@ public class SvrWxParser {
 
     /**
      * Set the message data and decode all message reports.
-     *
+     * 
      * @param message
      *            Raw message data.
      * @param traceId
@@ -154,7 +155,7 @@ public class SvrWxParser {
 
     /**
      * Does this parser contain any more reports.
-     *
+     * 
      * @return Does this parser contain any more reports.
      */
     public boolean hasNext() {
@@ -172,7 +173,7 @@ public class SvrWxParser {
     /**
      * Get the next available report. Returns a null reference if no more
      * reports are available.
-     *
+     * 
      * @return The next available report.
      */
     public SvrWxRecord next() {
@@ -212,7 +213,7 @@ public class SvrWxParser {
 
     /**
      * Gets Container
-     *
+     * 
      * @param obsData
      * @return
      */
@@ -229,7 +230,7 @@ public class SvrWxParser {
 
     /**
      * Collect Reports from svrWx Records.
-     *
+     * 
      * @param message
      * @return reports
      */
@@ -255,6 +256,14 @@ public class SvrWxParser {
                 case EVENT_REPORT:
                     reportCount++;
                     eRpt = (EventReport) rpt;
+                    if (eRpt.getStationId() == null && eRpt.getLatLon() != null) {
+                        // Set LatLon name for broken station name
+                        SurfaceObsLocation location = new SurfaceObsLocation();
+                        location.setLatitude(getLat(eRpt.getLatLon()));
+                        location.setLongitude(getLon(eRpt.getLatLon()));
+                        location.generateCoordinateStationId();
+                        eRpt.setStationId(location.getStationId());
+                    }
                     missingFields = getMissingFields(eRpt);
                     if (missingFields.length == 0 && year != -1 && month != -1) {
                         reports.add(buildRecord(eRpt, month, year));
@@ -288,7 +297,7 @@ public class SvrWxParser {
 
     /**
      * Builds a SvrWxRecord from an EventReport.
-     *
+     * 
      * @param eRpt
      *            The EventReport.
      * @param month
@@ -304,22 +313,18 @@ public class SvrWxParser {
         location.setLatitude(getLat(eRpt.getLatLon()));
 
         SvrWxRecord svrWxRecord = new SvrWxRecord();
-        svrWxRecord.setReportType(getReportType(eRpt
-                .getKey()));
-        svrWxRecord.setGreenTime(getGreenTime(eRpt
-                .getTime()));
+        svrWxRecord.setReportType(getReportType(eRpt.getKey()));
+        svrWxRecord.setGreenTime(getGreenTime(eRpt.getTime()));
         svrWxRecord.setLocation(location);
-        svrWxRecord.setDataTime(getRefTime(eRpt.getTime(),
-                month, year));
-        svrWxRecord
-                .setEventKey(getEventKey(eRpt.getKey()));
+        svrWxRecord.setDataTime(getRefTime(eRpt.getTime(), month, year));
+        svrWxRecord.setEventKey(getEventKey(eRpt.getKey()));
         svrWxRecord.setDetails(getDetails(svrWxRecord, eRpt));
         return svrWxRecord;
     }
 
     /**
      * Logs an EventReport that is invalid.
-     *
+     * 
      * @param eRpt
      *            The EventReport.
      * @param missingFields
@@ -337,7 +342,7 @@ public class SvrWxParser {
 
     /**
      * Parses the month.
-     *
+     * 
      * @param timeRangeLine
      *            The time range line.
      * @return The month, or 0 if the month cannot be found.
@@ -355,7 +360,7 @@ public class SvrWxParser {
 
     /**
      * Parses the year from the time range line.
-     *
+     * 
      * @param timeRangeLine
      *            The time range line.
      * @return The year, or 0 f the year cannot be found.
@@ -373,7 +378,7 @@ public class SvrWxParser {
 
     /**
      * Gets the green time from the time field.
-     *
+     * 
      * @param time
      *            The time field.
      * @return The green time, or null if the time is null.
@@ -388,7 +393,7 @@ public class SvrWxParser {
 
     /**
      * Gets the ref time from the time field, month, and year.
-     *
+     * 
      * @param time
      *            The time field.
      * @param month
@@ -422,7 +427,7 @@ public class SvrWxParser {
 
     /**
      * Gets the report type.
-     *
+     * 
      * @param key
      *            The event key field.
      * @return The report type, or null if the key field is not expected.
@@ -445,7 +450,7 @@ public class SvrWxParser {
 
     /**
      * Gets the event key.
-     *
+     * 
      * @param key
      *            The event key field.
      * @return The event key, or null if the event key is not expected.
@@ -494,7 +499,7 @@ public class SvrWxParser {
 
     /**
      * Parses the latitude from the combined latitude/longitude field.
-     *
+     * 
      * @param latlon
      *            The combined latitude/longitude field.
      * @return The latitude.
@@ -505,7 +510,7 @@ public class SvrWxParser {
 
     /**
      * Parses the longitude from the combined latitude/longitude field.
-     *
+     * 
      * @param latlon
      *            The combined latitude/longitude field.
      * @return The longitude.
@@ -516,7 +521,7 @@ public class SvrWxParser {
 
     /**
      * Get the event details.
-     *
+     * 
      * @param record
      *            The SvrWxRecord.
      * @param eRpt
@@ -535,23 +540,20 @@ public class SvrWxParser {
 
     /**
      * Check for missing fields that are required.
-     *
+     * 
      * @param eRpt
      *            The event report.
      * @return An array of the missing fields' names, or an empty array if no
      *         fields are missing.
      */
     private String[] getMissingFields(EventReport eRpt) {
-
         List<String> missing = new ArrayList<String>();
         if (eRpt.getStationId() == null) {
             missing.add("StationID");
         }
-
         if (eRpt.getLatLon() == null) {
             missing.add("Latitude/Longitude");
         }
-
         return missing.isEmpty() ? EMPTY_ARR : missing.toArray(EMPTY_ARR);
     }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/utility/edex_static/base/distribution/svrwx.xml b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/utility/edex_static/base/distribution/svrwx.xml
index 6c226bea9a..9fe42592ea 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/utility/edex_static/base/distribution/svrwx.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.svrwx/utility/edex_static/base/distribution/svrwx.xml
@@ -19,5 +19,5 @@
         further_licensing_information.
     -->
 <requestPatterns xmlns:ns2="group">
-    <regex>^NWUS20.*</regex>
+    <regex>^NWUS2[02].*</regex>
 </requestPatterns>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcg.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcg.xml
index b1c55c6c08..e0d0f8f199 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcg.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcg.xml
@@ -27,6 +27,4 @@
   
   <parameter name="stormType" numDims="1" type="STRING" />
   <parameter name="stormName" numDims="1" type="STRING" />
-  <parameter name="modelName" numDims="1" type="STRING" />
-  <parameter name="productType" numDims="1" type="STRING" />
 </pointDataDescription>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcgdb.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcgdb.xml
index b1ac58a90b..6805d5214d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcgdb.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/res/pointdata/tcgdb.xml
@@ -2,5 +2,7 @@
 <pointDataDbDescription>
   <parameter name="latitude" queryName="location.latitude" type="FLOAT" unit="°" />
   <parameter name="longitude" queryName="location.longitude" type="FLOAT" unit="°" />
-  <parameter name="dataURI" queryName="dataURI" type="STRING" />
+  <parameter name="stationId" queryName="location.stationId" type="STRING" />
+  <parameter name="productType" queryName="productType" type="STRING" />
+  <parameter name="modelName" queryName="modelName" type="STRING" />
 </pointDataDbDescription>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TropicalCycloneGuidanceDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TropicalCycloneGuidanceDao.java
index a20750bb50..37674f2612 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TropicalCycloneGuidanceDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/TropicalCycloneGuidanceDao.java
@@ -19,76 +19,39 @@
  **/
 package com.raytheon.uf.edex.plugin.tcg;
 
-import java.util.List;
-
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.tcg.TropicalCycloneGuidance;
-import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
 
 /**
  * 
+ * DAO for TropicalCycloneGuidance (TCG)
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
+ * 
+ * Date         Ticket#    Engineer     Description
+ * ------------ ---------- -----------  --------------------------
  * Oct 28, 2009            jsanchez     Initial creation
- *
+ * Jan 28, 2016       5286 tgurney      Remove dead code
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
- * @version 1.0 
+ * @version 1.0
  */
-public class TropicalCycloneGuidanceDao extends PointDataPluginDao<TropicalCycloneGuidance> {
+public class TropicalCycloneGuidanceDao extends
+        PointDataPluginDao<TropicalCycloneGuidance> {
 
     /**
      * Creates a new TropicalCycloneGuidanceDao
-     * @throws PluginException 
+     * 
+     * @throws PluginException
      */
     public TropicalCycloneGuidanceDao(String pluginName) throws PluginException {
         super(pluginName);
     }
-    
-    /**
-     * Retrieves an tcg report using the datauri .
-     * 
-     * @param dataURI
-     *            The dataURI to match against.
-     * @return The report record if it exists.
-     */
-    public TropicalCycloneGuidance queryByDataURI(String dataURI) {
-        TropicalCycloneGuidance report = null;
-        List<?> obs = null;
-        try {
-            obs = queryBySingleCriteria("dataURI", dataURI);
-        } catch (DataAccessLayerException e) {
-            e.printStackTrace();
-        }
-        if ((obs != null) && (obs.size() > 0)) {
-            report = (TropicalCycloneGuidance) obs.get(0);
-        }
-        return report;
-    }
-    /**
-     * Queries for to determine if a given data uri exists on the tcg table.
-     * 
-     * @param dataUri
-     *            The DataURI to find.
-     * @return An array of objects. If not null, there should only be a single
-     *         element.
-     */
-    public Object[] queryDataUriColumn(final String dataUri) {
-
-        String sql = "select datauri from awips.tcg where datauri='"
-                + dataUri + "';";
-
-        Object[] results = executeSQLQuery(sql);
-
-        return results;
-    }
 
     @Override
     public String[] getKeysRequiredForFileName() {
@@ -106,4 +69,3 @@ public class TropicalCycloneGuidanceDao extends PointDataPluginDao<TropicalCyclo
     }
 
 }
-
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/QLMData.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/QLMData.java
index 236dc3949e..fcca35ce05 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/QLMData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/QLMData.java
@@ -32,7 +32,8 @@ import com.raytheon.uf.common.time.DataTime;
 import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao;
 
 /**
- * TODO Add Description
+ * Parser for subset of Tropical Cyclone Guidance data that contains storm track
+ * predictions based on the Quasi-Lagrangian Limited Area (QLM) model.
  * 
  * <pre>
  * 
@@ -46,6 +47,7 @@ import com.raytheon.uf.edex.plugin.tcg.TropicalCycloneGuidanceDao;
  *                                     processing archive  data.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
  * Jul 23, 2014 3410       bclement    location changed to floats
+ * Jan 28, 2016 5286       tgurney     Generate unique stationId
  * 
  * </pre>
  * 
@@ -103,6 +105,7 @@ public class QLMData extends TCGDataAdapter {
                                 stationId);
                         location.setLongitude((float) fp.longitude);
                         location.setLatitude((float) fp.latitude);
+                        location.generateCoordinateStationId();
 
                         rpt.setWmoHeader(wmoHeader.getWmoHeader());
                         rpt.setTraceId(traceId);
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java
index da947acae6..14a3d13bba 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcg/src/com/raytheon/uf/edex/plugin/tcg/decoder/TCGDataAdapter.java
@@ -139,7 +139,7 @@ public abstract class TCGDataAdapter {
 
     /**
      * Does this parser contain any more reports.
-     *
+     * 
      * @return Does this parser contain any more reports.
      */
     public boolean hasNext() {
@@ -157,7 +157,7 @@ public abstract class TCGDataAdapter {
     /**
      * Get the next available report. Returns a null reference if no more
      * reports are available.
-     *
+     * 
      * @return The next available report.
      */
     public TropicalCycloneGuidance next() {
@@ -190,8 +190,6 @@ public abstract class TCGDataAdapter {
 
                 view.setString("stormType", report.getType().toString());
                 view.setString("stormName", report.getStormName());
-                view.setString("modelName", report.getModelName());
-                view.setString("productType", report.getProductType());
 
                 report.setPointDataView(view);
             }
@@ -200,7 +198,7 @@ public abstract class TCGDataAdapter {
     }
 
     /**
-     *
+     * 
      * @param obsData
      * @return
      */
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcs.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcs.xml
index 52aaffec9e..56b850e476 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcs.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcs.xml
@@ -23,7 +23,6 @@
 -->
 <pointDataDescription>
   <parameter name="wmoHeader" numDims="1" type="STRING" />
-  <parameter name="productType" numDims="1" type="STRING" />
   <parameter name="name" numDims="1" type="STRING" />
   <parameter name="pressure" numDims="1" type="INT" unit="mbar"/>
   <parameter name="size" numDims="1" type="INT" />
@@ -35,11 +34,11 @@
   <parameter name="isTropical" numDims="2" type="INT"/>
 
   <!-- 
-  	each radius will be stored as such: xxNE xxSE xxSW xxNW
+      each radius will be stored as such: xxNE xxSE xxSW xxNW
   -->
   <parameter name="radius64KT" numDims="2" type="INT" unit="mi" />
   <parameter name="radius50KT" numDims="2" type="INT" unit="mi" />
   <parameter name="radius34KT" numDims="2" type="INT" unit="mi" />
   <parameter name="radius12FT" numDims="2" type="INT" unit="mi" />
   
-</pointDataDescription>
\ No newline at end of file
+</pointDataDescription>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcsdb.xml b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcsdb.xml
index 070d23a722..f3afe00cb1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcsdb.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/res/pointdata/tcsdb.xml
@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <pointDataDbDescription>
-  <parameter name="dataURI" queryName="dataURI" type="STRING" />
-</pointDataDbDescription>
\ No newline at end of file
+  <parameter name="productType" queryName="productType" type="STRING" />
+</pointDataDbDescription>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TropicalCycloneSummaryDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TropicalCycloneSummaryDao.java
index 41e26e5e8d..c555dc0546 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TropicalCycloneSummaryDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/TropicalCycloneSummaryDao.java
@@ -19,74 +19,38 @@
  **/
 package com.raytheon.uf.edex.plugin.tcs;
 
-import java.util.List;
-
 import com.raytheon.uf.common.dataplugin.PluginException;
 import com.raytheon.uf.common.dataplugin.tcs.TropicalCycloneSummary;
-import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.pointdata.PointDataPluginDao;
+
 /**
  * 
+ * DAO for TropicalCycloneSummary (TCS)
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
+ * 
+ * Date         Ticket#    Engineer     Description
+ * ------------ ---------- -----------  --------------------------
  * Nov 12, 2009            jsanchez     Initial creation
- *
+ * Jan 27, 2016       5285 tgurney      Remove dead code
+ * 
  * </pre>
- *
+ * 
  * @author jsanchez
- * @version 1.0 
+ * @version 1.0
  */
-public class TropicalCycloneSummaryDao extends PointDataPluginDao<TropicalCycloneSummary> {
+public class TropicalCycloneSummaryDao extends
+        PointDataPluginDao<TropicalCycloneSummary> {
     /**
      * Creates a new TropicalCycloneSummaryDao
-     * @throws PluginException 
+     * 
+     * @throws PluginException
      */
     public TropicalCycloneSummaryDao(String pluginName) throws PluginException {
         super(pluginName);
     }
-    
-    /**
-     * Retrieves an tcs report using the datauri .
-     * 
-     * @param dataURI
-     *            The dataURI to match against.
-     * @return The report record if it exists.
-     */
-    public TropicalCycloneSummary queryByDataURI(String dataURI) {
-        TropicalCycloneSummary report = null;
-        List<?> obs = null;
-        try {
-            obs = queryBySingleCriteria("dataURI", dataURI);
-        } catch (DataAccessLayerException e) {
-            e.printStackTrace();
-        }
-        if ((obs != null) && (obs.size() > 0)) {
-            report = (TropicalCycloneSummary) obs.get(0);
-        }
-        return report;
-    }
-    /**
-     * Queries for to determine if a given data uri exists on the tcs table.
-     * 
-     * @param dataUri
-     *            The DataURI to find.
-     * @return An array of objects. If not null, there should only be a single
-     *         element.
-     */
-    public Object[] queryDataUriColumn(final String dataUri) {
-
-        String sql = "select datauri from awips.tcs where datauri='"
-                + dataUri + "';";
-
-        Object[] results = executeSQLQuery(sql);
-
-        return results;
-    }
 
     @Override
     public String[] getKeysRequiredForFileName() {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCMData.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCMData.java
index b7e91d1d73..8d96a24dfc 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCMData.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCMData.java
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
 
 import com.raytheon.uf.common.dataplugin.tcs.Radius;
 import com.raytheon.uf.common.dataplugin.tcs.TropicalCycloneSummary;
-import com.raytheon.uf.common.dataplugin.tcs.util.Util;
+import com.raytheon.uf.common.dataplugin.tcs.util.TcsUtil;
 import com.raytheon.uf.common.pointdata.PointDataDescription;
 import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
 import com.raytheon.uf.common.time.DataTime;
@@ -41,20 +41,25 @@ import com.raytheon.uf.common.wmo.WMOTimeParser;
 import com.raytheon.uf.edex.plugin.tcs.TropicalCycloneSummaryDao;
 
 /**
- * TODO Add Description
+ * Adapter for parsing a Tropical Cyclone Forecast/Advisory. TCM is the NNN of
+ * the AFOS PIL for Tropical Cyclone Forecast/Advisories. More information on
+ * the format of this product can be found at
+ * http://www.nhc.noaa.gov/aboutnhcprod.shtml#TCM.
  * 
  * <pre>
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Oct 20, 2010            jsanchez    Initial creation
- * Apr 19, 2012 457        dgilling    Use TimeTools.findDataTime()  to
- *                                     calculate times.
- * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
- * May 14, 2014 2536       bclement    moved WMO Header to common, removed TimeTools usage
- * Jul 23, 2014 3410       bclement    location changed to floats
+ * Date          Ticket#  Engineer  Description
+ * ------------- -------- --------- --------------------------------------------
+ * Oct 20, 2010           jsanchez  Initial creation
+ * Apr 19, 2012  457      dgilling  Use TimeTools.findDataTime()  to calculate
+ *                                  times.
+ * Aug 30, 2013  2298     rjpeter   Make getPluginName abstract
+ * May 14, 2014  2536     bclement  moved WMO Header to common, removed
+ *                                  TimeTools usage
+ * Jul 23, 2014  3410     bclement  location changed to floats
+ * Nov 30, 2015  5149     bsteffen  Rename TcsUtil, add class javadoc
  * 
  * </pre>
  * 
@@ -209,7 +214,7 @@ public class TCMData extends TCSDataAdapter {
             }
             String mask = line;
             // Searching for the wind radius
-            if (Util.isWindRadius(type, mask, radius)) {
+            if (TcsUtil.isWindRadius(type, mask, radius)) {
                 if ((radius.getKFUnit() != 'x') && (radius.getKT_FT() != -1)
                         && (radius.getNE() != -1) && (radius.getSE() != -1)
                         && (radius.getSW() != -1) && (radius.getNW() != -1)) {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCSDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCSDataAdapter.java
index d3b6202e68..8f3e27832e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCSDataAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.tcs/src/com/raytheon/uf/edex/plugin/tcs/decoder/TCSDataAdapter.java
@@ -146,7 +146,6 @@ public abstract class TCSDataAdapter implements TCSConstants {
                     headReport = report;
                     view = getContainer(report).append();
                     view.setString(WMO_HEADER, report.getWmoHeader());
-                    view.setString(TYPE, report.getProductType());
                     view.setString(NAME, report.getName());
                     view.setInt(PRESSURE, report.getPressure());
                 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/.classpath b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/.classpath
new file mode 100644
index 0000000000..098194ca4b
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/.project b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/.project
similarity index 91%
rename from edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/.project
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/.project
index 0f1bf36f7c..44449ebf83 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/.project
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.raytheon.uf.common.dataplugin.bufrquikscat</name>
+	<name>com.raytheon.uf.edex.plugin.text.dbsrv</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..7ed021fbb8
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Text Util Plug-in
+Bundle-SymbolicName: com.raytheon.uf.edex.plugin.text.dbsrv
+Bundle-Version: 1.16.0.qualifier
+Bundle-Vendor: RAYTHEON
+Require-Bundle: org.apache.commons.lang3;bundle-version="3.4.0",
+ org.slf4j;bundle-version="1.7.12",
+ com.raytheon.edex.common,
+ javax.persistence,
+ com.raytheon.uf.common.serialization.comm,
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.common.status,
+ com.raytheon.uf.common.site,
+ com.raytheon.uf.edex.archive,
+ com.raytheon.uf.edex.ndm,
+ com.raytheon.uf.common.localization;bundle-version="1.14.0",
+ com.raytheon.uf.edex.plugin.text,
+ com.raytheon.uf.common.dataplugin.text
+Export-Package: com.raytheon.uf.edex.plugin.text.dbsrv,
+ com.raytheon.uf.edex.plugin.text.dbsrv.impl,
+ com.raytheon.uf.edex.plugin.text.dbsrv.security
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package:  com.raytheon.uf.common.message,
+ com.raytheon.uf.common.wmo,
+ org.apache.commons.lang3
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/build.properties b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/build.properties
similarity index 79%
rename from edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/build.properties
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/build.properties
index 20a5272307..5791d48d5f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrquikscat/build.properties
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/build.properties
@@ -1,6 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
-               utility/,\
                .,\
                res/
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/res/spring/text-dbsrv-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/res/spring/text-dbsrv-common.xml
new file mode 100644
index 0000000000..bfef14c1ad
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/res/spring/text-dbsrv-common.xml
@@ -0,0 +1,19 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+    <bean id="textdbsrv" class="com.raytheon.uf.edex.plugin.text.dbsrv.TextDBSrv" />
+
+    <camelContext id="common-dbsrv-camel"
+                  xmlns="http://camel.apache.org/schema/spring"
+                  errorHandlerRef="errorHandler">
+
+        <route id="textdbsrvinternal">
+            <from uri="direct-vm:int.textdb.request" />
+            <bean ref="textdbsrv" method="processMessage" />
+        </route>
+
+    </camelContext>
+
+</beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/res/spring/text-dbsrv-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/res/spring/text-dbsrv-ingest.xml
new file mode 100644
index 0000000000..5756f4429f
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/res/spring/text-dbsrv-ingest.xml
@@ -0,0 +1,96 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+    <!-- Special handler for text plugin archives that bases filenames off
+         creation time-->
+    <bean id="textArchiveNamer" class="com.raytheon.uf.edex.plugin.text.dbsrv.maintenance.archiver.TextArchiveFileNameFormatter" />
+    <bean factory-bean="databaseArchiver" factory-method="registerPluginArchiveFormatter" depends-on="databaseArchiver">
+        <constructor-arg value="text" />
+        <constructor-arg ref="textArchiveNamer" />
+    </bean>
+
+    <bean factory-bean="databaseArchiver" factory-method="registerPluginBatchSize" depends-on="databaseArchiver">
+        <constructor-arg value="text" />
+        <constructor-arg value="1000" type="java.lang.Integer"/>
+    </bean>
+
+    <bean id="afosToAwipsListener" class="com.raytheon.uf.edex.plugin.text.dbsrv.ingest.AfosToAwipsListener" />
+    <bean id="afosBrowserListener" class="com.raytheon.uf.edex.plugin.text.dbsrv.ingest.AfosBrowserModelSubscriber" />
+
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="afos2awips.txt" />
+        <constructor-arg ref="afosToAwipsListener" />
+    </bean>
+
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="textCCChelp.txt" />
+        <constructor-arg ref="afosBrowserListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="textNNNhelp.txt" />
+        <constructor-arg ref="afosBrowserListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="textCategoryClass.txt" />
+        <constructor-arg ref="afosBrowserListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="textOriginTable.txt" />
+        <constructor-arg ref="afosBrowserListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="afosMasterPIL.txt" />
+        <constructor-arg ref="afosBrowserListener" />
+    </bean>
+
+    <!-- textdb -->
+    <bean id="textDBStaticDataListener" class="com.raytheon.uf.edex.plugin.text.dbsrv.ingest.TextDBStaticDataSubscriber">
+        <constructor-arg value="jms-generic:topic:textDBFilesChanged"/>
+    </bean>
+    <bean id="siteMapListener" class="com.raytheon.uf.edex.plugin.text.dbsrv.ingest.SiteMapNationalDatasetSubscriber" />
+
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="bit_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="collective_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="exclusionProductList.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="ispan_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="station_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="upair_table.dat" />
+        <constructor-arg ref="textDBStaticDataListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="afos_lookup_table.dat" />
+        <constructor-arg ref="siteMapListener" />
+    </bean>
+    <bean factory-bean="ndmProc" factory-method="registerListener">
+        <constructor-arg value="national_category_table.template" />
+        <constructor-arg ref="siteMapListener" />
+    </bean>
+
+    <camelContext id="clustered-text-dbsrv-camel"
+        xmlns="http://camel.apache.org/schema/spring"
+        errorHandlerRef="errorHandler">
+
+        <route id="textDBStaticSetDirty">
+            <from uri="jms-generic:topic:textDBFilesChanged"/>
+            <bean ref="textDBStaticDataListener" method="setDirty"/>
+        </route>
+    </camelContext>
+</beans>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/res/spring/text-dbsrv-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/res/spring/text-dbsrv-request.xml
new file mode 100644
index 0000000000..94538a3659
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/res/spring/text-dbsrv-request.xml
@@ -0,0 +1,82 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+     http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+    <bean id="getAfosIdHandler" class="com.raytheon.uf.edex.plugin.text.dbsrv.handler.GetAfosIdHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetAfosIdRequest"/>
+        <constructor-arg ref="getAfosIdHandler"/>
+    </bean>
+
+    <bean id="getPartialAfosIdHandler" class="com.raytheon.uf.edex.plugin.text.dbsrv.handler.GetPartialAfosIdHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetPartialAfosIdRequest"/>
+        <constructor-arg ref="getPartialAfosIdHandler"/>
+    </bean>
+
+    <bean id="getWmoIdHandler" class="com.raytheon.uf.edex.plugin.text.dbsrv.handler.GetWmoIdHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetWmoIdRequest"/>
+        <constructor-arg ref="getWmoIdHandler"/>
+    </bean>
+
+    <!-- textdb -->
+
+    <bean id="executeAfosCmdHandler" class="com.raytheon.uf.edex.plugin.text.dbsrv.handler.ExecuteAfosCmdHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteAfosCmdRequest"/>
+        <constructor-arg ref="executeAfosCmdHandler"/>
+    </bean>
+
+    <bean id="executeAwipsCmdHandler" class="com.raytheon.uf.edex.plugin.text.dbsrv.handler.ExecuteAwipsCmdHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteAwipsCmdRequest"/>
+        <constructor-arg ref="executeAwipsCmdHandler"/>
+    </bean>
+
+    <bean id="executeWmoCmdHandler" class="com.raytheon.uf.edex.plugin.text.dbsrv.handler.ExecuteWmoCmdHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteWmoCmdRequest"/>
+        <constructor-arg ref="executeWmoCmdHandler"/>
+    </bean>
+
+    <bean id="remoteRetrievalHandler" class="com.raytheon.uf.edex.plugin.text.dbsrv.handler.RemoteRetrievalHandler">
+        <property name="rrManager" ref="remoteRetrievalManager" />
+    </bean>
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest"/>
+        <constructor-arg ref="remoteRetrievalHandler"/>
+    </bean>
+
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.dbsrv.TextDBRequest"/>
+        <constructor-arg>
+            <bean class="com.raytheon.uf.edex.plugin.text.dbsrv.TextDBRequestHandler">
+                <constructor-arg ref="textdbsrv" />
+            </bean>
+        </constructor-arg>
+    </bean>
+
+    <bean id="remoteRetrievalManager" class="com.raytheon.uf.edex.plugin.text.dbsrv.handler.RemoteRetrievalManager">
+        <property name="rrDelegate" ref="textdbRemoteRetrievalTarget" />
+    </bean>
+
+    <camelContext id="textdbsrv-request-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
+
+        <proxy id="textdbRemoteRetrievalTarget"
+            serviceInterface="com.raytheon.uf.edex.plugin.text.dbsrv.handler.RemoteRetrievalManager$IRRDelegate"
+            serviceUrl="direct-vm:remoteRetrievalExternalRoute" />
+
+        <route id="remoteRetrievalExternal">
+            <from uri="direct-vm:remoteRetrievalExternalRoute" />
+            <!-- Convert from BeanInvocation if needed. -->
+            <convertBodyTo type="com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest" />
+            <bean ref="serializationUtil" method="transformToThrift" />
+            <to uri="jms-mhs:queue:fxa.mhs.request?requestTimeout=122000" pattern="InOut" />
+            <bean ref="serializationUtil" method="transformFromThrift" />
+        </route>
+
+    </camelContext>
+
+</beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBRequestHandler.java
similarity index 89%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBRequestHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBRequestHandler.java
index b978873105..ec289716c6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBRequestHandler.java
@@ -32,14 +32,15 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 18, 2014 2926       bclement     Initial creation
+ * Jan 18, 2016 4562       tjensen      Moved from edex.plugin.text to 
+ *                                      edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
  * @author bclement
  * @version 1.0
  */
-public class TextDBRequestHandler implements
-        IRequestHandler<TextDBRequest> {
+public class TextDBRequestHandler implements IRequestHandler<TextDBRequest> {
 
     private final TextDBSrv textdbSrv;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBSrv.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBSrv.java
similarity index 96%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBSrv.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBSrv.java
index 2b7dc8f724..2e5f15962b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBSrv.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/TextDBSrv.java
@@ -35,6 +35,8 @@ import com.raytheon.uf.edex.plugin.text.dbsrv.impl.CommandExecutor;
  * Oct 03, 2008 1538       jkorman     Initial implementation.
  * Mar 26, 2014 2835       rjpeter     Added logging.
  * May 15, 2014 2536       bclement    moved from uf.edex.textdbsrv
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * </pre>
  * 
  * @author jkorman
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAfosCmdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/ExecuteAfosCmdHandler.java
similarity index 91%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAfosCmdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/ExecuteAfosCmdHandler.java
index 1025f11e73..df891e3729 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAfosCmdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/ExecuteAfosCmdHandler.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.dbsrv.handler;
 
 import com.raytheon.uf.common.dataplugin.text.StdTextProductContainer;
 import com.raytheon.uf.common.dataplugin.text.request.ExecuteAfosCmdRequest;
@@ -36,6 +36,8 @@ import com.raytheon.uf.edex.plugin.text.db.TextDB;
  * Apri 14, 2010 4734      mhuang      Returned StdTextProductContainer object
  * May 23, 2012  14952     rferrel     Added refTime.
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * </pre>
  * 
  * @author njensen
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAwipsCmdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/ExecuteAwipsCmdHandler.java
similarity index 90%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAwipsCmdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/ExecuteAwipsCmdHandler.java
index c445d21b16..1be05b44bd 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteAwipsCmdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/ExecuteAwipsCmdHandler.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.dbsrv.handler;
 
 import java.util.List;
 
@@ -35,8 +35,10 @@ import com.raytheon.uf.edex.plugin.text.db.TextDB;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Aug 4, 2011            rferrel     Initial creation
+ * Aug 4, 2011             rferrel     Initial creation
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteWmoCmdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/ExecuteWmoCmdHandler.java
similarity index 82%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteWmoCmdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/ExecuteWmoCmdHandler.java
index b3fa201672..dce4aa648d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/ExecuteWmoCmdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/ExecuteWmoCmdHandler.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.dbsrv.handler;
 
 import java.util.List;
 
@@ -35,18 +35,22 @@ import com.raytheon.uf.edex.plugin.text.db.TextDB;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Aug 5, 2011            rferrel      Initial creation
+ * Aug 5, 2011             rferrel     Initial creation
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
  * @author rferrel
  * @version 1.0
  */
-public class ExecuteWmoCmdHandler implements IRequestHandler<ExecuteAwipsCmdRequest> {
+public class ExecuteWmoCmdHandler implements
+        IRequestHandler<ExecuteAwipsCmdRequest> {
 
     @Override
-    public Object handleRequest(ExecuteAwipsCmdRequest request) throws Exception {
+    public Object handleRequest(ExecuteAwipsCmdRequest request)
+            throws Exception {
         String wmoId = request.getWmoId();
         String site = request.getSite();
         String abbrId = request.getNnnXxx();
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAfosIdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/GetAfosIdHandler.java
similarity index 77%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAfosIdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/GetAfosIdHandler.java
index 9deeae8d06..2dcb1f31a0 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAfosIdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/GetAfosIdHandler.java
@@ -17,10 +17,10 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.dbsrv.handler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.request.GetAfosIdRequest;
@@ -28,7 +28,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 /**
- * TODO Add Description
+ * Request handler for GetAfosIdRequests. Forwards request to AfosToAwipsDao.
  * 
  * <pre>
  * 
@@ -36,6 +36,9 @@ import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 24, 2009 2924       rjpeter     Initial creation
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
@@ -45,7 +48,8 @@ import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 public class GetAfosIdHandler implements IRequestHandler<GetAfosIdRequest> {
 
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     @Override
     public AfosWmoIdDataContainer handleRequest(GetAfosIdRequest request)
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetPartialAfosIdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/GetPartialAfosIdHandler.java
similarity index 76%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetPartialAfosIdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/GetPartialAfosIdHandler.java
index a162185cc1..df43241491 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetPartialAfosIdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/GetPartialAfosIdHandler.java
@@ -17,10 +17,10 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.dbsrv.handler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.request.GetPartialAfosIdRequest;
@@ -28,7 +28,8 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 /**
- * TODO Add Description
+ * Request handler for GetPartialAfosIdRequests. Forwards request to
+ * AfosToAwipsDao.
  * 
  * <pre>
  * 
@@ -36,6 +37,9 @@ import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 19, 2009            avarani     Initial creation
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
@@ -46,14 +50,15 @@ import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 public class GetPartialAfosIdHandler implements
         IRequestHandler<GetPartialAfosIdRequest> {
 
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     @Override
     public AfosWmoIdDataContainer handleRequest(GetPartialAfosIdRequest request)
             throws Exception {
         AfosToAwipsDao dao = new AfosToAwipsDao();
         // TODO add exception logic
-        return dao.lookupAfosId(request.getCccc(), request.getNnn(), request
-                .getXxx());
+        return dao.lookupAfosId(request.getCccc(), request.getNnn(),
+                request.getXxx());
     }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetWmoIdHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/GetWmoIdHandler.java
similarity index 77%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetWmoIdHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/GetWmoIdHandler.java
index d63fbedf09..1c5fe4ab1a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetWmoIdHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/GetWmoIdHandler.java
@@ -17,10 +17,10 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.dbsrv.handler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.request.GetWmoIdRequest;
@@ -28,7 +28,7 @@ import com.raytheon.uf.common.serialization.comm.IRequestHandler;
 import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 /**
- * TODO Add Description
+ * Request handler for GetWmoIdHandlers. Forwards request to AfosToAwipsDao.
  * 
  * <pre>
  * 
@@ -36,6 +36,9 @@ import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Aug 24, 2009 2924       rjpeter     Initial creation
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
@@ -45,7 +48,8 @@ import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 
 public class GetWmoIdHandler implements IRequestHandler<GetWmoIdRequest> {
 
-    protected final transient Log logger = LogFactory.getLog(getClass());
+    protected final transient Logger logger = LoggerFactory
+            .getLogger(getClass());
 
     @Override
     public AfosWmoIdDataContainer handleRequest(GetWmoIdRequest request)
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/RemoteRetrievalHandler.java
similarity index 83%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/RemoteRetrievalHandler.java
index 749b753c73..aa68777ab6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/RemoteRetrievalHandler.java
@@ -17,11 +17,11 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.dbsrv.handler;
 
 import com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
-import com.raytheon.uf.edex.plugin.text.handler.RemoteRetrievalManager.RRJob;
+import com.raytheon.uf.edex.plugin.text.dbsrv.handler.RemoteRetrievalManager.RRJob;
 
 /**
  * Request handler for RemoteRetrievalRequests. Forwards request to
@@ -35,16 +35,18 @@ import com.raytheon.uf.edex.plugin.text.handler.RemoteRetrievalManager.RRJob;
  * ------------ ---------- ----------- --------------------------
  * ???                                 Initial creation
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
  * @version 1.0
  */
 public class RemoteRetrievalHandler implements
-    IRequestHandler<RemoteRetrievalRequest> {
+        IRequestHandler<RemoteRetrievalRequest> {
 
     private RemoteRetrievalManager rrManager;
-    
+
     @Override
     public Object handleRequest(RemoteRetrievalRequest request)
             throws Exception {
@@ -60,7 +62,8 @@ public class RemoteRetrievalHandler implements
     }
 
     /**
-     * @param rrManager the rrManager to set
+     * @param rrManager
+     *            the rrManager to set
      */
     public void setRrManager(RemoteRetrievalManager rrManager) {
         this.rrManager = rrManager;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalManager.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/RemoteRetrievalManager.java
similarity index 88%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalManager.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/RemoteRetrievalManager.java
index 07a8ef25c0..8ef2965572 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/RemoteRetrievalManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/handler/RemoteRetrievalManager.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.dbsrv.handler;
 
 import java.util.HashMap;
 
@@ -38,6 +38,8 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * ------------ ---------- ----------- --------------------------
  * ???                                 Initial creation
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
@@ -45,17 +47,19 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  */
 public class RemoteRetrievalManager {
     public interface IRRDelegate {
-        RemoteRetrievalResponse retrieve(RemoteRetrievalRequest req) throws Exception;
+        RemoteRetrievalResponse retrieve(RemoteRetrievalRequest req)
+                throws Exception;
     }
-    
+
     private static final transient IUFStatusHandler statusHandler = UFStatus
-        .getHandler(RemoteRetrievalManager.class);
+            .getHandler(RemoteRetrievalManager.class);
 
     private String remoteRetrievalExternalURI;
+
     private HashMap<String, RRJob> jobs = new HashMap<String, RRJob>(4);
-    
+
     public IRRDelegate rrDelegate;
-    
+
     public RRJob submitRequest(RemoteRetrievalRequest req) {
         RRJob job;
         synchronized (jobs) {
@@ -65,28 +69,29 @@ public class RemoteRetrievalManager {
             job = new RRJob(req);
             jobs.put(req.getMatchKey(), job);
         }
-        
+
         if (rrDelegate != null) {
             try {
                 job.setResponse(rrDelegate.retrieve(req));
             } catch (Exception e) {
                 statusHandler.handle(Priority.SIGNIFICANT,
                         "Remote retrieval request failed", e);
-                job.setResponse(new RemoteRetrievalResponse(false, 
+                job.setResponse(new RemoteRetrievalResponse(false,
                         "Product Request Status", e.getMessage()));
             }
             synchronized (jobs) {
                 jobs.remove(req.getMatchKey());
             }
         }
-        
+
         return job;
     }
-    
+
     class RRJob {
         RemoteRetrievalRequest request;
+
         RemoteRetrievalResponse response;
-        
+
         public RRJob(RemoteRetrievalRequest request) {
             this.request = request;
         }
@@ -101,14 +106,15 @@ public class RemoteRetrievalManager {
         public RemoteRetrievalResponse getResponse() {
             return response;
         }
-        
-        public synchronized RemoteRetrievalResponse waitResponse() throws InterruptedException {
+
+        public synchronized RemoteRetrievalResponse waitResponse()
+                throws InterruptedException {
             while (response == null) {
                 wait();
             }
             return response;
         }
-        
+
     }
 
     /**
@@ -119,7 +125,8 @@ public class RemoteRetrievalManager {
     }
 
     /**
-     * @param remoteRetrievalExternalURI the remoteRetrievalExternalURI to set
+     * @param remoteRetrievalExternalURI
+     *            the remoteRetrievalExternalURI to set
      */
     public void setRemoteRetrievalExternalURI(String remoteRetrievalExternalURI) {
         this.remoteRetrievalExternalURI = remoteRetrievalExternalURI;
@@ -133,7 +140,8 @@ public class RemoteRetrievalManager {
     }
 
     /**
-     * @param rrDelegate the rrDelegate to set
+     * @param rrDelegate
+     *            the rrDelegate to set
      */
     public void setRrDelegate(IRRDelegate rrDelegate) {
         this.rrDelegate = rrDelegate;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/CommandExecutor.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/CommandExecutor.java
similarity index 94%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/CommandExecutor.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/CommandExecutor.java
index db2723e223..07138f9eaa 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/CommandExecutor.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/CommandExecutor.java
@@ -19,7 +19,6 @@
  **/
 package com.raytheon.uf.edex.plugin.text.dbsrv.impl;
 
-
 import java.util.HashMap;
 import java.util.Map;
 
@@ -38,9 +37,12 @@ import com.raytheon.uf.common.message.Property;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 7, 2008        1538 jkorman     Initial creation
+ * Oct 7, 2008  1538       jkorman     Initial creation
  * May 15, 2014 2536       bclement    moved from uf.edex.textdbsrv, removed unused logger
  * Aug 22, 2014 2926       bclement    compatibility changes with new textdb service
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
+ * Feb 05, 2016 5269       skorolev    Removed WarnTableAdapter from execMap
  * 
  * </pre>
  * 
@@ -65,7 +67,6 @@ public class CommandExecutor implements ICommandExecutor {
      */
     public CommandExecutor() {
         execMap.put(StateTableAdapter.getViewTag(), new StateTableAdapter());
-        execMap.put(WarnTableAdapter.getViewTag(), new WarnTableAdapter());
         execMap.put(VersionsAdapter.getViewTag(), new VersionsAdapter());
         execMap.put(TextViewAdapter.getViewTag(), new TextViewAdapter());
     }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java
similarity index 96%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java
index 2b72c98533..52d00675ef 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/StateTableAdapter.java
@@ -19,7 +19,6 @@
  **/
 package com.raytheon.uf.edex.plugin.text.dbsrv.impl;
 
-
 import java.util.List;
 
 import com.raytheon.uf.common.dataplugin.text.db.StateMatch;
@@ -42,6 +41,8 @@ import com.raytheon.uf.edex.plugin.text.db.TextDB;
  * Aug 31, 2010 2103       cjeanbap    Check variable for null.
  * May 15, 2014 2536       bclement    moved from uf.edex.textdbsrv
  * Aug 22, 2014 2926       bclement    compatibility changes with new textdb service
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
@@ -121,8 +122,8 @@ public class StateTableAdapter implements ICommandExecutor {
             default: {
                 String tagName = (opTag != null) ? opTag.name() : "null";
                 Property[] props = new Property[] { new Property(
-                        CommandExecutor.STDERR,
-                        "ERROR:Invalid command tag = [" + tagName + "]"), };
+                        CommandExecutor.STDERR, "ERROR:Invalid command tag = ["
+                                + tagName + "]"), };
                 sHeader.setProperties(props);
                 break;
             }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java
similarity index 91%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java
index 388bb7acc9..dadaf9795a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/TextViewAdapter.java
@@ -19,7 +19,6 @@
  **/
 package com.raytheon.uf.edex.plugin.text.dbsrv.impl;
 
-
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
@@ -30,8 +29,8 @@ import java.util.List;
 
 import javax.xml.bind.JAXBException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.ICommandExecutor;
@@ -47,8 +46,8 @@ import com.raytheon.uf.common.serialization.SerializationException;
 import com.raytheon.uf.common.serialization.SerializationUtil;
 import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.time.util.TimeUtil;
-import com.raytheon.uf.edex.core.EDEXUtil;
-import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.AlarmAlertUtil;
+import com.raytheon.uf.edex.plugin.text.TextDecoder;
 import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 /**
@@ -59,7 +58,7 @@ import com.raytheon.uf.edex.plugin.text.db.TextDB;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 14, 2008       1538 jkorman     Initial creation
+ * Oct 14, 2008 1538       jkorman     Initial creation
  * 30Sep2009    3076       MW Fegan    Notify script runner on inserts.
  * 15Feb2010    4426       MW Fegan    correct data parsing problem.
  * Apr 14, 2010 4734       mhuang      Corrected StdTextProduct import 
@@ -74,6 +73,10 @@ import com.raytheon.uf.edex.plugin.text.db.TextDB;
  * May 15, 2014 2536       bclement    moved from uf.edex.textdbsrv, added marshalToStream()
  * Jul 15, 2014 3373       bclement    jaxb manager api changes
  * Aug 22, 2014 2926       bclement    compatibility changes with new textdb service
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
+ * 
  * 
  * </pre>
  * 
@@ -83,20 +86,20 @@ import com.raytheon.uf.edex.plugin.text.db.TextDB;
 
 public class TextViewAdapter implements ICommandExecutor {
 
-    // This is the default textdb formatted time.
-    // Oct 31 08 10:13:15 GMT
-    private static final String DEFAULT_TIME_FORMAT = "%1$tb %1$td %1$ty %1$tT GMT";
-
     /**
-     * defines the direct VM queue to use for notifications
+     * This is the default textdb formatted time.
+     * 
+     * <pre>
+     * Oct 31 08 10:13:15 GMT
+     * </pre>
      */
-    private static final String WATCH_WARN_QUEUE = "ldadWatchWarnDirect";
+    private static final String DEFAULT_TIME_FORMAT = "%1$tb %1$td %1$ty %1$tT GMT";
 
     private static final String FALSE = "FALSE";
 
     private static final String UNKNOWN_SITE = "Unable to locate site from National Category list!";
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private TextDB textDB;
 
@@ -149,16 +152,15 @@ public class TextViewAdapter implements ICommandExecutor {
             }
             case DELETE: {
                 Property[] props = new Property[] { new Property(
-                        CommandExecutor.STDERR,
-                        "ERROR:Command tag = [" + opTag.name()
-                                + "] not implemented"), };
+                        CommandExecutor.STDERR, "ERROR:Command tag = ["
+                                + opTag.name() + "] not implemented"), };
                 sHeader.setProperties(props);
                 break;
             }
             default: {
                 Property[] props = new Property[] { new Property(
-                        CommandExecutor.STDERR,
-                        "ERROR:Invalid command tag = [" + op + "]"), };
+                        CommandExecutor.STDERR, "ERROR:Invalid command tag = ["
+                                + op + "]"), };
                 sHeader.setProperties(props);
                 break;
             }
@@ -191,7 +193,7 @@ public class TextViewAdapter implements ICommandExecutor {
         long insertTime = textDB.writeProduct(prodId, product, operationalMode,
                 null);
         if (operationalMode && insertTime != Long.MIN_VALUE) {
-            sendTextToQueue(prodId, WATCH_WARN_QUEUE);
+            TextDecoder.sendTextToQueue(prodId);
         }
 
         if (insertTime != Long.MIN_VALUE) {
@@ -199,8 +201,7 @@ public class TextViewAdapter implements ICommandExecutor {
             d.setTime(insertTime);
             AlarmAlertUtil.sendProductAlarmAlert(prodId, d, operationalMode);
             Property[] props = new Property[] { new Property(
-                    CommandExecutor.STDERR,
-                    "NORMAL:Saved " + prodId), };
+                    CommandExecutor.STDERR, "NORMAL:Saved " + prodId), };
             msgHeader.setProperties(props);
         } else {
             Property[] props = new Property[] { new Property(
@@ -264,7 +265,7 @@ public class TextViewAdapter implements ICommandExecutor {
                         operationalMode);
                 // sort the list first...
                 Collections.sort(times);
-                
+
                 Property[] msgProps = new Property[times.size()];
                 int pIndex = 0;
                 for (Long t : times) {
@@ -413,8 +414,7 @@ public class TextViewAdapter implements ICommandExecutor {
                             header.append(nnnId);
                             header.append(xxxId);
                             prodList.add(new Property(CommandExecutor.STDOUT,
-                                    header
-                                    .toString()));
+                                    header.toString()));
                         }
                     }
                 } catch (SerializationException e) {
@@ -498,24 +498,6 @@ public class TextViewAdapter implements ICommandExecutor {
         return formattedTime;
     }
 
-    /**
-     * Sends an asynchronous message to the specified queue. This is basically a
-     * wrapper of the utility method that handles/logs any errors.
-     * 
-     * @param message
-     *            the message to send
-     * @param queue
-     *            the queue to receive the message
-     */
-    private void sendTextToQueue(String message, String queue) {
-        try {
-            EDEXUtil.getMessageProducer().sendAsync(queue, message);
-        } catch (EdexException e) {
-            logger.warn("Unable to send product '" + message + "' to queue '"
-                    + queue + "'", e);
-        }
-    }
-
     private boolean isOperationalMode(String operationalName) {
         boolean result = true;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java
similarity index 93%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java
index 81a7139ed0..c7c164afee 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/VersionsAdapter.java
@@ -19,7 +19,6 @@
  **/
 package com.raytheon.uf.edex.plugin.text.dbsrv.impl;
 
-
 import com.raytheon.uf.common.dataplugin.text.dbsrv.ICommandExecutor;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.TextDBSrvCommandTags;
 import com.raytheon.uf.common.dataplugin.text.dbsrv.VersionsTableTags;
@@ -37,9 +36,11 @@ import com.raytheon.uf.edex.plugin.text.db.TextDB;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Oct 8, 2008        1538 jkorman     Initial creation
+ * Oct 8, 2008  1538       jkorman     Initial creation
  * May 15, 2014 2536       bclement    moved from uf.edex.textdbsrv
  * Aug 22, 2014 2926       bclement    compatibility changes with new textdb service
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
@@ -92,7 +93,8 @@ public class VersionsAdapter implements ICommandExecutor {
                 switch (opTag) {
 
                 case PUT: {
-                    String versions = sHeader.getProperty(VersionsTableTags.VERSION.name());
+                    String versions = sHeader
+                            .getProperty(VersionsTableTags.VERSION.name());
 
                     addVersionInfo(sHeader, prodId.getCcc(), prodId.getNnn(),
                             prodId.getXxx(), versions);
@@ -185,8 +187,8 @@ public class VersionsAdapter implements ICommandExecutor {
                 "NORMAL:Deleting product id " + ccc + nnn + xxx
                         + " from versionstable.");
         Property errProperty = new Property(CommandExecutor.STDERR,
-                "ERROR:Failure deleting "
-                + ccc + nnn + xxx + " from versionstable.");
+                "ERROR:Failure deleting " + ccc + nnn + xxx
+                        + " from versionstable.");
 
         Property[] props = new Property[] { newProperty, };
         if (!textDB.deleteVersions(ccc, nnn, xxx)) {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosBrowserModelSubscriber.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/AfosBrowserModelSubscriber.java
similarity index 96%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosBrowserModelSubscriber.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/AfosBrowserModelSubscriber.java
index 8a3d82b5c0..dad6be689a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosBrowserModelSubscriber.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/AfosBrowserModelSubscriber.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.ingest;
+package com.raytheon.uf.edex.plugin.text.dbsrv.ingest;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -49,7 +49,9 @@ import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jan 12, 2011            bfarmer     Initial creation
- * Mar 06, 2014   2876     mpduff      New NDM plugin.
+ * Mar 06, 2014 2876       mpduff      New NDM plugin.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosToAwipsListener.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/AfosToAwipsListener.java
similarity index 94%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosToAwipsListener.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/AfosToAwipsListener.java
index cbeebab918..f7f08e16a9 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/AfosToAwipsListener.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/AfosToAwipsListener.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.ingest;
+package com.raytheon.uf.edex.plugin.text.dbsrv.ingest;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -28,7 +28,7 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.db.AfosToAwips;
@@ -50,7 +50,9 @@ import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jan 11, 2011            bfarmer     Initial creation
- * Mar 06, 2014   2876     mpduff      New NDM plugin.
+ * Mar 06, 2014 2876       mpduff      New NDM plugin.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/SiteMapNationalDatasetSubscriber.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/SiteMapNationalDatasetSubscriber.java
similarity index 95%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/SiteMapNationalDatasetSubscriber.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/SiteMapNationalDatasetSubscriber.java
index a746b070d6..c9e85fb91c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/SiteMapNationalDatasetSubscriber.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/SiteMapNationalDatasetSubscriber.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.ingest;
+package com.raytheon.uf.edex.plugin.text.dbsrv.ingest;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -50,8 +50,10 @@ import com.raytheon.uf.edex.ndm.ingest.INationalDatasetSubscriber;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jan 06, 2011            bfarmer     Initial creation
- * Mar 06, 2014   2876     mpduff      New NDM plugin.
+ * Mar 06, 2014 2876       mpduff      New NDM plugin.
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/TextDBStaticDataSubscriber.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/TextDBStaticDataSubscriber.java
similarity index 82%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/TextDBStaticDataSubscriber.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/TextDBStaticDataSubscriber.java
index 8e1fb81c36..9be79b9b51 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/ingest/TextDBStaticDataSubscriber.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/ingest/TextDBStaticDataSubscriber.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.ingest;
+package com.raytheon.uf.edex.plugin.text.dbsrv.ingest;
 
 import java.io.File;
 import java.io.IOException;
@@ -46,10 +46,12 @@ import com.raytheon.uf.edex.plugin.text.impl.TextDBStaticData;
  * ------------ ---------- ----------- --------------------------
  * Jan 25, 2011            bfarmer     Initial creation
  * Oct 18, 2011 10909      rferrel     notify() now saves a file.
- * Mar 06, 2014   2876     mpduff      New NDM plugin.
+ * Mar 06, 2014 2876       mpduff      New NDM plugin.
  * Mar 17, 2014 DR 16449   D. Friedman Send 'setDirty' notification to all nodes.
- * Mar 20, 2014   2915     dgilling    Code cleanup.
+ * Mar 20, 2014 2915       dgilling    Code cleanup.
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
@@ -78,21 +80,24 @@ public class TextDBStaticDataSubscriber implements INationalDatasetSubscriber {
 
         try {
             FileUtil.copyFile(file, outFile);
-        try {
-            if (setDirtyURI != null) {
-                EDEXUtil.getMessageProducer().sendAsyncUri(setDirtyURI, "");
-            } else {
-                setDirty();
+            try {
+                if (setDirtyURI != null) {
+                    EDEXUtil.getMessageProducer().sendAsyncUri(setDirtyURI, "");
+                } else {
+                    setDirty();
+                }
+            } catch (EdexException e) {
+                statusHandler
+                        .error("Unable to notify that TextDB static files have changes",
+                                e);
             }
-        } catch (EdexException e) {
-            statusHandler.error("Unable to notify that TextDB static files have changes", e);
-        }
         } catch (IOException e) {
             statusHandler.error("Unable to copy textdb static data file ["
                     + file.getPath() + "] to destination [" + outFile.getPath()
                     + "].", e);
         }
     }
+
     public void setDirty() {
         TextDBStaticData.setDirty();
     }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/maintenance/archiver/TextArchiveFileNameFormatter.java
similarity index 93%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/maintenance/archiver/TextArchiveFileNameFormatter.java
index 1a164b52b0..fbee59969a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/maintenance/archiver/TextArchiveFileNameFormatter.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/maintenance/archiver/TextArchiveFileNameFormatter.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.maintenance.archiver;
+package com.raytheon.uf.edex.plugin.text.dbsrv.maintenance.archiver;
 
 import java.util.Date;
 
@@ -41,6 +41,8 @@ import com.raytheon.uf.edex.database.plugin.PluginDao;
  * Apr 20, 2012            dgilling    Initial creation
  * Nov 05, 2013 2499       rjpeter     Moved IPluginArchiveFileNameFormatter.
  * Dec 13, 2013 2555       rjpeter     Refactored.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * </pre>
  * 
  * @author dgilling
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/security/EnvPathWhiteList.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/security/EnvPathWhiteList.java
similarity index 97%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/security/EnvPathWhiteList.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/security/EnvPathWhiteList.java
index 7063a719a9..e38cdf0e85 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/security/EnvPathWhiteList.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/security/EnvPathWhiteList.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.security;
+package com.raytheon.uf.edex.plugin.text.dbsrv.security;
 
 import java.io.File;
 import java.nio.file.InvalidPathException;
@@ -49,6 +49,8 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jun 3, 2015  4492       rferrel     Initial creation
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/security/EnvironmentCfg.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/security/EnvironmentCfg.java
similarity index 90%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/security/EnvironmentCfg.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/security/EnvironmentCfg.java
index 1ae63d0d8a..370ff1dc91 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/security/EnvironmentCfg.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/security/EnvironmentCfg.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.security;
+package com.raytheon.uf.edex.plugin.text.dbsrv.security;
 
 import java.util.List;
 
@@ -36,6 +36,8 @@ import javax.xml.bind.annotation.XmlElement;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jun 03, 2015 4492       rferrel     Initial creation
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/security/EnvironmentWrapCfg.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/security/EnvironmentWrapCfg.java
similarity index 89%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/security/EnvironmentWrapCfg.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/security/EnvironmentWrapCfg.java
index 4032e8b862..df7406a95a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/security/EnvironmentWrapCfg.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.dbsrv/src/com/raytheon/uf/edex/plugin/text/dbsrv/security/EnvironmentWrapCfg.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.security;
+package com.raytheon.uf.edex.plugin.text.dbsrv.security;
 
 import java.util.List;
 
@@ -36,6 +36,8 @@ import javax.xml.bind.annotation.XmlRootElement;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jun 03, 2015 4492       rferrel     Initial creation
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.dbsrv
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/.classpath b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/.classpath
new file mode 100644
index 0000000000..098194ca4b
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/.project b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/.project
new file mode 100644
index 0000000000..c7edfedad8
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.raytheon.uf.edex.plugin.text.subscription</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..ed03415cfe
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/META-INF/MANIFEST.MF
@@ -0,0 +1,26 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Subscription
+Bundle-SymbolicName: com.raytheon.uf.edex.plugin.text.subscription
+Bundle-Version: 1.16.0.qualifier
+Bundle-Vendor: RAYTHEON
+Require-Bundle: org.apache.commons.lang3;bundle-version="3.4.0",
+ org.slf4j;bundle-version="1.7.12",
+ com.raytheon.edex.common,
+ javax.persistence,
+ com.raytheon.uf.common.serialization.comm,
+ com.raytheon.uf.edex.decodertools,
+ com.raytheon.uf.common.status,
+ com.raytheon.uf.common.site,
+ com.raytheon.uf.edex.archive,
+ com.raytheon.uf.edex.ndm,
+ com.raytheon.uf.common.localization;bundle-version="1.14.0",
+ com.raytheon.uf.edex.plugin.text,
+ com.raytheon.uf.edex.plugin.text.dbsrv,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.dataplugin.text,
+ com.raytheon.uf.common.dataplugin.text.subscription
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Import-Package: com.raytheon.uf.common.message,
+ org.quartz
+Export-Package: com.raytheon.uf.edex.plugin.text.subscription.fax
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/build.properties b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/build.properties
new file mode 100644
index 0000000000..73974cda80
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/build.properties
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               res/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-common.xml
new file mode 100644
index 0000000000..a8dd7774cf
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-common.xml
@@ -0,0 +1,57 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+    <bean id="autoFaxDao" class="com.raytheon.uf.edex.plugin.text.subscription.fax.AutoFaxDao">
+       <property name="autoFaxNotifyURI" value="jms-generic:topic:autofax.notify"/>
+    </bean>
+
+    <!-- define the bean that handles watch/warn script handling -->
+    <bean id="textScriptRunner" class="com.raytheon.uf.edex.plugin.text.subscription.services.ScriptRunner">
+        <property name="type" value="ldad" />
+    </bean>
+
+    <bean id="subscriptionDao" class="com.raytheon.uf.edex.plugin.text.subscription.dao.SubscriptionDAO">
+       <property name="subscriptionNotifyURI" value="jms-generic:topic:subscription.notify"/>
+    </bean>
+
+    <camelContext id="common-subscription-camel"
+                  xmlns="http://camel.apache.org/schema/spring"
+                  errorHandlerRef="errorHandler">
+        <!-- Watch/Warn triggered script runner, internal use only -->
+        <route id="watchWarnDirect">
+           <from uri="direct-vm:watchWarnDirect"/>
+           <doTry>
+               <bean ref="textScriptRunner" method="runScripts" />
+               <doCatch>
+                    <exception>java.lang.Throwable</exception>
+                    <to uri="log:subscription?level=ERROR"/>
+               </doCatch>
+           </doTry>
+        </route>
+
+        <route id="autoFaxNotify">
+           <from uri="jms-generic:topic:autofax.notify"/>
+           <doTry>
+               <bean ref="autoFaxDao" method="updateCache" />
+               <doCatch>
+                    <exception>java.lang.Throwable</exception>
+                    <to uri="log:autoFax?level=ERROR"/>
+               </doCatch>
+           </doTry>
+        </route>
+
+        <route id="subscriptionNotify">
+           <from uri="jms-generic:topic:subscription.notify"/>
+           <doTry>
+               <bean ref="subscriptionDao" method="updateCache" />
+               <doCatch>
+                    <exception>java.lang.Throwable</exception>
+                    <to uri="log:subscription?level=ERROR"/>
+               </doCatch>
+           </doTry>
+        </route>
+
+    </camelContext>
+</beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-ingest.xml
new file mode 100644
index 0000000000..0bec0485f2
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-ingest.xml
@@ -0,0 +1,62 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+
+    <!-- define the bean that handles automatic faxing of products. -->
+    <bean id="autoFaxManager" class="com.raytheon.uf.edex.plugin.text.subscription.AutoFaxManager">
+    </bean>
+
+    <!-- define the bean that handles Quartz scheduled script running -->
+    <bean id="timerScriptRunner" class="com.raytheon.uf.edex.plugin.text.subscription.services.ScriptRunner" >
+        <property name="type" value="timer" />
+    </bean>
+
+    <camelContext id="text-subscription-camel"
+        xmlns="http://camel.apache.org/schema/spring"
+        errorHandlerRef="errorHandler">
+
+        <!-- AutoFax route -->
+        <route id="autoFaxRoute">
+            <from uri="vm:autoFaxRoute" />
+            <doTry>
+                <bean ref="autoFaxManager" method="processEvent" />
+                <doCatch>
+                    <exception>java.lang.Throwable</exception>
+                    <to uri="log:autoFax?level=ERROR"/>
+                </doCatch>
+            </doTry>
+        </route>
+
+        <!-- Quartz Timer triggered script runner -->
+        <route id="runnerScheduled">
+            <from uri="runnerCron" />
+            <doTry>
+                <bean ref="timerScriptRunner" method="runScripts" />
+                <doCatch>
+                    <exception>java.lang.Throwable</exception>
+                    <to uri="log:subscription?level=ERROR"/>
+                </doCatch>
+            </doTry>
+        </route>
+
+        <route id="textToWatchWarnRoute">
+            <from uri="direct-vm:textToWatchWarn" />
+            <bean ref="textDecoder" method="transformToProductIds" />
+            <to uri="jms-durable:queue:watchwarn" />
+        </route>
+
+        <!-- Watch/Warn triggered script runner -->
+        <route id="watchWarn">
+           <from uri="jms-durable:queue:watchwarn"/>
+           <doTry>
+               <bean ref="textScriptRunner" method="runScripts" />
+               <doCatch>
+                    <exception>java.lang.Throwable</exception>
+                    <to uri="log:subscription?level=ERROR"/>
+               </doCatch>
+           </doTry>
+        </route>
+    </camelContext>
+
+</beans>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-request.xml
new file mode 100644
index 0000000000..2588b6e858
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/res/spring/text-subscription-request.xml
@@ -0,0 +1,30 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.subscription.request.SubscriptionRequest"/>
+        <constructor-arg>
+            <bean class="com.raytheon.uf.edex.plugin.text.subscription.services.SubscriptionRequestHandler" />
+        </constructor-arg>
+    </bean>
+
+    <bean id="sendFaxRequestHandler" class="com.raytheon.uf.edex.plugin.text.subscription.handler.SendFaxRequestHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.subscription.request.SendFaxRequest"/>
+        <constructor-arg ref="sendFaxRequestHandler"/>
+    </bean>
+
+    <bean id="autoFaxRequestHandler" class="com.raytheon.uf.edex.plugin.text.subscription.handler.AutoFaxRequestHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.subscription.request.AutoFaxRequest"/>
+        <constructor-arg ref="autoFaxRequestHandler"/>
+    </bean>
+
+    <bean id="getAutoFaxRecordsRequestHandler" class="com.raytheon.uf.edex.plugin.text.subscription.handler.GetAutoFaxRecordsRequestHandler" />
+    <bean factory-bean="handlerRegistry" factory-method="register">
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.subscription.request.GetAutoFaxRecordsRequest"/>
+        <constructor-arg ref="getAutoFaxRecordsRequestHandler"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
similarity index 61%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
index 8765164356..104129db0d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/AutoFaxManager.java
@@ -23,22 +23,22 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.PluginException;
-import com.raytheon.uf.common.dataplugin.text.AutoFaxContainer;
-import com.raytheon.uf.common.dataplugin.text.db.AutoFaxRecord;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
+import com.raytheon.uf.common.dataplugin.text.subscription.AutoFaxContainer;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.AutoFaxRecord;
 import com.raytheon.uf.edex.core.EdexException;
 import com.raytheon.uf.edex.plugin.text.TextRecord;
 import com.raytheon.uf.edex.plugin.text.db.TextDB;
-import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
-import com.raytheon.uf.edex.plugin.text.fax.FaxSender;
+import com.raytheon.uf.edex.plugin.text.subscription.fax.AutoFaxDao;
+import com.raytheon.uf.edex.plugin.text.subscription.fax.FaxSender;
 
 /**
- * TODO Add Description
+ * Manages AutoFax events to send faxes
  * 
  * <pre>
  * 
@@ -47,6 +47,9 @@ import com.raytheon.uf.edex.plugin.text.fax.FaxSender;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Dec 15, 2010            bfarmer     Initial creation
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -58,7 +61,7 @@ public class AutoFaxManager {
 
     AutoFaxDao faxdao;
 
-    private transient Log logger = LogFactory.getLog(getClass());
+    private transient Logger logger = LoggerFactory.getLogger(getClass());
 
     AutoFaxManager() {
         try {
@@ -68,26 +71,22 @@ public class AutoFaxManager {
         }
     }
 
-    public void processEvent(Object event) throws EdexException {
+    public void processEvent(PluginDataObject[] pdos) throws EdexException {
         List<String> trigger = new ArrayList<String>();
-        if (event instanceof PluginDataObject[]) {
-            PluginDataObject[] pdos = (PluginDataObject[]) event;
-            for (PluginDataObject pdo : pdos) {
-                try {
-                    if (pdo instanceof TextRecord) {
-                        TextRecord tr = (TextRecord) pdo;
-                        String prodID = tr.getProductId();
-                        if (logger.isDebugEnabled()) {
-                            logger.debug("Processing trigger: " + prodID
-                                    + ", class = "
-                                    + pdo.getClass().getSimpleName());
-                        }
-                        trigger.add(prodID);
+        for (PluginDataObject pdo : pdos) {
+            try {
+                if (pdo instanceof TextRecord) {
+                    TextRecord tr = (TextRecord) pdo;
+                    String prodID = tr.getProductId();
+                    if (logger.isDebugEnabled()) {
+                        logger.debug("Processing trigger: " + prodID
+                                + ", class = " + pdo.getClass().getSimpleName());
                     }
-                } catch (Exception e) {
-                    logger.warn("Unable to extract product information from ["
-                            + pdo.toString() + "] skipping...");
+                    trigger.add(prodID);
                 }
+            } catch (Exception e) {
+                logger.warn("Unable to extract product information from ["
+                        + pdo.toString() + "] skipping...");
             }
         }
         sendFaxes(trigger);
@@ -110,10 +109,14 @@ public class AutoFaxManager {
                         // Shove it out to all the autofax subscribers to this
                         // PIL.
                         try {
-                            FaxSender.sendFax(faxRecord.getCompany(), faxRecord
-                                    .getId().getFaxNumber(), faxRecord
-                                    .getRecipient(), faxText, faxRecord.getId()
-                                    .getAfosPil());
+                            logger.info("Sending fax to '"
+                                    + faxRecord.getCompany()
+                                    + "' for AFOS PIL: " + afosPil);
+                            String status = FaxSender.sendFax(faxRecord
+                                    .getCompany(), faxRecord.getId()
+                                    .getFaxNumber(), faxRecord.getRecipient(),
+                                    faxText, faxRecord.getId().getAfosPil());
+                            logger.info(status);
                         } catch (IOException e) {
                             logger.warn("Error sending fax for AFOS PIL: "
                                     + afosPil);
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/SubscriptionDAO.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/dao/SubscriptionDAO.java
similarity index 96%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/SubscriptionDAO.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/dao/SubscriptionDAO.java
index 736364e8a1..4380b4efa9 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/SubscriptionDAO.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/dao/SubscriptionDAO.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.dao;
+package com.raytheon.uf.edex.plugin.text.subscription.dao;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,7 +32,7 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;
 
 import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
-import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.SubscriptionRecord;
 import com.raytheon.uf.common.dataquery.db.QueryParam;
 import com.raytheon.uf.common.message.Property;
 import com.raytheon.uf.common.status.IUFStatusHandler;
@@ -58,7 +58,9 @@ import com.raytheon.uf.edex.database.query.DatabaseQuery;
  * Nov 08, 2013 2361       njensen     Chaged method signature of saveOrUpdate(Object)
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
  * 10/16/2014   3454       bphillip    Upgrading to Hibernate 4
- * 10/28/2014   3454        bphillip    Fix usage of getSession()
+ * 10/28/2014   3454       bphillip    Fix usage of getSession()
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * </pre>
  * 
  * @author mfegan
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/AutoFaxDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/fax/AutoFaxDao.java
similarity index 95%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/AutoFaxDao.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/fax/AutoFaxDao.java
index 50b273c04a..a4a4018ca0 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/AutoFaxDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/fax/AutoFaxDao.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.fax;
+package com.raytheon.uf.edex.plugin.text.subscription.fax;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -30,8 +30,8 @@ import org.hibernate.Transaction;
 
 import com.raytheon.edex.db.dao.DefaultPluginDao;
 import com.raytheon.uf.common.dataplugin.PluginException;
-import com.raytheon.uf.common.dataplugin.text.AutoFaxContainer;
-import com.raytheon.uf.common.dataplugin.text.db.AutoFaxRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.AutoFaxContainer;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.AutoFaxRecord;
 import com.raytheon.uf.common.status.IUFStatusHandler;
 import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.common.status.UFStatus.Priority;
@@ -39,25 +39,29 @@ import com.raytheon.uf.edex.core.EDEXUtil;
 
 /**
  * Data access object for storing and retrieving AutoFaxRecords
- *
+ * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 2, 2010            bfarmer     Initial creation
  * May 20, 2014 2536      bclement    moved from edex.textdb to edex.plugin.text
  * Jul 30, 2015 1574      nabowle     Override purgeOrphanedData to noop
- *
+ * Jan 18, 2016 4562      tjensen     Moved from edex.plugin.text to 
+ *                                    edex.plugin.text.subscription
+ * 
  * </pre>
- *
+ * 
  * @author bfarmer
  * @version 1.0
  */
 
 public class AutoFaxDao extends DefaultPluginDao {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(AutoFaxDao.class);
+    private static final transient IUFStatusHandler statusHandler = UFStatus
+            .getHandler(AutoFaxDao.class);
+
     /**
      * Route to put a subscription notify message.
      */
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/fax/FaxSender.java
similarity index 95%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/fax/FaxSender.java
index 4fa3301f0b..90b85847ca 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/fax/FaxSender.java
@@ -17,7 +17,7 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.fax;
+package com.raytheon.uf.edex.plugin.text.subscription.fax;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -25,7 +25,7 @@ import java.io.FileWriter;
 import java.io.IOException;
 
 import com.raytheon.uf.common.util.RunProcess;
-import com.raytheon.uf.edex.plugin.text.security.EnvPathWhiteList;
+import com.raytheon.uf.edex.plugin.text.dbsrv.security.EnvPathWhiteList;
 
 /**
  * Sends FAX to number using LDAD system
@@ -38,9 +38,11 @@ import com.raytheon.uf.edex.plugin.text.security.EnvPathWhiteList;
  * ------------ ---------- ----------- --------------------------
  * Oct 28, 2010            bfarmer     Initial creation
  * Sep 19, 2011 10955      rferrel     Use RunProcess
- * Jan 10, 2012  4550	   mgamazaychikov	Fixed the sshCommand
+ * Jan 10, 2012 4550       mgamazay    Fixed the sshCommand
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
  * Jun 03, 2015 4492       rferrel     Use {@link EnvPathWhiteList} for security check.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/handler/AutoFaxRequestHandler.java
similarity index 74%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/handler/AutoFaxRequestHandler.java
index 7052e35eca..ad9c2c513b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/AutoFaxRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/handler/AutoFaxRequestHandler.java
@@ -17,19 +17,19 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.subscription.handler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginException;
-import com.raytheon.uf.common.dataplugin.text.db.AutoFaxRecord;
-import com.raytheon.uf.common.dataplugin.text.request.AutoFaxRequest;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.AutoFaxRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.request.AutoFaxRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
-import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
+import com.raytheon.uf.edex.plugin.text.subscription.fax.AutoFaxDao;
 
 /**
- * TODO Add Description
+ * Request handler for AutoFaxRequests. Forwards request to AutoFaxDao.
  * 
  * <pre>
  * 
@@ -38,6 +38,9 @@ import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Oct 28, 2010            bfarmer     Initial creation
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -46,7 +49,7 @@ import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
  */
 
 public class AutoFaxRequestHandler implements IRequestHandler<AutoFaxRequest> {
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     public Object handleRequest(AutoFaxRequest request) {
         AutoFaxRecord req = new AutoFaxRecord(request.getAfosPil(),
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/handler/GetAutoFaxRecordsRequestHandler.java
similarity index 67%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/handler/GetAutoFaxRecordsRequestHandler.java
index 3c518a6c50..5977749fa4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/GetAutoFaxRecordsRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/handler/GetAutoFaxRecordsRequestHandler.java
@@ -17,19 +17,20 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.subscription.handler;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.PluginException;
-import com.raytheon.uf.common.dataplugin.text.AutoFaxContainer;
-import com.raytheon.uf.common.dataplugin.text.request.GetAutoFaxRecordsRequest;
+import com.raytheon.uf.common.dataplugin.text.subscription.AutoFaxContainer;
+import com.raytheon.uf.common.dataplugin.text.subscription.request.GetAutoFaxRecordsRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
-import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
+import com.raytheon.uf.edex.plugin.text.subscription.fax.AutoFaxDao;
 
 /**
- * TODO Add Description
+ * Request handler for GetAutoFaxRecordsRequests. Forwards request to
+ * AutoFaxDao.
  * 
  * <pre>
  * 
@@ -37,7 +38,10 @@ import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
  * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Nov 2, 2010            bfarmer     Initial creation
+ * Nov 2, 2010             bfarmer     Initial creation
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -47,7 +51,7 @@ import com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao;
 
 public class GetAutoFaxRecordsRequestHandler implements
         IRequestHandler<GetAutoFaxRecordsRequest> {
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     public Object handleRequest(GetAutoFaxRecordsRequest request) {
         AutoFaxContainer retval = null;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/handler/SendFaxRequestHandler.java
similarity index 82%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/handler/SendFaxRequestHandler.java
index 82427f40d2..1f6cec47c4 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/SendFaxRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/handler/SendFaxRequestHandler.java
@@ -17,11 +17,11 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.handler;
+package com.raytheon.uf.edex.plugin.text.subscription.handler;
 
-import com.raytheon.uf.common.dataplugin.text.request.SendFaxRequest;
+import com.raytheon.uf.common.dataplugin.text.subscription.request.SendFaxRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
-import com.raytheon.uf.edex.plugin.text.fax.FaxSender;
+import com.raytheon.uf.edex.plugin.text.subscription.fax.FaxSender;
 
 /**
  * Request handler for SendFaxRequests. Sends FAX message using
@@ -35,6 +35,8 @@ import com.raytheon.uf.edex.plugin.text.fax.FaxSender;
  * ------------ ---------- ----------- --------------------------
  * Oct 21, 2010            bfarmer     Initial creation
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ASubscribeRunner.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ASubscribeRunner.java
similarity index 86%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ASubscribeRunner.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ASubscribeRunner.java
index 919ed60bd8..fcad3bdd83 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ASubscribeRunner.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ASubscribeRunner.java
@@ -22,8 +22,8 @@ package com.raytheon.uf.edex.plugin.text.subscription.runners;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
@@ -66,6 +66,9 @@ import com.raytheon.uf.common.message.Property;
  * ------------ ---------- ----------- --------------------------
  * 14Nov2008    1709       MW Fegan    Initial creation
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -77,29 +80,32 @@ public abstract class ASubscribeRunner implements ISubscribeRunner {
     /**
      * the logger
      */
-    protected final Log logger = LogFactory.getLog(getClass());
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
 
     protected Message message = null;
-    
+
     protected List<Property> results = null;
+
     /**
-     * Constructor. Does not initialize the message to process. Must
-     * be followed by a call to {@link #initialize(message)}.
+     * Constructor. Does not initialize the message to process. Must be followed
+     * by a call to {@link #initialize(message)}.
      */
     protected ASubscribeRunner() {
         this(null);
     }
+
     /**
      * Constructor. This version combines object construction and
      * initialization.
      * 
-     * @param message the message object to process
+     * @param message
+     *            the message object to process
      */
     protected ASubscribeRunner(Message message) {
         super();
         this.initialize(message);
     }
-    
+
     @Override
     public abstract boolean execute();
 
@@ -108,10 +114,10 @@ public abstract class ASubscribeRunner implements ISubscribeRunner {
         this.results = new ArrayList<Property>();
         this.message = message;
     }
+
     @Override
     public List<Property> getResults() {
         return this.results;
     }
 
-
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ISubscribeRunner.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ISubscribeRunner.java
similarity index 91%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ISubscribeRunner.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ISubscribeRunner.java
index df6f5c5af5..bfd294bdf3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ISubscribeRunner.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/ISubscribeRunner.java
@@ -42,6 +42,8 @@ import com.raytheon.uf.common.message.Property;
  * ------------ ---------- ----------- --------------------------
  * 14Nov2008    1709       MW Fegan    Initial creation.
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -51,19 +53,24 @@ import com.raytheon.uf.common.message.Property;
 
 public interface ISubscribeRunner {
     public static final String RESPONSE_NORMAL = "STDOUT";
+
     public static final String RESPONSE_ERROR = "STRERR";
+
     /**
      * Initializes the runner.
      * 
-     * @param message the message to process
+     * @param message
+     *            the message to process
      */
     public void initialize(Message message);
+
     /**
      * Executes the work as specified in the previously set message.
      * 
      * @return true if execution was successful, false otherwise
      */
     public boolean execute();
+
     /**
      * Returns the results as previously computed by the execute() method.
      */
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeAddRunner.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeAddRunner.java
similarity index 87%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeAddRunner.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeAddRunner.java
index cad348abe9..fd79489868 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeAddRunner.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeAddRunner.java
@@ -21,10 +21,10 @@ package com.raytheon.uf.edex.plugin.text.subscription.runners;
 
 import java.util.List;
 
-import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.SubscriptionRecord;
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
-import com.raytheon.uf.edex.plugin.text.dao.SubscriptionDAO;
+import com.raytheon.uf.edex.plugin.text.subscription.dao.SubscriptionDAO;
 import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
 
 /**
@@ -43,6 +43,8 @@ import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
  * 25May2011    8686       cjeanbap    Updated if-statement to check for filepath
  * 26May2011    8686       cjeanbap    fixed a punctuation bug    
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * </pre>
  * 
  * @author mfegan
@@ -52,9 +54,9 @@ import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
 public class SubscribeAddRunner extends ASubscribeRunner {
 
     private static final String TRIGGER = "trigger";
-    
+
     private static final String FILEPATH = "filepath";
-    
+
     /**
      * Constructor.
      */
@@ -79,10 +81,12 @@ public class SubscribeAddRunner extends ASubscribeRunner {
         List<Property> props = Tools.adjustMessageProperties(properties);
 
         for (Property prop : props) {
-            if (TRIGGER.equalsIgnoreCase(prop.getName()) || FILEPATH.equalsIgnoreCase(prop.getName())) {
-                if (prop.getValue().startsWith("[") && prop.getValue().endsWith("]")) {
+            if (TRIGGER.equalsIgnoreCase(prop.getName())
+                    || FILEPATH.equalsIgnoreCase(prop.getName())) {
+                if (prop.getValue().startsWith("[")
+                        && prop.getValue().endsWith("]")) {
                     int len = prop.getValue().length();
-                    prop.setValue(prop.getValue().substring(1, len-1));
+                    prop.setValue(prop.getValue().substring(1, len - 1));
                 }
                 prop.setValue(prop.getValue().replace(",", " "));
                 prop.setValue(prop.getValue().replace("'", ""));
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeDeleteRunner.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeDeleteRunner.java
similarity index 83%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeDeleteRunner.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeDeleteRunner.java
index 672c34464b..ecf7fc6e7a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeDeleteRunner.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeDeleteRunner.java
@@ -22,10 +22,10 @@ package com.raytheon.uf.edex.plugin.text.subscription.runners;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.SubscriptionRecord;
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
-import com.raytheon.uf.edex.plugin.text.dao.SubscriptionDAO;
+import com.raytheon.uf.edex.plugin.text.subscription.dao.SubscriptionDAO;
 import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
 
 /**
@@ -40,6 +40,8 @@ import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
  * ------------ ---------- ----------- --------------------------
  * 14Nov2008    1709       MW Fegan    Initial creation.
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -94,6 +96,7 @@ public class SubscribeDeleteRunner extends ASubscribeRunner {
         }
         return true;
     }
+
     /**
      * Creates a results list for a "no matching records" response.
      * 
@@ -101,21 +104,26 @@ public class SubscribeDeleteRunner extends ASubscribeRunner {
      */
     private List<Property> prepareNullResponse() {
         String msg = "There are no subscriptions matching the criteria";
-        Property resp = new Property(RESPONSE_NORMAL,msg);
+        Property resp = new Property(RESPONSE_NORMAL, msg);
         List<Property> retVal = new ArrayList<Property>();
         retVal.add(resp);
         return retVal;
     }
+
     /**
      * Creates a response list providing the number of records deleted.
-     * @param count the number of records that were deleted
+     * 
+     * @param count
+     *            the number of records that were deleted
      * @return the response list
      */
     private List<Property> prepareDeleteResponse(int count) {
-        String msg = String.format("Successfully deleted %d subscriptions matching the criteria",count);
-        Property resp = new Property(RESPONSE_NORMAL,msg);
+        String msg = String.format(
+                "Successfully deleted %d subscriptions matching the criteria",
+                count);
+        Property resp = new Property(RESPONSE_NORMAL, msg);
         List<Property> retVal = new ArrayList<Property>();
         retVal.add(resp);
-        return retVal;        
+        return retVal;
     }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeQueryRunner.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeQueryRunner.java
similarity index 81%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeQueryRunner.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeQueryRunner.java
index b3d42a2ba0..d0144c25db 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeQueryRunner.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeQueryRunner.java
@@ -22,11 +22,11 @@ package com.raytheon.uf.edex.plugin.text.subscription.runners;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.SubscriptionRecord;
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
 import com.raytheon.uf.common.serialization.SerializationUtil;
-import com.raytheon.uf.edex.plugin.text.dao.SubscriptionDAO;
+import com.raytheon.uf.edex.plugin.text.subscription.dao.SubscriptionDAO;
 import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
 import com.raytheon.uf.edex.plugin.text.subscription.util.TriggerMatcher;
 
@@ -76,6 +76,8 @@ import com.raytheon.uf.edex.plugin.text.subscription.util.TriggerMatcher;
  * 14Nov2008    1709       MW Fegan    Initial creation.
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
  * Sep 05, 2014 2926       bclement    added getDirectResults() to avoid marshaling
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -98,7 +100,9 @@ public class SubscribeQueryRunner extends ASubscribeRunner {
 
     /**
      * Constructor.
-     * @param message the message to process
+     * 
+     * @param message
+     *            the message to process
      */
     public SubscribeQueryRunner(Message message) {
         super(message);
@@ -128,14 +132,16 @@ public class SubscribeQueryRunner extends ASubscribeRunner {
     }
 
     /**
-     * Filters the list of records received, limiting to those that match
-     * the trigger condition.
+     * Filters the list of records received, limiting to those that match the
+     * trigger condition.
      * 
-     * @param records the list of records to filter
+     * @param records
+     *            the list of records to filter
      * 
      * @return the filtered records
      */
-    private List<SubscriptionRecord> filterRecords(List<SubscriptionRecord> records) {
+    private List<SubscriptionRecord> filterRecords(
+            List<SubscriptionRecord> records) {
         List<SubscriptionRecord> retVal = new ArrayList<SubscriptionRecord>();
         for (SubscriptionRecord record : records) {
             if (TriggerMatcher.matches(record, this.trigger)) {
@@ -146,26 +152,28 @@ public class SubscribeQueryRunner extends ASubscribeRunner {
     }
 
     /**
-     * Packages the subscriptions for return to the client. Each record
-     * is bundled within the value of a {@link Property} object with a
-     * name of <em>subscription</em>.
+     * Packages the subscriptions for return to the client. Each record is
+     * bundled within the value of a {@link Property} object with a name of
+     * <em>subscription</em>.
      * 
-     * @param records the list of records to bundle
+     * @param records
+     *            the list of records to bundle
      * 
      * @return the list of bundled records
      */
     private List<Property> packageSubscriptions(List<SubscriptionRecord> records) {
         List<Property> retVal = new ArrayList<Property>();
         if (records.size() == 0) {
-            retVal.add(new Property("count","0"));
+            retVal.add(new Property("count", "0"));
         } else {
-            retVal.add(new Property("count",String.valueOf(records.size())));
+            retVal.add(new Property("count", String.valueOf(records.size())));
             for (SubscriptionRecord record : records) {
                 try {
                     String xml = SerializationUtil.marshalToXml(record);
-                    retVal.add(new Property("subscription",xml));
+                    retVal.add(new Property("subscription", xml));
                 } catch (Exception e) {
-                    logger.warn("Unable to serialize subscription record " + record.toString() + " - skipping",e);
+                    logger.warn("Unable to serialize subscription record "
+                            + record.toString() + " - skipping", e);
                 }
             }
         }
@@ -173,10 +181,12 @@ public class SubscribeQueryRunner extends ASubscribeRunner {
     }
 
     /**
-     * Modifies the list of {@link Property} objects by removing the <em>trigger</em>
-     * property and adding a <em>active</em> property with a value of <em>TRUE</em>.
+     * Modifies the list of {@link Property} objects by removing the
+     * <em>trigger</em> property and adding a <em>active</em> property with a
+     * value of <em>TRUE</em>.
      * 
-     * @param properties the list of properties to modify
+     * @param properties
+     *            the list of properties to modify
      * 
      * @return the modified property list
      */
@@ -189,7 +199,7 @@ public class SubscribeQueryRunner extends ASubscribeRunner {
                 retVal.add(prop);
             }
         }
-        retVal.add(new Property("active","TRUE"));
+        retVal.add(new Property("active", "TRUE"));
         return retVal;
     }
 
@@ -205,7 +215,7 @@ public class SubscribeQueryRunner extends ASubscribeRunner {
         return packageSubscriptions(results);
     }
 
-    public List<SubscriptionRecord> getDirectResults(){
+    public List<SubscriptionRecord> getDirectResults() {
         return results;
     }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeReadRunner.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeReadRunner.java
similarity index 95%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeReadRunner.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeReadRunner.java
index 5acdbd6dd5..67a9e96908 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeReadRunner.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeReadRunner.java
@@ -22,11 +22,11 @@ package com.raytheon.uf.edex.plugin.text.subscription.runners;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.SubscriptionRecord;
 import com.raytheon.uf.common.message.Header;
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
-import com.raytheon.uf.edex.plugin.text.dao.SubscriptionDAO;
+import com.raytheon.uf.edex.plugin.text.subscription.dao.SubscriptionDAO;
 import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
 
 /**
@@ -74,6 +74,8 @@ import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
  * ------------ ---------- ----------- --------------------------
  * 14Nov2008    1709       MW Fegan    Initial creation.
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeRunner.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeRunner.java
similarity index 68%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeRunner.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeRunner.java
index 9bf87ef940..aa97ac440a 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeRunner.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeRunner.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.uf.edex.plugin.text.subscription.runners;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.util.StringUtil;
@@ -64,6 +64,9 @@ import com.raytheon.uf.edex.plugin.text.subscription.util.SubscribeAction;
  *                                      removed duplicate SubscribeAction enum
  * Aug 22, 2014 2926       bclement    improved error handling for unknown operation
  * Sep 05, 2014 2926       bclement    removed Class.forName() call
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -76,18 +79,20 @@ public class SubscribeRunner {
      * the logger
      */
     @SuppressWarnings("unused")
-    private final Log logger = LogFactory.getLog(getClass());
-    
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
     /*
      * The factory instance.
      */
     private static SubscribeRunner instance = null;
+
     /**
      * Constructor.
      */
     private SubscribeRunner() {
         super();
     }
+
     /**
      * 
      * @return
@@ -98,36 +103,47 @@ public class SubscribeRunner {
         }
         return instance;
     }
+
     /**
-     * Factory method for obtaining an {@link ISubscribeRunner} instance for the specified
-     * operation. The {@link ISubscribeRunner} instance must be initialized via the 
-     * {@link ISubscribeRunner#initialize(Message) initialize(Message)} method.
+     * Factory method for obtaining an {@link ISubscribeRunner} instance for the
+     * specified operation. The {@link ISubscribeRunner} instance must be
+     * initialized via the {@link ISubscribeRunner#initialize(Message)
+     * initialize(Message)} method.
      * 
-     * @param oper the operation for the instance to execute
+     * @param oper
+     *            the operation for the instance to execute
      * 
      * @return the requested class instance
      * 
-     * @throws EdexException if any error occurs in creating the class instance
+     * @throws EdexException
+     *             if any error occurs in creating the class instance
      */
-    public static ISubscribeRunner getInstance(String oper) throws EdexException {
+    public static ISubscribeRunner getInstance(String oper)
+            throws EdexException {
         return getInstance(oper, null);
     }
+
     /**
-     * Factory method for obtaining an {@link ISubscribeRunner} instance for the specified
-     * operation to process the specified message. If <code>message</code> is <code>null</code>,
-     * the {@link ISubscribeRunner} instance must be initialized via the 
+     * Factory method for obtaining an {@link ISubscribeRunner} instance for the
+     * specified operation to process the specified message. If
+     * <code>message</code> is <code>null</code>, the {@link ISubscribeRunner}
+     * instance must be initialized via the
      * {@link ISubscribeRunner#initialize(Message) initialize(Message)} method.
      * 
-     * @param message the message to process
+     * @param message
+     *            the message to process
      * 
      * @return the requested class instance
      * 
-     * @throws EdexException if any error occurs in creating the class instance
+     * @throws EdexException
+     *             if any error occurs in creating the class instance
      */
-    public static ISubscribeRunner getInstance(String oper, Message message) throws EdexException {
+    public static ISubscribeRunner getInstance(String oper, Message message)
+            throws EdexException {
         ISubscribeRunner retVal = null;
         if (StringUtil.isEmptyString(oper)) {
-            throw new EdexException("Unable to initialize ISubscribeRunner instance; null or empty operation specified - unable to continue");
+            throw new EdexException(
+                    "Unable to initialize ISubscribeRunner instance; null or empty operation specified - unable to continue");
         }
         SubscribeAction action = SubscribeAction.translate(oper);
         if (action == null) {
@@ -137,16 +153,20 @@ public class SubscribeRunner {
         }
         Class<? extends ISubscribeRunner> aClass = action.getRunner();
         if (aClass == null) {
-            throw new EdexException("Unable to initialize ISubscribeRunner instance; invalid operation [" + oper + "] specified - unable to continue");
+            throw new EdexException(
+                    "Unable to initialize ISubscribeRunner instance; invalid operation ["
+                            + oper + "] specified - unable to continue");
         }
-        
+
         try {
-            retVal = (ISubscribeRunner)aClass.newInstance();
+            retVal = (ISubscribeRunner) aClass.newInstance();
             if (message != null) {
                 retVal.initialize(message);
             }
         } catch (Exception e) {
-            throw new EdexException("Unable to initialize ISubscribeRunner instance; invalid operation [" + oper + "] specified - unable to continue",e);
+            throw new EdexException(
+                    "Unable to initialize ISubscribeRunner instance; invalid operation ["
+                            + oper + "] specified - unable to continue", e);
         }
         return retVal;
     }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeUpdateRunner.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeUpdateRunner.java
similarity index 83%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeUpdateRunner.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeUpdateRunner.java
index 144dda1fd2..c053d884c3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeUpdateRunner.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/runners/SubscribeUpdateRunner.java
@@ -22,11 +22,11 @@ package com.raytheon.uf.edex.plugin.text.subscription.runners;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.SubscriptionRecord;
 import com.raytheon.uf.common.message.Header;
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
-import com.raytheon.uf.edex.plugin.text.dao.SubscriptionDAO;
+import com.raytheon.uf.edex.plugin.text.subscription.dao.SubscriptionDAO;
 import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
 
 /**
@@ -56,6 +56,8 @@ import com.raytheon.uf.edex.plugin.text.subscription.util.Tools;
  * ------------ ---------- ----------- --------------------------
  * 05Dec2008    1709       MW Fegan    Initial creation.
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -92,7 +94,7 @@ public class SubscribeUpdateRunner extends ASubscribeRunner {
         Header header = this.message.getHeader();
         Property[] props = header.getProperties();
         List<Property> attribs = Tools.adjustMessageProperties(props);
-        
+
         List<Property> index = new ArrayList<Property>();
         String indx = "";
         for (Property prop : attribs) {
@@ -108,7 +110,7 @@ public class SubscribeUpdateRunner extends ASubscribeRunner {
         if (index.size() == 0) {
             msg = "Unable to perform update - no record ID specified";
             logger.warn(msg);
-            this.results.add(new Property(RESPONSE_ERROR,msg));
+            this.results.add(new Property(RESPONSE_ERROR, msg));
             return false;
         } else {
             records = dao.getSubscriptions(index);
@@ -116,9 +118,11 @@ public class SubscribeUpdateRunner extends ASubscribeRunner {
         // get the appropriate record
         if (records.size() == 0) {
             // this indicates the record wasn't located - need to do something.
-            msg = String.format("Unable to perform update - no subscriptions with ID [%s] available",indx);
+            msg = String
+                    .format("Unable to perform update - no subscriptions with ID [%s] available",
+                            indx);
             logger.warn(msg);
-            this.results.add(new Property(RESPONSE_NORMAL,msg));            
+            this.results.add(new Property(RESPONSE_NORMAL, msg));
             return true;
         }
         // update the record
@@ -126,7 +130,7 @@ public class SubscribeUpdateRunner extends ASubscribeRunner {
         for (SubscriptionRecord record : records) {
             for (Property prop : attribs) {
                 if ("update".equalsIgnoreCase(prop.getName())) {
-                    String[] parts = prop.getValue().split(":",2);
+                    String[] parts = prop.getValue().split(":", 2);
                     record.setAttribute(parts[0], parts[1]);
                     upd = true;
                 }
@@ -138,9 +142,9 @@ public class SubscribeUpdateRunner extends ASubscribeRunner {
                 dao.update(record);
             }
         }
-        msg = String.format("Updated %d subscription records.",records.size());
+        msg = String.format("Updated %d subscription records.", records.size());
         logger.info(msg);
-        this.results.add(new Property(RESPONSE_NORMAL,msg));
+        this.results.add(new Property(RESPONSE_NORMAL, msg));
         return true;
     }
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/ScriptRunner.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/ScriptRunner.java
similarity index 87%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/ScriptRunner.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/ScriptRunner.java
index c91965764f..f2d51bd853 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/ScriptRunner.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/ScriptRunner.java
@@ -26,21 +26,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import com.raytheon.edex.uengine.runners.IMicroEngine;
-import com.raytheon.edex.uengine.runners.MicroEngine;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.message.DataURINotificationMessage;
-import com.raytheon.uf.common.dataplugin.text.db.ReplacementRecord;
-import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.ReplacementRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.SubscriptionRecord;
 import com.raytheon.uf.common.message.Header;
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
 import com.raytheon.uf.common.util.ReflectionUtil;
 import com.raytheon.uf.common.util.StringUtil;
-import com.raytheon.uf.edex.core.EdexException;
 import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeQueryRunner;
 
 /**
@@ -69,6 +66,11 @@ import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeQueryRunne
  * Feb 15, 2013 1638       mschenke    Moved DataURINotificationMessage to uf.common.dataplugin
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
  * Sep 05, 2014 2926       bclement    get query results directly, removed decodeResponse()
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 04, 2016 5203       tjensen     Removed dependency on uEngine. Replaced with calls to 
+ *                                     TextTriggerHandler.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -77,7 +79,8 @@ import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeQueryRunne
  */
 
 public class ScriptRunner {
-    private transient Log logger = LogFactory.getLog("FailedTriggerLog");
+    private transient Logger logger = LoggerFactory
+            .getLogger("FailedTriggerLog");
 
     private String type = null;
 
@@ -101,10 +104,10 @@ public class ScriptRunner {
      * @param event
      *            the Trigger event
      * 
-     * @throws EdexException
+     * @throws TriggerException
      *             if an error occurs
      */
-    public void runScripts(Object event) throws EdexException {
+    public void runScripts(Object event) throws TriggerException {
         List<String> triggers = decodeTrigger(event);
         for (String trigger : triggers) {
             Message query = prepareQueryMessage(trigger);
@@ -126,10 +129,10 @@ public class ScriptRunner {
      * 
      * @return the decoded trigger event
      * 
-     * @throws EdexException
+     * @throws TriggerException
      *             if an error occurs
      */
-    private List<String> decodeTrigger(Object event) throws EdexException {
+    private List<String> decodeTrigger(Object event) throws TriggerException {
         List<String> trigger = new ArrayList<String>();
         switch (ScriptRunnerType.translate(this.type)) {
         case TIMER:
@@ -181,8 +184,7 @@ public class ScriptRunner {
                     for (PluginDataObject pdo : pdos) {
                         try {
                             String prodID = ReflectionUtil.getter(String.class,
-                                    pdo,
-                                    "productId");
+                                    pdo, "productId");
                             if (logger.isDebugEnabled()) {
                                 logger.debug("Processing trigger: " + prodID
                                         + ", class = "
@@ -222,8 +224,8 @@ public class ScriptRunner {
             }
             break;
         default:
-            throw new EdexException("Invalid scriptrunner type [" + this.type
-                    + "] configured");
+            throw new TriggerException("Invalid scriptrunner type ["
+                    + this.type + "] configured");
         }
         if (logger.isDebugEnabled()) {
             logger.debug("script runner fired: type= " + this.type
@@ -257,7 +259,8 @@ public class ScriptRunner {
         } else {
             String path = record.getFilepath();
             String args = record.getArguments();
-            if (StringUtil.isEmptyString(path) && StringUtil.isEmptyString(args)) {
+            if (StringUtil.isEmptyString(path)
+                    && StringUtil.isEmptyString(args)) {
                 logger.warn("Unable to execute script for " + record.toString());
                 return;
             }
@@ -267,23 +270,21 @@ public class ScriptRunner {
             script = (StringUtil.isEmptyString(path) ? "" : path) + " "
                     + (StringUtil.isEmptyString(args) ? "" : args);
         }
-        IMicroEngine engine = null;
-        try {
-            engine = MicroEngine.getInstance(runner);
-            engine.setScript(script);
-            engine.setTrigger(trigger);
-            engine.initialize();
-            engine.execute();
-            logger.info("Executed script: runner= " + runner + ", script= "
-                    + script.replaceAll("\\n", "<ret>"));
-        } catch (Exception e) {
-            logger.error(generateErrorMsg(runner, script), e);
-        } finally {
-            if (engine != null) {
-                engine.release();
-            }
-        }
 
+        if (runner.toLowerCase().equals("ldad")
+                || runner.toLowerCase().equals("pil")) {
+            TextTriggerHandler exHandler = new TextTriggerHandler();
+            try {
+                exHandler.execute(script, trigger);
+                logger.info("Executed script: runner= " + runner + ", script= "
+                        + script.replaceAll("\\n", "<ret>"));
+            } catch (Exception e) {
+                logger.error(generateErrorMsg(runner, script), e);
+            }
+        } else {
+            logger.error("Unable to execute script '" + script
+                    + "' due to unexpected script runner type: " + runner);
+        }
     }
 
     /**
@@ -317,11 +318,11 @@ public class ScriptRunner {
      * 
      * @return subscription record list containing the results of the query
      * 
-     * @throws EdexException
+     * @throws TriggerException
      *             if an error occurs
      */
     private List<SubscriptionRecord> querySubscriptions(Message message)
-            throws EdexException {
+            throws TriggerException {
         SubscribeQueryRunner runner = new SubscribeQueryRunner(message);
         runner.execute();
         return runner.getDirectResults();
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscriptionRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscriptionRequestHandler.java
similarity index 93%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscriptionRequestHandler.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscriptionRequestHandler.java
index e085663e88..5f4f0aca7e 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscriptionRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/SubscriptionRequestHandler.java
@@ -22,7 +22,7 @@ package com.raytheon.uf.edex.plugin.text.subscription.services;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.raytheon.uf.common.dataplugin.text.request.SubscriptionRequest;
+import com.raytheon.uf.common.dataplugin.text.subscription.request.SubscriptionRequest;
 import com.raytheon.uf.common.message.Header;
 import com.raytheon.uf.common.message.Message;
 import com.raytheon.uf.common.message.Property;
@@ -42,6 +42,8 @@ import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeRunner;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Sep 5, 2014  2926      bclement     Initial creation, replaced SubscribeManager
+ * Jan 18, 2016 4562      tjensen      Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -60,9 +62,6 @@ public class SubscriptionRequestHandler implements
     public SubscriptionRequestHandler() {
     }
 
-    /* (non-Javadoc)
-     * @see com.raytheon.uf.common.serialization.comm.IRequestHandler#handleRequest(com.raytheon.uf.common.serialization.comm.IServerRequest)
-     */
     @Override
     public Object handleRequest(SubscriptionRequest request) throws Exception {
         String msg = "";
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/TextTriggerHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/TextTriggerHandler.java
new file mode 100644
index 0000000000..cdb40bf087
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/TextTriggerHandler.java
@@ -0,0 +1,258 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.edex.plugin.text.subscription.services;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.raytheon.uf.common.localization.PathManagerFactory;
+import com.raytheon.uf.common.message.Header;
+import com.raytheon.uf.common.message.Message;
+import com.raytheon.uf.common.message.Property;
+import com.raytheon.uf.common.util.FileUtil;
+import com.raytheon.uf.common.util.RunProcess;
+import com.raytheon.uf.edex.plugin.text.dbsrv.TextDBSrv;
+
+/**
+ * 
+ * A script runner for Text Trigger execution scripts.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Jan 4, 2016  5203       tjensen     Initial creation
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
+ * 
+ * </pre>
+ * 
+ * @author tjensen
+ * @version 1.0
+ */
+
+public class TextTriggerHandler {
+    private static final String SCRIPT_LAUNCHER_PATH = "util/scriptLauncher";
+
+    /**
+     * Logger instance for system logging.
+     */
+    protected transient Logger logger = LoggerFactory.getLogger(getClass());
+
+    /**
+     * Constructor.
+     */
+    public TextTriggerHandler() {
+        super();
+    }
+
+    /**
+     * 
+     * @param script
+     * @param trigger
+     * @throws TriggerException
+     */
+    public void execute(String script, String trigger) throws TriggerException {
+        /*
+         * <pre> For script running, the script has format <path>/script_name
+         * <trigger pid>
+         * 
+         * This will need to basically replicate the script running capability.
+         * Initially, 1) retrieve the text product from the database (using the
+         * pid) 2) write the text product to a file using the standard file name
+         * env("FXA_DATA")/trigger/pid 3) execute the script </pre>
+         */
+        if (trigger == null || trigger.trim().equalsIgnoreCase("")) {
+            throw new TriggerException(
+                    "Invalid trigger, unable to execute script: " + script);
+        }
+
+        String prodID = null;
+        try {
+            prodID = (trigger.split(" "))[0];
+        } catch (Exception e) {
+            throw new TriggerException(
+                    "Unable to extract product ID, unable to execute script: "
+                            + script);
+        }
+
+        /* retrieve text product from textDB */
+        try {
+            String contents = retrieveTextProduct(prodID);
+            writeProductToFile(prodID, contents);
+            executeTriggerScript(script);
+            logger.info("Trigger: " + script);
+        } catch (Exception e) {
+            throw new TriggerException("unable to execute script " + script, e);
+        }
+    }
+
+    /**
+     * Retrieves the product from the text database. The retrieval is performed
+     * via the Text Database Service.
+     * 
+     * @param prodID
+     *            AFOS PIL of the product to retrieve
+     * 
+     * @return the latest product for the AFOS PIL
+     */
+    private String retrieveTextProduct(String prodID) {
+        Message message = createProductRequestMessage(prodID);
+        TextDBSrv server = new TextDBSrv();
+        Message response = server.processMessage(message);
+        return extractProductFromResponse((Message) response);
+    }
+
+    /**
+     * Generates the Text Database Server product request message. The message
+     * created will be similar to<BR>
+     * 
+     * <PRE>
+     *    {@literal <message>}
+     *       {@literal <header>}
+     *          {@literal <properties name="VIEW" value="text"/>}
+     *          {@literal <properties name="OP" value="GET"/>}
+     *          {@literal <properties name="SUBOP" value="PROD"/>}
+     *          {@literal <properties name="AFOSCMD" value="{prodID}"/>}
+     *       {@literal </header>}
+     *    {@literal </message>}
+     * </PRE>
+     * 
+     * @param prodID
+     *            AFOS PIL of the product to retrieve
+     * 
+     * @return the product request message
+     * 
+     */
+    private Message createProductRequestMessage(String prodID) {
+        Message message = new Message();
+        Header header = new Header();
+        List<Property> properties = new ArrayList<Property>();
+        properties.add(new Property("VIEW", "text"));
+        properties.add(new Property("OP", "GET"));
+        properties.add(new Property("SUBOP", "PROD"));
+        properties.add(new Property("AFOSCMD", prodID));
+        header.setProperties(properties.toArray(new Property[] {}));
+        message.setHeader(header);
+        return message;
+    }
+
+    /**
+     * Extracts the product from the response. The response message will be
+     * similar to<BR>
+     * 
+     * <PRE>
+     *    {@literal <message>}
+     *       {@literal <header>}
+     *          {@literal <properties name="STDOUT" value="{the text of the product}">}
+     *       {@literal </header>}
+     *    {@literal </message>}
+     * </PRE>
+     * 
+     * @param response
+     *            the response from the server
+     * 
+     * @return the product text
+     */
+    private String extractProductFromResponse(Message reply) {
+        StringBuffer retVal = new StringBuffer();
+        Header header = reply.getHeader();
+        if (header != null && header.getProperties() != null) {
+            for (Property property : header.getProperties()) {
+                if (property.getName().equalsIgnoreCase("stdout")) {
+                    retVal.append(property.getValue()).append("\n");
+                }
+            }
+        }
+
+        return retVal.toString();
+    }
+
+    /**
+     * Writes the product to the file system. The product is written to
+     * $FXA_DATA/trigger/{prodID} -- $FXA_DATA is obtained from the environment
+     * and {prodID} is the AFOS PIL of the product.
+     * 
+     * @param prodID
+     *            AFOS PIL of the product
+     * @param product
+     *            the product to export
+     */
+    private void writeProductToFile(String prodID, String product)
+            throws Exception {
+        String fxaData = System.getenv("FXA_DATA");
+        File fl = new File(fxaData, "trigger/" + prodID);
+        FileUtil.bytes2File(product.getBytes(), fl);
+    }
+
+    /**
+     * 
+     * @param script
+     * @throws Exception
+     */
+    private void executeTriggerScript(String script) throws Exception {
+        logger.info("Executing script: script= " + script);
+        Map<String, String> env = System.getenv();
+        List<String> strEnv = new ArrayList<String>();
+        for (Entry<String, String> entry : env.entrySet()) {
+            strEnv.add(entry.getKey() + "=" + entry.getValue());
+        }
+        String launcher = getScriptLauncher();
+        if (launcher != null)
+            script = launcher + ' ' + script;
+
+        RunProcess.getRunProcess()
+                .exec(script, strEnv.toArray(new String[] {}));
+    }
+
+    /**
+     * Finds a helper script that should be used to launch triggers. The helper
+     * script terminates immediately so that resources can be freed even if the
+     * trigger takes a long time to run.
+     * 
+     * @return The absolute path of the help script or null if not found.
+     */
+    private String getScriptLauncher() {
+        File f = null;
+        try {
+            f = PathManagerFactory.getPathManager().getStaticFile(
+                    SCRIPT_LAUNCHER_PATH);
+            if (f != null) {
+                f.setExecutable(true);
+                return f.getAbsolutePath();
+            } else {
+                logger.warn("Script launcher not found");
+                return null;
+            }
+        } catch (Exception e) {
+            logger.error("Error finding script launcher", e);
+            return null;
+        }
+    }
+
+}
diff --git a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/listener/GhgMonitorTableSelectionListener.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/TriggerException.java
similarity index 50%
rename from cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/listener/GhgMonitorTableSelectionListener.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/TriggerException.java
index 18445455f6..84ecfb1f4d 100644
--- a/cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/monitor/listener/GhgMonitorTableSelectionListener.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/services/TriggerException.java
@@ -17,27 +17,50 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.viz.ghg.monitor.listener;
-
-import com.raytheon.viz.ghg.monitor.event.GhgMonitorTableSelectionEvent;
+package com.raytheon.uf.edex.plugin.text.subscription.services;
 
 /**
- * Table selection interface.
+ * 
+ * Trigger Exception class
  * 
  * <pre>
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Jun 2, 2010            mpduff     Initial creation
- *
+ * Jan 5, 2016  5203       tjensen     Initial creation
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
+ * 
  * </pre>
- *
- * @author mpduff
- * @version 1.0	
+ * 
+ * @author tjensen
+ * @version 1.0
  */
+public class TriggerException extends Exception {
 
-public interface GhgMonitorTableSelectionListener {
-    public void notifyUpdate(GhgMonitorTableSelectionEvent evt);
-}
+    /**
+     * Default serial version UID
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * Create a Trigger Exception instance from only a message
+     * 
+     * @param message
+     */
+    public TriggerException(String message) {
+        super(message);
+    }
+
+    /**
+     * Create a Trigger Exception instance from both a message and a cause
+     * 
+     * @param message
+     * @param cause
+     */
+    public TriggerException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java
similarity index 87%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java
index 6ef19961a4..1666990b8c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/util/SubscribeAction.java
@@ -47,6 +47,8 @@ import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeUpdateRunn
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
  *                                      removed hard coded class names
  * Sep 05, 2014 2926       bclement    switched map from class names to class objects
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -55,21 +57,21 @@ import com.raytheon.uf.edex.plugin.text.subscription.runners.SubscribeUpdateRunn
  */
 
 public enum SubscribeAction {
-    ACTION_ADD,ACTION_READ,ACTION_DELETE,ACTION_UPDATE,ACTION_QUERY;
+    ACTION_ADD, ACTION_READ, ACTION_DELETE, ACTION_UPDATE, ACTION_QUERY;
     /**
      * A mapping of action names to SubscribeAction objects.
      */
     private static final Map<String, SubscribeAction> actions = new HashMap<String, SubscribeAction>() {
         private static final long serialVersionUID = 1L;
         {
-            put("add",ACTION_ADD);
-            put("read",ACTION_READ);
-            put("delete",ACTION_DELETE);
-            put("update",ACTION_UPDATE);
-            put("query",ACTION_QUERY);
+            put("add", ACTION_ADD);
+            put("read", ACTION_READ);
+            put("delete", ACTION_DELETE);
+            put("update", ACTION_UPDATE);
+            put("query", ACTION_QUERY);
         }
     };
-    
+
     /**
      * A mapping of SubscribeAction objects to implementation class
      */
@@ -83,20 +85,25 @@ public enum SubscribeAction {
             put(ACTION_QUERY, SubscribeQueryRunner.class);
         }
     };
+
     /**
      * Constructor.
      */
-    private SubscribeAction(){}
+    private SubscribeAction() {
+    }
+
     /**
      * Factory method that gets the SubscribeAction object for an action name.
      * 
-     * @param action name of the requested action
+     * @param action
+     *            name of the requested action
      * 
      * @return the corresponding action
      */
     public static final SubscribeAction translate(String action) {
         return actions.get(action.toLowerCase());
     }
+
     /**
      * Returns the class name of the runner associated with the action.
      */
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java
similarity index 88%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java
index 52a8dc64aa..47408a3ee9 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/util/Tools.java
@@ -20,7 +20,6 @@
 package com.raytheon.uf.edex.plugin.text.subscription.util;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import com.raytheon.uf.common.message.Property;
@@ -38,6 +37,8 @@ import com.raytheon.uf.common.message.Property;
  * 14Sep2010    3944       cjeanbap    Trim the newline char from value.
  * May 22, 2014 2536       bclement    moved from autobldsrv to edex.plugin.text
  * Sep 05, 2014 2926       bclement    removed hex utilities
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text to 
+ *                                     edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -59,15 +60,16 @@ public final class Tools {
      * @param properties
      * @return
      */
-    public static final List<Property> adjustMessageProperties(Property[] properties) {
+    public static final List<Property> adjustMessageProperties(
+            Property[] properties) {
         List<Property> retVal = new ArrayList<Property>();
         for (Property prop : properties) {
             if (!"operation".equalsIgnoreCase(prop.getName())) {
                 if ("file".equalsIgnoreCase(prop.getName())) {
-                    prop.setName("filepath");                    
+                    prop.setName("filepath");
                     if (prop.getValue().indexOf('\n') > 0) {
                         int len = prop.getValue().length();
-                        prop.setValue(prop.getValue().substring(0, len-1));
+                        prop.setValue(prop.getValue().substring(0, len - 1));
                     }
                 }
                 if ("index".equalsIgnoreCase(prop.getName())) {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java
similarity index 92%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java
index 34f779f4ea..e3f4567632 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java
@@ -23,7 +23,7 @@ import java.util.Date;
 
 import org.quartz.CronExpression;
 
-import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
+import com.raytheon.uf.common.dataplugin.text.subscription.db.SubscriptionRecord;
 
 /**
  * Utility for matching stored subscriptions to query triggers
@@ -36,6 +36,8 @@ import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
  * ------------ ---------- ----------- --------------------------
  * May 22, 2014 2536       bclement     Initial creation
  * 12.13.14     DR 14638   dhuffman     Cut whitespace.
+ * Jan 18, 2016 4562       tjensen      Moved from edex.plugin.text to 
+ *                                      edex.plugin.text.subscription
  * 
  * </pre>
  * 
@@ -82,8 +84,9 @@ public class TriggerMatcher {
             // 3)+"NNNXXX" +
             // " -- trigger.substring(0, 3)+\"NNN\"+trigger.substring(6)="+trigger.substring(0,
             // 3)+"NNN"+trigger.substring(6));
-            
-            // Below, "subscriptionTrigger" is data from the subscription database table.
+
+            // Below, "subscriptionTrigger" is data from the subscription
+            // database table.
             String subscriptionTrigger = recordTrigger.replaceAll("\\s+$", "");
             String requestTrigger = trigger.replaceAll("\\s+$", "");
             retVal = (requestTrigger.equalsIgnoreCase(subscriptionTrigger))
@@ -93,7 +96,8 @@ public class TriggerMatcher {
                             .equalsIgnoreCase(subscriptionTrigger))
                     || ((requestTrigger.substring(0, 3) + "NNNXXX")
                             .equalsIgnoreCase(subscriptionTrigger))
-                    || ((requestTrigger.substring(0, 3) + "NNN" + requestTrigger.substring(6))
+                    || ((requestTrigger.substring(0, 3) + "NNN" + requestTrigger
+                            .substring(6))
                             .equalsIgnoreCase(subscriptionTrigger) || (subscriptionTrigger
                             .startsWith(requestTrigger)));
         } else {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/utility/common_static/base/notification/text-subscription.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/utility/common_static/base/notification/text-subscription.xml
new file mode 100644
index 0000000000..5cc9ce17f2
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/utility/common_static/base/notification/text-subscription.xml
@@ -0,0 +1,22 @@
+<pluginNotificationList>
+    <pluginNotification>
+        <endpointName>autoFaxRoute</endpointName>
+        <format>PDO</format>
+        <endpointType>VM</endpointType>
+        <metadataMap>
+            <mapping key="pluginName">
+                <constraint constraintValue="text" constraintType="EQUALS"/>
+            </mapping>
+        </metadataMap>
+    </pluginNotification>
+    <pluginNotification>
+        <endpointName>textToWatchWarn</endpointName>
+        <format>PDO</format>
+        <endpointType>DIRECTVM</endpointType>
+        <metadataMap>
+            <mapping key="pluginName">
+                <constraint constraintValue="text" constraintType="EQUALS"/>
+            </mapping>
+        </metadataMap>
+    </pluginNotification>
+</pluginNotificationList>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/utility/edex_static/base/util/scriptLauncher b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/utility/edex_static/base/util/scriptLauncher
new file mode 100644
index 0000000000..9296c2ce16
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text.subscription/utility/edex_static/base/util/scriptLauncher
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# This starts the desired script passing the script name and arguments as a 
+# single string ("$@"). It then sends stdout/stderr to the bit bucket 
+# (>&/dev/null).
+# The stdin for the script is also the bit bucket (</dev/null) so if used it 
+# immediately indicates end of file. Finally the script is set to run in the 
+# background (&) so the launcher returns without waiting for the script to 
+# return.
+exec "$@" >&/dev/null </dev/null &
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
index 57a6176c29..ac63fb17f0 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Text Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.plugin.text
-Bundle-Version: 1.15.1.qualifier
+Bundle-Version: 1.16.0.qualifier
 Bundle-Vendor: RAYTHEON
-Require-Bundle: org.apache.commons.lang,
+Require-Bundle: org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.edex.common,
  javax.persistence,
  com.raytheon.uf.common.serialization.comm,
@@ -13,22 +13,14 @@ Require-Bundle: org.apache.commons.lang,
  com.raytheon.uf.common.site;bundle-version="1.12.1174",
  com.raytheon.uf.edex.archive,
  com.raytheon.uf.edex.ndm;bundle-version="1.0.0",
- com.raytheon.uf.common.localization;bundle-version="1.14.0"
+ com.raytheon.uf.common.localization;bundle-version="1.14.0",
+ com.raytheon.uf.common.dataplugin.text
 Export-Package: com.raytheon.uf.edex.plugin.text,
  com.raytheon.uf.edex.plugin.text.dao,
  com.raytheon.uf.edex.plugin.text.db,
- com.raytheon.uf.edex.plugin.text.dbsrv,
- com.raytheon.uf.edex.plugin.text.dbsrv.impl,
- com.raytheon.uf.edex.plugin.text.security
+ com.raytheon.uf.edex.plugin.text.impl
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Import-Package: com.raytheon.edex.uengine.runners,
- com.raytheon.uf.common.dataplugin.text,
- com.raytheon.uf.common.dataplugin.text.alarms,
- com.raytheon.uf.common.dataplugin.text.db,
- com.raytheon.uf.common.dataplugin.text.dbsrv,
- com.raytheon.uf.common.dataplugin.text.request,
- com.raytheon.uf.common.dataplugin.text.util,
- com.raytheon.uf.common.message,
+Import-Package: com.raytheon.uf.common.message,
  com.raytheon.uf.common.wmo,
- org.apache.commons.logging,
+ org.slf4j,
  org.quartz
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml
index 82310332a3..0f9e76e8c2 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-common.xml
@@ -1,8 +1,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
   http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-  
+
     <bean id="fxaCommonDbPluginProperties" class="com.raytheon.uf.edex.database.DatabasePluginProperties">
         <property name="pluginFQN" value="com.raytheon.uf.edex.database" />
         <property name="database" value="fxa" />
@@ -13,104 +13,44 @@
         <constructor-arg value="com.raytheon.uf.edex.database.fxa" />
         <constructor-arg ref="fxaCommonDbPluginProperties" />
     </bean>
-  
-  	<bean id="textProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
-		<property name="pluginName" value="text" />
-		<property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.text" />
-		<property name="dao" value="com.raytheon.uf.edex.plugin.text.dao.TextDao" />
-		<property name="database" value="fxa"/>
-		<property name="record" value="com.raytheon.uf.edex.plugin.text.TextRecord"/>
-	</bean>
-	
-	<bean id="textRegistered" factory-bean="pluginRegistry" factory-method="register"
-			depends-on="fxaTxManager,fxaCommonDbRegistered">
-		<constructor-arg value="text"/>
-		<constructor-arg ref="textProperties"/>
-	</bean>
- 
-   	<bean id="fxaDbSessionConfig" class="com.raytheon.uf.edex.database.DatabaseSessionConfiguration">
-   	    <property name="classFinder" ref="dbClassFinder" />
+
+    <bean id="textProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
+        <property name="pluginName" value="text" />
+        <property name="pluginFQN" value="com.raytheon.uf.common.dataplugin.text" />
+        <property name="dao" value="com.raytheon.uf.edex.plugin.text.dao.TextDao" />
+        <property name="database" value="fxa"/>
+        <property name="record" value="com.raytheon.uf.edex.plugin.text.TextRecord"/>
+    </bean>
+
+    <bean id="textRegistered" factory-bean="pluginRegistry" factory-method="register"
+            depends-on="fxaTxManager,fxaCommonDbRegistered">
+        <constructor-arg value="text"/>
+        <constructor-arg ref="textProperties"/>
+    </bean>
+
+    <bean id="fxaDbSessionConfig" class="com.raytheon.uf.edex.database.DatabaseSessionConfiguration">
+        <property name="classFinder" ref="dbClassFinder" />
         <property name="includes">
            <list>
                 <value>com.raytheon.uf.common.dataplugin.text</value>
+                <value>com.raytheon.uf.common.dataplugin.text.subscription</value>
                 <value>com.raytheon.uf.edex.database</value>
            </list>
         </property>
     </bean>
- 	<bean id="fxaSessionFactory"
-		class="com.raytheon.uf.edex.database.DatabaseSessionFactoryBean">
-		<property name="configLocation">
-			<value>file:///${edex.home}/conf/db/hibernateConfig/fxa/hibernate.cfg.xml</value>
-		</property>
-		<property name="databaseSessionConfiguration" ref="fxaDbSessionConfig"/>
-	</bean>
-
-	<bean id="fxaTxManager"
-		class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-		<property name="sessionFactory" ref="fxaSessionFactory" />
-	</bean>
- 	
-     <bean id="autoFaxDao" class="com.raytheon.uf.edex.plugin.text.fax.AutoFaxDao">
-       <property name="autoFaxNotifyURI" value="jms-generic:topic:autofax.notify"/>
+    <bean id="fxaSessionFactory"
+        class="com.raytheon.uf.edex.database.DatabaseSessionFactoryBean">
+        <property name="configLocation">
+            <value>file:///${edex.home}/conf/db/hibernateConfig/fxa/hibernate.cfg.xml</value>
+        </property>
+        <property name="databaseSessionConfiguration" ref="fxaDbSessionConfig"/>
     </bean>
 
-    <bean id="textdbsrv" class="com.raytheon.uf.edex.plugin.text.dbsrv.TextDBSrv" />
-    
-    <!-- subscription -->
-  
-    <bean id="subscriptionDao" class="com.raytheon.uf.edex.plugin.text.dao.SubscriptionDAO">
-       <property name="subscriptionNotifyURI" value="jms-generic:topic:subscription.notify"/>
+    <bean id="fxaTxManager"
+        class="org.springframework.orm.hibernate4.HibernateTransactionManager">
+        <property name="sessionFactory" ref="fxaSessionFactory" />
     </bean>
 
-    <!-- define the bean that handles ldad watch/warn script handling -->
-    <bean id="ldadScriptRunner" class="com.raytheon.uf.edex.plugin.text.subscription.services.ScriptRunner">
-        <property name="type" value="ldad" />
-    </bean>
-    
- 	<camelContext id="autofax-common-camel" 
-	              xmlns="http://camel.apache.org/schema/spring"
-                  errorHandlerRef="errorHandler">
-		<route id="autoFaxNotify">
-           <from uri="jms-generic:topic:autofax.notify"/>
-		   <doTry>
-		   	   <bean ref="autoFaxDao" method="updateCache" />
-		   	   <doCatch>
-					<exception>java.lang.Throwable</exception>
-					<to uri="log:autoFax?level=ERROR"/>
-		   	   </doCatch>
-		   </doTry>
-		</route>
-
-        <route id="textdbsrvinternal">
-            <from uri="direct-vm:int.textdb.request" />
-            <bean ref="textdbsrv" method="processMessage" />
-        </route>
-        
-        <route id="subscriptionNotify">
-           <from uri="jms-generic:topic:subscription.notify"/>
-           <doTry>
-               <bean ref="subscriptionDao" method="updateCache" />
-               <doCatch>
-                    <exception>java.lang.Throwable</exception>
-                    <to uri="log:subscription?level=ERROR"/>
-               </doCatch>
-           </doTry>
-        </route>
-
-        <!-- LDAD (watch/warn) triggered script runner, internal use only -->
-        <route id="ldadWatchWarnDirect">
-            <from uri="direct-vm:ldadWatchWarnDirect"/>
-           <doTry>
-               <bean ref="ldadScriptRunner" method="runScripts" />
-               <doCatch>
-                    <exception>java.lang.Throwable</exception>
-                    <to uri="log:subscription?level=ERROR"/>
-               </doCatch>
-           </doTry>
-        </route>        
-
-	</camelContext>
-
     <bean factory-bean="manualProc"
         factory-method="registerSecondaryPlugin">
         <constructor-arg value="text" />
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml
index f48948c096..89f0e5958b 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-ingest.xml
@@ -1,148 +1,71 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+    http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
     <bean class="com.raytheon.uf.common.logback.appender.ThreadBasedAppender" factory-method="registerThreadPattern">
         <constructor-arg value="text" />
         <constructor-arg value="Ingest.Text.*" />
     </bean>
 
-	<bean id="textDecoder" class="com.raytheon.uf.edex.plugin.text.TextDecoder">
-		<property name="pluginName" value="text" />
-		<property name="decoderMode" value="STD" />
-	</bean>
+    <bean id="textDecoder" class="com.raytheon.uf.edex.plugin.text.TextDecoder">
+        <property name="pluginName" value="text" />
+        <property name="decoderMode" value="STD" />
+    </bean>
 
-	<bean id="textDistRegistry" factory-bean="distributionSrv"
-		factory-method="register">
-		<constructor-arg value="text" />
-		<constructor-arg value="jms-durable:queue:Ingest.Text"/>
-	</bean>
+    <bean id="textDistRegistry" factory-bean="distributionSrv"
+        factory-method="register">
+        <constructor-arg value="text" />
+        <constructor-arg value="jms-durable:queue:Ingest.Text"/>
+    </bean>
 
-	<bean id="textHandleoupDistRegistry" factory-bean="handleoupDistributionSrv"
-		factory-method="register">
-		<constructor-arg value="text" />
-		<constructor-arg value="jms-durable:queue:Ingest.Text"/>
-	</bean>
-
-	<!-- define the bean that handles automatic faxing of products. -->
-	<bean id="autoFaxManager" class="com.raytheon.uf.edex.plugin.text.subscription.AutoFaxManager">
-	</bean>
+    <bean id="textHandleoupDistRegistry" factory-bean="handleoupDistributionSrv"
+        factory-method="register">
+        <constructor-arg value="text" />
+        <constructor-arg value="jms-durable:queue:Ingest.Text"/>
+    </bean>
 
     <!-- verify text product info for site, spawns in separate thread to not delay start up -->
     <bean id="textVersionPurge" class="com.raytheon.uf.edex.plugin.text.TextVersionPurge" depends-on="textRegistered"/>
 
-	<!-- Special handler for text plugin archives that bases filenames off 
-	     creation time-->
-    <bean id="textArchiveNamer" class="com.raytheon.uf.edex.plugin.text.maintenance.archiver.TextArchiveFileNameFormatter" />
-	<bean factory-bean="databaseArchiver" factory-method="registerPluginArchiveFormatter" depends-on="databaseArchiver">
-		<constructor-arg value="text" />
-		<constructor-arg ref="textArchiveNamer" />
-	</bean>
-
-    <bean factory-bean="databaseArchiver" factory-method="registerPluginBatchSize" depends-on="databaseArchiver">
-        <constructor-arg value="text" />
-        <constructor-arg value="1000" type="java.lang.Integer"/>
+    <bean id="fxaBloatMonitor" class="com.raytheon.uf.edex.database.health.DatabaseBloatMonitor">
+        <constructor-arg>
+            <bean class="com.raytheon.uf.edex.database.health.PostgresBloatDao">
+                <constructor-arg value="fxa"/>
+            </bean>
+        </constructor-arg>
+        <constructor-arg ref="warningThresholds"/>
+        <constructor-arg ref="criticalThresholds"/>
     </bean>
 
-    <bean id="afosToAwipsListener" class="com.raytheon.uf.edex.plugin.text.ingest.AfosToAwipsListener" />
-    <bean id="afosBrowserListener" class="com.raytheon.uf.edex.plugin.text.ingest.AfosBrowserModelSubscriber" />
-    
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="afos2awips.txt" />
-        <constructor-arg ref="afosToAwipsListener" />
+    <bean factory-bean="dbMonitorRegistry" factory-method="registerMonitor">
+        <constructor-arg value="fxaBloatMonitor" />
+        <constructor-arg ref="fxaBloatMonitor" />
     </bean>
 
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="textCCChelp.txt" />
-        <constructor-arg ref="afosBrowserListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="textNNNhelp.txt" />
-        <constructor-arg ref="afosBrowserListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="textCategoryClass.txt" />
-        <constructor-arg ref="afosBrowserListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="textOriginTable.txt" />
-        <constructor-arg ref="afosBrowserListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="afosMasterPIL.txt" />
-        <constructor-arg ref="afosBrowserListener" />
-    </bean>
-    
-    <!-- textdb -->
-    <bean id="textDBStaticDataListener" class="com.raytheon.uf.edex.plugin.text.ingest.TextDBStaticDataSubscriber">
-        <constructor-arg value="jms-generic:topic:textDBFilesChanged"/>
-    </bean>
-    <bean id="siteMapListener" class="com.raytheon.uf.edex.plugin.text.ingest.SiteMapNationalDatasetSubscriber" />
+    <camelContext id="text-camel"
+        xmlns="http://camel.apache.org/schema/spring"
+        errorHandlerRef="errorHandler">
+        <!--
+        <endpoint id="textFileEndpoint" uri="file:${edex.home}/data/sbn/text?noop=true&amp;idempotent=false" />
 
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="bit_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="collective_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="exclusionProductList.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="ispan_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="station_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="upair_table.dat" />
-        <constructor-arg ref="textDBStaticDataListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="afos_lookup_table.dat" />
-        <constructor-arg ref="siteMapListener" />
-    </bean>
-    <bean factory-bean="ndmProc" factory-method="registerListener">
-        <constructor-arg value="national_category_table.template" />
-        <constructor-arg ref="siteMapListener" />
-    </bean>
-    
-    <!-- subscription -->
-    
-    <!-- define the bean that handles Quartz scheduled script running -->
-    <bean id="timerScriptRunner" class="com.raytheon.uf.edex.plugin.text.subscription.services.ScriptRunner" >
-        <property name="type" value="timer" />
-    </bean>
-    
-	<camelContext id="text-camel"
-		xmlns="http://camel.apache.org/schema/spring"
-		errorHandlerRef="errorHandler">
-		<!--
-		<endpoint id="textFileEndpoint" uri="file:${edex.home}/data/sbn/text?noop=true&amp;idempotent=false" />
-
-		<route id="textFileConsumerRoute">
-			<from ref="textFileEndpoint" />
-			<bean ref="fileToString" />
-			<setHeader headerName="pluginName">
-				<constant>text</constant>
-			</setHeader>
-			<to uri="jms-durable:queue:Ingest.Text" />
-		</route>
-		-->
+        <route id="textFileConsumerRoute">
+            <from ref="textFileEndpoint" />
+            <bean ref="fileToString" />
+            <setHeader headerName="pluginName">
+                <constant>text</constant>
+            </setHeader>
+            <to uri="jms-durable:queue:Ingest.Text" />
+        </route>
+        -->
                 
         <!-- Refer to edex.xml for name/location of properties file -->
         <endpoint id="runnerCron" uri="quartz://runner/runnerScheduled/?cron=${subscription.cron}"/>
 
-		<!--
+        <!--
           Text routes.
           If an internal route (see ContextManager.INTERNAL_ENDPOINT_TYPES) is being sent data from another internal
           route in the same context it needs to come after the route that sends it data for proper startup/shutdown order.
-		-->
+        -->
         <route id="textUndecodedIngestRoute">
             <from uri="jms-durable:queue:Ingest.Text?concurrentConsumers=2" />
             <setHeader headerName="pluginName">
@@ -154,11 +77,9 @@
                     <bean ref="textDecoder" method="decodeFile" />
                     <bean ref="processUtil" method="log"/>
                     <multicast>
-                        <!-- This route needs to go to Mark's  -->
-                        <to uri="direct:textToWatchWarn"/>
-                        <to uri="direct:textSerializeRoute" />
                         <to uri="direct:textPurgeAccumulate" />
-                        <to uri="vm:autoFaxRoute" />
+                        <to uri="direct:textSerializeRoute" />
+                        <to uri="direct-vm:stageNotification"/>
                     </multicast>
                 </pipeline>
                 <doCatch>
@@ -168,154 +89,111 @@
             </doTry>
         </route>
 
-		<route id="textDirectDecodedIngestRoute">
-			<from uri="direct-vm:textDirectDecodedIngestRoute" />
-			<setHeader headerName="pluginName">
-				<constant>text</constant>
-			</setHeader>
-			<doTry>
-				<pipeline>
-					<bean ref="textDecoder" method="writeTextProduct" />
-					<bean ref="processUtil" method="log"/>
-					<multicast>
-						<to uri="direct:textToWatchWarn"/>
-						<to uri="direct:textSerializeRoute" />
-						<to uri="direct:textPurgeAccumulate" />
-						<to uri="vm:autoFaxRoute" />
-					</multicast>
-				</pipeline>
-				<doCatch>
-					<exception>java.lang.Throwable</exception>
-					<to uri="log:text?level=INFO"/>
-				</doCatch>
-			</doTry>
-		</route>
-
-		<route id="textDirectUndecodedIngestRoute">
-			<from uri="direct-vm:textDirectUndecodedIngestRoute" />
-			<setHeader headerName="pluginName">
-				<constant>text</constant>
-			</setHeader>
-			<doTry>
-				<pipeline>
-					<bean ref="textDecoder" method="decode" />
-					<bean ref="processUtil" method="log"/>
-					<multicast>
-						<to uri="direct:textToWatchWarn"/>
-						<to uri="direct:textSerializeRoute" />
-						<to uri="direct:textPurgeAccumulate" />
-						<to uri="vm:autoFaxRoute" />
-					</multicast>
-				</pipeline>
-				<doCatch>
-					<exception>java.lang.Throwable</exception>
-					<to uri="log:text?level=INFO"/>
-				</doCatch>
-			</doTry>
-		</route>
-
-		<route id="textToWatchWarnRoute">
-			<from uri="direct:textToWatchWarn" />
-			<bean ref="textDecoder" method="transformToProductIds" />
-			<to uri="jms-durable:queue:watchwarn" />
-		</route>
-
-		<route id="textSerializationRoute">
-			<from uri="direct:textSerializeRoute" />
-			<split streaming="true" >
-				<method bean="textDecoder" method="separator" />
-				<bean ref="textDecoder" method="transformToSimpleString" />
-				<bean ref="serializationUtil" method="transformToThrift"/>
-				<to uri="jms-generic:topic:edex.alarms.msg?timeToLive=60000" />
-			</split>
-		</route>
-
-		<route id="textPurgeAccumulateRoute">
-			<from uri="direct:textPurgeAccumulate" />
-			<bean ref="textVersionPurge" method="accumulateAfosIdToPurge" />
-		</route>
-
-		<route id="textPurgeSendRoute">
-		    <from uri="timer://textPurgeSend?period=60s" />
-			<doTry>
-				<bean ref="textVersionPurge" method="getAfosIdsToPurge"/>
-				<to uri="jms-generic:queue:textPurgeRequest" />
-				<doCatch>
-					<exception>java.lang.Throwable</exception>
-					<to uri="log:purge?level=ERROR"/>
-				</doCatch>
-			</doTry>
-		</route>
-
-		<!-- AutoFax route -->
-		<route id="autoFaxRoute">
-			<from uri="vm:autoFaxRoute" />
-			<doTry>
-				<bean ref="autoFaxManager" method="processEvent" />
-				<doCatch>
-					<exception>java.lang.Throwable</exception>
-					<to uri="log:autoFax?level=ERROR"/>
-				</doCatch>
-			</doTry>
-		</route>
-                
-        <route id="textDBStaticSetDirty">
-            <from uri="jms-generic:topic:textDBFilesChanged"/>
-            <bean ref="textDBStaticDataListener" method="setDirty"/>
-        </route>
-
-        <!-- Quartz Timer triggered script runner -->
-        <route id="runnerScheduled">
-            <from uri="runnerCron" />
+        <route id="textDirectDecodedIngestRoute">
+            <from uri="direct-vm:textDirectDecodedIngestRoute" />
+            <setHeader headerName="pluginName">
+                <constant>text</constant>
+            </setHeader>
             <doTry>
-                <bean ref="timerScriptRunner" method="runScripts" />
+                <pipeline>
+                    <bean ref="textDecoder" method="writeTextProduct" />
+                    <bean ref="processUtil" method="log"/>
+                    <multicast>
+                        <to uri="direct:textPurgeAccumulate" />
+                        <to uri="direct:textSerializeRoute" />
+                        <to uri="direct-vm:stageNotification"/>
+                    </multicast>
+                </pipeline>
                 <doCatch>
                     <exception>java.lang.Throwable</exception>
-                    <to uri="log:subscription?level=ERROR"/>
+                    <to uri="log:text?level=INFO"/>
                 </doCatch>
             </doTry>
         </route>
 
-        <!-- LDAD (watch/warn) triggered script runner -->
-        <route id="ldadWatchWarn">
-           <from uri="jms-durable:queue:watchwarn"/>
-           <doTry>
-               <bean ref="ldadScriptRunner" method="runScripts" />
-               <doCatch>
+        <route id="textDirectUndecodedIngestRoute">
+            <from uri="direct-vm:textDirectUndecodedIngestRoute" />
+            <setHeader headerName="pluginName">
+                <constant>text</constant>
+            </setHeader>
+            <doTry>
+                <pipeline>
+                    <bean ref="textDecoder" method="decode" />
+                    <bean ref="processUtil" method="log"/>
+                    <multicast>
+                        <to uri="direct:textPurgeAccumulate" />
+                        <to uri="direct:textSerializeRoute" />
+                        <to uri="direct-vm:stageNotification"/>
+                    </multicast>
+                </pipeline>
+                <doCatch>
                     <exception>java.lang.Throwable</exception>
-                    <to uri="log:subscription?level=ERROR"/>
-               </doCatch>
-           </doTry>
+                    <to uri="log:text?level=INFO"/>
+                </doCatch>
+            </doTry>
         </route>
-	</camelContext>
 
-	<camelContext id="clustered-text-camel"
-		xmlns="http://camel.apache.org/schema/spring"
-		errorHandlerRef="errorHandler">
-		<!-- TextPurge route -->
-		<route id="textPurgeRequestRoute">
-			<from uri="jms-generic:queue:textPurgeRequest" />
-			<doTry>
-				<bean ref="textVersionPurge" method="addAfosIdsToPurge"/>
-				<doCatch>
-					<exception>java.lang.Throwable</exception>
-					<to uri="log:purge?level=ERROR"/>
-				</doCatch>
-			</doTry>
-		</route>
-		<route id="textPurgeRoute">
-		    <from uri="timer://textPurge?period=60s" />
-			<doTry>
-				<bean ref="textVersionPurge" method="purgeAfosIds"/>
-				<doCatch>
-					<exception>java.lang.Throwable</exception>
-					<to uri="log:purge?level=ERROR"/>
-				</doCatch>
-			</doTry>
-		</route>
-	</camelContext>
+        <route id="textSerializationRoute">
+            <from uri="direct:textSerializeRoute" />
+            <split streaming="true" >
+                <method bean="textDecoder" method="separator" />
+                <bean ref="textDecoder" method="transformToSimpleString" />
+                <bean ref="serializationUtil" method="transformToThrift"/>
+                <to uri="jms-generic:topic:edex.alarms.msg?timeToLive=60000" />
+            </split>
+        </route>
 
-	<bean factory-bean="contextManager" factory-method="registerClusteredContext">
-		<constructor-arg ref="clustered-text-camel" />
-  	</bean>
+        <route id="textPurgeAccumulateRoute">
+            <from uri="direct:textPurgeAccumulate" />
+            <bean ref="textVersionPurge" method="accumulateAfosIdToPurge" />
+        </route>
+
+        <route id="textToStageNotificationRoute">
+            <from uri="jms-durable:queue:textToStageNotification" />
+            <bean ref="textDecoder" method="transformStringToTextRecord" />
+            <to uri="direct-vm:stageNotification"/>
+        </route>
+
+        <route id="textPurgeSendRoute">
+            <from uri="timer://textPurgeSend?period=60s" />
+            <doTry>
+                <bean ref="textVersionPurge" method="getAfosIdsToPurge"/>
+                <to uri="jms-generic:queue:textPurgeRequest" />
+                <doCatch>
+                    <exception>java.lang.Throwable</exception>
+                    <to uri="log:purge?level=ERROR"/>
+                </doCatch>
+            </doTry>
+        </route>
+    </camelContext>
+
+    <camelContext id="clustered-text-camel"
+        xmlns="http://camel.apache.org/schema/spring"
+        errorHandlerRef="errorHandler">
+        <!-- TextPurge route -->
+        <route id="textPurgeRequestRoute">
+            <from uri="jms-generic:queue:textPurgeRequest" />
+            <doTry>
+                <bean ref="textVersionPurge" method="addAfosIdsToPurge"/>
+                <doCatch>
+                    <exception>java.lang.Throwable</exception>
+                    <to uri="log:purge?level=ERROR"/>
+                </doCatch>
+            </doTry>
+        </route>
+        <route id="textPurgeRoute">
+            <from uri="timer://textPurge?period=60s" />
+            <doTry>
+                <bean ref="textVersionPurge" method="purgeAfosIds"/>
+                <doCatch>
+                    <exception>java.lang.Throwable</exception>
+                    <to uri="log:purge?level=ERROR"/>
+                </doCatch>
+            </doTry>
+        </route>
+    </camelContext>
+
+    <bean factory-bean="contextManager" factory-method="registerClusteredContext">
+        <constructor-arg ref="clustered-text-camel" />
+    </bean>
 </beans>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml
index c7ba2d7f16..a615fecef6 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/res/spring/text-request.xml
@@ -1,84 +1,30 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-     http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
-     http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-  
-  	<bean id="getAfosIdHandler" class="com.raytheon.uf.edex.plugin.text.handler.GetAfosIdHandler" />
-	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetAfosIdRequest"/>
-  		<constructor-arg ref="getAfosIdHandler"/>
-  	</bean>
-  	
-  	<bean id="getPartialAfosIdHandler" class="com.raytheon.uf.edex.plugin.text.handler.GetPartialAfosIdHandler" />
-	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetPartialAfosIdRequest"/>
-  		<constructor-arg ref="getPartialAfosIdHandler"/>
-  	</bean>
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
 
-	<bean id="getWmoIdHandler" class="com.raytheon.uf.edex.plugin.text.handler.GetWmoIdHandler" />
-	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetWmoIdRequest"/>
-  		<constructor-arg ref="getWmoIdHandler"/>
-  	</bean>
-  	
-  	<bean id="insertStdTextProduct" class="com.raytheon.uf.edex.plugin.text.handler.InsertStdTextProductHandler"/>  	
-  	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.InsertStdTextProductRequest"/>
-  		<constructor-arg ref="insertStdTextProduct"/>
-  	</bean>
-  	
-  	<!-- Instantiate the handler class for StdTextProductRequestHandler -->
-  	<bean id="stdTextProduct" class="com.raytheon.uf.edex.plugin.text.handler.StdTextProductRequestHandler"/>
-  	<!-- Register the handler class with the StdTextProductServerHandlerRegister. -->  	
-  	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.StdTextProductServerRequest"/>
-  		<constructor-arg ref="stdTextProduct"/>
-  	</bean>
-  	
-  	<!-- Instantiate the handler class for TextProductInfoRequestHandler -->
-  	<bean id="textProductInfo" class="com.raytheon.uf.edex.plugin.text.handler.TextProductInfoCreateHandler"/>
-  	<!-- Register the handler class with the TextProductInfoHandlerRegister. -->  	
-  	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.TextProductInfoCreateRequest"/>
-  		<constructor-arg ref="textProductInfo"/>
-  	</bean>
-  
-	<bean id="sendFaxRequestHandler" class="com.raytheon.uf.edex.plugin.text.handler.SendFaxRequestHandler" />
-	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.SendFaxRequest"/>
-  		<constructor-arg ref="sendFaxRequestHandler"/>
-  	</bean>
-  	
-	<bean id="autoFaxRequestHandler" class="com.raytheon.uf.edex.plugin.text.handler.AutoFaxRequestHandler" />
-	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.AutoFaxRequest"/>
-  		<constructor-arg ref="autoFaxRequestHandler"/>
-  	</bean>
-	<bean id="getAutoFaxRecordsRequestHandler" class="com.raytheon.uf.edex.plugin.text.handler.GetAutoFaxRecordsRequestHandler" />
-	<bean factory-bean="handlerRegistry" factory-method="register">
-  		<constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.GetAutoFaxRecordsRequest"/>
-  		<constructor-arg ref="getAutoFaxRecordsRequestHandler"/>
-  	</bean>
-    
-    <!-- textdb -->
+    <bean id="insertStdTextProduct" class="com.raytheon.uf.edex.plugin.text.handler.InsertStdTextProductHandler"/>
 
-    <bean id="executeAfosCmdHandler" class="com.raytheon.uf.edex.plugin.text.handler.ExecuteAfosCmdHandler" />
     <bean factory-bean="handlerRegistry" factory-method="register">
-        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteAfosCmdRequest"/>
-        <constructor-arg ref="executeAfosCmdHandler"/>
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.InsertStdTextProductRequest"/>
+        <constructor-arg ref="insertStdTextProduct"/>
     </bean>
 
-    <bean id="executeAwipsCmdHandler" class="com.raytheon.uf.edex.plugin.text.handler.ExecuteAwipsCmdHandler" />
+    <!-- Instantiate the handler class for StdTextProductRequestHandler -->
+    <bean id="stdTextProduct" class="com.raytheon.uf.edex.plugin.text.handler.StdTextProductRequestHandler"/>
+
+    <!-- Register the handler class with the StdTextProductServerHandlerRegister. -->
     <bean factory-bean="handlerRegistry" factory-method="register">
-        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteAwipsCmdRequest"/>
-        <constructor-arg ref="executeAwipsCmdHandler"/>
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.StdTextProductServerRequest"/>
+        <constructor-arg ref="stdTextProduct"/>
     </bean>
 
-    <bean id="executeWmoCmdHandler" class="com.raytheon.uf.edex.plugin.text.handler.ExecuteWmoCmdHandler" />
+    <!-- Instantiate the handler class for TextProductInfoRequestHandler -->
+    <bean id="textProductInfo" class="com.raytheon.uf.edex.plugin.text.handler.TextProductInfoCreateHandler"/>
+
+    <!-- Register the handler class with the TextProductInfoHandlerRegister. -->
     <bean factory-bean="handlerRegistry" factory-method="register">
-        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.ExecuteWmoCmdRequest"/>
-        <constructor-arg ref="executeWmoCmdHandler"/>
+        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.TextProductInfoCreateRequest"/>
+        <constructor-arg ref="textProductInfo"/>
     </bean>
 
     <bean id="writeProductHandler" class="com.raytheon.uf.edex.plugin.text.handler.WriteProductHandler" />
@@ -87,35 +33,6 @@
         <constructor-arg ref="writeProductHandler"/>
     </bean>
 
-    <bean id="remoteRetrievalHandler" class="com.raytheon.uf.edex.plugin.text.handler.RemoteRetrievalHandler">
-        <property name="rrManager" ref="remoteRetrievalManager" />
-    </bean>
-    <bean factory-bean="handlerRegistry" factory-method="register">
-        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest"/>
-        <constructor-arg ref="remoteRetrievalHandler"/>
-    </bean>
-    
-    <bean factory-bean="handlerRegistry" factory-method="register">
-        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.dbsrv.TextDBRequest"/>
-        <constructor-arg>
-            <bean class="com.raytheon.uf.edex.plugin.text.dbsrv.TextDBRequestHandler">
-                <constructor-arg ref="textdbsrv" />
-            </bean>
-        </constructor-arg>
-    </bean>
-    
-    <bean factory-bean="handlerRegistry" factory-method="register">
-        <constructor-arg value="com.raytheon.uf.common.dataplugin.text.request.SubscriptionRequest"/>
-        <constructor-arg>
-            <bean class="com.raytheon.uf.edex.plugin.text.subscription.services.SubscriptionRequestHandler" />
-        </constructor-arg>
-    </bean>
-
-    <bean id="remoteRetrievalManager" class="com.raytheon.uf.edex.plugin.text.handler.RemoteRetrievalManager">
-        <!--  <property name="remoteRetrievalExternalURI" value="direct-vm:remoteRetrievalExternalRoute" />  -->
-        <property name="rrDelegate" ref="textdbRemoteRetrievalTarget" />
-    </bean>
-
     <!-- JmsPooled* do not work... -->  
     <bean id="jms-mhs" class="org.apache.camel.component.jms.JmsComponent">
        <constructor-arg ref="jmsMhsConfig" />
@@ -134,20 +51,4 @@
         <property name="destinationResolver" ref="qpidNoDurableResolver"/>
     </bean>
 
-    <camelContext id="textdbsrv-request-camel" xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
-
-        <proxy id="textdbRemoteRetrievalTarget"
-            serviceInterface="com.raytheon.uf.edex.plugin.text.handler.RemoteRetrievalManager$IRRDelegate"
-            serviceUrl="direct-vm:remoteRetrievalExternalRoute" />
-        
-        <route id="remoteRetrievalExternal">
-            <from uri="direct-vm:remoteRetrievalExternalRoute" />
-            <!-- Convert from BeanInvocation if needed. -->
-            <convertBodyTo type="com.raytheon.uf.common.dataplugin.text.request.RemoteRetrievalRequest" />
-            <bean ref="serializationUtil" method="transformToThrift" />
-            <to uri="jms-mhs:queue:fxa.mhs.request?requestTimeout=122000" pattern="InOut" />
-            <bean ref="serializationUtil" method="transformFromThrift" />
-        </route>
-
-    </camelContext>
 </beans>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/AlarmAlertUtil.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/AlarmAlertUtil.java
similarity index 91%
rename from edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/AlarmAlertUtil.java
rename to edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/AlarmAlertUtil.java
index e189e2b9a8..e64ca48d5f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/AlarmAlertUtil.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/AlarmAlertUtil.java
@@ -17,15 +17,15 @@
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
-package com.raytheon.uf.edex.plugin.text.dbsrv.impl;
+package com.raytheon.uf.edex.plugin.text;
 
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.util.Util;
 import com.raytheon.uf.common.dataplugin.text.alarms.AlarmAlertProduct;
@@ -41,11 +41,14 @@ import com.raytheon.uf.edex.core.EdexException;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Sep 29, 2009            mnash     Initial creation
+ * Sep 29, 2009            mnash       Initial creation
  * 15Feb2010    4426       MW Fegan    Added over-ride of sendProductAlarmAlert(...)
  * 08Jul2010    2187       cjeanbap    Added Operational mode functionality.
  * 23May2012    14952      rferrel     Added reference time.
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
+ * Jan 18, 2016 4562       tjensen     Moved from edex.plugin.text.dbsrv.impl to 
+ *                                     edex.plugin.text
  * 
  * </pre>
  * 
@@ -55,7 +58,7 @@ import com.raytheon.uf.edex.core.EdexException;
 
 public class AlarmAlertUtil {
 
-    private static Log logger = LogFactory.getLog(Util.class);
+    private static Logger logger = LoggerFactory.getLogger(Util.class);
 
     private static final String alarmEndpoint = "alarmAlertNotify";
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java
index bb6789e115..8425ffbeb0 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/TextDecoder.java
@@ -37,8 +37,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.exception.DecoderException;
@@ -51,6 +51,7 @@ import com.raytheon.uf.common.time.DataTime;
 import com.raytheon.uf.common.wmo.AFOSProductId;
 import com.raytheon.uf.common.wmo.WMOHeader;
 import com.raytheon.uf.edex.core.EDEXUtil;
+import com.raytheon.uf.edex.core.EdexException;
 import com.raytheon.uf.edex.database.DataAccessLayerException;
 import com.raytheon.uf.edex.plugin.text.dao.AfosToAwipsDao;
 import com.raytheon.uf.edex.plugin.text.db.TextDB;
@@ -81,6 +82,7 @@ import com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator;
  * Mar 14, 2014 2652        skorolev    Changed logging for skipped headers.
  * May 12, 2014 2536        bclement    added createTextRecord(), removed deprecated code
  * Jul 10, 2014 2914        garmendariz Remove EnvProperties
+ * Dec 09, 2015 5166        kbisanz     Update logging to use SLF4J.
  * </pre>
  * 
  * @author
@@ -88,6 +90,9 @@ import com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator;
  */
 
 public class TextDecoder extends AbstractDecoder {
+
+    private static final String textToStageNotificationRoute = "jms-durable:queue:textToStageNotification";
+
     private static final long MILLIS_PER_HOUR = 60 * 60 * 1000;
 
     private static final long NOT_FOUND_LOG_PERIOD = 24 * MILLIS_PER_HOUR;
@@ -100,7 +105,8 @@ public class TextDecoder extends AbstractDecoder {
     private static String badTxtDir = EDEXUtil.getEdexData() + File.separator
             + "badTxt";
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private static final Logger logger = LoggerFactory
+            .getLogger(TextDecoder.class);
 
     private String pluginName;
 
@@ -484,10 +490,15 @@ public class TextDecoder extends AbstractDecoder {
     }
 
     public String[] transformToProductIds(PluginDataObject[] pdos) {
-        TextRecord[] trs = (TextRecord[]) pdos;
         String[] rval = new String[pdos.length];
-        for (int i = 0; i < trs.length; i++) {
-            rval[i] = trs[i].getProductId();
+
+        try {
+            for (int i = 0; i < pdos.length; i++) {
+                TextRecord tr = (TextRecord) pdos[i];
+                rval[i] = tr.getProductId();
+            }
+        } catch (Exception e) {
+            logger.error("Error transforming PDOs to Product IDs: ", e);
         }
         return rval;
     }
@@ -504,4 +515,41 @@ public class TextDecoder extends AbstractDecoder {
         }
         return Arrays.asList(pdo).iterator();
     }
+
+    /**
+     * Wraps a string containing an id in a TextRecord.
+     * 
+     * @param id
+     *            the id to put in a TextRecord
+     * @return PluginDataObject array (TextRecord) containing the id.
+     */
+    public PluginDataObject[] transformStringToTextRecord(String id) {
+
+        TextRecord tr = new TextRecord();
+        tr.setProductId(id);
+
+        PluginDataObject[] pdos = new TextRecord[1];
+        pdos[0] = tr;
+        return pdos;
+    }
+
+    /**
+     * 
+     * Sends an asynchronous message to the textToStageNotification queue. This
+     * is basically a wrapper of the utility method that handles/logs any
+     * errors.
+     * 
+     * @param message
+     *            the message to send
+     */
+    public static void sendTextToQueue(String message) {
+        try {
+            EDEXUtil.getMessageProducer().sendAsyncUri(
+                    textToStageNotificationRoute, message);
+        } catch (EdexException e) {
+            logger.warn("Unable to send product '" + message + "' to queue '"
+                    + textToStageNotificationRoute + "'", e);
+        }
+    }
+
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/AfosToAwipsDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/AfosToAwipsDao.java
index 4c5c3c0f5d..aa767c770d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/AfosToAwipsDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/AfosToAwipsDao.java
@@ -26,14 +26,14 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.jdbc.Work;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.uf.common.dataplugin.text.AfosWmoIdDataContainer;
 import com.raytheon.uf.common.dataplugin.text.db.AfosToAwips;
@@ -54,6 +54,7 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * Aug 28, 2009 2924         rjpeter    Initial creation
  * Nov 16, 2009 3336         njensen  Added lookupAfosId(String, String, String)
  * 02apr2013    15564   mgamazaychikov Ensured afosid to be 9 characters space-padded long
+ * Dec 09, 2015 5166         kbisanz    Update logging to use SLF4J.
  * 
  * </pre>
  * 
@@ -70,7 +71,7 @@ public class AfosToAwipsDao extends CoreDao {
 
     private final static int MAX_FIELD_LENGTH = 3;
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     public AfosToAwipsDao() {
         super(DaoConfig.forClass("fxa", AfosToAwips.class));
@@ -126,6 +127,7 @@ public class AfosToAwipsDao extends CoreDao {
             /**
              * @see org.hibernate.jdbc.Work#execute(java.sql.Connection)
              */
+            @Override
             public void execute(Connection c) throws SQLException {
                 PreparedStatement ps = null;
                 rval = new AfosWmoIdDataContainer();
@@ -138,8 +140,10 @@ public class AfosToAwipsDao extends CoreDao {
 
                     while (rs.next()) {
                         AfosToAwips id = new AfosToAwips();
-                        // make sure that the afosid is 9 characters space-padded long 
-						String afosid = String.format("%-9s", rs.getString(1).trim());
+                        // make sure that the afosid is 9 characters
+                        // space-padded long
+                        String afosid = String.format("%-9s", rs.getString(1)
+                                .trim());
                         id.setAfosid(afosid);
                         id.setWmottaaii(ttaaii);
                         id.setWmocccc(cccc);
@@ -208,6 +212,7 @@ public class AfosToAwipsDao extends CoreDao {
             /**
              * @see org.hibernate.jdbc.Work#execute(java.sql.Connection)
              */
+            @Override
             public void execute(Connection c) throws SQLException {
                 PreparedStatement ps = null;
                 rval = new AfosWmoIdDataContainer();
@@ -306,6 +311,7 @@ public class AfosToAwipsDao extends CoreDao {
              * 
              * @see org.hibernate.jdbc.Work#execute(java.sql.Connection)
              */
+            @Override
             public void execute(Connection c) throws SQLException {
                 PreparedStatement ps = null;
                 String awipsId = "%" + nnn + xxx;
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StdTextProductDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StdTextProductDao.java
index b1b5874dd7..61bb6f1b20 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StdTextProductDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/StdTextProductDao.java
@@ -37,9 +37,7 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang3.StringUtils;
 import org.hibernate.Criteria;
 import org.hibernate.HibernateException;
 import org.hibernate.Query;
@@ -48,6 +46,8 @@ import org.hibernate.criterion.Order;
 import org.hibernate.criterion.ProjectionList;
 import org.hibernate.criterion.Projections;
 import org.hibernate.criterion.Restrictions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.orm.hibernate4.SessionFactoryUtils;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallback;
@@ -102,6 +102,7 @@ import com.raytheon.uf.edex.database.purge.PurgeLogger;
  * Jan 27, 2015 4031        rferrel     Resolve AFOS PILs site conflict using preferredAfosFirstLetter.
  * May 05, 2015 4462        rferrel     {@link #write(StdTextProduct)} when missing set the textProduct's site.
  * Jul 06, 2015 4612        rferrel     Get all sites matching the preferredafosFirstLetter.
+ * Dec 09, 2015 5166        kbisanz     Update logging to use SLF4J.
  * </pre>
  * 
  * @author garmendariz
@@ -166,7 +167,7 @@ public class StdTextProductDao extends CoreDao {
 
             + " order by " + REFTIME + " desc" + ", " + INSERTTIME + " desc";
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private final static char[] preferredAfosFirstLetter;
     static {
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/WatchWarnDao.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/WatchWarnDao.java
deleted file mode 100644
index ff81d5361d..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dao/WatchWarnDao.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-
-package com.raytheon.uf.edex.plugin.text.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Criteria;
-import org.hibernate.Session;
-
-import com.raytheon.uf.common.dataplugin.text.db.WatchWarn;
-import com.raytheon.uf.edex.database.DataAccessLayerException;
-import com.raytheon.uf.edex.database.dao.CoreDao;
-import com.raytheon.uf.edex.database.dao.DaoConfig;
-
-/**
- * The dao implementation associated with the TextDao classes used for all
- * database interaction.
- * 
- * <pre>
- * 
- * SOFTWARE HISTORY
- * 
- * Date         Ticket#     Engineer    Description
- * ------------ ----------  ----------- --------------------------
- * 09/04/07     400         garmendariz Initial Check in    
- * Oct 1, 2008  1538        jkorman     Added additional functionality.
- * Aug 9, 2010  3944        cjeanbap    Added method, queryAllWatchWarn. 
- * May 20, 2014 2536        bclement    moved from edex.textdb to edex.plugin.text
- * 10/28/2014   3454        bphillip    Fix usage of getSession()
- * </pre>
- * 
- * @author garmendariz
- * @version 1
- */
-
-public class WatchWarnDao extends CoreDao {
-
-    /**
-     * 
-     */
-    public WatchWarnDao() {
-        super(DaoConfig.forClass("fxa", WatchWarn.class));
-    }
-
-    /**
-     * Add an entry to the WatchWarn table.
-     * 
-     * @param watchWarn
-     */
-    public boolean addEntry(WatchWarn watchWarn) {
-        this.persist(watchWarn);
-        return true;
-    }
-
-    /**
-     * Add an entry to the WatchWarn table.
-     * 
-     * @param watchWarn
-     */
-    public boolean deleteEntry(WatchWarn watchWarn) {
-        this.delete(watchWarn);
-        return true;
-    }
-
-    /**
-     * Get a list of all scripts associated with a given product identifier.
-     * 
-     * @param productId
-     *            A product identifier to query for.
-     * @return List of scripts retrieved. Returns an empty list if no values
-     *         were found.
-     */
-    public List<String> queryWatchWarn(String productId) {
-
-        List<String> retList = new ArrayList<String>();
-
-        List<?> values = null;
-        try {
-            values = queryBySingleCriteria("productid", productId);
-        } catch (DataAccessLayerException e) {
-            e.printStackTrace();
-        }
-        if (values != null) {
-            for (Object o : values) {
-                retList.add(((WatchWarn) o).getScript());
-            }
-        }
-
-        return retList;
-    }
-    
-    @SuppressWarnings("unchecked")
-    public List<WatchWarn> queryAllWatchWarn() {
-        
-        Session session = getSession();
-        try{
-            Criteria criteria = session.createCriteria(WatchWarn.class);   
-        
-        return criteria.list();
-        } finally {
-            if(session != null){
-                session.close();
-            }
-        }
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java
index 5b2060af59..3c71621153 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/db/TextDB.java
@@ -24,8 +24,8 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.TimeZone;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.site.SiteUtil;
@@ -34,7 +34,6 @@ import com.raytheon.uf.common.dataplugin.text.db.PracticeStdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.db.StateMatch;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.db.TextProductInfo;
-import com.raytheon.uf.common.dataplugin.text.db.WatchWarn;
 import com.raytheon.uf.common.dataplugin.text.util.AFOSParser;
 import com.raytheon.uf.common.site.SiteMap;
 import com.raytheon.uf.common.wmo.AFOSProductId;
@@ -43,7 +42,6 @@ import com.raytheon.uf.common.wmo.WMOTimeParser;
 import com.raytheon.uf.edex.plugin.text.dao.StateMatchDao;
 import com.raytheon.uf.edex.plugin.text.dao.StdTextProductDao;
 import com.raytheon.uf.edex.plugin.text.dao.TextProductInfoDao;
-import com.raytheon.uf.edex.plugin.text.dao.WatchWarnDao;
 import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
 
 /**
@@ -75,6 +73,8 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
  * May 15, 2014 2536        bclement    moved asciiToHex() hexToAscii() and getProperty() to PropConverter
  * May 20, 2014 2536        bclement    moved from edex.textdb to edex.plugin.text
  * Jul 10, 2014 2914        garmendariz Remove EnvProperties
+ * Dec 09, 2015 5166        kbisanz     Update logging to use SLF4J.
+ * Feb 05, 2016 5269        skorolev    Removed WatchWarn methods.
  * </pre>
  * 
  * @author jkorman
@@ -83,7 +83,7 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
 
 public class TextDB {
 
-    private Log logger = LogFactory.getLog(getClass());
+    private Logger logger = LoggerFactory.getLogger(getClass());
 
     private String siteName = SiteUtil.getSite();
 
@@ -249,7 +249,10 @@ public class TextDB {
             dao.persist(info);
             success = true;
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error persisting versions to keep: ccc=" + ccc
+                    + ", nnn=" + nnn + ", xxx=" + xxx + ", versions="
+                    + versions;
+            logger.error(msg, e);
         }
         return success;
     }
@@ -271,7 +274,9 @@ public class TextDB {
                 rval = Integer.toString(info.getVersionstokeep());
             }
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error retrieving versions: ccc=" + ccc + ", nnn="
+                    + nnn + ", xxx=" + xxx;
+            logger.error(msg, e);
         }
 
         return rval;
@@ -296,7 +301,9 @@ public class TextDB {
             }
             success = true;
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error deleting versions: ccc=" + ccc + ", nnn=" + nnn
+                    + ", xxx=" + xxx;
+            logger.error(msg, e);
         }
         return success;
     }
@@ -314,7 +321,10 @@ public class TextDB {
         try {
             success = dao.addState(stateInfo);
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error adding mapping for state: stateInfo="
+                    + stateInfo;
+
+            logger.error(msg, e);
         }
         return success;
     }
@@ -344,7 +354,9 @@ public class TextDB {
         try {
             success = dao.removeState(stateInfo);
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error removing mapping for state: stateInfo="
+                    + stateInfo;
+            logger.error(msg, e);
         }
         return success;
     }
@@ -374,121 +386,13 @@ public class TextDB {
         try {
             stateList = dao.queryState(state);
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error retrieving mappings for state: state=" + state;
+            logger.error(msg, e);
         }
 
         return stateList;
     }
 
-    /**
-     * --- watchwarn
-     * 
-     * @param watchWarn
-     * @return success
-     */
-    public boolean addWatchWarn(WatchWarn watchWarn) {
-        boolean success = false;
-
-        WatchWarnDao dao = new WatchWarnDao();
-        try {
-            success = dao.addEntry(watchWarn);
-        } catch (Exception e) {
-            logger.error(e);
-        }
-        return success;
-    }
-
-    /**
-     * --- watchwarn
-     * 
-     * @param productId
-     *            A not null reference to the product identifier to store.
-     * @param script
-     *            A not null reference to the script to store.
-     * @return success
-     */
-    public boolean addWatchWarn(String productId, String script) {
-        return addWatchWarn(new WatchWarn(productId, script));
-    }
-
-    /**
-     * --- watchwarn Get a list of all entries for a specific state.
-     * 
-     * @param stateInfo
-     *            A state to lookup.
-     * @return List of StateMatch entries for the specified state. If none were
-     *         found, an empty list is returned.
-     */
-    public List<WatchWarn> queryWatchWarn(String productId) {
-
-        List<WatchWarn> watchList = new ArrayList<WatchWarn>();
-
-        List<String> results = null;
-
-        WatchWarnDao dao = new WatchWarnDao();
-        try {
-            results = dao.queryWatchWarn(productId);
-        } catch (Exception e) {
-            logger.error(e);
-        }
-        if (results != null) {
-            for (String s : results) {
-                watchList.add(new WatchWarn(productId, s));
-            }
-        }
-
-        return watchList;
-    }
-
-    /**
-     * Get a list of all entries in database table.
-     * 
-     * @return List of WatchWarn entries.
-     */
-    public List<WatchWarn> queryAllWatchWarn() {
-        WatchWarnDao dao = new WatchWarnDao();
-
-        List<WatchWarn> results = null;
-
-        try {
-            results = dao.queryAllWatchWarn();
-        } catch (Exception e) {
-            logger.error(e);
-        }
-        return results;
-    }
-
-    /**
-     * --- watchwarn
-     * 
-     * @param watchWarn
-     * @return success
-     */
-    public boolean deleteWatchWarn(WatchWarn watchWarn) {
-        boolean success = false;
-
-        WatchWarnDao dao = new WatchWarnDao();
-        try {
-            success = dao.deleteEntry(watchWarn);
-        } catch (Exception e) {
-            logger.error(e);
-        }
-        return success;
-    }
-
-    /**
-     * --- watchwarn
-     * 
-     * @param productId
-     *            A not null reference to the product identifier to store.
-     * @param script
-     *            A not null reference to the script to store.
-     * @return success
-     */
-    public boolean deleteWatchWarn(String productId, String script) {
-        return deleteWatchWarn(new WatchWarn(productId, script));
-    }
-
     /**
      * Get the latest time for each product in the stdtextproducts table.
      * 
@@ -523,7 +427,9 @@ public class TextDB {
         try {
             times = dao.getLatestTimes(afosId);
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error getting latest times: afosId=" + afosId
+                    + ", operationalMode=" + operationalMode;
+            logger.error(msg, e);
         }
 
         return times;
@@ -546,7 +452,9 @@ public class TextDB {
         try {
             latestTime = dao.getLatestTime(afosId);
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error getting latest time: afosId=" + afosId
+                    + ", operationalMode=" + operationalMode;
+            logger.error(msg, e);
         }
 
         return latestTime;
@@ -631,7 +539,10 @@ public class TextDB {
         try {
             times = dao.getAllTimes(ccc, nnn, xxx);
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error retrieving all times: ccc=" + ccc + ", nnn="
+                    + nnn + ", xxx=" + xxx + ", operationalMode="
+                    + operationalMode;
+            logger.error(msg, e);
         }
 
         return times;
@@ -656,7 +567,17 @@ public class TextDB {
             products = dao
                     .getSameMinuteProducts(wmoId, siteId, hdrTime, afosId);
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error getting products within the same minute: wmoId="
+                    + wmoId
+                    + ", siteId="
+                    + siteId
+                    + ", hdrTime="
+                    + hdrTime
+                    + ", afosId="
+                    + afosId
+                    + ", operationalMode="
+                    + operationalMode;
+            logger.error(msg, e);
         }
 
         return products;
@@ -826,7 +747,8 @@ public class TextDB {
                     .getTimeZone("GMT")));
             success = dao.write(textProduct);
         } catch (Exception e) {
-            logger.error(e);
+            String msg = "Error writing product: textProduct=" + textProduct;
+            logger.error(msg, e);
         }
 
         if (logger.isDebugEnabled()) {
@@ -1038,4 +960,4 @@ public class TextDB {
 
         return this.operationalMode;
     }
-}
\ No newline at end of file
+}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/WarnTableAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/WarnTableAdapter.java
deleted file mode 100644
index b8b453f1a1..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/dbsrv/impl/WarnTableAdapter.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- * 
- * Contractor Name:        Raytheon Company
- * Contractor Address:     6825 Pine Street, Suite 340
- *                         Mail Stop B8
- *                         Omaha, NE 68106
- *                         402.291.0100
- * 
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.edex.plugin.text.dbsrv.impl;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.raytheon.uf.common.dataplugin.text.db.WatchWarn;
-import com.raytheon.uf.common.dataplugin.text.dbsrv.ICommandExecutor;
-import com.raytheon.uf.common.dataplugin.text.dbsrv.TextDBSrvCommandTags;
-import com.raytheon.uf.common.dataplugin.text.dbsrv.WarnTableTags;
-import com.raytheon.uf.common.message.Header;
-import com.raytheon.uf.common.message.Message;
-import com.raytheon.uf.common.message.Property;
-import com.raytheon.uf.edex.core.EDEXUtil;
-import com.raytheon.uf.edex.core.EdexException;
-import com.raytheon.uf.edex.plugin.text.db.TextDB;
-
-/**
- * Processes warning textdbsrv command messages
- * 
- * <pre>
- * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Oct 7, 2008        1538 jkorman     Initial creation
- * Aug 9,2010   3944       cjeanbap    Added logic to delete all records
- *                                     from WatchWarn table.
- * Sep 14,2010  3944       cjenabap    Added sendTextToQueue()
- * May 15, 2014 2536       bclement    moved from uf.edex.textdbsrv
- * Aug 22, 2014 2926       bclement    compatibility changes with new textdb service
- * </pre>
- * 
- * @author jkorman
- * @version 1.0
- */
-public class WarnTableAdapter implements ICommandExecutor {
-
-    private TextDB textDB;
-    
-    private static final String WATCH_WARN_QUEUE = "ldadWatchWarnDirect";
-
-    private Log logger = LogFactory.getLog(getClass());
-    
-    /**
-     * 
-     */
-    public WarnTableAdapter() {
-        textDB = new TextDB();
-    }
-
-    /**
-     * 
-     * @return
-     */
-    public static final String getViewTag() {
-        return "warn";
-    }
-
-    /**
-     * 
-     */
-    public void dispose() {
-
-    }
-
-    /**
-     * 
-     */
-    @Override
-    public Message execute(Message cmdMessage) {
-
-        Header sHeader = cmdMessage.getHeader();
-
-        // Get the operation code
-        String op = sHeader.getProperty(WarnTableTags.OP.name());
-
-        TextDBSrvCommandTags opTag = TextDBSrvCommandTags.valueOf(op);
-
-        if (opTag != null) {
-            switch (opTag) {
-
-            case PUT: {
-                String productId = sHeader.getProperty(WarnTableTags.PRODID.name());
-                String script = sHeader.getProperty(WarnTableTags.SCRIPT.name());
-
-                addWatchWarn(sHeader, productId, script);
-                sendTextToQueue(productId, WATCH_WARN_QUEUE);
-                break;
-            }
-
-            case GET: {
-                String productId = sHeader.getProperty(WarnTableTags.PRODID.name());
-                if (productId != null) {
-                    getWatchWarn(sHeader, productId);
-                }
-                break;
-            }
-            case DELETE: {
-                String productId = sHeader.getProperty(WarnTableTags.PRODID.name());
-                String script = sHeader.getProperty(WarnTableTags.SCRIPT.name());
-
-                if ((productId != null) && (script != null)) {
-                    deleteWatchWarn(sHeader, productId, script);
-                } else {
-                    Collection<WatchWarn> watchWarns = textDB.queryAllWatchWarn();
-                    Property[] tempProps = new Property[watchWarns.size()];
-                    int i = 0;
-                    for (WatchWarn ww: watchWarns) {
-                        deleteWatchWarn(sHeader, ww.getProductid(), ww.getScript());                                                 
-                        tempProps[i++] = sHeader.getProperties()[0];
-                    }
-                    sHeader.setProperties(tempProps);
-                }
-                break;
-            }
-            default: {
-                String tagName = (opTag != null) ? opTag.name() : "null";
-                Property[] props = new Property[] { new Property(
-                        CommandExecutor.STDERR, "ERROR:Invalid command tag = ["
-                                + tagName + "]"), };
-                sHeader.setProperties(props);
-                break;
-            }
-
-            }
-
-        }
-        cmdMessage.setHeader(sHeader);
-        return cmdMessage;
-    }
-
-    /**
-     * 
-     * @param state
-     * @param xxxId
-     * @param cccId
-     * @return
-     */
-    private void addWatchWarn(Header header, String productId, String script) {
-        Property newProperty = new Property(CommandExecutor.STDERR,
-                "NORMAL:Adding productId " + productId + " to trigger.");
-        Property errProperty = new Property(CommandExecutor.STDERR,
-                "ERROR:Failure adding to state_ccc table.");
-
-        Property[] props = new Property[] { newProperty, };
-        if (!textDB.addWatchWarn(productId, script)) {
-            props = new Property[] { newProperty, errProperty };
-        }
-        header.setProperties(props);
-    }
-
-    /**
-     * 
-     * @param header
-     * @param productId
-     */
-    private void getWatchWarn(Header header, String productId) {
-        String PROP_FMT = CommandExecutor.STDOUT;
-
-        Property[] props = null;
-
-        List<WatchWarn> dataList = textDB.queryWatchWarn(productId);
-
-        if (dataList.size() > 0) {
-            props = new Property[dataList.size() + 2];
-            int i = 0;
-            props[i] = new Property(PROP_FMT, "PRODUCTID SCRIPT");
-            props[i] = new Property(PROP_FMT, "--------- ------");
-            for (WatchWarn w : dataList) {
-                props[i++] = new Property(PROP_FMT, String.format("%9s %s",
-                        w.getProductid(), w.getScript()));
-            }
-        } else {
-            props = new Property[] { new Property(CommandExecutor.STDERR,
-                    "ERROR:Failure reading from watch warn table."), };
-        }
-        header.setProperties(props);
-    }
-
-    /**
-     * 
-     * @param state
-     * @param xxxId
-     * @param cccId
-     * @return
-     */
-    private void deleteWatchWarn(Header header, String productId, String script) {
-        Property newProperty = new Property(CommandExecutor.STDERR,
-                "NORMAL:Deleting product id " + productId + " trigger.");
-        Property errProperty = new Property(CommandExecutor.STDERR,
-                "ERROR:Failure adding to state_ccc table.");
-
-        Property[] props = new Property[] { newProperty, };
-        if (!textDB.deleteWatchWarn(productId, script)) {
-            props = new Property[] { newProperty, errProperty };
-        }
-        header.setProperties(props);
-    }
-    
-    /**
-     * Sends an asynchronous message to the specified queue.
-     * 
-     * @param message
-     *            the message to send
-     * @param queue
-     *            the queue to receive the message
-     */
-    private void sendTextToQueue(String message, String queue) {
-        try {
-            EDEXUtil.getMessageProducer().sendAsync(queue, message);
-        } catch (EdexException e) {
-            logger.warn("Unable to send product '" + message + "' to queue '"
-                    + queue + "'", e);
-        }
-    }
-}
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java
index 3ce82b4ee9..d980025c4d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/InsertStdTextProductHandler.java
@@ -23,13 +23,9 @@ import java.util.Date;
 
 import com.raytheon.uf.common.dataplugin.text.request.InsertStdTextProductRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.core.EDEXUtil;
-import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.AlarmAlertUtil;
+import com.raytheon.uf.edex.plugin.text.TextDecoder;
 import com.raytheon.uf.edex.plugin.text.db.TextDB;
-import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 /**
  * Handles InsertStdTextProductRequests by placing them onto the LDAD queue and
@@ -52,8 +48,6 @@ import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 public class InsertStdTextProductHandler implements
         IRequestHandler<InsertStdTextProductRequest> {
-    private static final transient IUFStatusHandler statusHandler = UFStatus.getHandler(InsertStdTextProductHandler.class);
-    private static final String WATCH_WARN_QUEUE = "ldadWatchWarnDirect";
 
     private TextDB dao;
 
@@ -72,7 +66,7 @@ public class InsertStdTextProductHandler implements
         if (d.getTime() != Long.MIN_VALUE) {
             if (request.isNotifySubscriptions()) {
                 if (request.getOperationalMode()) {
-                    sendTextToQueue(request.getAfosId(), WATCH_WARN_QUEUE);
+                    TextDecoder.sendTextToQueue(request.getAfosId());
                 }
             }
             if (request.isNotifyAlarmAlert()) {
@@ -83,23 +77,4 @@ public class InsertStdTextProductHandler implements
         }
         return d;
     }
-
-    /**
-     * 
-     * Sends an asynchronous message to the specified queue. This is basically a
-     * wrapper of the utility method that handles/logs any errors.
-     * 
-     * @param message
-     *            the message to send
-     * @param queue
-     *            the queue to receive the message
-     */
-    private void sendTextToQueue(String message, String queue) {
-        try {
-            EDEXUtil.getMessageProducer().sendAsync(queue, message);
-        } catch (EdexException e) {
-            statusHandler.handle(Priority.PROBLEM, "Unable to send product '"
-                            + message + "' to queue '" + queue + "'", e);
-        }
-    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java
index 2e221ea332..a8b38ddabf 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/StdTextProductRequestHandler.java
@@ -27,13 +27,9 @@ import com.raytheon.uf.common.dataplugin.text.db.PracticeStdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.db.StdTextProduct;
 import com.raytheon.uf.common.dataplugin.text.request.StdTextProductServerRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.core.EDEXUtil;
-import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.AlarmAlertUtil;
+import com.raytheon.uf.edex.plugin.text.TextDecoder;
 import com.raytheon.uf.edex.plugin.text.db.TextDB;
-import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 /**
  * Handles StdTextProductServerRequest by placing them onto the LDAD queue and
@@ -60,10 +56,6 @@ import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 public class StdTextProductRequestHandler implements
         IRequestHandler<StdTextProductServerRequest> {
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(StdTextProductRequestHandler.class);
-
-    private static final String WATCH_WARN_QUEUE = "ldadWatchWarnDirect";
 
     private final TextDB dao;
 
@@ -105,7 +97,7 @@ public class StdTextProductRequestHandler implements
         if (success) {
             String afosId = text.getCccid() + text.getNnnid() + text.getXxxid();
             if (operationalFlag) {
-                sendTextToQueue(afosId, WATCH_WARN_QUEUE);
+                TextDecoder.sendTextToQueue(afosId);
             }
 
             AlarmAlertUtil.sendProductAlarmAlert(afosId, new Date(createtime),
@@ -113,23 +105,4 @@ public class StdTextProductRequestHandler implements
         }
         return d;
     }
-
-    /**
-     * 
-     * Sends an asynchronous message to the specified queue. This is basically a
-     * wrapper of the utility method that handles/logs any errors.
-     * 
-     * @param message
-     *            the message to send
-     * @param queue
-     *            the queue to receive the message
-     */
-    private void sendTextToQueue(String message, String queue) {
-        try {
-            EDEXUtil.getMessageProducer().sendAsync(queue, message);
-        } catch (EdexException e) {
-            statusHandler.handle(Priority.PROBLEM, "Unable to send product '"
-                    + message + "' to queue '" + queue + "'", e);
-        }
-    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/WriteProductHandler.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/WriteProductHandler.java
index 92256dd7b5..a8bdea0cc5 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/WriteProductHandler.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/handler/WriteProductHandler.java
@@ -20,17 +20,12 @@
 package com.raytheon.uf.edex.plugin.text.handler;
 
 import java.util.Date;
-import java.util.logging.Logger;
 
 import com.raytheon.uf.common.dataplugin.text.request.WriteProductRequest;
 import com.raytheon.uf.common.serialization.comm.IRequestHandler;
-import com.raytheon.uf.common.status.IUFStatusHandler;
-import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.common.status.UFStatus.Priority;
-import com.raytheon.uf.edex.core.EDEXUtil;
-import com.raytheon.uf.edex.core.EdexException;
+import com.raytheon.uf.edex.plugin.text.AlarmAlertUtil;
+import com.raytheon.uf.edex.plugin.text.TextDecoder;
 import com.raytheon.uf.edex.plugin.text.db.TextDB;
-import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 /**
  * Request handler for WriteProductRequests. Forwards request to textdb.
@@ -40,12 +35,13 @@ import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
  * SOFTWARE HISTORY
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
- * Feb 2, 2010            njensen     Initial creation
- * 01Jun2010               cjeanbap    Added operational mode functionality.
+ * Feb 02, 2010            njensen     Initial creation
+ * Jun 01, 2010            cjeanbap    Added operational mode functionality.
  * Jul 02, 2010 4687       cjeanbap    Added watch warn queue.
  * May 23, 2012 14952      rferrel     Alarm Alerts date now set to the
  *                                      products reference/create time.
  * May 20, 2014 2536       bclement    moved from edex.textdb to edex.plugin.text
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -55,13 +51,6 @@ import com.raytheon.uf.edex.plugin.text.dbsrv.impl.AlarmAlertUtil;
 
 public class WriteProductHandler implements
         IRequestHandler<WriteProductRequest> {
-    private static final transient IUFStatusHandler statusHandler = UFStatus
-            .getHandler(WriteProductHandler.class);
-
-    private static final String WATCH_WARN_QUEUE = "ldadWatchWarnDirect";
-
-    private static Logger logger = Logger.getLogger(WriteProductHandler.class
-            .toString());
 
     @Override
     public Object handleRequest(WriteProductRequest request) throws Exception {
@@ -71,7 +60,7 @@ public class WriteProductHandler implements
 
         if (result != Long.MIN_VALUE) {
             if (request.getOperationalMode()) {
-                sendTextToQueue(request.getProductId(), WATCH_WARN_QUEUE);
+                TextDecoder.sendTextToQueue(request.getProductId());
             }
 
             if (request.isNotifyAlarmAlert()) {
@@ -86,27 +75,4 @@ public class WriteProductHandler implements
 
         return result;
     }
-
-    /**
-     * 
-     * Sends an asynchronous message to the specified queue. This is basically a
-     * wrapper of the utility method that handles/logs any errors.
-     * 
-     * @param message
-     *            the message to send
-     * @param queue
-     *            the queue to receive the message
-     */
-    private void sendTextToQueue(String message, String queue) {
-        try {
-            logger.info("Sending Product Id [" + message + "] to " + queue
-                    + "Queue.");
-            EDEXUtil.getMessageProducer().sendAsync(queue, message);
-            logger.info("\"Submitted\" Product Id [" + message + "] to "
-                    + queue);
-        } catch (EdexException e) {
-            statusHandler.handle(Priority.PROBLEM, "Unable to send product '"
-                    + message + "' to queue '" + queue + "'", e);
-        }
-    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java
index bd99f8310b..a2a0921c41 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/TextSeparatorFactory.java
@@ -21,8 +21,8 @@ package com.raytheon.uf.edex.plugin.text.impl;
 
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.site.SiteUtil;
@@ -52,6 +52,7 @@ import com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator;
  * Apr 01, 2014 2915       dgilling    Support re-factored TextDBStaticData.
  * May 14, 2014 2536       bclement    moved WMO Header to common
  * Jul 10, 2014 2914       garmendariz Remove EnvProperties
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
  * 
  * </pre>
  * 
@@ -61,8 +62,8 @@ import com.raytheon.uf.edex.plugin.text.impl.separator.WMOMessageSeparator;
 
 public class TextSeparatorFactory {
 
-    private static final Log logger = LogFactory
-            .getLog(TextSeparatorFactory.class);
+    private static final Logger logger = LoggerFactory
+            .getLogger(TextSeparatorFactory.class);
 
     private static final String siteId = SiteUtil.getSite();
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdCollectiveSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdCollectiveSeparator.java
index e59db7a2d1..ecc970200d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdCollectiveSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdCollectiveSeparator.java
@@ -25,8 +25,8 @@ import java.nio.charset.Charset;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.uf.common.site.SiteMap;
@@ -53,13 +53,14 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
  * Apr 01, 2014 2915       dgilling    Support re-factored TextDBStaticData.
  * May 14, 2014 2536       bclement    moved WMO Header to common
  * Dec 03, 2014 ASM #16859 D. Friedman Use CharBuffer instead of StringBuilder.
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
  * </pre>
  * 
  * @author jkorman
  * @version 1.0
  */
 public class StdCollectiveSeparator extends WMOMessageSeparator {
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private static final Pattern P_TAF = Pattern
             .compile("(TAF +AMD)|(TAF +COR)|(TAF...[\r\n])|(TAF ?)");
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdTextSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdTextSeparator.java
index aed484d60c..2e51a957ad 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdTextSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/StdTextSeparator.java
@@ -19,8 +19,8 @@
  **/
 package com.raytheon.uf.edex.plugin.text.impl.separator;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.uf.common.site.SiteMap;
@@ -43,6 +43,7 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
  *                                     have checks like A1.
  * Mar 13, 2014 2652       skorolev    Fixed calculation of message end.
  * Apr 01, 2014 2915       dgilling    Support re-factored TextDBStaticData.
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
  * </pre>
  * 
  * @author jkorman
@@ -51,7 +52,7 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
 
 public class StdTextSeparator extends WMOMessageSeparator {
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private boolean stdFlg = false;
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java
index cd500d96e9..867131859f 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/UACollectiveSeparator.java
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.uf.common.wmo.AFOSProductId;
@@ -52,6 +52,7 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
  * May 14, 2014 2536       bclement    moved WMO Header to common
  * Dec 03, 2014 ASM #16859 D. Friedman Use CharBuffer instead of StringBuilder.
  * Feb 17, 2014 ASM #17125 D. Friedman Fix parsing of type and date fields.
+ * Dec 09, 2015 5166       kbisanz     Update logging to use SLF4J.
  * </pre>
  * 
  * @author jkorman
@@ -76,7 +77,7 @@ public class UACollectiveSeparator extends WMOMessageSeparator {
 
     private static final String UA_NIL_C = "\\d{5} ..(AA|BB|CC|DD) {1,2} \\d{4}[0-9/] \\d{5} NIL";
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     ArrayList<Pattern> nilPatterns = new ArrayList<Pattern>();
     {
@@ -432,7 +433,7 @@ public class UACollectiveSeparator extends WMOMessageSeparator {
             }
             */
 
-            if (! checkCharNum(buffer.charAt(0))) {
+            if (!checkCharNum(buffer.charAt(0))) {
                 buffer.get();
             }
             stationNum.append(assignTextSegment(buffer, CSPC));
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/WMOMessageSeparator.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/WMOMessageSeparator.java
index 99b3a8fc12..df6a97b190 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/WMOMessageSeparator.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/impl/separator/WMOMessageSeparator.java
@@ -27,8 +27,8 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.esb.Headers;
 import com.raytheon.edex.plugin.AbstractRecordSeparator;
@@ -51,6 +51,7 @@ import com.raytheon.uf.edex.plugin.text.impl.WMOReportData;
  * Mar 04, 2014 2652        skorolev    Corrected NNNXXX pattern.
  * Mar 14, 2014 2652        skorolev    Changed logging for skipped headers.
  * Dec 03, 2014 ASM #16859  D. Friedman Use CharBuffer instead of StringBuilder.
+ * Dec 09, 2015 5166        kbisanz     Update logging to use SLF4J.
  * </pre>
  * 
  * @author
@@ -92,7 +93,7 @@ public abstract class WMOMessageSeparator extends AbstractRecordSeparator {
     protected static final Pattern NNNXXX = Pattern
             .compile("\\w{3,6}(?:\\s{1,2})?[\\r\\n]+(?:" + (char) 0x1e + ")?");
 
-    private final Log logger = LogFactory.getLog(getClass());
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     protected final WMOHeader wmoHeader;
 
@@ -404,8 +405,8 @@ public abstract class WMOMessageSeparator extends AbstractRecordSeparator {
 
     public static final void main(String[] args) {
 
-        CharBuffer cb = CharBuffer.wrap(
-                "\r\r\nKOFF 1912/20/15\n\n\r     BECMG");
+        CharBuffer cb = CharBuffer
+                .wrap("\r\r\nKOFF 1912/20/15\n\n\r     BECMG");
 
         safeStrpbrk(cb, nl);
 
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textNNNhelp.txt b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textNNNhelp.txt
index 61f6824b1e..95c7096786 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textNNNhelp.txt
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/utility/common_static/base/textdb/textNNNhelp.txt
@@ -127,7 +127,6 @@ FSH National Marine Fisheries Message
 FTJ FOUS Trajectory Forecast
 FTM Radar Free Text Message
 FTP Perf Prog Max-Min Temperature Guidance
-FWC NGM MOS
 FWD Fire Weather Outlook Discussion
 FWE Extended Fire Weather Outlook
 FWF Routine Fire Wx Fcst (w/wo 6-10 Day Otlk)
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF
index 3d30f44039..5a342cbc5c 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.vil/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Import-Package: com.raytheon.edex.urifilter,
  com.raytheon.uf.common.time,
  com.raytheon.uf.common.util.registry,
  com.raytheon.uf.edex.plugin.scan.common,
- org.apache.commons.logging
+ org.slf4j
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.edex.plugin.vil,
diff --git a/edexOsgi/com.raytheon.uf.edex.python.decoder/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.python.decoder/META-INF/MANIFEST.MF
index 68c44b832d..3d0a348361 100644
--- a/edexOsgi/com.raytheon.uf.edex.python.decoder/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.python.decoder/META-INF/MANIFEST.MF
@@ -2,15 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Decoder Plug-in
 Bundle-SymbolicName: com.raytheon.uf.edex.python.decoder
-Bundle-Version: 1.12.1174.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Require-Bundle: com.raytheon.edex.common,
  org.jep,
  org.geotools,
  com.raytheon.uf.common.localization,
- org.apache.commons.pool;bundle-version="1.0.0"
+ org.slf4j;bundle-version="1.7.12",
+ com.raytheon.uf.common.python;bundle-version="1.12.1174"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.raytheon.uf.edex.python.decoder
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.uf.common.python,
- org.apache.commons.logging
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoderFactory.java b/edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoderFactory.java
index 4de78d6dfa..6ea3f7b78f 100644
--- a/edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoderFactory.java
+++ b/edexOsgi/com.raytheon.uf.edex.python.decoder/src/com/raytheon/uf/edex/python/decoder/PythonDecoderFactory.java
@@ -25,8 +25,8 @@ import java.util.HashMap;
 
 import jep.JepException;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.raytheon.edex.exception.DecoderException;
 import com.raytheon.uf.common.localization.IPathManager;
@@ -48,6 +48,7 @@ import com.raytheon.uf.edex.core.EDEXUtil;
  * Apr 2, 2009             njensen     Initial creation
  * Jul 10, 2014 2914       garmendariz Remove EnvProperties
  * Aug 04, 2014 3427       bclement    decoder interface now takes full path to jar
+ * Dec 17, 2015 5166       kbisanz     Update logging to use SLF4J
  * 
  * </pre>
  * 
@@ -57,8 +58,8 @@ import com.raytheon.uf.edex.core.EDEXUtil;
 
 public class PythonDecoderFactory {
 
-    protected static transient Log logger = LogFactory
-            .getLog(PythonDecoderFactory.class);
+    protected static transient Logger logger = LoggerFactory
+            .getLogger(PythonDecoderFactory.class);
 
     /** number of times to retry instantiating the decoder if it fails */
     private static final int MAX_RETRIES = 3;
@@ -123,7 +124,7 @@ public class PythonDecoderFactory {
         if (py == null) {
             String msg = "Cannot instantiate " + pluginFQN + " decoder, "
                     + moduleName + " products will not be decoded!";
-            logger.fatal(msg);
+            logger.error(msg);
             throw new DecoderException(msg);
         }
         return py;
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
index b51dee557e..48556934fd 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Registry
 Bundle-SymbolicName: com.raytheon.uf.edex.registry.ebxml
-Bundle-Version: 1.14.0.qualifier
+Bundle-Version: 1.15.1.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.uf.common.registry.schemas.ebxml;bundle-version="1.0.0",
@@ -27,13 +27,13 @@ Require-Bundle: com.raytheon.uf.common.registry.schemas.ebxml;bundle-version="1.
  com.raytheon.uf.common.registry.ebxml,
  com.raytheon.uf.common.stats;bundle-version="1.0.0",
  com.raytheon.uf.common.registry.event;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
+ org.apache.commons.lang3;bundle-version="3.4.0",
  com.raytheon.uf.edex.database;bundle-version="1.0.0",
  com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  javax.mail;bundle-version="1.0.0",
  org.apache.commons.validator;bundle-version="1.2.0",
  com.sun.xml.bind;bundle-version="1.0.0",
- org.eclipse.jetty;bundle-version="7.6.14",
+ org.eclipse.jetty;bundle-version="9.0.7",
  com.raytheon.uf.edex.security;bundle-version="1.14.0",
  org.opensaml;bundle-version="1.0.0",
  com.raytheon.uf.common.security;bundle-version="1.14.0",
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/modes/ebxml-modes.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/modes/ebxml-modes.xml
index 1e55fca587..99ca5c8bf8 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/modes/ebxml-modes.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/modes/ebxml-modes.xml
@@ -33,5 +33,6 @@
         <include>geo-common.xml</include>
         <include>utility-request.xml</include>
         <include>utility-common.xml</include>
+        <include>request-service</include>
     </mode>
 </edexModes>
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
deleted file mode 100644
index daf0cb46a4..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client-route.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd   
-  http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
-
-    <camelContext id="ebxml-request-service-camel"
-        xmlns="http://camel.apache.org/schema/spring"
-        errorHandlerRef="errorHandler">    
-        
-        <propertyPlaceholder id="ebxmlThriftServiceProperties"
-                             location="classpath:com.raytheon.uf.edex.registry.ebxml.properties"/>    
-        
-        <restConfiguration component="jetty" host="0.0.0.0" port="{{ebxml.thrift.service.port}}" >
-            <endpointProperty key="disableStreamCache" value="{{ebxml.thrift.service.disableStreamCache}}" />
-            <endpointProperty key="chunked" value="{{ebxml.thrift.service.chunked}}" />
-        </restConfiguration>
-
-        <rest path="{{env:HTTP_SERVER_PATH}}">
-            <post uri="/{format}">
-                <to uri="bean:httpServiceExecutor?method=execute(${body}, ${header.format}, ${in.header.accept-encoding}, ${in.header.CamelHttpServletResponse})" />
-            </post>
-            <post uri="/">
-                <to uri="bean:httpServiceExecutor?method=execute(${body}, ${in.header.content-type}, ${in.header.accept-encoding}, ${in.header.CamelHttpServletResponse})" />
-            </post>
-        </rest>
-    </camelContext>
-
-</beans>
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
index 61eadf4ebd..531a8c6fb5 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/resources/com.raytheon.uf.edex.registry.ebxml.properties
@@ -18,12 +18,10 @@ ebxml-notification-batch-size=50
 # CPU's+{registries this registry is replicating to/from}=max-threads
 # 20 is a pretty good starting point for a default.
 ebxml-webserver-max-threads=20
-# EBXML thrift service port
-ebxml.thrift.service.port=9588
-ebxml.thrift.service.disableStreamCache=true
-ebxml.thrift.service.chunked=false
 # EBXML webserver port
 ebxml.registry.webserver.port=8082
+# ebxml thrift service port
+ebxml.thrift.service.port=9588
 # EBXML registry host
 ebxml.registry.host=localhost
 # NCF HOST
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/ReplicationEventDao.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/ReplicationEventDao.java
index 7ebcbb1969..4b4a24bf24 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/ReplicationEventDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/ReplicationEventDao.java
@@ -39,6 +39,7 @@ import com.raytheon.uf.edex.registry.federation.ReplicationEvent;
  * 2/19/2014    2769       bphillip    Initial Creation
  * 8/27/2014    3560       bphillip    Added query by event time method
  * 5/11/2015    4448        bphillip    Separated EBXML Registry from Data Delivery
+ * 8 Feb, 2016  5198        dhladky     Class cast for String expecting Long fixed
  * </pre>
  * 
  * @author bphillip
@@ -67,7 +68,7 @@ public class ReplicationEventDao extends
                         + "%");
     }
 
-    public List<ReplicationEvent> getEventsBeforeTime(String time) {
+    public List<ReplicationEvent> getEventsBeforeTime(Long time) {
         return this.executeHQLQuery(GET_EVENTS_BY_TIME, "eventTime", time);
     }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/SlotTypeDao.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/SlotTypeDao.java
index e9eb193492..a5160539bd 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/SlotTypeDao.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/SlotTypeDao.java
@@ -25,6 +25,7 @@ import java.util.List;
 import oasis.names.tc.ebxml.regrep.xsd.rim.v4.SlotType;
 
 import org.hibernate.SQLQuery;
+import org.hibernate.StaleStateException;
 import org.hibernate.criterion.Property;
 
 import com.raytheon.uf.edex.database.dao.SessionManagedDao;
@@ -44,6 +45,7 @@ import com.raytheon.uf.edex.registry.ebxml.services.query.QueryConstants;
  * 7/29/2013    2191        bphillip    Modified method to get orphaned slots
  * 12/2/2013    1829        bphillip    Changed how orphans are purged
  * 10/16/2014   3454       bphillip    Upgrading to Hibernate 4
+ * Nov 18, 2015  5006       dhladky     Deletion of duplicate slots causes errors.
  * </pre>
  * 
  * @author bphillip
@@ -78,22 +80,44 @@ public class SlotTypeDao extends SessionManagedDao<String, SlotType> {
                     parentId).isEmpty()) {
                 deleteBySlotId(slotId);
             }
-
         }
     }
 
+    /**
+     * Delete an individual slot by ID
+     * @param id
+     */
     public void deleteBySlotId(String id) {
         SlotType slot = this.getById(id);
         if (slot != null) {
-            getCurrentSession().delete(slot);
+            try {
+                getCurrentSession().delete(slot);
+            } catch (StaleStateException sse) {
+                statusHandler.warn("Registry Object to delete: " + id
+                        + " no longer exists in registry.");
+            }
         }
     }
-    
-    public void deleteBySlotId(Collection<String> ids){
-        for(Object obj: createCriteria().add(
-                Property.forName(QueryConstants.ID).in(ids))
-                .list()){
-            getCurrentSession().delete(obj);
+
+    /**
+     * Deletes a list of registry objects (SLOTS) associated with given ids.
+     * 
+     * @param ids
+     */
+    @SuppressWarnings("unchecked")
+    public void deleteBySlotId(Collection<String> ids) {
+
+        List<SlotType> objs = createCriteria()
+                .add(Property.forName(QueryConstants.ID).in(ids)).list();
+     
+        for (SlotType slot: objs) {
+            
+            try {
+                getCurrentSession().delete(slot);
+            } catch (StaleStateException sse) {
+                statusHandler.warn("Registry Object to delete: " + slot.getId()
+                        + " no longer exists in registry.");
+            }
         }
     }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/RegistryRESTServices.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/RegistryRESTServices.java
index dfca0b27b4..2a76db2af2 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/RegistryRESTServices.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/RegistryRESTServices.java
@@ -29,7 +29,7 @@ import javax.xml.bind.JAXBException;
 
 import oasis.names.tc.ebxml.regrep.xsd.rim.v4.RegistryObjectType;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.cxf.clustering.FailoverFeature;
 import org.apache.cxf.clustering.SequentialStrategy;
 import org.apache.cxf.feature.Feature;
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/QueryProtocolRestService.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/QueryProtocolRestService.java
index df1981b448..6bb3c2eb4a 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/QueryProtocolRestService.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/QueryProtocolRestService.java
@@ -19,6 +19,10 @@
  **/
 package com.raytheon.uf.edex.registry.ebxml.services.rest;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.math.BigInteger;
 import java.util.List;
 
@@ -29,6 +33,11 @@ import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriInfo;
 import javax.xml.bind.JAXBException;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
 
 import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.MsgRegistryException;
 import oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.QueryManager;
@@ -37,17 +46,22 @@ import oasis.names.tc.ebxml.regrep.xsd.query.v4.QueryResponse;
 import oasis.names.tc.ebxml.regrep.xsd.query.v4.ResponseOptionType;
 import oasis.names.tc.ebxml.regrep.xsd.rim.v4.ParameterType;
 import oasis.names.tc.ebxml.regrep.xsd.rim.v4.QueryType;
+import oasis.names.tc.ebxml.regrep.xsd.rim.v4.RegistryObjectType;
 
 import org.apache.commons.beanutils.ConstructorUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.raytheon.uf.common.registry.RegistryJaxbManager;
+import com.raytheon.uf.common.registry.RegistryNamespaceMapper;
 import com.raytheon.uf.common.registry.constants.CanonicalQueryTypes;
 import com.raytheon.uf.common.registry.constants.Languages;
 import com.raytheon.uf.common.registry.constants.QueryReturnTypes;
 import com.raytheon.uf.common.registry.ebxml.RegistryUtil;
 import com.raytheon.uf.common.registry.services.rest.IQueryProtocolRestService;
 import com.raytheon.uf.common.serialization.JAXBManager;
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
 import com.raytheon.uf.edex.registry.ebxml.dao.QueryDefinitionDao;
 import com.raytheon.uf.edex.registry.ebxml.services.query.RegistryQueryUtil;
 import com.raytheon.uf.edex.registry.ebxml.util.EbxmlExceptionUtil;
@@ -67,6 +81,7 @@ import com.raytheon.uf.edex.registry.ebxml.util.EbxmlExceptionUtil;
  * 5/21/2013    2022        bphillip    Added interface and moved constants
  * 10/8/2013    1682        bphillip    Refactored to use parameter definitions from the registry
  * 10/30/2013   1538        bphillip    Changed root REST service path
+ * 12/04/2015   4993        bphillip    Modified query output to more user readable format using xslt
  * </pre>
  * 
  * @author bphillip
@@ -77,6 +92,10 @@ import com.raytheon.uf.edex.registry.ebxml.util.EbxmlExceptionUtil;
 @Transactional
 public class QueryProtocolRestService implements IQueryProtocolRestService {
 
+    /** The logger */
+    protected final IUFStatusHandler statusHandler = UFStatus
+            .getHandler(getClass());
+
     /** The local query manager */
     private QueryManager queryManager;
 
@@ -93,13 +112,15 @@ public class QueryProtocolRestService implements IQueryProtocolRestService {
      *             If errors occur while initializing the JAXBManager
      */
     public QueryProtocolRestService() throws JAXBException {
-        responseJaxb = new JAXBManager(QueryRequest.class, QueryResponse.class);
+        responseJaxb = new RegistryJaxbManager(new RegistryNamespaceMapper());
     }
 
     @GET
-    @Produces("text/xml")
-    public String executeQuery(@Context UriInfo info) throws JAXBException,
-            MsgRegistryException {
+    @Produces({ "text/html" })
+    public String executeQuery(@Context
+    UriInfo info) throws JAXBException, MsgRegistryException {
+
+        String xml = "";
         /*
          * Extract out the canonical query parameters
          */
@@ -128,6 +149,8 @@ public class QueryProtocolRestService implements IQueryProtocolRestService {
                 QueryRequest.RESPONSE_OPTION, QueryReturnTypes.REGISTRY_OBJECT);
         Boolean returnRequest = getValue(queryParameters,
                 QueryRequest.RETURN_REQUEST, Boolean.FALSE);
+        Boolean formatResponse = getValue(queryParameters,
+                QueryRequest.FORMAT_RESPONSE, Boolean.FALSE);
 
         /*
          * Create the query request object
@@ -163,12 +186,54 @@ public class QueryProtocolRestService implements IQueryProtocolRestService {
             }
         }
 
-        if (returnRequest.booleanValue()) {
-            return responseJaxb.marshalToXml(restQueryRequest);
+        QueryResponse response = null;
+        if (returnRequest) {
+            xml = responseJaxb.marshalToXml(restQueryRequest);
         } else {
-            return responseJaxb.marshalToXml(queryManager
-                    .executeQuery(restQueryRequest));
+            response = queryManager.executeQuery(restQueryRequest);
+            if (formatResponse) {
+                for (RegistryObjectType obj : response.getRegistryObjects()) {
+                    /*
+                     * The content slot must be removed since having an xml
+                     * document inside another xml document confuses the xslt
+                     * transformer. The content slot is removed here but the
+                     * change is not persisted to the registry, so the original
+                     * object remains intact.
+                     */
+                    obj.getSlot().remove(obj.getSlotByName("content"));
+                }
+            }
+            xml = responseJaxb.marshalToXml(response);
         }
+        return formatResponse ? xsltTransformResponse(xml) : xml;
+    }
+
+    /**
+     * Transforms the query response using XSLT to a more user friendly format
+     * 
+     * @param xml
+     *            The xml to format
+     * @return The formatted output
+     * @throws JAXBException
+     */
+    private String xsltTransformResponse(String xml) throws JAXBException {
+
+        try (InputStream is = new ByteArrayInputStream(xml.getBytes())) {
+            OutputStream outputStream = new ByteArrayOutputStream();
+            TransformerFactory factory = TransformerFactory.newInstance();
+            Transformer transformer = factory.newTransformer(new StreamSource(
+                    System.getProperty("ebxml.registry.webserver.home")
+                            + "/registry/formatRegistryObject.xsl"));
+            Source text = new StreamSource(is);
+            transformer.transform(text, new StreamResult(outputStream));
+            return outputStream.toString();
+        } catch (Exception e) {
+            statusHandler.error(
+                    "Error applying XSLT transform to the following xml:\n"
+                            + xml, e);
+            return xml;
+        }
+
     }
 
     /**
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryFederationManager.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryFederationManager.java
index 04d4a08d1c..30d5d099ad 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryFederationManager.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/rest/RegistryFederationManager.java
@@ -76,7 +76,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
 import com.raytheon.uf.common.localization.LocalizationFile;
 import com.raytheon.uf.common.localization.PathManagerFactory;
-import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
+import com.raytheon.uf.common.localization.exception.LocalizationException;
 import com.raytheon.uf.common.registry.constants.ActionTypes;
 import com.raytheon.uf.common.registry.constants.CanonicalQueryTypes;
 import com.raytheon.uf.common.registry.constants.DeletionScope;
@@ -174,6 +174,9 @@ import com.raytheon.uf.edex.security.SecurityConfiguration;
  * 5/11/2015    4448        bphillip    Separated EBXML Registry from Data Delivery
  * 5/29/2015    4448        bphillip    Added default user to registry on startup
  * 10/20/2015   4992        dhladky     Improve error handling.
+ * Nov 12, 2015 4834        njensen     Changed LocalizationOpFailedException to LocalizationException
+ * 8 Feb, 2016  5198        dhladky     Class cast for String expecting Long fixed
+ * 
  * </pre>
  * 
  * @author bphillip
@@ -204,19 +207,18 @@ public class RegistryFederationManager implements IRegistryFederationManager,
 
     /** The mode that EDEX was started in */
     public static final boolean centralRegistry;
-    
+
     /** registry user property **/
     public static final String EDEX_SECURITY_AUTH_USER = "edex.security.auth.user";
-    
+
     /** registry user password **/
     public static final String EDEX_SECURITY_AUTH_PASSWORD = "edex.security.auth.password";
-    
+
     /** Local (client) level adminstrator user **/
     public static final String REGISTRY_LOCAL_ADMIN = "RegistryLocalAdministrator";
-    
+
     /** Registry adminstrator (central) **/
     public static final String REGISTRY_ADMIN = "RegistryAdministrator";
-    
 
     static {
         try {
@@ -341,7 +343,7 @@ public class RegistryFederationManager implements IRegistryFederationManager,
                                 "Unable to locate federation configuration file: "
                                         + FEDERATION_CONFIG_FILE);
                     } else {
-                        federationProperties = (FederationProperties) jaxbManager
+                        federationProperties = jaxbManager
                                 .unmarshalFromXmlFile(
                                         FederationProperties.class,
                                         federationPropertiesFile);
@@ -391,6 +393,7 @@ public class RegistryFederationManager implements IRegistryFederationManager,
             }
 
             Runtime.getRuntime().addShutdownHook(new Thread() {
+                @Override
                 public void run() {
                     txTemplate.execute(new TransactionCallbackWithoutResult() {
 
@@ -415,14 +418,17 @@ public class RegistryFederationManager implements IRegistryFederationManager,
                      * The registry super user initially gets the default
                      * password which *must* be changed immediately
                      */
-                    statusHandler
-                            .info(REGISTRY_ADMIN+" Not present in Central Registry! Adding user: "+REGISTRY_ADMIN);
+                    statusHandler.info(REGISTRY_ADMIN
+                            + " Not present in Central Registry! Adding user: "
+                            + REGISTRY_ADMIN);
 
                     registryUsers.addUser(RegistryUtil.registryUser,
                             "password", REGISTRY_ADMIN);
                 } else {
                     statusHandler
-                            .info(REGISTRY_ADMIN+ " present in Central Registry: "+REGISTRY_ADMIN);
+                            .info(REGISTRY_ADMIN
+                                    + " present in Central Registry: "
+                                    + REGISTRY_ADMIN);
                 }
 
             } else if (!centralRegistry) {
@@ -450,8 +456,8 @@ public class RegistryFederationManager implements IRegistryFederationManager,
                 }
             }
         } catch (MsgRegistryException e) {
-            throw new EbxmlRegistryException(
-                    "Error Checking registry user! ", e);
+            throw new EbxmlRegistryException("Error Checking registry user! ",
+                    e);
         }
 
         initialized.set(true);
@@ -648,14 +654,18 @@ public class RegistryFederationManager implements IRegistryFederationManager,
 
     }
 
+    @Override
     @Transactional
     @GET
     @Path("updateRegistryEvents/{registryId}/{time}")
-    public void updateRegistryEvents(@PathParam("registryId")
-    String registryId, @PathParam("time")
-    String time) {
+    public void updateRegistryEvents(
+            @PathParam("registryId") String registryId,
+            @PathParam("time") String time) {
+        
+        Long lTime= Long.parseLong(time);
+        
         for (ReplicationEvent event : replicationEventDao
-                .getEventsBeforeTime(time)) {
+                .getEventsBeforeTime(lTime)) {
             event.addReplicatedTo(registryId);
             replicationEventDao.update(event);
         }
@@ -664,17 +674,17 @@ public class RegistryFederationManager implements IRegistryFederationManager,
     /**
      * Synchronizes this registry's data with the registry at the specified URL
      * 
-     * @param remoteRegistryUrl
-     *            The URL of the registry to sync with
+     * @param registryId
      * @throws EbxmlRegistryException
      *             If the thread executor fails to shut down properly
      * @throws MsgRegistryException
      */
+    @Override
     @Transactional
     @GET
     @Path("synchronizeWithRegistry/{registryId}")
-    public void synchronizeWithRegistry(@PathParam("registryId")
-    String registryId) throws Exception {
+    public void synchronizeWithRegistry(
+            @PathParam("registryId") String registryId) throws Exception {
 
         if (SYNC_IN_PROGRESS.compareAndSet(false, true)) {
             try {
@@ -833,6 +843,7 @@ public class RegistryFederationManager implements IRegistryFederationManager,
         }
     }
 
+    @Override
     @GET
     @Path("isFederated")
     @Transactional
@@ -840,18 +851,21 @@ public class RegistryFederationManager implements IRegistryFederationManager,
         return System.getProperty("ebxml.registry.federation.enabled");
     }
 
+    @Override
     @GET
     @Path("clusterId")
     public String clusterId() {
         return RegistryIdUtil.getId();
     }
 
+    @Override
     @GET
     @Path("siteId")
     public String siteId() {
         return EDEXUtil.getEdexSite();
     }
 
+    @Override
     @GET
     @Path("getObjectTypesReplicated")
     public String getObjectTypesReplicated() {
@@ -859,6 +873,7 @@ public class RegistryFederationManager implements IRegistryFederationManager,
                 .toArray());
     }
 
+    @Override
     @GET
     @Path("getFederationMembers")
     @Transactional
@@ -878,6 +893,7 @@ public class RegistryFederationManager implements IRegistryFederationManager,
         return builder.toString();
     }
 
+    @Override
     @GET
     @Path("getReplicatingTo")
     @Transactional
@@ -886,6 +902,7 @@ public class RegistryFederationManager implements IRegistryFederationManager,
                 .getRegistryReplicationServers().toArray());
     }
 
+    @Override
     @GET
     @Path("getReplicatingFrom")
     @Transactional
@@ -910,11 +927,12 @@ public class RegistryFederationManager implements IRegistryFederationManager,
         return RegistryQueryUtil.formatArrayString(registrySet.toArray());
     }
 
+    @Override
     @GET
     @Path("subscribeToRegistry/{registryId}")
     @Transactional
-    public void subscribeToRegistry(@PathParam("registryId")
-    String registryId) throws Exception {
+    public void subscribeToRegistry(@PathParam("registryId") String registryId)
+            throws Exception {
         statusHandler.info("Establishing replication with [" + registryId
                 + "]...");
         RegistryType remoteRegistry = getRegistry(registryId);
@@ -923,11 +941,12 @@ public class RegistryFederationManager implements IRegistryFederationManager,
         statusHandler.info("Established replication with [" + registryId + "]");
     }
 
+    @Override
     @GET
     @Path("unsubscribeFromRegistry/{registryId}")
     @Transactional
-    public void unsubscribeFromRegistry(@PathParam("registryId")
-    String registryId) throws Exception {
+    public void unsubscribeFromRegistry(
+            @PathParam("registryId") String registryId) throws Exception {
         statusHandler.info("Disconnecting replication with [" + registryId
                 + "]...");
         RegistryType remoteRegistry = getRegistry(registryId);
@@ -937,21 +956,23 @@ public class RegistryFederationManager implements IRegistryFederationManager,
                 .info("Disconnected replication with [" + registryId + "]");
     }
 
+    @Override
     @GET
     @Path("addReplicationServer/{registryId}")
     @Transactional
-    public void addReplicationServer(@PathParam("registryId")
-    String registryId) throws Exception {
+    public void addReplicationServer(@PathParam("registryId") String registryId)
+            throws Exception {
         getRegistry(registryId);
         servers.addReplicationServer(registryId);
         saveNotificationServers();
     }
 
+    @Override
     @GET
     @Path("removeReplicationServer/{registryId}")
     @Transactional
-    public void removeReplicationServer(@PathParam("registryId")
-    String registryId) throws Exception {
+    public void removeReplicationServer(
+            @PathParam("registryId") String registryId) throws Exception {
         getRegistry(registryId);
         servers.removeReplicationServer(registryId);
         saveNotificationServers();
@@ -988,12 +1009,10 @@ public class RegistryFederationManager implements IRegistryFederationManager,
 
         try {
             jaxbManager.marshalToXmlFile(servers, file.getAbsolutePath());
-
             lf.save();
-
         } catch (SerializationException e) {
             statusHandler.error("Unable to update replication server file!", e);
-        } catch (LocalizationOpFailedException e) {
+        } catch (LocalizationException e) {
             statusHandler.handle(Priority.ERROR, e.getLocalizedMessage(), e);
         }
     }
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/EbxmlExceptionUtil.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/EbxmlExceptionUtil.java
index 67d470cfb2..498804d03e 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/EbxmlExceptionUtil.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/util/EbxmlExceptionUtil.java
@@ -36,7 +36,7 @@ import oasis.names.tc.ebxml.regrep.xsd.spi.v4.CatalogingExceptionType;
 import oasis.names.tc.ebxml.regrep.xsd.spi.v4.FilteringExceptionType;
 import oasis.names.tc.ebxml.regrep.xsd.spi.v4.ValidationExceptionType;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 
 import com.raytheon.uf.common.registry.constants.ErrorSeverity;
 import com.raytheon.uf.common.status.IUFStatusHandler;
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/SslNetworkTrafficSelectChannelConnector.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/NetworkTrafficSelectChannelConnector.java
similarity index 61%
rename from edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/SslNetworkTrafficSelectChannelConnector.java
rename to edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/NetworkTrafficSelectChannelConnector.java
index 5dd13a1620..3a70cdd937 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/SslNetworkTrafficSelectChannelConnector.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/NetworkTrafficSelectChannelConnector.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -26,39 +26,44 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.eclipse.jetty.io.NetworkTrafficListener;
-import org.eclipse.jetty.io.nio.NetworkTrafficSelectChannelEndPoint;
-import org.eclipse.jetty.io.nio.SelectChannelEndPoint;
-import org.eclipse.jetty.io.nio.SelectorManager;
-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;
+import org.eclipse.jetty.io.SelectChannelEndPoint;
+import org.eclipse.jetty.io.SelectorManager;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 /**
- * 
- * Custom SSL connector for logging traffic.
- * 
+ * Custom version of
+ * org.eclipse.jetty.server.nio.NetworkTrafficSelectChannelConnector to create
+ * an updated version of
+ * org.eclipse.jetty.io.NetworkTrafficSelectChannelEndPoint which does not
+ * suffer from the bug described here:
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=431519
+ *
+ * This class should not be needed when Jetty is upgraded beyond 9.1.5.
+ *
  * <pre>
- * 
+ *
+ *
  * SOFTWARE HISTORY
- * 
- * Date         Ticket#     Engineer    Description
- * ------------ ----------  ----------- --------------------------
- * 3/27/2014    1712       bphillip    Initial Creation
+ *
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 1, 2015  5152      nabowle     Initial creation
+ *
  * </pre>
- * 
- * @author bphillip
- * @version 1
- **/
-public class SslNetworkTrafficSelectChannelConnector extends
-        SslSelectChannelConnector {
+ *
+ * @author nabowle
+ * @version 1.0
+ */
+
+public class NetworkTrafficSelectChannelConnector extends ServerConnector {
+
     private final List<NetworkTrafficListener> listeners = new CopyOnWriteArrayList<NetworkTrafficListener>();
 
-    public SslNetworkTrafficSelectChannelConnector() {
-        super();
-    }
-
-    public SslNetworkTrafficSelectChannelConnector(
+    public NetworkTrafficSelectChannelConnector(Server server,
             SslContextFactory sslContextFactory) {
-        super(sslContextFactory);
+        super(server, sslContextFactory);
     }
 
     /**
@@ -79,19 +84,12 @@ public class SslNetworkTrafficSelectChannelConnector extends
 
     @Override
     protected SelectChannelEndPoint newEndPoint(SocketChannel channel,
-            SelectorManager.SelectSet selectSet, SelectionKey key)
+            SelectorManager.ManagedSelector selectSet, SelectionKey key)
             throws IOException {
         NetworkTrafficSelectChannelEndPoint endPoint = new NetworkTrafficSelectChannelEndPoint(
-                channel, selectSet, key, _maxIdleTime, listeners);
-        endPoint.setConnection(selectSet.getManager().newConnection(channel,
-                endPoint, key.attachment()));
+                channel, selectSet, key, getScheduler(), getIdleTimeout(),
+                listeners);
         endPoint.notifyOpened();
         return endPoint;
     }
-
-    @Override
-    protected void endPointClosed(SelectChannelEndPoint endpoint) {
-        super.endPointClosed(endpoint);
-        ((NetworkTrafficSelectChannelEndPoint) endpoint).notifyClosed();
-    }
 }
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/NetworkTrafficSelectChannelEndPoint.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/NetworkTrafficSelectChannelEndPoint.java
new file mode 100644
index 0000000000..dcbda0726f
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/NetworkTrafficSelectChannelEndPoint.java
@@ -0,0 +1,152 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.edex.registry.ebxml.web.security;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.SocketChannel;
+import java.util.List;
+
+import org.eclipse.jetty.io.NetworkTrafficListener;
+import org.eclipse.jetty.io.SelectChannelEndPoint;
+import org.eclipse.jetty.io.SelectorManager;
+import org.eclipse.jetty.util.thread.Scheduler;
+
+import com.raytheon.uf.common.status.IUFStatusHandler;
+import com.raytheon.uf.common.status.UFStatus;
+import com.raytheon.uf.common.status.UFStatus.Priority;
+
+/**
+ * Updated version of org.eclipse.jetty.io.NetworkTrafficSelectChannelEndPoint
+ * that does not suffer from the bug described here:
+ * https://bugs.eclipse.org/bugs/show_bug.cgi?id=431519
+ *
+ * This is done by the ByteBuffer view in flush() being created from
+ * {@link ByteBuffer#slice()} before the flush.
+ * 
+ * This class should not be needed when Jetty is upgraded beyond 9.1.5.
+ *
+ * <pre>
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 1, 2015            nabowle     Initial creation
+ *
+ * </pre>
+ *
+ * @author nabowle
+ * @version 1.0
+ */
+
+public class NetworkTrafficSelectChannelEndPoint extends SelectChannelEndPoint {
+    private static final IUFStatusHandler statusHandler = UFStatus
+            .getHandler(NetworkTrafficSelectChannelEndPoint.class);
+
+    private final List<NetworkTrafficListener> listeners;
+
+    public NetworkTrafficSelectChannelEndPoint(SocketChannel channel,
+            SelectorManager.ManagedSelector selectSet, SelectionKey key,
+            Scheduler scheduler, long idleTimeout,
+            List<NetworkTrafficListener> listeners) throws IOException {
+        super(channel, selectSet, key, scheduler, idleTimeout);
+        this.listeners = listeners;
+    }
+
+    @Override
+    public int fill(ByteBuffer buffer) throws IOException {
+        int read = super.fill(buffer);
+        notifyIncoming(buffer, read);
+        return read;
+    }
+
+    @Override
+    public boolean flush(ByteBuffer... buffers) throws IOException {
+        boolean flushed = true;
+        for (ByteBuffer b : buffers) {
+            if (b.hasRemaining()) {
+                int position = b.position();
+                ByteBuffer view = b.slice();
+                flushed &= super.flush(b);
+                int l = b.position() - position;
+                view.limit(view.position() + l);
+                notifyOutgoing(view);
+                if (!flushed)
+                    break;
+            }
+        }
+        return flushed;
+    }
+
+    public void notifyOpened() {
+        if (listeners != null && !listeners.isEmpty()) {
+            for (NetworkTrafficListener listener : listeners) {
+                try {
+                    listener.opened(getSocket());
+                } catch (Exception e) {
+                    statusHandler.handle(Priority.WARN,
+                            "Error notifying listener.", e);
+                }
+            }
+        }
+    }
+
+    public void notifyIncoming(ByteBuffer buffer, int read) {
+        if (listeners != null && !listeners.isEmpty() && read > 0) {
+            for (NetworkTrafficListener listener : listeners) {
+                try {
+                    ByteBuffer view = buffer.asReadOnlyBuffer();
+                    listener.incoming(getSocket(), view);
+                } catch (Exception e) {
+                    statusHandler.handle(Priority.WARN,
+                            "Error notifying listener.", e);
+                }
+            }
+        }
+    }
+
+    public void notifyOutgoing(ByteBuffer view) {
+        if (listeners != null && !listeners.isEmpty() && view.hasRemaining()) {
+            for (NetworkTrafficListener listener : listeners) {
+                try {
+                    listener.outgoing(getSocket(), view);
+                } catch (Exception e) {
+                    statusHandler.handle(Priority.WARN,
+                            "Error notifying listener.", e);
+                }
+            }
+        }
+    }
+
+    public void notifyClosed() {
+        if (listeners != null && !listeners.isEmpty()) {
+            for (NetworkTrafficListener listener : listeners) {
+                try {
+                    listener.closed(getSocket());
+                } catch (Exception e) {
+                    statusHandler.handle(Priority.WARN,
+                            "Error notifying listener.", e);
+                }
+            }
+        }
+    }
+}
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/RegistryLoginModule.java b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/RegistryLoginModule.java
index dbd6cc2d9c..298f057bd0 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/RegistryLoginModule.java
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/RegistryLoginModule.java
@@ -1,19 +1,19 @@
 /**
  * This software was developed and / or modified by Raytheon Company,
  * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- * 
+ *
  * U.S. EXPORT CONTROLLED TECHNICAL DATA
  * This software product contains export-restricted data whose
  * export/transfer/disclosure is restricted by U.S. law. Dissemination
  * to non-U.S. persons whether in the United States or abroad requires
  * an export license or other authorization.
- * 
+ *
  * Contractor Name:        Raytheon Company
  * Contractor Address:     6825 Pine Street, Suite 340
  *                         Mail Stop B8
  *                         Omaha, NE 68106
  *                         402.291.0100
- * 
+ *
  * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
  * further licensing information.
  **/
@@ -24,8 +24,8 @@ import java.util.List;
 
 import javax.xml.ws.WebServiceException;
 
-import org.eclipse.jetty.plus.jaas.spi.AbstractLoginModule;
-import org.eclipse.jetty.plus.jaas.spi.UserInfo;
+import org.eclipse.jetty.jaas.spi.AbstractLoginModule;
+import org.eclipse.jetty.jaas.spi.UserInfo;
 import org.eclipse.jetty.util.security.Credential;
 import org.eclipse.jetty.util.security.Password;
 
@@ -33,20 +33,21 @@ import com.raytheon.uf.common.registry.services.RegistryServiceException;
 import com.raytheon.uf.edex.core.EDEXUtil;
 
 /**
- * 
+ *
  * The registry login module used by the Jetty server hosting the registry
  * services
- * 
+ *
  * <pre>
- * 
+ *
  * SOFTWARE HISTORY
- * 
+ *
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
  * 7/10/2014    1717        bphillip    Initial creation
  * 7/24/2014    1712       bphillip    Spring injection of CredentialCache
+ * 11/10/2015   4839        nabowle     Jetty9 compatibility.
  * </pre>
- * 
+ *
  * @author bphillip
  * @version 1
  **/
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/etc/jettyServer.xml b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/etc/jettyServer.xml
index 61b11a47bb..537d4747ad 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/etc/jettyServer.xml
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/etc/jettyServer.xml
@@ -2,108 +2,112 @@
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
 
 <!-- This file configures the Jetty Server used by the ebxml registry. This 
-	file is read in by the class com.raytheon.uf.edex.registry.ebxml.web.RegistryWebServer -->
+    file is read in by the class com.raytheon.uf.edex.registry.ebxml.web.RegistryWebServer -->
 
 <Configure id="RegistryWebServer" class="org.eclipse.jetty.server.Server">
 
-	<Set name="ThreadPool">
-		<New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
-			<Arg>
-				<New class="java.util.concurrent.ArrayBlockingQueue">
-					<Arg type="int">500</Arg>
-				</New>
-			</Arg>
-			<Set name="minThreads">5</Set>
-			<Set name="maxThreads">
-				<SystemProperty name="ebxml-webserver-max-threads"
-					default="8" />
-			</Set>
-		</New>
-	</Set>
+    <Arg name="ThreadPool">
+        <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
+            <Arg name="maxThreads" type="int">
+                <SystemProperty name="ebxml-webserver-max-threads"
+                    default="8" />
+            </Arg>
+            <Arg name="minThreads" type="int">5</Arg>
+            <Arg name="idleTimeout" type="int">60000</Arg>
+            <Arg>
+                <New class="java.util.concurrent.ArrayBlockingQueue">
+                    <Arg type="int">500</Arg>
+                </New>
+            </Arg>
+        </New>
+    </Arg>
 
-	<Call name="addConnector">
-		<Arg>
-			<New
-				class="com.raytheon.uf.edex.registry.ebxml.web.security.SslNetworkTrafficSelectChannelConnector">
-				<Arg>
-					<New class="com.raytheon.uf.edex.registry.ebxml.web.security.RegistrySSLContextFactory">
-						<Set name="keyStore">
-							<SystemProperty name="edex.security.keystore.path" />
-						</Set>
-						<Set name="keyStorePassword">
-							<SystemProperty name="edex.security.keystore.password" />
-						</Set>
-						<Set name="keyManagerPassword">
-							<SystemProperty name="edex.security.keystore.password" />
-						</Set>
-						<Set name="trustStore">
-							<SystemProperty name="edex.security.truststore.path" />
-						</Set>
-						<Set name="trustStorePassword">
-							<SystemProperty name="edex.security.truststore.password" />
-						</Set>
-					</New>
-				</Arg>
-				<Set name="port">
-					<SystemProperty name="ebxml.registry.webserver.port"
-						default="8082" />
-				</Set>
-				<Set name="maxIdleTime">30000</Set>
-			</New>
-		</Arg>
-	</Call>
+    <Call name="addConnector">
+        <Arg>
+            <New
+                class="com.raytheon.uf.edex.registry.ebxml.web.security.NetworkTrafficSelectChannelConnector">
+                <Arg>
+                    <Ref refid="RegistryWebServer" />
+                </Arg>
+                <Arg>
+                    <New class="com.raytheon.uf.edex.registry.ebxml.web.security.RegistrySSLContextFactory">
+                        <Set name="keyStorePath">
+                            <SystemProperty name="edex.security.keystore.path" />
+                        </Set>
+                        <Set name="keyStorePassword">
+                            <SystemProperty name="edex.security.keystore.password" />
+                        </Set>
+                        <Set name="keyManagerPassword">
+                            <SystemProperty name="edex.security.keystore.password" />
+                        </Set>
+                        <Set name="trustStorePath">
+                            <SystemProperty name="edex.security.truststore.path" />
+                        </Set>
+                        <Set name="trustStorePassword">
+                            <SystemProperty name="edex.security.truststore.password" />
+                        </Set>
+                    </New>
+                </Arg>
+                <Set name="port">
+                    <SystemProperty name="ebxml.registry.webserver.port"
+                        default="8082" />
+                </Set>
+                <Set name="idleTimeout" type="long">30000</Set>
+            </New>
+        </Arg>
+    </Call>
 
-	<Set name="handler">
-		<New
-			class="com.raytheon.uf.edex.registry.ebxml.web.security.RegistryIPAccessHandler">
-			<Call name="setIPAccessControl" />
-			<Set name="handler">
-				<New class="org.eclipse.jetty.server.handler.HandlerList">
-					<Set name="handlers">
-						<Array type="org.eclipse.jetty.server.Handler">
-							<Item>
-								<New class="org.eclipse.jetty.webapp.WebAppContext">
-									<Set name="securityHandler">
-										<New class="org.eclipse.jetty.security.ConstraintSecurityHandler">
-											<Set name="loginService">
-												<New class="org.eclipse.jetty.plus.jaas.JAASLoginService">
-													<Set name="name"><SystemProperty name="edex.security.auth.loginService.name" /></Set>
-													<Set name="loginModuleName"><SystemProperty name="edex.security.auth.loginService.realm" /></Set>
-												</New>
-											</Set>
-										</New>
-									</Set>
-									<Set name="descriptor">WEB-INF/web.xml</Set>
-									<Set name="resourceBase">
-										<SystemProperty name="ebxml.registry.webserver.home" />
-									</Set>
-									<Set name="contextPath">/</Set>
-									<Set name="parentLoaderPriority">true</Set>
-									<Set name="war">
-										<SystemProperty name="ebxml.registry.webserver.home" />
-									</Set>
-									<Set name="systemClasses">
-										<Array type="java.lang.String">
-											<Item>java.</Item>
-											<Item>javax.</Item>
-											<Item>org.</Item>
-											<Item>com.</Item>
-											<Item>gov.</Item>
-											<Item>ch.</Item>
-											<Item>net.</Item>
-											<Item>edu.</Item>
-										</Array>
-									</Set>
-								</New>
-							</Item>
-							<Item>
-								<New class="org.eclipse.jetty.server.handler.DefaultHandler">
-								</New>
-							</Item>
-						</Array>
-					</Set>
-				</New>
-			</Set>
-		</New>
-	</Set>
+    <Set name="handler">
+        <New
+            class="com.raytheon.uf.edex.registry.ebxml.web.security.RegistryIPAccessHandler">
+            <Call name="setIPAccessControl" />
+            <Set name="handler">
+                <New class="org.eclipse.jetty.server.handler.HandlerList">
+                    <Set name="handlers">
+                        <Array type="org.eclipse.jetty.server.Handler">
+                            <Item>
+                                <New class="org.eclipse.jetty.webapp.WebAppContext">
+                                    <Set name="securityHandler">
+                                        <New class="org.eclipse.jetty.security.ConstraintSecurityHandler">
+                                            <Set name="loginService">
+                                                <New class="org.eclipse.jetty.jaas.JAASLoginService">
+                                                    <Set name="name"><SystemProperty name="edex.security.auth.loginService.name" /></Set>
+                                                    <Set name="loginModuleName"><SystemProperty name="edex.security.auth.loginService.realm" /></Set>
+                                                </New>
+                                            </Set>
+                                        </New>
+                                    </Set>
+                                    <Set name="descriptor">WEB-INF/web.xml</Set>
+                                    <Set name="resourceBase">
+                                        <SystemProperty name="ebxml.registry.webserver.home" />
+                                    </Set>
+                                    <Set name="contextPath">/</Set>
+                                    <Set name="parentLoaderPriority">true</Set>
+                                    <Set name="war">
+                                        <SystemProperty name="ebxml.registry.webserver.home" />
+                                    </Set>
+                                    <Set name="systemClasses">
+                                        <Array type="java.lang.String">
+                                            <Item>java.</Item>
+                                            <Item>javax.</Item>
+                                            <Item>org.</Item>
+                                            <Item>com.</Item>
+                                            <Item>gov.</Item>
+                                            <Item>ch.</Item>
+                                            <Item>net.</Item>
+                                            <Item>edu.</Item>
+                                        </Array>
+                                    </Set>
+                                </New>
+                            </Item>
+                            <Item>
+                                <New class="org.eclipse.jetty.server.handler.DefaultHandler">
+                                </New>
+                            </Item>
+                        </Array>
+                    </Set>
+                </New>
+            </Set>
+        </New>
+    </Set>
 </Configure>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/registry/formatRegistryObject.xsl b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/registry/formatRegistryObject.xsl
new file mode 100644
index 0000000000..a4cf7d42eb
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/registry/formatRegistryObject.xsl
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:lcm="urn:oasis:names:tc:ebxml-regrep:xsd:lcm:4.0"
+    xmlns:query="urn:oasis:names:tc:ebxml-regrep:xsd:query:4.0" xmlns:spi="urn:oasis:names:tc:ebxml-regrep:xsd:spi:4.0"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:rs="urn:oasis:names:tc:ebxml-regrep:xsd:rs:4.0"
+    xmlns:ns5="http://www.w3.org/2005/08/addressing" xmlns:rim="urn:oasis:names:tc:ebxml-regrep:xsd:rim:4.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <xsl:template match="/">
+        <html>
+            <head>
+                <style type="text/css">
+                    a {font-weight:bold;}
+                    td {width:300px;}
+                    button{width:190px;}
+                    table {border:0;}
+                    body { font-family: Helvetica;
+                    margin-left: 75px;
+                    margin-right: 75px;
+                    background: #D3D3D3;}
+                </style>
+
+                <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+                    <title>Registry Query Results</title>
+                </meta>
+            </head>
+            <body>
+                <h2>Query Result</h2>
+                <table border="1">
+
+                    <xsl:for-each select="query:QueryResponse/rim:ObjectRefList">
+                        <tr bgcolor="#9acd32">
+                            <th colspan="2">Registry Object Refs</th>
+                        </tr>
+                        <xsl:for-each select="rim:ObjectRef">
+                            <tr>
+                                <td>
+                                    <xsl:value-of select="@id" />
+                                </td>
+                            </tr>
+                        </xsl:for-each>
+
+                    </xsl:for-each>
+
+                    <xsl:for-each select="query:QueryRequest">
+                        <tr bgcolor="#9acd32">
+                            <th colspan="2">Query Request</th>
+                        </tr>
+                        <tr>
+                            <th>Attribute</th>
+                            <th>Value</th>
+                        </tr>
+                        <tr>
+                            <td align="right">
+                                <b>Query Language</b>
+                            </td>
+                            <td>
+                                <xsl:value-of
+                                    select="query:Query/rim:Slot[@name='queryLanguage']/rim:SlotValue/rim:Value" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td align="right">
+                                <b>Query Expression</b>
+                            </td>
+                            <td>
+                                <xsl:value-of
+                                    select="query:Query/rim:Slot[@name='queryExpression']/rim:SlotValue/rim:Value" />
+                            </td>
+                        </tr>
+                    </xsl:for-each>
+
+                    <xsl:for-each
+                        select="query:QueryResponse/rim:RegistryObjectList/rim:RegistryObject">
+
+                        <tr bgcolor="#9acd32">
+                            <th colspan="3">Registry Object</th>
+                        </tr>
+                        <tr>
+                            <th>Attribute</th>
+                            <th>Value</th>
+                            <th>Type</th>
+                        </tr>
+                        <tr>
+                            <td align="right">
+                                <b>id</b>
+                            </td>
+                            <td>
+                                <xsl:value-of select="@id" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td align="right">
+                                <b>lid</b>
+                            </td>
+                            <td>
+                                <xsl:value-of select="@lid" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td align="right">
+                                <b>Object Type</b>
+                            </td>
+                            <td>
+                                <xsl:value-of select="@objectType" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td align="right">
+                                <b>Owner</b>
+                            </td>
+                            <td>
+                                <xsl:value-of select="@owner" />
+                            </td>
+                        </tr>
+                        <xsl:for-each select="rim:Slot">
+                            <tr>
+                                <td align="right">
+                                    <b>
+                                        <xsl:value-of select="@name" />
+                                    </b>
+                                </td>
+                                <td>
+                                    <xsl:value-of select="rim:SlotValue/rim:Value" />
+                                </td>
+                                <td>
+                                    <xsl:value-of select="rim:SlotValue/@xsi:type" />
+                                </td>
+                            </tr>
+                        </xsl:for-each>
+                    </xsl:for-each>
+                </table>
+            </body>
+        </html>
+    </xsl:template>
+
+</xsl:stylesheet> 
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/registry/services/query/QueryInterface.html b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/registry/services/query/QueryInterface.html
index 45a09d5de2..c105a97f05 100644
--- a/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/registry/services/query/QueryInterface.html
+++ b/edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/registry/services/query/QueryInterface.html
@@ -78,6 +78,15 @@ Date         Ticket#     Engineer    Description
 			</select>
 		</td>
 	</tr>
+	<tr>
+		<td>Format Response</td>
+		<td>
+			<select name="formatResponse" id="formatResponseSelect">
+			    <option value="true">True</option>
+				<option value="false">False</option>
+			</select>
+		</td>
+	</tr>
 	<tr>
 		<td>Depth</td> 
 		<td>
diff --git a/edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java b/edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
index d41a770c01..5a9b7324d4 100644
--- a/edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
+++ b/edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
@@ -28,6 +28,9 @@ import java.io.IOException;
 import java.util.LinkedHashSet;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import com.raytheon.uf.common.localization.IPathManager;
 import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@@ -44,8 +47,8 @@ import com.raytheon.uf.common.util.registry.RegistryException;
 import com.raytheon.uf.edex.core.EDEXUtil;
 import com.raytheon.uf.edex.core.EdexException;
 import com.raytheon.uf.edex.database.cluster.ClusterLockUtils;
-import com.raytheon.uf.edex.database.cluster.ClusterTask;
 import com.raytheon.uf.edex.database.cluster.ClusterLockUtils.LockState;
+import com.raytheon.uf.edex.database.cluster.ClusterTask;
 import com.raytheon.uf.edex.site.SiteActivationMessage.Action;
 
 /**
@@ -68,6 +71,7 @@ import com.raytheon.uf.edex.site.SiteActivationMessage.Action;
  * Jul 10, 2014  2914      garmendariz Remove EnvProperties
  * Nov 9, 2015   14734     yteng       Remove activeSites and add lock to synchronize access
  *                                     to activeSites.txt to eliminate race conditions
+ * Dec 21, 2015  4262      dgilling    Execute startup ISiteActivationListeners asynchronously.
  * 
  * </pre>
  * 
@@ -82,7 +86,10 @@ public class SiteAwareRegistry {
 
     private static SiteAwareRegistry instance = new SiteAwareRegistry();
 
-    private Set<ISiteActivationListener> activationListeners = new CopyOnWriteArraySet<ISiteActivationListener>();
+    private final ExecutorService activationThreadPool = Executors
+            .newCachedThreadPool();
+
+    private final Set<ISiteActivationListener> activationListeners = new CopyOnWriteArraySet<ISiteActivationListener>();
 
     private String routeId;
 
@@ -105,23 +112,53 @@ public class SiteAwareRegistry {
      * @param sa
      *            the listener to register / add to the list
      */
-    public Object register(ISiteActivationListener sa) throws RegistryException {
+    public Object register(final ISiteActivationListener sa)
+            throws RegistryException {
         if (!activationListeners.add(sa)) {
             throw new RegistryException(
                     "SiteAwareRegistry Exception - duplicate site "
                             + sa.toString());
         }
+
+        Set<String> activeSites = getActiveSitesFromFile(true);
+        final CountDownLatch activationComplete = new CountDownLatch(
+                activeSites.size());
+
         // inform of the current active sites
-        for (String siteID : getActiveSitesFromFile(true)) {
-            try {
-                sa.activateSite(siteID);
-            } catch (Exception e) {
-                // Stack trace is not printed per requirement for DR14360
-                statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage());
-            }
+        for (final String siteID : activeSites) {
+            Runnable activateSiteTask = new Runnable() {
+
+                @Override
+                public void run() {
+                    try {
+                        sa.activateSite(siteID);
+                    } catch (Exception e) {
+                        // Stack trace is not printed per requirement for
+                        // DR14360
+                        statusHandler.error(e.getLocalizedMessage());
+                    } finally {
+                        activationComplete.countDown();
+                    }
+                }
+            };
+            activationThreadPool.submit(activateSiteTask);
         }
 
-        sa.registered();
+        Runnable siteActivationCompleteTask = new Runnable() {
+
+            @Override
+            public void run() {
+                try {
+                    activationComplete.await();
+                } catch (InterruptedException e) {
+                    statusHandler.error(e.getLocalizedMessage());
+                } finally {
+                    sa.registered();
+                }
+            }
+        };
+        activationThreadPool.submit(siteActivationCompleteTask);
+
         return this;
     }
 
@@ -280,7 +317,6 @@ public class SiteAwareRegistry {
      * load the active site list
      */
     private Set<String> getActiveSitesFromFile(boolean useFileLock) {
-        // add cluster locking
         ClusterTask ct = null;
         if (useFileLock) {
             do {
@@ -321,8 +357,8 @@ public class SiteAwareRegistry {
             }
 
             if (useFileLock) {
-                ClusterLockUtils.deleteLock(ct.getId().getName(), ct
-                        .getId().getDetails());
+                ClusterLockUtils.deleteLock(ct.getId().getName(), ct.getId()
+                        .getDetails());
             }
         }
 
@@ -368,31 +404,34 @@ public class SiteAwareRegistry {
     }
 
     /**
-     *  update the active site list
-     *
+     * update the active site list
+     * 
      * @param action
      * @param siteID
      */
     private synchronized void updateActiveSites(Action action, String siteID) {
         ClusterTask ct = null;
         do {
-            ct = ClusterLockUtils.lock("siteActivation", "readwrite",
-                    120000, true);
+            ct = ClusterLockUtils.lock("siteActivation", "readwrite", 120000,
+                    true);
         } while (!LockState.SUCCESSFUL.equals(ct.getLockState()));
 
         Set<String> activeSites = getActiveSitesFromFile(false);
         if (Action.ACTIVATE.equals(action)) {
-            if (activeSites.add(siteID))
+            if (activeSites.add(siteID)) {
                 saveActiveSites(activeSites);
+            }
         } else if (Action.DEACTIVATE.equals(action)) {
-            if (activeSites.remove(siteID))
+            if (activeSites.remove(siteID)) {
                 saveActiveSites(activeSites);
+            }
         } else {
-            statusHandler.handle(Priority.PROBLEM, "Error updating active sites");
+            statusHandler.handle(Priority.PROBLEM,
+                    "Error updating active sites");
         }
 
-        ClusterLockUtils.deleteLock(ct.getId().getName(), ct
-                .getId().getDetails());
+        ClusterLockUtils.deleteLock(ct.getId().getName(), ct.getId()
+                .getDetails());
     }
 }
 
diff --git a/edexOsgi/com.raytheon.uf.edex.tafqueue/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.tafqueue/META-INF/MANIFEST.MF
index 7323523e30..2af3f60324 100644
--- a/edexOsgi/com.raytheon.uf.edex.tafqueue/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.edex.tafqueue/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tafqueue
 Bundle-SymbolicName: com.raytheon.uf.edex.tafqueue
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174",
@@ -11,7 +11,6 @@ Require-Bundle: com.raytheon.edex.common;bundle-version="1.12.1174",
  com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
  com.raytheon.uf.common.status;bundle-version="1.12.1174",
  javax.persistence;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
  com.raytheon.uf.common.auth;bundle-version="1.12.1174",
  com.raytheon.uf.edex.auth;bundle-version="1.12.1174",
  com.raytheon.uf.common.plugin.nwsauth;bundle-version="1.12.1174"
diff --git a/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml
index 4e21290fd0..cc1bfbd187 100644
--- a/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.text.feature/feature.xml
@@ -71,4 +71,18 @@
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.raytheon.uf.edex.plugin.text.dbsrv"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="com.raytheon.uf.edex.plugin.text.subscription"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/capture b/edexOsgi/com.raytheon.uf.tools.cli/impl/capture
index 283d9130f9..8317aa1638 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/capture
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/capture
@@ -7,17 +7,21 @@ edexGrepString="edex.run.mode="
 xorgLogPath="/var/log"
 
 # the remote servers to grab top on.  Use to get general state of servers
-REMOTE_SERVERS_TO_CHECK="${DX_SERVERS}"
-
-# in case environ variable is undefined
-if [ "$REMOTE_SERVERS_TO_CHECK" == "" ]; then
+if [ ! -z "${DX_SERVERS}" ]; then
+   REMOTE_SERVERS_TO_CHECK="${DX_SERVERS}"
+else
    REMOTE_SERVERS_TO_CHECK="dx1f dx2f dx3 dx4"
 fi
+if [ ! -z "${PX_SERVERS}" ]; then
+   REMOTE_SERVERS_TO_CHECK="${REMOTE_SERVERS_TO_CHECK} ${PX_SERVERS}"
+else
+   REMOTE_SERVERS_TO_CHECK="${REMOTE_SERVERS_TO_CHECK} px1 px2"
+fi
 
 # the database host to grab current running queries for
 DATABASE_HOST="dx1f"
 
-# Flags to control what data capure grabs, to enable flag must be YES, anything else will be considered off.
+# Flags to control what data capture grabs, to enable flag must be YES, anything else will be considered off.
 RUN_JSTACK="Y"
 JSTACK_ITERATIONS="15"
 RUN_JMAP="Y"
@@ -590,7 +594,9 @@ else
            caveProcNums="$caveProcNums $children"
        fi
    done
-   procs=$(ps --no-header -fp $caveProcNums)
+   if [ ! "${caveProcNums}" = "" ]; then
+       procs=$(ps --no-header -fp $caveProcNums)
+   fi
 fi
 
 if [ ! -z "$cavePid" ]; then
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/conf/TDBConfig.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/conf/TDBConfig.py
index eea79f7e5b..4ab2b9b3a0 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/conf/TDBConfig.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/conf/TDBConfig.py
@@ -62,8 +62,6 @@ flags = {'-r':('text_get_prod','Read data from the database'),
          
          '-c':('afos_cmds','Reviews AFOS commands'),
          
-         '-tA':('trig_add','Add trigger(s) to populate the subscription table.'),
-         '-tR':('trig_del','Remove trigger(s) from the subscription table.'),
          '-n':('site_node', 'Display the current site')
          }
 
@@ -175,9 +173,7 @@ usage: textdb -r AFOSCmd                 Does a standard afos read
        textdb -s -r SS                   Displays XXX list for state [SS]
        textdb -pil -a productID script  Adds a PIL watch warning product with script pathname
        textdb -pil -d productID script  Deletes a PIL watch warning product with script pathname
-       textdb -c                         Reviews AFOS commands
-       textdb -tA script                 Add trigger(s) to subscription table
-       textdb -tR all                    Remove trigger(s) from subscriptions table     
+       textdb -c                         Reviews AFOS commands  
        textdb -n [site]                  Gets current node (CCC) site for running edex
 """
 # AFOS commands summary. Displayed when text database CLI tool is run with
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py
index 78896be429..4335741507 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/subscription/SubscriptionManager.py
@@ -31,7 +31,7 @@ import collections
 
 from ufpy import ThriftClient
 from dynamicserialize.dstypes.com.raytheon.uf.common.message import Message, Header, Property
-from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.text.request import SubscriptionRequest
+from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.text.subscription.request import SubscriptionRequest
 ##############################################################################
 # Class providing a command line interface to the EDEX Subscription Service
 # (SubscribeSrv) end-point. The package design, is to allow this class to run
diff --git a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
index bed1706dc8..daecb06d6a 100644
--- a/edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
+++ b/edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
@@ -87,6 +87,7 @@ def appendIfNotPresent(multimap, key, value):
 #    08/15/14        2926          bclement       Fixed hasSubOperations()
 #    08/22/14        2926          bclement       Switched to ThriftClient
 #    09/05/14        2926          bclement       Moved TextDBRequest to common
+#    02/05/16        5269          skorolev       Removed Handles the Watch Warn Trigger requests
 ##############################################################################
 class TextDB:
 
@@ -407,68 +408,6 @@ class TextDB:
         sm = SM.SubscriptionManager(name='textdb',args=cline)
         return sm.execute()
 
-    # Handles the Watch Warn Trigger requests
-    #
-    # raise:
-    #    propagates any exception received 
-    def __handleWatchWarnRequest(self):
-        cmd = self.commands.get('command')[0]
-        args = self.commands.get(cmd)
-        if cmd == 'trig_add':
-            if (os.path.exists(args[0])):
-                try:
-                    self.__deleteWatchWarn()
-                    self.__deleteSubscriptions()
-                except Exception,e:
-                        raise MessageError('unable to create message for textdb request',e)           
-                try:    
-                    for i in range(len(args)):    
-                        f = open(args[i],'r')
-                        for line in f:
-                            # remove all white-spaces at beginning of the line.
-                            line = line.lstrip()
-                            if (line.find('#') == -1):                        
-                                try:
-                                    values = line.split(' ', 1)
-                                    try:
-                                        props = []
-                                        props.append(Property(name='VIEW',value='warn'))
-                                        props.append(Property(name='OP',value='PUT'))
-                                        props.append(Property(name='PRODID',value=values[0]))
-                                        props.append(Property(name='SCRIPT',value=values[1]))
-                                        msg = Message(header=Header(props))
-                                    except Exception,e:
-                                            raise MessageError('unable to create message for textdb request',e)
-
-                                    if ((len(values[0]) >= 8) & (len(values[1].strip('\r\n')) > 0)):
-                                        # print "Insert Subscription [" + values[0] + "] Status:" + str(sm.execute())
-                                        cline = ['-o','add', '-t','ldad', '-r','ldad', '-p', values[0], '-f', values[1], '-c','%TRIGGER%']
-                                        sm = SM.SubscriptionManager(name='textdb',args=cline)
-                                        sm.execute()
-                                        msg = self.__submitRequestMessage(msg)
-                                        status = self.__processRequestResponse(msg)
-                                except ValueError:
-                                    util.printMessage(sys.stderr,
-                                        header='Error processing line',
-                                        body=line)
-                finally:
-                    f.close()
-            else:
-                raise MessageError('Unable to locate file: ' + args[0])
-        else:
-            self.__deleteSubscriptions()
-        return
-
-    #
-    #
-    #
-    def __deleteWatchWarn(self):
-        props = []
-        props.append(Property(name='VIEW',value='warn'))
-        props.append(Property(name='OP',value='DELETE'))
-        msg = self.__submitRequestMessage(Message(header=Header(props)))
-        status = self.__processRequestResponse(msg)
-
     #
     #
     #
diff --git a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpservertext/ifpServerText.py b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpservertext/ifpServerText.py
index 66754d5eb1..34d98d4ddd 100644
--- a/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpservertext/ifpServerText.py
+++ b/edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpservertext/ifpServerText.py
@@ -50,6 +50,7 @@ from ufpy import ThriftClient
 #    Date            Ticket#       Engineer       Description
 #    ------------    ----------    -----------    --------------------------
 #    12/17/10                      dgilling       Initial Creation.
+#    11/17/15         #5129        dgilling       Support changes to GetSiteTimeZoneInfoRequest.
 #    
 # 
 #
@@ -684,9 +685,17 @@ Usage: ifpServerText -h hostname -p rpcPortNumber -o siteID [-u user]
         txt = ""
         wsId = WsId(progName="ifpServerText")
         if self.__metaInfo == "sitetimezone":
+            request = GetActiveSitesRequest()
+            try:
+                serverResponse = self.__thrift.sendRequest(request)
+            except Exception, e:
+                raise RuntimeError,  "Could not retrieve meta information: " + str(e)            
+            
+            siteIds = serverResponse
             request = GetSiteTimeZoneInfoRequest()
             request.setWorkstationID(wsId)
             request.setSiteID("")
+            request.setRequestedSiteIDs(siteIds)
             try:
                 serverResponse = self.__thrift.sendRequest(request)
             except Exception, e:
@@ -733,7 +742,7 @@ Usage: ifpServerText -h hostname -p rpcPortNumber -o siteID [-u user]
                 raise RuntimeError,  "Could not retrieve meta information: " + str(e)
             
             if (serverResponse.isOkay()):
-                domain = serverResponse.getPayload()[0]
+                domain = serverResponse.getPayload()
                 proj = domain.getProjection()
                 txt = "ProjectionID: " + proj.getProjectionID() + "\n"
                 txt = txt + "Grid Size: " + `(domain.getNx(), domain.getNy())` + "\n"
diff --git a/edexOsgi/gov.noaa.nws.sr.oun.dataplugin.mping/META-INF/MANIFEST.MF b/edexOsgi/gov.noaa.nws.sr.oun.dataplugin.mping/META-INF/MANIFEST.MF
index 5ea0a48c47..9ee85f4584 100644
--- a/edexOsgi/gov.noaa.nws.sr.oun.dataplugin.mping/META-INF/MANIFEST.MF
+++ b/edexOsgi/gov.noaa.nws.sr.oun.dataplugin.mping/META-INF/MANIFEST.MF
@@ -2,14 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mping
 Bundle-SymbolicName: gov.noaa.nws.sr.oun.dataplugin.mping
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Bundle-Vendor: NWS OUN
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
  com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
  com.raytheon.edex.common;bundle-version="1.12.1174",
  javax.persistence;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
  javax.measure;bundle-version="1.0.0",
  com.raytheon.uf.common.pointdata,
  com.raytheon.uf.edex.pointdata,
diff --git a/javaUtilities/build.wes2bridge.utility/ant/setup.xml b/javaUtilities/build.wes2bridge.utility/ant/setup.xml
index 2b35a553f0..531c078505 100644
--- a/javaUtilities/build.wes2bridge.utility/ant/setup.xml
+++ b/javaUtilities/build.wes2bridge.utility/ant/setup.xml
@@ -3,30 +3,48 @@
 		classpath="${basedir}/../build.wes2bridge.utility/lib/ant/ant-contrib-1.0b3.jar" />
 	
 	<!-- The directory that the jar file will be placed in when it is finished. -->
-	<property name="destination.directory" 
-		value="" />
+	<property name="destination.directory" value="" />
 	<!-- The location of uframe-eclipse. -->
-	<property name="eclipse.directory" value="/opt/uframe-eclipse" />
-	<!-- Used to indicate if this is part of an rpm build. -->
-	<property name="rpm.build" value="false" />
+	<property name="eclipse.directory" value="" />
+	<!-- The location of the awips2 baseline. -->
+	<property name="baseline.dir" value="" />
 	
-	<!-- Verify the a destination directory has been provided. -->
+	<!-- Verify the destination directory has been provided. -->
 	<if>
 		<equals arg1="${destination.directory}" arg2="" />
 		<then>
 			<fail message="Error: a destination directory has not been specified." />
 		</then>
 	</if>
-	
+	<!-- Verify the an eclipse directory has been provided. -->
 	<if>
-		<equals arg1="${rpm.build}" arg2="true" />
+		<equals arg1="${eclipse.directory}" arg2="" />
 		<then>
-			<var name="baseline.directory" value="${basedir}/../build.wes2bridge.utility/wes2bridge/tmp/plugins" />
-			<var name="bin.dir" value="@dot" />
+			<fail message="Error: an eclipse directory has not been specified." />
 		</then>
-		<else>
-			<var name="baseline.directory" value="${basedir}/../" />
-			<var name="bin.dir" value="bin" />
-		</else>
 	</if>
+	<!-- Verify the awips2 baseline directory has been provided. -->
+	<if>
+		<equals arg1="${baseline.dir}" arg2="" />
+		<then>
+			<fail message="Error: a awips2 baseline directory has not been specified." />
+		</then>
+	</if>
+	
+	<target name="extract_eclipse_jar_in_jar">
+		<mkdir dir="${baseline.dir}/${project.name}/lib" />
+		<unzip
+			dest="${baseline.dir}/${project.name}/lib" 
+			overwrite="true">
+			
+			<fileset dir="${eclipse.directory}/plugins">
+				<include name="org.eclipse.jdt.ui_*.jar" />
+			</fileset>
+			
+        	<patternset>
+        		<include name="jar-in-jar-loader.zip" />
+        	</patternset>			
+			
+		</unzip>
+	</target>
 </project>
\ No newline at end of file
diff --git a/javaUtilities/build.wes2bridge.utility/build.xml b/javaUtilities/build.wes2bridge.utility/build.xml
deleted file mode 100644
index 817a6d6ed0..0000000000
--- a/javaUtilities/build.wes2bridge.utility/build.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<project default="build" basedir=".">
-	<property name="eclipse.dir" 
-		value="/opt/uframe-eclipse" />	
-	
-	<target name="init">
-		<antcall target="clean" />
-		
-		<exec executable="/usr/bin/find"
-		outputproperty="launcher.jar">
-			<arg value="${eclipse.dir}/plugins" />
-			<arg value="-name" />
-			<arg value="org.eclipse.equinox.launcher_*.jar" />
-		</exec>
-		
-		<exec executable="/usr/bin/find"
-		outputproperty="pde.dir">
-			<arg value="${eclipse.dir}/plugins" />
-			<arg value="-name" />
-			<arg value="org.eclipse.pde.build_*" />
-		</exec>
-	</target>
-		
-	<target name="clean">
-		<if>
-			<available file="${basedir}/wes2bridge/tmp"
-			type="dir" />
-			<then>
-				<delete includeemptydirs="true">
-					<fileset dir="${basedir}/wes2bridge/tmp" />
-				</delete>
-			</then>
-		</if>
-	</target>
-	
-	<target name="build" depends="init">
-		<java
-			classname="org.eclipse.core.launcher.Main"
-			fork="true"
-			failonerror="true">
-			
-			<arg value="-application" />
-			<arg value="org.eclipse.ant.core.antRunner" />
-			<arg value="-buildfile" />
-			<arg value="${pde.dir}/scripts/productBuild/productBuild.xml" />
-			<arg value="-DbaseLocation=${eclipse.dir}" />
-			<arg value="-Dbuilder=${basedir}/wes2bridge" />
-			<arg value="-DbuildDirectory=${basedir}/wes2bridge/tmp" />
-			<arg value="-Dbase=${basedir}/wes2bridge" />
-			<arg value="-Dconfigs=linux,gtk,x86" />
-			
-			<classpath>
-				<pathelement 
-					location="${launcher.jar}" />
-			</classpath>
-		</java>
-	</target>
-	
-	<taskdef resource="net/sf/antcontrib/antlib.xml" 
-		classpath="${basedir}/lib/ant/ant-contrib-1.0b3.jar" />
-</project>
\ No newline at end of file
diff --git a/javaUtilities/build.wes2bridge.utility/lib/jar-in-jar-loader.zip b/javaUtilities/build.wes2bridge.utility/lib/jar-in-jar-loader.zip
deleted file mode 100644
index 6ee121769d..0000000000
Binary files a/javaUtilities/build.wes2bridge.utility/lib/jar-in-jar-loader.zip and /dev/null differ
diff --git a/javaUtilities/com.raytheon.wes2bridge.common/META-INF/MANIFEST.MF b/javaUtilities/com.raytheon.wes2bridge.common/META-INF/MANIFEST.MF
index 7468bfa54e..262d0215d4 100644
--- a/javaUtilities/com.raytheon.wes2bridge.common/META-INF/MANIFEST.MF
+++ b/javaUtilities/com.raytheon.wes2bridge.common/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: Wes2Bridge Utility Common
 Bundle-SymbolicName: com.raytheon.wes2bridge.common
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.apache.commons.lang;bundle-version="2.3.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.raytheon.wes2bridge.common.configuration,
  com.raytheon.wes2bridge.configuration.jaxb
diff --git a/javaUtilities/com.raytheon.wes2bridge.common/build.xml b/javaUtilities/com.raytheon.wes2bridge.common/build.xml
new file mode 100644
index 0000000000..b96cbeafd9
--- /dev/null
+++ b/javaUtilities/com.raytheon.wes2bridge.common/build.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project default="create_jar" name="Create com.raytheon.wes2bridge.common.jar.">
+	
+	<import file="${basedir}/../build.wes2bridge.utility/ant/setup.xml" />
+	
+	<property name="project.name" value="com.raytheon.wes2bridge.common" />
+
+	<target name="compile">
+		<mkdir dir="${baseline.dir}/${project.name}/bin" />
+		<javac destdir="${baseline.dir}/${project.name}/bin" 
+			srcdir="${baseline.dir}/${project.name}/src" 
+			executable="/awips2/java/bin/javac" fork="true" 
+			includeantruntime="false">
+			
+			<include name="**/*.java" />
+			
+		</javac>
+	</target>
+	
+	<target name="create_jar" depends="compile">
+		<jar destfile="${destination.directory}/${project.name}.jar" 
+			manifest="${baseline.dir}/${project.name}/META-INF/MANIFEST.MF">
+			
+			<fileset dir="${baseline.dir}/${project.name}/bin" />
+		</jar>
+	</target>
+</project>
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.wes2bridge.configuration/META-INF/MANIFEST.MF b/javaUtilities/com.raytheon.wes2bridge.configuration/META-INF/MANIFEST.MF
index 22b6b77212..70d7ac772f 100644
--- a/javaUtilities/com.raytheon.wes2bridge.configuration/META-INF/MANIFEST.MF
+++ b/javaUtilities/com.raytheon.wes2bridge.configuration/META-INF/MANIFEST.MF
@@ -4,7 +4,5 @@ Bundle-Name: Wes2Bridge Configuration Utility
 Bundle-SymbolicName: com.raytheon.wes2bridge.configuration
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.apache.commons.configuration;bundle-version="1.6.0",
- org.apache.commons.lang;bundle-version="2.3.0",
- com.raytheon.wes2bridge.common;bundle-version="1.0.0"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: com.raytheon.wes2bridge.common;bundle-version="1.0.0"
diff --git a/javaUtilities/com.raytheon.wes2bridge.configuration/build.xml b/javaUtilities/com.raytheon.wes2bridge.configuration/build.xml
index 248e81715f..4d3d3da34e 100644
--- a/javaUtilities/com.raytheon.wes2bridge.configuration/build.xml
+++ b/javaUtilities/com.raytheon.wes2bridge.configuration/build.xml
@@ -5,39 +5,38 @@
 	
 	<import file="${basedir}/../build.wes2bridge.utility/ant/setup.xml" />
 	
-    <target name="create_run_jar">
+	<property name="project.name" value="com.raytheon.wes2bridge.configuration" />
+	
+	<path id="WES2BRIDGE.classpath">
+		<pathelement path="${destination.directory}/com.raytheon.wes2bridge.common.jar" />
+	</path>
+	
+	<target name="compile">
+		<mkdir dir="${baseline.dir}/${project.name}/bin" />
+		<javac destdir="${baseline.dir}/${project.name}/bin" 
+			srcdir="${baseline.dir}/${project.name}/src" 
+			executable="/awips2/java/bin/javac" fork="true" 
+			includeantruntime="false"
+			classpathref="WES2BRIDGE.classpath">
+			
+			<include name="**/*.java" />
+			
+		</javac>
+	</target>	
+	
+    <target name="create_run_jar" depends="compile">
+    	<antcall target="extract_eclipse_jar_in_jar" />
+    	
         <jar destfile="${destination.directory}/ConfigurationUtility.jar">
             <manifest>
                 <attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader"/>
                 <attribute name="Rsrc-Main-Class" value="com.raytheon.wes2bridge.configuration.ConfigurationUtility"/>
                 <attribute name="Class-Path" value="."/>
-                <attribute name="Rsrc-Class-Path" value="./ commons-collections-3.2.jar geronimo-jms_1.1_spec-1.1.1.jar org.eclipse.ui_3.8.2.v20121018-234953.jar org.eclipse.swt_3.8.1.v3836b.jar org.eclipse.swt.gtk.linux.x86_3.8.1.v3836b.jar org.eclipse.jface_3.8.0.v20120912-135020.jar org.eclipse.core.commands_3.6.1.v20120912-135020.jar org.eclipse.ui.workbench_3.8.2.v20121128-133708.jar org.eclipse.core.runtime_3.8.0.v20120521-2346.jar org.eclipse.osgi_3.8.2.v20130124-134944.jar org.eclipse.equinox.common_3.6.100.v20120522-1841.jar org.eclipse.core.jobs_3.5.200.v20120521-2346.jar runtime_registry_compatibility.jar org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar org.eclipse.equinox.preferences_3.5.1.v20121031-182809.jar org.eclipse.core.contenttype_3.4.200.v20120523-2004.jar org.eclipse.equinox.app_1.3.100.v20120522-1841.jar log4j-1.2.16.jar log4j.extras-1.0.jar commons-beanutils-1.8.3.jar commons-digester-1.8.1.jar commons-lang-2.3.jar commons-configuration-1.6.jar"/>
+                <attribute name="Rsrc-Class-Path" value="./ com.raytheon.wes2bridge.common.jar"/>
             </manifest>
-            <zipfileset src="${basedir}/../build.wes2bridge.utility/lib/jar-in-jar-loader.zip"/>
-            <zipfileset dir="${baseline.directory}/org.apache.commons.collections" includes="commons-collections-3.2.jar"/>
-            <zipfileset dir="${baseline.directory}/javax.jms" includes="geronimo-jms_1.1_spec-1.1.1.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.ui_3.8.2.v20121018-234953.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.swt_3.8.1.v3836b.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.swt.gtk.linux.x86_3.8.1.v3836b.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.jface_3.8.0.v20120912-135020.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.core.commands_3.6.1.v20120912-135020.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.ui.workbench_3.8.2.v20121128-133708.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.core.runtime_3.8.0.v20120521-2346.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.osgi_3.8.2.v20130124-134944.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.equinox.common_3.6.100.v20120522-1841.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.core.jobs_3.5.200.v20120521-2346.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins/org.eclipse.core.runtime.compatibility.registry_3.5.100.v20120521-2346" includes="runtime_registry_compatibility.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.equinox.preferences_3.5.1.v20121031-182809.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.core.contenttype_3.4.200.v20120523-2004.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.equinox.app_1.3.100.v20120522-1841.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.log4j" includes="log4j-1.2.16.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.log4j" includes="log4j.extras-1.0.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.commons.beanutils" includes="commons-beanutils-1.8.3.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.commons.digester" includes="commons-digester-1.8.1.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.commons.lang" includes="commons-lang-2.3.jar"/>
-            <fileset dir="${baseline.directory}/com.raytheon.wes2bridge.common/${bin.dir}"/>
-            <fileset dir="${baseline.directory}/com.raytheon.wes2bridge.configuration/${bin.dir}"/>
+        	<zipfileset src="${baseline.dir}/${project.name}/lib/jar-in-jar-loader.zip"/>
+        	<zipfileset dir="${destination.directory}" includes="com.raytheon.wes2bridge.common.jar"/>
+            <fileset dir="${baseline.dir}/${project.name}/bin"/>
         </jar>
     </target>
-</project>
+</project>
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.wes2bridge.datalink/META-INF/MANIFEST.MF b/javaUtilities/com.raytheon.wes2bridge.datalink/META-INF/MANIFEST.MF
index a0d2121819..30d9359e07 100644
--- a/javaUtilities/com.raytheon.wes2bridge.datalink/META-INF/MANIFEST.MF
+++ b/javaUtilities/com.raytheon.wes2bridge.datalink/META-INF/MANIFEST.MF
@@ -4,4 +4,4 @@ Bundle-Name: Wes2Bridge Datalink Utility
 Bundle-SymbolicName: com.raytheon.wes2bridge.datalink
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/javaUtilities/com.raytheon.wes2bridge.datalink/build.xml b/javaUtilities/com.raytheon.wes2bridge.datalink/build.xml
index 7d643a4a54..77247af8ce 100644
--- a/javaUtilities/com.raytheon.wes2bridge.datalink/build.xml
+++ b/javaUtilities/com.raytheon.wes2bridge.datalink/build.xml
@@ -5,7 +5,23 @@
 
 	<import file="${basedir}/../build.wes2bridge.utility/ant/setup.xml" />
 	
-    <target name="create_run_jar">
+	<property name="project.name" value="com.raytheon.wes2bridge.datalink" />
+	
+	<target name="compile">
+		<mkdir dir="${baseline.dir}/${project.name}/bin" />
+		<javac destdir="${baseline.dir}/${project.name}/bin" 
+			srcdir="${baseline.dir}/${project.name}/src" 
+			executable="/awips2/java/bin/javac" fork="true" 
+			includeantruntime="false">
+			
+			<include name="**/*.java" />
+			
+		</javac>
+	</target>
+	
+    <target name="create_run_jar" depends="compile">
+    	<antcall target="extract_eclipse_jar_in_jar" />
+    	
         <jar destfile="${destination.directory}/DataLinkUtility.jar">
             <manifest>
                 <attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader"/>
@@ -13,8 +29,8 @@
                 <attribute name="Class-Path" value="."/>
                 <attribute name="Rsrc-Class-Path" value="./"/>
             </manifest>
-            <zipfileset src="${basedir}/../build.wes2bridge.utility/lib/jar-in-jar-loader.zip"/>
-            <fileset dir="${baseline.directory}/com.raytheon.wes2bridge.datalink/${bin.dir}"/>
+        	<zipfileset src="${baseline.dir}/${project.name}/lib/jar-in-jar-loader.zip"/>
+            <fileset dir="${baseline.dir}/${project.name}/bin"/>
         </jar>
     </target>
 </project>
\ No newline at end of file
diff --git a/javaUtilities/com.raytheon.wes2bridge.manager/META-INF/MANIFEST.MF b/javaUtilities/com.raytheon.wes2bridge.manager/META-INF/MANIFEST.MF
index 41c95f3a62..7006e13b1c 100644
--- a/javaUtilities/com.raytheon.wes2bridge.manager/META-INF/MANIFEST.MF
+++ b/javaUtilities/com.raytheon.wes2bridge.manager/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: RAYTHEON
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: com.raytheon.wes2bridge.common;bundle-version="1.0.0",
- org.apache.commons.lang;bundle-version="2.3.0",
- org.codehaus.jackson;bundle-version="1.7.3"
+ org.codehaus.jackson,
+ org.apache.commons.lang3
diff --git a/javaUtilities/com.raytheon.wes2bridge.manager/build.xml b/javaUtilities/com.raytheon.wes2bridge.manager/build.xml
index 0a0d2eca93..a6fb7132fa 100644
--- a/javaUtilities/com.raytheon.wes2bridge.manager/build.xml
+++ b/javaUtilities/com.raytheon.wes2bridge.manager/build.xml
@@ -5,42 +5,58 @@
 	
 	<import file="${basedir}/../build.wes2bridge.utility/ant/setup.xml" />
 	
-    <target name="create_run_jar">
+	<property name="project.name" value="com.raytheon.wes2bridge.manager" />
+	
+	<path id="WES2BRIDGE.classpath">
+		<pathelement path="${destination.directory}/com.raytheon.wes2bridge.common.jar" />
+		<fileset dir="${baseline.dir}/org.codehaus.jackson">
+			<include name="**/*.jar" />
+			<exclude name="**/*sources.jar" />
+		</fileset>
+		<fileset dir="${baseline.dir}/org.apache.commons.lang3">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+	
+	<pathconvert property="manifest.classpath" pathsep=" ">
+	  <path refid="WES2BRIDGE.classpath"/>
+	  <mapper>
+	    <chainedmapper>
+	       <flattenmapper/>
+	    </chainedmapper>
+	  </mapper>
+	</pathconvert>
+	
+	<target name="compile">
+		<mkdir dir="${baseline.dir}/${project.name}/bin" />
+		<javac destdir="${baseline.dir}/${project.name}/bin" 
+			srcdir="${baseline.dir}/${project.name}/src" 
+			executable="/awips2/java/bin/javac" fork="true" 
+			includeantruntime="false"
+			classpathref="WES2BRIDGE.classpath">
+			
+			<include name="**/*.java" />
+			
+		</javac>
+	</target>
+	
+    <target name="create_run_jar" depends="compile">
+    	<antcall target="extract_eclipse_jar_in_jar" />
+    	
         <jar destfile="${destination.directory}/Wes2BridgeManager.jar">
             <manifest>
                 <attribute name="Main-Class" value="org.eclipse.jdt.internal.jarinjarloader.JarRsrcLoader"/>
                 <attribute name="Rsrc-Main-Class" value="com.raytheon.wes2bridge.manager.Wes2BridgeManager"/>
                 <attribute name="Class-Path" value="."/>
-                <attribute name="Rsrc-Class-Path" value="./ commons-collections-3.2.jar geronimo-jms_1.1_spec-1.1.1.jar org.eclipse.ui_3.8.2.v20121018-234953.jar org.eclipse.swt_3.8.1.v3836b.jar org.eclipse.swt.gtk.linux.x86_3.8.1.v3836b.jar org.eclipse.jface_3.8.0.v20120912-135020.jar org.eclipse.core.commands_3.6.1.v20120912-135020.jar org.eclipse.ui.workbench_3.8.2.v20121128-133708.jar org.eclipse.core.runtime_3.8.0.v20120521-2346.jar org.eclipse.osgi_3.8.2.v20130124-134944.jar org.eclipse.equinox.common_3.6.100.v20120522-1841.jar org.eclipse.core.jobs_3.5.200.v20120521-2346.jar runtime_registry_compatibility.jar org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar org.eclipse.equinox.preferences_3.5.1.v20121031-182809.jar org.eclipse.core.contenttype_3.4.200.v20120523-2004.jar org.eclipse.equinox.app_1.3.100.v20120522-1841.jar log4j-1.2.16.jar log4j.extras-1.0.jar commons-beanutils-1.8.3.jar commons-digester-1.8.1.jar commons-lang-2.3.jar commons-configuration-1.6.jar jackson-core-asl-1.7.3.jar jackson-mapper-asl-1.7.3.jar jackson-xc-1.7.3.jar"/>
+                <attribute name="Rsrc-Class-Path" value="./ ${manifest.classpath}"/>
             </manifest>
-            <zipfileset src="${basedir}/../build.wes2bridge.utility/lib/jar-in-jar-loader.zip"/>
-            <zipfileset dir="${baseline.directory}/org.apache.commons.collections" includes="commons-collections-3.2.jar"/>
-            <zipfileset dir="${baseline.directory}/javax.jms" includes="geronimo-jms_1.1_spec-1.1.1.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.ui_3.8.2.v20121018-234953.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.swt_3.8.1.v3836b.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.swt.gtk.linux.x86_3.8.1.v3836b.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.jface_3.8.0.v20120912-135020.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.core.commands_3.6.1.v20120912-135020.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.ui.workbench_3.8.2.v20121128-133708.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.core.runtime_3.8.0.v20120521-2346.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.osgi_3.8.2.v20130124-134944.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.equinox.common_3.6.100.v20120522-1841.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.core.jobs_3.5.200.v20120521-2346.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins/org.eclipse.core.runtime.compatibility.registry_3.5.100.v20120521-2346" includes="runtime_registry_compatibility.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.equinox.registry_3.5.200.v20120522-1841.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.equinox.preferences_3.5.1.v20121031-182809.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.core.contenttype_3.4.200.v20120523-2004.jar"/>
-            <zipfileset dir="${eclipse.directory}/plugins" includes="org.eclipse.equinox.app_1.3.100.v20120522-1841.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.log4j" includes="log4j-1.2.16.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.log4j" includes="log4j.extras-1.0.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.commons.beanutils" includes="commons-beanutils-1.8.3.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.commons.digester" includes="commons-digester-1.8.1.jar"/>
-            <zipfileset dir="${baseline.directory}/org.apache.commons.lang" includes="commons-lang-2.3.jar"/>
-            <zipfileset dir="${baseline.directory}/org.codehaus.jackson" includes="jackson-core-asl-1.7.3.jar"/>
-            <zipfileset dir="${baseline.directory}/org.codehaus.jackson" includes="jackson-mapper-asl-1.7.3.jar"/>
-            <zipfileset dir="${baseline.directory}/org.codehaus.jackson" includes="jackson-xc-1.7.3.jar"/>
-            <fileset dir="${baseline.directory}/com.raytheon.wes2bridge.common/${bin.dir}"/>
-            <fileset dir="${baseline.directory}/com.raytheon.wes2bridge.manager/${bin.dir}"/>
+        	<zipfileset src="${baseline.dir}/${project.name}/lib/jar-in-jar-loader.zip"/>
+        	<zipfileset dir="${destination.directory}" includes="com.raytheon.wes2bridge.common.jar"/>
+        	<zipfileset dir="${baseline.dir}/org.codehaus.jackson" includes="*.jar" 
+        		excludes="*sources.jar" />
+        	<zipfileset dir="${baseline.dir}/org.apache.commons.lang3" includes="*.jar" 
+        		excludes="*sources.jar" />
+            <fileset dir="${baseline.dir}/${project.name}/bin"/>
         </jar>
     </target>
 </project>
diff --git a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
index a4088fc87f..bdddf07fd8 100644
--- a/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
+++ b/javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
@@ -37,7 +37,7 @@ import java.util.regex.Matcher;
 
 import javax.xml.bind.JAXBException;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
 
@@ -69,6 +69,8 @@ import com.raytheon.wes2bridge.configuration.jaxb.Wes2BridgeJaxbManager;
  *                                     updated EDEX re-configuration.
  * Apr 15, 2015 4392       dlovely     Updates the new qpid json configuration now
  * Apr 20, 2015 4392       dlovely     Removed un-used JMX port configuration
+ * Nov 12, 2015 5121       bkowal      Write Java, Python, and PSQL locations to
+ *                                     setup.env to override the default locations.
  * 
  * </pre>
  * 
@@ -97,19 +99,19 @@ public class Wes2BridgeManager {
 
     private String wes2BridgeScripts = null;
 
-    private static final TypeReference<Map<String, Object>> MAP_TYPE_REFERENCE = new TypeReference<Map<String, Object>>()
-    {
+    private static final TypeReference<Map<String, Object>> MAP_TYPE_REFERENCE = new TypeReference<Map<String, Object>>() {
     };
 
     public static final String QPID_NAME = "name";
+
     public static final String QPID_AMQP = "AMQP";
+
     public static final String QPID_HTTP = "HTTP";
+
     public static final String QPID_PORT = "port";
+
     public static final String QPID_PORTS = "ports";
 
-    /**
-	 * 
-	 */
     public Wes2BridgeManager() {
     }
 
@@ -227,6 +229,15 @@ public class Wes2BridgeManager {
 
                 bw.write(line + "\n");
             }
+
+            /*
+             * Need to overwrite the Java, Python, and PSQL locations using
+             * setup.env ever since edex_camel was updated to use a login shell
+             * to run the EDEX start.sh script.
+             */
+            bw.write("export JAVA_INSTALL=/awips2/java\n");
+            bw.write("export PYTHON_INSTALL=/awips2/python\n");
+            bw.write("export PSQL_INSTALL=/awips2/psql\n");
         } finally {
             br.close();
             bw.close();
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.feature/.project b/javaUtilities/com.raytheon.wes2bridge.utility.feature/.project
deleted file mode 100644
index 1e5f0d5e42..0000000000
--- a/javaUtilities/com.raytheon.wes2bridge.utility.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.raytheon.wes2bridge.utility.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.feature/build.properties b/javaUtilities/com.raytheon.wes2bridge.utility.feature/build.properties
deleted file mode 100644
index 64f93a9f0b..0000000000
--- a/javaUtilities/com.raytheon.wes2bridge.utility.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.feature/com.raytheon.wes2bridge.utility.feature.ecl b/javaUtilities/com.raytheon.wes2bridge.utility.feature/com.raytheon.wes2bridge.utility.feature.ecl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.feature/feature.xml b/javaUtilities/com.raytheon.wes2bridge.utility.feature/feature.xml
deleted file mode 100644
index ab7267d88f..0000000000
--- a/javaUtilities/com.raytheon.wes2bridge.utility.feature/feature.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.raytheon.wes2bridge.utility.feature"
-      label="Wes2Bridge Utility Feature"
-      version="1.0.0.qualifier"
-      provider-name="RAYTHEON">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <plugin
-         id="com.raytheon.wes2bridge.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.raytheon.wes2bridge.configuration"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.raytheon.wes2bridge.datalink"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.raytheon.wes2bridge.manager"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.product/.settings/org.eclipse.jdt.core.prefs b/javaUtilities/com.raytheon.wes2bridge.utility.product/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f11c662822..0000000000
--- a/javaUtilities/com.raytheon.wes2bridge.utility.product/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Thu Apr 05 13:05:10 CDT 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.product/META-INF/MANIFEST.MF b/javaUtilities/com.raytheon.wes2bridge.utility.product/META-INF/MANIFEST.MF
deleted file mode 100644
index cc870bf34e..0000000000
--- a/javaUtilities/com.raytheon.wes2bridge.utility.product/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Wes2Bridge Utility Product
-Bundle-SymbolicName: com.raytheon.wes2bridge.utility.product
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: RAYTHEON
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.product/com.raytheon.wes2bridge.utility.product.ecl b/javaUtilities/com.raytheon.wes2bridge.utility.product/com.raytheon.wes2bridge.utility.product.ecl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/javaUtilities/com.raytheon.wes2bridge.utility.product/wes2bridge.utility.product b/javaUtilities/com.raytheon.wes2bridge.utility.product/wes2bridge.utility.product
deleted file mode 100644
index 3c6306702a..0000000000
--- a/javaUtilities/com.raytheon.wes2bridge.utility.product/wes2bridge.utility.product
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<product name="AWIPS II Wes2Bridge Utilities" useFeatures="true" includeLaunchers="true">
-
-   <configIni use="default">
-   </configIni>
-
-   <launcherArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <plugins>
-   </plugins>
-
-   <features>
-      <feature id="com.raytheon.wes2bridge.utility.feature" version="1.0.0.qualifier"/>
-   </features>
-
-
-</product>
diff --git a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1.0.0 b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1.0.0
index 570902ae5d..6a490b270b 100755
Binary files a/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1.0.0 and b/nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/libjasper.so.1.0.0 differ
diff --git a/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0 b/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0
index 570902ae5d..6a490b270b 100755
Binary files a/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0 and b/nativeLib/files.native/edex/lib/native/linux32/libjasper.so.1.0.0 differ
diff --git a/nativeLib/rary.cots.jasper/jasper-1.900.1-security_fixes-1.patch b/nativeLib/rary.cots.jasper/jasper-1.900.1-security_fixes-2.patch
similarity index 67%
rename from nativeLib/rary.cots.jasper/jasper-1.900.1-security_fixes-1.patch
rename to nativeLib/rary.cots.jasper/jasper-1.900.1-security_fixes-2.patch
index 469560c73c..298ff84df0 100644
--- a/nativeLib/rary.cots.jasper/jasper-1.900.1-security_fixes-1.patch
+++ b/nativeLib/rary.cots.jasper/jasper-1.900.1-security_fixes-2.patch
@@ -1,16 +1,17 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2008-12-29
-Initial Package Version: 1.900.1, but has some offsets
-Upstream Status: unknown
-Origin: Debian.  I suspect this originated at gentoo, but the links to their bzip2ed
-patch were dead.
-Description: Vulnerability fixes for CVE-2008-352{0..2}
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2015-01-28
+Initial Package Version: 1.900.1
+Upstream Status:         Unknown
+Origin:                  Archlinux
+Description:             Fixes multiple security issues, including:
+                         CVE-2008-3520, CVE-2008-3522, CVE-2011-4516, CVE-2011-4517,
+                         CVE-2014-8137, CVE-2014-8138, CVE-2014-8157, CVE-2014-8158 and
+                         CVE-2014-9029. Filename buffer overflow and Stepsizes overflow.
+#This was updated to fix jpc_qmfb.c as it was updated as put of the 64 compatibility upgrade
 
-diff --git a/src/libjasper/base/jas_cm.c b/src/libjasper/base/jas_cm.c
-index 77514dd..e63a6d2 100644
---- a/src/libjasper/base/jas_cm.c
-+++ b/src/libjasper/base/jas_cm.c
-@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cmpxformseq_t *pxformseq, int n)
+--- a/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/base/jas_cm.c	2015-01-28 17:57:34.114045370 +0100
+@@ -704,8 +704,7 @@
  {
  	jas_cmpxform_t **p;
  	assert(n >= pxformseq->numpxforms);
@@ -20,7 +21,7 @@ index 77514dd..e63a6d2 100644
  	if (!p) {
  		return -1;
  	}
-@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmshapmatlut_t *lut, jas_icccurv_t *curv)
+@@ -889,13 +888,13 @@
  	jas_cmshapmatlut_cleanup(lut);
  	if (curv->numents == 0) {
  		lut->size = 2;
@@ -36,7 +37,7 @@ index 77514dd..e63a6d2 100644
  			goto error;
  		gamma = curv->ents[0] / 256.0;
  		for (i = 0; i < lut->size; ++i) {
-@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmshapmatlut_t *lut, jas_icccurv_t *curv)
+@@ -903,7 +902,7 @@
  		}
  	} else {
  		lut->size = curv->numents;
@@ -45,7 +46,7 @@ index 77514dd..e63a6d2 100644
  			goto error;
  		for (i = 0; i < lut->size; ++i) {
  			lut->data[i] = curv->ents[i] / 65535.0;
-@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_cmshapmatlut_t *invlut,
+@@ -953,7 +952,7 @@
  			return -1;
  		}
  	}
@@ -54,11 +55,9 @@ index 77514dd..e63a6d2 100644
  		return -1;
  	invlut->size = n;
  	for (i = 0; i < invlut->size; ++i) {
-diff --git a/src/libjasper/base/jas_icc.c b/src/libjasper/base/jas_icc.c
-index e5a0a2e..6fb2721 100644
---- a/src/libjasper/base/jas_icc.c
-+++ b/src/libjasper/base/jas_icc.c
-@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof, jas_stream_t *out)
+--- a/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/base/jas_icc.c	2015-01-28 17:58:32.874025377 +0100
+@@ -373,7 +373,7 @@
  	jas_icctagtab_t *tagtab;
  
  	tagtab = &prof->tagtab;
@@ -67,7 +66,7 @@ index e5a0a2e..6fb2721 100644
  	  sizeof(jas_icctagtabent_t))))
  		goto error;
  	tagtab->numents = prof->attrtab->numattrs;
-@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_stream_t *in, jas_icctagtab_t *tagtab)
+@@ -522,7 +522,7 @@
  	}
  	if (jas_iccgetuint32(in, &tagtab->numents))
  		goto error;
@@ -76,7 +75,7 @@ index e5a0a2e..6fb2721 100644
  	  sizeof(jas_icctagtabent_t))))
  		goto error;
  	tagtabent = tagtab->ents;
-@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_iccattrtab_t *tab, int maxents)
+@@ -743,8 +743,7 @@
  {
  	jas_iccattr_t *newattrs;
  	assert(maxents >= tab->numattrs);
@@ -86,7 +85,7 @@ index e5a0a2e..6fb2721 100644
  	if (!newattrs)
  		return -1;
  	tab->attrs = newattrs;
-@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattrval_t *attrval, jas_stream_t *in,
+@@ -999,7 +998,7 @@
  
  	if (jas_iccgetuint32(in, &curv->numents))
  		goto error;
@@ -95,7 +94,15 @@ index e5a0a2e..6fb2721 100644
  		goto error;
  	for (i = 0; i < curv->numents; ++i) {
  		if (jas_iccgetuint16(in, &curv->ents[i]))
-@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_iccattrval_t *attrval, jas_stream_t *in,
+@@ -1011,7 +1010,6 @@
+ 	return 0;
+ 
+ error:
+-	jas_icccurv_destroy(attrval);
+ 	return -1;
+ }
+ 
+@@ -1100,7 +1098,7 @@
  	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
  	  jas_iccgetuint32(in, &txtdesc->uclen))
  		goto error;
@@ -104,7 +111,24 @@ index e5a0a2e..6fb2721 100644
  		goto error;
  	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
  	  JAS_CAST(int, txtdesc->uclen * 2))
-@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattrval_t *attrval, jas_stream_t *in,
+@@ -1129,7 +1127,6 @@
+ #endif
+ 	return 0;
+ error:
+-	jas_icctxtdesc_destroy(attrval);
+ 	return -1;
+ }
+ 
+@@ -1208,8 +1205,6 @@
+ 		goto error;
+ 	return 0;
+ error:
+-	if (txt->string)
+-		jas_free(txt->string);
+ 	return -1;
+ }
+ 
+@@ -1292,17 +1287,17 @@
  	  jas_iccgetuint16(in, &lut8->numouttabents))
  		goto error;
  	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
@@ -129,7 +153,15 @@ index e5a0a2e..6fb2721 100644
  	  sizeof(jas_iccuint8_t *))))
  		goto error;
  	for (i = 0; i < lut8->numoutchans; ++i)
-@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccattrval_t *attrval, jas_stream_t *in,
+@@ -1330,7 +1325,6 @@
+ 		goto error;
+ 	return 0;
+ error:
+-	jas_icclut8_destroy(attrval);
+ 	return -1;
+ }
+ 
+@@ -1461,17 +1455,17 @@
  	  jas_iccgetuint16(in, &lut16->numouttabents))
  		goto error;
  	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
@@ -154,11 +186,17 @@ index e5a0a2e..6fb2721 100644
  	  sizeof(jas_iccuint16_t *))))
  		goto error;
  	for (i = 0; i < lut16->numoutchans; ++i)
-diff --git a/src/libjasper/base/jas_image.c b/src/libjasper/base/jas_image.c
-index 876debb..c09974b 100644
---- a/src/libjasper/base/jas_image.c
-+++ b/src/libjasper/base/jas_image.c
-@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmpts, jas_image_cmptparm_t *cmptparms,
+@@ -1499,7 +1493,6 @@
+ 		goto error;
+ 	return 0;
+ error:
+-	jas_icclut16_destroy(attrval);
+ 	return -1;
+ }
+ 
+--- a/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/base/jas_image.c	2015-01-28 17:57:34.116045403 +0100
+@@ -142,7 +142,7 @@
  	image->inmem_ = true;
  
  	/* Allocate memory for the per-component information. */
@@ -167,7 +205,7 @@ index 876debb..c09974b 100644
  	  sizeof(jas_image_cmpt_t *)))) {
  		jas_image_destroy(image);
  		return 0;
-@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image_t *image, int maxcmpts)
+@@ -774,8 +774,7 @@
  	jas_image_cmpt_t **newcmpts;
  	int cmptno;
  
@@ -177,10 +215,8 @@ index 876debb..c09974b 100644
  	if (!newcmpts) {
  		return -1;
  	}
-diff --git a/src/libjasper/base/jas_malloc.c b/src/libjasper/base/jas_malloc.c
-index 13f7bc8..90658e8 100644
---- a/src/libjasper/base/jas_malloc.c
-+++ b/src/libjasper/base/jas_malloc.c
+--- a/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/base/jas_malloc.c	2015-01-28 17:57:34.116045403 +0100
 @@ -76,6 +76,9 @@
  
  /* We need the prototype for memset. */
@@ -191,7 +227,7 @@ index 13f7bc8..90658e8 100644
  
  #include "jasper/jas_malloc.h"
  
-@@ -113,18 +116,50 @@ void jas_free(void *ptr)
+@@ -113,18 +116,50 @@
  
  void *jas_realloc(void *ptr, size_t size)
  {
@@ -249,11 +285,9 @@ index 13f7bc8..90658e8 100644
  	return ptr;
  }
  
-diff --git a/src/libjasper/base/jas_seq.c b/src/libjasper/base/jas_seq.c
-index 16e1778..672b60f 100644
---- a/src/libjasper/base/jas_seq.c
-+++ b/src/libjasper/base/jas_seq.c
-@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numrows, int numcols)
+--- a/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/base/jas_seq.c	2015-01-28 17:57:34.116045403 +0100
+@@ -114,7 +114,7 @@
  	matrix->datasize_ = numrows * numcols;
  
  	if (matrix->maxrows_ > 0) {
@@ -262,7 +296,7 @@ index 16e1778..672b60f 100644
  		  sizeof(jas_seqent_t *)))) {
  			jas_matrix_destroy(matrix);
  			return 0;
-@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numrows, int numcols)
+@@ -122,7 +122,7 @@
  	}
  
  	if (matrix->datasize_ > 0) {
@@ -271,7 +305,7 @@ index 16e1778..672b60f 100644
  		  sizeof(jas_seqent_t)))) {
  			jas_matrix_destroy(matrix);
  			return 0;
-@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *mat0, jas_matrix_t *mat1, int r0, int c0,
+@@ -220,7 +220,7 @@
  	mat0->numrows_ = r1 - r0 + 1;
  	mat0->numcols_ = c1 - c0 + 1;
  	mat0->maxrows_ = mat0->numrows_;
@@ -280,11 +314,9 @@ index 16e1778..672b60f 100644
  	for (i = 0; i < mat0->numrows_; ++i) {
  		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
  	}
-diff --git a/src/libjasper/base/jas_stream.c b/src/libjasper/base/jas_stream.c
-index 9a88556..61fcc64 100644
---- a/src/libjasper/base/jas_stream.c
-+++ b/src/libjasper/base/jas_stream.c
-@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *buf, int bufsize)
+--- a/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/base/jas_stream.c	2015-01-28 17:57:57.483434550 +0100
+@@ -212,7 +212,7 @@
  	if (buf) {
  		obj->buf_ = (unsigned char *) buf;
  	} else {
@@ -293,40 +325,7 @@ index 9a88556..61fcc64 100644
  		obj->myalloc_ = 1;
  	}
  	if (!obj->buf_) {
-@@ -361,28 +361,22 @@ jas_stream_t *jas_stream_tmpfile()
- 	}
- 	obj->fd = -1;
- 	obj->flags = 0;
--	obj->pathname[0] = '\0';
- 	stream->obj_ = obj;
- 
- 	/* Choose a file name. */
--	tmpnam(obj->pathname);
-+	snprintf(obj->pathname, L_tmpnam, "%stmp.XXXXXXXXXX", P_tmpdir);
- 
- 	/* Open the underlying file. */
--	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
--	  JAS_STREAM_PERMS)) < 0) {
-+	if ((obj->fd = mkstemp(obj->pathname)) < 0) {
- 		jas_stream_destroy(stream);
- 		return 0;
- 	}
- 
- 	/* Unlink the file so that it will disappear if the program
- 	terminates abnormally. */
--	/* Under UNIX, one can unlink an open file and continue to do I/O
--	on it.  Not all operating systems support this functionality, however.
--	For example, under Microsoft Windows the unlink operation will fail,
--	since the file is open. */
- 	if (unlink(obj->pathname)) {
--		/* We will try unlinking the file again after it is closed. */
--		obj->flags |= JAS_STREAM_FILEOBJ_DELONCLOSE;
-+		jas_stream_destroy(stream);
-+		return 0;
- 	}
- 
- 	/* Use full buffering. */
-@@ -553,7 +547,7 @@ int jas_stream_printf(jas_stream_t *stream, const char *fmt, ...)
+@@ -553,7 +553,7 @@
  	int ret;
  
  	va_start(ap, fmt);
@@ -335,7 +334,7 @@ index 9a88556..61fcc64 100644
  	jas_stream_puts(stream, buf);
  	va_end(ap);
  	return ret;
-@@ -992,7 +986,7 @@ static int mem_resize(jas_stream_memobj_t *m, int bufsize)
+@@ -992,7 +992,7 @@
  	unsigned char *buf;
  
  	assert(m->buf_);
@@ -344,11 +343,9 @@ index 9a88556..61fcc64 100644
  		return -1;
  	}
  	m->buf_ = buf;
-diff --git a/src/libjasper/bmp/bmp_dec.c b/src/libjasper/bmp/bmp_dec.c
-index 4cb0df3..7a6dcb1 100644
---- a/src/libjasper/bmp/bmp_dec.c
-+++ b/src/libjasper/bmp/bmp_dec.c
-@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_stream_t *in)
+--- a/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/bmp/bmp_dec.c	2015-01-28 17:57:34.117045420 +0100
+@@ -283,7 +283,7 @@
  	}
  
  	if (info->numcolors > 0) {
@@ -357,11 +354,9 @@ index 4cb0df3..7a6dcb1 100644
  		  sizeof(bmp_palent_t)))) {
  			bmp_info_destroy(info);
  			return 0;
-diff --git a/src/libjasper/include/jasper/jas_malloc.h b/src/libjasper/include/jasper/jas_malloc.h
-index f2a8f8b..258e4c7 100644
---- a/src/libjasper/include/jasper/jas_malloc.h
-+++ b/src/libjasper/include/jasper/jas_malloc.h
-@@ -95,6 +95,9 @@ extern "C" {
+--- a/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
++++ b/src/libjasper/include/jasper/jas_malloc.h	2015-01-28 17:57:34.118045437 +0100
+@@ -95,6 +95,9 @@
  #define	jas_free	MEMFREE
  #define	jas_realloc	MEMREALLOC
  #define	jas_calloc	MEMCALLOC
@@ -371,7 +366,7 @@ index f2a8f8b..258e4c7 100644
  #endif
  
  /******************************************************************************\
-@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size);
+@@ -115,6 +118,12 @@
  /* Allocate a block of memory and initialize the contents to zero. */
  void *jas_calloc(size_t nmemb, size_t size);
  
@@ -384,11 +379,18 @@ index f2a8f8b..258e4c7 100644
  #endif
  
  #ifdef __cplusplus
-diff --git a/src/libjasper/jp2/jp2_cod.c b/src/libjasper/jp2/jp2_cod.c
-index d0bf058..8edf453 100644
---- a/src/libjasper/jp2/jp2_cod.c
-+++ b/src/libjasper/jp2/jp2_cod.c
-@@ -380,7 +380,7 @@ static int jp2_bpcc_getdata(jp2_box_t *box, jas_stream_t *in)
+--- a/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/jp2/jp2_cod.c	2015-01-28 17:57:34.118045437 +0100
+@@ -247,7 +247,7 @@
+ 	box = 0;
+ 	tmpstream = 0;
+ 
+-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
++	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
+ 		goto error;
+ 	}
+ 	box->ops = &jp2_boxinfo_unk.ops;
+@@ -372,7 +372,7 @@
  	jp2_bpcc_t *bpcc = &box->data.bpcc;
  	unsigned int i;
  	bpcc->numcmpts = box->datalen;
@@ -397,7 +399,7 @@ index d0bf058..8edf453 100644
  		return -1;
  	}
  	for (i = 0; i < bpcc->numcmpts; ++i) {
-@@ -424,7 +424,7 @@ static int jp2_colr_getdata(jp2_box_t *box, jas_stream_t *in)
+@@ -416,7 +416,7 @@
  		break;
  	case JP2_COLR_ICC:
  		colr->iccplen = box->datalen - 3;
@@ -406,7 +408,7 @@ index d0bf058..8edf453 100644
  			return -1;
  		}
  		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
-@@ -461,7 +461,7 @@ static int jp2_cdef_getdata(jp2_box_t *box, jas_stream_t *in)
+@@ -453,7 +453,7 @@
  	if (jp2_getuint16(in, &cdef->numchans)) {
  		return -1;
  	}
@@ -415,7 +417,7 @@ index d0bf058..8edf453 100644
  		return -1;
  	}
  	for (channo = 0; channo < cdef->numchans; ++channo) {
-@@ -774,7 +774,7 @@ static int jp2_cmap_getdata(jp2_box_t *box, jas_stream_t *in)
+@@ -766,7 +766,7 @@
  	unsigned int i;
  
  	cmap->numchans = (box->datalen) / 4;
@@ -424,7 +426,7 @@ index d0bf058..8edf453 100644
  		return -1;
  	}
  	for (i = 0; i < cmap->numchans; ++i) {
-@@ -836,10 +836,10 @@ static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in)
+@@ -828,10 +828,10 @@
  		return -1;
  	}
  	lutsize = pclr->numlutents * pclr->numchans;
@@ -437,11 +439,21 @@ index d0bf058..8edf453 100644
  		return -1;
  	}
  	for (i = 0; i < pclr->numchans; ++i) {
-diff --git a/src/libjasper/jp2/jp2_dec.c b/src/libjasper/jp2/jp2_dec.c
-index 65772de..5f7be7e 100644
---- a/src/libjasper/jp2/jp2_dec.c
-+++ b/src/libjasper/jp2/jp2_dec.c
-@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in, char *optstr)
+--- a/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/jp2/jp2_dec.c	2015-01-28 18:01:07.082617636 +0100
+@@ -291,7 +291,10 @@
+ 	case JP2_COLR_ICC:
+ 		iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
+ 		  dec->colr->data.colr.iccplen);
+-		assert(iccprof);
++		if (!iccprof) {
++			jas_eprintf("error: failed to parse ICC profile\n");
++			goto error;
++		}
+ 		jas_iccprof_gethdr(iccprof, &icchdr);
+ 		jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
+ 		jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));
+@@ -336,7 +339,7 @@
  	}
  
  	/* Allocate space for the channel-number to component-number LUT. */
@@ -450,7 +462,7 @@ index 65772de..5f7be7e 100644
  		jas_eprintf("error: no memory\n");
  		goto error;
  	}
-@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in, char *optstr)
+@@ -354,7 +357,7 @@
  			if (cmapent->map == JP2_CMAP_DIRECT) {
  				dec->chantocmptlut[channo] = channo;
  			} else if (cmapent->map == JP2_CMAP_PALETTE) {
@@ -459,11 +471,21 @@ index 65772de..5f7be7e 100644
  				for (i = 0; i < pclrd->numlutents; ++i) {
  					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
  				}
-diff --git a/src/libjasper/jp2/jp2_enc.c b/src/libjasper/jp2/jp2_enc.c
-index d41392f..b837612 100644
---- a/src/libjasper/jp2/jp2_enc.c
-+++ b/src/libjasper/jp2/jp2_enc.c
-@@ -194,7 +194,7 @@ int sgnd;
+@@ -386,6 +389,11 @@
+ 	/* Determine the type of each component. */
+ 	if (dec->cdef) {
+ 		for (i = 0; i < dec->numchans; ++i) {
++			/* Is the channel number reasonable? */
++			if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) {
++				jas_eprintf("error: invalid channel number in CDEF box\n");
++				goto error;
++			}
+ 			jas_image_setcmpttype(dec->image,
+ 			  dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo],
+ 			  jp2_getct(jas_image_clrspc(dec->image),
+--- a/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/jp2/jp2_enc.c	2015-01-28 17:57:34.119045453 +0100
+@@ -191,7 +191,7 @@
  		}
  		bpcc = &box->data.bpcc;
  		bpcc->numcmpts = jas_image_numcmpts(image);
@@ -472,7 +494,7 @@ index d41392f..b837612 100644
  		  sizeof(uint_fast8_t)))) {
  			goto error;
  		}
-@@ -288,7 +288,7 @@ int sgnd;
+@@ -285,7 +285,7 @@
  		}
  		cdef = &box->data.cdef;
  		cdef->numchans = jas_image_numcmpts(image);
@@ -481,11 +503,9 @@ index d41392f..b837612 100644
  		for (i = 0; i < jas_image_numcmpts(image); ++i) {
  			cdefchanent = &cdef->ents[i];
  			cdefchanent->channo = i;
-diff --git a/src/libjasper/jpc/jpc_cs.c b/src/libjasper/jpc/jpc_cs.c
-index f076571..d1fe721 100644
---- a/src/libjasper/jpc/jpc_cs.c
-+++ b/src/libjasper/jpc/jpc_cs.c
-@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate,
+--- a/src/libjasper/jpc/jpc_cs.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_cs.c	2015-01-28 17:57:34.120045470 +0100
+@@ -502,7 +502,7 @@
  	  !siz->tileheight || !siz->numcomps) {
  		return -1;
  	}
@@ -494,7 +514,21 @@ index f076571..d1fe721 100644
  		return -1;
  	}
  	for (i = 0; i < siz->numcomps; ++i) {
-@@ -1091,7 +1091,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in
+@@ -982,8 +982,11 @@
+ 		compparms->numstepsizes = (len - n) / 2;
+ 		break;
+ 	}
+-	if (compparms->numstepsizes > 0) {
+-		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
++	if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) {
++		jpc_qcx_destroycompparms(compparms);
++                return -1;
++        } else if (compparms->numstepsizes > 0) {
++		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
+ 		  sizeof(uint_fast16_t));
+ 		assert(compparms->stepsizes);
+ 		for (i = 0; i < compparms->numstepsizes; ++i) {
+@@ -1091,7 +1094,7 @@
  
  	ppm->len = ms->len - 1;
  	if (ppm->len > 0) {
@@ -503,7 +537,7 @@ index f076571..d1fe721 100644
  			goto error;
  		}
  		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
-@@ -1160,7 +1160,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in
+@@ -1160,7 +1163,7 @@
  	}
  	ppt->len = ms->len - 1;
  	if (ppt->len > 0) {
@@ -512,7 +546,7 @@ index f076571..d1fe721 100644
  			goto error;
  		}
  		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
-@@ -1223,7 +1223,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in
+@@ -1223,7 +1226,7 @@
  	uint_fast8_t tmp;
  	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
  	  (ms->len / 7);
@@ -521,7 +555,7 @@ index f076571..d1fe721 100644
  		goto error;
  	}
  	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
-@@ -1328,7 +1328,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in
+@@ -1328,7 +1331,7 @@
  	jpc_crgcomp_t *comp;
  	uint_fast16_t compno;
  	crg->numcomps = cstate->numcomps;
@@ -530,7 +564,7 @@ index f076571..d1fe721 100644
  		return -1;
  	}
  	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
-@@ -1467,7 +1467,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in
+@@ -1467,7 +1470,7 @@
  	cstate = 0;
  
  	if (ms->len > 0) {
@@ -539,11 +573,9 @@ index f076571..d1fe721 100644
  			return -1;
  		}
  		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
-diff --git a/src/libjasper/jpc/jpc_dec.c b/src/libjasper/jpc/jpc_dec.c
-index fa72a0e..b1ea056 100644
---- a/src/libjasper/jpc/jpc_dec.c
-+++ b/src/libjasper/jpc/jpc_dec.c
-@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t *dec, jpc_ms_t *ms)
+--- a/src/libjasper/jpc/jpc_dec.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_dec.c	2015-01-28 17:59:44.748230228 +0100
+@@ -449,7 +449,7 @@
  
  	if (dec->state == JPC_MH) {
  
@@ -552,7 +584,16 @@ index fa72a0e..b1ea056 100644
  		assert(compinfos);
  		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
  		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
-@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *dec, jpc_dec_tile_t *tile)
+@@ -489,7 +489,7 @@
+ 		dec->curtileendoff = 0;
+ 	}
+ 
+-	if (JAS_CAST(int, sot->tileno) > dec->numtiles) {
++	if (JAS_CAST(int, sot->tileno) >= dec->numtiles) {
+ 		jas_eprintf("invalid tile number in SOT marker segment\n");
+ 		return -1;
+ 	}
+@@ -692,7 +692,7 @@
  			tile->realmode = 1;
  		}
  		tcomp->numrlvls = ccp->numrlvls;
@@ -561,7 +602,7 @@ index fa72a0e..b1ea056 100644
  		  sizeof(jpc_dec_rlvl_t)))) {
  			return -1;
  		}
-@@ -764,7 +764,7 @@ rlvl->bands = 0;
+@@ -764,7 +764,7 @@
  			  rlvl->cbgheightexpn);
  
  			rlvl->numbands = (!rlvlno) ? 1 : 3;
@@ -570,7 +611,7 @@ index fa72a0e..b1ea056 100644
  			  sizeof(jpc_dec_band_t)))) {
  				return -1;
  			}
-@@ -797,7 +797,7 @@ rlvl->bands = 0;
+@@ -797,7 +797,7 @@
  
  				assert(rlvl->numprcs);
  
@@ -579,7 +620,7 @@ index fa72a0e..b1ea056 100644
  					return -1;
  				}
  
-@@ -834,7 +834,7 @@ rlvl->bands = 0;
+@@ -834,7 +834,7 @@
  			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
  				return -1;
  			}
@@ -588,7 +629,22 @@ index fa72a0e..b1ea056 100644
  				return -1;
  			}
  
-@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t *dec, jpc_ms_t *ms)
+@@ -1069,12 +1069,12 @@
+ 	/* Apply an inverse intercomponent transform if necessary. */
+ 	switch (tile->cp->mctid) {
+ 	case JPC_MCT_RCT:
+-		assert(dec->numcomps == 3);
++		assert(dec->numcomps >= 3);
+ 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
+ 		  tile->tcomps[2].data);
+ 		break;
+ 	case JPC_MCT_ICT:
+-		assert(dec->numcomps == 3);
++		assert(dec->numcomps >= 3);
+ 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
+ 		  tile->tcomps[2].data);
+ 		break;
+@@ -1181,7 +1181,7 @@
  		return -1;
  	}
  
@@ -597,25 +653,52 @@ index fa72a0e..b1ea056 100644
  		return -1;
  	}
  
-@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t *dec, jpc_ms_t *ms)
+@@ -1204,7 +1204,7 @@
  	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
  	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
  	dec->numtiles = dec->numhtiles * dec->numvtiles;
 -	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
-+	if (!(dec->tiles = jas_alloc2(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
++	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
  		return -1;
  	}
  
-@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t *dec, jpc_ms_t *ms)
+@@ -1228,7 +1228,7 @@
  		tile->pkthdrstreampos = 0;
  		tile->pptstab = 0;
  		tile->cp = 0;
 -		if (!(tile->tcomps = jas_malloc(dec->numcomps *
-+		if (!(tile->tcomps = jas_alloc2(dec->numcomps,
++		if (!(tile->tcomps = jas_calloc(dec->numcomps,
  		  sizeof(jpc_dec_tcomp_t)))) {
  			return -1;
  		}
-@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(uint_fast16_t numcomps)
+@@ -1280,7 +1280,7 @@
+ 	jpc_coc_t *coc = &ms->parms.coc;
+ 	jpc_dec_tile_t *tile;
+ 
+-	if (JAS_CAST(int, coc->compno) > dec->numcomps) {
++	if (JAS_CAST(int, coc->compno) >= dec->numcomps) {
+ 		jas_eprintf("invalid component number in COC marker segment\n");
+ 		return -1;
+ 	}
+@@ -1306,7 +1306,7 @@
+ 	jpc_rgn_t *rgn = &ms->parms.rgn;
+ 	jpc_dec_tile_t *tile;
+ 
+-	if (JAS_CAST(int, rgn->compno) > dec->numcomps) {
++	if (JAS_CAST(int, rgn->compno) >= dec->numcomps) {
+ 		jas_eprintf("invalid component number in RGN marker segment\n");
+ 		return -1;
+ 	}
+@@ -1355,7 +1355,7 @@
+ 	jpc_qcc_t *qcc = &ms->parms.qcc;
+ 	jpc_dec_tile_t *tile;
+ 
+-	if (JAS_CAST(int, qcc->compno) > dec->numcomps) {
++	if (JAS_CAST(int, qcc->compno) >= dec->numcomps) {
+ 		jas_eprintf("invalid component number in QCC marker segment\n");
+ 		return -1;
+ 	}
+@@ -1489,7 +1489,7 @@
  	cp->numlyrs = 0;
  	cp->mctid = 0;
  	cp->csty = 0;
@@ -624,7 +707,7 @@ index fa72a0e..b1ea056 100644
  		return 0;
  	}
  	if (!(cp->pchglist = jpc_pchglist_create())) {
-@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create()
+@@ -2048,7 +2048,7 @@
  	}
  	streamlist->numstreams = 0;
  	streamlist->maxstreams = 100;
@@ -633,7 +716,7 @@ index fa72a0e..b1ea056 100644
  	  sizeof(jas_stream_t *)))) {
  		jas_free(streamlist);
  		return 0;
-@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist_t *streamlist, int streamno,
+@@ -2068,8 +2068,8 @@
  	/* Grow the array of streams if necessary. */
  	if (streamlist->numstreams >= streamlist->maxstreams) {
  		newmaxstreams = streamlist->maxstreams + 1024;
@@ -644,7 +727,7 @@ index fa72a0e..b1ea056 100644
  			return -1;
  		}
  		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
-@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab, int maxents)
+@@ -2155,8 +2155,7 @@
  {
  	jpc_ppxstabent_t **newents;
  	if (tab->maxents < maxents) {
@@ -654,11 +737,9 @@ index fa72a0e..b1ea056 100644
  		if (!newents) {
  			return -1;
  		}
-diff --git a/src/libjasper/jpc/jpc_enc.c b/src/libjasper/jpc/jpc_enc.c
-index bbe1ef2..6299ead 100644
---- a/src/libjasper/jpc/jpc_enc.c
-+++ b/src/libjasper/jpc/jpc_enc.c
-@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *optstr, jas_image_t *image)
+--- a/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_enc.c	2015-01-28 17:57:34.122045503 +0100
+@@ -403,7 +403,7 @@
  		vsteplcm *= jas_image_cmptvstep(image, cmptno);
  	}
  
@@ -667,7 +748,7 @@ index bbe1ef2..6299ead 100644
  		goto error;
  	}
  	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
-@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *optstr, jas_image_t *image)
+@@ -656,7 +656,7 @@
  
  	if (ilyrrates && numilyrrates > 0) {
  		tcp->numlyrs = numilyrrates + 1;
@@ -676,7 +757,7 @@ index bbe1ef2..6299ead 100644
  		  sizeof(jpc_fix_t)))) {
  			goto error;
  		}
-@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->out);
+@@ -940,7 +940,7 @@
  	siz->tilewidth = cp->tilewidth;
  	siz->tileheight = cp->tileheight;
  	siz->numcomps = cp->numcmpts;
@@ -685,7 +766,7 @@ index bbe1ef2..6299ead 100644
  	assert(siz->comps);
  	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
  		siz->comps[i].prec = cp->ccps[i].prec;
-@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->out);
+@@ -977,7 +977,7 @@
  		return -1;
  	}
  	crg = &enc->mrk->parms.crg;
@@ -694,7 +775,7 @@ index bbe1ef2..6299ead 100644
  	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
  		jas_eprintf("cannot write CRG marker\n");
  		return -1;
-@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_enc_cp_t *cp, jas_image_t *image, int ti
+@@ -1955,7 +1955,7 @@
  	tile->mctid = cp->tcp.mctid;
  
  	tile->numlyrs = cp->tcp.numlyrs;
@@ -703,7 +784,7 @@ index bbe1ef2..6299ead 100644
  	  sizeof(uint_fast32_t)))) {
  		goto error;
  	}
-@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_enc_cp_t *cp, jas_image_t *image, int ti
+@@ -1964,7 +1964,7 @@
  	}
  
  	/* Allocate an array for the per-tile-component information. */
@@ -712,7 +793,7 @@ index bbe1ef2..6299ead 100644
  		goto error;
  	}
  	/* Initialize a few members critical for error recovery. */
-@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc_enc_tcmpt_t *tcmpt, jpc_enc_cp_t *cp,
+@@ -2110,7 +2110,7 @@
  	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
  	  jas_seq2d_yend(tcmpt->data), bandinfos);
  
@@ -721,7 +802,7 @@ index bbe1ef2..6299ead 100644
  		goto error;
  	}
  	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
-@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_enc_rlvl_t *rlvl, jpc_enc_cp_t *cp,
+@@ -2213,7 +2213,7 @@
  	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
  	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
  
@@ -730,7 +811,7 @@ index bbe1ef2..6299ead 100644
  		goto error;
  	}
  	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend && bandinfo->ystart != bandinfo->yend) {
+@@ -2290,7 +2290,7 @@
  	band->synweight = bandinfo->synenergywt;
  
  if (band->data) {
@@ -739,7 +820,7 @@ index bbe1ef2..6299ead 100644
  		goto error;
  	}
  	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
-@@ -2422,7 +2422,7 @@ if (!rlvlno) {
+@@ -2422,7 +2422,7 @@
  			goto error;
  		}
  
@@ -748,11 +829,9 @@ index bbe1ef2..6299ead 100644
  			goto error;
  		}
  		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
-diff --git a/src/libjasper/jpc/jpc_mqdec.c b/src/libjasper/jpc/jpc_mqdec.c
-index 4cc2f46..66a8581 100644
---- a/src/libjasper/jpc/jpc_mqdec.c
-+++ b/src/libjasper/jpc/jpc_mqdec.c
-@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctxs, jas_stream_t *in)
+--- a/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_mqdec.c	2015-01-28 17:57:34.126045570 +0100
+@@ -118,7 +118,7 @@
  	mqdec->in = in;
  	mqdec->maxctxs = maxctxs;
  	/* Allocate memory for the per-context state information. */
@@ -761,11 +840,9 @@ index 4cc2f46..66a8581 100644
  		goto error;
  	}
  	/* Set the current context to the first context. */
-diff --git a/src/libjasper/jpc/jpc_mqenc.c b/src/libjasper/jpc/jpc_mqenc.c
-index 758b361..399581e 100644
---- a/src/libjasper/jpc/jpc_mqenc.c
-+++ b/src/libjasper/jpc/jpc_mqenc.c
-@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctxs, jas_stream_t *out)
+--- a/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_mqenc.c	2015-01-28 17:57:34.126045570 +0100
+@@ -197,7 +197,7 @@
  	mqenc->maxctxs = maxctxs;
  
  	/* Allocate memory for the per-context state information. */
@@ -773,13 +850,11 @@ index 758b361..399581e 100644
 +	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
  		goto error;
  	}
- 
-diff --git a/src/libjasper/jpc/jpc_qmfb.c b/src/libjasper/jpc/jpc_qmfb.c
-index 00d406d..cf3320b 100644
---- a/src/libjasper/jpc/jpc_qmfb.c
-+++ b/src/libjasper/jpc/jpc_qmfb.c
-@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity)
- #if !defined(HAVE_VLA)
+
+# This was modified as the 64 bit conversion already removed the #define/#if 
+--- a/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_qmfb.c	2015-01-28 18:00:17.753785538 +0100
+@@ -324,6 +324,6 @@
  	/* Get a buffer. */
  	if (bufsize > QMFB_SPLITBUFSIZE) {
 -		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@ -787,8 +862,7 @@ index 00d406d..cf3320b 100644
  			/* We have no choice but to commit suicide in this case. */
  			abort();
  		}
-@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, int numrows, int stride,
- #if !defined(HAVE_VLA)
+@@ -384,6 +384,6 @@
  	/* Get a buffer. */
  	if (bufsize > QMFB_SPLITBUFSIZE) {
 -		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@ -796,8 +870,7 @@ index 00d406d..cf3320b 100644
  			/* We have no choice but to commit suicide in this case. */
  			abort();
  		}
-@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, int numrows, int stride,
- #if !defined(HAVE_VLA)
+@@ -447,6 +447,6 @@
  	/* Get a buffer. */
  	if (bufsize > QMFB_SPLITBUFSIZE) {
 -		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@ -805,8 +878,7 @@ index 00d406d..cf3320b 100644
  			/* We have no choice but to commit suicide in this case. */
  			abort();
  		}
-@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, int numrows, int numcols,
- #if !defined(HAVE_VLA)
+@@ -527,6 +527,6 @@
  	/* Get a buffer. */
  	if (bufsize > QMFB_SPLITBUFSIZE) {
 -		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@ -814,8 +886,7 @@ index 00d406d..cf3320b 100644
  			/* We have no choice but to commit suicide in this case. */
  			abort();
  		}
-@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int numcols, int parity)
- #if !defined(HAVE_VLA)
+@@ -603,6 +603,6 @@
  	/* Allocate memory for the join buffer from the heap. */
  	if (bufsize > QMFB_JOINBUFSIZE) {
 -		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@ -823,8 +894,7 @@ index 00d406d..cf3320b 100644
  			/* We have no choice but to commit suicide. */
  			abort();
  		}
-@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int numrows, int stride,
- #if !defined(HAVE_VLA)
+@@ -661,6 +661,6 @@
  	/* Allocate memory for the join buffer from the heap. */
  	if (bufsize > QMFB_JOINBUFSIZE) {
 -		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
@@ -832,8 +902,7 @@ index 00d406d..cf3320b 100644
  			/* We have no choice but to commit suicide. */
  			abort();
  		}
-@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, int numrows, int stride,
- #if !defined(HAVE_VLA)
+@@ -722,6 +722,6 @@
  	/* Allocate memory for the join buffer from the heap. */
  	if (bufsize > QMFB_JOINBUFSIZE) {
 -		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
@@ -841,8 +910,7 @@ index 00d406d..cf3320b 100644
  			/* We have no choice but to commit suicide. */
  			abort();
  		}
-@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, int numrows, int numcols,
- #if !defined(HAVE_VLA)
+@@ -800,6 +800,6 @@
  	/* Allocate memory for the join buffer from the heap. */
  	if (bufsize > QMFB_JOINBUFSIZE) {
 -		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
@@ -850,11 +918,9 @@ index 00d406d..cf3320b 100644
  			/* We have no choice but to commit suicide. */
  			abort();
  		}
-diff --git a/src/libjasper/jpc/jpc_t1enc.c b/src/libjasper/jpc/jpc_t1enc.c
-index 3a5acea..c8bfd21 100644
---- a/src/libjasper/jpc/jpc_t1enc.c
-+++ b/src/libjasper/jpc/jpc_t1enc.c
-@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_stream_t *out, jpc_enc_tcmpt_t *tcmpt, j
+--- a/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_t1enc.c	2015-01-28 17:57:34.128045603 +0100
+@@ -219,7 +219,7 @@
  
  	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
  	if (cblk->numpasses > 0) {
@@ -863,11 +929,9 @@ index 3a5acea..c8bfd21 100644
  		assert(cblk->passes);
  	} else {
  		cblk->passes = 0;
-diff --git a/src/libjasper/jpc/jpc_t2cod.c b/src/libjasper/jpc/jpc_t2cod.c
-index e734900..f3d030a 100644
---- a/src/libjasper/jpc/jpc_t2cod.c
-+++ b/src/libjasper/jpc/jpc_t2cod.c
-@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *pchglist, int pchgno, jpc_pchg_t *pchg)
+--- a/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_t2cod.c	2015-01-28 17:57:34.128045603 +0100
+@@ -573,7 +573,7 @@
  	}
  	if (pchglist->numpchgs >= pchglist->maxpchgs) {
  		newmaxpchgs = pchglist->maxpchgs + 128;
@@ -876,11 +940,9 @@ index e734900..f3d030a 100644
  			return -1;
  		}
  		pchglist->maxpchgs = newmaxpchgs;
-diff --git a/src/libjasper/jpc/jpc_t2dec.c b/src/libjasper/jpc/jpc_t2dec.c
-index 6d2cb72..8300f9b 100644
---- a/src/libjasper/jpc/jpc_t2dec.c
-+++ b/src/libjasper/jpc/jpc_t2dec.c
-@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *dec, jpc_dec_tile_t *tile)
+--- a/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_t2dec.c	2015-01-28 17:57:34.129045620 +0100
+@@ -478,7 +478,7 @@
  		return 0;
  	}
  	pi->numcomps = dec->numcomps;
@@ -889,7 +951,7 @@ index 6d2cb72..8300f9b 100644
  		jpc_pi_destroy(pi);
  		return 0;
  	}
-@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *dec, jpc_dec_tile_t *tile)
+@@ -490,7 +490,7 @@
  	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
  	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
  		picomp->numrlvls = tcomp->numrlvls;
@@ -898,7 +960,7 @@ index 6d2cb72..8300f9b 100644
  		  sizeof(jpc_pirlvl_t)))) {
  			jpc_pi_destroy(pi);
  			return 0;
-@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *dec, jpc_dec_tile_t *tile)
+@@ -503,7 +503,7 @@
  		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
  /* XXX sizeof(long) should be sizeof different type */
  			pirlvl->numprcs = rlvl->numprcs;
@@ -907,11 +969,9 @@ index 6d2cb72..8300f9b 100644
  			  sizeof(long)))) {
  				jpc_pi_destroy(pi);
  				return 0;
-diff --git a/src/libjasper/jpc/jpc_t2enc.c b/src/libjasper/jpc/jpc_t2enc.c
-index 9358a1c..d96066f 100644
---- a/src/libjasper/jpc/jpc_t2enc.c
-+++ b/src/libjasper/jpc/jpc_t2enc.c
-@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t *cp, jpc_enc_tile_t *tile)
+--- a/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_t2enc.c	2015-01-28 17:57:34.129045620 +0100
+@@ -565,7 +565,7 @@
  	}
  	pi->pktno = -1;
  	pi->numcomps = cp->numcmpts;
@@ -920,7 +980,7 @@ index 9358a1c..d96066f 100644
  		jpc_pi_destroy(pi);
  		return 0;
  	}
-@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t *cp, jpc_enc_tile_t *tile)
+@@ -577,7 +577,7 @@
  	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
  	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
  		picomp->numrlvls = tcomp->numrlvls;
@@ -929,7 +989,7 @@ index 9358a1c..d96066f 100644
  		  sizeof(jpc_pirlvl_t)))) {
  			jpc_pi_destroy(pi);
  			return 0;
-@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t *cp, jpc_enc_tile_t *tile)
+@@ -591,7 +591,7 @@
  /* XXX sizeof(long) should be sizeof different type */
  			pirlvl->numprcs = rlvl->numprcs;
  			if (rlvl->numprcs) {
@@ -938,11 +998,9 @@ index 9358a1c..d96066f 100644
  				  sizeof(long)))) {
  					jpc_pi_destroy(pi);
  					return 0;
-diff --git a/src/libjasper/jpc/jpc_tagtree.c b/src/libjasper/jpc/jpc_tagtree.c
-index 06422d3..8dce000 100644
---- a/src/libjasper/jpc/jpc_tagtree.c
-+++ b/src/libjasper/jpc/jpc_tagtree.c
-@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int numleafsh, int numleafsv)
+--- a/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_tagtree.c	2015-01-28 17:57:34.130045636 +0100
+@@ -125,7 +125,7 @@
  		++numlvls;
  	} while (n > 1);
  
@@ -951,11 +1009,9 @@ index 06422d3..8dce000 100644
  		return 0;
  	}
  
-diff --git a/src/libjasper/jpc/jpc_util.c b/src/libjasper/jpc/jpc_util.c
-index f53e248..6da1b66 100644
---- a/src/libjasper/jpc/jpc_util.c
-+++ b/src/libjasper/jpc/jpc_util.c
-@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, double **values)
+--- a/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
++++ b/src/libjasper/jpc/jpc_util.c	2015-01-28 17:57:34.130045636 +0100
+@@ -109,7 +109,7 @@
  	}
  
  	if (n) {
@@ -964,11 +1020,9 @@ index f53e248..6da1b66 100644
  			return -1;
  		}
  
-diff --git a/src/libjasper/mif/mif_cod.c b/src/libjasper/mif/mif_cod.c
-index 17506a1..a1b29dc 100644
---- a/src/libjasper/mif/mif_cod.c
-+++ b/src/libjasper/mif/mif_cod.c
-@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *hdr, int maxcmpts)
+--- a/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
++++ b/src/libjasper/mif/mif_cod.c	2015-01-28 17:57:34.131045653 +0100
+@@ -438,8 +438,7 @@
  	int cmptno;
  	mif_cmpt_t **newcmpts;
  	assert(maxcmpts >= hdr->numcmpts);
diff --git a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/base/jas_icc.c b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/base/jas_icc.c
index f5cc16b184..6f7cca29f5 100644
--- a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/base/jas_icc.c
+++ b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/base/jas_icc.c
@@ -1017,7 +1017,6 @@ static int jas_icccurv_input(jas_iccattrval_t *attrval, jas_stream_t *in,
 	return 0;
 
 error:
-	jas_icccurv_destroy(attrval);
 	return -1;
 }
 
@@ -1135,7 +1134,6 @@ static int jas_icctxtdesc_input(jas_iccattrval_t *attrval, jas_stream_t *in,
 #endif
 	return 0;
 error:
-	jas_icctxtdesc_destroy(attrval);
 	return -1;
 }
 
@@ -1214,8 +1212,6 @@ static int jas_icctxt_input(jas_iccattrval_t *attrval, jas_stream_t *in,
 		goto error;
 	return 0;
 error:
-	if (txt->string)
-		jas_free(txt->string);
 	return -1;
 }
 
@@ -1336,7 +1332,6 @@ static int jas_icclut8_input(jas_iccattrval_t *attrval, jas_stream_t *in,
 		goto error;
 	return 0;
 error:
-	jas_icclut8_destroy(attrval);
 	return -1;
 }
 
@@ -1505,7 +1500,6 @@ static int jas_icclut16_input(jas_iccattrval_t *attrval, jas_stream_t *in,
 		goto error;
 	return 0;
 error:
-	jas_icclut16_destroy(attrval);
 	return -1;
 }
 
diff --git a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/base/jas_stream.c b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/base/jas_stream.c
index 578d046bfd..15aed502be 100644
--- a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/base/jas_stream.c
+++ b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/base/jas_stream.c
@@ -368,22 +368,28 @@ jas_stream_t *jas_stream_tmpfile()
 	}
 	obj->fd = -1;
 	obj->flags = 0;
+	obj->pathname[0] = '\0';
 	stream->obj_ = obj;
 
 	/* Choose a file name. */
-	snprintf(obj->pathname, L_tmpnam, "%stmp.XXXXXXXXXX", P_tmpdir);
+	tmpnam(obj->pathname);
 
 	/* Open the underlying file. */
-	if ((obj->fd = mkstemp(obj->pathname)) < 0) {
+	if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
+	  JAS_STREAM_PERMS)) < 0) {
 		jas_stream_destroy(stream);
 		return 0;
 	}
 
 	/* Unlink the file so that it will disappear if the program
 	terminates abnormally. */
+	/* Under UNIX, one can unlink an open file and continue to do I/O
+	on it.  Not all operating systems support this functionality, however.
+	For example, under Microsoft Windows the unlink operation will fail,
+	since the file is open. */
 	if (unlink(obj->pathname)) {
-		jas_stream_destroy(stream);
-		return 0;
+		/* We will try unlinking the file again after it is closed. */
+		obj->flags |= JAS_STREAM_FILEOBJ_DELONCLOSE;
 	}
 
 	/* Use full buffering. */
diff --git a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_cod.c b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
index 808e6f07bf..56908abf01 100644
--- a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
+++ b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
@@ -254,7 +254,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
 	box = 0;
 	tmpstream = 0;
 
-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
 		goto error;
 	}
 	box->ops = &jp2_boxinfo_unk.ops;
diff --git a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_cod.c.orig b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_cod.c.orig
deleted file mode 100644
index 83cecb1f91..0000000000
--- a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_cod.c.orig
+++ /dev/null
@@ -1,921 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- * 
- * JasPer License Version 2.0
- * 
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- * 
- * All rights reserved.
- * 
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- * 
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- * 
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- * 
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- * 
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JP2 Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "jasper/jas_stream.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_debug.h"
-
-#include "jp2_cod.h"
-
-/******************************************************************************\
-* Function prototypes.
-\******************************************************************************/
-
-#define	ONES(n)	((1 << (n)) - 1)
-
-jp2_boxinfo_t *jp2_boxinfolookup(int type);
-
-static int jp2_getuint8(jas_stream_t *in, uint_fast8_t *val);
-static int jp2_getuint16(jas_stream_t *in, uint_fast16_t *val);
-static int jp2_getuint32(jas_stream_t *in, uint_fast32_t *val);
-static int jp2_getuint64(jas_stream_t *in, uint_fast64_t *val);
-static int jp2_putuint8(jas_stream_t *out, uint_fast8_t val);
-static int jp2_putuint16(jas_stream_t *out, uint_fast16_t val);
-static int jp2_putuint32(jas_stream_t *out, uint_fast32_t val);
-static int jp2_putuint64(jas_stream_t *out, uint_fast64_t val);
-
-static int jp2_getint(jas_stream_t *in, int s, int n, int_fast32_t *val);
-
-jp2_box_t *jp2_box_get(jas_stream_t *in);
-void jp2_box_dump(jp2_box_t *box, FILE *out);
-
-static int jp2_jp_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_jp_putdata(jp2_box_t *box, jas_stream_t *out);
-static int jp2_ftyp_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_ftyp_putdata(jp2_box_t *box, jas_stream_t *out);
-static int jp2_ihdr_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_ihdr_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_bpcc_destroy(jp2_box_t *box);
-static int jp2_bpcc_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_bpcc_putdata(jp2_box_t *box, jas_stream_t *out);
-static int jp2_colr_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_colr_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_colr_dumpdata(jp2_box_t *box, FILE *out);
-static void jp2_colr_destroy(jp2_box_t *box);
-static void jp2_cdef_destroy(jp2_box_t *box);
-static int jp2_cdef_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_cdef_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_cdef_dumpdata(jp2_box_t *box, FILE *out);
-static void jp2_cmap_destroy(jp2_box_t *box);
-static int jp2_cmap_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_cmap_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_cmap_dumpdata(jp2_box_t *box, FILE *out);
-static void jp2_pclr_destroy(jp2_box_t *box);
-static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_pclr_dumpdata(jp2_box_t *box, FILE *out);
-
-/******************************************************************************\
-* Local data.
-\******************************************************************************/
-
-jp2_boxinfo_t jp2_boxinfos[] = {
-	{JP2_BOX_JP, "JP", 0,
-	  {0, 0, jp2_jp_getdata, jp2_jp_putdata, 0}},
-	{JP2_BOX_FTYP, "FTYP", 0,
-	  {0, 0, jp2_ftyp_getdata, jp2_ftyp_putdata, 0}},
-	{JP2_BOX_JP2H, "JP2H", JP2_BOX_SUPER,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_IHDR, "IHDR", 0,
-	  {0, 0, jp2_ihdr_getdata, jp2_ihdr_putdata, 0}},
-	{JP2_BOX_BPCC, "BPCC", 0,
-	  {0, jp2_bpcc_destroy, jp2_bpcc_getdata, jp2_bpcc_putdata, 0}},
-	{JP2_BOX_COLR, "COLR", 0,
-	  {0, jp2_colr_destroy, jp2_colr_getdata, jp2_colr_putdata, jp2_colr_dumpdata}},
-	{JP2_BOX_PCLR, "PCLR", 0,
-	  {0, jp2_pclr_destroy, jp2_pclr_getdata, jp2_pclr_putdata, jp2_pclr_dumpdata}},
-	{JP2_BOX_CMAP, "CMAP", 0,
-	  {0, jp2_cmap_destroy, jp2_cmap_getdata, jp2_cmap_putdata, jp2_cmap_dumpdata}},
-	{JP2_BOX_CDEF, "CDEF", 0,
-	  {0, jp2_cdef_destroy, jp2_cdef_getdata, jp2_cdef_putdata, jp2_cdef_dumpdata}},
-	{JP2_BOX_RES, "RES", JP2_BOX_SUPER,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_RESC, "RESC", 0,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_RESD, "RESD", 0,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_JP2C, "JP2C", JP2_BOX_NODATA,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_JP2I, "JP2I", 0,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_XML, "XML", 0,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_UUID, "UUID", 0,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_UINF, "UINF", JP2_BOX_SUPER,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_ULST, "ULST", 0,
-	  {0, 0, 0, 0, 0}},
-	{JP2_BOX_URL, "URL", 0,
-	  {0, 0, 0, 0, 0}},
-	{0, 0, 0, {0, 0, 0, 0, 0}},
-};
-
-jp2_boxinfo_t jp2_boxinfo_unk = {
-	0, "Unknown", 0, {0, 0, 0, 0, 0}
-};
-
-/******************************************************************************\
-* Box constructor.
-\******************************************************************************/
-
-jp2_box_t *jp2_box_create(int type)
-{
-	jp2_box_t *box;
-	jp2_boxinfo_t *boxinfo;
-
-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
-		return 0;
-	}
-	memset(box, 0, sizeof(jp2_box_t));
-	box->type = type;
-	box->len = 0;
-	if (!(boxinfo = jp2_boxinfolookup(type))) {
-		return 0;
-	}
-	box->info = boxinfo;
-	box->ops = &boxinfo->ops;
-	return box;
-}
-
-/******************************************************************************\
-* Box destructor.
-\******************************************************************************/
-
-void jp2_box_destroy(jp2_box_t *box)
-{
-	if (box->ops->destroy) {
-		(*box->ops->destroy)(box);
-	}
-	jas_free(box);
-}
-
-static void jp2_bpcc_destroy(jp2_box_t *box)
-{
-	jp2_bpcc_t *bpcc = &box->data.bpcc;
-	if (bpcc->bpcs) {
-		jas_free(bpcc->bpcs);
-		bpcc->bpcs = 0;
-	}
-}
-
-static void jp2_cdef_destroy(jp2_box_t *box)
-{
-	jp2_cdef_t *cdef = &box->data.cdef;
-	if (cdef->ents) {
-		jas_free(cdef->ents);
-		cdef->ents = 0;
-	}
-}
-
-/******************************************************************************\
-* Box input.
-\******************************************************************************/
-
-jp2_box_t *jp2_box_get(jas_stream_t *in)
-{
-	jp2_box_t *box;
-	jp2_boxinfo_t *boxinfo;
-	jas_stream_t *tmpstream;
-	uint_fast32_t len;
-	uint_fast64_t extlen;
-	bool dataflag;
-
-	box = 0;
-	tmpstream = 0;
-
-	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
-		goto error;
-	}
-	box->ops = &jp2_boxinfo_unk.ops;
-	if (jp2_getuint32(in, &len) || jp2_getuint32(in, &box->type)) {
-		goto error;
-	}
-	boxinfo = jp2_boxinfolookup(box->type);
-	box->info = boxinfo;
-	box->ops = &boxinfo->ops;
-	box->len = len;
-	if (box->len == 1) {
-		if (jp2_getuint64(in, &extlen)) {
-			goto error;
-		}
-		if (extlen > 0xffffffffUL) {
-			jas_eprintf("warning: cannot handle large 64-bit box length\n");
-			extlen = 0xffffffffUL;
-		}
-		box->len = extlen;
-		box->datalen = extlen - JP2_BOX_HDRLEN(true);
-	} else {
-		box->datalen = box->len - JP2_BOX_HDRLEN(false);
-	}
-	if (box->len != 0 && box->len < 8) {
-		goto error;
-	}
-
-	dataflag = !(box->info->flags & (JP2_BOX_SUPER | JP2_BOX_NODATA));
-
-	if (dataflag) {
-		if (!(tmpstream = jas_stream_memopen(0, 0))) {
-			goto error;
-		}
-		if (jas_stream_copy(tmpstream, in, box->datalen)) {
-			jas_eprintf("cannot copy box data\n");
-			goto error;
-		}
-		jas_stream_rewind(tmpstream);
-
-		if (box->ops->getdata) {
-			if ((*box->ops->getdata)(box, tmpstream)) {
-				jas_eprintf("cannot parse box data\n");
-				goto error;
-			}
-		}
-		jas_stream_close(tmpstream);
-	}
-
-	if (jas_getdbglevel() >= 1) {
-		jp2_box_dump(box, stderr);
-	}
-
-	return box;
-	abort();
-
-error:
-	if (box) {
-		jp2_box_destroy(box);
-	}
-	if (tmpstream) {
-		jas_stream_close(tmpstream);
-	}
-	return 0;
-}
-
-void jp2_box_dump(jp2_box_t *box, FILE *out)
-{
-	jp2_boxinfo_t *boxinfo;
-	boxinfo = jp2_boxinfolookup(box->type);
-	assert(boxinfo);
-
-	fprintf(out, "JP2 box: ");
-	fprintf(out, "type=%c%s%c (0x%08x); length=%d\n", '"', boxinfo->name,
-	  '"', box->type, box->len);
-	if (box->ops->dumpdata) {
-		(*box->ops->dumpdata)(box, out);
-	}
-}
-
-static int jp2_jp_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-	jp2_jp_t *jp = &box->data.jp;
-	if (jp2_getuint32(in, &jp->magic)) {
-		return -1;
-	}
-	return 0;
-}
-
-static int jp2_ftyp_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-	jp2_ftyp_t *ftyp = &box->data.ftyp;
-	unsigned int i;
-	if (jp2_getuint32(in, &ftyp->majver) || jp2_getuint32(in, &ftyp->minver)) {
-		return -1;
-	}
-	ftyp->numcompatcodes = (box->datalen - 8) / 4;
-	if (ftyp->numcompatcodes > JP2_FTYP_MAXCOMPATCODES) {
-		return -1;
-	}
-	for (i = 0; i < ftyp->numcompatcodes; ++i) {
-		if (jp2_getuint32(in, &ftyp->compatcodes[i])) {
-			return -1;
-		}
-	}
-	return 0;
-}
-
-static int jp2_ihdr_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-	jp2_ihdr_t *ihdr = &box->data.ihdr;
-	if (jp2_getuint32(in, &ihdr->height) || jp2_getuint32(in, &ihdr->width) ||
-	  jp2_getuint16(in, &ihdr->numcmpts) || jp2_getuint8(in, &ihdr->bpc) ||
-	  jp2_getuint8(in, &ihdr->comptype) || jp2_getuint8(in, &ihdr->csunk) ||
-	  jp2_getuint8(in, &ihdr->ipr)) {
-		return -1;
-	}
-	return 0;
-}
-
-static int jp2_bpcc_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-	jp2_bpcc_t *bpcc = &box->data.bpcc;
-	unsigned int i;
-	bpcc->numcmpts = box->datalen;
-	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
-		return -1;
-	}
-	for (i = 0; i < bpcc->numcmpts; ++i) {
-		if (jp2_getuint8(in, &bpcc->bpcs[i])) {
-			return -1;
-		}
-	}
-	return 0;
-}
-
-static void jp2_colr_dumpdata(jp2_box_t *box, FILE *out)
-{
-	jp2_colr_t *colr = &box->data.colr;
-	fprintf(out, "method=%d; pri=%d; approx=%d\n", (int)colr->method, (int)colr->pri, (int)colr->approx);
-	switch (colr->method) {
-	case JP2_COLR_ENUM:
-		fprintf(out, "csid=%d\n", (int)colr->csid);
-		break;
-	case JP2_COLR_ICC:
-		jas_memdump(out, colr->iccp, colr->iccplen);
-		break;
-	}
-}
-
-static int jp2_colr_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-	jp2_colr_t *colr = &box->data.colr;
-	colr->csid = 0;
-	colr->iccp = 0;
-	colr->iccplen = 0;
-
-	if (jp2_getuint8(in, &colr->method) || jp2_getuint8(in, &colr->pri) ||
-	  jp2_getuint8(in, &colr->approx)) {
-		return -1;
-	}
-	switch (colr->method) {
-	case JP2_COLR_ENUM:
-		if (jp2_getuint32(in, &colr->csid)) {
-			return -1;
-		}
-		break;
-	case JP2_COLR_ICC:
-		colr->iccplen = box->datalen - 3;
-		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
-			return -1;
-		}
-		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
-			return -1;
-		}
-		break;
-	}
-	return 0;
-}
-
-static void jp2_cdef_dumpdata(jp2_box_t *box, FILE *out)
-{
-	jp2_cdef_t *cdef = &box->data.cdef;
-	unsigned int i;
-	for (i = 0; i < cdef->numchans; ++i) {
-		fprintf(out, "channo=%d; type=%d; assoc=%d\n",
-		  cdef->ents[i].channo, cdef->ents[i].type, cdef->ents[i].assoc);
-	}
-}
-
-static void jp2_colr_destroy(jp2_box_t *box)
-{
-	jp2_colr_t *colr = &box->data.colr;
-	if (colr->iccp) {
-		jas_free(colr->iccp);
-	}
-}
-
-static int jp2_cdef_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-	jp2_cdef_t *cdef = &box->data.cdef;
-	jp2_cdefchan_t *chan;
-	unsigned int channo;
-	if (jp2_getuint16(in, &cdef->numchans)) {
-		return -1;
-	}
-	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
-		return -1;
-	}
-	for (channo = 0; channo < cdef->numchans; ++channo) {
-		chan = &cdef->ents[channo];
-		if (jp2_getuint16(in, &chan->channo) || jp2_getuint16(in, &chan->type) ||
-		  jp2_getuint16(in, &chan->assoc)) {
-			return -1;
-		}
-	}
-	return 0;
-}
-
-/******************************************************************************\
-* Box output.
-\******************************************************************************/
-
-int jp2_box_put(jp2_box_t *box, jas_stream_t *out)
-{
-	jas_stream_t *tmpstream;
-	bool extlen;
-	bool dataflag;
-
-	tmpstream = 0;
-
-	dataflag = !(box->info->flags & (JP2_BOX_SUPER | JP2_BOX_NODATA));
-
-	if (dataflag) {
-		tmpstream = jas_stream_memopen(0, 0);
-		if (box->ops->putdata) {
-			if ((*box->ops->putdata)(box, tmpstream)) {
-				goto error;
-			}
-		}
-		box->len = jas_stream_tell(tmpstream) + JP2_BOX_HDRLEN(false);
-		jas_stream_rewind(tmpstream);
-	}
-	extlen = (box->len >= (((uint_fast64_t)1) << 32)) != 0;
-	if (jp2_putuint32(out, extlen ? 1 : box->len)) {
-		goto error;
-	}
-	if (jp2_putuint32(out, box->type)) {
-		goto error;
-	}
-	if (extlen) {
-		if (jp2_putuint64(out, box->len)) {
-			goto error;
-		}
-	}
-
-	if (dataflag) {
-		if (jas_stream_copy(out, tmpstream, box->len - JP2_BOX_HDRLEN(false))) {
-			goto error;
-		}
-		jas_stream_close(tmpstream);
-	}
-
-	return 0;
-	abort();
-
-error:
-
-	if (tmpstream) {
-		jas_stream_close(tmpstream);
-	}
-	return -1;
-}
-
-static int jp2_jp_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-	jp2_jp_t *jp = &box->data.jp;
-	if (jp2_putuint32(out, jp->magic)) {
-		return -1;
-	}
-	return 0;
-}
-
-static int jp2_ftyp_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-	jp2_ftyp_t *ftyp = &box->data.ftyp;
-	unsigned int i;
-	if (jp2_putuint32(out, ftyp->majver) || jp2_putuint32(out, ftyp->minver)) {
-		return -1;
-	}
-	for (i = 0; i < ftyp->numcompatcodes; ++i) {
-		if (jp2_putuint32(out, ftyp->compatcodes[i])) {
-			return -1;
-		}
-	}
-	return 0;
-}
-
-static int jp2_ihdr_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-	jp2_ihdr_t *ihdr = &box->data.ihdr;
-	if (jp2_putuint32(out, ihdr->height) || jp2_putuint32(out, ihdr->width) ||
-	  jp2_putuint16(out, ihdr->numcmpts) || jp2_putuint8(out, ihdr->bpc) ||
-	  jp2_putuint8(out, ihdr->comptype) || jp2_putuint8(out, ihdr->csunk) ||
-	  jp2_putuint8(out, ihdr->ipr)) {
-		return -1;
-	}
-	return 0;
-}
-
-static int jp2_bpcc_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-	jp2_bpcc_t *bpcc = &box->data.bpcc;
-	unsigned int i;
-	for (i = 0; i < bpcc->numcmpts; ++i) {
-		if (jp2_putuint8(out, bpcc->bpcs[i])) {
-			return -1;
-		}
-	}
-	return 0;
-}
-
-static int jp2_colr_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-	jp2_colr_t *colr = &box->data.colr;
-	if (jp2_putuint8(out, colr->method) || jp2_putuint8(out, colr->pri) ||
-	  jp2_putuint8(out, colr->approx)) {
-		return -1;
-	}
-	switch (colr->method) {
-	case JP2_COLR_ENUM:
-		if (jp2_putuint32(out, colr->csid)) {
-			return -1;
-		}
-		break;
-	case JP2_COLR_ICC:
-		if (jas_stream_write(out, colr->iccp,
-		  JAS_CAST(int, colr->iccplen)) != JAS_CAST(int, colr->iccplen))
-			return -1;
-		break;
-	}
-	return 0;
-}
-
-static int jp2_cdef_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-	jp2_cdef_t *cdef = &box->data.cdef;
-	unsigned int i;
-	jp2_cdefchan_t *ent;
-
-	if (jp2_putuint16(out, cdef->numchans)) {
-		return -1;
-	}
-
-	for (i = 0; i < cdef->numchans; ++i) {
-		ent = &cdef->ents[i];
-		if (jp2_putuint16(out, ent->channo) ||
-		  jp2_putuint16(out, ent->type) ||
-		  jp2_putuint16(out, ent->assoc)) {
-			return -1;
-		}
-	}
-	return 0;
-}
-
-/******************************************************************************\
-* Input operations for primitive types.
-\******************************************************************************/
-
-static int jp2_getuint8(jas_stream_t *in, uint_fast8_t *val)
-{
-	int c;
-	if ((c = jas_stream_getc(in)) == EOF) {
-		return -1;
-	}
-	if (val) {
-		*val = c;
-	}
-	return 0;
-}
-
-static int jp2_getuint16(jas_stream_t *in, uint_fast16_t *val)
-{
-	uint_fast16_t v;
-	int c;
-	if ((c = jas_stream_getc(in)) == EOF) {
-		return -1;
-	}
-	v = c;
-	if ((c = jas_stream_getc(in)) == EOF) {
-		return -1;
-	}
-	v = (v << 8) | c;
-	if (val) {
-		*val = v;
-	}
-	return 0;
-}
-
-static int jp2_getuint32(jas_stream_t *in, uint_fast32_t *val)
-{
-	uint_fast32_t v;
-	int c;
-	if ((c = jas_stream_getc(in)) == EOF) {
-		return -1;
-	}
-	v = c;
-	if ((c = jas_stream_getc(in)) == EOF) {
-		return -1;
-	}
-	v = (v << 8) | c;
-	if ((c = jas_stream_getc(in)) == EOF) {
-		return -1;
-	}
-	v = (v << 8) | c;
-	if ((c = jas_stream_getc(in)) == EOF) {
-		return -1;
-	}
-	v = (v << 8) | c;
-	if (val) {
-		*val = v;
-	}
-	return 0;
-}
-
-static int jp2_getuint64(jas_stream_t *in, uint_fast64_t *val)
-{
-	uint_fast64_t tmpval;
-	int i;
-	int c;
-
-	tmpval = 0;
-	for (i = 0; i < 8; ++i) {
-		tmpval <<= 8;
-		if ((c = jas_stream_getc(in)) == EOF) {
-			return -1;
-		}
-		tmpval |= (c & 0xff);
-	}
-	*val = tmpval;
-
-	return 0;
-}
-
-/******************************************************************************\
-* Output operations for primitive types.
-\******************************************************************************/
-
-static int jp2_putuint8(jas_stream_t *out, uint_fast8_t val)
-{
-	if (jas_stream_putc(out, val & 0xff) == EOF) {
-		return -1;
-	}
-	return 0;
-}
-
-static int jp2_putuint16(jas_stream_t *out, uint_fast16_t val)
-{
-	if (jas_stream_putc(out, (val >> 8) & 0xff) == EOF ||
-	  jas_stream_putc(out, val & 0xff) == EOF) {
-		return -1;
-	}
-	return 0;
-}
-
-static int jp2_putuint32(jas_stream_t *out, uint_fast32_t val)
-{
-	if (jas_stream_putc(out, (val >> 24) & 0xff) == EOF ||
-	  jas_stream_putc(out, (val >> 16) & 0xff) == EOF ||
-	  jas_stream_putc(out, (val >> 8) & 0xff) == EOF ||
-	  jas_stream_putc(out, val & 0xff) == EOF) {
-		return -1;
-	}
-	return 0;
-}
-
-static int jp2_putuint64(jas_stream_t *out, uint_fast64_t val)
-{
-	if (jp2_putuint32(out, (val >> 32) & 0xffffffffUL) ||
-	  jp2_putuint32(out, val & 0xffffffffUL)) {
-		return -1;
-	}
-	return 0;
-}
-
-/******************************************************************************\
-* Miscellaneous code.
-\******************************************************************************/
-
-jp2_boxinfo_t *jp2_boxinfolookup(int type)
-{
-	jp2_boxinfo_t *boxinfo;
-	for (boxinfo = jp2_boxinfos; boxinfo->name; ++boxinfo) {
-		if (boxinfo->type == type) {
-			return boxinfo;
-		}
-	}
-	return &jp2_boxinfo_unk;
-}
-
-
-
-
-
-static void jp2_cmap_destroy(jp2_box_t *box)
-{
-	jp2_cmap_t *cmap = &box->data.cmap;
-	if (cmap->ents) {
-		jas_free(cmap->ents);
-	}
-}
-
-static int jp2_cmap_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-	jp2_cmap_t *cmap = &box->data.cmap;
-	jp2_cmapent_t *ent;
-	unsigned int i;
-
-	cmap->numchans = (box->datalen) / 4;
-	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
-		return -1;
-	}
-	for (i = 0; i < cmap->numchans; ++i) {
-		ent = &cmap->ents[i];
-		if (jp2_getuint16(in, &ent->cmptno) ||
-		  jp2_getuint8(in, &ent->map) ||
-		  jp2_getuint8(in, &ent->pcol)) {
-			return -1;
-		}
-	}
-	
-	return 0;
-}
-
-static int jp2_cmap_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-	/* Eliminate compiler warning about unused variables. */
-	box = 0;
-	out = 0;
-
-	return -1;
-}
-
-static void jp2_cmap_dumpdata(jp2_box_t *box, FILE *out)
-{
-	jp2_cmap_t *cmap = &box->data.cmap;
-	unsigned int i;
-	jp2_cmapent_t *ent;
-	fprintf(out, "numchans = %d\n", (int) cmap->numchans);
-	for (i = 0; i < cmap->numchans; ++i) {
-		ent = &cmap->ents[i];
-		fprintf(out, "cmptno=%d; map=%d; pcol=%d\n",
-		  (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
-	}
-}
-
-static void jp2_pclr_destroy(jp2_box_t *box)
-{
-	jp2_pclr_t *pclr = &box->data.pclr;
-	if (pclr->lutdata) {
-		jas_free(pclr->lutdata);
-	}
-	if (pclr->bpc)
-		jas_free(pclr->bpc);
-}
-
-static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-	jp2_pclr_t *pclr = &box->data.pclr;
-	int lutsize;
-	unsigned int i;
-	unsigned int j;
-	int_fast32_t x;
-
-	pclr->lutdata = 0;
-
-	if (jp2_getuint16(in, &pclr->numlutents) ||
-	  jp2_getuint8(in, &pclr->numchans)) {
-		return -1;
-	}
-	lutsize = pclr->numlutents * pclr->numchans;
-	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
-		return -1;
-	}
-	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
-		return -1;
-	}
-	for (i = 0; i < pclr->numchans; ++i) {
-		if (jp2_getuint8(in, &pclr->bpc[i])) {
-			return -1;
-		}
-	}
-	for (i = 0; i < pclr->numlutents; ++i) {
-		for (j = 0; j < pclr->numchans; ++j) {
-			if (jp2_getint(in, (pclr->bpc[j] & 0x80) != 0,
-			  (pclr->bpc[j] & 0x7f) + 1, &x)) {
-				return -1;
-			}
-			pclr->lutdata[i * pclr->numchans + j] = x;
-		}
-	}
-	return 0;
-}
-
-static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-#if 0
-	jp2_pclr_t *pclr = &box->data.pclr;
-#endif
-/* Eliminate warning about unused variable. */
-box = 0;
-out = 0;
-	return -1;
-}
-
-static void jp2_pclr_dumpdata(jp2_box_t *box, FILE *out)
-{
-	jp2_pclr_t *pclr = &box->data.pclr;
-	unsigned int i;
-	int j;
-	fprintf(out, "numents=%d; numchans=%d\n", (int) pclr->numlutents,
-	  (int) pclr->numchans);
-	for (i = 0; i < pclr->numlutents; ++i) {
-		for (j = 0; j < pclr->numchans; ++j) {
-			fprintf(out, "LUT[%d][%d]=%d\n", i, j, pclr->lutdata[i * pclr->numchans + j]);
-		}
-	}
-}
-
-static int jp2_getint(jas_stream_t *in, int s, int n, int_fast32_t *val)
-{
-	int c;
-	int i;
-	uint_fast32_t v;
-	int m;
-
-	m = (n + 7) / 8;
-
-	v = 0;
-	for (i = 0; i < m; ++i) {
-		if ((c = jas_stream_getc(in)) == EOF) {
-			return -1;
-		}
-		v = (v << 8) | c;
-	}
-	v &= ONES(n);
-	if (s) {
-		int sb;
-		sb = v & (1 << (8 * m - 1));
-		*val = ((~v) + 1) & ONES(8 * m);
-		if (sb) {
-			*val = -*val;
-		}
-	} else {
-		*val = v;
-	}
-
-	return 0;
-}
-
-jp2_cdefchan_t *jp2_cdef_lookup(jp2_cdef_t *cdef, int channo)
-{
-	unsigned int i;
-	jp2_cdefchan_t *cdefent;
-	for (i = 0; i < cdef->numchans; ++i) {
-		cdefent = &cdef->ents[i];
-		if (cdefent->channo == JAS_CAST(unsigned int, channo)) {
-			return cdefent;
-		}
-	}
-	return 0;
-}
diff --git a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_dec.c b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
index d912cb9fa8..857b92dedf 100644
--- a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
+++ b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
@@ -298,7 +298,10 @@ jas_image_t *jp2_decode(jas_stream_t *in, char *optstr)
 	case JP2_COLR_ICC:
 		iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
 		  dec->colr->data.colr.iccplen);
-		assert(iccprof);
+		if (!iccprof) {
+			jas_eprintf("error: failed to parse ICC profile\n");
+			goto error;
+		}
 		jas_iccprof_gethdr(iccprof, &icchdr);
 		jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
 		jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));
@@ -393,6 +396,11 @@ jas_image_t *jp2_decode(jas_stream_t *in, char *optstr)
 	/* Determine the type of each component. */
 	if (dec->cdef) {
 		for (i = 0; i < dec->numchans; ++i) {
+			/* Is the channel number reasonable? */
+			if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) {
+				jas_eprintf("error: invalid channel number in CDEF box\n");
+				goto error;
+			}
 			jas_image_setcmpttype(dec->image,
 			  dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo],
 			  jp2_getct(jas_image_clrspc(dec->image),
diff --git a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_enc.c.orig b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_enc.c.orig
deleted file mode 100644
index 9e1e1fc47d..0000000000
--- a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jp2/jp2_enc.c.orig
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- * 
- * JasPer License Version 2.0
- * 
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- * 
- * All rights reserved.
- * 
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- * 
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- * 
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- * 
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- * 
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JP2 Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_cm.h"
-#include "jasper/jas_icc.h"
-#include "jp2_cod.h"
-
-static uint_fast32_t jp2_gettypeasoc(int colorspace, int ctype);
-static int clrspctojp2(jas_clrspc_t clrspc);
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-int jp2_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-	jp2_box_t *box;
-	jp2_ftyp_t *ftyp;
-	jp2_ihdr_t *ihdr;
-	jas_stream_t *tmpstream;
-	int allcmptssame;
-	jp2_bpcc_t *bpcc;
-	long len;
-	uint_fast16_t cmptno;
-	jp2_colr_t *colr;
-	char buf[4096];
-	uint_fast32_t overhead;
-	jp2_cdefchan_t *cdefchanent;
-	jp2_cdef_t *cdef;
-	int i;
-	uint_fast32_t typeasoc;
-jas_iccprof_t *iccprof;
-jas_stream_t *iccstream;
-int pos;
-int needcdef;
-int prec;
-int sgnd;
-
-	box = 0;
-	tmpstream = 0;
-
-	allcmptssame = 1;
-	sgnd = jas_image_cmptsgnd(image, 0);
-	prec = jas_image_cmptprec(image, 0);
-	for (i = 1; i < jas_image_numcmpts(image); ++i) {
-		if (jas_image_cmptsgnd(image, i) != sgnd ||
-		  jas_image_cmptprec(image, i) != prec) {
-			allcmptssame = 0;
-			break;
-		}
-	}
-
-	/* Output the signature box. */
-
-	if (!(box = jp2_box_create(JP2_BOX_JP))) {
-		goto error;
-	}
-	box->data.jp.magic = JP2_JP_MAGIC;
-	if (jp2_box_put(box, out)) {
-		goto error;
-	}
-	jp2_box_destroy(box);
-	box = 0;
-
-	/* Output the file type box. */
-
-	if (!(box = jp2_box_create(JP2_BOX_FTYP))) {
-		goto error;
-	}
-	ftyp = &box->data.ftyp;
-	ftyp->majver = JP2_FTYP_MAJVER;
-	ftyp->minver = JP2_FTYP_MINVER;
-	ftyp->numcompatcodes = 1;
-	ftyp->compatcodes[0] = JP2_FTYP_COMPATCODE;
-	if (jp2_box_put(box, out)) {
-		goto error;
-	}
-	jp2_box_destroy(box);
-	box = 0;
-
-	/*
-	 * Generate the data portion of the JP2 header box.
-	 * We cannot simply output the header for this box
-	 * since we do not yet know the correct value for the length
-	 * field.
-	 */
-
-	if (!(tmpstream = jas_stream_memopen(0, 0))) {
-		goto error;
-	}
-
-	/* Generate image header box. */
-
-	if (!(box = jp2_box_create(JP2_BOX_IHDR))) {
-		goto error;
-	}
-	ihdr = &box->data.ihdr;
-	ihdr->width = jas_image_width(image);
-	ihdr->height = jas_image_height(image);
-	ihdr->numcmpts = jas_image_numcmpts(image);
-	ihdr->bpc = allcmptssame ? JP2_SPTOBPC(jas_image_cmptsgnd(image, 0),
-	  jas_image_cmptprec(image, 0)) : JP2_IHDR_BPCNULL;
-	ihdr->comptype = JP2_IHDR_COMPTYPE;
-	ihdr->csunk = 0;
-	ihdr->ipr = 0;
-	if (jp2_box_put(box, tmpstream)) {
-		goto error;
-	}
-	jp2_box_destroy(box);
-	box = 0;
-
-	/* Generate bits per component box. */
-
-	if (!allcmptssame) {
-		if (!(box = jp2_box_create(JP2_BOX_BPCC))) {
-			goto error;
-		}
-		bpcc = &box->data.bpcc;
-		bpcc->numcmpts = jas_image_numcmpts(image);
-		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
-		  sizeof(uint_fast8_t)))) {
-			goto error;
-		}
-		for (cmptno = 0; cmptno < bpcc->numcmpts; ++cmptno) {
-			bpcc->bpcs[cmptno] = JP2_SPTOBPC(jas_image_cmptsgnd(image,
-			  cmptno), jas_image_cmptprec(image, cmptno));
-		}
-		if (jp2_box_put(box, tmpstream)) {
-			goto error;
-		}
-		jp2_box_destroy(box);
-		box = 0;
-	}
-
-	/* Generate color specification box. */
-
-	if (!(box = jp2_box_create(JP2_BOX_COLR))) {
-		goto error;
-	}
-	colr = &box->data.colr;
-	switch (jas_image_clrspc(image)) {
-	case JAS_CLRSPC_SRGB:
-	case JAS_CLRSPC_SYCBCR:
-	case JAS_CLRSPC_SGRAY:
-		colr->method = JP2_COLR_ENUM;
-		colr->csid = clrspctojp2(jas_image_clrspc(image));
-		colr->pri = JP2_COLR_PRI;
-		colr->approx = 0;
-		break;
-	default:
-		colr->method = JP2_COLR_ICC;
-		colr->pri = JP2_COLR_PRI;
-		colr->approx = 0;
-		iccprof = jas_iccprof_createfromcmprof(jas_image_cmprof(image));
-		assert(iccprof);
-		iccstream = jas_stream_memopen(0, 0);
-		assert(iccstream);
-		if (jas_iccprof_save(iccprof, iccstream))
-			abort();
-		if ((pos = jas_stream_tell(iccstream)) < 0)
-			abort();
-		colr->iccplen = pos;
-		colr->iccp = jas_malloc(pos);
-		assert(colr->iccp);
-		jas_stream_rewind(iccstream);
-		if (jas_stream_read(iccstream, colr->iccp, colr->iccplen) != colr->iccplen)
-			abort();
-		jas_stream_close(iccstream);
-		jas_iccprof_destroy(iccprof);
-		break;
-	}
-	if (jp2_box_put(box, tmpstream)) {
-		goto error;
-	}
-	jp2_box_destroy(box);
-	box = 0;
-
-	needcdef = 1;
-	switch (jas_clrspc_fam(jas_image_clrspc(image))) {
-	case JAS_CLRSPC_FAM_RGB:
-		if (jas_image_cmpttype(image, 0) ==
-		  JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R) &&
-		  jas_image_cmpttype(image, 1) ==
-		  JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G) &&
-		  jas_image_cmpttype(image, 2) ==
-		  JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B))
-			needcdef = 0;
-		break;
-	case JAS_CLRSPC_FAM_YCBCR:
-		if (jas_image_cmpttype(image, 0) ==
-		  JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_Y) &&
-		  jas_image_cmpttype(image, 1) ==
-		  JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_CB) &&
-		  jas_image_cmpttype(image, 2) ==
-		  JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_CR))
-			needcdef = 0;
-		break;
-	case JAS_CLRSPC_FAM_GRAY:
-		if (jas_image_cmpttype(image, 0) ==
-		  JAS_IMAGE_CT_COLOR(JAS_IMAGE_CT_GRAY_Y))
-			needcdef = 0;
-		break;
-	default:
-		abort();
-		break;
-	}
-
-	if (needcdef) {
-		if (!(box = jp2_box_create(JP2_BOX_CDEF))) {
-			goto error;
-		}
-		cdef = &box->data.cdef;
-		cdef->numchans = jas_image_numcmpts(image);
-		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
-		for (i = 0; i < jas_image_numcmpts(image); ++i) {
-			cdefchanent = &cdef->ents[i];
-			cdefchanent->channo = i;
-			typeasoc = jp2_gettypeasoc(jas_image_clrspc(image), jas_image_cmpttype(image, i));
-			cdefchanent->type = typeasoc >> 16;
-			cdefchanent->assoc = typeasoc & 0x7fff;
-		}
-		if (jp2_box_put(box, tmpstream)) {
-			goto error;
-		}
-		jp2_box_destroy(box);
-		box = 0;
-	}
-
-	/* Determine the total length of the JP2 header box. */
-
-	len = jas_stream_tell(tmpstream);
-	jas_stream_rewind(tmpstream);
-
-	/*
-	 * Output the JP2 header box and all of the boxes which it contains.
-	 */
-
-	if (!(box = jp2_box_create(JP2_BOX_JP2H))) {
-		goto error;
-	}
-	box->len = len + JP2_BOX_HDRLEN(false);
-	if (jp2_box_put(box, out)) {
-		goto error;
-	}
-	jp2_box_destroy(box);
-	box = 0;
-
-	if (jas_stream_copy(out, tmpstream, len)) {
-		goto error;
-	}
-
-	jas_stream_close(tmpstream);
-	tmpstream = 0;
-
-	/*
-	 * Output the contiguous code stream box.
-	 */
-
-	if (!(box = jp2_box_create(JP2_BOX_JP2C))) {
-		goto error;
-	}
-	box->len = 0;
-	if (jp2_box_put(box, out)) {
-		goto error;
-	}
-	jp2_box_destroy(box);
-	box = 0;
-
-	/* Output the JPEG-2000 code stream. */
-
-	overhead = jas_stream_getrwcount(out);
-	sprintf(buf, "%s\n_jp2overhead=%lu\n", (optstr ? optstr : ""),
-	  (unsigned long) overhead);
-
-	if (jpc_encode(image, out, buf)) {
-		goto error;
-	}
-
-	return 0;
-	abort();
-
-error:
-
-	if (box) {
-		jp2_box_destroy(box);
-	}
-	if (tmpstream) {
-		jas_stream_close(tmpstream);
-	}
-	return -1;
-}
-
-static uint_fast32_t jp2_gettypeasoc(int colorspace, int ctype)
-{
-	int type;
-	int asoc;
-
-	if (ctype & JAS_IMAGE_CT_OPACITY) {
-		type = JP2_CDEF_TYPE_OPACITY;
-		asoc = JP2_CDEF_ASOC_ALL;
-		goto done;
-	}
-
-	type = JP2_CDEF_TYPE_UNSPEC;
-	asoc = JP2_CDEF_ASOC_NONE;
-	switch (jas_clrspc_fam(colorspace)) {
-	case JAS_CLRSPC_FAM_RGB:
-		switch (JAS_IMAGE_CT_COLOR(ctype)) {
-		case JAS_IMAGE_CT_RGB_R:
-			type = JP2_CDEF_TYPE_COLOR;
-			asoc = JP2_CDEF_RGB_R;
-			break;
-		case JAS_IMAGE_CT_RGB_G:
-			type = JP2_CDEF_TYPE_COLOR;
-			asoc = JP2_CDEF_RGB_G;
-			break;
-		case JAS_IMAGE_CT_RGB_B:
-			type = JP2_CDEF_TYPE_COLOR;
-			asoc = JP2_CDEF_RGB_B;
-			break;
-		}
-		break;
-	case JAS_CLRSPC_FAM_YCBCR:
-		switch (JAS_IMAGE_CT_COLOR(ctype)) {
-		case JAS_IMAGE_CT_YCBCR_Y:
-			type = JP2_CDEF_TYPE_COLOR;
-			asoc = JP2_CDEF_YCBCR_Y;
-			break;
-		case JAS_IMAGE_CT_YCBCR_CB:
-			type = JP2_CDEF_TYPE_COLOR;
-			asoc = JP2_CDEF_YCBCR_CB;
-			break;
-		case JAS_IMAGE_CT_YCBCR_CR:
-			type = JP2_CDEF_TYPE_COLOR;
-			asoc = JP2_CDEF_YCBCR_CR;
-			break;
-		}
-		break;
-	case JAS_CLRSPC_FAM_GRAY:
-		type = JP2_CDEF_TYPE_COLOR;
-		asoc = JP2_CDEF_GRAY_Y;
-		break;
-	}
-
-done:
-	return (type << 16) | asoc;
-}
-
-static int clrspctojp2(jas_clrspc_t clrspc)
-{
-	switch (clrspc) {
-	case JAS_CLRSPC_SRGB:
-		return JP2_COLR_SRGB;
-	case JAS_CLRSPC_SYCBCR:
-		return JP2_COLR_SYCC;
-	case JAS_CLRSPC_SGRAY:
-		return JP2_COLR_SGRAY;
-	default:
-		abort();
-		break;
-	}
-}
diff --git a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jpc/jpc_cs.c b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
index 2e109a742c..89e4bc3d2d 100644
--- a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
+++ b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
@@ -989,8 +989,11 @@ static int jpc_qcx_getcompparms(jpc_qcxcp_t *compparms, jpc_cstate_t *cstate,
 		compparms->numstepsizes = (len - n) / 2;
 		break;
 	}
-	if (compparms->numstepsizes > 0) {
-		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
+	if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) {
+		jpc_qcx_destroycompparms(compparms);
+                return -1;
+        } else if (compparms->numstepsizes > 0) {
+		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
 		  sizeof(uint_fast16_t));
 		assert(compparms->stepsizes);
 		for (i = 0; i < compparms->numstepsizes; ++i) {
diff --git a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jpc/jpc_dec.c b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
index 6808d60a47..d44e3019be 100644
--- a/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
+++ b/nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
@@ -496,7 +496,7 @@ static int jpc_dec_process_sot(jpc_dec_t *dec, jpc_ms_t *ms)
 		dec->curtileendoff = 0;
 	}
 
-	if (JAS_CAST(int, sot->tileno) > dec->numtiles) {
+	if (JAS_CAST(int, sot->tileno) >= dec->numtiles) {
 		jas_eprintf("invalid tile number in SOT marker segment\n");
 		return -1;
 	}
@@ -1076,12 +1076,12 @@ static int jpc_dec_tiledecode(jpc_dec_t *dec, jpc_dec_tile_t *tile)
 	/* Apply an inverse intercomponent transform if necessary. */
 	switch (tile->cp->mctid) {
 	case JPC_MCT_RCT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;
 	case JPC_MCT_ICT:
-		assert(dec->numcomps == 3);
+		assert(dec->numcomps >= 3);
 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
 		  tile->tcomps[2].data);
 		break;
@@ -1211,7 +1211,7 @@ static int jpc_dec_process_siz(jpc_dec_t *dec, jpc_ms_t *ms)
 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
 	dec->numtiles = dec->numhtiles * dec->numvtiles;
-	if (!(dec->tiles = jas_alloc2(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
 		return -1;
 	}
 
@@ -1235,7 +1235,7 @@ static int jpc_dec_process_siz(jpc_dec_t *dec, jpc_ms_t *ms)
 		tile->pkthdrstreampos = 0;
 		tile->pptstab = 0;
 		tile->cp = 0;
-		if (!(tile->tcomps = jas_alloc2(dec->numcomps,
+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
 		  sizeof(jpc_dec_tcomp_t)))) {
 			return -1;
 		}
@@ -1287,7 +1287,7 @@ static int jpc_dec_process_coc(jpc_dec_t *dec, jpc_ms_t *ms)
 	jpc_coc_t *coc = &ms->parms.coc;
 	jpc_dec_tile_t *tile;
 
-	if (JAS_CAST(int, coc->compno) > dec->numcomps) {
+	if (JAS_CAST(int, coc->compno) >= dec->numcomps) {
 		jas_eprintf("invalid component number in COC marker segment\n");
 		return -1;
 	}
@@ -1313,7 +1313,7 @@ static int jpc_dec_process_rgn(jpc_dec_t *dec, jpc_ms_t *ms)
 	jpc_rgn_t *rgn = &ms->parms.rgn;
 	jpc_dec_tile_t *tile;
 
-	if (JAS_CAST(int, rgn->compno) > dec->numcomps) {
+	if (JAS_CAST(int, rgn->compno) >= dec->numcomps) {
 		jas_eprintf("invalid component number in RGN marker segment\n");
 		return -1;
 	}
@@ -1362,7 +1362,7 @@ static int jpc_dec_process_qcc(jpc_dec_t *dec, jpc_ms_t *ms)
 	jpc_qcc_t *qcc = &ms->parms.qcc;
 	jpc_dec_tile_t *tile;
 
-	if (JAS_CAST(int, qcc->compno) > dec->numcomps) {
+	if (JAS_CAST(int, qcc->compno) >= dec->numcomps) {
 		jas_eprintf("invalid component number in QCC marker segment\n");
 		return -1;
 	}
diff --git a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/MANIFEST.MF b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/MANIFEST.MF
index 4ba2227cec..4f34943dd4 100644
--- a/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/MANIFEST.MF
+++ b/ost/gov.noaa.nws.ost.edex.plugin.regionalsat/META-INF/MANIFEST.MF
@@ -2,14 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: regionalsat
 Bundle-SymbolicName: gov.noaa.nws.ost.edex.plugin.regionalsat
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.15.0.qualifier
 Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
 Bundle-Vendor: NWS
 Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
  org.geotools,
  javax.measure,
- org.apache.commons.lang,
  javax.persistence,
  com.raytheon.edex.plugin.satellite,
  ucar.nc2;bundle-version="1.0.0"
diff --git a/ost/gov.noaa.nws.ost.edex.plugin.stq/META-INF/MANIFEST.MF b/ost/gov.noaa.nws.ost.edex.plugin.stq/META-INF/MANIFEST.MF
index 4ae13043c0..5e2ee463fd 100644
--- a/ost/gov.noaa.nws.ost.edex.plugin.stq/META-INF/MANIFEST.MF
+++ b/ost/gov.noaa.nws.ost.edex.plugin.stq/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: com.raytheon.edex.common,
  com.raytheon.uf.common.pointdata,
  com.raytheon.uf.edex.pointdata,
  org.geotools,
- org.apache.commons.logging,
  org.dom4j,
  javax.persistence,
  javax.measure
diff --git a/ost/gov.noaa.nws.ost.edex.plugin.stq/build.properties b/ost/gov.noaa.nws.ost.edex.plugin.stq/build.properties
index 5791d48d5f..73974cda80 100644
--- a/ost/gov.noaa.nws.ost.edex.plugin.stq/build.properties
+++ b/ost/gov.noaa.nws.ost.edex.plugin.stq/build.properties
@@ -2,4 +2,5 @@ source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
-               res/
+               res/,\
+               utility/
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.py
index 71560b0139..eb39c44f09 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.py
@@ -18,23 +18,27 @@
 # further licensing information.
 ##
 
-# File auto-generated against equivalent DynamicSerialize Java class
+##
+#     SOFTWARE HISTORY
+#    
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    xx/xx/??                      dgilling       Initial Creation.
+#    12/02/15         5129         dgilling       Refactor based on AbstractGfeRequest.
+# 
+##
 
-class GetSiteTimeZoneInfoRequest(object):
+from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import AbstractGfeRequest
+
+class GetSiteTimeZoneInfoRequest(AbstractGfeRequest):
 
     def __init__(self):
-        self.workstationID = None
-        self.siteID = None
+        super(GetSiteTimeZoneInfoRequest, self).__init__()
+        self.requestedSiteIDs = None
 
-    def getWorkstationID(self):
-        return self.workstationID
+    def getRequestedSiteIDs(self):
+        return self.requestedSiteIDs
 
-    def setWorkstationID(self, workstationID):
-        self.workstationID = workstationID
-
-    def getSiteID(self):
-        return self.siteID
-
-    def setSiteID(self, siteID):
-        self.siteID = siteID
+    def setRequestedSiteIDs(self, requestedSiteIDs):
+        self.requestedSiteIDs = requestedSiteIDs
 
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py
index b9f43d824f..31e06919e2 100644
--- a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py
@@ -22,7 +22,7 @@
 
 __all__ = [
             'dbsrv',
-            'request'
+            'subscription'
           ]
 
 
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/__init__.py
new file mode 100644
index 0000000000..eaa0c74aed
--- /dev/null
+++ b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/__init__.py
@@ -0,0 +1,27 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+# File auto-generated by PythonFileGenerator
+
+__all__ = [
+            'request'
+          ]
+
+
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/SubscriptionRequest.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/SubscriptionRequest.py
similarity index 100%
rename from pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/SubscriptionRequest.py
rename to pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/SubscriptionRequest.py
diff --git a/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/__init__.py b/pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/__init__.py
similarity index 100%
rename from pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/__init__.py
rename to pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/__init__.py
diff --git a/pythonPackages/pil/BUILDME b/pythonPackages/pil/BUILDME
deleted file mode 100644
index 91201b1d90..0000000000
--- a/pythonPackages/pil/BUILDME
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Id: BUILDME 1998 2004-09-10 01:31:07Z fredrik $
-# quick build (for lazy programmers).  for more information on the
-# build process, see the README file.
-
-python setup.py build_ext -i
-python selftest.py
diff --git a/pythonPackages/pil/CHANGES b/pythonPackages/pil/CHANGES
deleted file mode 100644
index 4dd67b0d3c..0000000000
--- a/pythonPackages/pil/CHANGES
+++ /dev/null
@@ -1,1547 +0,0 @@
-The Python Imaging Library
-$Id: CHANGES 2934 2006-12-03 12:14:00Z fredrik $
-
-ACKNOWLEDGEMENTS: PIL wouldn't be what it is without the help of,
-among others: David Ascher, Phil Austin, Douglas Bagnall, Larry Bates,
-Anthony Baxter, William Baxter, Denis Benoit, Jan Blom, Duncan Booth,
-Jeff Breidenbach, Roger Burnham, Gene Cash, Kevin Cazabon, Fred Clare,
-Greg Coats, Chris Cogdon, Greg Couch, Bill Crutchfield, Abel Deuring,
-Tim Docker, Fred Drake, Graham Dumpleton, Matthew Ellis, Eric
-Etheridge, Robin Friedrich, Pier Paolo Glave, Federico Di Gregorio,
-Markus Gritsch, Daniel Haertle, Greg Hamilton, Mark Hammond, Bernhard
-Herzog, Rob Hooft, Bob Ippolito, Jack Jansen, Bill Janssen, Edward
-Jones, Richard Jones, Håkan Karlsson, Robert Kern, David Kirtley, Bob
-Klimek, Matthias Klose, Andrew Kuchling, Magnus Källström, Victor
-Lacina, Ben Last, Hamish Lawson, Cesare Leonardi, Andrew MacIntyre,
-Jan Matejek, Naveen Michaud-Agrawal, Gordon McMillan, Skip Montanaro,
-Fredrik Nehr, Russell Nelson, Luciano Nocera, Travis Oliphant, Piet
-van Oostrum, Richard Oudkerk, Paul Pharr, Andres Polit, Eric Raymond,
-Victor Reijs, Bertil Reinhammar, Nicholas Riley, Don Rozenberg, Toby
-Sargeant, Barry Scott, Les Schaffer, Joel Shprentz, Klamer Shutte,
-Gene Skonicki, Niki Spahiev, D. Alan Stewart, Perry Stoll, Paul
-Svensson, Ulrik Svensson, Miki Tebeka, Ivan Tkatchev, Dan Torop, Adam
-Twardoch, Rune Uhlin, Dmitry Vasiliev, Sasha Voynow, Charles Waldman,
-Dan Wolfe, and Ka-Ping Yee.
-
-*** Changes from release 1.1.5 to 1.1.6 ***
-
-(1.1.6 released)
-
-+ Fixed some 64-bit compatibility warnings for Python 2.5.
-
-+ Added threading support for the Sane driver (from Abel Deuring).
-
-(1.1.6b2 released)
-
-+ Added experimental "floodfill" function to the ImageDraw module
-  (based on code by Eric Raymond).
-
-+ The default arguments for "frombuffer" doesn't match "fromstring"
-  and the documentation; this is a bug, and will most likely be fixed
-  in a future version.  In this release, PIL prints a warning message
-  instead.  To silence the warning, change any calls of the form
-  "frombuffer(mode, size, data)" to
-
-      frombuffer(mode, size, data, "raw", mode, 0, 1)
-
-+ Added "fromarray" function, which takes an object implementing the
-  NumPy array interface and creates a PIL Image from it. (from Travis
-  Oliphant).
-
-+ Added NumPy array interface support (__array_interface__) to the
-  Image class (based on code by Travis Oliphant).
-
-  This allows you to easily convert between PIL image memories and
-  NumPy arrays:
-
-	import numpy, Image
-
-	im = Image.open('lena.jpg')
-
-	a = numpy.asarray(im) # a is readonly
-
-	im = Image.fromarray(a)
-
-+ Fixed CMYK polarity for JPEG images, by treating all images as
-  "Adobe CMYK" images. (thanks to Cesare Leonardi and Kevin Cazabon
-  for samples, debugging, and patches).
-
-(1.1.6b1 released)
-
-+ Added 'expand' option to the Image 'rotate' method.  If true, the
-  output image is made large enough to hold the entire rotated image.
-
-+ Changed the ImageDraw 'line' method to always draw the last pixel in
-  a polyline, independent of line angle.
-
-+ Fixed bearing calculation and clipping in the ImageFont truetype
-  renderer; this could lead to clipped text, or crashes in the low-
-  level _imagingft module.  (based on input from Adam Twardoch and
-  others).
-
-+ Added ImageQt wrapper module, for converting PIL Image objects to
-  QImage objects in an efficient way.
-
-+ Fixed 'getmodebands' to return the number of bands also for "PA"
-  and "LA" modes.  Added 'getmodebandnames' helper that return the
-  band names.
-
-(1.1.6a2 released)
-
-+ Added float/double support to the TIFF loader (from Russell
-  Nelson).
-
-+ Fixed broken use of realloc() in path.c (from Jan Matejek)
-
-+ Added save support for Spider images (from William Baxter).
-
-+ Fixed broken 'paste' and 'resize' operations in pildriver
-  (from Bill Janssen).
-
-+ Added support for duplex scanning to the Sane interface (Abel
-  Deuring).
-
-(1.1.6a1 released)
-
-+ Fixed a memory leak in "convert(mode)", when converting from
-  L to P.
-
-+ Added pixel access object.  The "load" method now returns a
-  access object that can be used to directly get and set pixel
-  values, using ordinary [x, y] notation:
-
-	pixel = im.load()
-	v = pixel[x, y]	
-	pixel[x, y] = v	
-
-  If you're accessing more than a few pixels, this is a lot
-  faster than using getpixel/putpixel.
-
-+ Fixed building on Cygwin (from Miki Tebeka).
-
-+ Fixed "point(callable)" on unloaded images (reported by Håkan
-  Karlsson).
-
-+ Fixed size bug in ImageWin.ImageWindow constructor (from Victor
-  Reijs)
-
-+ Fixed ImageMath float() and int() operations for Python 2.4
-  (reported by Don Rozenberg).
-
-+ Fixed "RuntimeError: encoder error -8 in tostring" problem for
-  wide "RGB", "I", and "F" images.
-
-+ Fixed line width calculation.
-
-(1.1.6a0 released)
-
-+ Fixed byte order issue in Image.paste(ink) (from Ka-Ping Yee).
-
-+ Fixed off-by-0.5 errors in the ANTIALIAS code (based on input
-  from Douglas Bagnall).
-
-+ Added buffer interface support to the Path constructor.  If
-  a buffer is provided, it is assumed to contain a flat array
-  of float coordinates (e.g. array.array('f', seq)).
-
-+ Added new ImageMath module.
-
-+ Fixed ImageOps.equalize when used with a small number of distinct
-  values (reported by David Kirtley).
-
-+ Fixed potential integer division in PSDraw.image (from Eric Etheridge).
-
-*** Changes from release 1.1 to 1.1.5 ***
-
-(1.1.5c2 and 1.1.5 final released)
-
-+ Added experimental PERSPECTIVE transform method (from Jeff Breiden-
-  bach).
-
-(1.1.5c1 released)
-
-+ Make sure "thumbnail" never generates zero-wide or zero-high images
-  (reported by Gene Skonicki)
-
-+ Fixed a "getcolors" bug that could result in a zero count for some
-  colors (reported by Richard Oudkerk).
-
-+ Changed default "convert" palette to avoid "rounding errors" when
-  round-tripping white source pixels (reported by Henryk Gerlach and
-  Jeff Epler).
-
-(1.1.5b3 released)
-
-+ Don't crash in "quantize" method if the number of colors requested
-  is larger than 256.  This release raises a ValueError exception;
-  future versions may return a mode "RGB" image instead (reported
-  by Richard Oudkerk).
-
-+ Added WBMP read/write support (based on code by Duncan Booth).
-
-(1.1.5b2 released)
-
-+ Added DPI read/write support to the PNG codec.  The decoder sets
-  the info["dpi"] attribute for PNG files with appropriate resolution
-  settings.  The encoder uses the "dpi" option (based on code by Niki
-  Spahiev).
-
-+ Added limited support for "point" mappings from mode "I" to mode "L".
-  Only 16-bit values are supported (other values are clipped), the lookup
-  table must contain exactly 65536 entries, and the mode argument must be
-  set to "L".
-
-+ Added support for Mac OS X icns files (based on code by Bob Ippolito).
-
-+ Added "ModeFilter" support to the ImageFilter module.
-
-+ Added support for Spider images (from William Baxter).  See the
-  comments in PIL/SpiderImagePlugin.py for more information on this
-  format.
-
-(1.1.5b1 released)
-
-+ Added new Sane release (from Ralph Heinkel).  See the Sane/README
-  and Sane/CHANGES files for more information.
-
-+ Added experimental PngInfo chunk container to the PngImageFile
-  module.  This can be used to add arbitrary chunks to a PNG file.
-  Create a PngInfo instance, use "add" or "add_text" to add chunks,
-  and pass the instance as the "pnginfo" option when saving the
-  file.
-
-+ Added "getpalette" method.  This returns the palette as a list,
-  or None if the image has no palette.  To modify the palette, use
-  "getpalette" to fetch the current palette, modify the list, and
-  put it back using "putpalette".
-
-+ Added optional flattening to the ImagePath "tolist" method.
-  tolist() or tolist(0) returns a list of 2-tuples, as before.
-  tolist(1) returns a flattened list instead.
-
-(1.1.5a5 released)
-
-+ Fixed BILINEAR/BICUBIC/ANTIALIAS filtering for mode "LA".
-
-+ Added "getcolors()" method.  This is similar to the existing histo-
-  gram method, but looks at color values instead of individual layers,
-  and returns an unsorted list of (count, color) tuples.
-
-  By default, the method returns None if finds more than 256 colors.
-  If you need to look for more colors, you can pass in a limit (this
-  is used to allocate internal tables, so you probably don't want to
-  pass in too large values).
-
-+ Build improvements: Fixed building under AIX, improved detection of
-  FreeType2 and Mac OS X framework libraries, and more.  Many thanks
-  to everyone who helped test the new "setup.py" script!
-
-(1.1.5a4 released)
-
-+ The "save" method now looks for a file format driver before
-  creating the file.
-
-+ Don't use antialiased truetype fonts when drawing in mode "P", "I",
-  and "F" images.
-
-+ Rewrote the "setup.py" file.  The new version scans for available
-  support libraries, and configures both the libImaging core library
-  and the bindings in one step.
-
-  To use specific versions of the libraries, edit the ROOT variables
-  in the setup.py file.
-
-+ Removed threaded "show" viewer; use the old "show" implementation
-  instead (Windows).
-
-+ Added deprecation warnings to Image.offset, ImageDraw.setink, and
-  ImageDraw.setfill.
-
-+ Added width option to ImageDraw.line().  The current implementation
-  works best for straight lines; it does not support line joins, so
-  polylines won't look good.
-
-+ ImageDraw.Draw is now a factory function instead of a class.  If
-  you need to create custom draw classes, inherit from the ImageDraw
-  class.    All other code should use the factory function.
-
-+ Fixed loading of certain PCX files (problem reported by Greg
-  Hamilton, who also provided samples).
-
-+ Changed _imagingft.c to require FreeType 2.1 or newer.  The
-  module can still be built with earlier versions; see comments
-  in _imagingft.c for details.
-
-(1.1.5a3 released)
-
-+ Added 'getim' method, which returns a PyCObject wrapping an
-  Imaging pointer.  The description string is set to IMAGING_MAGIC.
-  See Imaging.h for pointer and string declarations.
-
-+ Fixed reading of TIFF JPEG images (problem reported by Ulrik
-  Svensson).
-
-+ Made ImageColor work under Python 1.5.2
-
-+ Fixed division by zero "equalize" on very small images (from
-  Douglas Bagnall).
-
-(1.1.5a2 released)
-
-+ The "paste" method now supports the alternative "paste(im, mask)"
-  syntax (in this case, the box defaults to im's bounding box).
-
-+ The "ImageFile.Parser" class now works also for PNG files with
-  more than one IDAT block.
-
-+ Added DPI read/write to the TIFF codec, and fixed writing of
-  rational values.  The decoder sets the info["dpi"] attribute
-  for TIFF files with appropriate resolution settings.  The
-  encoder uses the "dpi" option.
-
-+ Disable interlacing for small (or narrow) GIF images, to
-  work around what appears to be a hard-to-find bug in PIL's
-  GIF encoder.
-
-+ Fixed writing of mode "P" PDF images.  Made mode "1" PDF
-  images smaller.
-
-+ Made the XBM reader a bit more robust; the file may now start
-  with a few whitespace characters.
-
-+ Added support for enhanced metafiles to the WMF driver.  The
-  separate PILWMF kit lets you render both placeable WMF files
-  and EMF files as raster images.  See
-
-      http://effbot.org/downloads#pilwmf
-
-(1.1.5a1 released)
-
-+ Replaced broken WMF driver with a WMF stub plugin (see below).
-
-+ Fixed writing of mode "1", "L", and "CMYK" PDF images (based on
-  input from Nicholas Riley and others).
-
-+ Fixed adaptive palette conversion for zero-width or zero-height
-  images (from Chris Cogdon)
-
-+ Fixed reading of PNG images from QuickTime 6 (from Paul Pharr)
-
-+ Added support for StubImageFile plugins, including stub plugins
-  for BUFR, FITS, GRIB, and HDF5 files.  A stub plugin can identify
-  a given file format, but relies on application code to open and
-  save files in that format.
-
-+ Added optional "encoding" argument to the ImageFont.truetype
-  factory.  This argument can be used to specify non-Unicode character
-  maps for fonts that support that.  For example, to draw text using
-  the Microsoft Symbol font, use:
-
-      font = ImageFont.truetype("symbol.ttf", 16, encoding="symb")
-      draw.text((0, 0), unichr(0xF000 + 0xAA))
-
-  (note that the symbol font uses characters in the 0xF000-0xF0FF
-   range)
-
-  Common encodings are "unic" (Unicode), "symb" (Microsoft Symbol),
-  "ADOB" (Adobe Standard), "ADBE" (Adobe Expert), and "armn" (Apple
-  Roman).  See the FreeType documentation for more information.
-
-+ Made "putalpha" a bit more robust; you can now attach an alpha
-  layer to a plain "L" or "RGB" image, and you can also specify
-  constant alphas instead of alpha layers (using integers or colour
-  names).
-
-+ Added experimental "LA" mode support.
-
-  An "LA" image is an "L" image with an attached transparency layer.
-  Note that support for "LA" is not complete; some operations may
-  fail or produce unexpected results.
-
-+ Added "RankFilter", "MinFilter", "MedianFilter", and "MaxFilter"
-  classes to the ImageFilter module.
-
-+ Improved support for applications using multiple threads; PIL
-  now releases the global interpreter lock for many CPU-intensive
-  operations (based on work by Kevin Cazabon).
-
-+ Ignore Unicode characters in the PCF loader (from Andres Polit)
-
-+ Fixed typo in OleFileIO.loadfat, which could affect loading of
-  FlashPix and Image Composer images (Daniel Haertle)
-
-+ Fixed building on platforms that have Freetype but don't have
-  Tcl/Tk (Jack Jansen, Luciano Nocera, Piet van Oostrum and others)
-
-+ Added EXIF GPSInfo read support for JPEG files.  To extract
-  GPSInfo information, open the file, extract the exif dictionary,
-  and check for the key 0x8825 (GPSInfo).  If present, it contains
-  a dictionary mapping GPS keys to GPS values.  For a list of keys,
-  see the EXIF specification.
-
-  The "ExifTags" module contains a GPSTAGS dictionary mapping GPS
-  tags to tag names.
-
-+ Added DPI read support to the PCX and DCX codecs (info["dpi"]).
-
-+ The "show" methods now uses a built-in image viewer on Windows.
-  This viewer creates an instance of the ImageWindow class (see
-  below) and keeps it running in a separate thread.  NOTE: This
-  was disabled in 1.1.5a4.
-
-+ Added experimental "Window" and "ImageWindow" classes to the
-  ImageWin module.  These classes allow you to create a WCK-style
-  toplevel window, and use it to display raster data.
-
-+ Fixed some Python 1.5.2 issues (to build under 1.5.2, use the
-  Makefile.pre.in/Setup.in approach)
-
-+ Added support for the TIFF FillOrder tag.  PIL can read mode "1",
-  "L", "P" and "RGB" images with non-standard FillOrder (based on
-  input from Jeff Breidenbach).
-
-(1.1.4 final released)
-
-+ Fixed ImageTk build problem on Unix.
-
-(1.1.4b2 released)
-
-+ Improved building on Mac OS X (from Jack Jansen).
-
-+ Improved building on Windows with MinGW (from Klamer Shutte).
-
-+ If no font is specified, ImageDraw now uses the embedded default
-  font.  Use the "load" or "truetype" methods to load a real font.
-
-+ Added embedded default font to the ImageFont module (currently
-  an 8-pixel Courier font, taken from the X window distribution).
-
-(1.1.4b1 released)
-
-+ Added experimental EXIF support for JPEG files.  To extract EXIF
-  information from a JPEG file, open the file as usual, and call the
-  "_getexif" method.  If successful, this method returns a dictionary
-  mapping EXIF TIFF tags to values.  If the file does not contain EXIF
-  data, the "_getexif" method returns None.
-
-  The "ExifTags" module contains a dictionary mapping tags to tag
-  names.
-
-  This interface will most likely change in future versions.
-
-+ Fixed a bug when using the "transparency" option with the GIF
-  writer.
-
-+ Added limited support for "bitfield compression" in BMP files
-  and DIB buffers, for 15-bit, 16-bit, and 32-bit images.  This
-  also fixes a problem with ImageGrab module when copying screen-
-  dumps from the clipboard on 15/16/32-bit displays.
-
-+ Added experimental WAL (Quake 2 textures) loader.  To use this
-  loader, import WalImageFile and call the "open" method in that
-  module.
-
-(1.1.4a4 released)
-
-+ Added updated SANE driver (Andrew Kuchling, Abel Deuring)
-
-+ Use Python's "mmap" module on non-Windows platforms to read some
-  uncompressed formats using memory mapping.  Also added a "frombuffer"
-  function that allows you to access the contents of an existing string
-  or buffer object as if it were an image object.
-
-+ Fixed a memory leak that could appear when processing mode "P"
-  images (from Pier Paolo Glave)
-
-+ Ignore Unicode characters in the BDF loader (from Graham Dumpleton)
-
-(1.1.4a3 released; windows only)
-
-+ Added experimental RGBA-on-RGB drawing support.  To use RGBA
-  colours on an RGB image, pass "RGBA" as the second string to
-  the ImageDraw.Draw constructor.
-
-+ Added support for non-ASCII strings (Latin-1) and Unicode
-  to the truetype font renderer.
-
-+ The ImageWin "Dib" object can now be constructed directly from
-  an image object.
-
-+ The ImageWin module now allows you use window handles as well
-  as device contexts.  To use a window handle, wrap the handle in
-  an ImageWin.HWND object, and pass in this object instead of the
-  device context.
-
-(1.1.4a2 released)
-
-+ Improved support for 16-bit unsigned integer images (mode "I;16").
-  This includes TIFF reader support, and support for "getextrema"
-  and "point" (from Klamer Shutte).
-
-+ Made the BdfFontFile reader a bit more robust (from Kevin Cazabon
-  and Dmitry Vasiliev)
-
-+ Changed TIFF writer to always write Compression tag, even when
-  using the default compression (from Greg Couch).
-
-+ Added "show" support for Mac OS X (from Dan Wolfe).
-
-+ Added clipboard support to the "ImageGrab" module (Windows only).
-  The "grabclipboard" function returns an Image object, a list of
-  filenames (not in 1.1.4), or None if neither was found.
-
-(1.1.4a1 released)
-
-+ Improved support for drawing RGB data in palette images.  You can
-  now use RGB tuples or colour names (see below) when drawing in a
-  mode "P" image.  The drawing layer automatically assigns color
-  indexes, as long as you don't use more than 256 unique colours.
-
-+ Moved self test from MiniTest/test.py to ./selftest.py.
-
-+ Added support for CSS3-style color strings to most places that
-  accept colour codes/tuples.  This includes the "ImageDraw" module,
-  the Image "new" function, and the Image "paste" method.
-
-  Colour strings can use one of the following formats: "#f00",
-  "#ff0000", "rgb(255,0,0)", "rgb(100%,0%,0%)", "hsl(0, 100%, 50%)",
-  or "red" (most X11-style colour names are supported).  See the
-  documentation for the "ImageColor" module for more information.
-
-+ Fixed DCX decoder (based on input from Larry Bates)
-
-+ Added "IptcImagePlugin.getiptcinfo" helper to extract IPTC/NAA
-  newsphoto properties from JPEG, TIFF, or IPTC files.
-
-+ Support for TrueType/OpenType fonts has been added to
-  the standard distribution.  You need the freetype 2.0
-  library.
-
-+ Made the PCX reader a bit more robust when reading 2-bit
-  and 4-bit PCX images with odd image sizes.
-
-+ Added "Kernel" class to the ImageFilter module.  This class
-  allows you to filter images with user-defined 3x3 and 5x5
-  convolution kernels.
-
-+ Added "putdata" support for mode "I", "F" and "RGB".
-
-+ The GIF writer now supports the transparency option (from
-  Denis Benoit).
-
-+ A HTML version of the module documentation is now shipped
-  with the source code distribution.  You'll find the files in
-  the Doc subdirectory.
-
-+ Added support for Palm pixmaps (from Bill Janssen).  This
-  change was listed for 1.1.3, but the "PalmImagePlugin" driver
-  didn't make it into the distribution.
-
-+ Improved decoder error messages.
-
-(1.1.3 final released)
-
-+ Made setup.py look for old versions of zlib.  For some back-
-  ground, see: http://www.gzip.org/zlib/advisory-2002-03-11.txt
-
-(1.1.3c2 released)
-
-+ Added setup.py file (tested on Unix and Windows).  You still
-  need to build libImaging/imaging.lib in the traditional way,
-  but the setup.py script takes care of the rest.
-
-  The old Setup.in/Makefile.pre.in build method is still
-  supported.
-
-+ Fixed segmentation violation in ANTIALIAS filter (an internal
-  buffer wasn't properly allocated).
-
-(1.1.3c1 released)
-
-+ Added ANTIALIAS downsampling filter for high-quality "resize"
-  and "thumbnail" operations.  Also added filter option to the
-  "thumbnail" operation; the default value is NEAREST, but this
-  will most likely change in future versions.
-
-+ Fixed plugin loader to be more robust if the __file__
-  variable isn't set.
-
-+ Added seek/tell support (for layers) to the PhotoShop
-  loader.  Layer 0 is the main image.
-
-+ Added new (but experimental) "ImageOps" module, which provides
-  shortcuts for commonly used operations on entire images.
-
-+ Don't mess up when loading PNG images if the decoder leaves
-  data in the output buffer.  This could cause internal errors
-  on some PNG images, with some versions of ZLIB. (Bug report
-  and patch provided by Bernhard Herzog.)
-
-+ Don't mess up on Unicode filenames.
-
-+ Don't mess up when drawing on big endian platforms.
-
-+ Made the TIFF loader a bit more robust; it can now read some
-  more slightly broken TIFF files (based on input from Ted Wright,
-  Bob Klimek, and D. Alan Stewart)
-
-+ Added OS/2 EMX build files (from Andrew MacIntyre)
-
-+ Change "ImageFont" to reject image files if they don't have the
-  right mode.  Older versions could leak memory for "P" images.
-  (Bug reported by Markus Gritsch).
-  
-+ Renamed some internal functions to avoid potential build
-  problem on Mac OS X.
-
-+ Added DL_EXPORT where relevant (for Cygwin, based on input
-  from Robert Yodlowski)
-
-+ (re)moved bogus __init__ call in BdfFontFile (bug spotted
-  by Fred Clare)
-
-+ Added "ImageGrab" support (Windows only)
-
-+ Added support for XBM hotspots (based on code contributed by
-  Bernhard Herzog).
-
-+ Added write support for more TIFF tags, namely the Artist,
-  Copyright, DateTime, ResolutionUnit, Software, XResolution and
-  YResolution tags (from Greg Couch)
-
-+ Added TransposedFont wrapper to ImageFont module
-
-+ Added "optimize" flag to GIF encoder.  If optimize is present
-  and non-zero, PIL will work harder to create a small file.
-
-+ Raise "EOFError" (not IndexError) when reading beyond the
-  end of a TIFF sequence.
-
-+ Support rewind ("seek(0)") for GIF and TIFF sequences.
-
-+ Load grayscale GIF images as mode "L"
-
-+ Added DPI read/write support to the JPEG codec.  The decoder
-  sets the info["dpi"] attribute for JPEG files with JFIF dpi
-  settings.  The encoder uses the "dpi" option:
-
-      im = Image.open("file.jpg")
-      dpi = im.info["dpi"] # raises KeyError if DPI not known
-      im.save("out.jpg", dpi=dpi)
-
-  Note that PIL doesn't always preserve the "info" attribute
-  for normal image operations.
-
-(1.1.2c1 and 1.1.2 final released)
-
-+ Adapted to Python 2.1.  Among other things, all uses of the
-  "regex" module has been repleased with "re".
-
-+ Fixed attribute error when reading large PNG files (this bug
-  was introduced in maintenance code released after the 1.1.1
-  release)
-
-+ Ignore non-string objects in sys.path
-
-+ Fixed Image.transform(EXTENT) for negative xoffsets
-
-+ Fixed loading of image plugins if PIL is installed as a package.
-  (The plugin loader now always looks in the directory where the
-  Image.py module itself is found, even if that directory isn't on
-  the standard search path)
-
-+ The Png plugin has been added to the list of preloaded standard
-  formats
-
-+ Fixed bitmap/text drawing in fill mode.
-
-+ Fixed "getextrema" to work also for multiband images.
-
-+ Added transparency support for L and P images to the PNG codec.
-
-+ Improved support for read-only images.  The "load" method now
-  sets the "readonly" attribute for memory-mapped images.  Operations
-  that modifies an image in place (such as "paste" and drawing operations)
-  creates an in-memory copy of the image, if necessary.  (before this
-  change, any attempt to modify a memory-mapped image resulted in a
-  core dump...)
-
-+ Added special cases for lists everywhere PIL expects a sequence.
-  This should speed up things like "putdata" and drawing operations.
-
-+ The Image.offset method is deprecated.  Use the ImageChops.offset
-  function instead. 
-
-+ Changed ImageChops operators to copy palette and info dictionary
-  from the first image argument.
-
-(1.1.1 released)
-
-+ Additional fixes for Python 1.6/2.0, including TIFF "save" bug. 
-
-+ Changed "init" to properly load plugins when PIL is used as a
-  package.
-
-+ Fixed broken "show" method (on Unix)
-
-*** Changes from release 1.0 to 1.1 ***
-
-+ Adapted to Python 1.6 ("append" and other method changes)
-
-+ Fixed Image.paste when pasting with solid colour and matte
-  layers ("L" or "RGBA" masks) (bug reported by Robert Kern)
-
-+ To make it easier to distribute prebuilt versions of PIL,
-  the tkinit binding stuff has been moved to a separate
-  extension module, named "_imagingtk".
-
-*** Changes from release 0.3b2 to 1.0 final ***
-
-+ If there's no 16-bit integer (like on a Cray T3E), set
-  INT16 to the smallest integer available.  Most of the
-  library works just fine anyway (from Bill Crutchfield)
-
-+ Tweaks to make drawing work on big-endian platforms.
-
-(1.0c2 released)
-
-+ If PIL is built with the WITH_TKINTER flag, ImageTk can
-  automatically hook into a standard Tkinter build.  You
-  no longer need to build your own Tkinter to use the
-  ImageTk module.
-
-  The old way still works, though.  For more information,
-  see Tk/install.txt.
-
-+ Some tweaks to ImageTk to support multiple Tk interpreters
-  (from Greg Couch).
-
-+ ImageFont "load_path" now scans directory mentioned in .pth
-  files (from Richard Jones).
-
-(1.0c1 released)
-
-+ The TIFF plugin has been rewritten.  The new plugin fully
-  supports all major PIL image modes (including F and I).
-
-+ The ImageFile module now includes a Parser class, which can
-  be used to incrementally decode an image file (while down-
-  loading it from the net, for example).  See the handbook for
-  details.
-
-+ "show" now converts non-standard modes to "L" or "RGB" (as
-  appropriate), rather than writing weird things to disk for
-  "xv" to choke upon. (bug reported by Les Schaffer).
-
-(1.0b2 released)
-
-+ Major speedups for rotate, transform(EXTENT), and transform(AFFINE)
-  when using nearest neighbour resampling.
-
-+ Modified ImageDraw to be compatible with the Arrow graphics
-  interface.  See the handbook for details.
-
-+ PIL now automatically loads file codecs when used as a package
-  (from The Dragon De Monsyne).  Also included an __init__.py file
-  in the standard distribution.
-
-+ The GIF encoder has been modified to produce much smaller files.
-
-  PIL now uses a run-length encoding method to encode GIF files.
-  On a random selection of GIF images grabbed from the web, this
-  version makes the images about twice as large as the original
-  LZW files, where the earlier version made them over 5 times
-  larger.  YMMV, of course.
-
-+ Added PCX write support (works with "1", "P", "L", and "RGB")
-
-+ Added "bitmap" and "textsize" methods to ImageDraw.
-
-+ Improved font rendering code.  Fixed a bug or two, and moved
-  most of the time critical stuff to C.
-
-+ Removed "bdf2pil.py".  Use "pilfont.py" instead!
-
-+ Improved 16-bit support (still experimental, though).
-
-  The following methods now support "I;16" and "I;16B" images:
-  "getpixel", "copy", "convert" (to and from mode "I"), "resize",
-  "rotate", and "transform" with nearest neighbour filters, and
-  "save" using the IM format.  The "new" and "open" functions
-  also work as expected.  On Windows, 16-bit files are memory
-  mapped.
-
-  NOTE: ALL other operations are still UNDEFINED on 16-bit images.
-
-+ The "paste" method now supports constant sources.
-
-  Just pass a colour value (a number or a tuple, depending on
-  the target image mode) instead of the source image.
-
-  This was in fact implemented in an inefficient way in
-  earlier versions (the "paste" method generated a temporary
-  source image if you passed it a colour instead of an image).
-  In this version, this is handled on the C level instead.
-
-+ Added experimental "RGBa" mode support.
-
-  An "RGBa" image is an RGBA image where the colour components
-  have have been premultipled with the alpha value.  PIL allows
-  you to convert an RGBA image to an RGBa image, and to paste
-  RGBa images on top of RGB images.  Since this saves a bunch
-  of multiplications and shifts, it is typically about twice
-  as fast an ordinary RGBA paste.
-
-+ Eliminated extra conversion step when pasting "RGBA" or "RGBa"
-  images on top of "RGB" images.
-
-+ Fixed Image.BICUBIC resampling for "RGB" images.
-
-+ Fixed PCX image file handler to properly read 8-bit PCX
-  files (bug introduced in 1.0b1, reported by Bernhard
-  Herzog)
-
-+ Fixed PSDraw "image" method to restore the coordinate
-  system.
-
-+ Fixed "blend" problem when applied to images that was
-  not already loaded (reported by Edward C. Jones)
-
-+ Fixed -f option to "pilconvert.py" (from Anthony Baxter)
-
-(1.0b1 released)
-
-+ Added Toby J. Sargeant's quantization package.  To enable
-  quantization, use the "palette" option to "convert":
-
-	imOut = im.convert("P", palette=Image.ADAPTIVE)
-
-  This can be used with "L", "P", and "RGB" images.  In this
-  version, dithering cannot be used with adaptive palettes.
-
-  Note: ADAPTIVE currently maps to median cut quantization
-  with 256 colours.  The quantization package also contains
-  a maximum coverage quantizer, which will be supported by
-  future versions of PIL.
-
-+ Added Eric S. Raymond's "pildriver" image calculator to the
-  distribution.  See the docstring for more information.
-
-+ The "offset" method no longer dumps core if given positive
-  offsets (from Charles Waldman).
-
-+ Fixed a resource leak that could cause ImageWin to run out of
-  GDI resources (from Roger Burnham).
-
-+ Added "arc", "chord", and "pieslice" methods to ImageDraw (inspired
-  by code contributed by Richard Jones).
-
-+ Added experimental 16-bit support, via modes "I;16" (little endian
-  data) and "I;16B" (big endian).  Only a few methods properly support
-  such images (see above).
-
-+ Added XV thumbnail file handler (from Gene Cash).
-
-+ Fixed BMP image file handler to handle palette images with small
-  palettes (from Rob Hooft).
-
-+ Fixed Sun raster file handler for palette images (from Charles
-  Waldman).
-
-+ Improved various internal error messages.
-
-+ Fixed Path constructor to handle arbitrary sequence objects.  This
-  also affects the ImageDraw class (from Richard Jones).
-
-+ Fixed a bug in JpegDecode that caused PIL to report "decoder error
-  -2" for some progressive JPEG files (reported by Magnus Källström,
-  who also provided samples).
-
-+ Fixed a bug in JpegImagePlugin that caused PIL to hang when loading
-  JPEG files using 16-bit quantization tables.
-
-+ The Image "transform" method now supports Image.QUAD transforms.
-  The data argument is an 8-tuple giving the upper left, lower
-  left, lower right, and upper right corner of the source quadri-
-  lateral.  Also added Image.MESH transform which takes a list
-  of quadrilaterals.
-
-+ The Image "resize", "rotate", and "transform" methods now support
-  Image.BILINEAR (2x2) and Image.BICUBIC (4x4) resampling filters.
-  Filters can be used with all transform methods.
-
-+ The ImageDraw "rectangle" method now includes both the right
-  and the bottom edges when drawing filled rectangles.
-
-+ The TGA decoder now works properly for runlength encoded images 
-  which have more than one byte per pixel.
-
-+ "getbands" on an YCbCr image now returns ("Y", "Cb", "Cr")
-
-+ Some file drivers didn't handle the optional "modify" argument
-  to the load method.  This resulted in exceptions when you used
-  "paste" (and other methods that modify an image in place) on a
-  newly opened file.
-
-*** Changes from release 0.2 (b5) to 0.3 (b2) ***
-
-(0.3b2 released)
-
-The test suite includes 825 individual tests.
-
-+ An Image "getbands" method has been added.  It returns a tuple
-  containing the individual band names for this image.  To figure
-  out how many bands an image has, use "len(im.getbands())".
-
-+ An Image "putpixel" method has been added.
-
-+ The Image "point" method can now be used to convert "L" images
-  to any other format, via a lookup table.  That table should
-  contain 256 values for each band in the output image.
-
-+ Some file drivers (including FLI/FLC, GIF, and IM) accidently
-  overwrote the offset method with an internal attribute.  All
-  drivers have been updated to use private attributes where
-  possible.
-
-+ The Image "histogram" method now works for "I" and "F" images.
-  For these modes, PIL divides the range between the min and
-  max values used in the image into 256 bins.  You can also
-  pass in your own min and max values via the "extrema" option:
-
-	h = im.histogram(extrema=(0, 255))
-
-+ An Image "getextrema" method has been added.  It returns the
-  min and max values used in the image. In this release, this
-  works for single band images only.
-
-+ Changed the PNG driver to load and save mode "I" images as
-  16-bit images.  When saving, values outside the range 0..65535
-  are clipped.
-
-+ Fixed ImageFont.py to work with the new "pilfont" compiler.
-
-+ Added JPEG "save" and "draft" support for mode "YCbCr" images.
-  Note that if you save an "YCbCr" image as a JPEG file and read
-  it back, it is read as an RGB file.  To get around this, you
-  can use the "draft" method:
-
-	im = Image.open("color.jpg")
-	im.draft("YCbCr", im.size)
-
-+ Read "RGBA" TGA images.  Also fixed the orientation bug; all
-  images should now come out the right way.
-
-+ Changed mode name (and internal representation) from "YCrCb"
-  to "YCbCr" (!)
-  *** WARNING: MAY BREAK EXISTING CODE ***
-
-(0.3b1 released)
-
-The test suite includes 750 individual tests.
-
-+ The "pilfont" package is now included in the standard PIL
-  distribution.  The pilfont utility can be used to convert
-  X BDF and PCF raster font files to a format understood by
-  the ImageFont module.
-
-+ GIF files are now interlaced by default.  To write a
-  non-interlaced file, pass interlace=0 to the "save"
-  method.
-
-+ The default string format has changed for the "fromstring"
-  and "tostring" methods.
-  *** WARNING: MAY BREAK EXISTING CODE ***
-
-  NOTE: If no extra arguments are given, the first line in
-  the string buffer is the top line of the image, instead of
-  the bottom line.  For RGB images, the string now contains
-  3 bytes per pixel instead of 4.  These changes were made
-  to make the methods compatible with the "fromstring"
-  factory function.
-
-  To get the old behaviour, use the following syntax:
-
-	data = im.tostring("raw", "RGBX", 0, -1)
-	im.fromstring(data, "raw", "RGBX", 0, -1)
-
-+ "new" no longer gives a MemoryError if the width or height
-  is zero (this only happened on platforms where malloc(0)
-  or calloc(0) returns NULL).
-
-+ "new" now adds a default palette object to "P" images.
-
-+ You can now convert directly between all modes supported by
-  PIL.  When converting colour images to "P", PIL defaults to
-  a "web" palette and dithering.  When converting greyscale
-  images to "1", PIL uses a thresholding and dithering.
-
-+ Added a "dither" option to "convert".  By default, "convert"
-  uses floyd-steinberg error diffusion for "P" and "1" targets,
-  so this option is only used to *disable* dithering. Allowed
-  values are NONE (no dithering) or FLOYDSTEINBERG (default).
-
-	imOut = im.convert("P", dither=Image.NONE)
-
-+ Added a full set of "I" decoders.  You can use "fromstring"
-  (and file decoders) to read any standard integer type as an
-  "I" image.
-
-+ Added some support for "YCbCr" images (creation, conversion
-  from/to "L" and "RGB", IM YCC load/save)
-
-+ "getpixel" now works properly with fractional coordinates.
-
-+ ImageDraw "setink" now works with "I", "F", "RGB", "RGBA",
-  "RGBX", "CMYK", and "YCbCr" images.
-
-+ ImImagePlugin no longer attaches palettes to "RGB" images.
-
-+ Various minor fixes.
-
-(0.3a4 released)
-
-+ Added experimental IPTC/NAA support.
-
-+ Eliminated AttributeError exceptions after "crop" (from
-  Skip Montanaro)
-
-+ Reads some uncompressed formats via memory mapping (this
-  is currently supported on Win32 only)
-
-+ Fixed some last minute glitches in the last alpha release
-  (Types instead of types in Image.py, version numbers, etc.)
-
-+ Eliminated some more bogus compiler warnings.
-
-+ Various fixes to make PIL compile and run smoother on Macs
-  (from Jack Jansen).
-
-+ Fixed "fromstring" and "tostring" for mode "I" images.
-
-(0.3a3 released)
-
-The test suite includes 530 individual tests.
-
-+ Eliminated unexpected side-effect in "paste" with matte.  "paste"
-  now works properly also if compiled with "gcc".
-
-+ Adapted to Python 1.5 (build issues only)
-
-+ Fixed the ImageDraw "point" method to draw also the last
-  point (!).
-
-+ Added "I" and "RGBX" support to Image.new.
-
-+ The plugin path is now properly prepended to the module search
-  path when a plugin module is imported.
-
-+ Added "draw" method to the ImageWin.Dib class.  This is used by
-  Topaz to print images on Windows printers.
-
-+ "convert" now supports conversions from "P" to "1" and "F".
-
-+ "paste" can now take a colour instead of an image as the first argument.
-  The colour must match the colour argument given to the new function, and
-  match the mode of the target image.
-
-+ Fixed "paste" to allow a mask also for mode "F" images.
-
-+ The BMP driver now saves mode "1" images.  When loading images, the mode
-  is set to "L" for 8-bit files with greyscale palettes, and to "P" for
-  other 8-bit files.
-
-+ The IM driver now reads and saves "1" images (file modes "0 1" or "L 1").
-
-+ The JPEG and GIF drivers now saves "1" images.  For JPEG, the image
-  is saved as 8-bit greyscale (it will load as mode "L").  For GIF, the
-  image will be loaded as a "P" image.
-
-+ Fixed a potential buffer overrun in the GIF encoder.
-
-(0.3a2 released)
-
-The test suite includes 400 individual tests.
-
-+ Improvements to the test suite revealed a number of minor bugs, which
-  are all fixed.  Note that crop/paste, 32-bit ImageDraw, and ImageFont
-  are still weak spots in this release.
-
-+ Added "putpalette" method to the Image class.  You can use this
-  to add or modify the palette for "P" and "L" images.  If a palette
-  is added to an "L" image, it is automatically converted to a "P"
-  image.
-
-+ Fixed ImageDraw to properly handle 32-bit image memories
-  ("RGB", "RGBA", "CMYK", "F")
-
-+ Fixed "fromstring" and "tostring" not to mess up the mode attribute
-  in default mode.
-
-+ Changed ImPlatform.h to work on CRAY's (don't have one at home, so I
-  haven't tried it).  The previous version assumed that either "short"
-  or "int" were 16-bit wide. PIL still won't compile on platforms where
-  neither "short", "int" nor "long" are 32-bit wide.
-
-+ Added file= and data= keyword arguments to PhotoImage and BitmapImage.
-  This allows you to use them as drop-in replacements for the corre-
-  sponding Tkinter classes.
-
-+ Removed bogus references to the crack coder (ImagingCrack).
-
-(0.3a1 released)
-
-+ Make sure image is loaded in "tostring".
-
-+ Added floating point packer (native 32-bit floats only).
-
-*** Changes from release 0.1b1 to 0.2 (b5) ***
-
-+ Modified "fromstring" and "tostring" methods to use file codecs.
-  Also added "fromstring" factory method to create an image directly
-  from data in a string.
-
-+ Added support for 32-bit floating point images (mode "F").  You
-  can convert between "L" and "F" images, and apply a subset of the
-  available image processing methods on the "F" image.  You can also
-  read virtually any data format into a floating point image memory;
-  see the section on "Decoding Floating Point Data" in the handbook
-  for more information.
-
-(0.2b5 released; on windows only)
-
-+ Fixed the tobitmap() method to work properly for small bitmaps.
-
-+ Added RMS and standard deviation to the ImageStat.Stat class.  Also
-  modified the constructor to take an optional feature mask, and also
-  to accept either an image or a list containing the histogram data.
-
-+ The BitmapImage code in ImageTk can now use a special bitmap
-  decoder, which has to be patched into Tk.  See the "Tk/pilbitmap.txt"
-  file for details.  If not installed, bitmaps are transferred to Tk as
-  XBM strings.
-
-+ The PhotoImage code in ImageTk now uses a Tcl command ("PyImagingPaste")
-  instead of a special image type.  This gives somewhat better performance,
-  and also allows PIL to support transparency.
-  *** WARNING: TKAPPINIT MUST BE MODIFIED ***
-
-+ ImageTk now honours the alpha layer in RGBA images.  Only fully
-  transparent pixels are made transparent (that is, the alpha layer
-  is treated as a mask).  To treat the alpha laters as a matte, you
-  must paste the image on the background before handing it over to
-  ImageTk.
-
-+ Added McIdas reader (supports 8-bit images only).
-
-+ PIL now preloads drivers for BMP, GIF, JPEG, PPM, and TIFF.  As
-  long as you only load and save these formats, you don't have to
-  wait for a full scan for drivers.  To force scanning, call the
-  Image.init() function.
-
-+ The "seek" and "tell" methods are now always available, also for
-  single-frame images.
-
-+ Added optional mask argument to histogram method.  The mask may
-  be an "1" or "L" image with the same size as the original image.
-  Only pixels where the mask is non-zero are included in the
-  histogram.
-
-+ The "paste" method now allows you to specify only the lower left
-  corner (a 2-tuple), instead of the full region (a 4-tuple).
-
-+ Reverted to old plugin scanning model; now scans all directory
-  names in the path when looking for plugins.
-
-+ Added PIXAR raster support.  Only uncompressed ("dumped") RGB
-  images can currently be read (based on information provided
-  by Greg Coats).
-
-+ Added FlashPix (FPX) read support.  Reads all pixel formats, but
-  only the highest resolution is read, and the viewing transform is
-  currently ignored.
-
-+ Made PNG encoding somewhat more efficient in "optimize" mode; a
-  bug in 0.2b4 didn't enable all predictor filters when optimized
-  storage were requested.
-
-+ Added Microsoft Image Composer (MIC) read support.  When opened,
-  the first sprite in the file is loaded.  You can use the seek method
-  to load additional sprites from the file.
-
-+ Properly reads "P" and "CMYK" PSD images.
-
-+ "pilconvert" no longer optimizes by default; use the -o option to
-  make the file as small as possible (at the expense of speed); use
-  the -q option to set the quality when compressing to JPEG.
-
-+ Fixed "crop" not to drop the palette for "P" images.
-
-+ Added and verified FLC support.
-
-+ Paste with "L" or "RGBA" alpha is now several times faster on most
-  platforms.
-
-+ Changed Image.new() to initialize the image to black, as described
-  in the handbook.  To get an uninitialized image, use None as the
-  colour.
-
-+ Fixed the PDF encoder to produce a valid header; Acrobat no longer
-  complains when you load PDF images created by PIL.
-
-+ PIL only scans fully-qualified directory names in the path when
-  looking for plugins.
-  *** WARNING: MAY BREAK EXISTING CODE ***
-
-+ Faster implementation of "save" used when filename is given,
-  or when file object has "fileno" and "flush" methods.
-
-+ Don't crash in "crop" if region extends outside the source image.
-
-+ Eliminated a massive memory leak in the "save" function.
-
-+ The GIF decoder doesn't crash if the code size is set to an illegal
-  value.  This could happen since another bug didn't handle local
-  palettes properly if they didn't have the same size as the
-  global palette (not very common).
-
-+ Added predictor support (TIFF 6.0 section 14) to the TIFF decoder.
-
-+ Fixed palette and padding problems in BMP driver.  Now properly
-  writes "1", "L", "P" and "RGB" images.
-
-+ Fixed getpixel()/getdata() to return correct pixel values.
-
-+ Added PSD (PhotoShop) read support.  Reads both uncompressed
-  and compressed images of most types.
-
-+ Added GIF write support (writes "uncompressed" GIF files only,
-  due to unresolvable licensing issues).  The "gifmaker.py" script
-  can be used to create GIF animations.
-
-+ Reads 8-bit "L" and "P" TGA images.  Also reads 16-bit "RGB"
-  images.
-
-+ Added FLI read support.  This driver has only been tested
-  on a few FLI samples.
-
-+ Reads 2-bit and 4-bit PCX images.
-
-+ Added MSP read and write support.  Both version 1 and 2 can be
-  read, but only version 1 (uncompressed) files are written.
-
-+ Fixed a bug in the FLI/FLC identification code that caused the
-  driver to raise an exception when parsing valid FLI/FLC files.
-
-+ Improved performance when loading file format plugins, and when
-  opening files.
-
-+ Added GIF animation support, via the "seek" and "tell" methods.
-  You can use "player.py" to play an animated GIF file.
-
-+ Removed MNG support, since the spec is changing faster than I
-  can change the code.  I've added support for the experimental
-  ARG format instead.  Contact me for more information on this
-  format.
-
-+ Added keyword options to the "save" method.  The following options
-  are currently supported:
-
-      format	option		description
-      --------------------------------------------------------
-      JPEG	optimize	minimize output file at the
-				expense of compression speed.
-
-      JPEG	progressive	enable progressive output. the
-				option value is ignored.
-
-      JPEG	quality		set compression quality (1-100).
-				the default value is 75.
-
-      JPEG	smooth		smooth dithered images.  value
-				is strengh (1-100).  default is
-				off (0).
-
-      PNG	optimize	minimize output file at the
-				expense of compression speed.
-
-  Expect more options in future releases.  Also note that
-  file writers silently ignore unknown options.
-
-+ Plugged memory leaks in the PNG and TIFF decoders.
-
-+ Added PNG write support.
-
-+ (internal) RGB unpackers and converters now set the pad byte
-  to 255 (full opacity).
-
-+ Properly handles the "transparency" property for GIF, PNG
-  and XPM files.
-
-+ Added a "putalpha" method, allowing you to attach a "1" or "L"
-  image as the alpha layer to an "RGBA" image.
-
-+ Various improvements to the sample scripts:
-
-  "pilconvert"  Carries out some extra tricks in order to make
-		the resulting file as small as possible.
-
-  "explode"	(NEW) Split an image sequence into individual frames.
-
-  "gifmaker"	(NEW) Convert a sequence file into a GIF animation.
-		Note that the GIF encoder create "uncompressed" GIF
-		files, so animations created by this script are
-		rather large (typically 2-5 times the compressed
-		sizes).
-
-  "image2py"	(NEW) Convert a single image to a python module.  See
-		comments in this script for details.
-
-  "player"	If multiple images are given on the command line,
-		they are interpreted as frames in a sequence.  The
-		script assumes that they all have the same size.
-		Also note that this script now can play FLI/FLC
-		and GIF animations.
-
-		This player can also execute embedded Python
-		animation applets (ARG format only).
-
-  "viewer"	Transparent images ("P" with transparency property,
-		and "RGBA") are superimposed on the standard Tk back-
-		ground.
-
-+ Fixed colour argument to "new".  For multilayer images, pass a
-  tuple: (Red, Green, Blue), (Red, Green, Blue, Alpha), or (Cyan,
-  Magenta, Yellow, Black).
-
-+ Added XPM (X pixmap) read support.
-
-(0.2b3 released)
-
-+ Added MNG (multi-image network graphics) read support.  "Ming"
-  is a proposed animation standard, based on the PNG file format.
-
-  You can use the "player" sample script to display some flavours
-  of this format.  The MNG standard is still under development, 
-  as is this driver.  More information, including sample files,
-  can be found at <ftp://swrinde.nde.swri.edu/pub/mng>
-
-+ Added a "verify" method to images loaded from file.  This method
-  scans the file for errors, without actually decoding the image
-  data, and raises a suitable exception if it finds any problems.
-  Currently implemented for PNG and MNG files only.
-
-+ Added support for interlaced GIF images.
-
-+ Added PNG read support -- if linked with the ZLIB compression library,
-  PIL reads all kinds of PNG images, except interlaced files.
-
-+ Improved PNG identification support -- doesn't mess up on unknown
-  chunks, identifies all possible PNG modes, and verifies checksum
-  on PNG header chunks.
-
-+ Added an experimental reader for placable Windows Meta Files (WMF).
-  This reader is still very incomplete, but it illustrates how PIL's
-  drawing capabilities can be used to render vector and metafile
-  formats.
-
-+ Added restricted drivers for images from Image Tools (greyscale
-  only) and LabEye/IFUNC (common interchange modes only).
-
-+ Some minor improvements to the sample scripts provided in the
-  "Scripts" directory.
-
-+ The test images have been moved to the "Images" directory.
-
-(0.2b2 released)
-(0.2b1 released; Windows only)
-
-+ Fixed filling of complex polygons.  The ImageDraw "line" and
-  "polygon" methods also accept Path objects.
-
-+ The ImageTk "PhotoImage" object can now be constructed directly
-  from an image.  You can also pass the object itself to Tkinter,
-  instead of using the "image" attribute.  Finally, using "paste"
-  on a displayed image automatically updates the display.
-
-+ The ImageTk "BitmapImage" object allows you to create transparent
-  overlays from 1-bit images.  You can pass the object itself to
-  Tkinter.  The constructor takes the same arguments as the Tkinter
-  BitmapImage class; use the "foreground" option to set the colour
-  of the overlay.
-
-+ Added a "putdata" method to the Image class.  This can be used to
-  load a 1-layer image with data from a sequence object or a string.
-  An optional floating point scale and offset can be used to adjust
-  the data to fit into the 8-bit pixel range.  Also see the "getdata"
-  method.
-
-+ Added the EXTENT method to the Image "transform" method.  This can
-  be used to quickly crop, stretch, shrink, or mirror a subregion
-  from another image.
-
-+ Adapted to Python 1.4.
-
-+ Added a project makefile for Visual C++ 4.x.  This allows you to
-  easily build a dynamically linked version of PIL for Windows 95
-  and NT.
-
-+ A Tk "booster" patch for Windows is available.  It gives dramatic
-  performance improvements for some displays.  Has been tested with
-  Tk 4.2 only, but is likely to work with Tk 4.1 as well.  See the Tk
-  subdirectory for details.
-
-+ You can now save 1-bit images in the XBM format.  In addition, the
-  Image class now provides a "tobitmap" method which returns a string
-  containing an XBM representation of the image.  Quite handy to use
-  with Tk.
-
-+ More conversions, including "RGB" to "1" and more.
-
-(0.2a1 released)
-
-+ Where earlier versions accepted lists, this version accepts arbitrary
-  Python sequences (including strings, in some cases).  A few resource
-  leaks were plugged in the process.
-
-+ The Image "paste" method now allows the box to extend outside
-  the target image.  The size of the box, the image to be pasted,
-  and the optional mask must still match.
-
-+ The ImageDraw module now supports filled polygons, outlined and
-  filled ellipses, and text.  Font support is rudimentary, though.
-
-+ The Image "point" method now takes an optional mode argument,
-  allowing you to convert the image while translating it.  Currently,
-  this can only be used to convert "L" or "P" images to "1" images
-  (creating thresholded images or "matte" masks).
-
-+ An Image "getpixel" method has been added.  For single band images,
-  it returns the pixel value at a given position as an integer.
-  For n-band images, it returns an n-tuple of integers.
-
-+ An Image "getdata" method has been added.  It returns a sequence
-  object representing the image as a 1-dimensional array.  Only len()
-  and [] can be used with this sequence.  This method returns a
-  reference to the existing image data, so changes in the image
-  will be immediately reflected in the sequence object.
-
-+ Fixed alignment problems in the Windows BMP writer.
-
-+ If converting an "RGB" image to "RGB" or "L", you can give a second
-  argument containing a colour conversion matrix.
-
-+ An Image "getbbox" method has been added.  It returns the bounding
-  box of data in an image, considering the value 0 as background.
-
-+ An Image "offset" method has been added.  It returns a new image
-  where the contents of the image have been offset the given distance
-  in X and/or Y direction.  Data wraps between edges.
-
-+ Saves PDF images.  The driver creates a binary PDF 1.1 files, using
-  JPEG compression for "L", "RGB", and "CMYK" images, and hex encoding
-  (same as for PostScript) for other formats.
-
-+ The "paste" method now accepts "1" masks.  Zero means transparent,
-  any other pixel value means opaque.  This is faster than using an
-  "L" transparency mask.
-
-+ Properly writes EPS files (and properly prints images to postscript
-  printers as well).
-
-+ Reads 4-bit BMP files, as well as 4 and 8-bit Windows ICO and CUR
-  files.  Cursor animations are not supported.
-
-+ Fixed alignment problems in the Sun raster loader.
-
-+ Added "draft" and "thumbnail" methods.  The draft method is used
-  to optimize loading of JPEG and PCD files, the thumbnail method is
-  used to create a thumbnail representation of an image.
-
-+ Added Windows display support, via the ImageWin class (see the
-  handbook for details).
-
-+ Added raster conversion for EPS files.  This requires GNU or Aladdin
-  Ghostscript, and probably works on UNIX only.
-
-+ Reads PhotoCD (PCD) images.  The base resolution (768x512) can be
-  read from a PhotoCD file.
-
-+ Eliminated some compiler warnings.  Bindings now compile cleanly in C++
-  mode.  Note that the Imaging library itself must be compiled in C mode.
-
-+ Added "bdf2pil.py", which converts BDF fonts into images with associated
-  metrics.  This is definitely work in progress.  For info, see description
-  in script for details.
-
-+ Fixed a bug in the "ImageEnhance.py" module.
-
-+ Fixed a bug in the netpbm save hack in "GifImagePlugin.py"
-
-+ Fixed 90 and 270 degree rotation of rectangular images.
-
-+ Properly reads 8-bit TIFF palette-color images.
-
-+ Reads plane separated RGB and CMYK TIFF images.
-
-+ Added driver debug mode.  This is enabled by setting Image.DEBUG
-  to a non-zero value.  Try the -D option to "pilfile.py" and see what
-  happens.
-
-+ Don't crash on "atend" constructs in PostScript files.
-
-+ Only the Image module imports _imaging directly.  Other modules
-  should refer to the binding module as "Image.core".
-
-*** Changes from release 0.0 to 0.1 (b1) ***
-
-+ A handbook is available (distributed separately).
-
-+ The coordinate system is changed so that (0,0) is now located
-  in the upper left corner.  This is in compliancy with ISO 12087
-  and 90% of all other image processing and graphics libraries.
-
-+ Modes "1" (bilevel) and "P" (palette) have been introduced.  Note
-  that bilevel images are stored with one byte per pixel.
-
-+ The Image "crop" and "paste" methods now accepts None as the
-  box argument, to refer to the full image (self, that is).
-
-+ The Image "crop" method now works properly.
-
-+ The Image "point" method is now available.  You can use either a
-  lookup table or a function taking one argument.
-
-+ The Image join function has been renamed to "merge".
-
-+ An Image "composite" function has been added.  It is identical
-  to copy() followed by paste(mask).
-
-+ An Image "eval" function has been added.  It is currently identical
-  to point(function); that is, only a single image can be processed.
-
-+ A set of channel operations has been added.  See the "ImageChops"
-  module, test_chops.py, and the handbook for details.
-
-+ Added the "pilconvert" utility, which converts image files.  Note
-  that the number of output formats are still quite restricted.
-
-+ Added the "pilfile" utility, which quickly identifies image files
-  (without loading them, in most cases).
-
-+ Added the "pilprint" utility, which prints image files to Postscript
-  printers.
-
-+ Added a rudimentary version of the "pilview" utility, which is
-  simple image viewer based on Tk.  Only File/Exit and Image/Next
-  works properly.
-
-+ An interface to Tk has been added.  See "Lib/ImageTk.py" and README
-  for details.
-
-+ An interface to Jack Jansen's Img library has been added (thanks to
-  Jack).  This allows you to read images through the Img extensions file
-  format handlers.  See the file "Lib/ImgExtImagePlugin.py" for details.
-
-+ Postscript printing is provided through the PSDraw module.  See the
-  handbook for details.
diff --git a/pythonPackages/pil/CONTENTS b/pythonPackages/pil/CONTENTS
deleted file mode 100644
index 171fe14cbd..0000000000
--- a/pythonPackages/pil/CONTENTS
+++ /dev/null
@@ -1,295 +0,0 @@
-Imaging/README
-
-Imaging/CHANGES
-
-Imaging/CONTENTS
-Imaging/MANIFEST
-
-Imaging/BUILDME
-
-Imaging/setup.py
-
-Imaging/selftest.py
-Imaging/doctest.py
-
-Imaging/libImaging/Imaging.h
-Imaging/libImaging/ImDib.h
-Imaging/libImaging/ImPlatform.h
-
-Imaging/libImaging/Quant.h
-Imaging/libImaging/QuantHash.h
-Imaging/libImaging/QuantHeap.h
-Imaging/libImaging/QuantDefines.h
-Imaging/libImaging/QuantTypes.h
-
-Imaging/libImaging/Access.c
-Imaging/libImaging/Antialias.c
-Imaging/libImaging/Bands.c
-Imaging/libImaging/Blend.c
-Imaging/libImaging/Chops.c
-Imaging/libImaging/Convert.c
-Imaging/libImaging/ConvertYCbCr.c
-Imaging/libImaging/Copy.c
-Imaging/libImaging/Crc32.c
-Imaging/libImaging/Crop.c
-Imaging/libImaging/Dib.c
-Imaging/libImaging/Draw.c
-Imaging/libImaging/Effects.c
-Imaging/libImaging/Except.c
-Imaging/libImaging/File.c
-Imaging/libImaging/Fill.c
-Imaging/libImaging/Filter.c
-Imaging/libImaging/Geometry.c
-Imaging/libImaging/GetBBox.c
-Imaging/libImaging/Histo.c
-Imaging/libImaging/Matrix.c
-Imaging/libImaging/ModeFilter.c
-Imaging/libImaging/Negative.c
-Imaging/libImaging/Offset.c
-Imaging/libImaging/Pack.c
-Imaging/libImaging/Palette.c
-Imaging/libImaging/Paste.c
-Imaging/libImaging/Point.c
-Imaging/libImaging/Quant.c
-Imaging/libImaging/QuantHash.c
-Imaging/libImaging/QuantHeap.c
-Imaging/libImaging/RankFilter.c
-Imaging/libImaging/Storage.c
-Imaging/libImaging/Unpack.c
-Imaging/libImaging/UnpackYCC.c
-
-Imaging/libImaging/Bit.h
-Imaging/libImaging/Gif.h
-Imaging/libImaging/Jpeg.h
-Imaging/libImaging/Lzw.h
-Imaging/libImaging/Raw.h
-Imaging/libImaging/Zip.h
-Imaging/libImaging/BitDecode.c
-Imaging/libImaging/EpsEncode.c
-Imaging/libImaging/FliDecode.c
-Imaging/libImaging/GifDecode.c
-Imaging/libImaging/GifEncode.c
-Imaging/libImaging/HexDecode.c
-Imaging/libImaging/JpegDecode.c
-Imaging/libImaging/JpegEncode.c
-Imaging/libImaging/LzwDecode.c
-Imaging/libImaging/MspDecode.c
-Imaging/libImaging/PackDecode.c
-Imaging/libImaging/PcdDecode.c
-Imaging/libImaging/PcxEncode.c
-Imaging/libImaging/PcxDecode.c
-Imaging/libImaging/RawDecode.c
-Imaging/libImaging/RawEncode.c
-Imaging/libImaging/SunRleDecode.c
-Imaging/libImaging/TgaRleDecode.c
-Imaging/libImaging/XbmDecode.c
-Imaging/libImaging/XbmEncode.c
-Imaging/libImaging/ZipDecode.c
-Imaging/libImaging/ZipEncode.c
-
-Imaging/_imaging.c
-Imaging/decode.c
-Imaging/encode.c
-Imaging/display.c
-Imaging/map.c
-Imaging/outline.c
-Imaging/path.c
-
-Imaging/_imagingtk.c
-Imaging/_imagingft.c
-Imaging/_imagingmath.c
-
-Imaging/PIL.pth
-Imaging/PIL/__init__.py
-Imaging/PIL/ArgImagePlugin.py
-Imaging/PIL/BdfFontFile.py
-Imaging/PIL/BmpImagePlugin.py
-Imaging/PIL/BufrStubImagePlugin.py
-Imaging/PIL/ContainerIO.py
-Imaging/PIL/CurImagePlugin.py
-Imaging/PIL/DcxImagePlugin.py
-Imaging/PIL/EpsImagePlugin.py
-Imaging/PIL/ExifTags.py
-Imaging/PIL/FitsStubImagePlugin.py
-Imaging/PIL/FliImagePlugin.py
-Imaging/PIL/FontFile.py
-Imaging/PIL/FpxImagePlugin.py
-Imaging/PIL/GbrImagePlugin.py
-Imaging/PIL/GdImageFile.py
-Imaging/PIL/GifImagePlugin.py
-Imaging/PIL/GimpGradientFile.py
-Imaging/PIL/GimpPaletteFile.py
-Imaging/PIL/GribStubImagePlugin.py
-Imaging/PIL/Hdf5StubImagePlugin.py
-Imaging/PIL/IcoImagePlugin.py
-Imaging/PIL/IcnsImagePlugin.py
-Imaging/PIL/Image.py
-Imaging/PIL/ImageChops.py
-Imaging/PIL/ImageColor.py
-Imaging/PIL/ImageDraw.py
-Imaging/PIL/ImageDraw2.py
-Imaging/PIL/ImageEnhance.py
-Imaging/PIL/ImageFile.py
-Imaging/PIL/ImageFileIO.py
-Imaging/PIL/ImageFilter.py
-Imaging/PIL/ImageFont.py
-Imaging/PIL/ImageGL.py
-Imaging/PIL/ImageGrab.py
-Imaging/PIL/ImageMath.py
-Imaging/PIL/ImageMode.py
-Imaging/PIL/ImageOps.py
-Imaging/PIL/ImagePalette.py
-Imaging/PIL/ImagePath.py
-Imaging/PIL/ImageQt.py
-Imaging/PIL/ImageSequence.py
-Imaging/PIL/ImageStat.py
-Imaging/PIL/ImageTk.py
-Imaging/PIL/ImageTransform.py
-Imaging/PIL/ImageWin.py
-Imaging/PIL/ImImagePlugin.py
-Imaging/PIL/ImtImagePlugin.py
-Imaging/PIL/IptcImagePlugin.py
-Imaging/PIL/JpegImagePlugin.py
-Imaging/PIL/McIdasImagePlugin.py
-Imaging/PIL/MicImagePlugin.py
-Imaging/PIL/MpegImagePlugin.py
-Imaging/PIL/MspImagePlugin.py
-Imaging/PIL/OleFileIO.py
-Imaging/PIL/PaletteFile.py
-Imaging/PIL/PalmImagePlugin.py
-Imaging/PIL/PcdImagePlugin.py
-Imaging/PIL/PcfFontFile.py
-Imaging/PIL/PcxImagePlugin.py
-Imaging/PIL/PdfImagePlugin.py
-Imaging/PIL/PixarImagePlugin.py
-Imaging/PIL/PngImagePlugin.py
-Imaging/PIL/PpmImagePlugin.py
-Imaging/PIL/PsdImagePlugin.py
-Imaging/PIL/PSDraw.py
-Imaging/PIL/SgiImagePlugin.py
-Imaging/PIL/SpiderImagePlugin.py
-Imaging/PIL/SunImagePlugin.py
-Imaging/PIL/TarIO.py
-Imaging/PIL/TgaImagePlugin.py
-Imaging/PIL/TiffImagePlugin.py
-Imaging/PIL/TiffTags.py
-Imaging/PIL/WalImageFile.py
-Imaging/PIL/WmfImagePlugin.py
-Imaging/PIL/XbmImagePlugin.py
-Imaging/PIL/XpmImagePlugin.py
-Imaging/PIL/XVThumbImagePlugin.py
-
-Imaging/Docs/index.html
-Imaging/Docs/effbot.css
-Imaging/Docs/pythondoc-PIL.ArgImagePlugin.html
-Imaging/Docs/pythondoc-PIL.BdfFontFile.html
-Imaging/Docs/pythondoc-PIL.BmpImagePlugin.html
-Imaging/Docs/pythondoc-PIL.BufrStubImagePlugin.html
-Imaging/Docs/pythondoc-PIL.ContainerIO.html
-Imaging/Docs/pythondoc-PIL.CurImagePlugin.html
-Imaging/Docs/pythondoc-PIL.DcxImagePlugin.html
-Imaging/Docs/pythondoc-PIL.EpsImagePlugin.html
-Imaging/Docs/pythondoc-PIL.ExifTags.html
-Imaging/Docs/pythondoc-PIL.FitsStubImagePlugin.html
-Imaging/Docs/pythondoc-PIL.FliImagePlugin.html
-Imaging/Docs/pythondoc-PIL.FontFile.html
-Imaging/Docs/pythondoc-PIL.FpxImagePlugin.html
-Imaging/Docs/pythondoc-PIL.GbrImagePlugin.html
-Imaging/Docs/pythondoc-PIL.GdImageFile.html
-Imaging/Docs/pythondoc-PIL.GifImagePlugin.html
-Imaging/Docs/pythondoc-PIL.GimpGradientFile.html
-Imaging/Docs/pythondoc-PIL.GimpPaletteFile.html
-Imaging/Docs/pythondoc-PIL.GribStubImagePlugin.html
-Imaging/Docs/pythondoc-PIL.Hdf5StubImagePlugin.html
-Imaging/Docs/pythondoc-PIL.IcoImagePlugin.html
-Imaging/Docs/pythondoc-PIL.IcnsImagePlugin.html
-Imaging/Docs/pythondoc-PIL.Image.html
-Imaging/Docs/pythondoc-PIL.ImageChops.html
-Imaging/Docs/pythondoc-PIL.ImageColor.html
-Imaging/Docs/pythondoc-PIL.ImageDraw.html
-Imaging/Docs/pythondoc-PIL.ImageEnhance.html
-Imaging/Docs/pythondoc-PIL.ImageFile.html
-Imaging/Docs/pythondoc-PIL.ImageFileIO.html
-Imaging/Docs/pythondoc-PIL.ImageFilter.html
-Imaging/Docs/pythondoc-PIL.ImageFont.html
-Imaging/Docs/pythondoc-PIL.ImageGL.html
-Imaging/Docs/pythondoc-PIL.ImageGrab.html
-Imaging/Docs/pythondoc-PIL.ImageOps.html
-Imaging/Docs/pythondoc-PIL.ImagePalette.html
-Imaging/Docs/pythondoc-PIL.ImagePath.html
-Imaging/Docs/pythondoc-PIL.ImageSequence.html
-Imaging/Docs/pythondoc-PIL.ImageStat.html
-Imaging/Docs/pythondoc-PIL.ImageTk.html
-Imaging/Docs/pythondoc-PIL.ImageTransform.html
-Imaging/Docs/pythondoc-PIL.ImageWin.html
-Imaging/Docs/pythondoc-PIL.ImImagePlugin.html
-Imaging/Docs/pythondoc-PIL.ImtImagePlugin.html
-Imaging/Docs/pythondoc-PIL.IptcImagePlugin.html
-Imaging/Docs/pythondoc-PIL.JpegImagePlugin.html
-Imaging/Docs/pythondoc-PIL.McIdasImagePlugin.html
-Imaging/Docs/pythondoc-PIL.MicImagePlugin.html
-Imaging/Docs/pythondoc-PIL.MpegImagePlugin.html
-Imaging/Docs/pythondoc-PIL.MspImagePlugin.html
-Imaging/Docs/pythondoc-PIL.OleFileIO.html
-Imaging/Docs/pythondoc-PIL.PaletteFile.html
-Imaging/Docs/pythondoc-PIL.PalmImagePlugin.html
-Imaging/Docs/pythondoc-PIL.PcdImagePlugin.html
-Imaging/Docs/pythondoc-PIL.PcfFontFile.html
-Imaging/Docs/pythondoc-PIL.PcxImagePlugin.html
-Imaging/Docs/pythondoc-PIL.PdfImagePlugin.html
-Imaging/Docs/pythondoc-PIL.PixarImagePlugin.html
-Imaging/Docs/pythondoc-PIL.PngImagePlugin.html
-Imaging/Docs/pythondoc-PIL.PpmImagePlugin.html
-Imaging/Docs/pythondoc-PIL.PsdImagePlugin.html
-Imaging/Docs/pythondoc-PIL.PSDraw.html
-Imaging/Docs/pythondoc-PIL.SgiImagePlugin.html
-Imaging/Docs/pythondoc-PIL.SpiderImagePlugin.html
-Imaging/Docs/pythondoc-PIL.SunImagePlugin.html
-Imaging/Docs/pythondoc-PIL.TarIO.html
-Imaging/Docs/pythondoc-PIL.TgaImagePlugin.html
-Imaging/Docs/pythondoc-PIL.TiffImagePlugin.html
-Imaging/Docs/pythondoc-PIL.TiffTags.html
-Imaging/Docs/pythondoc-PIL.WalImageFile.html
-Imaging/Docs/pythondoc-PIL.WmfImagePlugin.html
-Imaging/Docs/pythondoc-PIL.XbmImagePlugin.html
-Imaging/Docs/pythondoc-PIL.XpmImagePlugin.html
-Imaging/Docs/pythondoc-PIL.XVThumbImagePlugin.html
-
-Imaging/Scripts/pilconvert.py
-Imaging/Scripts/pildriver.py
-Imaging/Scripts/pilfile.py
-Imaging/Scripts/pilfont.py
-Imaging/Scripts/pilprint.py
-
-Imaging/Images/lena.gif
-Imaging/Images/lena.ppm
-Imaging/Images/lena.jpg
-
-Imaging/Images/courB08.bdf
-Imaging/Images/courB08.pbm
-Imaging/Images/courB08.pil
-
-Imaging/Sane/README
-Imaging/Sane/CHANGES
-Imaging/Sane/setup.py
-Imaging/Sane/sanedoc.txt
-Imaging/Sane/_sane.c
-Imaging/Sane/sane.py
-Imaging/Sane/demo_numarray.py
-Imaging/Sane/demo_pil.py
-
-Imaging/Scripts/README
-Imaging/Scripts/enhancer.py
-Imaging/Scripts/explode.py
-Imaging/Scripts/gifmaker.py
-Imaging/Scripts/image2py.py
-Imaging/Scripts/painter.py
-Imaging/Scripts/player.py
-Imaging/Scripts/viewer.py
-Imaging/Scripts/thresholder.py
-
-Imaging/Tk/tkImaging.c
-Imaging/Tk/install.txt
-Imaging/Tk/booster.txt
-Imaging/Tk/pilbitmap.txt
-
diff --git a/pythonPackages/pil/Docs/effbot.css b/pythonPackages/pil/Docs/effbot.css
deleted file mode 100644
index b03ae458cd..0000000000
--- a/pythonPackages/pil/Docs/effbot.css
+++ /dev/null
@@ -1,118 +0,0 @@
-/* effbot.css */
-
-BODY {
-    font: 100% Georgia, Times, serif;
-    color: black;
-    margin: 0px 20px 0px 20px;
-}
-
-#effbot-body {
-    background: white;
-    padding: 10px 40px 10px 40px;
-    max-width: 50em;
-}
-
-#effbot-menu {
-    display: none;
-}
-
-.adsense {
-    background: #f8fff8;
-    border: 1px solid #084; 
-    padding: 10px 4px 4px 4px;
-}
-
-.sidebar {
-    border: 1px solid #000; 
-    float: right; clear: right;
-    width: 200px;
-    background: white;
-    padding: 10px;
-    margin: 0px -25px 10px 0px;
-}
-
-/* visual style */
-
-P {
-    line-height: 1.3em;
-}
-
-CODE, PRE {
-    font: 100% "Courier New", Courier, Monaco, monospace;
-    color: #042; margin-left: 20px; 
-}
-
-H1, H2, H3 {
-    font-family: Georgia, Times, serif;
-    color: #084; margin-top: 30px;
-}
-
-H1, H2, { border-top: 1px solid #084; }
-
-H4, H5, H6 {
-    font-family: Georgia, Times, serif;
-    color: #084; margin-top: 15px;
-}
-
-A:link, A:hover { color: #084; }
-A:visited { color: #404040; }
-
-UL LI { list-style-type: square; }
-
-.title { margin-bottom: 2px; color: #084; }
-.info { font-size: 80%; color: #084; margin-top: 0px; }
-
-.bluebox { color: #084; margin-top: 10px; }
-
-.highlight { background: #cfc; }
-.mark { color: #084; }
-.small { font-size: 80%; }
-.display { background: #eee; padding: 20px; }
-
-.note { 
-    background: #efe;
-    border-top: 1px solid #084;
-    border-bottom: 1px solid #084;
-    padding: 2px 20px;
-}
-
-.example {
-    border-top: medium solid #084;
-    border-bottom: medium solid #084;
-    padding: 5px;
-}
-
-.figure {
-    border-top: medium solid #084;
-    border-bottom: medium solid #084;
-    padding: 5px;
-}
-
-.fixme {
-    background: #eee;
-    border: 1px solid #084;
-    padding: 2x 20px;
-}
-
-.simpletable {
-    border: 1px solid #084;
-    border-collapse: collapse;
-}
-
-.simpletable TH {
-    text-align: left;
-    background: #cfc;
-    border: 1px solid #084;
-    margin: 0px;
-    padding: 1px 5px;
-}
-
-.simpletable TD {
-    border: 1px solid #084;
-    margin: 0px;
-    padding: 5px;
-}
-
-/* xmldiff markup */
-.new { text-decoration: underline; color: red; background: #fff0f0; }
-.old { text-decoration: line-through; color: blue; background: #f0f0ff; }
diff --git a/pythonPackages/pil/Docs/index.html b/pythonPackages/pil/Docs/index.html
deleted file mode 100644
index fbc76a99df..0000000000
--- a/pythonPackages/pil/Docs/index.html
+++ /dev/null
@@ -1,103 +0,0 @@
-
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The Python Imaging Library</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The Python Imaging Library</h1>
-
-<h3 id='online'>Online Resources</h3>
-
-<dl>
-<dt><a href='http://www.pythonware.com/products/pil'><i>Python Imaging Library</i></a> (official product page at <a href="http://www.pythonware.com">pythonware.com</a>)</dt>
-<dt><a href='http://effbot.org/zone/pil-index.htm'><i>Python Imaging Library</i></a> (development page at <a href="http://effbot.org">effbot.org</a>)</dt>
-</dl>
-
-<h3>Package Contents</h3>
-
-<p>The following pages are generated from <a href='http://effbot.org/zone/pythondoc.htm'><b>pythondoc</b></a> markup in the source files.</p>
-
-<dl>
-<dt><a href='pythondoc-PIL.Image.html'>The PIL.Image Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageChops.html'>The PIL.ImageChops Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageColor.html'>The PIL.ImageColor Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageDraw.html'>The PIL.ImageDraw Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageEnhance.html'>The PIL.ImageEnhance Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageFile.html'>The PIL.ImageFile Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageFileIO.html'>The PIL.ImageFileIO Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageFilter.html'>The PIL.ImageFilter Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageFont.html'>The PIL.ImageFont Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageGL.html'>The PIL.ImageGL Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageGrab.html'>The PIL.ImageGrab Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageMath.html'>The PIL.ImageMath Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageMode.html'>The PIL.ImageMode Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageOps.html'>The PIL.ImageOps Module</a></dt>
-<dt><a href='pythondoc-PIL.ImagePalette.html'>The PIL.ImagePalette Module</a></dt>
-<dt><a href='pythondoc-PIL.ImagePath.html'>The PIL.ImagePath Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageQt.html'>The PIL.ImageQt Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageSequence.html'>The PIL.ImageSequence Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageStat.html'>The PIL.ImageStat Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageTk.html'>The PIL.ImageTk Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageTransform.html'>The PIL.ImageTransform Module</a></dt>
-<dt><a href='pythondoc-PIL.ImageWin.html'>The PIL.ImageWin Module</a></dt>
-<dt>&nbsp;</dt>
-<dt><a href='pythondoc-PIL.ArgImagePlugin.html'>The PIL.ArgImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.BdfFontFile.html'>The PIL.BdfFontFile Module</a></dt>
-<dt><a href='pythondoc-PIL.BmpImagePlugin.html'>The PIL.BmpImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.BufrStubImagePlugin.html'>The PIL.BufrStubImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.ContainerIO.html'>The PIL.ContainerIO Module</a></dt>
-<dt><a href='pythondoc-PIL.CurImagePlugin.html'>The PIL.CurImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.DcxImagePlugin.html'>The PIL.DcxImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.EpsImagePlugin.html'>The PIL.EpsImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.ExifTags.html'>The PIL.ExifTags Module</a></dt>
-<dt><a href='pythondoc-PIL.FitsStubImagePlugin.html'>The PIL.FitsStubImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.FliImagePlugin.html'>The PIL.FliImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.FontFile.html'>The PIL.FontFile Module</a></dt>
-<dt><a href='pythondoc-PIL.FpxImagePlugin.html'>The PIL.FpxImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.GbrImagePlugin.html'>The PIL.GbrImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.GdImageFile.html'>The PIL.GdImageFile Module</a></dt>
-<dt><a href='pythondoc-PIL.GifImagePlugin.html'>The PIL.GifImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.GimpGradientFile.html'>The PIL.GimpGradientFile Module</a></dt>
-<dt><a href='pythondoc-PIL.GimpPaletteFile.html'>The PIL.GimpPaletteFile Module</a></dt>
-<dt><a href='pythondoc-PIL.GribStubImagePlugin.html'>The PIL.GribStubImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.Hdf5StubImagePlugin.html'>The PIL.Hdf5StubImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.IcnsImagePlugin.html'>The PIL.IcnsImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.IcoImagePlugin.html'>The PIL.IcoImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.ImImagePlugin.html'>The PIL.ImImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.ImtImagePlugin.html'>The PIL.ImtImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.IptcImagePlugin.html'>The PIL.IptcImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.JpegImagePlugin.html'>The PIL.JpegImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.McIdasImagePlugin.html'>The PIL.McIdasImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.MicImagePlugin.html'>The PIL.MicImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.MpegImagePlugin.html'>The PIL.MpegImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.MspImagePlugin.html'>The PIL.MspImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.OleFileIO.html'>The PIL.OleFileIO Module</a></dt>
-<dt><a href='pythondoc-PIL.PSDraw.html'>The PIL.PSDraw Module</a></dt>
-<dt><a href='pythondoc-PIL.PaletteFile.html'>The PIL.PaletteFile Module</a></dt>
-<dt><a href='pythondoc-PIL.PalmImagePlugin.html'>The PIL.PalmImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.PcdImagePlugin.html'>The PIL.PcdImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.PcfFontFile.html'>The PIL.PcfFontFile Module</a></dt>
-<dt><a href='pythondoc-PIL.PcxImagePlugin.html'>The PIL.PcxImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.PdfImagePlugin.html'>The PIL.PdfImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.PixarImagePlugin.html'>The PIL.PixarImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.PngImagePlugin.html'>The PIL.PngImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.PpmImagePlugin.html'>The PIL.PpmImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.PsdImagePlugin.html'>The PIL.PsdImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.SgiImagePlugin.html'>The PIL.SgiImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.SunImagePlugin.html'>The PIL.SunImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.TarIO.html'>The PIL.TarIO Module</a></dt>
-<dt><a href='pythondoc-PIL.TgaImagePlugin.html'>The PIL.TgaImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.TiffImagePlugin.html'>The PIL.TiffImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.TiffTags.html'>The PIL.TiffTags Module</a></dt>
-<dt><a href='pythondoc-PIL.WalImageFile.html'>The PIL.WalImageFile Module</a></dt>
-<dt><a href='pythondoc-PIL.WbmpImagePlugin.html'>The PIL.WbmpImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.WmfImagePlugin.html'>The PIL.WmfImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.XVThumbImagePlugin.html'>The PIL.XVThumbImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.XbmImagePlugin.html'>The PIL.XbmImagePlugin Module</a></dt>
-<dt><a href='pythondoc-PIL.XpmImagePlugin.html'>The PIL.XpmImagePlugin Module</a></dt>
-</dl>
-
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ArgImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.ArgImagePlugin.html
deleted file mode 100644
index 28aa4e11bc..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ArgImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ArgImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ArgImagePlugin Module</h1>
-<dl>
-<dt><b>ArgImageFile</b> (class)  [<a href='#PIL.ArgImagePlugin.ArgImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the experimental Animated Raster Graphics format.</p>
-<p>For more information about this class, see <a href='#PIL.ArgImagePlugin.ArgImageFile-class'><i>The ArgImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ArgImagePlugin.ArgImageFile-class' name='PIL.ArgImagePlugin.ArgImageFile-class'>The ArgImageFile Class</a></h2>
-<dl>
-<dt><b>ArgImageFile</b> (class)  [<a href='#PIL.ArgImagePlugin.ArgImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.BdfFontFile.html b/pythonPackages/pil/Docs/pythondoc-PIL.BdfFontFile.html
deleted file mode 100644
index 1f2008c173..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.BdfFontFile.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.BdfFontFile Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.BdfFontFile Module</h1>
-<dl>
-<dt><b>BdfFontFile(fp)</b> (class) [<a href='#PIL.BdfFontFile.BdfFontFile-class'>#</a>]</dt>
-<dd>
-<p>Font file plugin for the X11 BDF format.</p>
-<p>For more information about this class, see <a href='#PIL.BdfFontFile.BdfFontFile-class'><i>The BdfFontFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.BdfFontFile.BdfFontFile-class' name='PIL.BdfFontFile.BdfFontFile-class'>The BdfFontFile Class</a></h2>
-<dl>
-<dt><b>BdfFontFile(fp)</b> (class) [<a href='#PIL.BdfFontFile.BdfFontFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.BmpImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.BmpImagePlugin.html
deleted file mode 100644
index 17fe0d1f14..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.BmpImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.BmpImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.BmpImagePlugin Module</h1>
-<dl>
-<dt><b>BmpImageFile</b> (class)  [<a href='#PIL.BmpImagePlugin.BmpImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the Windows BMP format.</p>
-<p>For more information about this class, see <a href='#PIL.BmpImagePlugin.BmpImageFile-class'><i>The BmpImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.BmpImagePlugin.BmpImageFile-class' name='PIL.BmpImagePlugin.BmpImageFile-class'>The BmpImageFile Class</a></h2>
-<dl>
-<dt><b>BmpImageFile</b> (class)  [<a href='#PIL.BmpImagePlugin.BmpImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.BufrStubImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.BufrStubImagePlugin.html
deleted file mode 100644
index c17a1199d1..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.BufrStubImagePlugin.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.BufrStubImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.BufrStubImagePlugin Module</h1>
-<dl>
-<dt><a id='PIL.BufrStubImagePlugin.register_handler-function' name='PIL.BufrStubImagePlugin.register_handler-function'><b>register_handler(handler)</b></a> [<a href='#PIL.BufrStubImagePlugin.register_handler-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>handler</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ContainerIO.html b/pythonPackages/pil/Docs/pythondoc-PIL.ContainerIO.html
deleted file mode 100644
index 61e4c91879..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ContainerIO.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ContainerIO Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ContainerIO Module</h1>
-<dl>
-<dt><b>ContainerIO(file, offset, length)</b> (class) [<a href='#PIL.ContainerIO.ContainerIO-class'>#</a>]</dt>
-<dd>
-<p>A file object that provides read access to a part of an existing
-file (for example a TAR file).</p>
-<p>For more information about this class, see <a href='#PIL.ContainerIO.ContainerIO-class'><i>The ContainerIO Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ContainerIO.ContainerIO-class' name='PIL.ContainerIO.ContainerIO-class'>The ContainerIO Class</a></h2>
-<dl>
-<dt><b>ContainerIO(file, offset, length)</b> (class) [<a href='#PIL.ContainerIO.ContainerIO-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ContainerIO.ContainerIO.__init__-method' name='PIL.ContainerIO.ContainerIO.__init__-method'><b>__init__(file, offset, length)</b></a> [<a href='#PIL.ContainerIO.ContainerIO.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>file</i></dt>
-<dd>
-</dd>
-<dt><i>offset</i></dt>
-<dd>
-</dd>
-<dt><i>length</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ContainerIO.ContainerIO.isatty-method' name='PIL.ContainerIO.ContainerIO.isatty-method'><b>isatty()</b></a> [<a href='#PIL.ContainerIO.ContainerIO.isatty-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ContainerIO.ContainerIO.read-method' name='PIL.ContainerIO.ContainerIO.read-method'><b>read(bytes=0)</b></a> [<a href='#PIL.ContainerIO.ContainerIO.read-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>bytes</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ContainerIO.ContainerIO.readline-method' name='PIL.ContainerIO.ContainerIO.readline-method'><b>readline()</b></a> [<a href='#PIL.ContainerIO.ContainerIO.readline-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ContainerIO.ContainerIO.readlines-method' name='PIL.ContainerIO.ContainerIO.readlines-method'><b>readlines()</b></a> [<a href='#PIL.ContainerIO.ContainerIO.readlines-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ContainerIO.ContainerIO.seek-method' name='PIL.ContainerIO.ContainerIO.seek-method'><b>seek(offset, mode=0)</b></a> [<a href='#PIL.ContainerIO.ContainerIO.seek-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>offset</i></dt>
-<dd>
-</dd>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ContainerIO.ContainerIO.tell-method' name='PIL.ContainerIO.ContainerIO.tell-method'><b>tell()</b></a> [<a href='#PIL.ContainerIO.ContainerIO.tell-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.CurImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.CurImagePlugin.html
deleted file mode 100644
index 0dafd34ecb..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.CurImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.CurImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.CurImagePlugin Module</h1>
-<dl>
-<dt><b>CurImageFile</b> (class)  [<a href='#PIL.CurImagePlugin.CurImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Windows Cursor files.</p>
-<p>For more information about this class, see <a href='#PIL.CurImagePlugin.CurImageFile-class'><i>The CurImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.CurImagePlugin.CurImageFile-class' name='PIL.CurImagePlugin.CurImageFile-class'>The CurImageFile Class</a></h2>
-<dl>
-<dt><b>CurImageFile</b> (class)  [<a href='#PIL.CurImagePlugin.CurImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.DcxImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.DcxImagePlugin.html
deleted file mode 100644
index 335ac43392..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.DcxImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.DcxImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.DcxImagePlugin Module</h1>
-<dl>
-<dt><b>DcxImageFile</b> (class)  [<a href='#PIL.DcxImagePlugin.DcxImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the Intel DCX format.</p>
-<p>For more information about this class, see <a href='#PIL.DcxImagePlugin.DcxImageFile-class'><i>The DcxImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.DcxImagePlugin.DcxImageFile-class' name='PIL.DcxImagePlugin.DcxImageFile-class'>The DcxImageFile Class</a></h2>
-<dl>
-<dt><b>DcxImageFile</b> (class)  [<a href='#PIL.DcxImagePlugin.DcxImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.EpsImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.EpsImagePlugin.html
deleted file mode 100644
index 262b34632d..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.EpsImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.EpsImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.EpsImagePlugin Module</h1>
-<dl>
-<dt><b>EpsImageFile</b> (class)  [<a href='#PIL.EpsImagePlugin.EpsImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Encapsulated Postscript.</p>
-<p>For more information about this class, see <a href='#PIL.EpsImagePlugin.EpsImageFile-class'><i>The EpsImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.EpsImagePlugin.EpsImageFile-class' name='PIL.EpsImagePlugin.EpsImageFile-class'>The EpsImageFile Class</a></h2>
-<dl>
-<dt><b>EpsImageFile</b> (class)  [<a href='#PIL.EpsImagePlugin.EpsImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ExifTags.html b/pythonPackages/pil/Docs/pythondoc-PIL.ExifTags.html
deleted file mode 100644
index 39aab438bc..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ExifTags.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ExifTags Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ExifTags Module</h1>
-<h2>Module Contents</h2>
-<dl>
-<dt><a id='PIL.ExifTags.GPSTAGS-variable' name='PIL.ExifTags.GPSTAGS-variable'><b>GPSTAGS</b></a> (variable) [<a href='#PIL.ExifTags.GPSTAGS-variable'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ExifTags.TAGS-variable' name='PIL.ExifTags.TAGS-variable'><b>TAGS</b></a> (variable) [<a href='#PIL.ExifTags.TAGS-variable'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.FitsStubImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.FitsStubImagePlugin.html
deleted file mode 100644
index 1492f74a2e..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.FitsStubImagePlugin.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.FitsStubImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.FitsStubImagePlugin Module</h1>
-<dl>
-<dt><a id='PIL.FitsStubImagePlugin.register_handler-function' name='PIL.FitsStubImagePlugin.register_handler-function'><b>register_handler(handler)</b></a> [<a href='#PIL.FitsStubImagePlugin.register_handler-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>handler</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.FliImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.FliImagePlugin.html
deleted file mode 100644
index 0d7faa008b..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.FliImagePlugin.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.FliImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.FliImagePlugin Module</h1>
-<dl>
-<dt><b>FliImageFile</b> (class)  [<a href='#PIL.FliImagePlugin.FliImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the FLI/FLC animation format.</p>
-<p>For more information about this class, see <a href='#PIL.FliImagePlugin.FliImageFile-class'><i>The FliImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.FliImagePlugin.FliImageFile-class' name='PIL.FliImagePlugin.FliImageFile-class'>The FliImageFile Class</a></h2>
-<dl>
-<dt><b>FliImageFile</b> (class)  [<a href='#PIL.FliImagePlugin.FliImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the FLI/FLC animation format.  Use the <b>seek</b>
-method to load individual frames.
-</p></dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.FontFile.html b/pythonPackages/pil/Docs/pythondoc-PIL.FontFile.html
deleted file mode 100644
index 7f9b82fafe..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.FontFile.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.FontFile Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.FontFile Module</h1>
-<dl>
-<dt><b>FontFile()</b> (class) [<a href='#PIL.FontFile.FontFile-class'>#</a>]</dt>
-<dd>
-<p>Base class for raster font file handlers.</p>
-<p>For more information about this class, see <a href='#PIL.FontFile.FontFile-class'><i>The FontFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.FontFile.FontFile-class' name='PIL.FontFile.FontFile-class'>The FontFile Class</a></h2>
-<dl>
-<dt><b>FontFile()</b> (class) [<a href='#PIL.FontFile.FontFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.FpxImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.FpxImagePlugin.html
deleted file mode 100644
index f4631b8903..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.FpxImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.FpxImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.FpxImagePlugin Module</h1>
-<dl>
-<dt><b>FpxImageFile</b> (class)  [<a href='#PIL.FpxImagePlugin.FpxImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the FlashPix images.</p>
-<p>For more information about this class, see <a href='#PIL.FpxImagePlugin.FpxImageFile-class'><i>The FpxImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.FpxImagePlugin.FpxImageFile-class' name='PIL.FpxImagePlugin.FpxImageFile-class'>The FpxImageFile Class</a></h2>
-<dl>
-<dt><b>FpxImageFile</b> (class)  [<a href='#PIL.FpxImagePlugin.FpxImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.GbrImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.GbrImagePlugin.html
deleted file mode 100644
index a318ed7c54..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.GbrImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.GbrImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.GbrImagePlugin Module</h1>
-<dl>
-<dt><b>GbrImageFile</b> (class)  [<a href='#PIL.GbrImagePlugin.GbrImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the GIMP brush format.</p>
-<p>For more information about this class, see <a href='#PIL.GbrImagePlugin.GbrImageFile-class'><i>The GbrImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.GbrImagePlugin.GbrImageFile-class' name='PIL.GbrImagePlugin.GbrImageFile-class'>The GbrImageFile Class</a></h2>
-<dl>
-<dt><b>GbrImageFile</b> (class)  [<a href='#PIL.GbrImagePlugin.GbrImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.GdImageFile.html b/pythonPackages/pil/Docs/pythondoc-PIL.GdImageFile.html
deleted file mode 100644
index 554ffb980d..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.GdImageFile.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.GdImageFile Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.GdImageFile Module</h1>
-<dl>
-<dt><b>GdImageFile</b> (class)  [<a href='#PIL.GdImageFile.GdImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the GD uncompressed format.</p>
-<p>For more information about this class, see <a href='#PIL.GdImageFile.GdImageFile-class'><i>The GdImageFile Class</i></a>.</p>
-</dd>
-<dt><a id='PIL.GdImageFile.open-function' name='PIL.GdImageFile.open-function'><b>open(fp, mode=&quot;r&quot;)</b></a> [<a href='#PIL.GdImageFile.open-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>filename</i></dt>
-<dd>
-</dd>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>IOError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.GdImageFile.GdImageFile-class' name='PIL.GdImageFile.GdImageFile-class'>The GdImageFile Class</a></h2>
-<dl>
-<dt><b>GdImageFile</b> (class)  [<a href='#PIL.GdImageFile.GdImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the GD uncompressed format.  Note that this format
-is not supported by the standard <b>Image.open</b> function.  To use
-this plugin, you have to import the <b>GdImageFile</b> module and
-use the <b>GdImageFile.open</b> function.
-</p></dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.GifImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.GifImagePlugin.html
deleted file mode 100644
index 06a0401e43..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.GifImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.GifImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.GifImagePlugin Module</h1>
-<dl>
-<dt><b>GifImageFile</b> (class)  [<a href='#PIL.GifImagePlugin.GifImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for GIF images.</p>
-<p>For more information about this class, see <a href='#PIL.GifImagePlugin.GifImageFile-class'><i>The GifImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.GifImagePlugin.GifImageFile-class' name='PIL.GifImagePlugin.GifImageFile-class'>The GifImageFile Class</a></h2>
-<dl>
-<dt><b>GifImageFile</b> (class)  [<a href='#PIL.GifImagePlugin.GifImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.GimpGradientFile.html b/pythonPackages/pil/Docs/pythondoc-PIL.GimpGradientFile.html
deleted file mode 100644
index d9e3d3231c..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.GimpGradientFile.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.GimpGradientFile Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.GimpGradientFile Module</h1>
-<dl>
-<dt><b>GimpGradientFile(fp)</b> (class) [<a href='#PIL.GimpGradientFile.GimpGradientFile-class'>#</a>]</dt>
-<dd>
-<p>File handler for GIMP's gradient format.</p>
-<p>For more information about this class, see <a href='#PIL.GimpGradientFile.GimpGradientFile-class'><i>The GimpGradientFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.GimpGradientFile.GimpGradientFile-class' name='PIL.GimpGradientFile.GimpGradientFile-class'>The GimpGradientFile Class</a></h2>
-<dl>
-<dt><b>GimpGradientFile(fp)</b> (class) [<a href='#PIL.GimpGradientFile.GimpGradientFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.GimpPaletteFile.html b/pythonPackages/pil/Docs/pythondoc-PIL.GimpPaletteFile.html
deleted file mode 100644
index 421fc9c0f4..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.GimpPaletteFile.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.GimpPaletteFile Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.GimpPaletteFile Module</h1>
-<dl>
-<dt><b>GimpPaletteFile(fp)</b> (class) [<a href='#PIL.GimpPaletteFile.GimpPaletteFile-class'>#</a>]</dt>
-<dd>
-<p>File handler for GIMP's palette format.</p>
-<p>For more information about this class, see <a href='#PIL.GimpPaletteFile.GimpPaletteFile-class'><i>The GimpPaletteFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.GimpPaletteFile.GimpPaletteFile-class' name='PIL.GimpPaletteFile.GimpPaletteFile-class'>The GimpPaletteFile Class</a></h2>
-<dl>
-<dt><b>GimpPaletteFile(fp)</b> (class) [<a href='#PIL.GimpPaletteFile.GimpPaletteFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.GribStubImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.GribStubImagePlugin.html
deleted file mode 100644
index 735db2b03d..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.GribStubImagePlugin.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.GribStubImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.GribStubImagePlugin Module</h1>
-<dl>
-<dt><a id='PIL.GribStubImagePlugin.register_handler-function' name='PIL.GribStubImagePlugin.register_handler-function'><b>register_handler(handler)</b></a> [<a href='#PIL.GribStubImagePlugin.register_handler-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>handler</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.Hdf5StubImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.Hdf5StubImagePlugin.html
deleted file mode 100644
index d03591a0f3..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.Hdf5StubImagePlugin.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.Hdf5StubImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.Hdf5StubImagePlugin Module</h1>
-<dl>
-<dt><a id='PIL.Hdf5StubImagePlugin.register_handler-function' name='PIL.Hdf5StubImagePlugin.register_handler-function'><b>register_handler(handler)</b></a> [<a href='#PIL.Hdf5StubImagePlugin.register_handler-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>handler</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.IcnsImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.IcnsImagePlugin.html
deleted file mode 100644
index 4a05314197..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.IcnsImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.IcnsImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.IcnsImagePlugin Module</h1>
-<dl>
-<dt><b>IcnsImageFile</b> (class)  [<a href='#PIL.IcnsImagePlugin.IcnsImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Mac OS icons.</p>
-<p>For more information about this class, see <a href='#PIL.IcnsImagePlugin.IcnsImageFile-class'><i>The IcnsImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.IcnsImagePlugin.IcnsImageFile-class' name='PIL.IcnsImagePlugin.IcnsImageFile-class'>The IcnsImageFile Class</a></h2>
-<dl>
-<dt><b>IcnsImageFile</b> (class)  [<a href='#PIL.IcnsImagePlugin.IcnsImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.IcoImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.IcoImagePlugin.html
deleted file mode 100644
index 5e2b9230f2..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.IcoImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.IcoImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.IcoImagePlugin Module</h1>
-<dl>
-<dt><b>IcoImageFile</b> (class)  [<a href='#PIL.IcoImagePlugin.IcoImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Windows Icon files.</p>
-<p>For more information about this class, see <a href='#PIL.IcoImagePlugin.IcoImageFile-class'><i>The IcoImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.IcoImagePlugin.IcoImageFile-class' name='PIL.IcoImagePlugin.IcoImageFile-class'>The IcoImageFile Class</a></h2>
-<dl>
-<dt><b>IcoImageFile</b> (class)  [<a href='#PIL.IcoImagePlugin.IcoImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImImagePlugin.html
deleted file mode 100644
index 918f745980..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImImagePlugin Module</h1>
-<dl>
-<dt><b>ImImageFile</b> (class)  [<a href='#PIL.ImImagePlugin.ImImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the IFUNC IM file format.</p>
-<p>For more information about this class, see <a href='#PIL.ImImagePlugin.ImImageFile-class'><i>The ImImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImImagePlugin.ImImageFile-class' name='PIL.ImImagePlugin.ImImageFile-class'>The ImImageFile Class</a></h2>
-<dl>
-<dt><b>ImImageFile</b> (class)  [<a href='#PIL.ImImagePlugin.ImImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.Image.html b/pythonPackages/pil/Docs/pythondoc-PIL.Image.html
deleted file mode 100644
index e1a49c01fa..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.Image.html
+++ /dev/null
@@ -1,931 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.Image Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.Image Module</h1>
-<dl>
-<dt><a id='PIL.Image.blend-function' name='PIL.Image.blend-function'><b>blend(im1, im2, alpha)</b></a> [<a href='#PIL.Image.blend-function'>#</a>]</dt>
-<dd>
-<p>Creates a new image by interpolating between two input images, using
-a constant alpha.
-
-<pre>
-   out = image1 * (1.0 - alpha) + image2 * alpha
-</pre>
-
-</p><dl>
-<dt><i>im1</i></dt>
-<dd>
-</dd>
-<dt><i>im2</i></dt>
-<dd>
-</dd>
-<dt><i>alpha</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.composite-function' name='PIL.Image.composite-function'><b>composite(image1, image2, mask)</b></a> [<a href='#PIL.Image.composite-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image2</i></dt>
-<dd>
-</dd>
-<dt><i>mask</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.eval-function' name='PIL.Image.eval-function'><b>eval(image, function)</b></a> [<a href='#PIL.Image.eval-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>function</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.frombuffer-function' name='PIL.Image.frombuffer-function'><b>frombuffer(mode, size, data, decoder_name=&quot;raw&quot;, *args)</b></a> [<a href='#PIL.Image.frombuffer-function'>#</a>]</dt>
-<dd>
-<p>(New in 1.1.4) Creates an image memory from pixel data in a string
-or byte buffer.
-</p><p>
-This function is similar to <a class="link" href="#PIL.Image.fromstring-function"><b>fromstring</b></a>, but uses data in
-the byte buffer, where possible.  This means that changes to the
-original buffer object are reflected in this image).  Not all modes
-can share memory; support modes include "L", "RGBX", "RGBA", and
-"CMYK".  For other modes, this function behaves like a corresponding
-call to the <b>fromstring</b> function.
-</p><p>
-Note that this function decodes pixel data only, not entire images.
-If you have an entire image file in a string, wrap it in a
-<b>StringIO</b> object, and use <a class="link" href="#PIL.Image.open-function"><b>open</b></a> to load it.
-
-</p><dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>data</i></dt>
-<dd>
-</dd>
-<dt><i>decoder_name</i></dt>
-<dd>
-</dd>
-<dt><i>*args</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.fromstring-function' name='PIL.Image.fromstring-function'><b>fromstring(mode, size, data, decoder_name=&quot;raw&quot;, *args)</b></a> [<a href='#PIL.Image.fromstring-function'>#</a>]</dt>
-<dd>
-<p>Creates an image memory from pixel data in a string.
-</p><p>
-In its simplest form, this function takes three arguments
-(mode, size, and unpacked pixel data).
-</p><p>
-You can also use any pixel decoder supported by PIL.  For more
-information on available decoders, see the section <a href="pil-decoder.htm"><i>Writing Your Own File Decoder</i></a>.
-</p><p>
-Note that this function decodes pixel data only, not entire images.
-If you have an entire image in a string, wrap it in a
-<b>StringIO</b> object, and use <a class="link" href="#PIL.Image.open-function"><b>open</b></a> to load it.
-
-</p><dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>data</i></dt>
-<dd>
-</dd>
-<dt><i>decoder_name</i></dt>
-<dd>
-</dd>
-<dt><i>*args</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.getmodebandnames-function' name='PIL.Image.getmodebandnames-function'><b>getmodebandnames(mode)</b></a> [<a href='#PIL.Image.getmodebandnames-function'>#</a>]</dt>
-<dd>
-<p>Gets a list of individual band names.  Given a mode, this function
-returns a tuple containing the names of individual bands (use
-<a class="link" href="#PIL.Image.getmodetype-function"><b>getmodetype</b></a> to get the mode used to store each individual
-band.
-
-</p><dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>KeyError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.getmodebands-function' name='PIL.Image.getmodebands-function'><b>getmodebands(mode)</b></a> [<a href='#PIL.Image.getmodebands-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>KeyError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.getmodebase-function' name='PIL.Image.getmodebase-function'><b>getmodebase(mode)</b></a> [<a href='#PIL.Image.getmodebase-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>KeyError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.getmodetype-function' name='PIL.Image.getmodetype-function'><b>getmodetype(mode)</b></a> [<a href='#PIL.Image.getmodetype-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>KeyError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><b>Image()</b> (class) [<a href='#PIL.Image.Image-class'>#</a>]</dt>
-<dd>
-<p>This class represents an image object.</p>
-<p>For more information about this class, see <a href='#PIL.Image.Image-class'><i>The Image Class</i></a>.</p>
-</dd>
-<dt><a id='PIL.Image.init-function' name='PIL.Image.init-function'><b>init()</b></a> [<a href='#PIL.Image.init-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.Image.isDirectory-function' name='PIL.Image.isDirectory-function'><b>isDirectory(f)</b></a> [<a href='#PIL.Image.isDirectory-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.Image.isImageType-function' name='PIL.Image.isImageType-function'><b>isImageType(t)</b></a> [<a href='#PIL.Image.isImageType-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.Image.isStringType-function' name='PIL.Image.isStringType-function'><b>isStringType(t)</b></a> [<a href='#PIL.Image.isStringType-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.Image.isTupleType-function' name='PIL.Image.isTupleType-function'><b>isTupleType(t)</b></a> [<a href='#PIL.Image.isTupleType-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.Image.merge-function' name='PIL.Image.merge-function'><b>merge(mode, bands)</b></a> [<a href='#PIL.Image.merge-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt><i>bands</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.new-function' name='PIL.Image.new-function'><b>new(mode, size, color=0)</b></a> [<a href='#PIL.Image.new-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>color</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.open-function' name='PIL.Image.open-function'><b>open(file, mode=&quot;r&quot;)</b></a> [<a href='#PIL.Image.open-function'>#</a>]</dt>
-<dd>
-<p>Opens and identifies the given image file.
-</p><p>
-This is a lazy operation; this function identifies the file, but the
-actual image data is not read from the file until you try to process
-the data (or call the <a class="link" href="#PIL.Image.Image.load-method"><b>load</b></a> method).
-
-</p><dl>
-<dt><i>file</i></dt>
-<dd>
-A filename (string) or a file object.  The file object
-   must implement <b>read</b>, <b>seek</b>, and <b>tell</b> methods,
-   and be opened in binary mode.
-</dd>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>IOError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.preinit-function' name='PIL.Image.preinit-function'><b>preinit()</b></a> [<a href='#PIL.Image.preinit-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.Image.register_extension-function' name='PIL.Image.register_extension-function'><b>register_extension(id, extension)</b></a> [<a href='#PIL.Image.register_extension-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>id</i></dt>
-<dd>
-</dd>
-<dt><i>extension</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.register_mime-function' name='PIL.Image.register_mime-function'><b>register_mime(id, mimetype)</b></a> [<a href='#PIL.Image.register_mime-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>id</i></dt>
-<dd>
-</dd>
-<dt><i>mimetype</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.register_open-function' name='PIL.Image.register_open-function'><b>register_open(id, factory, accept=None)</b></a> [<a href='#PIL.Image.register_open-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>id</i></dt>
-<dd>
-</dd>
-<dt><i>factory</i></dt>
-<dd>
-</dd>
-<dt><i>accept</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.register_save-function' name='PIL.Image.register_save-function'><b>register_save(id, driver)</b></a> [<a href='#PIL.Image.register_save-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>id</i></dt>
-<dd>
-</dd>
-<dt><i>driver</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.Image.Image-class' name='PIL.Image.Image-class'>The Image Class</a></h2>
-<dl>
-<dt><b>Image()</b> (class) [<a href='#PIL.Image.Image-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.Image.Image.convert-method' name='PIL.Image.Image.convert-method'><b>convert(mode, matrix=None)</b></a> [<a href='#PIL.Image.Image.convert-method'>#</a>]</dt>
-<dd>
-<p>Returns a converted copy of this image. For the "P" mode, this
-method translates pixels through the palette.  If mode is
-omitted, a mode is chosen so that all information in the image
-and the palette can be represented without a palette.
-</p><p>
-The current version supports all possible conversions between
-"L", "RGB" and "CMYK."
-</p><p>
-When translating a colour image to black and white (mode "L"),
-the library uses the ITU-R 601-2 luma transform:
-</p><p>
-<b>L = R * 299/1000 + G * 587/1000 + B * 114/1000</b>
-</p><p>
-When translating a greyscale image into a bilevel image (mode
-"1"), all non-zero values are set to 255 (white). To use other
-thresholds, use the <a class="link" href="#PIL.Image.Image.point-method"><b>point</b></a> method.
-
-</p><dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt><i>matrix</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.copy-method' name='PIL.Image.Image.copy-method'><b>copy()</b></a> [<a href='#PIL.Image.Image.copy-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.crop-method' name='PIL.Image.Image.crop-method'><b>crop(box=None)</b></a> [<a href='#PIL.Image.Image.crop-method'>#</a>]</dt>
-<dd>
-<p>Returns a rectangular region from this image. The box is a
-4-tuple defining the left, upper, right, and lower pixel
-coordinate.
-</p><p>
-This is a lazy operation.  Changes to the source image may or
-may not be reflected in the cropped image.  To break the
-connection, call the <a class="link" href="#PIL.Image.Image.load-method"><b>load</b></a> method on the cropped
-copy.
-
-</p><dl>
-<dt><i>The</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.draft-method' name='PIL.Image.Image.draft-method'><b>draft(mode, size)</b></a> [<a href='#PIL.Image.Image.draft-method'>#</a>]</dt>
-<dd>
-<p>Configures the image file loader so it returns a version of the
-image that as closely as possible matches the given mode and
-size.  For example, you can use this method to convert a colour
-JPEG to greyscale while loading it, or to extract a 128x192
-version from a PCD file.
-</p><p>
-Note that this method modifies the Image object in place.  If
-the image has already been loaded, this method has no effect.
-
-</p><dl>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.filter-method' name='PIL.Image.Image.filter-method'><b>filter(filter)</b></a> [<a href='#PIL.Image.Image.filter-method'>#</a>]</dt>
-<dd>
-<p>Filters this image using the given filter.  For a list of
-available filters, see the <b>ImageFilter</b> module.
-
-</p><dl>
-<dt><i>filter</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.fromstring-method' name='PIL.Image.Image.fromstring-method'><b>fromstring(data, decoder_name=&quot;raw&quot;, *args)</b></a> [<a href='#PIL.Image.Image.fromstring-method'>#</a>]</dt>
-<dd>
-<p>Loads this image with pixel data from a string.
-</p><p>
-This method is similar to the <a class="link" href="#PIL.Image.fromstring-function"><b>fromstring</b></a> function, but
-loads data into this image instead of creating a new image
-object.
-</p></dd>
-<dt><a id='PIL.Image.Image.getbands-method' name='PIL.Image.Image.getbands-method'><b>getbands()</b></a> [<a href='#PIL.Image.Image.getbands-method'>#</a>]</dt>
-<dd>
-<p>Returns a tuple containing the name of each band in this image.
-For example, <b>getbands</b> on an RGB image returns ("R", "G", "B").
-
-</p><dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.getbbox-method' name='PIL.Image.Image.getbbox-method'><b>getbbox()</b></a> [<a href='#PIL.Image.Image.getbbox-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.getcolors-method' name='PIL.Image.Image.getcolors-method'><b>getcolors(maxcolors=256)</b></a> [<a href='#PIL.Image.Image.getcolors-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>maxcolors</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.getdata-method' name='PIL.Image.Image.getdata-method'><b>getdata(band=None)</b></a> [<a href='#PIL.Image.Image.getdata-method'>#</a>]</dt>
-<dd>
-<p>Returns the contents of this image as a sequence object
-containing pixel values.  The sequence object is flattened, so
-that values for line one follow directly after the values of
-line zero, and so on.
-</p><p>
-Note that the sequence object returned by this method is an
-internal PIL data type, which only supports certain sequence
-operations.  To convert it to an ordinary sequence (e.g. for
-printing), use <b>list(im.getdata())</b>.
-
-</p><dl>
-<dt><i>band</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.getextrema-method' name='PIL.Image.Image.getextrema-method'><b>getextrema()</b></a> [<a href='#PIL.Image.Image.getextrema-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.getim-method' name='PIL.Image.Image.getim-method'><b>getim()</b></a> [<a href='#PIL.Image.Image.getim-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.getpalette-method' name='PIL.Image.Image.getpalette-method'><b>getpalette()</b></a> [<a href='#PIL.Image.Image.getpalette-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.getpixel-method' name='PIL.Image.Image.getpixel-method'><b>getpixel(xy)</b></a> [<a href='#PIL.Image.Image.getpixel-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>xy</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.getprojection-method' name='PIL.Image.Image.getprojection-method'><b>getprojection()</b></a> [<a href='#PIL.Image.Image.getprojection-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.histogram-method' name='PIL.Image.Image.histogram-method'><b>histogram(mask=None)</b></a> [<a href='#PIL.Image.Image.histogram-method'>#</a>]</dt>
-<dd>
-<p>Returns a histogram for the image. The histogram is returned as
-a list of pixel counts, one for each pixel value in the source
-image. If the image has more than one band, the histograms for
-all bands are concatenated (for example, the histogram for an
-"RGB" image contains 768 values).
-</p><p>
-A bilevel image (mode "1") is treated as a greyscale ("L") image
-by this method.
-</p><p>
-If a mask is provided, the method returns a histogram for those
-parts of the image where the mask image is non-zero. The mask
-image must have the same size as the image, and be either a
-bi-level image (mode "1") or a greyscale image ("L").
-
-</p><dl>
-<dt><i>mask</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.load-method' name='PIL.Image.Image.load-method'><b>load()</b></a> [<a href='#PIL.Image.Image.load-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.offset-method' name='PIL.Image.Image.offset-method'><b>offset(xoffset, yoffset=None)</b></a> [<a href='#PIL.Image.Image.offset-method'>#</a>]</dt>
-<dd>
-<p>(Deprecated) Returns a copy of the image where the data has been
-offset by the given distances. Data wraps around the edges. If
-yoffset is omitted, it is assumed to be equal to xoffset.
-</p><p>
-This method is deprecated. New code should use the <b>offset</b>
-function in the <b>ImageChops</b> module.
-
-</p><dl>
-<dt><i>xoffset</i></dt>
-<dd>
-</dd>
-<dt><i>yoffset</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.paste-method' name='PIL.Image.Image.paste-method'><b>paste(im, box=None, mask=None)</b></a> [<a href='#PIL.Image.Image.paste-method'>#</a>]</dt>
-<dd>
-<p>Pastes another image into this image. The box argument is either
-a 2-tuple giving the upper left corner, a 4-tuple defining the
-left, upper, right, and lower pixel coordinate, or None (same as
-(0, 0)).  If a 4-tuple is given, the size of the pasted image
-must match the size of the region.
-</p><p>
-If the modes don't match, the pasted image is converted to the
-mode of this image (see the <a class="link" href="#PIL.Image.Image.convert-method"><b>convert</b></a> method for
-details).
-</p><p>
-Instead of an image, the source can be a integer or tuple
-containing pixel values.  The method then fills the region
-with the given colour.  When creating RGB images, you can
-also use colour strings as supported by the ImageColor module.
-</p><p>
-If a mask is given, this method updates only the regions
-indicated by the mask.  You can use either "1", "L" or "RGBA"
-images (in the latter case, the alpha band is used as mask).
-Where the mask is 255, the given image is copied as is.  Where
-the mask is 0, the current value is preserved.  Intermediate
-values can be used for transparency effects.
-</p><p>
-Note that if you paste an "RGBA" image, the alpha band is
-ignored.  You can work around this by using the same image as
-both source image and mask.
-
-</p><dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-<dt><i>box</i></dt>
-<dd>
-<p>An optional 4-tuple giving the region to paste into.
-   If a 2-tuple is used instead, it's treated as the upper left
-   corner.  If omitted or None, the source is pasted into the
-   upper left corner.
-   </p><p>
-   If an image is given as the second argument and there is no
-   third, the box defaults to (0, 0), and the second argument
-   is interpreted as a mask image.
-</p></dd>
-<dt><i>mask</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.point-method' name='PIL.Image.Image.point-method'><b>point(lut, mode=None)</b></a> [<a href='#PIL.Image.Image.point-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>lut</i></dt>
-<dd>
-</dd>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.putalpha-method' name='PIL.Image.Image.putalpha-method'><b>putalpha(alpha)</b></a> [<a href='#PIL.Image.Image.putalpha-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.putdata-method' name='PIL.Image.Image.putdata-method'><b>putdata(data, scale=1.0, offset=0.0)</b></a> [<a href='#PIL.Image.Image.putdata-method'>#</a>]</dt>
-<dd>
-<p>Copies pixel data to this image.  This method copies data from a
-sequence object into the image, starting at the upper left
-corner (0, 0), and continuing until either the image or the
-sequence ends.  The scale and offset values are used to adjust
-the sequence values: <b>pixel = value*scale + offset</b>.
-
-</p><dl>
-<dt><i>data</i></dt>
-<dd>
-</dd>
-<dt><i>scale</i></dt>
-<dd>
-</dd>
-<dt><i>offset</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.putpalette-method' name='PIL.Image.Image.putpalette-method'><b>putpalette(data)</b></a> [<a href='#PIL.Image.Image.putpalette-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>data</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.putpixel-method' name='PIL.Image.Image.putpixel-method'><b>putpixel(xy, value)</b></a> [<a href='#PIL.Image.Image.putpixel-method'>#</a>]</dt>
-<dd>
-<p>Modifies the pixel at the given position. The colour is given as
-a single numerical value for single-band images, and a tuple for
-multi-band images.
-</p><p>
-Note that this method is relatively slow.  For more extensive
-changes, use <a class="link" href="#PIL.Image.Image.paste-method"><b>paste</b></a> or the <b>ImageDraw</b> module
-instead.
-
-</p><dl>
-<dt><i>xy</i></dt>
-<dd>
-</dd>
-<dt><i>value</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.resize-method' name='PIL.Image.Image.resize-method'><b>resize(size, filter=NEAREST)</b></a> [<a href='#PIL.Image.Image.resize-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>filter</i></dt>
-<dd>
-An optional resampling filter.  This can be
-   one of <b>NEAREST</b> (use nearest neighbour), <b>BILINEAR</b>
-   (linear interpolation in a 2x2 environment), <b>BICUBIC</b>
-   (cubic spline interpolation in a 4x4 environment), or
-   <b>ANTIALIAS</b> (a high-quality downsampling filter).
-   If omitted, or if the image has mode "1" or "P", it is
-   set <b>NEAREST</b>.
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.rotate-method' name='PIL.Image.Image.rotate-method'><b>rotate(angle, filter=NEAREST)</b></a> [<a href='#PIL.Image.Image.rotate-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>angle</i></dt>
-<dd>
-</dd>
-<dt><i>filter</i></dt>
-<dd>
-An optional resampling filter.  This can be
-   one of <b>NEAREST</b> (use nearest neighbour), <b>BILINEAR</b>
-   (linear interpolation in a 2x2 environment), or <b>BICUBIC</b>
-   (cubic spline interpolation in a 4x4 environment).
-   If omitted, or if the image has mode "1" or "P", it is
-   set <b>NEAREST</b>.
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.save-method' name='PIL.Image.Image.save-method'><b>save(file, format=None, **options)</b></a> [<a href='#PIL.Image.Image.save-method'>#</a>]</dt>
-<dd>
-<p>Saves this image under the given filename.  If no format is
-specified, the format to use is determined from the filename
-extension, if possible.
-</p><p>
-Keyword options can be used to provide additional instructions
-to the writer. If a writer doesn't recognise an option, it is
-silently ignored. The available options are described later in
-this handbook.
-</p><p>
-You can use a file object instead of a filename. In this case,
-you must always specify the format. The file object must
-implement the <b>seek</b>, <b>tell</b>, and <b>write</b>
-methods, and be opened in binary mode.
-
-</p><dl>
-<dt><i>file</i></dt>
-<dd>
-</dd>
-<dt><i>format</i></dt>
-<dd>
-</dd>
-<dt><i>**options</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>KeyError</b>:</dt><dd>
-</dd>
-<dt>Raises <b>IOError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.seek-method' name='PIL.Image.Image.seek-method'><b>seek(frame)</b></a> [<a href='#PIL.Image.Image.seek-method'>#</a>]</dt>
-<dd>
-<p>Seeks to the given frame in this sequence file. If you seek
-beyond the end of the sequence, the method raises an
-<b>EOFError</b> exception. When a sequence file is opened, the
-library automatically seeks to frame 0.
-</p><p>
-Note that in the current version of the library, most sequence
-formats only allows you to seek to the next frame.
-
-</p><dl>
-<dt><i>frame</i></dt>
-<dd>
-</dd>
-<dt>Raises <b>EOFError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.show-method' name='PIL.Image.Image.show-method'><b>show(title=None)</b></a> [<a href='#PIL.Image.Image.show-method'>#</a>]</dt>
-<dd>
-<p>Displays this image. This method is mainly intended for
-debugging purposes.
-</p><p>
-On Unix platforms, this method saves the image to a temporary
-PPM file, and calls the <b>xv</b> utility.
-</p><p>
-On Windows, it saves the image to a temporary BMP file, and uses
-the standard BMP display utility to show it (usually Paint).
-
-</p><dl>
-<dt><i>title</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.split-method' name='PIL.Image.Image.split-method'><b>split()</b></a> [<a href='#PIL.Image.Image.split-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.tell-method' name='PIL.Image.Image.tell-method'><b>tell()</b></a> [<a href='#PIL.Image.Image.tell-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.thumbnail-method' name='PIL.Image.Image.thumbnail-method'><b>thumbnail(size, resample=NEAREST)</b></a> [<a href='#PIL.Image.Image.thumbnail-method'>#</a>]</dt>
-<dd>
-<p>Make this image into a thumbnail.  This method modifies the
-image to contain a thumbnail version of itself, no larger than
-the given size.  This method calculates an appropriate thumbnail
-size to preserve the aspect of the image, calls the <a class="link" href="#PIL.Image.Image.draft-method"><b>draft</b></a> method to configure the file reader (where
-applicable), and finally resizes the image.
-</p><p>
-Note that the bilinear and bicubic filters in the current
-version of PIL are not well-suited for thumbnail generation.
-You should use <b>ANTIALIAS</b> unless speed is much more
-important than quality.
-</p><p>
-Also note that this function modifies the Image object in place.
-If you need to use the full resolution image as well, apply this
-method to a <a class="link" href="#PIL.Image.Image.copy-method"><b>copy</b></a> of the original image.
-
-</p><dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>resample</i></dt>
-<dd>
-Optional resampling filter.  This can be one
-   of <b>NEAREST</b>, <b>BILINEAR</b>, <b>BICUBIC</b>, or
-   <b>ANTIALIAS</b> (best quality).  If omitted, it defaults
-   to <b>NEAREST</b> (this will be changed to ANTIALIAS in a
-   future version).
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.tobitmap-method' name='PIL.Image.Image.tobitmap-method'><b>tobitmap(name=&quot;image&quot;)</b></a> [<a href='#PIL.Image.Image.tobitmap-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>name</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>ValueError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.tostring-method' name='PIL.Image.Image.tostring-method'><b>tostring(encoder_name=&quot;raw&quot;, *args)</b></a> [<a href='#PIL.Image.Image.tostring-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>encoder_name</i></dt>
-<dd>
-</dd>
-<dt><i>*args</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.transform-method' name='PIL.Image.Image.transform-method'><b>transform(size, method, data, resample=NEAREST)</b></a> [<a href='#PIL.Image.Image.transform-method'>#</a>]</dt>
-<dd>
-<p>Transforms this image.  This method creates a new image with the
-given size, and the same mode as the original, and copies data
-to the new image using the given transform.
-</p><p>
-</p><dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>method</i></dt>
-<dd>
-The transformation method.  This is one of
-  <b>EXTENT</b> (cut out a rectangular subregion), <b>AFFINE</b>
-  (affine transform), <b>PERSPECTIVE</b> (perspective
-  transform), <b>QUAD</b> (map a quadrilateral to a
-  rectangle), or <b>MESH</b> (map a number of source quadrilaterals
-  in one operation).
-</dd>
-<dt><i>data</i></dt>
-<dd>
-</dd>
-<dt><i>resample</i></dt>
-<dd>
-Optional resampling filter.  It can be one of
-   <b>NEAREST</b> (use nearest neighbour), <b>BILINEAR</b>
-   (linear interpolation in a 2x2 environment), or
-   <b>BICUBIC</b> (cubic spline interpolation in a 4x4
-   environment). If omitted, or if the image has mode
-   "1" or "P", it is set to <b>NEAREST</b>.
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.transpose-method' name='PIL.Image.Image.transpose-method'><b>transpose(method)</b></a> [<a href='#PIL.Image.Image.transpose-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>method</i></dt>
-<dd>
-One of <b>FLIP_LEFT_RIGHT</b>, <b>FLIP_TOP_BOTTOM</b>,
-<b>ROTATE_90</b>, <b>ROTATE_180</b>, or <b>ROTATE_270</b>.
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.Image.Image.verify-method' name='PIL.Image.Image.verify-method'><b>verify()</b></a> [<a href='#PIL.Image.Image.verify-method'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageChops.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageChops.html
deleted file mode 100644
index 2e665b5774..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageChops.html
+++ /dev/null
@@ -1,282 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageChops Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageChops Module</h1>
-<p>The <b>ImageChops</b> module contains a number of arithmetical image
-operations, called <i>channel operations</i> ("chops"). These can be
-used for various purposes, including special effects, image
-compositions, algorithmic painting, and more.
-</p><p>
-At this time, channel operations are only implemented for 8-bit
-images (e.g. "L" and "RGB").
-</p><p>
-Most channel operations take one or two image arguments and returns
-a new image.  Unless otherwise noted, the result of a channel
-operation is always clipped to the range 0 to MAX (which is 255 for
-all modes supported by the operations in this module).
-</p><h2>Module Contents</h2>
-<dl>
-<dt><a id='PIL.ImageChops.add-function' name='PIL.ImageChops.add-function'><b>add(image1, image2, scale=1.0, offset=0)</b></a> [<a href='#PIL.ImageChops.add-function'>#</a>]</dt>
-<dd>
-<p>Add images
-((image1 + image2) / scale + offset).
-</p><p>
-Adds two images, dividing the result by scale and adding the
-offset. If omitted, scale defaults to 1.0, and offset to 0.0.
-
-</p><dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.add_modulo-function' name='PIL.ImageChops.add_modulo-function'><b>add_modulo(image1, image2)</b></a> [<a href='#PIL.ImageChops.add_modulo-function'>#</a>]</dt>
-<dd>
-<p>Add images without clipping
-((image1 + image2) % MAX).
-</p><p>
-Adds two images, without clipping the result.
-
-</p><dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.blend-function' name='PIL.ImageChops.blend-function'><b>blend(image1, image2, alpha)</b></a> [<a href='#PIL.ImageChops.blend-function'>#</a>]</dt>
-<dd>
-<p>Blend images using constant transparency weight.
-</p><p>
-Same as the <b>blend</b> function in the <b>Image</b> module.
-</p></dd>
-<dt><a id='PIL.ImageChops.composite-function' name='PIL.ImageChops.composite-function'><b>composite(image1, image2, mask)</b></a> [<a href='#PIL.ImageChops.composite-function'>#</a>]</dt>
-<dd>
-<p>Create composite using transparency mask.
-</p><p>
-Same as the <b>composite</b> function in the <b>Image</b> module.
-</p></dd>
-<dt><a id='PIL.ImageChops.constant-function' name='PIL.ImageChops.constant-function'><b>constant(image, value)</b></a> [<a href='#PIL.ImageChops.constant-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>value</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.darker-function' name='PIL.ImageChops.darker-function'><b>darker(image1, image2)</b></a> [<a href='#PIL.ImageChops.darker-function'>#</a>]</dt>
-<dd>
-<p>Compare images, and return darker pixel value
-(min(image1, image2)).
-</p><p>
-Compares the two images, pixel by pixel, and returns a new image
-containing the darker values.
-
-</p><dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.difference-function' name='PIL.ImageChops.difference-function'><b>difference(image1, image2)</b></a> [<a href='#PIL.ImageChops.difference-function'>#</a>]</dt>
-<dd>
-<p>Calculate absolute difference
-(abs(image1 - image2)).
-</p><p>
-Returns the absolute value of the difference between the two images.
-
-</p><dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.duplicate-function' name='PIL.ImageChops.duplicate-function'><b>duplicate(image)</b></a> [<a href='#PIL.ImageChops.duplicate-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.invert-function' name='PIL.ImageChops.invert-function'><b>invert(image)</b></a> [<a href='#PIL.ImageChops.invert-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.lighter-function' name='PIL.ImageChops.lighter-function'><b>lighter(image1, image2)</b></a> [<a href='#PIL.ImageChops.lighter-function'>#</a>]</dt>
-<dd>
-<p>Compare images, and return lighter pixel value
-(max(image1, image2)).
-</p><p>
-Compares the two images, pixel by pixel, and returns a new image
-containing the lighter values.
-
-</p><dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.logical_and-function' name='PIL.ImageChops.logical_and-function'><b>logical_and(image1, image2)</b></a> [<a href='#PIL.ImageChops.logical_and-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageChops.logical_or-function' name='PIL.ImageChops.logical_or-function'><b>logical_or(image1, image2)</b></a> [<a href='#PIL.ImageChops.logical_or-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageChops.logical_xor-function' name='PIL.ImageChops.logical_xor-function'><b>logical_xor(image1, image2)</b></a> [<a href='#PIL.ImageChops.logical_xor-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageChops.multiply-function' name='PIL.ImageChops.multiply-function'><b>multiply(image1, image2)</b></a> [<a href='#PIL.ImageChops.multiply-function'>#</a>]</dt>
-<dd>
-<p>Superimpose positive images
-(image1 * image2 / MAX).
-</p><p>
-Superimposes two images on top of each other. If you multiply an
-image with a solid black image, the result is black. If you multiply
-with a solid white image, the image is unaffected.
-
-</p><dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.offset-function' name='PIL.ImageChops.offset-function'><b>offset(image, xoffset, yoffset=None)</b></a> [<a href='#PIL.ImageChops.offset-function'>#</a>]</dt>
-<dd>
-<p>Offset image data.
-</p><p>
-Returns a copy of the image where data has been offset by the given
-distances.  Data wraps around the edges.  If yoffset is omitted, it
-is assumed to be equal to xoffset.
-
-</p><dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>xoffset</i></dt>
-<dd>
-</dd>
-<dt><i>yoffset</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.screen-function' name='PIL.ImageChops.screen-function'><b>screen(image1, image2)</b></a> [<a href='#PIL.ImageChops.screen-function'>#</a>]</dt>
-<dd>
-<p>Superimpose negative images
-(MAX - ((MAX - image1) * (MAX - image2) / MAX)).
-</p><p>
-Superimposes two inverted images on top of each other.
-
-</p><dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.subtract-function' name='PIL.ImageChops.subtract-function'><b>subtract(image1, image2, scale=1.0, offset=0)</b></a> [<a href='#PIL.ImageChops.subtract-function'>#</a>]</dt>
-<dd>
-<p>Subtract images
-((image1 - image2) / scale + offset).
-</p><p>
-Subtracts two images, dividing the result by scale and adding the
-offset. If omitted, scale defaults to 1.0, and offset to 0.0.
-
-</p><dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageChops.subtract_modulo-function' name='PIL.ImageChops.subtract_modulo-function'><b>subtract_modulo(image1, image2)</b></a> [<a href='#PIL.ImageChops.subtract_modulo-function'>#</a>]</dt>
-<dd>
-<p>Subtract images without clipping
-((image1 - image2) % MAX).
-</p><p>
-Subtracts two images, without clipping the result.
-
-</p><dl>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt><i>image1</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageColor.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageColor.html
deleted file mode 100644
index b409ccff94..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageColor.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageColor Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageColor Module</h1>
-<dl>
-<dt><a id='PIL.ImageColor.getrgb-function' name='PIL.ImageColor.getrgb-function'><b>getrgb(color)</b></a> [<a href='#PIL.ImageColor.getrgb-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>color</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>ValueError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageDraw.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageDraw.html
deleted file mode 100644
index 1e72665f48..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageDraw.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageDraw Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageDraw Module</h1>
-<dl>
-<dt><a id='PIL.ImageDraw.Draw-function' name='PIL.ImageDraw.Draw-function'><b>Draw(im, mode=None)</b></a> [<a href='#PIL.ImageDraw.Draw-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageDraw.getdraw-function' name='PIL.ImageDraw.getdraw-function'><b>getdraw(im=None, hints=None)</b></a> [<a href='#PIL.ImageDraw.getdraw-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-<dt><i>hints</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><b>ImageDraw(im, mode=None)</b> (class) [<a href='#PIL.ImageDraw.ImageDraw-class'>#</a>]</dt>
-<dd>
-<p>A simple 2D drawing interface for PIL images.</p>
-<p>For more information about this class, see <a href='#PIL.ImageDraw.ImageDraw-class'><i>The ImageDraw Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageDraw.ImageDraw-class' name='PIL.ImageDraw.ImageDraw-class'>The ImageDraw Class</a></h2>
-<dl>
-<dt><b>ImageDraw(im, mode=None)</b> (class) [<a href='#PIL.ImageDraw.ImageDraw-class'>#</a>]</dt>
-<dd>
-<p>A simple 2D drawing interface for PIL images.
-</p><p>
-Application code should use the <b>Draw</b> factory, instead of
-directly.
-</p></dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.__init__-method' name='PIL.ImageDraw.ImageDraw.__init__-method'><b>__init__(im, mode=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-<dt><i>mode</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.arc-method' name='PIL.ImageDraw.ImageDraw.arc-method'><b>arc(xy, start, end, fill=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.arc-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.bitmap-method' name='PIL.ImageDraw.ImageDraw.bitmap-method'><b>bitmap(xy, bitmap, fill=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.bitmap-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.chord-method' name='PIL.ImageDraw.ImageDraw.chord-method'><b>chord(xy, start, end, fill=None, outline=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.chord-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.ellipse-method' name='PIL.ImageDraw.ImageDraw.ellipse-method'><b>ellipse(xy, fill=None, outline=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.ellipse-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.getfont-method' name='PIL.ImageDraw.ImageDraw.getfont-method'><b>getfont()</b></a> [<a href='#PIL.ImageDraw.ImageDraw.getfont-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.line-method' name='PIL.ImageDraw.ImageDraw.line-method'><b>line(xy, fill=None, width=0)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.line-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.pieslice-method' name='PIL.ImageDraw.ImageDraw.pieslice-method'><b>pieslice(xy, start, end, fill=None, outline=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.pieslice-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.point-method' name='PIL.ImageDraw.ImageDraw.point-method'><b>point(xy, fill=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.point-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.polygon-method' name='PIL.ImageDraw.ImageDraw.polygon-method'><b>polygon(xy, fill=None, outline=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.polygon-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.rectangle-method' name='PIL.ImageDraw.ImageDraw.rectangle-method'><b>rectangle(xy, fill=None, outline=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.rectangle-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.setfill-method' name='PIL.ImageDraw.ImageDraw.setfill-method'><b>setfill(onoff)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.setfill-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.setfont-method' name='PIL.ImageDraw.ImageDraw.setfont-method'><b>setfont(font)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.setfont-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.setink-method' name='PIL.ImageDraw.ImageDraw.setink-method'><b>setink(ink)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.setink-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.shape-method' name='PIL.ImageDraw.ImageDraw.shape-method'><b>shape(shape, fill=None, outline=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.shape-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.text-method' name='PIL.ImageDraw.ImageDraw.text-method'><b>text(xy, text, fill=None, font=None, anchor=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.text-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageDraw.ImageDraw.textsize-method' name='PIL.ImageDraw.ImageDraw.textsize-method'><b>textsize(text, font=None)</b></a> [<a href='#PIL.ImageDraw.ImageDraw.textsize-method'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageEnhance.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageEnhance.html
deleted file mode 100644
index e7493d0986..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageEnhance.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageEnhance Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageEnhance Module</h1>
-<dl>
-<dt><b>Brightness(image)</b> (class) [<a href='#PIL.ImageEnhance.Brightness-class'>#</a>]</dt>
-<dd>
-<p>Brightness enhancement object.</p>
-<p>For more information about this class, see <a href='#PIL.ImageEnhance.Brightness-class'><i>The Brightness Class</i></a>.</p>
-</dd>
-<dt><b>Color(image)</b> (class) [<a href='#PIL.ImageEnhance.Color-class'>#</a>]</dt>
-<dd>
-<p>Color enhancement object.</p>
-<p>For more information about this class, see <a href='#PIL.ImageEnhance.Color-class'><i>The Color Class</i></a>.</p>
-</dd>
-<dt><b>Contrast(image)</b> (class) [<a href='#PIL.ImageEnhance.Contrast-class'>#</a>]</dt>
-<dd>
-<p>Contrast enhancement object.</p>
-<p>For more information about this class, see <a href='#PIL.ImageEnhance.Contrast-class'><i>The Contrast Class</i></a>.</p>
-</dd>
-<dt><b>Sharpness(image)</b> (class) [<a href='#PIL.ImageEnhance.Sharpness-class'>#</a>]</dt>
-<dd>
-<p>Sharpness enhancement object.</p>
-<p>For more information about this class, see <a href='#PIL.ImageEnhance.Sharpness-class'><i>The Sharpness Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageEnhance.Brightness-class' name='PIL.ImageEnhance.Brightness-class'>The Brightness Class</a></h2>
-<dl>
-<dt><b>Brightness(image)</b> (class) [<a href='#PIL.ImageEnhance.Brightness-class'>#</a>]</dt>
-<dd>
-<p>Brightness enhancement object.
-</p><p>
-This class can be used to control the brighntess of an image.  An
-enhancement factor of 0.0 gives a black image, factor 1.0 gives the
-original image.
-</p></dd>
-</dl>
-<h2><a id='PIL.ImageEnhance.Color-class' name='PIL.ImageEnhance.Color-class'>The Color Class</a></h2>
-<dl>
-<dt><b>Color(image)</b> (class) [<a href='#PIL.ImageEnhance.Color-class'>#</a>]</dt>
-<dd>
-<p>Color enhancement object.
-</p><p>
-This class can be used to adjust the colour balance of an image, in
-a manner similar to the controls on a colour TV set.  An enhancement
-factor of 0.0 gives a black and white image, a factor of 1.0 gives
-the original image.
-</p></dd>
-</dl>
-<h2><a id='PIL.ImageEnhance.Contrast-class' name='PIL.ImageEnhance.Contrast-class'>The Contrast Class</a></h2>
-<dl>
-<dt><b>Contrast(image)</b> (class) [<a href='#PIL.ImageEnhance.Contrast-class'>#</a>]</dt>
-<dd>
-<p>Contrast enhancement object.
-</p><p>
-This class can be used to control the contrast of an image, similar
-to the contrast control on a TV set.  An enhancement factor of 0.0
-gives an solid grey image, factor 1.0 gives the original image.
-</p></dd>
-</dl>
-<h2><a id='PIL.ImageEnhance.Sharpness-class' name='PIL.ImageEnhance.Sharpness-class'>The Sharpness Class</a></h2>
-<dl>
-<dt><b>Sharpness(image)</b> (class) [<a href='#PIL.ImageEnhance.Sharpness-class'>#</a>]</dt>
-<dd>
-<p>Sharpness enhancement object.
-</p><p>
-This class can be used to adjust the sharpness of an image.  The
-enhancement factor 0.0 gives a blurred image, 1.0 gives the original
-image, and a factor of 2.0 gives a sharpened image.
-</p></dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageFile.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageFile.html
deleted file mode 100644
index 6755b69ae1..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageFile.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageFile Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageFile Module</h1>
-<dl>
-<dt><b>_ParserFile(data)</b> (class) [<a href='#PIL.ImageFile._ParserFile-class'>#</a>]</dt>
-<dd>
-<p>(Internal) Support class for the Parser file.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFile._ParserFile-class'><i>The _ParserFile Class</i></a>.</p>
-</dd>
-<dt><a id='PIL.ImageFile._safe_read-function' name='PIL.ImageFile._safe_read-function'><b>_safe_read(fp, size)</b></a> [<a href='#PIL.ImageFile._safe_read-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>fp</i></dt>
-<dd>
-File handle.  Must implement a <b>read</b> method.
-</dd>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-A string containing up to <i>size</i> bytes of data.
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageFile._save-function' name='PIL.ImageFile._save-function'><b>_save(im, fp, tile)</b></a> [<a href='#PIL.ImageFile._save-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-<dt><i>fp</i></dt>
-<dd>
-</dd>
-<dt><i>tile</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><b>ImageFile(fp=None, filename=None)</b> (class) [<a href='#PIL.ImageFile.ImageFile-class'>#</a>]</dt>
-<dd>
-<p>Base class for image file handlers.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFile.ImageFile-class'><i>The ImageFile Class</i></a>.</p>
-</dd>
-<dt><b>Parser</b> (class)  [<a href='#PIL.ImageFile.Parser-class'>#</a>]</dt>
-<dd>
-<p>Incremental image parser.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFile.Parser-class'><i>The Parser Class</i></a>.</p>
-</dd>
-<dt><b>StubImageFile</b> (class)  [<a href='#PIL.ImageFile.StubImageFile-class'>#</a>]</dt>
-<dd>
-<p>Base class for stub image loaders.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFile.StubImageFile-class'><i>The StubImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFile._ParserFile-class' name='PIL.ImageFile._ParserFile-class'>The _ParserFile Class</a></h2>
-<dl>
-<dt><b>_ParserFile(data)</b> (class) [<a href='#PIL.ImageFile._ParserFile-class'>#</a>]</dt>
-<dd>
-<p>(Internal) Support class for the <b>Parser</b> file.
-</p></dd>
-</dl>
-<h2><a id='PIL.ImageFile.ImageFile-class' name='PIL.ImageFile.ImageFile-class'>The ImageFile Class</a></h2>
-<dl>
-<dt><b>ImageFile(fp=None, filename=None)</b> (class) [<a href='#PIL.ImageFile.ImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFile.Parser-class' name='PIL.ImageFile.Parser-class'>The Parser Class</a></h2>
-<dl>
-<dt><b>Parser</b> (class)  [<a href='#PIL.ImageFile.Parser-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageFile.Parser.close-method' name='PIL.ImageFile.Parser.close-method'><b>close()</b></a> [<a href='#PIL.ImageFile.Parser.close-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>IOError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageFile.Parser.feed-method' name='PIL.ImageFile.Parser.feed-method'><b>feed(data)</b></a> [<a href='#PIL.ImageFile.Parser.feed-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>data</i></dt>
-<dd>
-</dd>
-<dt>Raises <b>IOError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageFile.Parser.reset-method' name='PIL.ImageFile.Parser.reset-method'><b>reset()</b></a> [<a href='#PIL.ImageFile.Parser.reset-method'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFile.StubImageFile-class' name='PIL.ImageFile.StubImageFile-class'>The StubImageFile Class</a></h2>
-<dl>
-<dt><b>StubImageFile</b> (class)  [<a href='#PIL.ImageFile.StubImageFile-class'>#</a>]</dt>
-<dd>
-<p>Base class for stub image loaders.
-</p><p>
-A stub loader is an image loader that can identify files of a
-certain format, but relies on external code to load the file.
-</p></dd>
-<dt><a id='PIL.ImageFile.StubImageFile._load-method' name='PIL.ImageFile.StubImageFile._load-method'><b>_load()</b></a> [<a href='#PIL.ImageFile.StubImageFile._load-method'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageFileIO.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageFileIO.html
deleted file mode 100644
index 78fc226c11..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageFileIO.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageFileIO Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageFileIO Module</h1>
-<dl>
-<dt><b>ImageFileIO(fp)</b> (class) [<a href='#PIL.ImageFileIO.ImageFileIO-class'>#</a>]</dt>
-<dd>
-<p>The ImageFileIO module can be used to read an image from a
-socket, or any other stream device.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFileIO.ImageFileIO-class'><i>The ImageFileIO Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFileIO.ImageFileIO-class' name='PIL.ImageFileIO.ImageFileIO-class'>The ImageFileIO Class</a></h2>
-<dl>
-<dt><b>ImageFileIO(fp)</b> (class) [<a href='#PIL.ImageFileIO.ImageFileIO-class'>#</a>]</dt>
-<dd>
-<p>The <b>ImageFileIO</b> module can be used to read an image from a
-socket, or any other stream device.
-</p><p>
-This module is deprecated. New code should use the <b>Parser</b>
-class in the <a href="imagefile">ImageFile</a> module instead.
-
-</p></dd>
-<dt><a id='PIL.ImageFileIO.ImageFileIO.__init__-method' name='PIL.ImageFileIO.ImageFileIO.__init__-method'><b>__init__(fp)</b></a> [<a href='#PIL.ImageFileIO.ImageFileIO.__init__-method'>#</a>]</dt>
-<dd>
-<p>Adds buffering to a stream file object, in order to
-provide <b>seek</b> and <b>tell</b> methods required
-by the <b>Image.open</b> method. The stream object must
-implement <b>read</b> and <b>close</b> methods.
-
-</p><dl>
-<dt><i>fp</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageFilter.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageFilter.html
deleted file mode 100644
index b67e8223b1..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageFilter.html
+++ /dev/null
@@ -1,257 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageFilter Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageFilter Module</h1>
-<dl>
-<dt><b>BLUR</b> (class)  [<a href='#PIL.ImageFilter.BLUR-class'>#</a>]</dt>
-<dd>
-<p>Blur filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.BLUR-class'><i>The BLUR Class</i></a>.</p>
-</dd>
-<dt><b>CONTOUR</b> (class)  [<a href='#PIL.ImageFilter.CONTOUR-class'>#</a>]</dt>
-<dd>
-<p>Contour filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.CONTOUR-class'><i>The CONTOUR Class</i></a>.</p>
-</dd>
-<dt><b>DETAIL</b> (class)  [<a href='#PIL.ImageFilter.DETAIL-class'>#</a>]</dt>
-<dd>
-<p>Detail filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.DETAIL-class'><i>The DETAIL Class</i></a>.</p>
-</dd>
-<dt><b>EDGE_ENHANCE</b> (class)  [<a href='#PIL.ImageFilter.EDGE_ENHANCE-class'>#</a>]</dt>
-<dd>
-<p>Edge enhancement filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.EDGE_ENHANCE-class'><i>The EDGE_ENHANCE Class</i></a>.</p>
-</dd>
-<dt><b>EDGE_ENHANCE_MORE</b> (class)  [<a href='#PIL.ImageFilter.EDGE_ENHANCE_MORE-class'>#</a>]</dt>
-<dd>
-<p>Stronger edge enhancement filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.EDGE_ENHANCE_MORE-class'><i>The EDGE_ENHANCE_MORE Class</i></a>.</p>
-</dd>
-<dt><b>EMBOSS</b> (class)  [<a href='#PIL.ImageFilter.EMBOSS-class'>#</a>]</dt>
-<dd>
-<p>Embossing filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.EMBOSS-class'><i>The EMBOSS Class</i></a>.</p>
-</dd>
-<dt><b>FIND_EDGES</b> (class)  [<a href='#PIL.ImageFilter.FIND_EDGES-class'>#</a>]</dt>
-<dd>
-<p>Edge-finding filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.FIND_EDGES-class'><i>The FIND_EDGES Class</i></a>.</p>
-</dd>
-<dt><b>Kernel(size, kernel, **options)</b> (class) [<a href='#PIL.ImageFilter.Kernel-class'>#</a>]</dt>
-<dd>
-<p>Convolution filter kernel.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.Kernel-class'><i>The Kernel Class</i></a>.</p>
-</dd>
-<dt><b>MaxFilter(size=3)</b> (class) [<a href='#PIL.ImageFilter.MaxFilter-class'>#</a>]</dt>
-<dd>
-<p>Max filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.MaxFilter-class'><i>The MaxFilter Class</i></a>.</p>
-</dd>
-<dt><b>MedianFilter(size=3)</b> (class) [<a href='#PIL.ImageFilter.MedianFilter-class'>#</a>]</dt>
-<dd>
-<p>Median filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.MedianFilter-class'><i>The MedianFilter Class</i></a>.</p>
-</dd>
-<dt><b>MinFilter(size=3)</b> (class) [<a href='#PIL.ImageFilter.MinFilter-class'>#</a>]</dt>
-<dd>
-<p>Min filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.MinFilter-class'><i>The MinFilter Class</i></a>.</p>
-</dd>
-<dt><b>ModeFilter(size=3)</b> (class) [<a href='#PIL.ImageFilter.ModeFilter-class'>#</a>]</dt>
-<dd>
-<p>Mode filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.ModeFilter-class'><i>The ModeFilter Class</i></a>.</p>
-</dd>
-<dt><b>RankFilter(size, rank)</b> (class) [<a href='#PIL.ImageFilter.RankFilter-class'>#</a>]</dt>
-<dd>
-<p>Rank filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.RankFilter-class'><i>The RankFilter Class</i></a>.</p>
-</dd>
-<dt><b>SHARPEN</b> (class)  [<a href='#PIL.ImageFilter.SHARPEN-class'>#</a>]</dt>
-<dd>
-<p>Sharpening filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.SHARPEN-class'><i>The SHARPEN Class</i></a>.</p>
-</dd>
-<dt><b>SMOOTH</b> (class)  [<a href='#PIL.ImageFilter.SMOOTH-class'>#</a>]</dt>
-<dd>
-<p>Smoothing filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.SMOOTH-class'><i>The SMOOTH Class</i></a>.</p>
-</dd>
-<dt><b>SMOOTH_MORE</b> (class)  [<a href='#PIL.ImageFilter.SMOOTH_MORE-class'>#</a>]</dt>
-<dd>
-<p>Stronger smoothing filter.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFilter.SMOOTH_MORE-class'><i>The SMOOTH_MORE Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.BLUR-class' name='PIL.ImageFilter.BLUR-class'>The BLUR Class</a></h2>
-<dl>
-<dt><b>BLUR</b> (class)  [<a href='#PIL.ImageFilter.BLUR-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.CONTOUR-class' name='PIL.ImageFilter.CONTOUR-class'>The CONTOUR Class</a></h2>
-<dl>
-<dt><b>CONTOUR</b> (class)  [<a href='#PIL.ImageFilter.CONTOUR-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.DETAIL-class' name='PIL.ImageFilter.DETAIL-class'>The DETAIL Class</a></h2>
-<dl>
-<dt><b>DETAIL</b> (class)  [<a href='#PIL.ImageFilter.DETAIL-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.EDGE_ENHANCE-class' name='PIL.ImageFilter.EDGE_ENHANCE-class'>The EDGE_ENHANCE Class</a></h2>
-<dl>
-<dt><b>EDGE_ENHANCE</b> (class)  [<a href='#PIL.ImageFilter.EDGE_ENHANCE-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.EDGE_ENHANCE_MORE-class' name='PIL.ImageFilter.EDGE_ENHANCE_MORE-class'>The EDGE_ENHANCE_MORE Class</a></h2>
-<dl>
-<dt><b>EDGE_ENHANCE_MORE</b> (class)  [<a href='#PIL.ImageFilter.EDGE_ENHANCE_MORE-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.EMBOSS-class' name='PIL.ImageFilter.EMBOSS-class'>The EMBOSS Class</a></h2>
-<dl>
-<dt><b>EMBOSS</b> (class)  [<a href='#PIL.ImageFilter.EMBOSS-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.FIND_EDGES-class' name='PIL.ImageFilter.FIND_EDGES-class'>The FIND_EDGES Class</a></h2>
-<dl>
-<dt><b>FIND_EDGES</b> (class)  [<a href='#PIL.ImageFilter.FIND_EDGES-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.Kernel-class' name='PIL.ImageFilter.Kernel-class'>The Kernel Class</a></h2>
-<dl>
-<dt><b>Kernel(size, kernel, **options)</b> (class) [<a href='#PIL.ImageFilter.Kernel-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageFilter.Kernel.__init__-method' name='PIL.ImageFilter.Kernel.__init__-method'><b>__init__(size, kernel, **options)</b></a> [<a href='#PIL.ImageFilter.Kernel.__init__-method'>#</a>]</dt>
-<dd>
-<p>Create a convolution kernel.  The current version only
-supports 3x3 and 5x5 integer and floating point kernels.
-</p><p>
-In the current version, kernels can only be applied to
-"L" and "RGB" images.
-
-</p><dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>kernel</i></dt>
-<dd>
-</dd>
-<dt><i>**options</i></dt>
-<dd>
-</dd>
-<dt><i>scale=</i></dt>
-<dd>
-</dd>
-<dt><i>offset=</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.MaxFilter-class' name='PIL.ImageFilter.MaxFilter-class'>The MaxFilter Class</a></h2>
-<dl>
-<dt><b>MaxFilter(size=3)</b> (class) [<a href='#PIL.ImageFilter.MaxFilter-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageFilter.MaxFilter.__init__-method' name='PIL.ImageFilter.MaxFilter.__init__-method'><b>__init__(size=3)</b></a> [<a href='#PIL.ImageFilter.MaxFilter.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.MedianFilter-class' name='PIL.ImageFilter.MedianFilter-class'>The MedianFilter Class</a></h2>
-<dl>
-<dt><b>MedianFilter(size=3)</b> (class) [<a href='#PIL.ImageFilter.MedianFilter-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageFilter.MedianFilter.__init__-method' name='PIL.ImageFilter.MedianFilter.__init__-method'><b>__init__(size=3)</b></a> [<a href='#PIL.ImageFilter.MedianFilter.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.MinFilter-class' name='PIL.ImageFilter.MinFilter-class'>The MinFilter Class</a></h2>
-<dl>
-<dt><b>MinFilter(size=3)</b> (class) [<a href='#PIL.ImageFilter.MinFilter-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageFilter.MinFilter.__init__-method' name='PIL.ImageFilter.MinFilter.__init__-method'><b>__init__(size=3)</b></a> [<a href='#PIL.ImageFilter.MinFilter.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.ModeFilter-class' name='PIL.ImageFilter.ModeFilter-class'>The ModeFilter Class</a></h2>
-<dl>
-<dt><b>ModeFilter(size=3)</b> (class) [<a href='#PIL.ImageFilter.ModeFilter-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageFilter.ModeFilter.__init__-method' name='PIL.ImageFilter.ModeFilter.__init__-method'><b>__init__(size=3)</b></a> [<a href='#PIL.ImageFilter.ModeFilter.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.RankFilter-class' name='PIL.ImageFilter.RankFilter-class'>The RankFilter Class</a></h2>
-<dl>
-<dt><b>RankFilter(size, rank)</b> (class) [<a href='#PIL.ImageFilter.RankFilter-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageFilter.RankFilter.__init__-method' name='PIL.ImageFilter.RankFilter.__init__-method'><b>__init__(size, rank)</b></a> [<a href='#PIL.ImageFilter.RankFilter.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>rank</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.SHARPEN-class' name='PIL.ImageFilter.SHARPEN-class'>The SHARPEN Class</a></h2>
-<dl>
-<dt><b>SHARPEN</b> (class)  [<a href='#PIL.ImageFilter.SHARPEN-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.SMOOTH-class' name='PIL.ImageFilter.SMOOTH-class'>The SMOOTH Class</a></h2>
-<dl>
-<dt><b>SMOOTH</b> (class)  [<a href='#PIL.ImageFilter.SMOOTH-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageFilter.SMOOTH_MORE-class' name='PIL.ImageFilter.SMOOTH_MORE-class'>The SMOOTH_MORE Class</a></h2>
-<dl>
-<dt><b>SMOOTH_MORE</b> (class)  [<a href='#PIL.ImageFilter.SMOOTH_MORE-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageFont.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageFont.html
deleted file mode 100644
index 6f1cd885dd..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageFont.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageFont Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageFont Module</h1>
-<dl>
-<dt><b>FreeTypeFont(file, size, index=0, encoding=&quot;&quot;)</b> (class) [<a href='#PIL.ImageFont.FreeTypeFont-class'>#</a>]</dt>
-<dd>
-<p>Wrapper for FreeType fonts.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFont.FreeTypeFont-class'><i>The FreeTypeFont Class</i></a>.</p>
-</dd>
-<dt><b>ImageFont</b> (class)  [<a href='#PIL.ImageFont.ImageFont-class'>#</a>]</dt>
-<dd>
-<p>The ImageFont module defines a class with the same name.</p>
-<p>For more information about this class, see <a href='#PIL.ImageFont.ImageFont-class'><i>The ImageFont Class</i></a>.</p>
-</dd>
-<dt><a id='PIL.ImageFont.load-function' name='PIL.ImageFont.load-function'><b>load(filename)</b></a> [<a href='#PIL.ImageFont.load-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>filename</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>IOError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageFont.load_default-function' name='PIL.ImageFont.load_default-function'><b>load_default()</b></a> [<a href='#PIL.ImageFont.load_default-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageFont.load_path-function' name='PIL.ImageFont.load_path-function'><b>load_path(filename)</b></a> [<a href='#PIL.ImageFont.load_path-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>filename</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>IOError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-<dt><b>TransposedFont(font, orientation=None)</b> (class) [<a href='#PIL.ImageFont.TransposedFont-class'>#</a>]</dt>
-<dd>
-<p>Wrapper that creates a transposed font from any existing font
-object.</p>
-<dl>
-<dt><i>font</i></dt>
-<dd>
-</dd>
-<dt><i>orientation</i></dt>
-<dd>
-</dd>
-</dl><br />
-<p>For more information about this class, see <a href='#PIL.ImageFont.TransposedFont-class'><i>The TransposedFont Class</i></a>.</p>
-</dd>
-<dt><a id='PIL.ImageFont.truetype-function' name='PIL.ImageFont.truetype-function'><b>truetype(filename, size, index=0, encoding=&quot;&quot;)</b></a> [<a href='#PIL.ImageFont.truetype-function'>#</a>]</dt>
-<dd>
-<p>Load a TrueType or OpenType font file, and create a font object.
-This function loads a font object from the given file, and creates
-a font object for a font of the given size.
-</p><p>
-This function requires the _imagingft service.
-
-</p><dl>
-<dt><i>filename</i></dt>
-<dd>
-A truetype font file.  Under Windows, if the file
-   is not found in this filename, the loader also looks in Windows
-   <b>fonts</b> directory
-</dd>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>index</i></dt>
-<dd>
-</dd>
-<dt><i>encoding</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-<dt>Raises <b>IOError</b>:</dt><dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageFont.FreeTypeFont-class' name='PIL.ImageFont.FreeTypeFont-class'>The FreeTypeFont Class</a></h2>
-<dl>
-<dt><b>FreeTypeFont(file, size, index=0, encoding=&quot;&quot;)</b> (class) [<a href='#PIL.ImageFont.FreeTypeFont-class'>#</a>]</dt>
-<dd>
-<p>Wrapper for FreeType fonts.  Application code should use the
-<b>truetype</b> factory function to create font objects.
-</p></dd>
-</dl>
-<h2><a id='PIL.ImageFont.ImageFont-class' name='PIL.ImageFont.ImageFont-class'>The ImageFont Class</a></h2>
-<dl>
-<dt><b>ImageFont</b> (class)  [<a href='#PIL.ImageFont.ImageFont-class'>#</a>]</dt>
-<dd>
-<p>The <b>ImageFont</b> module defines a class with the same name.
-Instances of this class store bitmap fonts, and are used with the
-<b>text</b> method of the <b>ImageDraw</b> class.
-</p><p>
-PIL uses it's own font file format to store bitmap fonts. You can
-use the <b>pilfont</b> utility to convert BDF and PCF font
-descriptors (X window font formats) to this format.
-</p><p>
-Starting with version 1.1.4, PIL can be configured to support
-TrueType and OpenType fonts.  For earlier version, TrueType
-support is only available as part of the imToolkit package
-
-</p></dd>
-</dl>
-<h2><a id='PIL.ImageFont.TransposedFont-class' name='PIL.ImageFont.TransposedFont-class'>The TransposedFont Class</a></h2>
-<dl>
-<dt><b>TransposedFont(font, orientation=None)</b> (class) [<a href='#PIL.ImageFont.TransposedFont-class'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>font</i></dt>
-<dd>
-</dd>
-<dt><i>orientation</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageGL.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageGL.html
deleted file mode 100644
index 6fee03f8bb..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageGL.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageGL Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageGL Module</h1>
-<h2>Module Contents</h2>
-<dl>
-<dt><b>TextureFactory</b> (class)  [<a href='#PIL.ImageGL.TextureFactory-class'>#</a>]</dt>
-<dd>
-<p>Texture factory.</p>
-<p>For more information about this class, see <a href='#PIL.ImageGL.TextureFactory-class'><i>The TextureFactory Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageGL.TextureFactory-class' name='PIL.ImageGL.TextureFactory-class'>The TextureFactory Class</a></h2>
-<dl>
-<dt><b>TextureFactory</b> (class)  [<a href='#PIL.ImageGL.TextureFactory-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageGrab.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageGrab.html
deleted file mode 100644
index fb1354e050..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageGrab.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageGrab Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageGrab Module</h1>
-<p>(New in 1.1.3)  The <b>ImageGrab</b> module can be used to copy
-the contents of the screen to a PIL image memory.
-</p><p>
-The current version works on Windows only.</p>
-
-<h2>Module Contents</h2>
-<dl>
-<dt><a id='PIL.ImageGrab.grab-function' name='PIL.ImageGrab.grab-function'><b>grab(bbox=None)</b></a> [<a href='#PIL.ImageGrab.grab-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>bbox</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageGrab.grabclipboard-function' name='PIL.ImageGrab.grabclipboard-function'><b>grabclipboard()</b></a> [<a href='#PIL.ImageGrab.grabclipboard-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageOps.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageOps.html
deleted file mode 100644
index 1554571a0c..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageOps.html
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageOps Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageOps Module</h1>
-<p>(New in 1.1.3) The <b>ImageOps</b> module contains a number of
-'ready-made' image processing operations.  This module is somewhat
-experimental, and most operators only work on L and RGB images.
-
-</p><h2>Module Contents</h2>
-<dl>
-<dt><a id='PIL.ImageOps.autocontrast-function' name='PIL.ImageOps.autocontrast-function'><b>autocontrast(image, cutoff=0, ignore=None)</b></a> [<a href='#PIL.ImageOps.autocontrast-function'>#</a>]</dt>
-<dd>
-<p>Maximize (normalize) image contrast.  This function calculates a
-histogram of the input image, removes <i>cutoff</i> percent of the
-lightest and darkest pixels from the histogram, and remaps the image
-so that the darkest pixel becomes black (0), and the lightest
-becomes white (255).
-
-</p><dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>cutoff</i></dt>
-<dd>
-</dd>
-<dt><i>ignore</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.colorize-function' name='PIL.ImageOps.colorize-function'><b>colorize(image, black, white)</b></a> [<a href='#PIL.ImageOps.colorize-function'>#</a>]</dt>
-<dd>
-<p>Colorize grayscale image.  The <i>black</i> and <i>white</i>
-arguments should be RGB tuples; this function calculates a colour
-wedge mapping all black pixels in the source image to the first
-colour, and all white pixels to the second colour.
-
-</p><dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>black</i></dt>
-<dd>
-</dd>
-<dt><i>white</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.crop-function' name='PIL.ImageOps.crop-function'><b>crop(image, border=0)</b></a> [<a href='#PIL.ImageOps.crop-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>border</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.deform-function' name='PIL.ImageOps.deform-function'><b>deform(image, deformer, resample=Image.BILINEAR)</b></a> [<a href='#PIL.ImageOps.deform-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>deformer</i></dt>
-<dd>
-</dd>
-<dt><i>resample</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.equalize-function' name='PIL.ImageOps.equalize-function'><b>equalize(image, mask=None)</b></a> [<a href='#PIL.ImageOps.equalize-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>mask</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.expand-function' name='PIL.ImageOps.expand-function'><b>expand(image, border=0, fill=0)</b></a> [<a href='#PIL.ImageOps.expand-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>border</i></dt>
-<dd>
-</dd>
-<dt><i>fill</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.fit-function' name='PIL.ImageOps.fit-function'><b>fit(image, size, method=Image.NEAREST, bleed=0.0, centering=(0.5, 0.5))</b></a> [<a href='#PIL.ImageOps.fit-function'>#</a>]</dt>
-<dd>
-<p>Returns a sized and cropped version of the image, cropped to the
-requested aspect ratio and size.
-</p><p>
-The <b>fit</b> function was contributed by Kevin Cazabon.
-
-</p><dl>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>method</i></dt>
-<dd>
-</dd>
-<dt><i>bleed</i></dt>
-<dd>
-</dd>
-<dt><i>centering</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.flip-function' name='PIL.ImageOps.flip-function'><b>flip(image)</b></a> [<a href='#PIL.ImageOps.flip-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.grayscale-function' name='PIL.ImageOps.grayscale-function'><b>grayscale(image)</b></a> [<a href='#PIL.ImageOps.grayscale-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.invert-function' name='PIL.ImageOps.invert-function'><b>invert(image)</b></a> [<a href='#PIL.ImageOps.invert-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.mirror-function' name='PIL.ImageOps.mirror-function'><b>mirror(image)</b></a> [<a href='#PIL.ImageOps.mirror-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.posterize-function' name='PIL.ImageOps.posterize-function'><b>posterize(image, bits)</b></a> [<a href='#PIL.ImageOps.posterize-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>bits</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageOps.solarize-function' name='PIL.ImageOps.solarize-function'><b>solarize(image, threshold=128)</b></a> [<a href='#PIL.ImageOps.solarize-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>threshold</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImagePalette.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImagePalette.html
deleted file mode 100644
index 67e0d114f1..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImagePalette.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImagePalette Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImagePalette Module</h1>
-<dl>
-<dt><b>ImagePalette(mode=&quot;RGB&quot;, palette=None)</b> (class) [<a href='#PIL.ImagePalette.ImagePalette-class'>#</a>]</dt>
-<dd>
-<p>Colour palette wrapper for palette mapped images.</p>
-<p>For more information about this class, see <a href='#PIL.ImagePalette.ImagePalette-class'><i>The ImagePalette Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImagePalette.ImagePalette-class' name='PIL.ImagePalette.ImagePalette-class'>The ImagePalette Class</a></h2>
-<dl>
-<dt><b>ImagePalette(mode=&quot;RGB&quot;, palette=None)</b> (class) [<a href='#PIL.ImagePalette.ImagePalette-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImagePath.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImagePath.html
deleted file mode 100644
index 67743bdfef..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImagePath.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImagePath Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImagePath Module</h1>
-<dl>
-<dt><b>Path(xy)</b> (class) [<a href='#PIL.ImagePath.Path-class'>#</a>]</dt>
-<dd>
-<p>Path wrapper.</p>
-<p>For more information about this class, see <a href='#PIL.ImagePath.Path-class'><i>The Path Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImagePath.Path-class' name='PIL.ImagePath.Path-class'>The Path Class</a></h2>
-<dl>
-<dt><b>Path(xy)</b> (class) [<a href='#PIL.ImagePath.Path-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImagePath.Path.__init__-method' name='PIL.ImagePath.Path.__init__-method'><b>__init__(xy)</b></a> [<a href='#PIL.ImagePath.Path.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>xy</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImagePath.Path.compact-method' name='PIL.ImagePath.Path.compact-method'><b>compact(distance=2)</b></a> [<a href='#PIL.ImagePath.Path.compact-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImagePath.Path.getbbox-method' name='PIL.ImagePath.Path.getbbox-method'><b>getbbox()</b></a> [<a href='#PIL.ImagePath.Path.getbbox-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImagePath.Path.map-method' name='PIL.ImagePath.Path.map-method'><b>map(function)</b></a> [<a href='#PIL.ImagePath.Path.map-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImagePath.Path.tolist-method' name='PIL.ImagePath.Path.tolist-method'><b>tolist(flat=0)</b></a> [<a href='#PIL.ImagePath.Path.tolist-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>flat</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImagePath.Path.transform-method' name='PIL.ImagePath.Path.transform-method'><b>transform(matrix)</b></a> [<a href='#PIL.ImagePath.Path.transform-method'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageSequence.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageSequence.html
deleted file mode 100644
index 848e7a200e..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageSequence.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageSequence Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageSequence Module</h1>
-<dl>
-<dt><b>Iterator(im)</b> (class) [<a href='#PIL.ImageSequence.Iterator-class'>#</a>]</dt>
-<dd>
-<p>This class implements an iterator object that can be used to loop
-over an image sequence.</p>
-<p>For more information about this class, see <a href='#PIL.ImageSequence.Iterator-class'><i>The Iterator Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageSequence.Iterator-class' name='PIL.ImageSequence.Iterator-class'>The Iterator Class</a></h2>
-<dl>
-<dt><b>Iterator(im)</b> (class) [<a href='#PIL.ImageSequence.Iterator-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageSequence.Iterator.__init__-method' name='PIL.ImageSequence.Iterator.__init__-method'><b>__init__(im)</b></a> [<a href='#PIL.ImageSequence.Iterator.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageStat.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageStat.html
deleted file mode 100644
index 10a308b334..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageStat.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageStat Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageStat Module</h1>
-<p>The <b>ImageStat</b> module calculates global statistics for an
-image, or a region of an image.
-</p><h2>Module Contents</h2>
-<dl>
-<dt><b>Stat(image, mask=None)</b> (class) [<a href='#PIL.ImageStat.Stat-class'>#</a>]</dt>
-<dd>
-<p>Calculate statistics for the given image.</p>
-<p>For more information about this class, see <a href='#PIL.ImageStat.Stat-class'><i>The Stat Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageStat.Stat-class' name='PIL.ImageStat.Stat-class'>The Stat Class</a></h2>
-<dl>
-<dt><b>Stat(image, mask=None)</b> (class) [<a href='#PIL.ImageStat.Stat-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageStat.Stat.__init__-method' name='PIL.ImageStat.Stat.__init__-method'><b>__init__(image, mask=None)</b></a> [<a href='#PIL.ImageStat.Stat.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>mask</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageTk.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageTk.html
deleted file mode 100644
index d5d4e2381c..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageTk.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageTk Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageTk Module</h1>
-<p>The <b>ImageTk</b> module contains support to create and modify
-Tkinter <b>BitmapImage</b> and <b>PhotoImage</b> objects.
-</p><p>
-For examples, see the demo programs in the <i>Scripts</i>
-directory.
-</p><h2>Module Contents</h2>
-<dl>
-<dt><b>BitmapImage(image=None, **options)</b> (class) [<a href='#PIL.ImageTk.BitmapImage-class'>#</a>]</dt>
-<dd>
-<p>Create a Tkinter-compatible bitmap image.</p>
-<p>For more information about this class, see <a href='#PIL.ImageTk.BitmapImage-class'><i>The BitmapImage Class</i></a>.</p>
-</dd>
-<dt><a id='PIL.ImageTk.getimage-function' name='PIL.ImageTk.getimage-function'><b>getimage(photo)</b></a> [<a href='#PIL.ImageTk.getimage-function'>#</a>]</dt>
-<dd>
-</dd>
-<dt><b>PhotoImage(image=None, size=None, **options)</b> (class) [<a href='#PIL.ImageTk.PhotoImage-class'>#</a>]</dt>
-<dd>
-<p>Creates a Tkinter-compatible photo image.</p>
-<p>For more information about this class, see <a href='#PIL.ImageTk.PhotoImage-class'><i>The PhotoImage Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageTk.BitmapImage-class' name='PIL.ImageTk.BitmapImage-class'>The BitmapImage Class</a></h2>
-<dl>
-<dt><b>BitmapImage(image=None, **options)</b> (class) [<a href='#PIL.ImageTk.BitmapImage-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageTk.BitmapImage.__init__-method' name='PIL.ImageTk.BitmapImage.__init__-method'><b>__init__(image=None, **options)</b></a> [<a href='#PIL.ImageTk.BitmapImage.__init__-method'>#</a>]</dt>
-<dd>
-<p>Create a Tkinter-compatible bitmap image.
-</p><p>
-The given image must have mode "1".  Pixels having value 0 are
-treated as transparent.  Options, if any, are passed on to
-Tkinter.  The most commonly used option is <b>foreground</b>,
-which is used to specify the colour for the non-transparent
-parts.  See the Tkinter documentation for information on how to
-specify colours.
-
-</p><dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageTk.BitmapImage.__str__-method' name='PIL.ImageTk.BitmapImage.__str__-method'><b>__str__()</b></a> [<a href='#PIL.ImageTk.BitmapImage.__str__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageTk.BitmapImage.height-method' name='PIL.ImageTk.BitmapImage.height-method'><b>height()</b></a> [<a href='#PIL.ImageTk.BitmapImage.height-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageTk.BitmapImage.width-method' name='PIL.ImageTk.BitmapImage.width-method'><b>width()</b></a> [<a href='#PIL.ImageTk.BitmapImage.width-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageTk.PhotoImage-class' name='PIL.ImageTk.PhotoImage-class'>The PhotoImage Class</a></h2>
-<dl>
-<dt><b>PhotoImage(image=None, size=None, **options)</b> (class) [<a href='#PIL.ImageTk.PhotoImage-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.ImageTk.PhotoImage.__init__-method' name='PIL.ImageTk.PhotoImage.__init__-method'><b>__init__(image=None, size=None, **options)</b></a> [<a href='#PIL.ImageTk.PhotoImage.__init__-method'>#</a>]</dt>
-<dd>
-<p>Create a photo image object. The constructor takes either
-a PIL image, or a mode and a size.  Alternatively, you can
-use the <b>file</b> or <b>data</b> options to initialize
-the photo image object.
-</p><p>
-</p><dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-<dt><i>file=</i></dt>
-<dd>
-</dd>
-<dt><i>data=</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageTk.PhotoImage.__str__-method' name='PIL.ImageTk.PhotoImage.__str__-method'><b>__str__()</b></a> [<a href='#PIL.ImageTk.PhotoImage.__str__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageTk.PhotoImage.height-method' name='PIL.ImageTk.PhotoImage.height-method'><b>height()</b></a> [<a href='#PIL.ImageTk.PhotoImage.height-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageTk.PhotoImage.paste-method' name='PIL.ImageTk.PhotoImage.paste-method'><b>paste(im, box=None)</b></a> [<a href='#PIL.ImageTk.PhotoImage.paste-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-<dt><i>box</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageTk.PhotoImage.width-method' name='PIL.ImageTk.PhotoImage.width-method'><b>width()</b></a> [<a href='#PIL.ImageTk.PhotoImage.width-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageTransform.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageTransform.html
deleted file mode 100644
index 6771fb1488..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageTransform.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageTransform Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageTransform Module</h1>
-<dl>
-<dt><b>AffineTransform</b> (class)  [<a href='#PIL.ImageTransform.AffineTransform-class'>#</a>]</dt>
-<dd>
-<p>Define an affine image transform.</p>
-<dl>
-<dt><i>matrix</i></dt>
-<dd>
-A 6-tuple (<i>a, b, c, d, e, f</i>) containing
-   the first two rows from an affine transform matrix.
-</dd>
-</dl><br />
-<p>For more information about this class, see <a href='#PIL.ImageTransform.AffineTransform-class'><i>The AffineTransform Class</i></a>.</p>
-</dd>
-<dt><b>ExtentTransform</b> (class)  [<a href='#PIL.ImageTransform.ExtentTransform-class'>#</a>]</dt>
-<dd>
-<p>Define a transform to extract a subregion from an image.</p>
-<dl>
-<dt><i>bbox</i></dt>
-<dd>
-A 4-tuple (<i>x0, y0, x1, y1</i>) which specifies
-   two points in the input image's coordinate system.
-</dd>
-</dl><br />
-<p>For more information about this class, see <a href='#PIL.ImageTransform.ExtentTransform-class'><i>The ExtentTransform Class</i></a>.</p>
-</dd>
-<dt><b>MeshTransform</b> (class)  [<a href='#PIL.ImageTransform.MeshTransform-class'>#</a>]</dt>
-<dd>
-<p>Define an mesh image transform.</p>
-<dl>
-<dt><i>data</i></dt>
-<dd>
-</dd>
-</dl><br />
-<p>For more information about this class, see <a href='#PIL.ImageTransform.MeshTransform-class'><i>The MeshTransform Class</i></a>.</p>
-</dd>
-<dt><b>QuadTransform</b> (class)  [<a href='#PIL.ImageTransform.QuadTransform-class'>#</a>]</dt>
-<dd>
-<p>Define an quad image transform.</p>
-<dl>
-<dt><i>xy</i></dt>
-<dd>
-An 8-tuple (<i>x0, y0, x1, y1, x2, y2, y3, y3</i>) which
-  contain the upper left, lower left, lower right, and upper right
-  corner of the source quadrilateral.
-</dd>
-</dl><br />
-<p>For more information about this class, see <a href='#PIL.ImageTransform.QuadTransform-class'><i>The QuadTransform Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageTransform.AffineTransform-class' name='PIL.ImageTransform.AffineTransform-class'>The AffineTransform Class</a></h2>
-<dl>
-<dt><b>AffineTransform</b> (class)  [<a href='#PIL.ImageTransform.AffineTransform-class'>#</a>]</dt>
-<dd>
-<p>Define an affine image transform.
-</p><p>
-This function takes a 6-tuple (<i>a, b, c, d, e, f</i>) which
-contain the first two rows from an affine transform matrix. For
-each pixel (<i>x, y</i>) in the output image, the new value is
-taken from a position (a <i>x</i> + b <i>y</i> + c,
-d <i>x</i> + e <i>y</i> + f) in the input image, rounded to
-nearest pixel.
-</p><p>
-This function can be used to scale, translate, rotate, and shear the
-original image.
-
-</p><dl>
-<dt><i>matrix</i></dt>
-<dd>
-A 6-tuple (<i>a, b, c, d, e, f</i>) containing
-   the first two rows from an affine transform matrix.
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageTransform.ExtentTransform-class' name='PIL.ImageTransform.ExtentTransform-class'>The ExtentTransform Class</a></h2>
-<dl>
-<dt><b>ExtentTransform</b> (class)  [<a href='#PIL.ImageTransform.ExtentTransform-class'>#</a>]</dt>
-<dd>
-<p>Define a transform to extract a subregion from an image.
-</p><p>
-Maps a rectangle (defined by two corners) from the image to a
-rectangle of the given size.  The resulting image will contain
-data sampled from between the corners, such that (<i>x0, y0</i>)
-in the input image will end up at (0,0) in the output image,
-and (<i>x1, y1</i>) at <i>size</i>.
-</p><p>
-This method can be used to crop, stretch, shrink, or mirror an
-arbitrary rectangle in the current image. It is slightly slower than
-<b>crop</b>, but about as fast as a corresponding <b>resize</b>
-operation.
-
-</p><dl>
-<dt><i>bbox</i></dt>
-<dd>
-A 4-tuple (<i>x0, y0, x1, y1</i>) which specifies
-   two points in the input image's coordinate system.
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageTransform.MeshTransform-class' name='PIL.ImageTransform.MeshTransform-class'>The MeshTransform Class</a></h2>
-<dl>
-<dt><b>MeshTransform</b> (class)  [<a href='#PIL.ImageTransform.MeshTransform-class'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>data</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageTransform.QuadTransform-class' name='PIL.ImageTransform.QuadTransform-class'>The QuadTransform Class</a></h2>
-<dl>
-<dt><b>QuadTransform</b> (class)  [<a href='#PIL.ImageTransform.QuadTransform-class'>#</a>]</dt>
-<dd>
-<p>Define an quad image transform.
-</p><p>
-Maps a quadrilateral (a region defined by four corners) from the
-image to a rectangle of the given size.
-
-</p><dl>
-<dt><i>xy</i></dt>
-<dd>
-An 8-tuple (<i>x0, y0, x1, y1, x2, y2, y3, y3</i>) which
-  contain the upper left, lower left, lower right, and upper right
-  corner of the source quadrilateral.
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImageWin.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImageWin.html
deleted file mode 100644
index e1608d15a4..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImageWin.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImageWin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImageWin Module</h1>
-<dl>
-<dt><b>Dib(image, size=None)</b> (class) [<a href='#PIL.ImageWin.Dib-class'>#</a>]</dt>
-<dd>
-<p>Create a Windows bitmap with the given mode and size.</p>
-<p>For more information about this class, see <a href='#PIL.ImageWin.Dib-class'><i>The Dib Class</i></a>.</p>
-</dd>
-<dt><b>HDC(dc)</b> (class) [<a href='#PIL.ImageWin.HDC-class'>#</a>]</dt>
-<dd>
-<p>The ImageWin module contains support to create and display
-images under Windows 95/98, NT, 2000 and later.</p>
-<p>For more information about this class, see <a href='#PIL.ImageWin.HDC-class'><i>The HDC Class</i></a>.</p>
-</dd>
-<dt><b>ImageWindow(image, title=&quot;PIL&quot;)</b> (class) [<a href='#PIL.ImageWin.ImageWindow-class'>#</a>]</dt>
-<dd>
-<p>Create an image window which displays the given image.</p>
-<p>For more information about this class, see <a href='#PIL.ImageWin.ImageWindow-class'><i>The ImageWindow Class</i></a>.</p>
-</dd>
-<dt><b>Window(title=&quot;PIL&quot;, width=None, height=None)</b> (class) [<a href='#PIL.ImageWin.Window-class'>#</a>]</dt>
-<dd>
-<p>Create a Window with the given title size.</p>
-<p>For more information about this class, see <a href='#PIL.ImageWin.Window-class'><i>The Window Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImageWin.Dib-class' name='PIL.ImageWin.Dib-class'>The Dib Class</a></h2>
-<dl>
-<dt><b>Dib(image, size=None)</b> (class) [<a href='#PIL.ImageWin.Dib-class'>#</a>]</dt>
-<dd>
-<p>Create a Windows bitmap with the given mode and size.  The mode can
-be one of "1", "L", "P", or "RGB".
-
-If the display requires a palette, this constructor creates a
-suitable palette and associates it with the image. For an "L" image,
-128 greylevels are allocated. For an "RGB" image, a 6x6x6 colour
-cube is used, together with 20 greylevels.
-
-To make sure that palettes work properly under Windows, you must
-call the <b>palette</b> method upon certain events from Windows.
-</p></dd>
-<dt><a id='PIL.ImageWin.Dib.__init__-method' name='PIL.ImageWin.Dib.__init__-method'><b>__init__(image, size=None)</b></a> [<a href='#PIL.ImageWin.Dib.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>image</i></dt>
-<dd>
-</dd>
-<dt><i>size</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageWin.Dib.expose-method' name='PIL.ImageWin.Dib.expose-method'><b>expose(handle)</b></a> [<a href='#PIL.ImageWin.Dib.expose-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>handle</i></dt>
-<dd>
-Device context (HDC), cast to a Python integer,
-   or a HDC or HWND instance.  In PythonWin, you can use the
-   <b>GetHandleAttrib</b> method of the <b>CDC</b> class to get
-   a suitable handle.
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageWin.Dib.fromstring-method' name='PIL.ImageWin.Dib.fromstring-method'><b>fromstring(buffer)</b></a> [<a href='#PIL.ImageWin.Dib.fromstring-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>buffer</i></dt>
-<dd>
-A string buffer containing display data (usually
-    data returned from <b>tostring</b>)
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageWin.Dib.paste-method' name='PIL.ImageWin.Dib.paste-method'><b>paste(im, box=None)</b></a> [<a href='#PIL.ImageWin.Dib.paste-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-<dt><i>box</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageWin.Dib.query_palette-method' name='PIL.ImageWin.Dib.query_palette-method'><b>query_palette(handle)</b></a> [<a href='#PIL.ImageWin.Dib.query_palette-method'>#</a>]</dt>
-<dd>
-<p>Installs the palette associated with the image in the
-given device context.
-</p><p>
-This method should be called upon <b>QUERYNEWPALETTE</b>
-and <b>PALETTECHANGED</b> events from Windows. If this
-method returns a non-zero value, one or more display
-palette entries were changed, and the image should be
-redrawn.
-
-</p><dl>
-<dt><i>handle</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><a id='PIL.ImageWin.Dib.tostring-method' name='PIL.ImageWin.Dib.tostring-method'><b>tostring()</b></a> [<a href='#PIL.ImageWin.Dib.tostring-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-<h2><a id='PIL.ImageWin.HDC-class' name='PIL.ImageWin.HDC-class'>The HDC Class</a></h2>
-<dl>
-<dt><b>HDC(dc)</b> (class) [<a href='#PIL.ImageWin.HDC-class'>#</a>]</dt>
-<dd>
-<p>The <b>ImageWin</b> module contains support to create and display
-images under Windows 95/98, NT, 2000 and later.
-</p></dd>
-</dl>
-<h2><a id='PIL.ImageWin.ImageWindow-class' name='PIL.ImageWin.ImageWindow-class'>The ImageWindow Class</a></h2>
-<dl>
-<dt><b>ImageWindow(image, title=&quot;PIL&quot;)</b> (class) [<a href='#PIL.ImageWin.ImageWindow-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.ImageWin.Window-class' name='PIL.ImageWin.Window-class'>The Window Class</a></h2>
-<dl>
-<dt><b>Window(title=&quot;PIL&quot;, width=None, height=None)</b> (class) [<a href='#PIL.ImageWin.Window-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.ImtImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.ImtImagePlugin.html
deleted file mode 100644
index 7f2071436f..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.ImtImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.ImtImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.ImtImagePlugin Module</h1>
-<dl>
-<dt><b>ImtImageFile</b> (class)  [<a href='#PIL.ImtImagePlugin.ImtImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for IM Tools images.</p>
-<p>For more information about this class, see <a href='#PIL.ImtImagePlugin.ImtImageFile-class'><i>The ImtImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.ImtImagePlugin.ImtImageFile-class' name='PIL.ImtImagePlugin.ImtImageFile-class'>The ImtImageFile Class</a></h2>
-<dl>
-<dt><b>ImtImageFile</b> (class)  [<a href='#PIL.ImtImagePlugin.ImtImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.IptcImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.IptcImagePlugin.html
deleted file mode 100644
index fe503036a5..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.IptcImagePlugin.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.IptcImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.IptcImagePlugin Module</h1>
-<dl>
-<dt><a id='PIL.IptcImagePlugin.getiptcinfo-function' name='PIL.IptcImagePlugin.getiptcinfo-function'><b>getiptcinfo(im)</b></a> [<a href='#PIL.IptcImagePlugin.getiptcinfo-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>im</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><b>IptcImageFile</b> (class)  [<a href='#PIL.IptcImagePlugin.IptcImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for IPTC/NAA datastreams.</p>
-<p>For more information about this class, see <a href='#PIL.IptcImagePlugin.IptcImageFile-class'><i>The IptcImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.IptcImagePlugin.IptcImageFile-class' name='PIL.IptcImagePlugin.IptcImageFile-class'>The IptcImageFile Class</a></h2>
-<dl>
-<dt><b>IptcImageFile</b> (class)  [<a href='#PIL.IptcImagePlugin.IptcImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for IPTC/NAA datastreams.  To read IPTC/NAA fields
-from TIFF and JPEG files, use the <b>getiptcinfo</b> function.
-</p></dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.JpegImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.JpegImagePlugin.html
deleted file mode 100644
index fc19e7c462..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.JpegImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.JpegImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.JpegImagePlugin Module</h1>
-<dl>
-<dt><b>JpegImageFile</b> (class)  [<a href='#PIL.JpegImagePlugin.JpegImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for JPEG and JFIF images.</p>
-<p>For more information about this class, see <a href='#PIL.JpegImagePlugin.JpegImageFile-class'><i>The JpegImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.JpegImagePlugin.JpegImageFile-class' name='PIL.JpegImagePlugin.JpegImageFile-class'>The JpegImageFile Class</a></h2>
-<dl>
-<dt><b>JpegImageFile</b> (class)  [<a href='#PIL.JpegImagePlugin.JpegImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.McIdasImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.McIdasImagePlugin.html
deleted file mode 100644
index a595303236..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.McIdasImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.McIdasImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.McIdasImagePlugin Module</h1>
-<dl>
-<dt><b>McIdasImageFile</b> (class)  [<a href='#PIL.McIdasImagePlugin.McIdasImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for McIdas area images.</p>
-<p>For more information about this class, see <a href='#PIL.McIdasImagePlugin.McIdasImageFile-class'><i>The McIdasImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.McIdasImagePlugin.McIdasImageFile-class' name='PIL.McIdasImagePlugin.McIdasImageFile-class'>The McIdasImageFile Class</a></h2>
-<dl>
-<dt><b>McIdasImageFile</b> (class)  [<a href='#PIL.McIdasImagePlugin.McIdasImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.MicImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.MicImagePlugin.html
deleted file mode 100644
index fdd746735d..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.MicImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.MicImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.MicImagePlugin Module</h1>
-<dl>
-<dt><b>MicImageFile</b> (class)  [<a href='#PIL.MicImagePlugin.MicImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Microsoft's Image Composer file format.</p>
-<p>For more information about this class, see <a href='#PIL.MicImagePlugin.MicImageFile-class'><i>The MicImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.MicImagePlugin.MicImageFile-class' name='PIL.MicImagePlugin.MicImageFile-class'>The MicImageFile Class</a></h2>
-<dl>
-<dt><b>MicImageFile</b> (class)  [<a href='#PIL.MicImagePlugin.MicImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.MpegImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.MpegImagePlugin.html
deleted file mode 100644
index b40d0c28e9..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.MpegImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.MpegImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.MpegImagePlugin Module</h1>
-<dl>
-<dt><b>MpegImageFile</b> (class)  [<a href='#PIL.MpegImagePlugin.MpegImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for MPEG streams.</p>
-<p>For more information about this class, see <a href='#PIL.MpegImagePlugin.MpegImageFile-class'><i>The MpegImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.MpegImagePlugin.MpegImageFile-class' name='PIL.MpegImagePlugin.MpegImageFile-class'>The MpegImageFile Class</a></h2>
-<dl>
-<dt><b>MpegImageFile</b> (class)  [<a href='#PIL.MpegImagePlugin.MpegImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.MspImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.MspImagePlugin.html
deleted file mode 100644
index c17e991285..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.MspImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.MspImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.MspImagePlugin Module</h1>
-<dl>
-<dt><b>MspImageFile</b> (class)  [<a href='#PIL.MspImagePlugin.MspImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Windows MSP images.</p>
-<p>For more information about this class, see <a href='#PIL.MspImagePlugin.MspImageFile-class'><i>The MspImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.MspImagePlugin.MspImageFile-class' name='PIL.MspImagePlugin.MspImageFile-class'>The MspImageFile Class</a></h2>
-<dl>
-<dt><b>MspImageFile</b> (class)  [<a href='#PIL.MspImagePlugin.MspImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.OleFileIO.html b/pythonPackages/pil/Docs/pythondoc-PIL.OleFileIO.html
deleted file mode 100644
index f56a6b41df..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.OleFileIO.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.OleFileIO Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.OleFileIO Module</h1>
-<dl>
-<dt><b>OleFileIO(filename=None)</b> (class) [<a href='#PIL.OleFileIO.OleFileIO-class'>#</a>]</dt>
-<dd>
-<p>This class encapsulates the interface to an OLE 2 structured
-storage file.</p>
-<p>For more information about this class, see <a href='#PIL.OleFileIO.OleFileIO-class'><i>The OleFileIO Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.OleFileIO.OleFileIO-class' name='PIL.OleFileIO.OleFileIO-class'>The OleFileIO Class</a></h2>
-<dl>
-<dt><b>OleFileIO(filename=None)</b> (class) [<a href='#PIL.OleFileIO.OleFileIO-class'>#</a>]</dt>
-<dd>
-<p>This class encapsulates the interface to an OLE 2 structured
-storage file.  Use the <a class="link" href="link:listdir"><b>listdir</b></a> and <a class="link" href="link:openstream"><b>openstream</b></a>
-methods to access the contents of this file.
-</p></dd>
-<dt><a id='PIL.OleFileIO.OleFileIO.getproperties-method' name='PIL.OleFileIO.OleFileIO.getproperties-method'><b>getproperties(filename)</b></a> [<a href='#PIL.OleFileIO.OleFileIO.getproperties-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.OleFileIO.OleFileIO.listdir-method' name='PIL.OleFileIO.OleFileIO.listdir-method'><b>listdir()</b></a> [<a href='#PIL.OleFileIO.OleFileIO.listdir-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.OleFileIO.OleFileIO.open-method' name='PIL.OleFileIO.OleFileIO.open-method'><b>open(filename)</b></a> [<a href='#PIL.OleFileIO.OleFileIO.open-method'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.OleFileIO.OleFileIO.openstream-method' name='PIL.OleFileIO.OleFileIO.openstream-method'><b>openstream(filename)</b></a> [<a href='#PIL.OleFileIO.OleFileIO.openstream-method'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PSDraw.html b/pythonPackages/pil/Docs/pythondoc-PIL.PSDraw.html
deleted file mode 100644
index f89d796f0f..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PSDraw.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PSDraw Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PSDraw Module</h1>
-<dl>
-<dt><b>PSDraw(fp=None)</b> (class) [<a href='#PIL.PSDraw.PSDraw-class'>#</a>]</dt>
-<dd>
-<p>Simple Postscript graphics interface.</p>
-<p>For more information about this class, see <a href='#PIL.PSDraw.PSDraw-class'><i>The PSDraw Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.PSDraw.PSDraw-class' name='PIL.PSDraw.PSDraw-class'>The PSDraw Class</a></h2>
-<dl>
-<dt><b>PSDraw(fp=None)</b> (class) [<a href='#PIL.PSDraw.PSDraw-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PaletteFile.html b/pythonPackages/pil/Docs/pythondoc-PIL.PaletteFile.html
deleted file mode 100644
index 65e4de4e66..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PaletteFile.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PaletteFile Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PaletteFile Module</h1>
-<dl>
-<dt><b>PaletteFile(fp)</b> (class) [<a href='#PIL.PaletteFile.PaletteFile-class'>#</a>]</dt>
-<dd>
-<p>File handler for Teragon-style palette files.</p>
-<p>For more information about this class, see <a href='#PIL.PaletteFile.PaletteFile-class'><i>The PaletteFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.PaletteFile.PaletteFile-class' name='PIL.PaletteFile.PaletteFile-class'>The PaletteFile Class</a></h2>
-<dl>
-<dt><b>PaletteFile(fp)</b> (class) [<a href='#PIL.PaletteFile.PaletteFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PalmImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.PalmImagePlugin.html
deleted file mode 100644
index d5a3cb3943..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PalmImagePlugin.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PalmImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PalmImagePlugin Module</h1>
-<h2>Module Contents</h2>
-<dl>
-<dt><a id='PIL.PalmImagePlugin._save-function' name='PIL.PalmImagePlugin._save-function'><b>_save(im, fp, filename, check=0)</b></a> [<a href='#PIL.PalmImagePlugin._save-function'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PcdImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.PcdImagePlugin.html
deleted file mode 100644
index feb6860381..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PcdImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PcdImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PcdImagePlugin Module</h1>
-<dl>
-<dt><b>PcdImageFile</b> (class)  [<a href='#PIL.PcdImagePlugin.PcdImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for PhotoCD images.</p>
-<p>For more information about this class, see <a href='#PIL.PcdImagePlugin.PcdImageFile-class'><i>The PcdImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.PcdImagePlugin.PcdImageFile-class' name='PIL.PcdImagePlugin.PcdImageFile-class'>The PcdImageFile Class</a></h2>
-<dl>
-<dt><b>PcdImageFile</b> (class)  [<a href='#PIL.PcdImagePlugin.PcdImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PcfFontFile.html b/pythonPackages/pil/Docs/pythondoc-PIL.PcfFontFile.html
deleted file mode 100644
index 8b1e41be9a..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PcfFontFile.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PcfFontFile Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PcfFontFile Module</h1>
-<dl>
-<dt><b>PcfFontFile(fp)</b> (class) [<a href='#PIL.PcfFontFile.PcfFontFile-class'>#</a>]</dt>
-<dd>
-<p>Font file plugin for the X11 PCF format.</p>
-<p>For more information about this class, see <a href='#PIL.PcfFontFile.PcfFontFile-class'><i>The PcfFontFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.PcfFontFile.PcfFontFile-class' name='PIL.PcfFontFile.PcfFontFile-class'>The PcfFontFile Class</a></h2>
-<dl>
-<dt><b>PcfFontFile(fp)</b> (class) [<a href='#PIL.PcfFontFile.PcfFontFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PcxImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.PcxImagePlugin.html
deleted file mode 100644
index 011349a8db..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PcxImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PcxImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PcxImagePlugin Module</h1>
-<dl>
-<dt><b>PcxImageFile</b> (class)  [<a href='#PIL.PcxImagePlugin.PcxImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Paintbrush images.</p>
-<p>For more information about this class, see <a href='#PIL.PcxImagePlugin.PcxImageFile-class'><i>The PcxImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.PcxImagePlugin.PcxImageFile-class' name='PIL.PcxImagePlugin.PcxImageFile-class'>The PcxImageFile Class</a></h2>
-<dl>
-<dt><b>PcxImageFile</b> (class)  [<a href='#PIL.PcxImagePlugin.PcxImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PdfImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.PdfImagePlugin.html
deleted file mode 100644
index 20e0b3f6ec..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PdfImagePlugin.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PdfImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PdfImagePlugin Module</h1>
-<h2>Module Contents</h2>
-<dl>
-<dt><a id='PIL.PdfImagePlugin._save-function' name='PIL.PdfImagePlugin._save-function'><b>_save(im, fp, filename)</b></a> [<a href='#PIL.PdfImagePlugin._save-function'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PixarImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.PixarImagePlugin.html
deleted file mode 100644
index 28b06140c1..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PixarImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PixarImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PixarImagePlugin Module</h1>
-<dl>
-<dt><b>PixarImageFile</b> (class)  [<a href='#PIL.PixarImagePlugin.PixarImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for PIXAR raster images.</p>
-<p>For more information about this class, see <a href='#PIL.PixarImagePlugin.PixarImageFile-class'><i>The PixarImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.PixarImagePlugin.PixarImageFile-class' name='PIL.PixarImagePlugin.PixarImageFile-class'>The PixarImageFile Class</a></h2>
-<dl>
-<dt><b>PixarImageFile</b> (class)  [<a href='#PIL.PixarImagePlugin.PixarImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PngImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.PngImagePlugin.html
deleted file mode 100644
index ccd8e93252..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PngImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PngImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PngImagePlugin Module</h1>
-<dl>
-<dt><b>PngImageFile</b> (class)  [<a href='#PIL.PngImagePlugin.PngImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for PNG images.</p>
-<p>For more information about this class, see <a href='#PIL.PngImagePlugin.PngImageFile-class'><i>The PngImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.PngImagePlugin.PngImageFile-class' name='PIL.PngImagePlugin.PngImageFile-class'>The PngImageFile Class</a></h2>
-<dl>
-<dt><b>PngImageFile</b> (class)  [<a href='#PIL.PngImagePlugin.PngImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PpmImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.PpmImagePlugin.html
deleted file mode 100644
index 24789682aa..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PpmImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PpmImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PpmImagePlugin Module</h1>
-<dl>
-<dt><b>PpmImageFile</b> (class)  [<a href='#PIL.PpmImagePlugin.PpmImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for PBM, PGM, and PPM images.</p>
-<p>For more information about this class, see <a href='#PIL.PpmImagePlugin.PpmImageFile-class'><i>The PpmImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.PpmImagePlugin.PpmImageFile-class' name='PIL.PpmImagePlugin.PpmImageFile-class'>The PpmImageFile Class</a></h2>
-<dl>
-<dt><b>PpmImageFile</b> (class)  [<a href='#PIL.PpmImagePlugin.PpmImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.PsdImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.PsdImagePlugin.html
deleted file mode 100644
index 7ed4f80844..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.PsdImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.PsdImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.PsdImagePlugin Module</h1>
-<dl>
-<dt><b>PsdImageFile</b> (class)  [<a href='#PIL.PsdImagePlugin.PsdImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Photoshop images.</p>
-<p>For more information about this class, see <a href='#PIL.PsdImagePlugin.PsdImageFile-class'><i>The PsdImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.PsdImagePlugin.PsdImageFile-class' name='PIL.PsdImagePlugin.PsdImageFile-class'>The PsdImageFile Class</a></h2>
-<dl>
-<dt><b>PsdImageFile</b> (class)  [<a href='#PIL.PsdImagePlugin.PsdImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.SgiImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.SgiImagePlugin.html
deleted file mode 100644
index 847b35efd7..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.SgiImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.SgiImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.SgiImagePlugin Module</h1>
-<dl>
-<dt><b>SgiImageFile</b> (class)  [<a href='#PIL.SgiImagePlugin.SgiImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for SGI images.</p>
-<p>For more information about this class, see <a href='#PIL.SgiImagePlugin.SgiImageFile-class'><i>The SgiImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.SgiImagePlugin.SgiImageFile-class' name='PIL.SgiImagePlugin.SgiImageFile-class'>The SgiImageFile Class</a></h2>
-<dl>
-<dt><b>SgiImageFile</b> (class)  [<a href='#PIL.SgiImagePlugin.SgiImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.SpiderImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.SpiderImagePlugin.html
deleted file mode 100644
index 733f044198..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.SpiderImagePlugin.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.SpiderImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.SpiderImagePlugin Module</h1>
-<p>Image plugin for the Spider image format.  This format is is used
-by the SPIDER software, in processing image data from electron
-microscopy and tomography.</p>
-<h2>Module Contents</h2>
-<dl>
-<dt><b>SpiderImageFile</b> (class)  [<a href='#PIL.SpiderImagePlugin.SpiderImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the SPIDER format.</p>
-<p>For more information about this class, see <a href='#PIL.SpiderImagePlugin.SpiderImageFile-class'><i>The SpiderImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.SpiderImagePlugin.SpiderImageFile-class' name='PIL.SpiderImagePlugin.SpiderImageFile-class'>The SpiderImageFile Class</a></h2>
-<dl>
-<dt><b>SpiderImageFile</b> (class)  [<a href='#PIL.SpiderImagePlugin.SpiderImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for the SPIDER format.</p>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.SunImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.SunImagePlugin.html
deleted file mode 100644
index fb3cdd9875..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.SunImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.SunImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.SunImagePlugin Module</h1>
-<dl>
-<dt><b>SunImageFile</b> (class)  [<a href='#PIL.SunImagePlugin.SunImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Sun raster files.</p>
-<p>For more information about this class, see <a href='#PIL.SunImagePlugin.SunImageFile-class'><i>The SunImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.SunImagePlugin.SunImageFile-class' name='PIL.SunImagePlugin.SunImageFile-class'>The SunImageFile Class</a></h2>
-<dl>
-<dt><b>SunImageFile</b> (class)  [<a href='#PIL.SunImagePlugin.SunImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.TarIO.html b/pythonPackages/pil/Docs/pythondoc-PIL.TarIO.html
deleted file mode 100644
index 996633b98c..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.TarIO.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.TarIO Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.TarIO Module</h1>
-<dl>
-<dt><b>TarIO(tarfile, file)</b> (class) [<a href='#PIL.TarIO.TarIO-class'>#</a>]</dt>
-<dd>
-<p>A file object that provides read access to a given member of a TAR
-file.</p>
-<p>For more information about this class, see <a href='#PIL.TarIO.TarIO-class'><i>The TarIO Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.TarIO.TarIO-class' name='PIL.TarIO.TarIO-class'>The TarIO Class</a></h2>
-<dl>
-<dt><b>TarIO(tarfile, file)</b> (class) [<a href='#PIL.TarIO.TarIO-class'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.TarIO.TarIO.__init__-method' name='PIL.TarIO.TarIO.__init__-method'><b>__init__(tarfile, file)</b></a> [<a href='#PIL.TarIO.TarIO.__init__-method'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>tarfile</i></dt>
-<dd>
-</dd>
-<dt><i>file</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.TgaImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.TgaImagePlugin.html
deleted file mode 100644
index f91381e959..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.TgaImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.TgaImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.TgaImagePlugin Module</h1>
-<dl>
-<dt><b>TgaImageFile</b> (class)  [<a href='#PIL.TgaImagePlugin.TgaImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Targa files.</p>
-<p>For more information about this class, see <a href='#PIL.TgaImagePlugin.TgaImageFile-class'><i>The TgaImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.TgaImagePlugin.TgaImageFile-class' name='PIL.TgaImagePlugin.TgaImageFile-class'>The TgaImageFile Class</a></h2>
-<dl>
-<dt><b>TgaImageFile</b> (class)  [<a href='#PIL.TgaImagePlugin.TgaImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.TiffImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.TiffImagePlugin.html
deleted file mode 100644
index 56546d260f..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.TiffImagePlugin.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.TiffImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.TiffImagePlugin Module</h1>
-<dl>
-<dt><b>ImageFileDirectory(prefix=&quot;II&quot;)</b> (class) [<a href='#PIL.TiffImagePlugin.ImageFileDirectory-class'>#</a>]</dt>
-<dd>
-<p>Wrapper for TIFF IFDs.</p>
-<p>For more information about this class, see <a href='#PIL.TiffImagePlugin.ImageFileDirectory-class'><i>The ImageFileDirectory Class</i></a>.</p>
-</dd>
-<dt><b>TiffImageFile</b> (class)  [<a href='#PIL.TiffImagePlugin.TiffImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for TIFF files.</p>
-<p>For more information about this class, see <a href='#PIL.TiffImagePlugin.TiffImageFile-class'><i>The TiffImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.TiffImagePlugin.ImageFileDirectory-class' name='PIL.TiffImagePlugin.ImageFileDirectory-class'>The ImageFileDirectory Class</a></h2>
-<dl>
-<dt><b>ImageFileDirectory(prefix=&quot;II&quot;)</b> (class) [<a href='#PIL.TiffImagePlugin.ImageFileDirectory-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-<h2><a id='PIL.TiffImagePlugin.TiffImageFile-class' name='PIL.TiffImagePlugin.TiffImageFile-class'>The TiffImageFile Class</a></h2>
-<dl>
-<dt><b>TiffImageFile</b> (class)  [<a href='#PIL.TiffImagePlugin.TiffImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.TiffTags.html b/pythonPackages/pil/Docs/pythondoc-PIL.TiffTags.html
deleted file mode 100644
index 15d8c98a17..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.TiffTags.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.TiffTags Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.TiffTags Module</h1>
-<h2>Module Contents</h2>
-<dl>
-<dt><a id='PIL.TiffTags.TAGS-variable' name='PIL.TiffTags.TAGS-variable'><b>TAGS</b></a> (variable) [<a href='#PIL.TiffTags.TAGS-variable'>#</a>]</dt>
-<dd>
-</dd>
-<dt><a id='PIL.TiffTags.TYPES-variable' name='PIL.TiffTags.TYPES-variable'><b>TYPES</b></a> (variable) [<a href='#PIL.TiffTags.TYPES-variable'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.WalImageFile.html b/pythonPackages/pil/Docs/pythondoc-PIL.WalImageFile.html
deleted file mode 100644
index 3b0b54633d..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.WalImageFile.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.WalImageFile Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.WalImageFile Module</h1>
-<dl>
-<dt><a id='PIL.WalImageFile.open-function' name='PIL.WalImageFile.open-function'><b>open(filename)</b></a> [<a href='#PIL.WalImageFile.open-function'>#</a>]</dt>
-<dd>
-<p>Load texture from a Quake2 WAL texture file.
-</p><p>
-By default, a Quake2 standard palette is attached to the texture.
-To override the palette, use the <b>putpalette</b> method.
-
-</p><dl>
-<dt><i>filename</i></dt>
-<dd>
-</dd>
-<dt>Returns:</dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.WmfImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.WmfImagePlugin.html
deleted file mode 100644
index 51bf10300f..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.WmfImagePlugin.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.WmfImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.WmfImagePlugin Module</h1>
-<dl>
-<dt><a id='PIL.WmfImagePlugin.register_handler-function' name='PIL.WmfImagePlugin.register_handler-function'><b>register_handler(handler)</b></a> [<a href='#PIL.WmfImagePlugin.register_handler-function'>#</a>]</dt>
-<dd>
-<dl>
-<dt><i>handler</i></dt>
-<dd>
-</dd>
-</dl><br />
-</dd>
-<dt><b>WmfStubImageFile</b> (class)  [<a href='#PIL.WmfImagePlugin.WmfStubImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for Windows metafiles.</p>
-<p>For more information about this class, see <a href='#PIL.WmfImagePlugin.WmfStubImageFile-class'><i>The WmfStubImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.WmfImagePlugin.WmfStubImageFile-class' name='PIL.WmfImagePlugin.WmfStubImageFile-class'>The WmfStubImageFile Class</a></h2>
-<dl>
-<dt><b>WmfStubImageFile</b> (class)  [<a href='#PIL.WmfImagePlugin.WmfStubImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.XVThumbImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.XVThumbImagePlugin.html
deleted file mode 100644
index 30282acabf..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.XVThumbImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.XVThumbImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.XVThumbImagePlugin Module</h1>
-<dl>
-<dt><b>XVThumbImageFile</b> (class)  [<a href='#PIL.XVThumbImagePlugin.XVThumbImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for XV thumbnail images.</p>
-<p>For more information about this class, see <a href='#PIL.XVThumbImagePlugin.XVThumbImageFile-class'><i>The XVThumbImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.XVThumbImagePlugin.XVThumbImageFile-class' name='PIL.XVThumbImagePlugin.XVThumbImageFile-class'>The XVThumbImageFile Class</a></h2>
-<dl>
-<dt><b>XVThumbImageFile</b> (class)  [<a href='#PIL.XVThumbImagePlugin.XVThumbImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.XbmImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.XbmImagePlugin.html
deleted file mode 100644
index 682e05f777..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.XbmImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.XbmImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.XbmImagePlugin Module</h1>
-<dl>
-<dt><b>XbmImageFile</b> (class)  [<a href='#PIL.XbmImagePlugin.XbmImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for X11 bitmaps.</p>
-<p>For more information about this class, see <a href='#PIL.XbmImagePlugin.XbmImageFile-class'><i>The XbmImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.XbmImagePlugin.XbmImageFile-class' name='PIL.XbmImagePlugin.XbmImageFile-class'>The XbmImageFile Class</a></h2>
-<dl>
-<dt><b>XbmImageFile</b> (class)  [<a href='#PIL.XbmImagePlugin.XbmImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Docs/pythondoc-PIL.XpmImagePlugin.html b/pythonPackages/pil/Docs/pythondoc-PIL.XpmImagePlugin.html
deleted file mode 100644
index 218f704771..0000000000
--- a/pythonPackages/pil/Docs/pythondoc-PIL.XpmImagePlugin.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>
-<html>
-<head>
-<meta http-equiv='Content-Type' content='text/html; charset=us-ascii' />
-<title>The PIL.XpmImagePlugin Module</title>
-<link rel='stylesheet' href='effbot.css' type='text/css' />
-</head>
-<body>
-<h1>The PIL.XpmImagePlugin Module</h1>
-<dl>
-<dt><b>XpmImageFile</b> (class)  [<a href='#PIL.XpmImagePlugin.XpmImageFile-class'>#</a>]</dt>
-<dd>
-<p>Image plugin for X11 pixel maps.</p>
-<p>For more information about this class, see <a href='#PIL.XpmImagePlugin.XpmImageFile-class'><i>The XpmImageFile Class</i></a>.</p>
-</dd>
-</dl>
-<h2><a id='PIL.XpmImagePlugin.XpmImageFile-class' name='PIL.XpmImagePlugin.XpmImageFile-class'>The XpmImageFile Class</a></h2>
-<dl>
-<dt><b>XpmImageFile</b> (class)  [<a href='#PIL.XpmImagePlugin.XpmImageFile-class'>#</a>]</dt>
-<dd>
-</dd>
-</dl>
-</body></html>
diff --git a/pythonPackages/pil/Images/courB08.bdf b/pythonPackages/pil/Images/courB08.bdf
deleted file mode 100644
index 5a48895d1d..0000000000
--- a/pythonPackages/pil/Images/courB08.bdf
+++ /dev/null
@@ -1,2676 +0,0 @@
-STARTFONT 2.1
-COMMENT $XConsortium: courB08.bdf,v 1.5 94/04/10 21:46:11 gildea Exp $
-COMMENT 
-COMMENT  Copyright 1984, 1987 Adobe Systems, Inc.
-COMMENT  Portions Copyright 1988 Digital Equipment Corporation
-COMMENT 
-COMMENT  Adobe is a registered trademark of Adobe Systems, Inc.  Permission 
-COMMENT  to use these trademarks is hereby granted only in association with the
-COMMENT  images described in this file.
-COMMENT 
-COMMENT  Permission to use, copy, modify, and distribute this software and
-COMMENT  its documentation for any purpose and without fee is hereby granted,
-COMMENT  provided that the above copyright notices appear in all copies and
-COMMENT  that both those copyright notices and this permission notice appear
-COMMENT  in supporting documentation, and that the names of Adobe Systems and
-COMMENT  Digital Equipment Corporation not be used in advertising or
-COMMENT  publicity pertaining to distribution of the software without
-COMMENT  specific, written prior permission.  Adobe Systems and Digital
-COMMENT  Equipment Corporation make no representations about the suitability
-COMMENT  of this software for any purpose.  It is provided "as is" without
-COMMENT  express or implied warranty.
-COMMENT 
-COMMENT  ADOBE SYSTEMS AND DIGITAL EQUIPMENT CORPORATION DISCLAIM ALL
-COMMENT  WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED
-COMMENT  WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL ADOBE
-COMMENT  SYSTEMS AND DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY SPECIAL,
-COMMENT  INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-COMMENT  RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-COMMENT  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-COMMENT  CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-COMMENT 
-COMMENT 
-FONT -Adobe-Courier-Bold-R-Normal--11-80-100-100-M-60-ISO8859-1
-SIZE 8 100 100
-FONTBOUNDINGBOX 8 11 -1 -2
-STARTPROPERTIES 22
-COMMENT Begin LogicalFontDescription
-FONTNAME_REGISTRY ""
-FAMILY_NAME "Courier"
-FOUNDRY "Adobe"
-WEIGHT_NAME "Bold"
-SLANT "R"
-SETWIDTH_NAME "Normal"
-ADD_STYLE_NAME ""
-PIXEL_SIZE 11
-POINT_SIZE 80
-RESOLUTION_X 100
-RESOLUTION_Y 100
-SPACING "M"
-AVERAGE_WIDTH 60
-CHARSET_REGISTRY "ISO8859"
-CHARSET_ENCODING "1"
-COMMENT END LogicalFontDescription
-CHARSET_COLLECTIONS "ASCII ISO8859-1 ADOBE-STANDARD"
-FACE_NAME "Courier Bold"
-COPYRIGHT "Copyright (c) 1987 Adobe Systems, Inc., Portions Copyright 1988 Digital Equipment Corp."
-COMMENT ***** end of inserted font properties
-FONT_ASCENT 8
-FONT_DESCENT 2
-CAP_HEIGHT 6
-X_HEIGHT 5
-ENDPROPERTIES
-CHARS 194
-STARTCHAR space
-ENCODING 32
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 1 1 0 0
-BITMAP
-00
-ENDCHAR
-STARTCHAR exclam
-ENCODING 33
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 2 6 1 0
-BITMAP
-C0
-C0
-C0
-C0
-00
-C0
-ENDCHAR
-STARTCHAR quotedbl
-ENCODING 34
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 3 1 3
-BITMAP
-A0
-A0
-A0
-ENDCHAR
-STARTCHAR numbersign
-ENCODING 35
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 -1
-BITMAP
-50
-50
-F8
-50
-50
-F8
-50
-50
-ENDCHAR
-STARTCHAR dollar
-ENCODING 36
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 9 0 -1
-BITMAP
-20
-78
-C8
-F0
-78
-18
-D8
-F0
-20
-ENDCHAR
-STARTCHAR percent
-ENCODING 37
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-E0
-A8
-F0
-20
-78
-A8
-38
-ENDCHAR
-STARTCHAR ampersand
-ENCODING 38
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-38
-60
-30
-7C
-D8
-7C
-ENDCHAR
-STARTCHAR quoteright
-ENCODING 39
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 3 1 4
-BITMAP
-60
-40
-80
-ENDCHAR
-STARTCHAR parenleft
-ENCODING 40
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 8 1 -1
-BITMAP
-20
-40
-C0
-C0
-C0
-C0
-40
-20
-ENDCHAR
-STARTCHAR parenright
-ENCODING 41
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 8 1 -1
-BITMAP
-80
-40
-60
-60
-60
-60
-40
-80
-ENDCHAR
-STARTCHAR asterisk
-ENCODING 42
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 4 0 3
-BITMAP
-20
-F0
-60
-90
-ENDCHAR
-STARTCHAR plus
-ENCODING 43
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 5 0 1
-BITMAP
-20
-20
-F8
-20
-20
-ENDCHAR
-STARTCHAR comma
-ENCODING 44
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 3 1 -2
-BITMAP
-60
-40
-80
-ENDCHAR
-STARTCHAR minus
-ENCODING 45
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 1 0 3
-BITMAP
-F8
-ENDCHAR
-STARTCHAR period
-ENCODING 46
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 2 1 1 0
-BITMAP
-C0
-ENDCHAR
-STARTCHAR slash
-ENCODING 47
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 8 1 -1
-BITMAP
-10
-10
-20
-20
-40
-40
-80
-80
-ENDCHAR
-STARTCHAR zero
-ENCODING 48
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-70
-D8
-D8
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR one
-ENCODING 49
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-30
-F0
-30
-30
-30
-30
-FC
-ENDCHAR
-STARTCHAR two
-ENCODING 50
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-70
-D8
-18
-30
-60
-D8
-F8
-ENDCHAR
-STARTCHAR three
-ENCODING 51
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-70
-D8
-18
-70
-18
-D8
-70
-ENDCHAR
-STARTCHAR four
-ENCODING 52
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-18
-38
-58
-D8
-FC
-18
-18
-ENDCHAR
-STARTCHAR five
-ENCODING 53
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-F8
-C0
-F0
-D8
-18
-98
-F0
-ENDCHAR
-STARTCHAR six
-ENCODING 54
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-70
-D8
-C0
-F0
-D8
-D8
-70
-ENDCHAR
-STARTCHAR seven
-ENCODING 55
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-F8
-D8
-18
-30
-30
-60
-60
-ENDCHAR
-STARTCHAR eight
-ENCODING 56
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-70
-D8
-D8
-70
-D8
-D8
-70
-ENDCHAR
-STARTCHAR nine
-ENCODING 57
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-70
-D8
-D8
-78
-18
-D8
-70
-ENDCHAR
-STARTCHAR colon
-ENCODING 58
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 2 4 1 0
-BITMAP
-C0
-00
-00
-C0
-ENDCHAR
-STARTCHAR semicolon
-ENCODING 59
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 6 0 -2
-BITMAP
-60
-00
-00
-60
-40
-80
-ENDCHAR
-STARTCHAR less
-ENCODING 60
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 5 0 1
-BITMAP
-30
-60
-C0
-60
-30
-ENDCHAR
-STARTCHAR equal
-ENCODING 61
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 3 0 2
-BITMAP
-F0
-00
-F0
-ENDCHAR
-STARTCHAR greater
-ENCODING 62
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 5 1 1
-BITMAP
-C0
-60
-30
-60
-C0
-ENDCHAR
-STARTCHAR question
-ENCODING 63
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 6 0 0
-BITMAP
-70
-98
-30
-60
-00
-60
-ENDCHAR
-STARTCHAR at
-ENCODING 64
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 0 -1
-BITMAP
-70
-C8
-98
-A8
-A8
-9C
-C0
-70
-ENDCHAR
-STARTCHAR A
-ENCODING 65
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-78
-38
-28
-7C
-6C
-EE
-ENDCHAR
-STARTCHAR B
-ENCODING 66
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-F8
-6C
-78
-6C
-6C
-F8
-ENDCHAR
-STARTCHAR C
-ENCODING 67
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 6 0 0
-BITMAP
-78
-D8
-C0
-C0
-D8
-70
-ENDCHAR
-STARTCHAR D
-ENCODING 68
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-F8
-6C
-6C
-6C
-6C
-F8
-ENDCHAR
-STARTCHAR E
-ENCODING 69
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-FC
-60
-78
-60
-6C
-FC
-ENDCHAR
-STARTCHAR F
-ENCODING 70
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-FC
-60
-78
-60
-60
-F0
-ENDCHAR
-STARTCHAR G
-ENCODING 71
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 6 0 0
-BITMAP
-70
-D8
-C0
-F8
-D8
-78
-ENDCHAR
-STARTCHAR H
-ENCODING 72
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-EE
-6C
-7C
-6C
-6C
-EE
-ENDCHAR
-STARTCHAR I
-ENCODING 73
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 6 0 0
-BITMAP
-F0
-60
-60
-60
-60
-F0
-ENDCHAR
-STARTCHAR J
-ENCODING 74
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-3C
-18
-18
-D8
-D8
-70
-ENDCHAR
-STARTCHAR K
-ENCODING 75
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-EC
-68
-70
-78
-6C
-F6
-ENDCHAR
-STARTCHAR L
-ENCODING 76
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-F0
-60
-60
-60
-6C
-FC
-ENDCHAR
-STARTCHAR M
-ENCODING 77
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-C4
-6C
-6C
-7C
-54
-D4
-ENDCHAR
-STARTCHAR N
-ENCODING 78
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-EE
-74
-74
-6C
-6C
-E4
-ENDCHAR
-STARTCHAR O
-ENCODING 79
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 6 0 0
-BITMAP
-70
-D8
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR P
-ENCODING 80
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-F8
-6C
-6C
-78
-60
-F0
-ENDCHAR
-STARTCHAR Q
-ENCODING 81
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 -1
-BITMAP
-70
-D8
-D8
-D8
-D8
-70
-18
-ENDCHAR
-STARTCHAR R
-ENCODING 82
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-F8
-6C
-6C
-78
-6C
-F6
-ENDCHAR
-STARTCHAR S
-ENCODING 83
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 6 0 0
-BITMAP
-78
-C8
-F0
-38
-98
-F0
-ENDCHAR
-STARTCHAR T
-ENCODING 84
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-FC
-B4
-30
-30
-30
-78
-ENDCHAR
-STARTCHAR U
-ENCODING 85
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-EE
-6C
-6C
-6C
-6C
-38
-ENDCHAR
-STARTCHAR V
-ENCODING 86
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-EE
-6C
-28
-38
-38
-10
-ENDCHAR
-STARTCHAR W
-ENCODING 87
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-D6
-54
-54
-7C
-38
-28
-ENDCHAR
-STARTCHAR X
-ENCODING 88
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 0 0
-BITMAP
-CC
-78
-30
-30
-78
-CC
-ENDCHAR
-STARTCHAR Y
-ENCODING 89
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-E6
-66
-3C
-18
-18
-3C
-ENDCHAR
-STARTCHAR Z
-ENCODING 90
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 6 0 0
-BITMAP
-F8
-D8
-30
-60
-D8
-F8
-ENDCHAR
-STARTCHAR bracketleft
-ENCODING 91
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 8 1 -1
-BITMAP
-E0
-C0
-C0
-C0
-C0
-C0
-C0
-E0
-ENDCHAR
-STARTCHAR backslash
-ENCODING 92
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 8 0 -1
-BITMAP
-80
-80
-40
-40
-20
-20
-10
-10
-ENDCHAR
-STARTCHAR bracketright
-ENCODING 93
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 8 1 -1
-BITMAP
-E0
-60
-60
-60
-60
-60
-60
-E0
-ENDCHAR
-STARTCHAR asciicircum
-ENCODING 94
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 3 0 4
-BITMAP
-20
-70
-D8
-ENDCHAR
-STARTCHAR underscore
-ENCODING 95
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 1 0 -2
-BITMAP
-FC
-ENDCHAR
-STARTCHAR quoteleft
-ENCODING 96
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 3 1 4
-BITMAP
-C0
-40
-20
-ENDCHAR
-STARTCHAR a
-ENCODING 97
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 5 0 0
-BITMAP
-70
-D8
-78
-D8
-FC
-ENDCHAR
-STARTCHAR b
-ENCODING 98
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 -1 0
-BITMAP
-E0
-60
-78
-6C
-6C
-6C
-F8
-ENDCHAR
-STARTCHAR c
-ENCODING 99
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 5 0 0
-BITMAP
-70
-D8
-C0
-D8
-70
-ENDCHAR
-STARTCHAR d
-ENCODING 100
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-38
-18
-78
-D8
-D8
-D8
-7C
-ENDCHAR
-STARTCHAR e
-ENCODING 101
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 5 0 0
-BITMAP
-70
-D8
-F8
-C0
-78
-ENDCHAR
-STARTCHAR f
-ENCODING 102
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-38
-60
-F8
-60
-60
-60
-F8
-ENDCHAR
-STARTCHAR g
-ENCODING 103
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 -2
-BITMAP
-6C
-D8
-D8
-D8
-78
-18
-F0
-ENDCHAR
-STARTCHAR h
-ENCODING 104
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 -1 0
-BITMAP
-E0
-60
-78
-6C
-6C
-6C
-6C
-ENDCHAR
-STARTCHAR i
-ENCODING 105
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-30
-00
-F0
-30
-30
-30
-FC
-ENDCHAR
-STARTCHAR j
-ENCODING 106
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 9 0 -2
-BITMAP
-30
-00
-F0
-30
-30
-30
-30
-30
-E0
-ENDCHAR
-STARTCHAR k
-ENCODING 107
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 7 -1 0
-BITMAP
-E0
-60
-6C
-78
-70
-78
-6E
-ENDCHAR
-STARTCHAR l
-ENCODING 108
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-F0
-30
-30
-30
-30
-30
-FC
-ENDCHAR
-STARTCHAR m
-ENCODING 109
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 5 -1 0
-BITMAP
-F8
-7C
-54
-54
-54
-ENDCHAR
-STARTCHAR n
-ENCODING 110
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 5 -1 0
-BITMAP
-D8
-6C
-6C
-6C
-6C
-ENDCHAR
-STARTCHAR o
-ENCODING 111
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 5 0 0
-BITMAP
-70
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR p
-ENCODING 112
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 -1 -2
-BITMAP
-F8
-6C
-6C
-6C
-78
-60
-F0
-ENDCHAR
-STARTCHAR q
-ENCODING 113
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 -2
-BITMAP
-6C
-D8
-D8
-D8
-78
-18
-3C
-ENDCHAR
-STARTCHAR r
-ENCODING 114
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 5 0 0
-BITMAP
-DC
-74
-60
-60
-F0
-ENDCHAR
-STARTCHAR s
-ENCODING 115
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 5 0 0
-BITMAP
-78
-E0
-78
-1C
-F8
-ENDCHAR
-STARTCHAR t
-ENCODING 116
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-60
-60
-F8
-60
-60
-6C
-38
-ENDCHAR
-STARTCHAR u
-ENCODING 117
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 5 -1 0
-BITMAP
-EC
-6C
-6C
-6C
-3E
-ENDCHAR
-STARTCHAR v
-ENCODING 118
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 5 -1 0
-BITMAP
-EC
-6C
-38
-38
-10
-ENDCHAR
-STARTCHAR w
-ENCODING 119
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 5 -1 0
-BITMAP
-D6
-54
-7C
-3C
-28
-ENDCHAR
-STARTCHAR x
-ENCODING 120
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 5 0 0
-BITMAP
-EC
-78
-30
-78
-DC
-ENDCHAR
-STARTCHAR y
-ENCODING 121
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 7 -1 -2
-BITMAP
-EE
-6C
-6C
-28
-38
-30
-E0
-ENDCHAR
-STARTCHAR z
-ENCODING 122
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 5 0 0
-BITMAP
-F8
-B0
-60
-D8
-F8
-ENDCHAR
-STARTCHAR braceleft
-ENCODING 123
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 8 1 -1
-BITMAP
-30
-60
-60
-C0
-60
-60
-60
-30
-ENDCHAR
-STARTCHAR bar
-ENCODING 124
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 1 7 2 -1
-BITMAP
-80
-80
-80
-80
-80
-80
-80
-ENDCHAR
-STARTCHAR braceright
-ENCODING 125
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 8 0 -1
-BITMAP
-C0
-60
-60
-30
-60
-60
-60
-C0
-ENDCHAR
-STARTCHAR asciitilde
-ENCODING 126
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 2 0 3
-BITMAP
-68
-B0
-ENDCHAR
-STARTCHAR exclamdown
-ENCODING 161
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 2 7 1 -2
-BITMAP
-C0
-00
-C0
-C0
-C0
-C0
-C0
-ENDCHAR
-STARTCHAR cent
-ENCODING 162
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 -1
-BITMAP
-20
-20
-78
-C8
-C0
-78
-20
-20
-ENDCHAR
-STARTCHAR sterling
-ENCODING 163
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-38
-68
-20
-F8
-20
-64
-F8
-ENDCHAR
-STARTCHAR currency
-ENCODING 164
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 5 0 1
-BITMAP
-88
-70
-50
-70
-88
-ENDCHAR
-STARTCHAR yen
-ENCODING 165
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-CC
-48
-FC
-30
-FC
-30
-78
-ENDCHAR
-STARTCHAR brokenbar
-ENCODING 166
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 1 9 2 -2
-BITMAP
-80
-80
-80
-80
-00
-80
-80
-80
-80
-ENDCHAR
-STARTCHAR section
-ENCODING 167
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 -1
-BITMAP
-78
-48
-60
-90
-48
-30
-90
-F0
-ENDCHAR
-STARTCHAR dieresis
-ENCODING 168
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 1 1 5
-BITMAP
-A0
-ENDCHAR
-STARTCHAR copyright
-ENCODING 169
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-30
-48
-B4
-A4
-B4
-48
-30
-ENDCHAR
-STARTCHAR ordfeminine
-ENCODING 170
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 5 1 2
-BITMAP
-E0
-10
-D0
-00
-F0
-ENDCHAR
-STARTCHAR guillemotleft
-ENCODING 171
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 5 -1 0
-BITMAP
-36
-6C
-D8
-6C
-36
-ENDCHAR
-STARTCHAR logicalnot
-ENCODING 172
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 3 0 2
-BITMAP
-F8
-08
-08
-ENDCHAR
-STARTCHAR hyphen
-ENCODING 173
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 1 0 3
-BITMAP
-F8
-ENDCHAR
-STARTCHAR registered
-ENCODING 174
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 7 0 0
-BITMAP
-38
-44
-BA
-B2
-AA
-44
-38
-ENDCHAR
-STARTCHAR macron
-ENCODING 175
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 1 0 5
-BITMAP
-F0
-ENDCHAR
-STARTCHAR degree
-ENCODING 176
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 3 0 4
-BITMAP
-60
-90
-60
-ENDCHAR
-STARTCHAR plusminus
-ENCODING 177
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 6 0 0
-BITMAP
-20
-20
-F8
-20
-00
-F8
-ENDCHAR
-STARTCHAR twosuperior
-ENCODING 178
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 4 1 3
-BITMAP
-60
-A0
-40
-E0
-ENDCHAR
-STARTCHAR threesuperior
-ENCODING 179
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 4 1 3
-BITMAP
-E0
-40
-20
-C0
-ENDCHAR
-STARTCHAR acute
-ENCODING 180
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 2 2 2 5
-BITMAP
-40
-80
-ENDCHAR
-STARTCHAR mu
-ENCODING 181
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 7 -1 -2
-BITMAP
-EC
-6C
-6C
-6C
-7E
-40
-40
-ENDCHAR
-STARTCHAR paragraph
-ENCODING 182
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 0 -1
-BITMAP
-7C
-A8
-A8
-68
-28
-28
-28
-6C
-ENDCHAR
-STARTCHAR periodcentered
-ENCODING 183
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 2 1 1 3
-BITMAP
-C0
-ENDCHAR
-STARTCHAR cedilla
-ENCODING 184
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 3 1 -2
-BITMAP
-40
-20
-C0
-ENDCHAR
-STARTCHAR onesuperior
-ENCODING 185
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 3 4 1 3
-BITMAP
-C0
-40
-40
-E0
-ENDCHAR
-STARTCHAR ordmasculine
-ENCODING 186
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 5 1 2
-BITMAP
-60
-90
-60
-00
-F0
-ENDCHAR
-STARTCHAR guillemotright
-ENCODING 187
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 5 -1 0
-BITMAP
-D8
-6C
-36
-6C
-D8
-ENDCHAR
-STARTCHAR onequarter
-ENCODING 188
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 7 -1 0
-BITMAP
-C0
-44
-48
-F4
-2C
-5E
-04
-ENDCHAR
-STARTCHAR onehalf
-ENCODING 189
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 7 -1 0
-BITMAP
-C0
-44
-48
-F6
-2A
-44
-0E
-ENDCHAR
-STARTCHAR threequarters
-ENCODING 190
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 7 -1 0
-BITMAP
-E0
-44
-28
-D4
-2C
-5E
-04
-ENDCHAR
-STARTCHAR questiondown
-ENCODING 191
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 -2
-BITMAP
-30
-00
-30
-30
-60
-C8
-70
-ENDCHAR
-STARTCHAR Agrave
-ENCODING 192
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-20
-10
-00
-78
-38
-28
-7C
-6C
-EE
-ENDCHAR
-STARTCHAR Aacute
-ENCODING 193
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-10
-20
-00
-78
-38
-28
-7C
-6C
-EE
-ENDCHAR
-STARTCHAR Acircumflex
-ENCODING 194
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-10
-28
-00
-78
-38
-28
-7C
-6C
-EE
-ENDCHAR
-STARTCHAR Atilde
-ENCODING 195
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-34
-48
-00
-78
-38
-28
-7C
-6C
-EE
-ENDCHAR
-STARTCHAR Adieresis
-ENCODING 196
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 8 -1 0
-BITMAP
-28
-00
-78
-38
-28
-7C
-6C
-EE
-ENDCHAR
-STARTCHAR Aring
-ENCODING 197
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-30
-48
-30
-78
-38
-28
-7C
-6C
-EE
-ENDCHAR
-STARTCHAR AE
-ENCODING 198
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-7E
-3A
-6C
-78
-DA
-DE
-ENDCHAR
-STARTCHAR Ccedilla
-ENCODING 199
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 -2
-BITMAP
-78
-D8
-C0
-C0
-D8
-70
-10
-60
-ENDCHAR
-STARTCHAR Egrave
-ENCODING 200
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 9 -1 0
-BITMAP
-20
-10
-00
-FC
-64
-78
-60
-6C
-FC
-ENDCHAR
-STARTCHAR Eacute
-ENCODING 201
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 9 -1 0
-BITMAP
-10
-20
-00
-FC
-64
-78
-60
-6C
-FC
-ENDCHAR
-STARTCHAR Ecircumflex
-ENCODING 202
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 9 -1 0
-BITMAP
-20
-50
-00
-FC
-64
-78
-60
-6C
-FC
-ENDCHAR
-STARTCHAR Edieresis
-ENCODING 203
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 -1 0
-BITMAP
-50
-00
-FC
-64
-78
-60
-6C
-FC
-ENDCHAR
-STARTCHAR Igrave
-ENCODING 204
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 9 0 0
-BITMAP
-40
-20
-00
-F0
-60
-60
-60
-60
-F0
-ENDCHAR
-STARTCHAR Iacute
-ENCODING 205
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 9 0 0
-BITMAP
-20
-40
-00
-F0
-60
-60
-60
-60
-F0
-ENDCHAR
-STARTCHAR Icircumflex
-ENCODING 206
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 9 0 0
-BITMAP
-40
-A0
-00
-F0
-60
-60
-60
-60
-F0
-ENDCHAR
-STARTCHAR Idieresis
-ENCODING 207
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 4 8 0 0
-BITMAP
-A0
-00
-F0
-60
-60
-60
-60
-F0
-ENDCHAR
-STARTCHAR Eth
-ENCODING 208
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-F8
-6C
-F4
-64
-6C
-F8
-ENDCHAR
-STARTCHAR Ntilde
-ENCODING 209
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-34
-48
-00
-EE
-64
-74
-7C
-6C
-EC
-ENDCHAR
-STARTCHAR Ograve
-ENCODING 210
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 9 0 0
-BITMAP
-40
-20
-00
-70
-D8
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR Oacute
-ENCODING 211
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 9 0 0
-BITMAP
-20
-40
-00
-70
-D8
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR Ocircumflex
-ENCODING 212
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 9 0 0
-BITMAP
-20
-50
-00
-70
-D8
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR Otilde
-ENCODING 213
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 9 0 0
-BITMAP
-68
-90
-00
-70
-D8
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR Odieresis
-ENCODING 214
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 0
-BITMAP
-50
-00
-70
-D8
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR multiply
-ENCODING 215
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 5 0 1
-BITMAP
-88
-50
-20
-50
-88
-ENDCHAR
-STARTCHAR Oslash
-ENCODING 216
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-3A
-6C
-7C
-6C
-6C
-B8
-ENDCHAR
-STARTCHAR Ugrave
-ENCODING 217
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-20
-10
-00
-EE
-6C
-6C
-6C
-6C
-38
-ENDCHAR
-STARTCHAR Uacute
-ENCODING 218
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-08
-10
-00
-EE
-6C
-6C
-6C
-6C
-38
-ENDCHAR
-STARTCHAR Ucircumflex
-ENCODING 219
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-10
-28
-00
-EE
-6C
-6C
-6C
-6C
-38
-ENDCHAR
-STARTCHAR Udieresis
-ENCODING 220
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 8 -1 0
-BITMAP
-28
-00
-EE
-6C
-6C
-6C
-6C
-38
-ENDCHAR
-STARTCHAR Yacute
-ENCODING 221
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 0
-BITMAP
-04
-08
-00
-E6
-66
-3C
-18
-18
-3C
-ENDCHAR
-STARTCHAR Thorn
-ENCODING 222
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 6 -1 0
-BITMAP
-E0
-78
-6C
-6C
-78
-E0
-ENDCHAR
-STARTCHAR germandbls
-ENCODING 223
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 6 -1 0
-BITMAP
-38
-68
-7C
-66
-66
-EC
-ENDCHAR
-STARTCHAR agrave
-ENCODING 224
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 0 0
-BITMAP
-20
-10
-00
-70
-98
-78
-D8
-FC
-ENDCHAR
-STARTCHAR aacute
-ENCODING 225
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 0 0
-BITMAP
-10
-20
-00
-70
-98
-78
-D8
-FC
-ENDCHAR
-STARTCHAR acircumflex
-ENCODING 226
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 0 0
-BITMAP
-20
-50
-00
-70
-98
-78
-D8
-FC
-ENDCHAR
-STARTCHAR atilde
-ENCODING 227
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 0 0
-BITMAP
-68
-90
-00
-70
-98
-78
-D8
-FC
-ENDCHAR
-STARTCHAR adieresis
-ENCODING 228
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-50
-00
-70
-98
-78
-D8
-FC
-ENDCHAR
-STARTCHAR aring
-ENCODING 229
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 9 0 0
-BITMAP
-30
-48
-30
-00
-70
-98
-78
-D8
-FC
-ENDCHAR
-STARTCHAR ae
-ENCODING 230
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 5 -1 0
-BITMAP
-6C
-B4
-7C
-B0
-DC
-ENDCHAR
-STARTCHAR ccedilla
-ENCODING 231
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 -2
-BITMAP
-70
-D8
-C0
-D8
-70
-10
-60
-ENDCHAR
-STARTCHAR egrave
-ENCODING 232
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 0
-BITMAP
-40
-20
-00
-70
-D8
-F8
-C0
-78
-ENDCHAR
-STARTCHAR eacute
-ENCODING 233
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 0
-BITMAP
-20
-40
-00
-70
-D8
-F8
-C0
-78
-ENDCHAR
-STARTCHAR ecircumflex
-ENCODING 234
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 0
-BITMAP
-20
-50
-00
-70
-D8
-F8
-C0
-78
-ENDCHAR
-STARTCHAR edieresis
-ENCODING 235
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-50
-00
-70
-D8
-F8
-C0
-78
-ENDCHAR
-STARTCHAR igrave
-ENCODING 236
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 0 0
-BITMAP
-20
-10
-00
-70
-30
-30
-30
-FC
-ENDCHAR
-STARTCHAR iacute
-ENCODING 237
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 0 0
-BITMAP
-10
-20
-00
-70
-30
-30
-30
-FC
-ENDCHAR
-STARTCHAR icircumflex
-ENCODING 238
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 8 0 0
-BITMAP
-20
-50
-00
-70
-30
-30
-30
-FC
-ENDCHAR
-STARTCHAR idieresis
-ENCODING 239
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-50
-00
-70
-30
-30
-30
-FC
-ENDCHAR
-STARTCHAR eth
-ENCODING 240
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 0
-BITMAP
-D0
-60
-B0
-78
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR ntilde
-ENCODING 241
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 8 -1 0
-BITMAP
-34
-48
-00
-D8
-6C
-6C
-6C
-6E
-ENDCHAR
-STARTCHAR ograve
-ENCODING 242
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 0
-BITMAP
-40
-20
-00
-70
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR oacute
-ENCODING 243
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 0
-BITMAP
-20
-40
-00
-70
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR ocircumflex
-ENCODING 244
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 0
-BITMAP
-20
-50
-00
-70
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR otilde
-ENCODING 245
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 8 0 0
-BITMAP
-68
-90
-00
-70
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR odieresis
-ENCODING 246
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 0
-BITMAP
-50
-00
-70
-D8
-D8
-D8
-70
-ENDCHAR
-STARTCHAR divide
-ENCODING 247
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 5 0 1
-BITMAP
-20
-00
-F8
-00
-20
-ENDCHAR
-STARTCHAR oslash
-ENCODING 248
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 5 7 0 -1
-BITMAP
-08
-70
-D8
-F8
-D8
-70
-80
-ENDCHAR
-STARTCHAR ugrave
-ENCODING 249
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 8 -1 0
-BITMAP
-20
-10
-00
-EC
-6C
-6C
-6C
-3E
-ENDCHAR
-STARTCHAR uacute
-ENCODING 250
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 8 -1 0
-BITMAP
-10
-20
-00
-EC
-6C
-6C
-6C
-3E
-ENDCHAR
-STARTCHAR ucircumflex
-ENCODING 251
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 8 -1 0
-BITMAP
-10
-28
-00
-EC
-6C
-6C
-6C
-3E
-ENDCHAR
-STARTCHAR udieresis
-ENCODING 252
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 7 -1 0
-BITMAP
-28
-00
-EC
-6C
-6C
-6C
-3E
-ENDCHAR
-STARTCHAR yacute
-ENCODING 253
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 10 -1 -2
-BITMAP
-08
-10
-00
-EE
-6C
-6C
-28
-38
-30
-F0
-ENDCHAR
-STARTCHAR thorn
-ENCODING 254
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 9 -1 -2
-BITMAP
-E0
-60
-78
-6C
-6C
-6C
-78
-60
-F0
-ENDCHAR
-STARTCHAR ydieresis
-ENCODING 255
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 9 -1 -2
-BITMAP
-28
-00
-EE
-6C
-6C
-28
-38
-30
-F0
-ENDCHAR
-STARTCHAR trademark
-ENCODING 8482
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 4 -1 3
-BITMAP
-F6
-5E
-5A
-5A
-ENDCHAR
-STARTCHAR perthousand
-ENCODING 8240
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 7 0 0
-BITMAP
-60
-A8
-D0
-60
-6C
-B4
-D8
-ENDCHAR
-STARTCHAR oe
-ENCODING 339
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 6 5 0 0
-BITMAP
-6C
-B4
-BC
-B0
-6C
-ENDCHAR
-STARTCHAR fl
-ENCODING 64258
-SWIDTH 600 0
-DWIDTH 6 0
-BBX 7 7 -1 0
-BITMAP
-3C
-6C
-FC
-6C
-6C
-6C
-FE
-ENDCHAR
-ENDFONT
diff --git a/pythonPackages/pil/Images/courB08.pbm b/pythonPackages/pil/Images/courB08.pbm
deleted file mode 100644
index aedce1a311..0000000000
Binary files a/pythonPackages/pil/Images/courB08.pbm and /dev/null differ
diff --git a/pythonPackages/pil/Images/courB08.pil b/pythonPackages/pil/Images/courB08.pil
deleted file mode 100644
index 28982c0fa7..0000000000
Binary files a/pythonPackages/pil/Images/courB08.pil and /dev/null differ
diff --git a/pythonPackages/pil/Images/lena.gif b/pythonPackages/pil/Images/lena.gif
deleted file mode 100644
index 64a9b93c89..0000000000
Binary files a/pythonPackages/pil/Images/lena.gif and /dev/null differ
diff --git a/pythonPackages/pil/Images/lena.jpg b/pythonPackages/pil/Images/lena.jpg
deleted file mode 100644
index ed01c4e676..0000000000
Binary files a/pythonPackages/pil/Images/lena.jpg and /dev/null differ
diff --git a/pythonPackages/pil/Images/lena.ppm b/pythonPackages/pil/Images/lena.ppm
deleted file mode 100644
index 06a398ea5d..0000000000
--- a/pythonPackages/pil/Images/lena.ppm
+++ /dev/null
@@ -1,4 +0,0 @@
-P6
-128 128
-255
-ߢ…ä£{ä¡~ߟxÞ¡yàšfß›lÜšyâ›jåŸhæ¦ué­yê§vé¡pÛš»ubž^Y¦f]©g[¯gZ±kX­m\±kY²jT²m]³iQ¶u\Ây\ÃxZÀyaÎ�_Ê„`чeÊ‚fÌ„eË€_Ë�aÌ�]Ì€]·nÒ‚]φeÖ‚[Ð…d̆iÌ‚aΈeÌ…cЄ_Ó…\Ì…nË„fσcÊ�[΃^Í�[ɇjÉ‚dЃ\у^Є_φc΄aÍ…gφbÈ€\Ê€_Ѓ]΃`ЇbÇ~[Ë…i΃eʃaÉ}^È~ZÁ|i¾yb²p[ªfR½tbЇ_Ö‘mÞ™mߣuÝ›hÜ™hß—iÚšyÝšqàšhÞ–dÞ™kݘeß—iݘbÝšjÞšjÝŸqÝœoàžlôΑøÕ�ýÙž÷ҕϘt¥dV¬h[¹w]¸y^ÀwV¿yWº|d¼{iÀ{_¾yaÅ�fÂ|c¿{c½uXÂ~dÀ{[Ä�dÀwZ¼sX¹xfå§�Ý›nã�qâžxãšjáœkß™kâ˜làšiÞ›eܘnç¡néªzî¯|í«~ëžcÜ�m¹n]Ÿ\T¤`W¦b\­jY±kT°gV¯jV°iT¶nV²oZ·mTÂvYÁvWÆzbÉ~_È}]˃gÊ�_Èãb΀`Ì‚a΂`χkцhÓ‰gÕ„`ΈlÒ‰`ÎbÒƒ]Ó…^Í…a΃j͇f̓m͆gÊ`΀ZÏ�]È~]É�`È_Ì€\΃]φdÒ�[͆gφhÍ„a̓^Ì�b̃bÈ…lÈ|Zʃf̃gÉ~dÉ_Å}`¿y\¼w\¹vaªiY³mUË€WÖ�jÝ™uÞŸkÞŸoà˜fÚšvÝ›rÚ—kÞœqàšgÞ—há˜dá–_Ü›bà˜fÜ›gÞ›mÝšiÚ�uóȃúÖ˜ýÚ ùןۣv£aQ¬pf´sZ¼w\ÁyVÂzV½{eµv`ÁwVÃ{^Ã}]¿xZ¿{]½vXÂx\Ç_Å�e¿y[¾rS¾}dØ•t¬gQà�mà›lá›wà�pß™iâ›dà˜kà›lâšcå¤uìªtë¨nï©tå›`׋^¼qYž[P£YO®dM°eO´iQ³iV°kR°gM±fM±hX°iS·t]È|^Ã~_Æ}aÉ}\Ê€fÕƒXËXʈi΀[Í[Ì�[΂_΄_Ó†`Ö‡\Õ…^Ñ…fÏ„_шiÍ„`ÓƒbÌ„lЃ`Ë}^Ô†aʃiÍ‚bÌ€^ΆbÍ‚dÍ|YɃbÐ�\Ñ„^Í€[Í�`ЈgЄaÉ]È‚iË‚dÍ\Å~eÉzZË‚ZÉ}[ÆvYÄ}^Ã|b¾wc¶q[¯gR«eT¾v[Ò‹lÙ•oÜ�zÞ sÝžwÙšmàœeÞœrà™kà™dãœdÞšlàœoß™fß�nÚ™iÙ™qܘfÙ›sç³|öÒ˜ûؘüÙšó̇¹z_«hSµoXºtX¾uX¸za¹w\¿zY¼zhÄzYÄ{Z¿{[Ä}cÇ�cÅ}\È}\Ã}\ʃdÅ~_±iOa5?\-=á�oåœiâšiâ™dßžxâ–eà˜hãœgæžmå¦qæ§mì§hë¦cãžkÓ‰c´mQžVI¢\KªcR±jT´o^²mQ°fN³kO²fP´iSÀnOÂwWÅtSÄvYÈzYË\ÏzQÏ‚e΃eцhÓ„_Ò…iË€_φdÑ�]ÎXÒ…bÓ„[Õ„ZÏ�]Ђ`Ó†bÏ�^χkÒ‚^͇kÒ‚`Ï…cÏ„iÑ€\Î�aÑ�]ЀVÑ€XÔ†aÓ…fÏ�]ЂaÍ„cЃbÏ€_Ç`ΆdË�a˃bÌYÅ}aË�bÌ\Ç|`Ç|bÄ|c¸p\³p\±kV«j[Í„d×�nߘná¡ißžoà�kã�jà¡næ¡kåŸoâšháœgß›mà•`â™^Û—bÝšmÙ˜oÙ—kØ–kñĉøÕ›üÚœûØšã³~¤gX°s^½sT¹rZº{fÂvWÀxZ¾x]½vU¾yZÂ{ZÃ|\ÄyUÊ�bÈ‚^Ê}_Ó„^³mT_;PW(;[0Aá›oá–eãžkâ›mâ™]äœhÝšpá£}æ¦yå¥ké¦tê¤nè kâ˜i؇Z»lP \P¢^L«hW®dN´eHµkR¶kQ´n]²eJ¸gKÂpMÂpNÅuTÆybÉ}XÎ}XÐ\È„gÓW΃^Ò„`Òƒ]Ñ…a΂^Ï�ZÏ…dÒ„XÕ„]Ò†lÓ~VÕ„_Ï…bÔ‚^̃]Í‚[ІjІeЄbÏ�`Ì„^σ\΂aÌ~UÔ‚XÒŠmÓ‰fЂ\σ]Ò[Óƒ^̓aÊ‚_Ñ‚]Î�^Ì}_Ï|[Ï…iÎ�aÎ�aÈ€`¿}fÅz[ºqU±wg»s\«hY¾yf×—zÝ–nÞšmߣuá£zåžjå£rá såŸmã¡xáœgâžlâ›mßœfÝ•f×—tÙ—oÛ–kÖ”käªtøÏ�úØœüÚžøÑ•ÍŽa³oW³nU»t]·yd»{bÆ}^Á}]Ã`À}bÅa»gË}YÊ�aу`̓c§_N[,;U-?V.<\-;â›jâœjæ›eå›dážtã™eߘkߢwé¨oç£pç¤uå¡næ¡hå¡u؉Y¸oS¤bPŸ\N­eR³fL¸iT³iJ°nU°fN®cH²hP¸oTÃtQÀuUÆ}]Í}SÁ{d΃dÌ^ÏV΂d΃bÐ�`ʃeÌ„cÐ�aÏ�UÑ�YÖ‡aÓ„ZÓƒ]Î}YÕƒZÍ\Ò…aЃ]Óƒ^Î�`΂`у_Ç~^΂`Í�\Î[Ì\Ò„bÒ‰hуdσaÑWÎ`Ë~WЃe΀`Ë}YÇ€gË~]Êz\΃cÐ�ZË~YÂz^Á{dÃy^·q[³mW°jW°o\ЋiÚ“eÞ›nã¢yå¦vä�iä¡rã¢kæ¢iã lá›mâšoâ›qÝ uÞ™qܘgÚ˜pØ”pÙ–nÚ�dï½|úÔ˜ûÚ�üÚšòÄ‚¨hS¬jV²q[»tZÂz^Á~`ºs^½|c¸|iÀ†sȃiÉ‚dÓ‡cÕ�f¤_O[->W):V1EW/>e7EÞ˜kä�qã¢râœdâœpãœoæŸmæ§|é¤uæ§wå£pâ�hå¢pä—]Ý‹Y¿r[¢XF¦[L­`L¯hO²gO·hP²mU°gR±iQ¹mP¶oW½sRÃ{WÈxTÇxTÇ~^Ð�[Ê[ÐWÏ�]Ï�ZÓ„]Ë…nÑ~\Ô�ZÒ�VÒƒ]Ø�VÓƒ^Ô~VÐ�[Ï‚aÒ†eÒ‚[Ö�^Ñ}VÍyUÍ~WÌ�cÏ~YÓ�XÊ|\Í�ZÈ|[Ì~^Ï…gÕ€YЂ^σ_΂aÐ�\Ð}XЀ[ЂbÊ}ZÍ€cÐ�bÐ~WÍ}YÌ�`Ç{ZÆ{b¿yb³nZ³lS®h\´wlψnÙ“qàžuá¡wä¡zä¦zà ~âŸnâŸdäŸhߘgÞ�jäšcá›oÞšpÛ›mÞ˜fÛ–iÙ—oÖ“kÞ�m÷Ë�ùÙ¢ûÝŸüÖ•×¥j©dM®kX¼vW¾y[Å|T¼x`ÁzZ»t]ÀkÃ}_Ò€`Ô‹g¥^RgIYW'7X/DZ-8a1:f6=æžhå�fãŸzæŸkâ�jâŸvæ£måªrè¥mä¥wä¡iá�jå¡oç�`Ù�_¾pMžYM¦\J­`L³jQ¸lQ³iM´eI¯eM¯fP¸jPµgNÀrQÆwPÅxTÆ{\Ç�]ÌYÌyRÍ‚]Î�ZЃYÌ�aÈ€gÌ‚dσaÓ�YÑ‚ZцfÖ†cÑ}XÒ{UÓ‚aуcÐ…lÊ{VÎ}TÊxSË|\Ê{^Ï^Ë}_Î|\Í|WÌ|XÑ€^Ì^Ô�]Í�`Ï�]чeÈz]É€Z΄bÏ�\Ð}YÌ}]ÌWÐ}\Í^Ð…`É}]Ãw`Æ{bºnW·pZ³lZ·sbσh×”yÝœ|àžwã£{âŸyàžsÞŸráœrã¡nâ¡fá›gàšnâškß�vÛœvÚ˜lÚ•c×”fÙ‘lÖ”kñºyùÕ˜ùÙŸýÞ¤ôËŒ³nN¯kT¾uT¾uU¾z\»xdÅxV¹x]Æ|`ȃ`ÑŠgŸYIT/DW-D^3D\*7e5Bj5A^2<äŸpã rå›iã£væ¤zç¥xëªqèªuä©tæ aâ pá�fæ aæœd݉U¿oS¡]N¨_V«aI°dNµhO°hR´dJ³fM°fN¶jS»pVÃrQÇvVÁx]¾wXÇ|bÎ�ZÍ{ZÉ|[Ì}YÍ~_Ï€\Ì€a΀bÓ‚ZЄ[Ï�_Ï]ЄaÎaÓT΃m΂iÏ~[Ó|VÑ{SÌ|VÇuYÉyVÊ}aÌ~_Ì}WÌ€]Æ}aÉ|[Æ`Ì�cË�cу^Í\Ê‚fË€dÏ„cÈ~bÍ~aÍ€aÉ~aÊ}_Î}TÇ�jÊ~\Èz[Èy\µqb¼r\¹kX¸teЃdÖ�uÜ–màœtá�vâ uÜŸtÞœpá¡pá�uß�ràšiášnßœkÜ™mß›oß�kášnØ™nØ•pÔ�hבhõË‹úØžû߯ýݠ㸪k[±kS¹rV¿xZÃ|\ÂxVÂ~aÆ�cÈ„\¥^QW&6R':Y3D^*=f6;f1=^09i7<âŸnãœgá«å¡uç¤nê©rì§oí¦né¢häžkâžmâ oç¡pæ›lÚ‡U¼kN›RD¡[Jª[H­gX¯eN±gL¬fK±cM²iVµiP¸lN¸pW¿qVÃsQÇyWÇ{[È~[Í‚bËzZÎYÏ€ZË]Ë|^Ï€`Ð~\Ï}UÈ|^΀cÒ‡mÕˆhÒ�WÕ~[×XÒ€]Ï~YÏ|YÎ{YÈvYËwWÉ|VÍ~ZÆ{[Àz`Å|ZÌ|UÍ�cÈ~^ʃiɃfË‚bÊ~bÊ�eÒ�ZÐ`È~`Ï[Ë|`Ð}YЀ\È~dÏ{WË~aÃu\À{eºoS´m_Àwb΀dÕŒpØ”oÜ™sÝštàžwÝ›pÞžwÞ xÞœuß™qà�hà›rä�kà›gášhÝ™ràšlØ—nÕ‘kØ‘e׌[ç®xùÔ˜úÜ¡ûà±ùÔ•ÄŠ^®gQ»pT¿uW¾}bÀzZÊ�aÐ…f›[KW'8U,>Y-?Z,>e6Ba.:`3Bd4=Z,6å¡häŸgå£xä¦zçªyé§xê£oç¢iç ræ¡nèŸdçŸlèŸjæša؈\¼fKœSD¢ZG«YJ±pe´dL±eP°eQ¯eQ¯bP²cHÀkMÀrRÁx\Ãx[Ä}_ÄvWÊxWÍ{WÈ€fÆ{[ÌyUË|cÎ}\Ë|\Ò{WÑ~YÍ€^ÑcÏ|XÓ}WуbÑ�^Ï…mÔ�cÑzWÐ}[ÍzTÏ~YÍzPÂtRÍySÃvVÇxQÅsTÈyVÌ~[Èa̓fÍ�dÏ�cÐ~YÊ~`Í€dÏ�dÎ|VË�dÍzZÑUË�]Í{WÉxVÇx_ÀuY»u^¼t^»lV½r^Ì‚iÔ‹lÔ“zÙ•sÜž{à�xÞŸwÝšsážrâ�tßšháœgß™lÞšká ß™fß™mݘlÚ•kÙ�jÚ�`׌]Ö�_öˈùÚ¤úÞ§üÞ¥òÆ…¨dO­kR´qY»oSÃ|`ʃa¢aQ[.>W-AW*:\3C`3B`4@`7Ib,:_-:Z);äžlã�jâ yé§té©|ç�gãœqåžfä wê¥eäŸfå�kè¡kç˜]ÛˆY´jQ–RE¢`O­`L®cOµjU°bJ®bI®fM³fOµhR¼kSÄw^ÅxSÅvSËYÇ{ZÇcÏ|[Ê‚gÉ{WÎYÍ�eщsÑZÍhÊ}\Ð…gÍ~YÒ€bÔƒdÒ�]Ó|VÑ„cÒ~UÎ~]ÒYË~bÅzfɃuÈ«§È¨©Àšš½�†·yhÁvXÎ|UÈvTÈz\Èz]Íy[Ç€aËcÒ]Í‚bÌ|[Ô^Î�dÑ}PÊ‚dσaÍ€_Çy`Âw]»nT½oR²k\¼s_Æ�kÓŠkÕ’tؘyÛ˜tÜ–mÞ�xßœ|Ü›sâšjßœqà™mãžhäœcß�qß™hà•dÙ•oÖŒaÚ�dÚŽ]Ù�cÔ�må©múЋúݦûß«ù×™Õšb¯jS¯kSµo]À}[¢^OY+:U+;U)?`1D\1Bk>Jb3Ci7H_/;_/;]1?ã£rå¢né pçªrê£uç™aã“[Þ“bäœmè¢eæ¡mä sè£sæ›hß‹\ºoR£[PŸWG­_L­dP°eO±hQ­eOµjN±eM½kMÂsUÁpRÈvSÊxUÆxVÍ}WÌ}VÏVÈ~]Ï�^Ò~ZÒ]Ò…hÓYÊyZÒ�bÈ{]Ï„dÖ[ЄbÕ„XÒ}VÌ}eË‘‚¼�Ž¾œ–¾‘‰ÌŸ‹Î¡Õ²–Ñ´˜Ø¶�ÙÆ´Ô¼¬Ô¯ŸÕ»§¿��»s[¼sYÊ�gÆyYÉ{XǃlÅ~g΂aÎ}]Í{XÐ�iÊ~aÉ~_Î~`ÍxRÁw\Às\ºrc¶kWµpaÌ|^ØŠgבnÖ‘s×�nÜ—rÛ–qÝ™sàšpÜ•hà™mÞ–iá›lå›eà—gÛ–lß–gÛ�^Ö�a×�fÚ�\ÖŒ]Ô�gÕ‘dôăùÙ¨úÞ¤üá©÷ˉ®kQ¶pW¾|`Ÿ\LT%8X1HX0D`0>c7Ab6@a8Gf>La-:[):c/<b/<æ¡qè¡jê§jé§oç›là‘\܇]Ü…Rãšdè£fä£wæ¢né¢iæ›fÞ�[»hH�SE¡VG§]M«fT´gN³jQ®lWºiQ¶iP¼nPºkPÅw[Ð{QÍyTËySÏ}VÏ�cÑ~WÐ~[Ï[Í€_Õ‚[Ñ�aÔ[Ñ‚]ÐzVÑ}UÏ~ZÓ€[ÑzVÏaÉ�|Ã�€Ïœ†»ƒwÆ‹vË¢šÈ¯¯Ì¨�д©Ñ²ŸÎ³ªÊ †Îª”Ö®Š×¾£Û¿¯ß¿�ί ³jYÄuZÄt_Ä|bÅgÍ^È�lÏ€\Í�cÎ{WÏ}XÈw_ÉwXÀqY¿oX¸qZ±jU»s_Í„fÖŒdØ’uÓ�vÚ�nÚ”pÛ–uÚ˜wà˜lß”bÝ—lâ˜pÞ•là–eÝ•cÛ”hÜ‹^ÙŽgÖ�lÙ‹^×�_ÔŒ[׋YÓˆ\ß™gúÏŠøܦúà¬ÿà¨ä¶„Ây[¦gO_-9T%;V+<[.>b2;i;H_-8d3?^4F\+8c1:\*6],9åžgë£rí­uë¥qä•YÙ�NÓ{LÙŠZçœhê£dë¥mé§oì¨lçŸgÜ„V·kO›M@ UG¨[F«aM¬_H¯_I³dM¯bL³gO¶fO¹kRÅpQÇtUÑzTÍyRÊyZÐzVÎ~[Ì~]ÍzYÓXÐ|[Ò�\Ð\Ñ}ZË{^Ñ„kÉ„qÍ•…Áx_ĉqÆ�zÀŽ~È”‹Ë”|Í”tÉ“Å�Ê‘vÍž…Ó¢{Õ²™×¯‹Òº¦Ò·¢Õ¬�Ù¼›Õ»«ãÈ¥ßÄ°Àž”¼oU¿sZÉ|cÊeÍ{_Çx_ЀcÈwXÈw]Çy[ÂoS¾rXÀpQ´iS±m]½oSÍ`׌iÙ“lÜ•wÖ’oÛ“oÚ”sÖ•wÙ˜uÜ�mÜ”hÜ”iÚ’hÜ—kÙ‘bÜŽ`Ý‘hÚ‘mØ�gØŒaÙŽ`ÙŽdÙ�^Õ‹_Ñ…^î·uùÚ©ûÞ§ÿä®ÿÚ—¾xXX,AQ';U&8W0Ae9Ce1>h8G`3<[2E`/Ag9Fa8L[,=_.:çŸjí©hí©kè�gá‹YÈnB½lKÛ‡[åœfè©sí¦më£nî¥kè¡náŽXÀoOšYK•LH›VK¢\S­ng¯dJ¬aL²aI³fK±hTÃnUÂqPÉvRÃv[É|\ÇzZÎyPÐzQÏzVЀ_Ñ�iÑ�_Í€aÑyWÓ‡kÖ•qÊ�u¾„j„nÂ~m³vh¿j¸|s»�rÀŒ„Æ��̤—Çœ�Ǭ£Ñ¦’Ò±�ɧ�Ô©Š×°‰ÙÀ©Ñ¶£Ü·…ÚÁ¦ãÁ•ÚįâÁ£Ûů¬jZ½lRÁpV¿zcÆy]ÄzaÃs[ÅzaÄv^Àt]¿sU¹p_²lY²fNºpZÇ}j׈gÜ’nÞ”mÙ�jÛ“jÛ”kÛ“uÛ“nÜ—oà•kÙ�aÛ�`×�fÜ’fÛ�fÜ‘aÚ‘h×�eØŒeÚ�]ÛŽZÜ�]Ú�_Ö‰_ØŽdùÉŠüÜ þä²ÿå­¾pLT-AY-EX/?a2@j8Gc4Ei=K`.?X+@d3Ac5Fb1A^-:g29è©rï­oêœaå•_ÏxI¢RAÄqKÛŒ\åžeë¨ré¤jé£mï¦méš_ÜŒ^¿lI�JD—TI£VG¥]K¢]N­aJ±jN°fO°fP²jU´oZ½sZÉsLÃrSÇrRÇuRË{]È}`ÆvYÍ|\Ï}aÐzWÍz\î°y¹mR½ze¿vU¹zg½|h¸zfº…|Ä…l¸t‹wÅ‚eÅ„kÀ”‡Â�€Í¥ŒÀ�ŽÇŸ™Ô¡yÓ°—×·¥Ûº™Ô½¤Ú¹¥Þ¿™Ö´§ßŸٿ´ßÇ«ÞÁ¥·™Ž®lY·kT¿ubÄvWÀs]ÇuW¿s[ÆsVÂpT¹pW·jP¨h^¹lUÍ`ØŒmß”mÜ”nÝ“jÜ�mÚ’k×’qÛ’oÝ“lÞ™oÛ�dÙ‡Zà�`ÞŒ\Û—lÞ�]ÙŽ`Ú�iÕŠ`ÛŽbÕŒdØ’jÙ‘jØŒ`Ø�_è¤mÿÛ¥ÿä³ï»wK&=U*=W*:Z.?j;Gc5Ag4@\,:T(=^->^/:V+7_.;f6AW'4ì¨uèœhÚ„R­^E’JD¿qMÛ‰Vä¡mí¥mé£ié¥ué¤eèœl߇Y¹jO’F>”M?›[N¥ZK§bR«aN§aO«eR®eM³dIµjOºqZÀrS¿tZÃuSÃxWÇw_Æv[Ï€^ËbÐ}[Ð{ZÊyWÄrPÀoZ½v\½u\¾€p¾xm»zd¹}lÈvº‰�½†tÌ‘xĉtɉkÇŠqË—~Ó£}Ó²˜Ò³¥Ô¦|Ó¸¤Ö¶©Ü¾žÙ·¥à½—Ú¿¦âãØźÝìÙǺáÈ°Ó½®¬fT°jY¶iRºoU¼pX¾r\ºr_»p[±iY¹jN©aP¶oYÐ_ߎcá˜nݘtá”iÛ�mÖŽjÓŽiÖ�lÜ�iÚ”qß“fÚ�fÞ�dÞ�cÝ�aÛ‘iÙ�eÞ�cØŒcÙ�eÜ�hÝ�_ÜŽ`ÜŽaÞ”jÞ•fÿˆó¸uU';V*@T,CZ.<f;De6Fe5?a/@]0@c7Ja6G^2C[.Bn<F[+6E2ï­vð¢bâ”`ÈxO�SE–QD¿mNÝŒXçžeìªlëªtë¤hè¢iê›fÛŒc¼lJ�L@•OF¢VF§`L°fT¦_R°eP°aI¨eY®hS±kY»lPÀqY¾tZÄuSÈyWËvRÎzSÉz^Ï}XÎxUÎuV؈W»v_¿v[¼sY»t`µrc½|oÃ{^Šn¼ƒtÄ…rÈ€dÁ|j¿’‘Ê–{È•ˆ»ŒƒÊ‘€Õ£‚×´—Ï¡�Ù¸”Ô¹¡ã¼‡ÛÁ§Ü¸–áǯàÀ¬ßǮٻ¢Üdzݦá˵ßàœ\P ^LªbK°k[¹lV´pb´iT¶lb¶hPµfO±iYÏ|dÝ�mã˜iâ˜jà˜oÝ”mØŽfІiЃdЂc׌gÞ˜qÝ‘bß’gà‘ká–sáŽYÜ�i׌fÚ�_Ø‘iÙŽbÝ’bÞ’fà“cß•kå›lÕˆ[b3E\2FV.B^/>d3>f4>g6A_1>Q(;e;Ga1?U,?c5En@Lk<G@3�^Xí¥gæœm܃O¥]Q’PD˜PEÁrVÝŠSè¡nì¥líªnì£nì gèšbÛ‡Y·hL�IB–SLžVM§^N©aN®bR©dS¯eN¯cO®dP·kV²oTÀtVÅv^¾qUÆz^Ìz]Ë{^Ð{YÅz_É{[ÚŽi½pTÁrR¾pNÁqUÁ|g»pZ¼rYÍ‚h¾}iÇŠqº‰zË�uÂ…iņjÅ”ƒÂŠuÉ’„ɘ‚Å‹~Úµ�Ö´™Ø²›ÞÁ¥Ø²¡ÝÀžØµ ßÀ¤Ù¿²àÄ¥Ô¾¯ÛÀŸÌ»¼ßÒÇìÝËóãÔçÞÈ™TH­dS¸lTµnX«dU³lX¯dS©e\³k\Ò†lÞ�på—aå�kãšvß™p׎cÎ^ÃqZ½rUÒ„bÜ�fâ”eá“gß�`ß•jß�_Ý�`Ù‘dÝ’pÞ‘gÝ‘jÛ�kÞ”gâ–jâ™rà–gk5FW*;W'=X*;`3Bk6Cc6Bf0;X.<i;Cb2A\5Fa1@f7Cl?IJ&=vFQÞŸzæ¤zá’cÃqM–O@—SLœTG¾rRÝ�eéœaì¥lí¦fé§oé¥pè›cÜŠ`ºhJ’JA“PH¥\L¥]T¯aM¨\J¦dR­hW¬fS°gV³lY·lT¾sSºoUÄz^É|\Ì{]ËyYÅx\Ì{VÎ_Ò~T¸mV»mQ¹o^ÂuW¹qX½wbÁx\¼{fÂ|d¿lÃv\ÂnÂ{eÆ‚eĆmÒ¡„Ë’yÎ�€ÁŽ‰×©…غ Û«‘ÛÁ«Ó³ªàŪٷœâÆ«Öº©Ô°›ÖÉ¿çÓ½æÑ¿åÖÌçÖÄì×ÅôâÌ×»©—SJ£cX®gS®dU¬eV©aQ£]P·m[Í€dÝ�jã˜nã™há™qâšqÝ“qÒ€^ª`MžUI½mVÓ‹mâ–ià”eß�gß’bÞ�gÝ‘mÝŒ^ß’gÜ“iÜŽaÞ’eß”iâ™qç›l•OJU1D]9HX$5Z.:g7Hd5@d5BX-@b6Ag;EU(<V*<a7K}PWg<Pk<CÉ‘~â¥wâ•`Ó~QžUI WL ZM£UCÀqUÜŽ\é�fí©hí§hê§rê£tç™gÚ‰^µiK–RK”RK¡XI¥cR­dP¯fR«]K°hW²hXµiR¹kR¶nVºv[ÂoS¾u\ÃvYÌyTËyXÊyRÈ_Ø„UµeN¶hPµlWÂt\Ãx^Á}]¿tS¿{i´qa´l`Ã~eÀ„qÈ�hƃsÈ}_É…gË�uÍ’|È–€Ì™‡Õ©‰Ü¾¢ÜªˆÝ¾¦ß½¨Ü»�Ñ­—̳¸áÐÇéÓ¶åѽäлäÒ¾æϸàÎÇèÓ¿îÜÄòàĨvk™VM§_Q¥fY«aS¨cT®cQªhVÍdØŠhå™iá˜iâ˜sã™tÞ’kÎ\¡_M~@?¡ZHÌfÚ�nä“cß�_à•kÞ“gà‘aÝ�`Û�bâ�`ß�gà‘fã•qêœhÇtQT)?Y,B[(9a-6i<Ih6@e6AZ-=]2?m<@Y):\.?^4CpFVnBT}KT·…zΓuЕrà‹U²eNœUG [IŸXFŸTH½oRÚ�dä¡sì¥lí©pê§vè¥jä—`ׂQ»iM“NB”QB£\N¢aR«^K¯dO¯fU±fU®fZ­fV¹oV»nRÂoTÇsVÃt[ÌxYÊxWÍ}[ÈyYÎZ³lYºnUºlS¶ta»pUÂv]¶pZÅ€`ÀiµulÅ�aɈoćpÇ�}ÁmÇeÑ–~Ñ�sÒ—wË‘x΋yؤ{Õ°‘Ùª‘Û¾¨ÏžŠÇ¥“âÊ¿æÓÆçÍ·ãÎÀãǨâÏÆãνãΰæÏÁáÐÂãÕÌìßÍñÞ¿•\Q•OCœWM¥^PŸ]R¤^Q³gUÌyWÛ�eá™qå›kæšlá”oß“gÒƒh®jYm3B|::¼mSÓ…gÞ”oâ•màŽaÝ“gÜ�hÝ’kß�`à•là�_ä‘eé˜lߌ]b1@[0A\+<_-<k:C^/;g6B],?X*;f:B_1B\/H`6Df=OoIZ�LWµ~tΘˆÅ�sÉ�mÍxQœVL \QŸ[M [HœTEÁoNÝ�Yè¡nç¤uí§mé£pë¤hè™_Ú…S²dH‘NF’UMŸ[P«aP¬]N­bN¯_F¨YI®cMµhQ³dK¶uh»nRÅuTÄvRÀsTÆ{aÊzYÌ{bºmT»mN¾sY½oR»kTÂzc¾v[¼s[¶n[³tfÃybÇaË„fÍ“xË�qĉyÏ�uÕ“wΈfÉŽtË�sБzà«‚Û¶•Ö¤ƒÈ�záȶåηêʦàÅ·äÒÈäκâȵãɸàȵÞɼäÖÈéÔ»êÔ»ëÞÑìàÔçÚ¼‡G>ŒNH“UL™WK¤YJªfXÊ~bÜ�læšlä™oä˜há˜má’jÓ‡j«i\f19^0EšaXÃwZÛ‹fá•nÞ‘lߎbß�càŽ_Ý�`ߎhà‘få–mçŸx�AET%9\3AY*<e4Ah6@h7E^->Y,@n:BY.;X5D].<]4EmHY‚R`¬ytÈ‘wјu¾…nÔžy£[J�WN¢YH¤^QœVC�ZP¼jNÚŠ[äšfì©tí¨xë§vë¨}ä–cÙˆj¹jP‘NJ’KF¢WI©aN§`Q¬dR¨cN­`H¬dO±iY´gR¸q[ÄsSÈsP¿t[ÃwZË{_ÃuZË{XÂsXºnTºnU¼pWÅrWÁoR³n`µ}t¼p½�u¸yg¸yeÈ^ÒŠfÇ�|ÇŽqÑ‘nŇlÏ�jË‘x΋tΑzݲ�Ä•†Å¦‘æʪåÊ°ãÊ´áͼèÏ°ãŨÛÁ¹Ûþà̼ç̯æǦÛıßÏÄàÏÀãÒÀæÓÃîÝÌÏÍÇšj\ŽJA“M?œYM¨_LÏ}[Ü�hå›zä™nä•lå˜nà“j؈f°dKk08R)<t;>²dQÔˆkÝ‘jã•dá�aÙŽhÞŒ`Þ�hä•iç”hë™fÇtRX+<Q(:S(9b3?g;Cg4Aa.9\.Al;Fk9@W,?`5Ff:GfARsFY©xÊ‘|Εzº†uКw×¢‚˜UL¡YH ZL¥[H¡XJŸVE¾qPØ�aåšgê¤rì¤oé£pæ£tæše؆^½kM”OD•MD UF©`N¨fV¯cL«eR¬dM®hZ¯fO¸gLºmW¹pUÁvZÃu[Èu[ÈuSÖ‰d¼pYÀnPÆsS¸n\·o^¸mUÃz\¸ubÇzZÀsZÆ�gÄŽ}¼€rÈ�iÑŽvÎ�wÇ’‰Í‰nÎŽtÇ‚dÃ�}Ê–�Ó™vÁ}gÛ¼ªÞĬßÈ´åʨàÁ¨áÇ·ÜŵâɲàŨÚÀ²áÁšâÎÂä̹áÎÀæÏ»âÒÇãÒÅæÒÄêØÆìÚÉðáŲw_ˆGA”QC§_KÐzXÜ�ká™oá™rã™pãœrÝ›yÕˆb´jRn5<V*<[*8ŽNH¼t[Ù‡aá’bå‘aÝŽeÜ�káŒ]å•mè™rß‘jc-5S&:W'7],;m;Ck6Be7CY,<_->j5<a.@Z-:_3>\0Di9OšjeÈ‘wÆ�sÉ’uО†Ö¥ƒÙ£~œUG¤[H¡^N¢]L›VHŸ]U¼udÚˆUæšiè¢oç¦}ê¦zë£pç˜aÝ„U·hT’LF—KA�\Q¦aKªe]¯hZ¸hM«cO¬bN³aM¸pW¶mT¾nPÂwTÃvW¼oXÃrPÏ|W¬^J®aMºkQÁsWºlU·jVÃtX¹mY´ulºx_Æ~dÈ�nÇ�{ΆkʉkÒ”xȆlÇ€pÃ…hχg͉b¾�r½�ƒÜ²’Þ¿³ãÆ´ÞÀ«ßƵݺ¡ØùàÄ°Ù®äпâÍÂçѽãÅ°â̼äͶæϸâʱäкâпçÙËæÕÃçÚÍðáÀt;<‰F@¦^LËyXÛŠcá–kæšqçšpâšqäšwÖˆc±kSt;BZ(6U%5m15§[GÍzVÛŽkà’eÜ�fÛ‹aß�eä”kèœp’SOV+9a2?].;p:Cd2=e4Ac1@Y,@i;J]+8_1=b09Y2@W.J•fkÇ’Æ�tÀŠxÉ•wר…×¥~Ò ~ŸXL¦_Jž`S¡]LžYL›UL¿oQÛŒcãŸwè¥kè¢qè£uå£räœr؆gµiR�NP–UL�YKŸ[I¨`P²dP©aM¬eS²hO¯fQ¸gL¸nUÆvW¿sWÁw\½oW캀ÊoH½jM·m[ºnW¿vaÂoO¿pUºr[Ì{ZÄd»yjÇzj͆jÒ–x¹zqÐ…fÕ“uË�}Ä{_¿{g¹s]°paÜ­}ä¿–Þ¼­â³Œßµ�àÀ¤Ù¶ÝÁ¬ØÁµâĪàË´ãÏÁâοàÉÁâοãÓÆãϹæоãÐÀàË·ÝÊ¿âÐÀæÖÀëÚÁíâϵ¥­{8>—SIÆvXÜ�gã™râ™lçšoäœuÝ—uÕ†c³iUw:?]-=_.;[(7s45¯aJÐ{SÕŽkÚŠ\Þ†UÜŒ`å•iÎyLW)9V+<_0Aa2=f0=c6<h5C[/A`2Ac4?X,>i5@c7AP(?}KUÁ’ƒÌ–�ÄŠpÇ“{Ó¡zÓŸvÔ¢}Ø£y¡YH XIžZO [NžXFšQEµjOØ‘käšdë¢jë¢rê¦sè¥væ™iÜ‹\ºnV’OF’OK¡VH¤]N©aK­`G²eOªaPªgT²m]¸mS±mYÂoRÁtY»mP¹k^úÈ€°`T°iY³fUÁsY»nSÁsTµlTÁu^ÇvZÑ}WÃiÌ…lÏ…eÐŽiÆ‚h΀]щnÄ�y¹yh±n^µzpßµ¥ßÀ¡áÁ©â½™ß¼Ÿà¸œÝ¯‰Õ·¦âÇ°ÞÅ·ßɽ۽´ÞʶâÐÁáÈ·ßʾá̹ãκֿ·âÌÀåθãÓÅãнâÓÅåÖÊéßÔðàÈšXP�JFÂpL܈aä˜fã•kß—qå—gãœuÖ‡d°gRx>K`.C](4^,6S".p=EÏ¿¹éØÆîÕ¹Ù¾±æÓ¿Ø“ob/AU*<[.@^1=f1=h9Ff;Gh9K`8H^-8^0Gh8Hb1;[/=d7K»…yÑ—yŇpÃ�wÔ£„Ó xÓŸ|ÒŸƒÕžy™XK¡\LšYK�[O¢]RšUFºkOÕŒhåšlé¥wæ¤w䦈é¡mæ—c؉^¸fHŒEB–PGžVF�XGª^Jª^N§bL¨]I­eW°mV±eOºjO¸mSÀpO·eOÏŠ`î¥e´fU±iP´mU¸q]Î|UºmWÃsW¼{j´iZÊ�iÎ�_ÏŽnÁ~nЈaÀƒp̆jÄxW´yf´rfÊ™‹Ü²£Ý¯ƒäº“جš×¯™àƱԯ¢âÅ£ßÀ¨ÝÅ°ßÄ«àIJß˸â¦ÜÅ·á̻ܿ¨Ùòäнç϶Ýȼà̹àÎÀàÐÁãÒÆãÒÆåÕËèÞÖÑú‡GA·nWÔ‡lãšqå˜lå›häœsá•kÖˆh´kSr;A[)7Z'8U'8Q.AâγíÕ´Õ¶¤äпíßËíâÔéÔ±L&AQ,CZ-Ah3@d3?gAKa2?`1?d5Cb4Dc4Gj<AT)<Z-C§uwÏ—€Æ�zËvÒœwÔ©€Ö¡‚Öž{Ô�xÕŸ|—TPœZM¥_N¢]NŸZQžTH¸mR×…Yã˜iì£tì¨uë§xé¡oè�lÙ„WºjI†C?�KG›SE£ZJ©`N°bL¯cK¬bL«`P²dM¶kVµiPÁsV½nR³bQüÖ–í«r°fO¶kU¼mQ¿jOÁv\¿r_ÅrOÇyTÁ{`Ç~bÑ€WÅ…i­dZÔŒeЉk¾xe¹q\®eYߦ€Þ¯�èº�Ø¢س•Ù·©Û¡~Ú°—Ú»­Û¹�ݾ�ཛ޼¡ß¿¬ÛøÚúڻ¢ØÁ´å̹áÉ´âʱáÉ´âÇ£Üǹà̽ßÊ»ÞÌ»ÞÉ·àÏÄçÛÎçÝÇ‚LK³jVÕˆbà—näœpä™oç›qá™sÕ…_ªgQk07M$5I%;‚`pèÔ¼áƧÐÉÌîÝÊíÝÈíÛËôáÊöêÕU3MN';Y*;a0Bi5Cf17\+<f8Da.8W.Bk:Da-<X.CŠWhΕ~Í’~½‹yÏ›†Õž†Õ wÕ¥{Ó }Ó ‚Óœt�[R¢WE¦_P¨cK§ZDŸO@³iQÕŠfåšgê¨oî¨nè¨zé¥påšcÙ„V¯fM‘PF�PG›WM©aP°hV«cM±dP²cN·fJ¶hL³jP¸jLÁsV¹s`³gXýÓ—ã’[¬`N®gS²iSÀoQ¿sQ­fX¼iJÎ�]̃o¼t]ÇyZºzi̓bÊ~`Æ‚^²oU§f`ݨ‰Ù±§Û´�Ù¦‡Ò¨£ß·ŒÓ¨�â·¢Ù¯�Õ«–ÞĶÚÀ¯Ü¹ ß¼Ÿà·�Þ»Ÿ×º²áʹâȸßÇ·áįàÊ»áǯáȶßƬÝÊÁãÑÂàÑÀäÓÇáÏÁäÒÂæÜÒÙθªZDÔˆ_à›vá›vé�pæšfÜ–mÐ�[¤bO]-<?#:°£¸éÙÄΞyÖƸîÛÁëÕ»æÒÀêÓ½èÕÂøçÏ­�‡Q,K\.?_3?d7=c2>a3>d1=V.A_0<e6Ad6Nq?MÁŠ{Ò•uÇ�{Ë—‚ÕŸÕž{Õ�|ןvÓ�}Õ�rÕŸ|¥_P§_M¬jbª`Nª^G«]N¹lPÚ�Sã™`ç¥pé¨vê¨qé¦nç�oÜ�b¸mN�H@’QI¡VE£\M­aM±gOµeM¶bI®gS·hPµlSµiQÂqRµlRµcNôÏ�è–\±^K¶lU¶nX³lX°jVÃu]ÇyaÍ~^Â�m®gZÉ_ÓˆdÁ{fÒ†aÀrN»q^ܨ‹ßª�צ†Û¢ŠÖ©ˆÕ˜ݶ¡á¹�תœÚ±œÜµ’Ù­™×²¬Ûº«Ø¸§× ~àÁ¥ß»¦ßÆ´àǸáǬàÇ°ã¿—áÊ»áÅ®àÑÈàÀ£×Á³ÜÌÁÞÍÁÞÌÀÝÎÁàÒÈåØ̶¢¬Õ�Sà”eæ›fèœiäœqß�[ÂrQ”WP`9JОæѹƣ—ãÐÂêÖ¾æÑ·æзÜȺà̹êÚÌõâʶ’wL)A[1Ge8F_/9\.@e5?^2Fa.;h6:Z,;\1E§ppÒŸ‡Ì’}Ê•xÔŸyØŸÓ›yÔ�~Ó�uÑ›wÕœyÕŸz¦eQ®\K³cK­`H§_S©XB½jKÛ‡Vå›jé¢jê¤ré©qî©têžeØŠ[µkR–OHšQC¤YE©\H¬fSµhN·dL·lS±`F¶eLÀrT¿nNÀqV¾lOу\øДքP­eO®dP±dO¼pZÎyRÂ~l¸mYÉvYÇ€f¿xjÎ{\Í„fÃ}d²fT·{lÞ¡‚Ù™wÔ�ŠÐ�z஄֞‰Ù­�á°†Ù°—á¿›Úª‰Þ³‘Ö®—Ù´—Ñ«¦Ô­—些߾¥Ü´žÝ½©àÇ·ÜÀ©ÞÄ°áÊ´âɸÝÈ·Æ›†àȲÞɺà˹ÜȸÞȲÝʼÛȺáÑÅçÔÁÑÀ¹à�^ä˜cç˜fäšk׉]µpWºœ ìÛÁÕ²•Î²­ç×ÆèÓÀäκá˸ÞÄ®äË·éÔÀëÚÈôãË›l_R)>[2Dd5Cc0:_/9\.=d6Jm8Cf3<J 5}KXÏ–ƒÐ•€ÆŽ|ÕŸƒ× ‰× ‚Ó��ÓžvÔ™rÔ�€ÑšwÓ™€°iW©_I²bG®fL®bI¬ZBÇoJÚ�iå™bè¢qè§sê§nì©né kÝŠ_½qO–PA—QE SEªbP°lY°cI³fK±jP±_D¹dJ´fJµqW¹pV°gVé¯wðºrÊyT´jQ´fO¹hO½hR¾nQ³n[¿t_ÅwXÇ{aÉ�dÌx[Å‚b²l^È…oÜ£xØž|Ö‘wňwË�uØ�wݱ‘Þ­“׸¤Û¨ŠØª™×»¬Þ°ŽÝ±‹Ó¡‡Õ­˜Û¾¨Ü´žÜ·—׺®áºšÞ¿«ÝÀ²áÉ·ÞȺàưˤŽÜèÖÁµÝįÞDZß˺ÝÇ·ÜÇ»Ù÷Úįß˾âͳã’Yåœgä”ZÝ�`Ó™ˆãÑÁäÇ£Û¦ÚƵæÔÁåѸãɲâ˺ÝÈ·âË´âϾç×ÎêÚÎñÝ¿O*@R/Fb<P_.Ac2>^.8[,=d2Cf4?W*6Z-B¶uÓ›…È�zЙƒ×£zÒ �Õ�|Öž�јzÓ�€Ö›yјzÒ™v¬dM±`F®cO«dP¯aH«`IÉqHߌ]ߘiê¥pì¨sï®sí¬sé¢mߎ]¼nK˜OC“MC�YK¦bTªbK±aG®`I²hP±`I°eL·kO½lL¹lR§YKûڥ᥄ËzTµhQ¸mV²bM®aP¾qQ¹qZ§_YÉyYÇ|c²fUÌ{[½ubДƒÖš�ÚšnÒ“qЗx¸xlÛ €Ø¦�ØŸ‹Ø±�Û¤‘Ó¢�פ—×¼·Þ¸™Ó”{Û»žÛ©�Ò¯žà¿ªÚ²Œ×± Ü¼¬×®›ß¿¨Û¬‡×°¤×µŸß½žØ»£Ô·¦Ù¾­ÙĶ׼¯ÛÀ²ÞįØĸӵŸÑ¼µÙƽرŸß“`à—ißïîÔ«ÖµŸ×±ŸäÔ¿åÏ´àÈ´ÞʸáDZßÊ·âιãͼæÑ¿ëÔÂñàÏñÞºL'@W2G\2Da2A^0>]+:Z-:d3@c8Io>N™^cÏ“|Д~Î’xÖž}Ö €Ö }Öž~ÓŸ~Ö {Ñš}Ì–�јzÑ–x­gN®dP­gQ·gK°aH°`HÆqMÛŠ_å�lì¤gî©kì®uî«uê¦sà”h»oQ“J<“NB¤bU¥[I­dN±cJ³cJ­cK®_G¬aK´fN·jKµeG¥XOýÖ—èžnÙ‹ZÃwT¸kT¸nR·gSÄvTµnZºhPÆzWÀzoÍ�eÀsTÌ�xÔ•{Û™sÏ„fÕ¡†Ãx_Ú’qÙ ‚Ûž„Р’Õ™…Ú¨ŽÕ²£Ù­†Í—�Ó¡“Þ·šÝ¥ƒÜ¯”Ù¯•Ý¶–ݵŽÞª„×·¬Û½®×©‡Ü²ŒÞ¼¥Ó·®Ó°˜Ø¾¬ÖÁ¾ÜÄ´Þ¿¦Ø¸¢Ùº¨×»­Õ¾®Ñ»¬ÖÁ¶Ó¸¬ÛƸٱ êӷ׳‘߸•ßÈ´èϵå̳ÞÊ·ßʶàȳãÊ·áÏ»â˹ßÆ«æÑÀçÒÁðàÑïÞ¸E$AZ/@`5D^3J^/<W+9e4Eh5Fi8M~KVÄ�ƒÓ–€È�„Ñ™yÔ¡„מ{ÖŸ‚ÑœxÑ›wÔ�€ÑœƒÒ›xÏ–yÑ™y¯cP«aK§VD¬gW³dE²bKÃoQÙŠ^å˜cí§uî«vñ¯tð­pí¦nâŽ\ÁrR—RC˜SB¢YE°[D®_I«aK±dQªdM¯aH°_E®cO·hL³fL«_VúÓ‘í´€ä’ZÔ„\ЃW´iR°cP½iK½s^¾kPÎ…dÈ~h½xlÃ�pÓ‘oЈfÑŠlÖ˜q½{h×�jÒ’{Í‘{К‡Ö›ƒÙ¤„Òª©Ý­|Õ¡�Õ¥‹Û»¢Ù©„á°�Ó¨‹×°£Ù¯ŒÚ§�Þ´�Û­–Û¸§Ýµ—Ý·žØ°‘Ù¹¡ÞÅ°Ö·ªÙ¾¯Øµ­Ù»°Ö°”Öº¬Ñ³¯Ï¶ªÍ±¢Ã¤�г£á̹ܴ�áǤÞñæÒ½æϺá¤ßȱàȲÞdzàʹäθáʶàòھ¨åμèÔÁðÚÀÙÊ¿Q&=Z-=^->c3A^->k>Pj7?a3<h9N§tvÙš{Ó”~Ï•€Ó …ÚŸ�Ô }×�}ÔŸ„ÖœzÔœtϞљzÖ›vÒ™z©^Hª_J¯iW¨_J®eL®aI¼hGÛŽ`å�dé¦kí­|îªqñ¯vì¢oà�TÄtN’K@˜OB¤[KªbN®cH°eS¯aI®aK¯`I¯dK´iO¶eK°gM­`RüÎŒê²�äžg×�dÒ“c¿mJ¼hN¾x_²mX½r\¾v`»p_ÁƒvЇlÕ�kÒ‡hÕ’k·ucÚ“s×”rØ™wȃkÍŒwÕ­—׳ŸÙ¡{ÌŠtಙ߱†Õª˜Ý¬ŠáªˆÜ²˜Ü§ˆÚ²�ب’Ö¥}Û¦�Ý´›Ü³–Õ´šà¸¡Ü¬…Ù½³Ø¾­Ù«–Ú¶ Ö·¤Ø­‹Õ²’Ú¸¡Í®�Æ¡˜â̾޹—Ò¸®Ûijá˺çÍ·á˶ÙĸßȲàȲÝÆ´àÇ·àÊ»ãÈ·äÒÂÒ£†Ùª‰æÌ·äÊ®í׿t=;T%8Z.=`3Cc:MS%6[,:f6C_0F~GVÍ“{Ó“zГ{Ïž‚Õœ|מuן}Ö ƒ×Ÿ‚ÓžƒÕ¢wÔ�uÔžvÖŸz×›yªbJ§`O¨\F«aN±bJ¯^CÀoQÚŒdæœjí¬sì±€í­pê«pë¦pâŽ]¹nW–OD”RL¤`R©cM±dNªcO¬`I­cK¯cK°gP¶fM¶hL¶fL¦\Oùǃï¬vê�hÛŽbß�a¿qSÁoK§]P²bOÊwT»mTË€gÕ�pÎ|\ÔˆjÇ™y½waÖ”uؘ|Ö•{Õ•sÒ˜„Ù›}Â…vÒ£›Î•~಑ݨŽÚ¤ˆÙ©žÜ©�Úž}×­¡×žzÚ§–Ø›‰Ø®’Òšx̪œÖ«’Û±�ܶ—Û¼¥×®�Ù¯™Ô°£Ù¬�Ö±£×´¢Î¤—ϧ¡Ñ´œçÄ–Ù´›Ù½¬à̼æË®âȲۻšÜ¿§ÝƳáÈ´ÞȸßʶßÈ´âʺâȬ׮ŒÌœ‡Ô°•Ç‹oÞ¾ªéÕ³P,C\1>].Aa5Aa2?[)7a0;Y-=Pa­y|Ó—{Ò’rÍ—€Ôž‡Ö „Ó¢ˆÙŸ€Õ¡‹Òœ€Òž�Ò�~Ñ�€Ôž}Ô›sÖšqªbI¥_L¦WH§aL¦bM°bLÁpKÛŠXç�fì¨vê©uè¬uê«ví¤iá’`»jM“ME™NG¦\F§dS«dT°bI«^IªbO®aM®`F·hM·fF¬`G­eMôÃ{é­{â’cÝ’jÙŒeË}X´k\§]N¸hQ»kMËŒqÕ�kÏ�`ЇgÏ‹cÁ~fÖ�qÖ�nÌ‘�Ï�vÔœuʘ”Û¢xÖ•~Ó’wÙ¦™ÚžxÜš„Û­˜ÚŸ~Ø¥„Û �Õ•}ݱ‘Û£‡Õ�fÌž„׫ŒÖ®’Ù¨‡Ü¯šØ«™Û¸¡Ø¯’Õ§“Ò¬›Ô­™Õ´¥Ê ŽÑ§˜èʥб™Üº™ÜIJèαáȶÙñÜÀ¯Ü¾©àÄ°ÞűáȲàȵâ̺ãͼäͺåϻș†×¯�»}kÒ¡‘Ü·šË¹«N%9W)5c8D^0:U+:f6>\-:n?R˜`hÕ•xÔ—‚Ë“Øž‚Õ£€ÓŸ~ÖšwÓ�‚Ò�ÕžzÒ™xÕœrÐœ~ÒŸ{Óœ~Ñš{§^G§]I¥]J¨^H¥[H«aOÅnLß�[è¡fì©uí©pì©pñ©qí©kà‘e·kR™SK˜RN¢XK«`K«\L­^J¯^H¯cM±aD´gN³dH¬cM¨]IÆ}QòÀ€æ±}Þ›zÚ‘qÌyVчfÇv[¶cI²dN׋iÕŽpÔ‡hʃgǃdÉ‚fוxÖ‡aÍŽzÕ‘jÊ‹sÐ�xÔ–xÒ�uÓ”|Ü¡yÙ™~Ö��Ù•tÕž�Ñ›„Ñ¢’Û¥œÛ«‰ÑŽpÅ•ˆ×¬ˆÛ¡�Û­˜ÓŸ†Ù±šØ®¡Ó¤ž×§šÖ¢‘Ö¨”Óœ…Ç—�ÊŸ�àÁ¤Ý­…⼋àèæ͵äǬâÁžÝîÚ­ßÅ°áŪßȵáʺã̸á˵ßʹãÑÁçҺʛ‡Ð¨�ĉtÙ©•Í—‡çиS.@Y1K[1=a8@];MY*;c2@\/EyG\¼ƒvÖš|Î�{Ζ„Óž}Ó €ÐžƒÒ›�ÑšxÓžƒÓ¡ƒÕž‚Л}Ï�wΚyΙvÕšw¥]F­cO«_J¨bNªaJ²fIÇvVߌ\ä mì§tí­së­xí¯{ê¡hâ—k¾qR•K@—J@žXG£_N­fR¬aK®]D³`H®cMªbM®cL«`F¡WGáš^õÄ~í¯sêœ]â“RÚ‚Sá”_ÌuO»bGÑ�iÖŠj˃hÇ�dÃ|`Â~kÙ“oÏ…c×–uÐ’vº|pĉ~Ó–yÑŒjØ”uÚ¡�Ú™~Ô•�É��Ï�›µ”˜©Š’£uv�X^Ë–Š×š{Ý£�Ù¢‚ؤ|Ñœ‰Ý¥ƒØ›…Ò •Ó¢”ТžÐ«¥Ñ˜{Ä—�Ú¹žåÀ–Ù²›ÛÁ±å̳áãڻ¤Õ¸ Û¿©ßÀ©ÞůÝDzÝƯàË·ã̺ä˺âÊ´áͽæÓÂÝÇ´Î¥‘ÅŒzÏšj«l`بŽîßÀI$=V+?a8J]3AX.?iBPc1=d6J•aeÖ˜yÑ”€Ì“yÒ�‚× €Ø yÕž€ÓšzÑštÔ›~Õž}Óœ€Ðš|П{Óœ}Ð�€Ôœs§]J«bN­cJ©dP±cL·hQÈuRàŒZæŸoì®sì«pê­xí©lð«uà�Z½kK–KA—PG¢ZF§bS©_K°^F®_F®`L¶fN¯_GµbH¯]F¡TFØ’NòÇò¯nížTì Yç [ìœ^ÛˆV¸oaÎ�aÈx_̃iË‘†¸|nÌŒuÚŽkÑŠqÒ�l¹{fÇ„nÍŒvЊ`Ô–yÒ”}Ó–ƒŽSZ«}€©mg�UYžjjž_aÊ�‹Ì™ˆ�\c½ƒtÙ �Ø©•°Ž‹Â‰~ר˜×¨•«xh7LÊ›’½ŽŒÆŽ‚áÁ®Úª�Ú»­âdzèȪãÆ­Ú½ªÜÁ©ÛÄ°ÜÁ®ÛƲàȳßÆ°âÈ´â͸ßɲä̹æйæÒ¿æÒ»Ò§ŒÆ™z‰QJžcW¼‡…ëÕ¿À˜oL"6Y-?`18[(7_0Cl9?\1Ei7L¹‚tÙœwÌ’†Ï—~ÔŸ{Ù¢|Ö ƒÓšzÐ�‚Ñš|ÔœzÒŸ|Óœ~Ôš|ЛwÑ�|Ïœ‚Îœ|©dT«cT¨dS«bL­aP¶eLÐwRáŒWé�iì©sîªqì®wì®|í§nå—c¾qR”LC�KA›TE¥bQ«^H°cL±dO²eL·hO¶aG²bJ°`BŸVDÐPöË÷»‚øµeì¤\éšYéžcâ�X¹o^Ãt\Æ{eÁ‚rº{oȉuЇcЇiÍ�uµ}n΂eɇtʆmÏ�t×”zÓ‘s«q€ÍŠq»xm¦jk‘]h�ZeoE\Ö¦›Ø£�Ÿ€¤©†¢ ƒ�qE_‹\k rq”ai_2KlEb†^nR,IÌœ�彙С…Ôµ¡ßÀ¤àŪܾ áƬÙñÛõÝÀ­ÝÅ­ÞɺáɸáʲâɶåηáÌ»à˵æθçϳΞƒ—XD•TH�\N´xkâÁ­ìÚ¹T,AT)<_/=a.9X)7f3=^/:X0F”dgÒ–ЕÍ”�Ö¢…ÓŸ†Ö�Óž�ÕŸzКwÑœ|Óš{Ïœ|ÒœzΛ�Л~Ì™ЙyÔšy¬^K±gQ§bQ©_M°eMÇmEÑtLä’[êžbê¬rê¬líªsì¬pî¥gã—i¾sO�PH–K@�TJ§]JªdP«_G®cM°fR¯aL±`J³bH°dM§XD´cEýÃxù¾jþÅjñ£VÙ‹\è˜[¿va¶q_½tYÀl®jaÈ‚j͉nÈ„nÒŽqÊ€dÈ„mÒˆiÈ…lȉwÓ‘zÊŽ�žemĉ�¬~‡¢q{£di¯ty“eƒ‰g†žp†¥Š¨†YpmHed;\—€Ÿc;ZtNoX.?P'AS4VL,N ‰”Ô˜tÓ¥˜ÞȸæÈ«áèÞìÞÁ§âÅ«ÚįØÁ°ÜÁ§ÝDZáÈ´âȯáɺæмãÍ»çÏ¿äÈ«Á|P’RF—`RšZI `P±q_Ý´œìѲ�D5R-@[0Bb3Ba3>V+8i9CY.<Z.Gº…|Ê”„ÌŽvÒš‚Ô¥ƒÔ�€ÔŸ}ÔŸ�Ó ‚Ò�€ÏšÔ™yÏœ‹Ñ›yÍ™ΙzÌš~Òž~Ò™u®fL«cO±fK®bIµjPÀoNÒzKàŒWæ¡pêªxê¨oí­lî­wí§uæ•cµmO•OG’SK [J¤aL«_H®gS°`J°eL­`LµbG®_F¬`D­Z?šRVûʃýË|ÿÊwó®[ÓzSØœ{Ì”vÇxT¹v^­iXÇ~dÒŽmΈsÅ…j¼x_̆sȇẍiË}hÑŽrÓ‡j©kiĈx€u©qt¯uƒžn�xIUh<UoAQ{Rk}YpŠa‹…cˆo>V‚e‡^3Iƒd‹]5M?1E&Bͳ¦¾ƒu̱®äÅ©àĦâƪá©Þĩݾ§áÃ¥ßñ׿©Û¿­ÝÄ«Û°ã͸åɬëÒ»åÍ®›\M–RG—TE˜VHž\N¨iaÊ—ˆæ¹˜ê˨a03U'=X,=c3A`.=^-?c2<f9AR*B†UcΓ|Ì�{ϘyÕ¢�Ö¡€Ó †Ö¢†Ô£‹Õ }Ò�}Ò›|ÑŸ‚Ð�‰Ð›~Κ€Ï™wÌš}Ï�Í—z¯iS´eK¯bL«`J°bKÅoQÐwRß“eåžlëªjí«ré¯ví¬lí¨væ’`ÀpN“RJ”RO ]N§ZM¨\K­`G¯dO­`L«\E±aJ³^BªdO¨[E—ROøÛ­ýÍzýÎ~ð¥WÚƒRÐ�wÄzeÉ€g§`P¶n^Ì…n͇tÈŠ|»}kÂw[ΈpÄuÄyaÖ�nÕŽt±mk¹�Í‹w¬r‚€^pi;W|Ljl=Si;RsDf‰by~Rhf9Q‹`~„]k|^ŠZ0M�z�D ;a?aÞÁ£±toÕµ¤åĢذŒÕ³žÛÁ©Ü¼§ÝÀ£Ù¼¤Ú¼¨Ú¿©ÚįÛÄ°ÝÅ´áDZÝǵâÈ©œhT¦�~¤`P›VHœ[M¯n_Ï”yã¢n嶑åǦ^->_1?`4A`5Cd3>_,;[-<k?KjL]Z0P²zqÓ—xÇ‹rÒ¤ŠØ¤‚Ö¥…Ó¡‰Õ¤�ÑŸ~Ë›„Т‡Ï›Ξ�ΛÌœ‚Ô�wÌ™yИyÌ™‚Ì–v´iR°jV°gP±hX²hT»gEÏyPÞ”nçœcì©sé©vë­uë¬wí§sæ”]ÂtV’MB“L=œSB¥[J­]K±fR¨ZH­`F¬eO¬`M¸dF±fL®bJŸVKâ©[ûÈuüÊy÷ÁtÕ¢sÛ™yÖ…X«k^ÂwbÓ�qÐŒuȃo°nbÂ~tÎ�jÊ„f¼|oÑ‹uÕˆgÒ‡m­ouÆ…z‹\ne8S�o“a2Da7S_0Gb1Q™u“‘dk]/EZ,Gƒ[t�^€U+BE#Kv]„jBZá²…½€nßÀ«âÀ�س�Ù´˜Ùº£Û¶¢Ù¸¢Ù¹£Ú¹¢Û¾«Ù¼¤Ù¾§ÝÀ©ÝíÝÅ°»ŽkzNS–gq²��¼Ž‡Ô’jæ£xê¨tߧ|é­‚îÊ¡\*4V/B^-@kAO`7Hd2A\/;\)8m:BZ0EtBRÎ’|Ð’wÎŽxÖ¤ŒÖ¤…Õ¥ƒÓ£‡Öž|Ò¢‹Ð£�Ò�ƒÒ¥�Ê™‚Í›{Ì›‚Ñœ�Í�€Ë™Ë–‚É–‚¯kY´hPµl\¨_M¯aIÃjKÍrJá�ZéŸhì«që¬~é«sî­lïªtã”_ÅrM—TP’LE XK£[LªdP©^K­aI­dO®dQ°cO­aJ¯dN°dPª^G¨ZGüÐŒüÓœøόܩ‹Öœ‹Ñ“sµlXÉ„nψiÌ‹q©c]ÉxYÇvÆzbÀw\É�x§utŒNTЊy«ojp>SfA[€U_c@RZ-EqFYX+@oFjM\a1Ec8U’s‹‹g‹Q'Ata”@4†_lÙ�l¸€nÝ´�åǦٷ•Ô±¢Õ»­×µ™Ñµ¤Ð¯–Õ´žØ¸¡àÁ¨ÞÁªÛ°áĤг�~PSpBJ›v~Ÿx„¶•’Þ¦†å¥yè©vå¦ré·’òÍŸa.1U';\-8_.;l8Ab7?a1;^-7d4>`>O\7K£pmÒ“sÏ’xÓžƒ×£~Ö¥€Ô¤…Ó¦ŠÖ£‚Ô£…Òž�ÒŸ‚Ñ�ˆÎŸ�Í�ˆÎœ„Í��Ë›�Ê™}ΖtÍ–y°kV³iW²fR²dK¸dG²fGÈrNá‰Vé¡jë«rî«oê©tî¬uì©yâ’aÊuP–NF’GCžWH¤\IªcO°bJ«_K¬bM°aJ±eM®`K·fL¶eF¯`FŸZLöܱúÚ¥î½ä­„á›q¥YIÓŒoÌ…oʉ{£b^ÀzhÆ{b»znÆy`σkÕŠoÏŠv|<E•\iyOfmE_Žg‘nD_X*F“w™R&@V(Hk;C[-B]*BŠ_o|TruQilMoO*F†n”Ê�pºsäÁžåĪ޿¬Ó¸§Õµ�ѯ¢Óµ Í®�Ô®”ͪ–Ö»¤àÁ­Ý¾ŸÝÀ�·qS€FOzGN—mz°‹€žtqšioÉ��æ©xí®zë´†ìÊ–_2;R"0]*8`2=d4>h:Gc4Ad5D]+6f28X0Ae:N¸„|Ç�xÊ‘|Ö¤|Ú§~ק€Ö¤„ب†×¡Ñ£‡Ò¢€Ó¡~Ñ �Íœ�Ò��Îœ€ÍŸ‰Í�„Í›‡Ì™Θ�µjS±mW·iP¯gU®bL³\CÂoNÛŠ^è�aê«wì­|ï®sí«oì¦nä•`ÇuR�J?”NGšNH¥[J©_N­aJ²gQ¯aK°bM¯^G¯cP¹iLµhN·iQ®bLžWKøݵñ»}è°€íº}¾wSË{_͆p·rfÁ{c΀dÇ~jÀvc²rq̇w­|„·vp¥fgŽ[ii>XƒZlY.EQ&AoB`ŽhuP$8a2P^1=[.@a/Db5Nf>TW-NŠ€¢”p…†QW›n~⼒Ῡݪ׺£Ñµ¡Ï±™Ô· Ô®’Ѩ�×· Õº§Õ¹¢Ö»§×µ¦ëĪ竉’SRšoo„RT‘ez¦‚‹�kvÇ“„å©�ñ ⷃV,<\.9U%4b3?h5@k9Ap?G^1;U)8\+>c6Bb8NŒXXÀ‡sµ�qКƒÖ¨‚Ù¨†×¢~Ô¥ˆÕ¢€Ö¢„Ô£„Ö¡‚ÑžÒ£�Ò¢ˆÐ�€Ñœ|Ïš€Í�}ʘ{Ç•~Ë–|±jW·jVµiR­cM°gSª_N½iMÖŠ`è mîªyï©píªuð¯qñªkã˜gÊxY“KC�F<—RA¡]K®gR¦aR¬_J²aL­bM¬bT¯eL´eNÀkQÁnP³gJ¢WHçµuöÆ{ð¼”Û™s݈[¿v_»rbÀxcÊ‚j½€|³umºup²€Š u‡•e{�P_…OcŒ[lŽc|k?Ra9LO'A~Z{j?RrA][*=^/Ci<T€Xw…b€`‚qNz�s’Ÿ{ŸœuŒÆ£¡ã¾¦Û¸ Õº£Òµ£Ñ±šÏ±ŸÒ¯™Ó®–Ô¨ŒÒ³¤Ð´¨Üº©ç¿©èÁ«ïË°å¼—Ë|g–ZY�xmŠ\f–id«„‡ÀŽŠç¶ˆ—YI_,9X+<b4De,<g7Ak8Aj9Bn9Aa-A`+8l7>[/CqH_§vk¹€m±€~Ó£†Ù¦�Õ£�×£‚×¥�Õ¡Ô£…Ö£†Õ¡|Ó �Ï›|ÑœyÑŸ~Í�…Ð�xÌ�˘zÏ›|È•€»qX¶kV·kS®_J¬`K¥ZFµgJÚƒUã™gê«xì¬kë«xï°yïªvä”dÆwV“ID�HD˜XJ¡UG°eOªbP¨_Lª_J¬^M¯bL±cLµjPÃqX½ye»oS¥_OЂPüÙ”öÄ�ð«w¾wdÇ|d¥_TÁ{hÁzg¸}yȇpÏ„k³qr̃n°qusAVf;Qh9SŠaqCZ\2KZ3PpB^�e†vK_X-?]/@`4FZ.>W1D\4M“h|}X†Œj’§‹“Òª”Õ­˜ÖµžÒ°šÌ©�Ñ´ Ï®›Ó°”ײ›Ð°™Íª™êĥ뿩êÁ¯ëÄ­îÅ®ïÄ¡ãšw²aHHS–mv…P_¬ƒ†·��ÊzœSBT$5S):^/@f;Ji8?m;Bi6Ba0<X-=a0<h2:\0E€N[ºŠ{­yrÁŒxÓ¦†Ö£€Ö¥‚ؤ~Ò¡ƒÓ£„Ó¥…Ô£‚ÓŸ‚Ó €Ñ Ô¡‚Ñ�ÒžƒÐ�|Ï›zÏ�|Ê•xΚu¯cP³hS´lU­`J¯cL¥W@´jQÙ„Xâ›mí«~ë­w첆í¬~ð«på—fÆwQ‘NI’NK›WL£[K«bN®bQ«cM©bM¹dI±cM¶dN½jKÁqUÅvWºiK±cJÐ|PüÚ¦û×¥ÍuM½v\¹tc¾we¸ub°fWÛŠiÐ�bÉ„pŸ][“SFf3?tHZ[3GU*CqE_qEZ„ZtS,Df7Q~Z€’n�W+=c8FT)7S(:N$?˜ir�OS¦ˆ©À–‘ܳ’Ô²™Û» ×´�ΨŽÎ¤ŠÑ¤–ÓµŸÌ¢‡Ë¦œä¸˜ëâíÆ­ëƨë«ìÅ«îĨïÁœé¨~¶dLy<>W+AˆU]žpl±�ј†o4AY,<[/<f0>i4;rDRe8Dj4@]-;_0>`/=e5D_.F¦tn¿ˆv±}q–„Ó¤Õ¤�×¥€Ô¤Õ¦}Π‚Õ €Ñ£ƒÖ¥€Ó£}Ò¡ˆÒŸzÓ£‡ÑŸƒÑ ƒÑ�zÐ�ƒÐ˜qÍ—v±jV¬hR¬bO«fU­dQ¡]J·jOÙ‡_åšjê¨{í¬uì®zêªví§uå—hÆuQ–RJ”K=•OC¤]N«_J°bQ¶eN«fW«_K²iS´eN¸lR¾nTÆsR½mUºgI³cKÿÖšþÍ�¯gS¶gN¼oZ¹wm¼p]΄q¾mYÊ{gÆ{h—hnR%;[oZ.>W)@].B]5OwPlqHZb8SSo`9\¡�°|Pi~W{O);F!7ª…ƒ¨e_Äž Ó¤‹¡†Ÿ×®’Ú¿¦ÞÁ§Òª“΢�ÉŸ‹Ñµ Õ°™ß¢‰ç¬‰ì»žíǪëäíÈ©ïǨòË­ñ϶óͳì´�ÊlJ‹JE\/A�PQwDQ»’�Í�Š]0HY3E]-:c1:f1>f6Ej8Bh3;g6F\'4f19X1?uHTµ†u¹†uÆ�xË›}Ä“v˘Ô¤ƒÖ©…Ó¥ƒÓ¤|Ò¢~Õ£�Ò¤Õ¢…Ô Ñ›yР�Ò ~Ï�{ÍŸ~ΙzÌ–wÊ”{­cN«lX±iV¬dN§bO¨[E®cN؆^á™hë¨rë«zì­|ë«sî­ræ“dÇzZ“PJ�QIœTD¢]M«eO®kU°l[¶cJ²hO±hY´fMµgTÄ{RÃrXÆvTºlN²`Pýàºè´ƒ¹jPÀwi½mQ­h^Í‚dÆw\�PSxHQ„IQ“[_\.D‡[nU*<l@Yl@U\.Dd:Nh9I_4PzPkb:[‰o|[-BM%;G4˜okÂs_П›Ý©‡×¥‹žˆ¢¹�¢ÜÀ¯Ô¶žÓ«‘Φ–Ϩ”Ð�yãž~çª鹑íÁ¦ïÇ©íʳðʱðƯóкòÒ¸öÓ´ñÄŸÕ†f©YDS&:\,@ƒOb½ž¡Êž�^7IZ/An4;e6?h:Ei7Ak>Ea2>_0A`4Af69Z-E˜hiÄ�o²|iΘwÑž…Ê—yÄ—‚Ë“~˘}ÍœƒÏž†Ñ¢}ÓŸzÔ£СŠÒ£ƒÐ ƒÔ¤~Ðœ{Ñ›zÒœwÒ�}Θ~Ì•}±lT­gQ®eOªgR©gT¥[E±fHÔ…aã�jê«zë¬wì¯uí®sî§nä–e½pW•SM™SJ UE£^S°cO°fU±jW²gQ´bJ®aQ¶cNÔ†bÅrQÃqQÄtWÄsS·mZã™S伕ÇtPÄoP»r\Á}hÈ„y×…k³g[™Y[`4GT&:f9Wo@K[.Ik>QlAUa7KX)AqG_g7S‹f‡…X{[,?k@_C9ŠY]ЄlÌ’‚ܪ‡Û­‘׫—©��Ѧ‰Ø¾®Ó³šÑ¬šÌ¦‘Ø‘náœ訄䮑ëÀ¢ëÀ¥îĪíɹðʲñͱñÒ»õÑ·õÓºóɨã™z¦WBa.;Q":vJR¿�¢Ï¤’]6IfI`i8Di:Fh=Fl>Gr<C_->^/<d49`4D`5I¶�uÀŽ‚È�rÓ¦€ÌŸ†Ë›{ȘxÇ–É”vÈ–~É•zÊ–{Ç–‚Î�~Ò …ÑŸ„Ï¢†Î�†Í�‡Òž{Ñ›wÎœ€Í˜yΔu±gP¶hO­bR®eQ¦\K§^I¯fSЀYáœkê¨xì«vì°té­uð¨kà—gÄuT“PK�PM�`W¨^R«bL¬fU¯eS´jV·iP²fT´fOÅ…j¿qZÃ|\ÌyUÇvWÈrM¿qaóØ´Ê~]ºcMχoÌ„mÇv`ª]Q�AC\2L�\xQ':V)F�l�o<RjAR`/EqFWY/@c8Q]+LZ-:sH`P$E‰h�f4BÓŠbÁ{hÞ¦…ଅڼ¥×¹¨¦†ŽÔ«“ßȷѧŽÑ¡ˆÝ—uâ �æ©„æª�髌뷑îÀ£íÇ­îƧðË«ñ̲îδòÑ´öÔ½öѯꪄ½kUz8:P(=Y*<‹PSΪ¡‡PV_0Bh6@g7Fg9Bl<Dk<C]1@]0?f8>X-;„RWÈ“€´‚rɘ~צ|Ò£�Ñ£‡Ïœ}Éœ~Ìœ{É—}É›ƒÀ�s¿’~Å’uÇ‘uÇ“xÊš~ÍŸˆÏšyÊ™|Î�~Λ�Ö›{Ï”w°fP«cQ¯fQ¬cN©]H©[B´dKØŠaæ”gè¨}쫀ꮆï°tï«uâ›uÆvW•TL—OH YR¥_O°gS±gZ¯eS´mX±eS¸gR¸lS¾pZ½sWÁpTÀkIÁoL¼fGÓŒfÊ�QÂtQ×XÕŒx¯‘¡lmr8DXrO$Ck?TmIrf;VU(>l=VƒSgZ(;a7Mf?Td:L_1EoEl}RuH7†a}Ú p¹sbà¥zÛœzÛ¯•Ö¹¦Úº¦«Š�×·ŸË§›Î�ƒÜ�ŠáŸ‚䥂鮑笄賙붛ïÁ îÅ®ìɵîÇ©ñ˪ðͯóÏ´÷Ò´öѮ︗ÉtT”PFU,BR(A†PZÙ­‘�HO_,:d=Ok<@m?Ji?Ja5<b/;c2<c5A\2I¥wvÂŒo½ˆvÍ¡Ó£~Ò¡‚Í ~΢…Ó¢�Ï¢ƒÏ£�Ñš}Ë›yÀ˜…À�tǘ{”}¿’„½�wÈ“yË—|Æ–}ΚxϘwЙy°fO±fP«cR¬]G¬aH¥ZE¯dPÚ†aâžrç©‚ë­ì¯ví¯yð«pà”eÆsO•OJ”OF¢XO§^O­gX³dP­fU¸iS´hV¹hR´jS¿qPÂrSË{XÎzWÍxTÐwQ¢aSå›bÉ}`¿}�³…‰¾p\­i]Y3RuK_L%F�]oT)BP#<qC_‚Vcg5D\/EZ0H�r�X*Ci=[cAXL#5F ?ÀŒy—YUḑ٧�Ú¥‚Ѩ�Ú½«ØÀ¬Ð®žÍ­˜Ó•vࠂ⧋⤉å©�é¯�ê¯�鱕뱕︔íĦë¦ïŨïǪñͲòϳöÕ»÷ѲóÅŸÔ] NBR%9T+?�O_Ú²�”YVa2GyJQnCQmCJl@L^/=a4Fd4>]3AnAS½‰sÁ†mÅ’}Ô£sئ‡Ô¢…Ð�uΠ„Ô¤Ò¦„Ó¥‹Ï¡†Íž|ǘ€¿•�¿‘€¿‘v¿�w¾�sÓÀ�z½Ž|Ä“‚ДqÉš|­dQ¯fP§_L°dP®eM°`Fª_KÕ‚Yâ›rç¨wï®{뱂ð±xí§pã˜lÆwU•PJ–RNžZO¥`S­hQ³fVª`O­cM©_Q²gY¿kQÄrPÉuWÄuYÊwYÙ–pÝ¥[S#4U&:ªmg´�‰Æy]ÀqRb.FpFRN$@\4M”q•S&4h8H]0Ch?UV)=[,C`3Kf6IX/Bi8T[wQ(?¢yr¦_PáÅ·Û¥€Ü¹˜Ì™Ó¤ŠÛÁ´Ü¿«Í¯•‹G@­eQ·tcÉ|hØ“ä¥�뵘뵒걎벑췚îáëÁ¢ï¾¡ïšïȦñɨóÍ°ó̪뮈ÃoRt7?Y&3P%9‘_tݹ©Ÿ^Zn>Gc8Ji=LrIRh<Ha3A^1Cd3>[2JŽ]a¾‹|»€jÈ—zÑ¢‡Ò�zÔžyÏ�}Ïž|Ï�zÓ …Ñž~С‚ÌšzÍž€Í›vÇ™ƒ½”�¿•‰Ä•�¿‘‚¼‹y¼‘…¹‹|À‹v‰q°iT³fP°fP­aF²`C¥^K¬\HÕ„[ã�wé§vï®{ì­oî¯{ð©påœkÃv^“RN�OHœRKª]L±eT°bK®bP¯eT¼jM¸fH»kRÁsXÇoUÃrSËz[é¡o¸oVo=G[(A´ŒŠÚƒP UI�SRb5L‘�¤T.S}Yz’oˆS'=g;XmLZc:NW0AV'9P%8ŠlŠnMr‚[T)D`:EÄ€eÊ›ŒÝªƒÜ¹�ཛྷ͚‚Ø»¬ÞíɑoÖˆkÞ–z×”xÄ}e’KB=;›XMÒ�té¯�ç´˜ç®Œì¯Šíº—é¨íº�í¼ŸòÄ™ðßé¹�Ãfž^UŽH@‰C=X'6O*AsCUÙ¬›ÃŒwY-?}HLm;Cn>I\4C]0<b0<g6DZ-@¦vsÁ‰w²qÓ¢†Ù¥wÓž|ПÑœxÐ�uΛО}ÌŸÓŸ|ÈœƒËšÉšyÉ›~Ç›„Èœ‡Èœ‡Çš†Á�|½�{´Š�´ˆ}¶†w«fY°hU±jW¯hR°`G¤S?ª`LÙ~Rã–rì§yî«pë°~î°sð­yäšlËxS“ML�SOŸZP¦`O¯tj°eV¯eS°dP°cP¯eQ²dM»jNÀqUЇlâŸ}Ý�hÀ�‹Ž^\M*H¹†Š§_W—YQd4M‡h‹^3MrNn]0D—…�N%>vKgS(?^7HyL_P!0\)6U*C‚lqX1=E 8Òž»€sà¨zß²’àÆ­Ò¨ŽÖ±�ßÆ©¸lOÑ~_ÒŠnÓŠnÈ{^àœ„Ó‰l²dX£VG¤YNÌw]å£�骊ê®�칚íÁŸîº™ì¶™ê¶�µmYŸ_[®h^¶lVÇrN¨ZCs:@Q(<qCWÏ¢’·€ne1:m@GtALo?F_8G`4Be0=d4?k<O»‡z¶�nÃ�vÑŸzÔ }Ö£ƒÏš‚Ð�€Í�…Ï�€Í™wÑžОzÍ›wÍ™{É–v˘yÈŸ…È™~Ë™�Èš†Æ—|·“‚°‰²„{±�s®jU¯aJ¯cO°cLª]H¢TB­_KÕ‚\ã™gë«tí®yñ²uí³yî¨uãœgÎ�a–L?•MD¡XJ¢_X®dRµiR³dK²fN¶aI³cHµfL¶nbº‡~Ù�iÝ›xß›wð¥jâ˜kÁzeo7@W-Bo\o|Qq‡`zyHfƒh€F <~\}U&<|YrO%;V.J�u�Q(9\-:^-8U%6i<cžob­dPæ¹…Ý°‹â¡àÇ´Ô«™ÞŨ–OE¤WC�WF}BAp85l23u7;g0;½{kшrÒz]ÑzXÝ�mæ¡�裂îÁ¡ðÄ¢ïÁ¡ë»�ÔŠh³lXv99k35r8@zAC†AAn27S(>sHUÙ�®p_yDLf;@m<Kh7=a0>e1;c0;S&>†RX¿•Š¸„r̘|Ö¤}Õ ~Óœ‚ÏšvÕœrÍœzјvΞ�Î�xÏ�|ИrϘzʘwÊœxÉ™}Ê›ƒÊšƒÆ–~À’zÕ�»�}ºŽ�³‡‚©`J§_P¤^Q¨\L¡ZL˜QCŸXIÑ‚\â›jê«zð²vì±nð²vì«{ä—eÌzT’ME’OG—TE¡TE¨^J¶cJ­_H¨_J¯aJ«\H­aZÓ¥�ç¤fÞ�[à˜uâ–i¾„zb2A�IHH"CxY|Nm“€«…f‰‰e�œ�­A:|Wtg>R}^rV,EL#6U)B˜xšS&:]'7K);K#:É•gÛ¹¥Ü¤|ß·¢äÌ·Þ¿«Û½ŸŒJ<ˆB>h.5l29h5Ac-8rNažno[-9\(9¨V=ׇ`Õ‚cÜ�pâ”u꧄ﾚôÌ°òÊ¥·uXf4A_2CƒGHv=@d/=k<Dz:<f-8R$2vDQÁ”‹·„}}IQd7?j:Bc09^3@d7Fg>JQ(A£mdŠnÀ†vÕ ÒžvÐœ€Ï—xÏ—yΗtÓ™nÔ¢Óž„Ï›yÎ�}ЙwÆ–xÎœ|È–vË–{Èš„Ç™}À’|¿Žz¸Š{¿‰x³‹¶ˆ{¨dM¤\K¦]F§`L¡YG“PEŸS?ׂVâ˜gï­oî­lî±…ñ´ƒë¬~â“]ËyO‘HC•NF¨YI±eP°aI¯^H¯gP°dJ­\E¥WHÔ~IñćÅ~fÜ‘kã˜dŸ][Ì�s€GOK*EoPtb=V}_…L&@nHl‰b†�pŽQ)=Z->]7Mf>HW,AV(6d2C^.>Z,@b8WQ&E¸Œu®l`ܤtà·“Ú¸£àȶâÅ ŽPI–N?i6<j37�PN„NWS&3f2HãËÆѹ¬};CšSNÍ|gÐyW݆dà�c裂óÇ¥ø×´È�db2@W/Gn9LƒKO¿’Žp7>e19j7Ce1<U&9�PW»Š€ÃŒ€˜kxi:En?Ga,8^09`2?_/Ag9K¾‰yÆ‹qÇ’~ÓœwКwÑ›zΕwЙ{И~К{Ï›{ЗtÍ—{ΚwÍ™}Ñ™yÉ—}Ë—|Ã’}É–|¹�„¹‹v·‰x·ˆv´‡}ª�w®ƒu©aL«_G¯aI \NšYK•NFŸOAÒ�Yãšjëªuë±zï´yð´tí«rä™dÍ{S—NE˜PD¥ZFª^G·gN¶iQ´iN²fS³hR�KCo9B‹U_è§x鲉âœcj.3`2GP)G{Wv_.HlKo^4U_5VpJe…Yz‘q�M*?[.BX(7Z,D{OcT)7]0@^,;Y+;Q,EQ/@�QU×±¡Â“‰Ï³ªãȲßä¨gVÃwa­dT‘NJŒDF¶kl<EŠOQ›qŠæÑËìζÅzkÐ~\ÁkRÇr\×~^Þ�pë¦|õΰðÕ²£\R—]b”ciŒY[¦zŽØ›‹†E>a-5h/7f6AW*<�fo¬rhÈš…�`eU\g4<]/9d4Ee5CY->‚RXÂ�}¾†tÌ—€Ñ›}Óž€Òž}ΘoÐœ{Ï™xÍ–~Òœ}ÑšuÊ—xÏš|ΗyÌ—‚Ê”nÔyÃ’wÂ�yÀ�z¼�|¶ˆr±†u¦~w²Š~É£‰°dLªdQ¨aK¥`O�[M“M@–QFÓ|Oá—pï«tï³yì³zò²{ð®zã˜kÐyR�VG YL¬aJ³hM³jS¾nTµhO�C5n4B‰Ui¯�„Ó¯¶ìºŽõã·^3JO&<K(?pIj‡b†[2K]6YZyyUk�eƒb8S™ƒŸ_;SS'6[+;\(8^1Co>M`/:g6EM#4W8[Ì›„½‡{Ô–tÙ¹ ßƺÚÁ¤ªeOÏ{]Ñ}j׋oÊ…t¥ZO¼n`ÂŒ‰¼‘”áÁ¯íκ綋ܑmÇpXÓ}WÑx\Õ�cÞ�s驈÷ÜÁéÊ°¨YKÇ€t£y�©Ž«×´¯Ò�ŒD<{>Eq5>Z/Bb3EˆW_�Z`Ë¢•}JT‚SW`1>[-8[0>j9?\/B˜f_¿‡kÃŒwÔž€Î›|ÏœzÏ—wЛ{Ó˜sÏ—yÏ™wИvÑ›s̘v˘zΕwÌ’sÄ•Ô{»�{¶‡q»��´„q®�xÁ’yÏ¢Ú­}à·Œ±hP®hU­fO¡XCŸVH™RG˜K<Õ�Uãžhêªvî²}î´�﹂ð´vå›oÓ€U¢VJ¢YI²dK·iL¾pT¿qSÓ›xV'9©niÖ™{ÆŠ†Æ““£tOa<ZR.R—¥~[gc:S]3JI%@v`}vYz]5R‡eŠŽg‘’m…jE`O&=S%9Y*9_,>`/<b9Jb1BL"6�]U£XNàÁ¨Ý°�ÞÁ©ÞÅ®ª`LÍtZÑ‚mÕ‡oÛ�w×�mÔ†mÖƒfÅwc·tnÊt½roÏ¢¢Ü°™Ü�lÐ}`Ò�lØ‚bÚ‰t駊öÚÇìηᧄӓ�ʃnË€c¦XC†<8{??–UCt7;W-C`4E‚OXŠT\Ô¹²‚T_†SUa,<c6Gd3>b4EtBG°|Á…hÄ�pÏ�|Ñ�zÍš�ЗxÇ—{Ï–|Ï—uÊ�ƒÊ—yÍ–tÌœƒÍ—wÊ“mÆŒv¿ŒvÀ�z¹‡u³…t³ˆx¹�‚֧ݴ†ä¸„潄辉¯iV­bP¥aNžXK™UF“MA’H:Ñ|Sâ—jì©xî³vî¶|ð·…ð°wåžmÕ�OŸSC£S@¯`J¸dHÁnOÀiNÕŠT½”‰Æ‹ŒÈ¨�xERmE[~RcT';[3OZ6\¤�ÄœŠ¯‡p”Z5R`:NlEc�[…†j‘’vŸš…¨a4?W-CX);`2@[-:^.?X+9G0J":Ó›sÅŒzÚ¦Ù±šáȱ�\G½cHÓ„gÙŠtÝ’yá–{Ü‘qÝ�pÛ”yÝ�oÔ‰tØ”|Û•zÜŸ�Ú”ƒØœ‡Ó{b؉p×�dÙ‚mç¥�óÒ»îÒ¹Úª“Ú•{Ó‡pÏ‚oÊ}d¶gR«_J [D|?@W(9b2BOU€NXàÀ°˜bktAAl8?X&6pDEY)4�KPËs²€uÏœzÑ¡€Ë”tΘyÍ–yÊ•|Ê–xË“rÍ—zÈ“wÍ–xÈ“rÊ“wÈ’wÇ‘t¹‰w½‡l´…u±�vÏœyß³…ç¼…èÀ…亄齀鼀¬aM¨^HœWI”PG–RE‡C=ŒD;Í|Uã•cê§të°wð³†ð¶ƒô¶ƒæšaÖQŸVJ¡ZG§^EºiL½nQÀmPÃoW×™x³pgŸjgc8Q‹f…c>VP.Ni:Y‚\|’uœiF^uPoT+H`7TuRunNb�wªŽpŸƒm†“‡·_0@X,<T'3X*;`7HY0BJ&A°�o°eRÚ¬…Ý»©ä˸±�O±`HÅoTÔ†sØ�tß–}à›ˆä¢Šã¦Šäž‹â¡“ßŸ†âª”ଗ㫙ચڌpÙ‡n݈c×~fÙ€lå ƒðÐÁîÖÆ⺜à�…Ü—€×‰uЄlÆt[ÄuY«_D‚HNa,4s@G}JSs>Dܹ§—jv‹\__1;U%4e:?T(=›f\º‰{º‰uÍœ‚Ð�}Ï›xÍ–pΘwË—|͘xÊ•wÌ•yÉ•wÇ”€Á•‚È•wÂ�vÄ�}¹Ž²€oµ‚pج‚æÀˆìÅ’ëÁ‚鿄羇è»~꽂¦YE WJšTJ“OD“M?†A9ˆEBÎzNâ™nê©uð°wð²uñ¶{ó®rëžiÒ�]�VDœP?«YA¹cFºpY¿oXÀuf¥k„˪¸¤‘ºª‘¬iC]`9Qe9S{Mn‹h€X€œ…ªL"9Q+F^8Z–{•zW„gDg’{µ��¿i@Xp@JY+>`3BX,9T,CU,CU(;Å|RÃŒ€ã´ŒÞÁªÑ»¥ŽD;¿jNÎxZÒ€hÜ‹rá–�ã›}檋奇豖䫒嬒魑æ©�â­”Þœ~Ü“~ÛŽoÚ‰jØb×z[ä—}îË·ñÜÍâ¸�ݨ—Ýš}Ý�mÛ†jÓ~cÐz`°dMo/5f-6j06zBFm:C߯•¥ux{IIpAOW)8c1:_->°zi¾‡qÉ�tÓŸxÎ�‡Ï–vÌ•uËš„È•|È—|É’xÅ’xË”vÆ’uÃ�rÀŒu¼�}»‹u´‡v¯‚uت�êÀ†ëÄ�îŃìÀ}ê¿„é»}ëÁ…éÀ„›VH™WL”OI’RO‘K>~>;‡A?ÎzWá’cè«�ì±}ðµwñ³ï³|çžmÓ€Y›PG›N?§YD°kfÂ�™Ñ‰k´‡Å€otBK`<Xd>Rh?Xc7OtQwvNmtQu—‚¤a<S]7OP(>T*D[6Ih?[‘r�sLTK'F±…z§uh]4G\.>W/FT.DO*Cµ‰v°plÙ´’Þ¬ÞϱT%7–MAÇoKÐy`ׄgÙˆiá–råš{处讓벓笔簕簌鲗孌á¥�Û“xÞ•yÜŒuÜ…a܃iß‘vîʶòÚÈ㸛ऎកÜ�yÚ†vÕ„kÍ}^¸gMt>Gm;Eh4Bm7Bc/Dâ´•³Ž‡f6Bg4:`5@`/9h4?ÂŽu½‡uјyÓ¡zÍžzÊ™zÉ—É“vÍ•sÈ”xÔwÄ’xÑz½�wÄ‘tÑy»Štµ„p¸„qÕ¥zéÀ‰íʼnìćí€ïÁ|êÀ‹è¿…éÂ’éƘ™UJ‘OEŽID‘OI‰JCy;6�>?Ê{Uä›pé©të°vï²yï³{ï°�å—_Ñ|Q£XH–QG¦]H­na¼mVÀo`·ytxMa�Xvƒ^|rF\^6R‚`ƒ^6U–„±�m„]8UY0HZ.E[/HV)@_4LyIWi:Me5>P'D§lc£ic\/BY4JS)AN&7[2GÃfÄtá½£ßÁ¢M'<f06œUJÇtWÑ|[ÑxSÛŠnã’qä—v⠃譎뵤괓ç«�魋馇âŸ~Þ“|â”pÛ�qÛ‡cÖƒaâ–xêƳñßÑ帞ݡˆÚŸ�Ý•yÝ…iÙ„eÑxS®bLz>Cr=Cl9?k5?c-?Ú¬œË¨Œa/:[)7e5?_1=ŽVNÉ“n‡oÔ zРzΘtÉœŠÆ–wË—~É’vÄ–~Ç‘uÁ“‚É“‚Ã�y¾‘„¼Žy¶…u³€sΞ�纃ðÀ|îÁ„ìÁ}ìÄ„ë‚鿎ëÆ�ëÉžéË©�JGˆFBŽOKŽJDƒC<v@C€A=ËtPÞ“ié§vì­wê¯yï±zð®vç›hÕ€VœRE™RB¡\N²hK»iLÄpY V]¡…¦–x�Œ]w†Uk‘r•U5N^7]tWvƒ\uY2Lb4GW.>`3B_3C[0DX5I\.C~C?p:E«qc¼X©zuN+DH 6M!9»…c¶sdâÄ©âÄ®¹—vP(;k17žUHÌtRÏx\Ú‚hÝ…aã�qá–zã“mè¢€í©„ê²’é°„ç­‘ç­‹æ¤{㟃ݎhÞŒhÛ‰eÒ{YÝ€XÛ�|麧òßÎ㻦ުŠßž�Ú�rÙ‰oÛ„jÌvZ�TGg3>g1;m3<i-6^*CÚ³œÏ�ƒX*:Q"6m?B`2C­tdËŽnÆ�rÕ¥}Ï›~ÏšyÊš€ÊšË”xÅ•wÆ”Á“}ÀŽw¿�qÂ’z»�w»Œx±‚r¹ˆvâ³~íÄ�ïÃ�íÂyíÁ€ìÇîÅ…êÇ�í΢íΛë̤†KM�JF†JH�DG{CFn5C|<;ÊwRß“eé¥rê±{é«sì±}ï©tçšlÔ�P›TF“LK´ˆ“ª`N¹f[Ú¯°�–b;N�Rr¦z“’| W-Iz_„vV}‡r¨š­€Xr`7Pf8P]1BR&9T*>R&6uADr9<v<F¤†ŽœTRÉ€X‰PKS(5M#:Ä‚e¾�tæǯåѵF 7T%3l17ŸTHÅlNÒ|_Ø~XÛ„cáŠnã—uå�}å›}ì¢ꭒ謌ç­�馂å¢|á˜oÛˆnׄaØŠmÕ}ZÕ|W߉jæ®–óÛÉè˹इÝ�Ú“yÛŠrÕ„nÌxY†DBW*6`1Bm9Dc/7Z%9Ô¤ŽÅ•Šj<EV-<`8C\+9¿ƒjÆŒpÌ›‚Ó¡|Ò›wÏ™~ÌšyÍš‚Ê”tÆ“xÆ’v¿ŽuÁŽvÀ’}Æ�w»‰x»‹s®‚iÖ£uêÀ€ïÃ�ïÂxíÁ�íÁ}íÇ”ïÌ”îСîТëÊŸëʦŒRO…IKƒFGƒGF}CGn5<z=@ÆxVß”cì¦sí®{ì¬ví¯xîªxç˜bÔ€S–PC”I?Ãe¯kmÆ…|°‚•‘ThzGc¢}‘„b|d;W]4S�b†rS|�ƒ«˜Ž±�š·f=Mc7IV0?Q*=U)=CB¨fQi2C”eyß»§Ç”{{==yFG?4§oZ³~nÙ¾·ãË­T(9R%=Z.:s44›QDÅjJÐ}]ÖƒbÚ~[à‡ià˜€ä™zæ ˆæš{夊穂稆饉ä¡~à™{ÚŠmׂ^Ó‚kÔ|[Ô{UÚˆg樊ðÓ¼ñØ»Þ�‚Ú˜zÚ�yÙŠvÔ‚jÀoPy:@U-Aq6;†MJc-8O!<Íœ�Ç‹p‰SUY*7]+:HNÈ‹lĈjÓžuÒŸwÏ›zЙoÑ�vÊ•}Ê–€Ç•vÇ’zÕ{À‘tÄ’u»‰t¾Œt²†vÅŽx軂îÄ€îÁ~íÁ�íÂ}ëÇ�ïÌ•ïОîÑ¡êÍŸêË¡íËœŽPK�MKƒFH€KNv@>o3:o/3ÈvXà—jã£{í°„ë±xï±{ð¯wêžeÖ~O›QA“MC¡ZG©db§z�µˆ–�WisGhˆ\|„^‚d8Z€b…ˆuš€^‹{\„Ÿ•²Y5@J$8W-Ha2CV.Da2H‰^o�[Z¬zn²uZt;<xB:N$5L .X+Dɉ^¾yeéÍ­ ~VN&9V'?\0<‚A;¢RA½fFÊw\Ö^ß„aà†bã�rá˜å—uã�~ä˜yæŸ{ç {礃á�~Þ�pÑ}[Õ|WØŒr×{[ÑtTÛ„j⟈ðѾôÝÇÝœ|Þ˜{Ü“uÔ‰nÕ€_¨dKR(>^,<sDIƒFFl57K4ÁŒzÀ„q¡rtZ,=Y-BšcYÅ�lňiÖ¡xÏ�{ÌœxϘp̘wÊœ…É£ŽÊ”xÃ’xÀ”‚Õ¿�x¼‰nº‰v¯€qتyíÃ}ïÄ€î„ïÂ…íÄ…îÍšîÑ î͘ëÌ™íÏŸëÏ¥íΤ–VP‘MF‹PN…C>|?=i.;i/6ÁwYá–lë§uí±„î°xð°…ò¬{è�cÒ}W—PA‘KI²|‰´of¯lj»uluE`…[s€\�vNizPoa:^’y�X5Y€_Ž•†§^0Qi>SY0LkDRS*<K$5†Yb¾ŸŽ¥]L”np;;U(7Y/BF%=Åš†©vg­vdÇ¢�i66K"7T$5`-6”NC–M?ÁjKÎyYÓ|YׂaáŒhâ‘oà�lâ™xæ—w矇äœz碄äŸ~à’pÙŽlÆkNÚƒ`Þ‹kÝŒmÙ€X؃l枀ñʳöâÇØ�jÝ”wÖ�q؃gË|\ŽKGY*;c6C}CAˆLId3<M 3¯ƒ~ÉŸ�·‹|c6CR'?¼~h΋dÏ“rКtÑšxÏ›sÈ‘q˘tÊ•yÍ™yÊ™yÉ™„Ç’}Â�tÄ”~¼‰pµ�k¾Šrç¹}óÇ‚ðÂñÂzïÄ„ïË—ïЙíΚîÌ•ì˘éΫìÑ©êΦ�QLŠOJ�QJˆLE�@=t:<{:;ÈzXÞ”hè©ë®~ê«wﳂð°æ™iÒU¥dn¨dY�\T±dT²oh¸z}|Kb‰\uˆg�€WsX.R‡k˜ySrO*Sˆn‘Žv�nBb§¥ÅW,=^0FŒ^cK&=qK^W+9^2C�beX'7J%5J2£ŒŽ×¨†Ø°˜Þ´Œ¤zvS%8O!1X&6e37–\U¡TEÇmLÓzS×}XÚƒdà†`à�tãŽlâ–rã˜zã—w⟂ç�|å €â–sÜŠbÈlM݈iÙ‚SÏ~bÖ„h×yXÞ�líÁ¢ð̱ۗ~ß—{Õ�yÕ„_¼v\^,<R,@e5Au:?o:A^(4U#2�VSÏ©’°…zP#1X);Ì”tÐ�nÑ�†Î�€Ê˜{ÏšyË”vË–yÇ”vÍ–sÅ–yÅ”yÆ“{Á“v¾Ž~ÃŽs·„uÔ¡yî¾wñÄ|ðÀyðÉîÉŒðÌ—ìÍ™ïÍšíΛëЪëÐ¥êϤêά”US’OG�ICŒH=„C>EB�MDÎ}\á™rè¨té¯ë¯}ï°|ò°{ë oÕƒ`žTG”MC¡YG±cIºoa¤jq¡an†^u¬}xxMmI&N˜€”_<XQ-R‹u¡�z§¥�´—”§I#8mCIwFLQ%8I$8U+8—t†n6B\2HP':F:Æ—ௌãÀ¦¾¡˜O"2S'6]*7_/:_)1£fa²_GÄlLÏtOØ|[Ú‚aà‰`à�pâ�nâ—vã–tç—qå™zä�}äž�Þ›|ß”sÖ{[Ü€V½lU¹kXºiO»aB×{Vä©Šâ¬�Þš€Ø‘v׈oуc’TKV*AQ+Ad2A…FIo5:k/7x;<s:AѬ’Å›‰S)AˆJDÏ”xÎ�iÖ¡~ΛsÉ™ƒÊ“yÉ•zË—uÉšƒÉ•tÄ’|‘yÄ�uÃ’xÀ‹w»Šy·„vß«sñÄ‚ðÄzïÇñÇŠòЛîΙìÍ¡íѦíÓ¦ìÒ¦ëУíТìÍ£�THšQB�J@‰LG‚?;‡GC YOÏŒwà›sè¤xê«�ë«{ï¯~òµ€êŸhÕ…[›TJ’QG¤\E°cNºzw§f^b4Pˆ`~vK]N%H�†ži>_yUzyW†�}š}b‰ª¡µ“~ L#;f<Jžqs²wi=6M&:sFDG">’`d§oj´—œ¯tY«smØÏÂJ$9S)<jM[c09W"1c4>¢dX«YCÆoRÓx[×~[Ú�`Þ†kÞ‹qà‘pâ”rà”uä”wã˜|å �ç�{äŸtá˜tà•oÚŽzÜ€[߀ZÖ�fÕŽß¾®ç¼¡ä¦†Ý›Õ‘}Ó„mÇxXX,;X1GU-D]3A…IHs=Aj6<c-2_,C×°’Â�|g7E¬ygÏ”rÌ�mÒŸyÒœtÏ–qËšxÊ•wÌ•xÄ”wÉ‘sÈ—w¿“yÁ‘rºŒy¾�p¸„nº„oç¶|óÃ~ñ‚ïÅ…ðÌ“òЙïÎ�ìΟîÏžðѤíÑ¢íÏ�íЦíÑ­‘RN‹OI“PJ�LD†HC†FD¢cYÒ‹nâžuìª}è§qí¬uó´€ç oÖˆbšUJ“OI�ZH°bLºpeÒš”V+O~VvtNq‹wžhC[O-NqLi{Zu‚b€‘}£rOiŽo‡‘o‘\/=wK[¤cXR&@_4@`5F¦u|²…ƒÖ®™˜XL¯th×­V.EV0E^0=`17i6?_.Ac4BŸ_S±cPÇoWÔ|ZÕ[×€[Ý„bߊiã�hà‘ráŒkâ˜u䜂枀çžzãœyà™xÞ•zÜ�rÞ�lâ™w迥棈êȳåªâ¢|Û’xÔŽrÑ�b¢`QZ3JX1HU.FyHPŸcL{FAz@Ca-;O!>Ò „¼ŒzŒTQ¿‚cÒ‘bÊ”rÔœuÌ�€Ëœ~͘}Î��Å�wÔwÈ–È’oÊ“p¿’~ÀŽr¼�x³‡zÌ—së¼�ñÂzðÄ{ïÈ�òÑœòÑœðΘíÍšñÑ�ðÓ§ìÒ§ìÒ­íÓ§îÔ±ˆLA�I@ŒE?�I@|>=†GC¤h`ÑŒsàœzè©�ê©jî«xñ³~ð¯tè mÔƒ\¡VH”SF£TE®\KÓ——¨|‹mPk|Rl ˆ�l>M[0B[0Ra9Ng@awQs…eˆyVŠ�n™™yŠk>X‘`rˆRYL%5M'@¸”•Æ�~Ï´¦Í¬��ZN«uem?9W(<^+9h3>k:@m<Ec1;^,:£ogª^FÇqUÓzYØ_Ú�[܇fà�mà�râŒmãŠiã’vâ•uâ–yä›{áœ|Û“wÜ•tÜ”yܘ}穇í̳櫎íÊ®éç㠀Ø�wÖ‰nφgZ.CW4K[1FV.DrBP•YMIF|?@e-5M7Ƙ€À‰p£rlÐ�iÕ�[ЙpΚwÆš}ÌšzÇ•uÉ—{ΔrÑwÃŒs½�‚Á‘oÄ“p¾�w»�r¹„iÑ›uïÂ~ðÅwóÉ‹òΘòÒ¡òЙïÏšíÎœïЙïÒ¤îÔªíЪîÓ«îÔ²‡ED‡GF‡B<ˆIEzABŒMH `RˈpÝ›xé¦xê¬~믇ð¬zôµ{ê¤pÕ‚X�UM•PIžQG½Š�¯le®v~oA]‘l‚ˆg…d9XsSrfC]c4RrKcpOq…f{kHr›œ’t�„Tbƒ:7T'?ŒXb—_\§wvÉš“ÖÅ­ŸeWœYRÁœbN)Ak5=h6Fs:<t@E~LLb.?]'7�e^–I>ÆmLÏ|`Ø�\Ü~]ß…gà‡fä‘mߊmã‡bâ‹lá�qÞ•wà’sá—vÜ“uÝ“oÚ–yࠃ宔íͳ婒ëξ绖ܜ†ÚŒpΉv®ofZ->V0FW.?a5Jj=KŽPI�JB{DAe2>X'<¾Šr¬t`¬s_Ò�fЕvÊ›Ο}̘yÌœuÈ•|ÈœˆÆ“~Ä”zÁ‘yÁ‘z¿‘vÆ‘v¾�w¸‡p¹€f×¢wòÀ|óÅ€òΗñОòÒ¡òΘïÑ¡ïÏ›îÏšëÒ±ìÓ°ïÒªîÔ±îÓ®�BD<9„KF‚AA}>>‹IH�^VˈtÝœvç¨zë­뱄ð´~ñ²|ç¡o؃S›SFŽFE°sn¡^Z¶iR¡jyqDWˆkŽg:I_2JaAVw\…sQe„]yhGhuMr‘q–V2R•w‘ ”¦@)EqCRņyϼ¼È«§Ü¯“O=›\Pȵ¶T/FT)>¦k`e2?m9>f4>ŒUM]*3a*:—VKšSJ¼`CÖyQØ}WÚXÞƒ`á‡^àŠgà�g܆eá�rÝ�o݈`Ü‹kÜ�oÙ�tÝ‘ràœtã™jä”læžyðÀ•ç ‡å¤ˆÕ‹j΄rΉvY/FX.>a6DX/C_3@v>CŒPH�F>}ABd/8X&<­z®ub¶|`Õ�_Ì”lÏšuÏšuÌšxË›~Ç•}Æ“vɘxÓ|Á“wÆ‘tÆ“{Â�t¿Œv¸‰o·ƒoÚ¦tðÂzóʈðÑ òÓ›óÑšòÓ¤ïЙíÏ îÒ¤íѪìÕ®ìÓ«îÔ¬íѪm5=q78x<<ƒCB~?@‰HAœZMшkÛ {é®ꬆí¯yï³…ð±të¤qÜ€N”NH•UZ±vx¦^V¼‚…—_kZ,G_5KtIa_9TsNiQ2TkHhˆd‹‡c€tOn`=aŽn˜ƒn�‰w‘}Wi×®µ�u‘ؼ·åϼ¢eI¤fYµƒqU-=V+>V,?‰PH]*7b.:n=>{B=a+4_/>…FC‘NF¶`IÎwWØ�]Ú„aÜ|R߃XÞ‡câŒhá�iâ”k²]=­YAÎqFÖ|MÐyOÕuNÏqGËjEËnOß|K؉g“C8»jN¼lTÛ’u½|fT/JW-AX,?W-;b8Fh3>x<:�ROk2=zC@\&8›e`²�̓ZÙ‘\Í�oÍšuΚuÍœ}É•yÇ•{Æ”vÂ’}À’yÅ”vÀŽuÀ�rÂ’t‘y¶‡sµiÞªsñÆ…óΔóÓ¤òÔ¢ðÑ�ðÑ™ïÐ�ðÑŸïÒ¥îÓ§íÕ±îÔ®íÔ¯ðÙªj:Eo:@z<;|A@z?D‘YT«fWÐŽoàž}ë«uì¬xî±{ñ¶{ò´†é¡jÒ…aŸTQË—‹™NG«e`ĉ‚†Sd}Tq]7LkCW\9RnF`{T�`=[¡�±ƒcŒ|XuŒjŠ‚^}•u’aB^|RnÝ‘eÛ„jîàÕÙ¼Ÿ©j^´thÀŸsW/=_-7V3Bi58_,9i39i68p>Cx=@d.Bw8:‘VQ¬[CÇpRÒwTÖzPÖ€W܃`݇`á…fâ�nà’sÙ�bØ�[ÖsWÓnLØvWß|XÝ�e×zZÚ}nå�€å›‘Ý…vÔ‹uÜŠnÖŒj\0FV3I`7CV-Fa2=zFIk7?‚LL�RIe0@Ža]X+;…PP¿�ŠÔˆVÙŽ`Ì—|ÐœvΘtÉ—uÇ•xÉ—|Á”}ÓÀ‘•�¾‘~À’xÀ’|»�v´„n³ƒvä±yôÌ�ôÓ˜òÒ£ñјðÐ�ñÑšñÓ¢ïÒ¤îÒ¦ðÔ¯ïÖ§îÕ¬ñÕ©ðÔªh8Dp7<{@@€A>x:?ŠSP¤bRΊná�rꮌë±sì°rðµzï³pä¡}Ç}vÇ–ŽŽHD›QMÆ�…±gX”cla1MnASO&8P'D|Piw]€`Ec�…›V3T†l’Šk’€^z\7YƒbŒ¢ƒšç”cÌsYßÐÃ�[NÉŒyÙ¼¤P-C[9Kc5CW,=\-8s<=a.;i58t?CHGd0;‚D?‡RI‹GA¶gKÍtUÌuQÔ|SØ~TÚ„fÛ‹jã�kâ’sã�mÜ‚ZØ€\Þ‚Xày]ç…kê�†î¦‡ï±”قwÕ�xÜŒiš[JY.GX.?e4@Z):d5<c/9xE@|=:–QKl3;�YQ^*9€N]ËŸ�Ö’fÕ�ZÌ—vÌœyΛsÊœ{Ì–rÌœƒÊ–uÄ•zÆ—w¾“�½Ž}ÕxÂ�s¼�|´ƒn¸{[çµ€öÑ�óÕ¦òÔŸñÐ�òÕ§ïÕ®ïÕ©ïÕ°ðÖ«ïÔ«îÔ­îРïÒ¥ðÒ¡g6Bo8;s34s69q7:ŽUH¡ZL͉pæ¢tæ©xë²{ì²zï¶{í³Œç¤‰ÕŠp–OF�GF¨my´kf¸pa\2KuOai6D]6KY8U\0N^8T�|¢Œn“k?fz\‚gJd„i‰†r¡ŽmœÉŸ£Ñ�¢Ì…mÇŸ‰Î…fõÕ›W3J\:Nc;Jd8@[/=e8Dc2?b3>l9>h6A~LI_4F‘VS‰OH}EE±`D¾nNÇrPÐwPÐ`Ó�dØ�eÞ‡bÞ‹kä“pÜ‹i܆aÔ]×|TÞƒaæ„bçŽ|ê“�ë�uä…pÔ•‚Ü—yʆmW*@U/FV-A_0C\,=b-4f17…E=w=C‘RL€DC’^Yh8CuFTÎ�†Ö¡�Ø“fÊšvÌžyÊ›zÍ›xÈ–xË›|Èš}Ä•ƒÁ—yÀ‘yÀ“~»�~Á�s¾Œr°„r°{cí¿}öÖ£öÖ¢óÔ¡ñÑ›òÖ¨òÖ¨ðÕ¨ñÖ®ñÖ§ñОîÏ›îÍ”ðË‘ðΙc3?g5>p::o9=q69Ÿ]LšUKÏ„dܘsçª|í³‚î´ƒðµxò´|æžlÕ�T˜REEQѦ©¦`Y«nl_1N‘q|Y+?X2N‚g„[0NnOv±¶Ô}Vu›‘¸�z™a>[cCh–ˆª©xp•w‰®�¡¾’�Þ§k穈m9FY5L\4Gf6Ag4:X-Bj58c4@r=Cf9CvBEq?B_/>„QRˆRMw@C T>¶eIºeEÃnLÊvZÔ{WØ‚`׃cÛ‡hÞ�rÞŽqÛ…hÛ‚]×VÒ~WËuVËv[ÍrXÐ{\à …Ú�{Ó�or6:U+CQ%<\/Be6CyDEk7=o9>�WIˆEB•]Qt>=‘UGl6Bj;IÒ«˜Ú¡„Õ”iÊ›tÅ™tÍœ€Ë™vÈ—uÇ–vÎ�vƘÁ”|Řy¼�x»�w¹�{·‹y¬}l°wdìÃ…÷Ú©÷Ø£ôÕŸðÕ©ôÖ§ôÙ«òÙ´ðÒ£îΗîÍ”íÌ—ìÐœðРðÏš_2Bg1Ag1:e/9}?>°iP¨fZ΃iÛ“ié£nê²€í²zð³ð²xé¥yׂU—VO†?H¹–�£abƒT^g:U�rŒ]1DE"A|_~iA]O0\¶¸ß”v�bHb™…§€`„€[wŠµ¥qvŒoŠ�i‚––÷Äw¿{]S.DZ4HX->g7<b1:Z0?h;Eb2Ad8Gk8@l8Bw9<p=Ct<@�LGi6?ŽI=¦XAµfJ»iIÈsXÕ~^Õ^Ù�]Ü‹iÚŒrÛˆmÚŠlÚˆiÙˆfâ•ná–|àœ~ãž„äž„Ý”rÙ�p¿{_‡LHW0CO'@X2Cm<Dj<@c7<n8BŠNA�SOŽXRxA=‹NEn19Z.=Óª�Ú¢}Ë�mɘsËžzËšyŘ{È™{È•yÊ™‚ׄ¾”xÁ“|¼�{¹‹x·‹xµ…m§{j¨udîÆŒõÚ¬õÚ¤òÕ£óÙ²ò×­õÙªñÓŸðÑžïÑ¥ñÔ¢ðÓ ðÒ¥òÔ¨óÒŸ[/?c-:b2Ca2B‘RE©hW¯fUÑ‚]Ü”jë¨vì°ƒê°wð²î¯zæ¡{Öˆ`ŸXI†BG¤nt¥g_sAT‹ct‡byV,CQ+M„`{R.J_7\ª¦ËrUv�q’¡˜»’y›{Z€kLn±€—±�‹|Uc¶|xÍ k^8LY2L`5G^5G`0>i7A\5Gg6?e0:`.=^,;k9<n7<i6>i7@j;Bm6=†I>�:2£WC²bG¾jPÐ{[Ô\Ö†eØ‹pÙ‰gÚŽlà‘qâœ{Ý–säž~䥌é­�äžx䢄ޕ{Ó•sV&9„I@W0IY1E]6In<Df3=t?Ck7A˜`YŠOJ�MB}DE•XRq9>[,BÕ®‘Ü¥zÌ›|Ë ~ÇœyÉœƒÈ–yÁ–|È›�Å–€Æ˜y¿”{Å”�¼”ˆ½�x²Š€´‰q¥{k¤ugîÇ‘õÛ¬÷Ú£óÖ¤óÕ¥òÔ¥ôÔŸòÓ¥ñÖ§óÔ¦ðÒ£ñÏ—ñΑòСó͘\2@d7C[-?U0D’XP¬gT©eUІcÞ“jê¦zë²zé°vì°…ð³|è£rÖ€S�TH�IF¡dZ”[\`8IW0LzQ_e:LO1R€Wp\:TiCe ’´gAW_=Y”…³�””|¢v[Œ±’ŸË••hD_ŸkktCRg7JW/E\3G\1El;Ek9AZ/Bk9BW(7m=@^.=`/>n8;v:9h7>l8<u@>�D?u99u4.–K=±[=ÁnPÓ|WÖ~Y׉kÚ�wÛ“|â›zâ�{穉壇穈奋樊अړyÇŠuS';r>FS3HT/J\4Ip>A\,;m7;`/:™aT‹NN„I@‡OHŽSCŽYUZ+F×®•Ù�wÈ•|ˢ˛vÅšƒÅ–xÄ•|Ä“v“yĘ~Å•uÀ”z¹Žz´Ž|²‡x­…t¡{l¬rðÏœõܯ÷Ø óÔ¢òÓ óÖ§óÕ¢óÖ¢òÔ óÐ�ðÍ—òΘï̘óÍ™ïÆŽ],?d5A^1B\->yCD¤aL¿rSÒ†`ß–mç§uê¯{í°wí²}ï­~é lÖ…X™NE|BF˜\Yb:Ic8JQ1H�esb8O[0Ki@[S.GD!J¢�´‹i‹mGh…k–�i‡š‡ª‰q™’s�°Šš†Se–k`qERZ8L[0D[0CV/Dj;D{BDV-?€F@a2=`2@[,:]-7h6@c2:d2;m<?wECg7@�OAe0>d)1ƒ??§\HÅtTÉtUÐ}aÑ‚kÞŽlÜ’oÞ“táŸ~奊簗䥄妌àš}Õ“v¶mRW*>Y3M_<PX9Sa5FQPg7Bh7Ba0>Ÿh^‹MK…HC‹LA‘XJ’YV\,CÚ­˜Ú¢€Æ–ÕzƘ}Ä™€Á—ƒÄ™„Á—€¼”€Å˜x¿–w»�w´�{µŒ€´‰x©�užvj¾�}ôÕžõÝ®÷ÖžñÑ“òÔŸõצõئôÔŸòÑŸóÎ�óÊ‘îÇ�꾌â¨{¶qFZ+?].@W+<T*?k4AŸ_L§_LÐ�_Þšxè¦vè«{ꬃî²wð±wé£sÒ€W�I@|FT¶�¯ ‚�I)IŒ^lmARh=Pc9G^8LN+BO+M¦¤Ç›‹¨d@YgDh•y˜�dŒš’¶Žz¥®Ÿ¼¢…©®�©�dpN+DX.E[2FX2G{DE‹QHU);„SL\.=g5@_0;e5?b0@h3?t=?q?CoAGk;C}GG‚GBs>?v@>C=<3•QD¥`K«j`Æy`Ñ‹sÕ�uÜ”wâŸ|å¢~ݘ{Þ–uÖŽnÅ‚g£YDR-<\4EX3N];Q]4IsCGg8Dg5?i:E™`[’]X‡PM†NK–_S�VG]1GÚ°™Ò•k³}f²}gµƒj¼Œx¾‘~¼‘}¾“€Å”z¿“}¼�xµ�}µ‹y¯‰x«ƒv§�wŸqfد~õ×£÷Ú¨÷ÖœöÕ›õÓžöÔ—õЗóÏ“òÏ‘ïÄŒëµw͇Ku:8Y+9R+>f5@`3BV)<R*?i47”YI˜PDÉ|[Ü–mæ¦zé¬zéªmç«{ï¯|ç�iÉyQ�^fëÜÉs<U´ž©M+EsK`g?UnEVrIUc8KM*FU+Qœ’²š‚“rJ`oJloHa‚f‚‡sž{Y‰¢�²’}›}M^µ¨¼‡c~J*GQ'>W+@‘PMƒNLR)=}DAW-=]2Cb0>^0=[-=a.:m=Aj5:m9Dj5:s;;•NA›PB½mVÈzgÔ…h׆jÖ�uЉpÜ’uÙ�qßœ|Þ ßž€Û {ߥ‰âª‰ß°“Þ»Ÿ¼�œ{QZU9NW1IY4H\5FoAM^4Bc7EJI—\Q�RI�UO„LL™ZQ‡ICj:DÓ©“Á…c°z^©mWªsf±z]±�i±�t²ƒn²†vÅ’w½�wµŽ{´Šu¬‡r©�p¢zoŸtoçÂŒö×¢õÓ˜öÒ™îÏ—ôÒ�õÑ•ôÏ–ôʊ渇ΙtƒHCQ#7Q*=d2>u<<l>He5@_-BY.?a.<„H@ŠIAÇaÚ‘jæ¤xì®�éªtë®}ï¯wæ›iˉ}ྈzFO]0EwIRP-Hh?RsFRe:Ia8KrKX]7MX-K�e›�©¢�©^9TY8\œ‰° �¾„h”†kƒ’p‘’w”nIZµ—�‰k‘O3Ha6DEIq>D^3D‰QK\-@Z+?c4B_/:a1Ae4Ad6Bu@Gu@Dg4Ai6C—TI¬`OÌxYσeÎ~_Í~_Ò„cÈ„mчiØ�oÛ“vÙ”pÖ–yבrוy× ‡ß¯‡çÀ›êâëɤáÅ«”uˆW?U_;Lf<MV1G`<Pk=G�YT~GL‰UXˆQR›\R†SStEQÓ’k¼~`´r®p®rb®wc«o`¦n]¤p`£sa°~n¯m¬}p­†z®…yª„|žyožspðÉ’öÖ›õÍ�öΑóÑ™óÑšöÑšôɆ鿈ک~›_K\,B\/Bo=D’TG‹NK“cd€JMo=@a1@i37{B@v=:±hOØŽfæ¥è©véªz詃ï­�欜ݙg‰EE}K]©‹‘R'>I)?R+D}N^b9MV/HlHTQgnBXN(C—‡ª[}ˆo�Ÿ�¶¤�¶b?[|]‹‰k“‹sŒvOx¬—¼­…Ž’ytZ=Q^0Ax@Fh;HV2GŒTNX.=Y+<X,:h7?`0?`/:]*7m>Dm8Bc3=h5>ŽUT·hMÊz_Ë|_Ì~aÏ{`΄lЊqÚ‰fÜŠaÙ�r׊j׉i×�rÚ—yà£{ã³�å¿�çÄ�èÆŸêÈ¡ï̪êΪ•w†M-=M)>Q'9k:C�IE~GIƒLI�TQ‹QI~ED†MPÖ•gµ~gÉ�q½…j½�aµ€q³xc«tf£iZ fW™g[žj_¡sn™i_�ob›iX—lcžj^ïÄŠöÑ�óȉõЖôÒ—ñИöÑ—ëÁ•Ù«|�QFZ.<g1;q;?�PI‘WN•YL§„…¥}t“\TzGG„MKv8<g.6�VE׈_ä¢z諃ì¯}é©|ñ³‚ê¢rÓ…]ŽPS¤hZv:?M';M'>Y0>_3H“v”G!;j9P�i�yK[L%>S)K£“³�wšƒ\™Ž¬qTm‚f‹�k—”�«‹m“Žjˆ ~Ÿc4Ež’Œg7C‚CBa3CS&<‹OD\+9`/>U';f6?_3GX-Bg9Ci=GKJk6Aa0<…FC°gO½qSË{bÌz[Ð}^Ï}aÓƒcÙ‰pØŠmÚ‰mØŒnØŽlØ“yÞ™zܧŒå¹�è¾›çÁœè˜êÇ¥ï̦ïÌ©òÏ°æÏ®iJQF 9a4:ŽVP€FGxGF„JG€EDLT‘_`Ö’h¼†w¼Žx¿�s¿‹o¶„r¼„n±~o«ub«p] gZŸcV•aY�YT—`UªqW”^QˆOO쿆öÏ’öË�ôÓœóÍ“òÌ�ìËá©v�SE`/<†OJ†JJ�HF•XN�SJ“VI§‚�¨Œ‹§ƒ‚žso‘_RƒEBc*5–UFÓˆeä£yç¦xê©tê­zî®~ê iÎ}a¹~t¨toR.IV/DL$:I#BŸ}œ�l‰L,KŽo“uFZ€Xo]5Oa;TyMghDd™†ž]8UsPvz_z�u—�uœ—¤¢†£’c\vJ^tMbŽdqw?C]3?Q+B…OJ^3Dh8DZ2Dj<JmJP]6I`3?`4@v>EyDFc7@ŠPK¨fVÄtWÆvZÐ`Ï�aÊ‚eÚŠhØ�lÜ“uÙ�nÙˆlÙ’tÛ•xÝŸ€á«„崌鿙徚èÁ—éžíÉ ðͪò̦òÒ®óÖµ‘y�a6=e9G{GLyGHŒQG{CCk4:®zmЕuÍ’sÈ”y¿“wÀ‹mÂ�w¸Œ}¼‹{·„r¯{k¨xm¡na qd‘ZU®t`Æ‚Y™bR�VPïĆ÷Ò˜öÐ’øÖœöÒ›òÍ–Ø›js<?])5�PHŽSF‹NE“XO�[K“RG•WL¢�~¨’”®”˜©„~žom‡FA[(:—UIÓ‡hç§~ì¯vé©vë­{ï¯oè¤vÒŒwåÀ›‚DDj@UW-EP%5L'@j?PM'>zUgm?RlE[c<[‡i‘�koM&F–Š­`9UkEbb@\yX}‡kˆš‚ ’|�¡“¨K#C»§ŸP*Iµ˜‚d2GR.FN)BŠOJf3Bd9KR1Fb2@g=Ib1>]4Ii4At?F©cI`0>‹WR±o\ÅqWÑ„^Ì~]É{dÖ‹o܆aÙŽiØŒn؆dÙ‰gÚ‘lÜœ{à¢䧃⭉åµ�溘弗澘ëÅŸðÉ¢ðÍ£óÏ«õÓ±ô×·ž‰�_6MtAIsBC~JFw>@\(=ÈŽ{ΔuÏšyÄ—}Á‘z¿�s¾Žwº�x´‡xµ…p³…u¯|p§xp¤yqŸnf¸yVÈ„X¨j[ʈ\ôË“õÕž÷Ô ÷Ö óˉ뿃¥gOW*>ŽPG—YL–XK”RL¨gW�_N˜\Sœ\I›ut¬Œ�«——«•�¬‡{”ZNa,9—PBÒ‰hç¦pì¬xì®wë«oåŸsã”tµuiÑÅËE <Z/@f;Cg8LP[O/CtGSV2HjAT]5JS+Ab=RR/RƒjvO)EpQjiGe|`€‚d†‘v“›…œ�ˆ«›…œrDOÀ­±c9Ml?LU+BX4N{KRf9M\5IW3I\8LsDFhAW`6DvIO‚NU®iXe7Hs>E¸wgÈ{_Êz^Áx`׈kÜ�i׈lÛŽmÚŠfÝ�gÚ�lÝ•wàœxÝŸ}⩇ã¢~å­‚ä±�渌뻑뿑ìÆ�ï̦ñΤñÓ·óÖºôؽ‹fi}C>r;;~FA‚HHP(CÙª‡Ë‘pÅ“vÈ–t¼‘r¾�tÀ�nÁ�z»Šw½‰u¾Šu±‚o´‚n¨o¨yiµzYȆY»uNÞ¨uôÓŸöÕš÷Ô—øÕœíňןi�B?zDGŸ^Nž_S›ZL­jU´€z¡`M“QL¢`UsEQœ~„¬“—¸¡›º–…¡tna.9•SC׌`è¥zðµ‡ë±€í°~ï±wë jÝŒZ¤y~g6>P(@P&;b6AV,8W0Bk8FS.BQ*G‰c{sJbK(A\6@O&BY;X|VfQ.HnFalJp�x—’u–˜}—¢”·¦š±¤‚†j<;a8[ͺÁM&8M$7w@Eh8Ab0@S)@^2E~MO_0<T'6„IE˜\OÈ}_…A?c/5¥^M¶eMÎ�eÖ…aÙ‡fØŠmÖ†dÚŠjÜ‹eÙ�pÜ�mß”oàšpážuà¡~ã§�屋â®�嶉纒ì“ì˜îÆœòÌŸôѧòÓ³õÙ½ôÜ»o@IY(6yA@n?AR%AÙ®ŽÄŒmÃ�nÆ�jÄ“qÀ�tÄ�q¿�x»�~¾Žy¸‰u·‡x­n®€q¯}oÁ„`ÎŽ[Ä|Uì¿z÷ןõÔ�öÕœõҙ꿂½{TzGKš^Q™SK¢aQ¢cV³t^¬jSŸ[N `P¢f[S*<Šbm®˜“¼¦ ½Ÿ�§�wa-8ŽKEÖŽgé§|í°|î±~ë¯zí³zèŸ^߉`²ƒ‚�~‡E6O&:[/A‰e{Q)>Q1G^1C[/J“p…^:LX&3J!=‰aP-GoEe„a€nMd{XhDeˆo�Žl‹‹p”­—¨™{‘D#@ ˆ©ÝÙÓH%<P'>q;@~DFa-<U+;Y3G‚RSa:J[+;u:=±`IÌxX—TDV'8 faÊvTׂcÕƒ`Ù�c݉lÛ‹eÙŒeÞ�hØŒkÙ�qà™uà›uߟ}â¡~ä¤{å­�ᬇ岎æ·�è¾™êÀ–íÅšñÊ¡ñвñѳõÖ³õáÈÜË´P%7€lsi6<U%?ÌœzÀŽvÄ”uÄ‘vÀ’y¿’y¾Žm¿Œrºˆs½ŽzºŒz¸ˆv²…r®}j­x_¿ƒbÏŽWÑ�YòljøÙ¡÷ÖšøÓ•öÑ’â­rŽLD˜WLž^Wž`R¢bTµqY¯hW˜XM�^T¬hU¦i_H 5j=K©”–¼©¥¾£•©‡}T':€?;ØŒdè¦zì²yì®|ì¶~ò°zí¥sÝŒZЦ„g:KT0FM':[2F`:NY3HT-?T,Ba9Q‘v“`:Ng7IK"6L">�h‡{W{sMpa�Šl�ˆn‹uVx€a~¢”¹¬›¬c3K]3OŸszàÖÍN+EP&9}CA„OEc4AU.@Y3GvACb.:_2?l6>ª`N¾pI¡ZG`,;¦bSÉqOÙ�\Ø€bÛ‡_Ü…_܇eÝ‘mÜ‹eÝ�kÝ’kà‘iÞ˜tà›uÝœyà¢}ä§㬄届沉溗ê½�ìÄšïʨñдñÒ´óÖ¾õÜÄ÷ß»k:;e/9^,7a+7ÕšrËjÉ–xÊ‘lÇ”w¿�lÀ�{¼Šr¹�‚³‰v¶‰t°„u®�q«zh±yfË�lä¬sî¾{õÏ—õÙ¥øÖšøÓ˜òÈ~ÍŠOšXQ¤`M›VO¬fT²oV²mZž^NšYN©gY£kdŸi_R):a3F¢Š‹Â«¤½¤—¦ƒ{O&;†G<ÙŒ`é¨xñ³�ë±sî±}ñµví¦jß‹a©~{M)Ce7MX-Cc:Jb;HV.C]7LS-J€ZnˆbxH"=qJT]/DQ%;[7Ra<Va8ImMfwUquXwwX}€a„¦—°–s…“v’U-D…Z`¸¿I"9U.FŽUM–_Xe4@[5I`0Al;JX*;b-9ˆLE¼jL¹nX¬_C]*7¢bWÒ|ZÙƒZ×`݇\߉[Ü‹aÞŠaÝ�jÙ�mÝ’sÛ�lÞ•oàœqß™pà�y⧃᪅䯒嶎å·�æ¼—éžð̪óЬðÓ·ïÒµôÛÄ÷ÜÂÞË´U#2W$2c37Ùž€ÃŽqÅ”wÇ—vÄ’pÁŽp“v¾Žqµ‹x²„p·„o³‚l­}g°zcÀ‚bê¹~õÈ�øË“û×�÷ØŸ÷ך÷Ò‘å´q©cJ¡`L£]M©bO¬k]½uWªdN˜[PŸ]R«o_›_WžldK 6\,@¥‡…º§¦À«�¥†{Q -�?9Ö‰^ê¦oëµ|í²wé´ƒñ¶wë¦jߌf«�L+>P%:iCO_6GY*<T(8M%8P-RŸ€–‚YtJ-Bc@OlEX]4K[1FT4MR+Ge=RzYu‰k�fEbuPiš€Ÿ¤–®ŒrŠ�\Œ¥Š¡h<OY/@M%9‰LG|A=h9An;C_3Db5G]5GvAA™SEÄpRÍ}_²dFd09­iVÙ~XØ‚bÝ…]ÞˆdÝŠeÛ…]ÙŠqÞŠ`Þ‹gÚ�pÜ‘hÝ“lß”kÞ�yà¡~å¥|Þ§ˆã­†ã±Œç¹’ç¾—êÁ›í̳ñвðÒ¶ñÕ»óÝÇ÷ÛÂôÞµL2S#3ŽH>Ô�iÆ”yÈ“x¿�r¼‹sÆ‘sÁ�p¾�sºˆm»‰m²€n©|s©ye°zcÜ©vùÔ›øÕ õΑøÕœøÙ¡öÔ™òÈ�Ù�X¤]I¡\K _P°fO»sX¸u\œZNšZL«k[£dW›`X”_^G3U%:›z�»§¢È­¡­Š}[)3z88Ù‡Wë§wí²|ì°|í±xîµ}í¦pÛ‰Y­rV.Ie>LN$9T*9[,?]3JR-H”yœl>Ie7IK'@S*@vJ\b<HL$;e=MT)?j?YZ4X˜”f?c|a‰œ†¢±¡¹›x¡Œ[o­›¡vQGO(@e4>f5@c05f2@o;Dj?Id09_-=v=BÁrQÏ^È|^®[DyCA«iX×zP׃g܈gÞˆiߊcÚ‰dÛ‡`ÝŒfß…^ÝŒhÝ�nÚ�~à–rßœxà�wß¡᧊㯎ä³�帎å½�æÃ¥íɬðϱïÏ´ïÓ»ïÖÁöÚ¾öß¼­scF0¬kYÏ‹dÏŸzÈ•uÁ�rÃ�n½ŽqÁ�qÀ�p¶‰t²ƒn³„m­€r¬zhµw[꾆÷Ù¡ùÔ—÷Ñ•öÖ øؤùÒ�è´}ÂuK¬_H XE¥_L²lW¹oP§cQŸ^PŸ`P¦g[škh•aZˆVVJ!4U(>™|…·¤¤Âª¡­�…h4:|>BÚˆZê§rì®{é²yæ­pë±vâŸrØ‘lžs„g?PU-BQ-CU,9[)9V,JwReO1S�o†xSeZ/BW.?d:HP(<P*Ab9JS'D†cwS-Gb=[“zš”|£¥Ž ‰_~–}“¥”³¬—°~[ƒ”sgrA=[/;\0AuCFg4@n=Cb1<v<@�MBËyQÉ|[Í{WŠGA‡QP´iNÙ‰fׄcÛ…dÞˆ`àŒbÙ�rÞ‰^Û‰lÛ‰gÛ‹dÛ�jÝ“mÝ‘nÞž~Þ›{à¡�ᦃ㩌Ⰻ㴋濙åÀ¢ëÅ©îͲîεïѺïÔ¼ò×¾õÛÁâÍ·C4ǃfËŠeÄ•v½�yÑu½�r½�v½ŠgÀ�n·Šuµ…q³„r¨}n­z`¼†zïÅŠøØ£ôÍ‹÷Ó�úÚ¨øØ›õÌŠÛ˜_»tU¹gG­`JªbJ¸kK³nU¢_Oœ^P¤hX¢fX’]S‘XNƒQUG1P%<”pwº§¦Æ­§²’ƒc/7|;>ÕƒWí©xç¯~å¯~è±}çŸkÛŒb¶�~xNXW)=\8IV*=_7FV1DQ/AZ4G„\muFYS,>mKY[6GV-A_8OU1?V-HŽq”d>WL*I�k�™œ˜„Ÿ•n‘U(;V+0L':\39j;=¥€Œ®–® �’`.9f8Dm<Cg6D‚FC¦\IÑ[Ï|[ÓVŠOP˜ZMÁpPÖƒc׆fÝ„XÞˆ_áŒfÞŠaÛ‹e܆\Þ‰\܇aÞ�iÞŒdÜ•pÞ™xá›|àžzá¡~㩉߬‚ä´�亘彚èÅ¥íÊ®îË­ðѵïÓºîÕÂóØÁð×­E6Á‚\ÁŠlÅ“oÅ’r½Žu¼�y¹ˆr¸Šq¾�s½Œn¯‚o°ƒp«~n°}bÈ€\ôÊŽøØ™öˆ÷Ñ”ùÜ­úÔ‘ìºwÌ}SÆ{V±jN«`M°hT´oSª_Fœ[L�\R£i]˜\R›cX‰WV�^ZG4O(=‰en¸¡žÅ¯¥±˜�vEBs;>ÕƒZë¨mí±xî°uì²tì²zé¤pÖ…`¥mrk8Ef<PV/C[.FZ2GU-Dd=PQ,FjBP`8L^<PT.EgBTT,@R(>pH^W,KnFVB!;g@]‚`…Œz Œv’‹p•ž…”U/GO&9m6<V->m@LvLPq?E¦}bi7?c2<i9B–SJ½kJÍzVÏbÏ€Zr4=£e]Ï�bÚƒYÛ„YÝ…\ÞŽoÝŠeàŽiÚ…^Ý„^ÞŒkÜŒcÛˆ`ß�fß’rÝ•tÞ�|Þ›|Ý£‚ᩎெᭈ乕㿙çŪìÉ«îжëϺðÒ·ñÕ¿òÖ»õÚ·Z(9ÃxRÁ‹qÄ•sÄ”w¿“yÃ�nºŠp¼�u¶‰n½�y³‰t¶…l¬�o´…mljjî½�úÒŽõˆøБüÚ�õÏ�á fÇyW¼pRµjJ [L«bM­gN’UL—ZL©i[¡ga”_Y”ZS�[Z’abM!7N">€Y\¯˜™½©Ÿ±™�wGI}>?Òƒ^è nì±~è®�ê³ƒíµ‰ç¢fÚ’kÇ|vGRd=NW.BO)EY4P�eq]5ET,CkCWc9M\0?X/AL(?{WxX->a=VzUq[6Sb†V;L|f“†r£“„¥kDh�r’“m‰W-=L#8tBFc6>s>Ei4<b19^2B^+6~@=ŸXK¹lSÍxSÍ�gÁvTb3D§fVÔ„a؆^Ý�hÜ�iÝ�eâ�dà‹cÛŠdÚ�x܈_àˆYß�bá�hÛ“lÚ’lâ–gàšmÝŸ~à§xÞ£~ᬈⳌ仗çÁŸêÉ­ëË«îеðѸðÕ¶îÓ¿ò×¼Ò­£ÌƒXÄ�q¾•¼’u½‘w¾‘wÄ”sÀ�t½Œr¼�q²…s¯†v´…k»…g̈^Ò�Zæ³pë»yöÕ£ùØ›ôÊ…Ú“\¾rUºoP²cH¡\L¨fTœZMŒNG§eS¤dWš^W•[P“ZT“a^“`XO(9F5rHY­™–À¬œ³š‹ˆ]\|?@Ó‚V驅ê¯~節ð°té¤oÒ‡hÉ‹zŒ\eZ2FU1KwP\c6HR.EW3DW1Ke7Kc9Oc>QkCVc:Qc?Te8LW3Hc8OY2Gy]xgCi^>Uz`x™‘±h<[hHoœ}˜¥–¶H$8j:@S(<e6C[-6e9D]1@c.;ˆGCµjQÊwUÏ‚^Êz[¤VB†NK·qYׂbÚ‰dà‹_Þ�lá�iß�hÜŒkߌ\Û†_ÙŠbÞ‹aÜ�nÜŽrÞ‘mÞ–mÝ—và›sÝ›xÞ á£}á°ƒáµ�䵌æÁ¥éǧêɳíйðÓ»òÓ¸ïÕÀñÕ¿ñÔ®Ô‘`²�k¤raªwb¶‚m½ˆj¾�sÁ”}¼’z»‘v´Šs¶ŒvÁˆhÉŽkÑ”oɉa˃Rç³tûÛ¤ûÙ˜ñÁvÓ…Y¼rS±^E£\M¦`Q¥_JŒKC›WJ¦fT›_UŽXR�VI“^Z‘ca�KIN&9K#4zMX©“•¹§¨²š‘…YXA<ЀQç¡oì¯í¯zë±uð²{ë¦sØ�cÈ’‚Ž_j]1BN(=Z0>Y2DR+<\6IoJ_rGXZ<Vƒ_gV3GW+<\/AR*HtQg`6GT-L’{£…h“d<WF#@hDWb;T„f‡rIa“{‘d1>k;DR'5`09Z'5Z,:_05k7?–SGÂnKÌvSÌ}]ËxXi7IšWKÓ‚[ÚˆeÙ‡dÝ�uß‹gà�gÝ�qß�dá�hà�iÝŠ_Û‰`ÝŠ`Þ�bß�eß•oß•qàœuÞ›qà¡~ᩃ᫆⮅縒佛èÀ ëÉ®éÉ­ñÔÀòÕ¼ðÕ¿ïÓ¼ôڹͅU–[G’VH�WG�cM¦p[­w`±†x¸ˆp·†n¸�u¸‹pÇŽnÓœfÑ’^ˇV͈XîÑúÛ£ûÕ’ç¯aÅxN¶fJ•SG›UGªfO�MB•TI¤lfŸ`W—bZ�YXœkh’^YˆVUu>?N(:N#5^1C±›™Æ±«¾¦˜—oju<=Ï}Oã�mé­wê®yæ¯{ñ³wì§mà�a¢kk‚R]Q)@V*;[-=U+<W/Je>MV/Eg?SZ6Ke8F`6DX,AO$5Q(>X.?iR‚‰u ~[œˆ™\:T€bˆnF]c;Sƒj„€Xrl>G^0<U&9d6?\1>X)8V(8g26ŠKGµeFÈxVÆsRÉvN¨]Ae9MªeVÕWÚˆh؆_Þ�qÝ‘nã’bÞŠjà�dá‹ZáŒhÛˆ^Ú…[Þˆ^ÚŒgÞŠ]Ý“làšvÞšvÝšsßžpâ£xà©„á«~ß±Žå»˜åÀ�çÆ©ëÏ·îжðÓ¸ðÓ¸ñØÁ÷Û¾Ê�w�SI�aX�F@†GBŠQ@”]M“]Q–cT�nb¢sf¸‡qÊ–}Ô¢rÉ’iŇ_Õ˜hõÑ’ýÞ¦öÉÛ�W¶jP›S@ŠMCŸZP˜SIŒME�aXž`Tš_[“_W•`\˜jf�a]~JGm59N%9E0^4I®•�ȯ¡¿¨˜£|mz=;ÊuRã�nç¬~ê±yë®{ñ´�í¨tÞ“`¢ps‹YcM%?f;LQ0JP(AU/Ci>KU4Kc9HW3Gj@Mg:Qg<IP%:X1@\4JW2@L'C]�š‚ž¯¥¾hC]‡g†¤„˜d4=\/=g4@iAHU*6W/:T&2T(8\+7q:=—P@ÄqOÇx\É€`ÅwNU$6’REÌ~\܈d؆d݇cÜŽkÞ�bâ�hÞ�iß‘pãŒ`áˆ^ÝŒ_܆YÚŠeÝ�nÛŽgÞ�iß“pà—mÝ™rÜ›pÝ¡zᤃߨƒá¯�乕俢êħëË®ìηðвîÔ¾ñÔ¸ô׿æ͹‰MH˜\L™]L“XL‡PL…JH|B?s=@p?EsAA‰XN´ySËŒcÜ®sÙš_߬rùÕ™üÙ˜ì°\ÁrI“NB|=>”NA’MF‹KCžbZ¥nc‘UP�[T‘ZRžf`�`^‰WWk;@k7@_/:n<Ek7A¬“‘dz©Ç¯ ¦ˆyw<<ÈvTàŸwæ­zè±vè¯xï·tí­qЉc¦{xm=ML&>S);V.@]2E]4G_8MW2Jd;T[4Hi=Qf=I^/CjBSR+?X1@`<R]1JO,J†j�§¦Ë‹q~~YjY{tM_P&;e7=[+:g=PT+>S'4X)7h.8ˆF?¶hKËxNÆvUÌ{U{6/g3>°mYÓƒZÝ‹_߆`ÚˆhÞ�aÞ‹_á‰aߎiâ�nÞ�kàŽ_ß‹cÛ…Y݆[ÜŠ[Û…YÛ�eÜ’nÛ•oà™mÞ™nàŸwà¢zঃⴑ㳉世åĪéǬí̳ìϾîÔ¿ïÔÂõÙ¾ôد�NC™`K¥hZ¡fU–^S‰QEƒIFp;Ae38Z+5U+6xBI߯€ïÆ‚à©]î½}úÓ�úωܖS—RAs9;‹JF’WLƒIG–YS¡lh™^N“[Y�\S”YS li�]ZxJIs>>g2<”\V‡PKŠ\`¦ˆ~Ƴ¨Í·§ª‹xBAÈsHãŸyë®}ê°}é²{ð¼„ë®qÀoX·‡‚zKYR%7W0GgAPX0FR(<\2@X7Oc<NkET^:G_7MiBUR/GL&:V+>`5GsL]S)>I(I„k‚ž“º�sšŠbƒ¡}ˆV0EW0?V+5R&6R%8U0?Z*?�PE™YHÅrNÇtUÉwP�C6W'9žXMÓ€YØ„WÙ†[ÝŠeÜ‹f݆]áŠ]á�iã�fß“oâ‹\á�fÛŠ_Ý�jÚ�h݈\ÞŠcÝŠ^ÚŽfß’eà”kܘqÝ›yáŸ|ߥyß©ƒå´�㺕çÀ¡çÆ­éɳêÍ»îÒ¾ñÔ»òÕ½öÙ¸ŸeX™^M¤k[¦o\ŸgZ”_U“]VGEtEM_/9O'=�DDòÆ‹÷Í�Ý™[óÇyüÔ�é¶q”P?m57{@>‰LC†HH‹QP¥i_šcWˆPO‰TJŒTJ˜f`¢ttˆYWzIJr@Dk6>�[V�ZR–ljª�…­¡Æ·¥¯•‰€FAÂsSàœpê¬tî±tê°ñ¸wé­l¨cN¶{jƒQ_Z1EU,C[3BV-=X+=Y5IW1DV0DR*=pGYX0Be=RU-CW0He9JN$8j?MZ6MhCVn@U^:S�h}�w˜T/E`1>T)<S(<U)4K!5`1>r<?’SK¸gHÉ|\ÊsK‡>0P!3˜WEÎ~WÔ~Vׄ^Ù†c߉aÓ†eߎaÞ‹\á‹cÝ�dÝ�qÝ‹_Þ’oàŠ\ÞŠcß‹hÝ‹^Ý�hØŒiÚ‰^à�dà•aÛ”iá�tÞŸ|ߣ‡Þ§{㱒㶗㽠æçéȳë͹ëѽòÔÀñѸöÙ¿Ôµ§’WM j`©m[ŸdUšaR˜\QŽUJyF@k:?`,9ˆILèµ|öÉ{ðÀuõÆ„é®g—YCg3;j5=�LFz?CŠNJœbVš^R‹RO„OO‚LF’ZW qr•fa†UW�SRo:BrBK…QMŸqnŸro©Š„Å® È¯ž±–††PFÀqRá›oç²xè¬që´‚î¸vî­v®cS®rm_3Eb9JT3GZ1C^6HV,@a8HQ)@X4LcF]iBQT,CrK[g=R\6GV/GŠf}^8TnB^a:UoOf’x’l?S[4@p?HV+=R);X-;O)7S%,a1:�MA¶hK·iJ°eIO!,a-7¯cEÃtOÑxQØ„WØ„WÛ‰]܈WÛ�kÞ‹aÜŠeÞŒhÞ�cß‹aÞ�iá�fÝ‘jߌeà‹cߌ\Þ�bÞ‰^Ú‹gÝ�iÛ‘iÜ’eÜ™tÞŸwߤ}à¥|ᧀ௑⸖你æÅ­ìÍ°ëϸîÒ½ïÔ»óÙÃïÕ®‹MB™f^¡hYŸeU�g\—bU˜bWˆUU†NJ‰VOœ\Káµ}úÕ—ôÅ}×’Z›]Lw@?m5;ƒLG�E@ˆI@™aV£lcŒZX}KP†NLŒ[W kg¡mj�^^‹XXtDGwGIg6<uBF”f]‘fiœ~€»¥›Ç³¡±˜‹�YN¿qJášjê­z것ê´�ð·|íªq¿vZ—gcR+AU.;]=Sb6Eh;ER+>_3HoFXY/Dc;P`=QU0GyVrvP`O(<V,G|VpO*>~`hW3JjIhsNx£–º\6GfE\O*FX/6Q)9Z.:\*4}B;–Q=i29O&4j6>ŸT@²cGÇuSÍxWÔ~U؃ZÔ�Z؆_ÜŒ^Û…[ß’kÞŽoߊaá�eãŽfß‘dà’já“jÝ’iß�bÜŒgÞŠXÛ�eÝŒaÝ‹\ÝŒ]Ü“kà˜lÞ™rÞ¡|ृã©z⯋ඕ忢åìçÇ­êϸìѽðÒ¿ñÖÁðÕ°ŒRI’ZP›eYžl\—g\šg^–dYŽ^Y–a]™\S bZà«wñƈؖT�RH‚LFz>C~F>…GB„LKžb^¤ph“_W€NMu>A‡LM˜`XŸoe›id’a`yDGp><sCDl>Fb2:~W[†]dšz~¹¨¢Æ¯¢µ™„œi_ÀpJÞ›jæ¬vì²|îµ€ó·}îªlÎ�oNVN'@S+@T1?a9Mo?Q\6J`6F[1Ha3IW/HuZsR/G€]€‘u’sJ^I)@ƒaqM#2pLs•x�_:X–€£‚bu�o~T2GQ*>V-?\1>Z)7X(6U'5l7>�NC¤YDµeMÃqSÐwQÎyRÑ€UÒ~TÕ|QÔ‚\׆bÚŠgÛˆ[݈_Ý…YÝ‹dàŠbß�`ÝŒgß’nâ•kÞ�gÝŽdÞ�aÞŒb܉[á�`Þ‘iÜ�dÞ’ià™oàžàŸuà£�â©„â±�亘亥俣çÅ«é̳ìлïÕÀñÖÀñؼ»†y‡RJ’b[–eUžgZ¢qc—cbœf\­t`¬lX³nVÂ{W¹xT”UK�PG’UI–[P�PF„FE—aZœga“^TJF{IMwBH™c^œpn¤rq“cc‰Z`vGLq=Aq>A_0;d:Di<E~PU�mv¸¥ É´¥¹¢‘¡rc¶oTÝ™né®~í´{ïµ|ó¸}è«xʆbwIRY1GL&7U0BV/=oDWkK\b5L„c�U.@]2H‰k„P-Gh>Xb=W‘v”M(F�m�‹ew@8tI]U.?gGb™y‹sRhiCSL$6Z7ER&5a,/t95–N<¦XA¹mOÂnLÈv[Ï|ZÑzTÑ|WÒUÕ‚VÖRÕ‚XÚƒV܈a݈]܈cÛˆ\àŒ_á�`Þ‹aÜŽkÝ‘mà�gÝ�bÞ‘là�eà�cÛ�dà�eá’iÜ�jÛ“dÞ•pà›vÜ›yà¡~ृ஑ఇⶕ⽡çĦåÈ­éεïÓ»îÕ¿ð×¾ßƯ‚HCŒ]T’bXšfZ¡r_�lZ¤te­v^¯nS¹pX¬kX¨eQš^V¡eT¦dO–VJ‰JG�SRœlo�]X�KL‡RN~JK‰RI§zv§{yŸnh’e`}EHq=Ag6>i8Aa3>`4:`1:g@H‡_hκ°âË°ÝƯ«�r¶rYÞšsí°}î³xïµ}÷¹}ç¥wƒQZh?K]3IV*?O(6_4FjAOb8Pg?Ua@NO)@S+L�nƒQ/DmF^sC_�Œ­[>QhGd—‚¤V0Fg<N¢’¤D"?oQl‰h“]7FP%;W/Ad08r1/’L;¸gK½sSÌtLÄqGÆvSÏ}PÒ}T׃YÔ|OØP؃^Ô�]Ù„XÛ„TÛ‡]݇XÝ�eàˆ\á�eß‹\á�eáŽcá‹gá’jÞ“oß’nÝ‘já“dÞ“hà”gÛ’hß–fÞ•pà—jÝœsÞ¢€ä©~䭌ౕà³�㺚äÀ§æȯéʳëθéÏÁåͶìÓ¯{@BˆYQ˜h^›kY�jb pb¯w`´s[¸rS»tT·qX­iS®gNÁxW®jQ™XPš[R–_WˆV]{CD}JE„F?‚JEœg`©zu¢vt™mv†WUqBFf8@j>Cf39}A<a6?a4=d6E�jpÜÄ®ã˷ݦ˩ˆ»vWÞ–gì­tí±xì°zð¸‚æ¤nÁ…zh;QS+9N&?R,=X1Cd5Hg9NqFTX.LuGbP.HwMaU2P�ZuZ/GsOa�p’V3S†emV-9P*DoFYWwyNj˜|¦–•K%5S%3s30–NA§W>¹jDÂkHÉrHÊyWÉuMÏ{MÒ�ZÓ}SÓ|Q؃SÙ€S؃XÚ‚X܆\Þˆ[Þ†[Û…^ä�WÝŠ^߉[Þ�oá�ná‘jà“jÝ�ià’ià’hà•já–kâ“mß�`ß—lä›uáštã�vÞŸqà¦yߦ~ⱈà³�以㾡äÅ®èÉ´ëϸëмìÒ»ïÔ³†LG†UQŒYK—f^™g\¥sg±t\¿~_Â~b¸uYºqS½oQË~WÇwP¯iS�`^œg]Š[[�SV…MPƒNI…MF—bY±zk¬ys�h`†W[r??c1<d26e39�GIœZH\1:`18Z,<xQ`ÙÁ±ÞȲÙÁ«È§ŽºxZÜšpëªxì³}붆ñ·�é®}…W[a8KR%<X.@M(BZ1AnDQg?PtL]_8Ig<U†i|\.@P&;vHVU+FtJ`�]aa:L’|œZ2GI&@ƒ[kg?IO(?uScsKc‹cXl8BšQ@¦X@«dI¿iGÊtGÈuUÎ}XÑ|TÔ�WÎ~_Ó€VÓ�YׂU×�^Ø�RÛƒZÜ„Vá†YÞŽiÜ…W݈]àŠ`ÞŒeÞŽgà‘jß�iÞ‘kâ�gá’fà�fà’fá“là˜oá“`Þ–lß–uãŸwàžqâ yߧ†à£yà©‹à­Šâ·�ä½�äÂ¥çȯêÊ®íνêнïÔº»ŠƒŠ]^’]IŒWM—eV£n\¯ua΄]É|WÅzSÃxWÔˆZÓ‰`ÄsM£`O•YLˆQO{JQ‰\WŒYU‡QP�[Uªsj²‚z«yŽ_arFEa19^0=_-6tFF—\P¬dL
\ No newline at end of file
diff --git a/pythonPackages/pil/MANIFEST b/pythonPackages/pil/MANIFEST
deleted file mode 100644
index 7ab93aecdf..0000000000
--- a/pythonPackages/pil/MANIFEST
+++ /dev/null
@@ -1,275 +0,0 @@
-README
-CHANGES
-CONTENTS
-MANIFEST
-BUILDME
-setup.py
-selftest.py
-doctest.py
-libImaging/Imaging.h
-libImaging/ImDib.h
-libImaging/ImPlatform.h
-libImaging/Quant.h
-libImaging/QuantHash.h
-libImaging/QuantHeap.h
-libImaging/QuantDefines.h
-libImaging/QuantTypes.h
-libImaging/Access.c
-libImaging/Antialias.c
-libImaging/Bands.c
-libImaging/Blend.c
-libImaging/Chops.c
-libImaging/Convert.c
-libImaging/ConvertYCbCr.c
-libImaging/Copy.c
-libImaging/Crc32.c
-libImaging/Crop.c
-libImaging/Dib.c
-libImaging/Draw.c
-libImaging/Effects.c
-libImaging/Except.c
-libImaging/File.c
-libImaging/Fill.c
-libImaging/Filter.c
-libImaging/Geometry.c
-libImaging/GetBBox.c
-libImaging/Histo.c
-libImaging/Matrix.c
-libImaging/ModeFilter.c
-libImaging/Negative.c
-libImaging/Offset.c
-libImaging/Pack.c
-libImaging/Palette.c
-libImaging/Paste.c
-libImaging/Point.c
-libImaging/Quant.c
-libImaging/QuantHash.c
-libImaging/QuantHeap.c
-libImaging/RankFilter.c
-libImaging/Storage.c
-libImaging/Unpack.c
-libImaging/UnpackYCC.c
-libImaging/Bit.h
-libImaging/Gif.h
-libImaging/Jpeg.h
-libImaging/Lzw.h
-libImaging/Raw.h
-libImaging/Zip.h
-libImaging/BitDecode.c
-libImaging/EpsEncode.c
-libImaging/FliDecode.c
-libImaging/GifDecode.c
-libImaging/GifEncode.c
-libImaging/HexDecode.c
-libImaging/JpegDecode.c
-libImaging/JpegEncode.c
-libImaging/LzwDecode.c
-libImaging/MspDecode.c
-libImaging/PackDecode.c
-libImaging/PcdDecode.c
-libImaging/PcxEncode.c
-libImaging/PcxDecode.c
-libImaging/RawDecode.c
-libImaging/RawEncode.c
-libImaging/SunRleDecode.c
-libImaging/TgaRleDecode.c
-libImaging/XbmDecode.c
-libImaging/XbmEncode.c
-libImaging/ZipDecode.c
-libImaging/ZipEncode.c
-_imaging.c
-decode.c
-encode.c
-display.c
-map.c
-outline.c
-path.c
-_imagingtk.c
-_imagingft.c
-_imagingmath.c
-PIL.pth
-PIL/__init__.py
-PIL/ArgImagePlugin.py
-PIL/BdfFontFile.py
-PIL/BmpImagePlugin.py
-PIL/BufrStubImagePlugin.py
-PIL/ContainerIO.py
-PIL/CurImagePlugin.py
-PIL/DcxImagePlugin.py
-PIL/EpsImagePlugin.py
-PIL/ExifTags.py
-PIL/FitsStubImagePlugin.py
-PIL/FliImagePlugin.py
-PIL/FontFile.py
-PIL/FpxImagePlugin.py
-PIL/GbrImagePlugin.py
-PIL/GdImageFile.py
-PIL/GifImagePlugin.py
-PIL/GimpGradientFile.py
-PIL/GimpPaletteFile.py
-PIL/GribStubImagePlugin.py
-PIL/Hdf5StubImagePlugin.py
-PIL/IcoImagePlugin.py
-PIL/IcnsImagePlugin.py
-PIL/Image.py
-PIL/ImageChops.py
-PIL/ImageColor.py
-PIL/ImageDraw.py
-PIL/ImageDraw2.py
-PIL/ImageEnhance.py
-PIL/ImageFile.py
-PIL/ImageFileIO.py
-PIL/ImageFilter.py
-PIL/ImageFont.py
-PIL/ImageGL.py
-PIL/ImageGrab.py
-PIL/ImageMath.py
-PIL/ImageMode.py
-PIL/ImageOps.py
-PIL/ImagePalette.py
-PIL/ImagePath.py
-PIL/ImageQt.py
-PIL/ImageSequence.py
-PIL/ImageStat.py
-PIL/ImageTk.py
-PIL/ImageTransform.py
-PIL/ImageWin.py
-PIL/ImImagePlugin.py
-PIL/ImtImagePlugin.py
-PIL/IptcImagePlugin.py
-PIL/JpegImagePlugin.py
-PIL/McIdasImagePlugin.py
-PIL/MicImagePlugin.py
-PIL/MpegImagePlugin.py
-PIL/MspImagePlugin.py
-PIL/OleFileIO.py
-PIL/PaletteFile.py
-PIL/PalmImagePlugin.py
-PIL/PcdImagePlugin.py
-PIL/PcfFontFile.py
-PIL/PcxImagePlugin.py
-PIL/PdfImagePlugin.py
-PIL/PixarImagePlugin.py
-PIL/PngImagePlugin.py
-PIL/PpmImagePlugin.py
-PIL/PsdImagePlugin.py
-PIL/PSDraw.py
-PIL/SgiImagePlugin.py
-PIL/SpiderImagePlugin.py
-PIL/SunImagePlugin.py
-PIL/TarIO.py
-PIL/TgaImagePlugin.py
-PIL/TiffImagePlugin.py
-PIL/TiffTags.py
-PIL/WalImageFile.py
-PIL/WmfImagePlugin.py
-PIL/XbmImagePlugin.py
-PIL/XpmImagePlugin.py
-PIL/XVThumbImagePlugin.py
-Docs/index.html
-Docs/effbot.css
-Docs/pythondoc-PIL.ArgImagePlugin.html
-Docs/pythondoc-PIL.BdfFontFile.html
-Docs/pythondoc-PIL.BmpImagePlugin.html
-Docs/pythondoc-PIL.BufrStubImagePlugin.html
-Docs/pythondoc-PIL.ContainerIO.html
-Docs/pythondoc-PIL.CurImagePlugin.html
-Docs/pythondoc-PIL.DcxImagePlugin.html
-Docs/pythondoc-PIL.EpsImagePlugin.html
-Docs/pythondoc-PIL.ExifTags.html
-Docs/pythondoc-PIL.FitsStubImagePlugin.html
-Docs/pythondoc-PIL.FliImagePlugin.html
-Docs/pythondoc-PIL.FontFile.html
-Docs/pythondoc-PIL.FpxImagePlugin.html
-Docs/pythondoc-PIL.GbrImagePlugin.html
-Docs/pythondoc-PIL.GdImageFile.html
-Docs/pythondoc-PIL.GifImagePlugin.html
-Docs/pythondoc-PIL.GimpGradientFile.html
-Docs/pythondoc-PIL.GimpPaletteFile.html
-Docs/pythondoc-PIL.GribStubImagePlugin.html
-Docs/pythondoc-PIL.Hdf5StubImagePlugin.html
-Docs/pythondoc-PIL.IcoImagePlugin.html
-Docs/pythondoc-PIL.IcnsImagePlugin.html
-Docs/pythondoc-PIL.Image.html
-Docs/pythondoc-PIL.ImageChops.html
-Docs/pythondoc-PIL.ImageColor.html
-Docs/pythondoc-PIL.ImageDraw.html
-Docs/pythondoc-PIL.ImageEnhance.html
-Docs/pythondoc-PIL.ImageFile.html
-Docs/pythondoc-PIL.ImageFileIO.html
-Docs/pythondoc-PIL.ImageFilter.html
-Docs/pythondoc-PIL.ImageFont.html
-Docs/pythondoc-PIL.ImageGL.html
-Docs/pythondoc-PIL.ImageGrab.html
-Docs/pythondoc-PIL.ImageOps.html
-Docs/pythondoc-PIL.ImagePalette.html
-Docs/pythondoc-PIL.ImagePath.html
-Docs/pythondoc-PIL.ImageSequence.html
-Docs/pythondoc-PIL.ImageStat.html
-Docs/pythondoc-PIL.ImageTk.html
-Docs/pythondoc-PIL.ImageTransform.html
-Docs/pythondoc-PIL.ImageWin.html
-Docs/pythondoc-PIL.ImImagePlugin.html
-Docs/pythondoc-PIL.ImtImagePlugin.html
-Docs/pythondoc-PIL.IptcImagePlugin.html
-Docs/pythondoc-PIL.JpegImagePlugin.html
-Docs/pythondoc-PIL.McIdasImagePlugin.html
-Docs/pythondoc-PIL.MicImagePlugin.html
-Docs/pythondoc-PIL.MpegImagePlugin.html
-Docs/pythondoc-PIL.MspImagePlugin.html
-Docs/pythondoc-PIL.OleFileIO.html
-Docs/pythondoc-PIL.PaletteFile.html
-Docs/pythondoc-PIL.PalmImagePlugin.html
-Docs/pythondoc-PIL.PcdImagePlugin.html
-Docs/pythondoc-PIL.PcfFontFile.html
-Docs/pythondoc-PIL.PcxImagePlugin.html
-Docs/pythondoc-PIL.PdfImagePlugin.html
-Docs/pythondoc-PIL.PixarImagePlugin.html
-Docs/pythondoc-PIL.PngImagePlugin.html
-Docs/pythondoc-PIL.PpmImagePlugin.html
-Docs/pythondoc-PIL.PsdImagePlugin.html
-Docs/pythondoc-PIL.PSDraw.html
-Docs/pythondoc-PIL.SgiImagePlugin.html
-Docs/pythondoc-PIL.SpiderImagePlugin.html
-Docs/pythondoc-PIL.SunImagePlugin.html
-Docs/pythondoc-PIL.TarIO.html
-Docs/pythondoc-PIL.TgaImagePlugin.html
-Docs/pythondoc-PIL.TiffImagePlugin.html
-Docs/pythondoc-PIL.TiffTags.html
-Docs/pythondoc-PIL.WalImageFile.html
-Docs/pythondoc-PIL.WmfImagePlugin.html
-Docs/pythondoc-PIL.XbmImagePlugin.html
-Docs/pythondoc-PIL.XpmImagePlugin.html
-Docs/pythondoc-PIL.XVThumbImagePlugin.html
-Scripts/pilconvert.py
-Scripts/pildriver.py
-Scripts/pilfile.py
-Scripts/pilfont.py
-Scripts/pilprint.py
-Images/lena.gif
-Images/lena.ppm
-Images/lena.jpg
-Images/courB08.bdf
-Images/courB08.pbm
-Images/courB08.pil
-Sane/README
-Sane/CHANGES
-Sane/setup.py
-Sane/sanedoc.txt
-Sane/_sane.c
-Sane/sane.py
-Sane/demo_numarray.py
-Sane/demo_pil.py
-Scripts/README
-Scripts/enhancer.py
-Scripts/explode.py
-Scripts/gifmaker.py
-Scripts/image2py.py
-Scripts/painter.py
-Scripts/player.py
-Scripts/viewer.py
-Scripts/thresholder.py
-Tk/tkImaging.c
-Tk/install.txt
-Tk/booster.txt
-Tk/pilbitmap.txt
diff --git a/pythonPackages/pil/PIL.pth b/pythonPackages/pil/PIL.pth
deleted file mode 100644
index b338169ce0..0000000000
--- a/pythonPackages/pil/PIL.pth
+++ /dev/null
@@ -1 +0,0 @@
-PIL
diff --git a/pythonPackages/pil/PIL/ArgImagePlugin.py b/pythonPackages/pil/PIL/ArgImagePlugin.py
deleted file mode 100644
index 48582d9aa3..0000000000
--- a/pythonPackages/pil/PIL/ArgImagePlugin.py
+++ /dev/null
@@ -1,498 +0,0 @@
-#
-# THIS IS WORK IN PROGRESS
-#
-# The Python Imaging Library.
-# $Id: ArgImagePlugin.py 2309 2005-03-02 15:06:34Z fredrik $
-#
-# ARG animation support code
-#
-# history:
-# 1996-12-30 fl   Created
-# 1996-01-06 fl   Added safe scripting environment
-# 1996-01-10 fl   Added JHDR, UHDR and sYNC support
-# 2005-03-02 fl   Removed AAPP and ARUN support
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1996-97.
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.4"
-
-import marshal, string
-
-import Image, ImageFile, ImagePalette
-
-from PngImagePlugin import i16, i32, ChunkStream, _MODES
-
-MAGIC = "\212ARG\r\n\032\n"
-
-# --------------------------------------------------------------------
-# ARG parser
-
-class ArgStream(ChunkStream):
-    "Parser callbacks for ARG data"
-
-    def __init__(self, fp):
-
-        ChunkStream.__init__(self, fp)
-
-        self.eof = 0
-
-        self.im = None
-        self.palette = None
-
-        self.__reset()
-
-    def __reset(self):
-
-        # reset decoder state (called on init and sync)
-
-        self.count = 0
-        self.id = None
-        self.action = ("NONE",)
-
-        self.images = {}
-        self.names = {}
-
-
-    def chunk_AHDR(self, offset, bytes):
-        "AHDR -- animation header"
-
-        # assertions
-        if self.count != 0:
-            raise SyntaxError, "misplaced AHDR chunk"
-
-        s = self.fp.read(bytes)
-        self.size = i32(s), i32(s[4:])
-        try:
-            self.mode, self.rawmode = _MODES[(ord(s[8]), ord(s[9]))]
-        except:
-            raise SyntaxError, "unknown ARG mode"
-
-        if Image.DEBUG:
-            print "AHDR size", self.size
-            print "AHDR mode", self.mode, self.rawmode
-
-        return s
-
-    def chunk_AFRM(self, offset, bytes):
-        "AFRM -- next frame follows"
-
-        # assertions
-        if self.count != 0:
-            raise SyntaxError, "misplaced AFRM chunk"
-
-        self.show = 1
-        self.id = 0
-        self.count = 1
-        self.repair = None
-
-        s = self.fp.read(bytes)
-        if len(s) >= 2:
-            self.id = i16(s)
-            if len(s) >= 4:
-                self.count = i16(s[2:4])
-                if len(s) >= 6:
-                    self.repair = i16(s[4:6])
-                else:
-                    self.repair = None
-
-        if Image.DEBUG:
-            print "AFRM", self.id, self.count
-
-        return s
-
-    def chunk_ADEF(self, offset, bytes):
-        "ADEF -- store image"
-
-        # assertions
-        if self.count != 0:
-            raise SyntaxError, "misplaced ADEF chunk"
-
-        self.show = 0
-        self.id = 0
-        self.count = 1
-        self.repair = None
-
-        s = self.fp.read(bytes)
-        if len(s) >= 2:
-            self.id = i16(s)
-            if len(s) >= 4:
-                self.count = i16(s[2:4])
-
-        if Image.DEBUG:
-            print "ADEF", self.id, self.count
-
-        return s
-
-    def chunk_NAME(self, offset, bytes):
-        "NAME -- name the current image"
-
-        # assertions
-        if self.count == 0:
-            raise SyntaxError, "misplaced NAME chunk"
-
-        name = self.fp.read(bytes)
-        self.names[self.id] = name
-
-        return name
-
-    def chunk_AEND(self, offset, bytes):
-        "AEND -- end of animation"
-
-        if Image.DEBUG:
-            print "AEND"
-
-        self.eof = 1
-
-        raise EOFError, "end of ARG file"
-
-    def __getmodesize(self, s, full=1):
-
-        size = i32(s), i32(s[4:])
-
-        try:
-            mode, rawmode = _MODES[(ord(s[8]), ord(s[9]))]
-        except:
-            raise SyntaxError, "unknown image mode"
-
-        if full:
-            if ord(s[12]):
-                pass # interlace not yet supported
-            if ord(s[11]):
-                raise SyntaxError, "unknown filter category"
-
-        return size, mode, rawmode
-
-    def chunk_PAST(self, offset, bytes):
-        "PAST -- paste one image into another"
-
-        # assertions
-        if self.count == 0:
-            raise SyntaxError, "misplaced PAST chunk"
-
-        if self.repair is not None:
-            # we must repair the target image before we
-            # start pasting
-
-            # brute force; a better solution would be to
-            # update only the dirty rectangles in images[id].
-            # note that if images[id] doesn't exist, it must
-            # be created
-
-            self.images[self.id] = self.images[self.repair].copy()
-            self.repair = None
-
-        s = self.fp.read(bytes)
-        im = self.images[i16(s)]
-        x, y = i32(s[2:6]), i32(s[6:10])
-        bbox = x, y, im.size[0]+x, im.size[1]+y
-
-        if im.mode in ["RGBA"]:
-            # paste with transparency
-            # FIXME: should handle P+transparency as well
-            self.images[self.id].paste(im, bbox, im)
-        else:
-            # paste without transparency
-            self.images[self.id].paste(im, bbox)
-
-        self.action = ("PAST",)
-        self.__store()
-
-        return s
-
-    def chunk_BLNK(self, offset, bytes):
-        "BLNK -- create blank image"
-
-        # assertions
-        if self.count == 0:
-            raise SyntaxError, "misplaced BLNK chunk"
-
-        s = self.fp.read(bytes)
-        size, mode, rawmode = self.__getmodesize(s, 0)
-
-        # store image (FIXME: handle colour)
-        self.action = ("BLNK",)
-        self.im = Image.core.fill(mode, size, 0)
-        self.__store()
-
-        return s
-
-    def chunk_IHDR(self, offset, bytes):
-        "IHDR -- full image follows"
-
-        # assertions
-        if self.count == 0:
-            raise SyntaxError, "misplaced IHDR chunk"
-
-        # image header
-        s = self.fp.read(bytes)
-        size, mode, rawmode = self.__getmodesize(s)
-
-        # decode and store image
-        self.action = ("IHDR",)
-        self.im = Image.core.new(mode, size)
-        self.decoder = Image.core.zip_decoder(rawmode)
-        self.decoder.setimage(self.im, (0,0) + size)
-        self.data = ""
-
-        return s
-
-    def chunk_DHDR(self, offset, bytes):
-        "DHDR -- delta image follows"
-
-        # assertions
-        if self.count == 0:
-            raise SyntaxError, "misplaced DHDR chunk"
-
-        s = self.fp.read(bytes)
-
-        size, mode, rawmode = self.__getmodesize(s)
-
-        # delta header
-        diff = ord(s[13])
-        offs = i32(s[14:18]), i32(s[18:22])
-
-        bbox = offs + (offs[0]+size[0], offs[1]+size[1])
-
-        if Image.DEBUG:
-            print "DHDR", diff, bbox
-
-        # FIXME: decode and apply image
-        self.action = ("DHDR", diff, bbox)
-
-        # setup decoder
-        self.im = Image.core.new(mode, size)
-
-        self.decoder = Image.core.zip_decoder(rawmode)
-        self.decoder.setimage(self.im, (0,0) + size)
-
-        self.data = ""
-
-        return s
-
-    def chunk_JHDR(self, offset, bytes):
-        "JHDR -- JPEG image follows"
-
-        # assertions
-        if self.count == 0:
-            raise SyntaxError, "misplaced JHDR chunk"
-
-        # image header
-        s = self.fp.read(bytes)
-        size, mode, rawmode = self.__getmodesize(s, 0)
-
-        # decode and store image
-        self.action = ("JHDR",)
-        self.im = Image.core.new(mode, size)
-        self.decoder = Image.core.jpeg_decoder(rawmode)
-        self.decoder.setimage(self.im, (0,0) + size)
-        self.data = ""
-
-        return s
-
-    def chunk_UHDR(self, offset, bytes):
-        "UHDR -- uncompressed image data follows (EXPERIMENTAL)"
-
-        # assertions
-        if self.count == 0:
-            raise SyntaxError, "misplaced UHDR chunk"
-
-        # image header
-        s = self.fp.read(bytes)
-        size, mode, rawmode = self.__getmodesize(s, 0)
-
-        # decode and store image
-        self.action = ("UHDR",)
-        self.im = Image.core.new(mode, size)
-        self.decoder = Image.core.raw_decoder(rawmode)
-        self.decoder.setimage(self.im, (0,0) + size)
-        self.data = ""
-
-        return s
-
-    def chunk_IDAT(self, offset, bytes):
-        "IDAT -- image data block"
-
-        # pass compressed chunks through the decoder
-        s = self.fp.read(bytes)
-        self.data = self.data + s
-        n, e = self.decoder.decode(self.data)
-        if n < 0:
-            # end of image
-            if e < 0:
-                raise IOError, "decoder error %d" % e
-        else:
-            self.data = self.data[n:]
-
-        return s
-
-    def chunk_DEND(self, offset, bytes):
-        return self.chunk_IEND(offset, bytes)
-
-    def chunk_JEND(self, offset, bytes):
-        return self.chunk_IEND(offset, bytes)
-
-    def chunk_UEND(self, offset, bytes):
-        return self.chunk_IEND(offset, bytes)
-
-    def chunk_IEND(self, offset, bytes):
-        "IEND -- end of image"
-
-        # we now have a new image.  carry out the operation
-        # defined by the image header.
-
-        # won't need these anymore
-        del self.decoder
-        del self.data
-
-        self.__store()
-
-        return self.fp.read(bytes)
-
-    def __store(self):
-
-        # apply operation
-        cid = self.action[0]
-
-        if cid in ["BLNK", "IHDR", "JHDR", "UHDR"]:
-            # store
-            self.images[self.id] = self.im
-
-        elif cid == "DHDR":
-            # paste
-            cid, mode, bbox = self.action
-            im0 = self.images[self.id]
-            im1 = self.im
-            if mode == 0:
-                im1 = im1.chop_add_modulo(im0.crop(bbox))
-            im0.paste(im1, bbox)
-
-        self.count = self.count - 1
-
-        if self.count == 0 and self.show:
-            self.im = self.images[self.id]
-            raise EOFError # end of this frame
-
-    def chunk_PLTE(self, offset, bytes):
-        "PLTE -- palette data"
-
-        s = self.fp.read(bytes)
-        if self.mode == "P":
-            self.palette = ImagePalette.raw("RGB", s)
-        return s
-
-    def chunk_sYNC(self, offset, bytes):
-        "SYNC -- reset decoder"
-
-        if self.count != 0:
-            raise SyntaxError, "misplaced sYNC chunk"
-
-        s = self.fp.read(bytes)
-        self.__reset()
-        return s
-
-
-# --------------------------------------------------------------------
-# ARG reader
-
-def _accept(prefix):
-    return prefix[:8] == MAGIC
-
-##
-# Image plugin for the experimental Animated Raster Graphics format.
-
-class ArgImageFile(ImageFile.ImageFile):
-
-    format = "ARG"
-    format_description = "Animated raster graphics"
-
-    def _open(self):
-
-        if self.fp.read(8) != MAGIC:
-            raise SyntaxError, "not an ARG file"
-
-        self.arg = ArgStream(self.fp)
-
-        # read and process the first chunk (AHDR)
-
-        cid, offset, bytes = self.arg.read()
-
-        if cid != "AHDR":
-            raise SyntaxError, "expected an AHDR chunk"
-
-        s = self.arg.call(cid, offset, bytes)
-
-        self.arg.crc(cid, s)
-
-        # image characteristics
-        self.mode = self.arg.mode
-        self.size = self.arg.size
-
-    def load(self):
-
-        if self.arg.im is None:
-            self.seek(0)
-
-        # image data
-        self.im = self.arg.im
-        self.palette = self.arg.palette
-
-        # set things up for further processing
-        Image.Image.load(self)
-
-    def seek(self, frame):
-
-        if self.arg.eof:
-            raise EOFError, "end of animation"
-
-        self.fp = self.arg.fp
-
-        while 1:
-
-            #
-            # process chunks
-
-            cid, offset, bytes = self.arg.read()
-
-            if self.arg.eof:
-                raise EOFError, "end of animation"
-
-            try:
-                s = self.arg.call(cid, offset, bytes)
-            except EOFError:
-                break
-
-            except "glurk": # AttributeError
-                if Image.DEBUG:
-                    print cid, bytes, "(unknown)"
-                s = self.fp.read(bytes)
-
-            self.arg.crc(cid, s)
-
-        self.fp.read(4) # ship extra CRC
-
-    def tell(self):
-        return 0
-
-    def verify(self):
-        "Verify ARG file"
-
-        # back up to first chunk
-        self.fp.seek(8)
-
-        self.arg.verify(self)
-        self.arg.close()
-
-        self.fp = None
-
-#
-# --------------------------------------------------------------------
-
-Image.register_open("ARG", ArgImageFile, _accept)
-
-Image.register_extension("ARG", ".arg")
-
-Image.register_mime("ARG", "video/x-arg")
diff --git a/pythonPackages/pil/PIL/BdfFontFile.py b/pythonPackages/pil/PIL/BdfFontFile.py
deleted file mode 100644
index 9297a18bb7..0000000000
--- a/pythonPackages/pil/PIL/BdfFontFile.py
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: BdfFontFile.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# bitmap distribution font (bdf) file parser
-#
-# history:
-# 1996-05-16 fl   created (as bdf2pil)
-# 1997-08-25 fl   converted to FontFile driver
-# 2001-05-25 fl   removed bogus __init__ call
-# 2002-11-20 fl   robustification (from Kevin Cazabon, Dmitry Vasiliev)
-# 2003-04-22 fl   more robustification (from Graham Dumpleton)
-#
-# Copyright (c) 1997-2003 by Secret Labs AB.
-# Copyright (c) 1997-2003 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-import FontFile
-
-import string
-
-# --------------------------------------------------------------------
-# parse X Bitmap Distribution Format (BDF)
-# --------------------------------------------------------------------
-
-bdf_slant = {
-   "R": "Roman",
-   "I": "Italic",
-   "O": "Oblique",
-   "RI": "Reverse Italic",
-   "RO": "Reverse Oblique",
-   "OT": "Other"
-}
-
-bdf_spacing = {
-    "P": "Proportional",
-    "M": "Monospaced",
-    "C": "Cell"
-}
-
-def bdf_char(f):
-
-    # skip to STARTCHAR
-    while 1:
-        s = f.readline()
-        if not s:
-            return None
-        if s[:9] == "STARTCHAR":
-            break
-    id = string.strip(s[9:])
-
-    # load symbol properties
-    props = {}
-    while 1:
-        s = f.readline()
-        if not s or s[:6] == "BITMAP":
-            break
-        i = string.find(s, " ")
-        props[s[:i]] = s[i+1:-1]
-
-    # load bitmap
-    bitmap = []
-    while 1:
-        s = f.readline()
-        if not s or s[:7] == "ENDCHAR":
-            break
-        bitmap.append(s[:-1])
-    bitmap = string.join(bitmap, "")
-
-    [x, y, l, d] = map(int, string.split(props["BBX"]))
-    [dx, dy] = map(int, string.split(props["DWIDTH"]))
-
-    bbox = (dx, dy), (l, -d-y, x+l, -d), (0, 0, x, y)
-
-    try:
-        im = Image.fromstring("1", (x, y), bitmap, "hex", "1")
-    except ValueError:
-        # deal with zero-width characters
-        im = Image.new("1", (x, y))
-
-    return id, int(props["ENCODING"]), bbox, im
-
-##
-# Font file plugin for the X11 BDF format.
-
-class BdfFontFile(FontFile.FontFile):
-
-    def __init__(self, fp):
-
-        FontFile.FontFile.__init__(self)
-
-        s = fp.readline()
-        if s[:13] != "STARTFONT 2.1":
-            raise SyntaxError, "not a valid BDF file"
-
-        props = {}
-        comments = []
-
-        while 1:
-            s = fp.readline()
-            if not s or s[:13] == "ENDPROPERTIES":
-                break
-            i = string.find(s, " ")
-            props[s[:i]] = s[i+1:-1]
-            if s[:i] in ["COMMENT", "COPYRIGHT"]:
-                if string.find(s, "LogicalFontDescription") < 0:
-                    comments.append(s[i+1:-1])
-
-        font = string.split(props["FONT"], "-")
-
-        font[4] = bdf_slant[string.upper(font[4])]
-        font[11] = bdf_spacing[string.upper(font[11])]
-
-        ascent = int(props["FONT_ASCENT"])
-        descent = int(props["FONT_DESCENT"])
-
-        fontname = string.join(font[1:], ";")
-
-        # print "#", fontname
-        # for i in comments:
-        #       print "#", i
-
-        font = []
-        while 1:
-            c = bdf_char(fp)
-            if not c:
-                break
-            id, ch, (xy, dst, src), im = c
-            if ch >= 0 and ch < len(self.glyph):
-                self.glyph[ch] = xy, dst, src, im
diff --git a/pythonPackages/pil/PIL/BmpImagePlugin.py b/pythonPackages/pil/PIL/BmpImagePlugin.py
deleted file mode 100644
index a939d9b386..0000000000
--- a/pythonPackages/pil/PIL/BmpImagePlugin.py
+++ /dev/null
@@ -1,245 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: BmpImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# BMP file handler
-#
-# Windows (and OS/2) native bitmap storage format.
-#
-# history:
-# 1995-09-01 fl   Created
-# 1996-04-30 fl   Added save
-# 1997-08-27 fl   Fixed save of 1-bit images
-# 1998-03-06 fl   Load P images as L where possible
-# 1998-07-03 fl   Load P images as 1 where possible
-# 1998-12-29 fl   Handle small palettes
-# 2002-12-30 fl   Fixed load of 1-bit palette images
-# 2003-04-21 fl   Fixed load of 1-bit monochrome images
-# 2003-04-23 fl   Added limited support for BI_BITFIELDS compression
-#
-# Copyright (c) 1997-2003 by Secret Labs AB
-# Copyright (c) 1995-2003 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.7"
-
-
-import string
-import Image, ImageFile, ImagePalette
-
-
-#
-# --------------------------------------------------------------------
-# Read BMP file
-
-def i16(c):
-    return ord(c[0]) + (ord(c[1])<<8)
-
-def i32(c):
-    return ord(c[0]) + (ord(c[1])<<8) + (ord(c[2])<<16) + (ord(c[3])<<24)
-
-
-BIT2MODE = {
-    # bits => mode, rawmode
-    1: ("P", "P;1"),
-    4: ("P", "P;4"),
-    8: ("P", "P"),
-    16: ("RGB", "BGR;16"),
-    24: ("RGB", "BGR"),
-    32: ("RGB", "BGRX")
-}
-
-def _accept(prefix):
-    return prefix[:2] == "BM"
-
-##
-# Image plugin for the Windows BMP format.
-
-class BmpImageFile(ImageFile.ImageFile):
-
-    format = "BMP"
-    format_description = "Windows Bitmap"
-
-    def _bitmap(self, header = 0, offset = 0):
-
-        if header:
-            self.fp.seek(header)
-
-        read = self.fp.read
-
-        # CORE/INFO
-        s = read(4)
-        s = s + ImageFile._safe_read(self.fp, i32(s)-4)
-
-        if len(s) == 12:
-
-            # OS/2 1.0 CORE
-            bits = i16(s[10:])
-            self.size = i16(s[4:]), i16(s[6:])
-            compression = 0
-            lutsize = 3
-            colors = 0
-
-        elif len(s) in [40, 64]:
-
-            # WIN 3.1 or OS/2 2.0 INFO
-            bits = i16(s[14:])
-            self.size = i32(s[4:]), i32(s[8:])
-            compression = i32(s[16:])
-            lutsize = 4
-            colors = i32(s[32:])
-
-        else:
-            raise IOError("Unsupported BMP header type (%d)" % len(s))
-
-        if not colors:
-            colors = 1 << bits
-
-        # MODE
-        try:
-            self.mode, rawmode = BIT2MODE[bits]
-        except KeyError:
-            raise IOError("Unsupported BMP pixel depth (%d)" % bits)
-
-        if compression == 3:
-            # BI_BITFIELDS compression
-            mask = i32(read(4)), i32(read(4)), i32(read(4))
-            if bits == 32 and mask == (0xff0000, 0x00ff00, 0x0000ff):
-                rawmode = "BGRX"
-            elif bits == 16 and mask == (0x00f800, 0x0007e0, 0x00001f):
-                rawmode = "BGR;16"
-            elif bits == 16 and mask == (0x007c00, 0x0003e0, 0x00001f):
-                rawmode = "BGR;15"
-            else:
-                # print bits, map(hex, mask)
-                raise IOError("Unsupported BMP bitfields layout")
-        elif compression != 0:
-            raise IOError("Unsupported BMP compression (%d)" % compression)
-
-        # LUT
-        if self.mode == "P":
-            palette = []
-            greyscale = 1
-            if colors == 2:
-                indices = (0, 255)
-            else:
-                indices = range(colors)
-            for i in indices:
-                rgb = read(lutsize)[:3]
-                if rgb != chr(i)*3:
-                    greyscale = 0
-                palette.append(rgb)
-            if greyscale:
-                if colors == 2:
-                    self.mode = rawmode = "1"
-                else:
-                    self.mode = rawmode = "L"
-            else:
-                self.mode = "P"
-                self.palette = ImagePalette.raw(
-                    "BGR", string.join(palette, "")
-                    )
-
-        if not offset:
-            offset = self.fp.tell()
-
-        self.tile = [("raw",
-                     (0, 0) + self.size,
-                     offset,
-                     (rawmode, ((self.size[0]*bits+31)>>3)&(~3), -1))]
-
-        self.info["compression"] = compression
-
-    def _open(self):
-
-        # HEAD
-        s = self.fp.read(14)
-        if s[:2] != "BM":
-            raise SyntaxError("Not a BMP file")
-        offset = i32(s[10:])
-
-        self._bitmap(offset=offset)
-
-
-class DibImageFile(BmpImageFile):
-
-    format = "DIB"
-    format_description = "Windows Bitmap"
-
-    def _open(self):
-        self._bitmap()
-
-#
-# --------------------------------------------------------------------
-# Write BMP file
-
-def o16(i):
-    return chr(i&255) + chr(i>>8&255)
-
-def o32(i):
-    return chr(i&255) + chr(i>>8&255) + chr(i>>16&255) + chr(i>>24&255)
-
-SAVE = {
-    "1": ("1", 1, 2),
-    "L": ("L", 8, 256),
-    "P": ("P", 8, 256),
-    "RGB": ("BGR", 24, 0),
-}
-
-def _save(im, fp, filename, check=0):
-
-    try:
-        rawmode, bits, colors = SAVE[im.mode]
-    except KeyError:
-        raise IOError("cannot write mode %s as BMP" % im.mode)
-
-    if check:
-        return check
-
-    stride = ((im.size[0]*bits+7)/8+3)&(~3)
-    header = 40 # or 64 for OS/2 version 2
-    offset = 14 + header + colors * 4
-    image  = stride * im.size[1]
-
-    # bitmap header
-    fp.write("BM" +                     # file type (magic)
-             o32(offset+image) +        # file size
-             o32(0) +                   # reserved
-             o32(offset))               # image data offset
-
-    # bitmap info header
-    fp.write(o32(header) +              # info header size
-             o32(im.size[0]) +          # width
-             o32(im.size[1]) +          # height
-             o16(1) +                   # planes
-             o16(bits) +                # depth
-             o32(0) +                   # compression (0=uncompressed)
-             o32(image) +               # size of bitmap
-             o32(1) + o32(1) +          # resolution
-             o32(colors) +              # colors used
-             o32(colors))               # colors important
-
-    fp.write("\000" * (header - 40))    # padding (for OS/2 format)
-
-    if im.mode == "1":
-        for i in (0, 255):
-            fp.write(chr(i) * 4)
-    elif im.mode == "L":
-        for i in range(256):
-            fp.write(chr(i) * 4)
-    elif im.mode == "P":
-        fp.write(im.im.getpalette("RGB", "BGRX"))
-
-    ImageFile._save(im, fp, [("raw", (0,0)+im.size, 0, (rawmode, stride, -1))])
-
-#
-# --------------------------------------------------------------------
-# Registry
-
-Image.register_open(BmpImageFile.format, BmpImageFile, _accept)
-Image.register_save(BmpImageFile.format, _save)
-
-Image.register_extension(BmpImageFile.format, ".bmp")
diff --git a/pythonPackages/pil/PIL/BufrStubImagePlugin.py b/pythonPackages/pil/PIL/BufrStubImagePlugin.py
deleted file mode 100644
index ee02659490..0000000000
--- a/pythonPackages/pil/PIL/BufrStubImagePlugin.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: BufrStubImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# BUFR stub adapter
-#
-# Copyright (c) 1996-2003 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image, ImageFile
-
-_handler = None
-
-##
-# Install application-specific BUFR image handler.
-#
-# @param handler Handler object.
-
-def register_handler(handler):
-    global _handler
-    _handler = handler
-
-# --------------------------------------------------------------------
-# Image adapter
-
-def _accept(prefix):
-    return prefix[:4] == "BUFR" or prefix[:4] == "ZCZC"
-
-class BufrStubImageFile(ImageFile.StubImageFile):
-
-    format = "BUFR"
-    format_description = "BUFR"
-
-    def _open(self):
-
-        offset = self.fp.tell()
-
-        if not _accept(self.fp.read(8)):
-            raise SyntaxError("Not a BUFR file")
-
-        self.fp.seek(offset)
-
-        # make something up
-        self.mode = "F"
-        self.size = 1, 1
-
-        loader = self._load()
-        if loader:
-            loader.open(self)
-
-    def _load(self):
-        return _handler
-
-def _save(im, fp, filename):
-    if _handler is None or not hasattr("_handler", "save"):
-        raise IOError("BUFR save handler not installed")
-    _handler.save(im, fp, filename)
-
-
-# --------------------------------------------------------------------
-# Registry
-
-Image.register_open(BufrStubImageFile.format, BufrStubImageFile, _accept)
-Image.register_save(BufrStubImageFile.format, _save)
-
-Image.register_extension(BufrStubImageFile.format, ".bufr")
diff --git a/pythonPackages/pil/PIL/ContainerIO.py b/pythonPackages/pil/PIL/ContainerIO.py
deleted file mode 100644
index 7b7283f58f..0000000000
--- a/pythonPackages/pil/PIL/ContainerIO.py
+++ /dev/null
@@ -1,116 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ContainerIO.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# a class to read from a container file
-#
-# History:
-# 1995-06-18 fl     Created
-# 1995-09-07 fl     Added readline(), readlines()
-#
-# Copyright (c) 1997-2001 by Secret Labs AB
-# Copyright (c) 1995 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-##
-# A file object that provides read access to a part of an existing
-# file (for example a TAR file).
-
-class ContainerIO:
-
-    ##
-    # Create file object.
-    #
-    # @param file Existing file.
-    # @param offset Start of region, in bytes.
-    # @param length Size of region, in bytes.
-
-    def __init__(self, file, offset, length):
-        self.fh = file
-        self.pos = 0
-        self.offset = offset
-        self.length = length
-        self.fh.seek(offset)
-
-    ##
-    # Always false.
-
-    def isatty(self):
-        return 0
-
-    ##
-    # Move file pointer.
-    #
-    # @param offset Offset in bytes.
-    # @param mode Starting position. Use 0 for beginning of region, 1
-    #    for current offset, and 2 for end of region.  You cannot move
-    #    the pointer outside the defined region.
-
-    def seek(self, offset, mode = 0):
-        if mode == 1:
-            self.pos = self.pos + offset
-        elif mode == 2:
-            self.pos = self.length + offset
-        else:
-            self.pos = offset
-        # clamp
-        self.pos = max(0, min(self.pos, self.length))
-        self.fh.seek(self.offset + self.pos)
-
-    ##
-    # Get current file pointer.
-    #
-    # @return Offset from start of region, in bytes.
-
-    def tell(self):
-        return self.pos
-
-    ##
-    # Read data.
-    #
-    # @def read(bytes=0)
-    # @param bytes Number of bytes to read.  If omitted or zero,
-    #     read until end of region.
-    # @return An 8-bit string.
-
-    def read(self, n = 0):
-        if n:
-            n = min(n, self.length - self.pos)
-        else:
-            n = self.length - self.pos
-        if not n: # EOF
-            return ""
-        self.pos = self.pos + n
-        return self.fh.read(n)
-
-    ##
-    # Read a line of text.
-    #
-    # @return An 8-bit string.
-
-    def readline(self):
-        s = ""
-        while 1:
-            c = self.read(1)
-            if not c:
-                break
-            s = s + c
-            if c == "\n":
-                break
-        return s
-
-    ##
-    # Read multiple lines of text.
-    #
-    # @return A list of 8-bit strings.
-
-    def readlines(self):
-        l = []
-        while 1:
-            s = self.readline()
-            if not s:
-                break
-            l.append(s)
-        return l
diff --git a/pythonPackages/pil/PIL/CurImagePlugin.py b/pythonPackages/pil/PIL/CurImagePlugin.py
deleted file mode 100644
index b879da3418..0000000000
--- a/pythonPackages/pil/PIL/CurImagePlugin.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: CurImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# Windows Cursor support for PIL
-#
-# notes:
-#       uses BmpImagePlugin.py to read the bitmap data.
-#
-# history:
-#       96-05-27 fl     Created
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1996.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.1"
-
-import string
-
-import Image, BmpImagePlugin
-
-
-#
-# --------------------------------------------------------------------
-
-def i16(c):
-    return ord(c[0]) + (ord(c[1])<<8)
-
-def i32(c):
-    return ord(c[0]) + (ord(c[1])<<8) + (ord(c[2])<<16) + (ord(c[3])<<24)
-
-
-def _accept(prefix):
-    return prefix[:4] == "\0\0\2\0"
-
-##
-# Image plugin for Windows Cursor files.
-
-class CurImageFile(BmpImagePlugin.BmpImageFile):
-
-    format = "CUR"
-    format_description = "Windows Cursor"
-
-    def _open(self):
-
-        offset = self.fp.tell()
-
-        # check magic
-        s = self.fp.read(6)
-        if not _accept(s):
-            raise SyntaxError, "not an CUR file"
-
-        # pick the largest cursor in the file
-        m = ""
-        for i in range(i16(s[4:])):
-            s = self.fp.read(16)
-            if not m:
-                m = s
-            elif ord(s[0]) > ord(m[0]) and ord(s[1]) > ord(m[1]):
-                m = s
-            #print "width", ord(s[0])
-            #print "height", ord(s[1])
-            #print "colors", ord(s[2])
-            #print "reserved", ord(s[3])
-            #print "hotspot x", i16(s[4:])
-            #print "hotspot y", i16(s[6:])
-            #print "bytes", i32(s[8:])
-            #print "offset", i32(s[12:])
-
-        # load as bitmap
-        self._bitmap(i32(m[12:]) + offset)
-
-        # patch up the bitmap height
-        self.size = self.size[0], self.size[1]/2
-        d, e, o, a = self.tile[0]
-        self.tile[0] = d, (0,0)+self.size, o, a
-
-        return
-
-
-#
-# --------------------------------------------------------------------
-
-Image.register_open("CUR", CurImageFile, _accept)
-
-Image.register_extension("CUR", ".cur")
diff --git a/pythonPackages/pil/PIL/DcxImagePlugin.py b/pythonPackages/pil/PIL/DcxImagePlugin.py
deleted file mode 100644
index 3a0df0188c..0000000000
--- a/pythonPackages/pil/PIL/DcxImagePlugin.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: DcxImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# DCX file handling
-#
-# DCX is a container file format defined by Intel, commonly used
-# for fax applications.  Each DCX file consists of a directory
-# (a list of file offsets) followed by a set of (usually 1-bit)
-# PCX files.
-#
-# History:
-# 1995-09-09 fl   Created
-# 1996-03-20 fl   Properly derived from PcxImageFile.
-# 1998-07-15 fl   Renamed offset attribute to avoid name clash
-# 2002-07-30 fl   Fixed file handling
-#
-# Copyright (c) 1997-98 by Secret Labs AB.
-# Copyright (c) 1995-96 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.2"
-
-import Image, ImageFile
-
-from PcxImagePlugin import PcxImageFile
-
-MAGIC = 0x3ADE68B1 # QUIZ: what's this value, then?
-
-def i32(c):
-    return ord(c[0]) + (ord(c[1])<<8) + (ord(c[2])<<16) + (ord(c[3])<<24)
-
-def _accept(prefix):
-    return i32(prefix) == MAGIC
-
-##
-# Image plugin for the Intel DCX format.
-
-class DcxImageFile(PcxImageFile):
-
-    format = "DCX"
-    format_description = "Intel DCX"
-
-    def _open(self):
-
-        # Header
-        s = self.fp.read(4)
-        if i32(s) != MAGIC:
-            raise SyntaxError, "not a DCX file"
-
-        # Component directory
-        self._offset = []
-        for i in range(1024):
-            offset = i32(self.fp.read(4))
-            if not offset:
-                break
-            self._offset.append(offset)
-
-        self.__fp = self.fp
-        self.seek(0)
-
-    def seek(self, frame):
-        if frame >= len(self._offset):
-            raise EOFError("attempt to seek outside DCX directory")
-        self.frame = frame
-        self.fp = self.__fp
-        self.fp.seek(self._offset[frame])
-        PcxImageFile._open(self)
-
-    def tell(self):
-        return self.frame
-
-
-Image.register_open("DCX", DcxImageFile, _accept)
-
-Image.register_extension("DCX", ".dcx")
diff --git a/pythonPackages/pil/PIL/EpsImagePlugin.py b/pythonPackages/pil/PIL/EpsImagePlugin.py
deleted file mode 100644
index e0a608e45f..0000000000
--- a/pythonPackages/pil/PIL/EpsImagePlugin.py
+++ /dev/null
@@ -1,349 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: EpsImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# EPS file handling
-#
-# History:
-# 1995-09-01 fl   Created (0.1)
-# 1996-05-18 fl   Don't choke on "atend" fields, Ghostscript interface (0.2)
-# 1996-08-22 fl   Don't choke on floating point BoundingBox values
-# 1996-08-23 fl   Handle files from Macintosh (0.3)
-# 2001-02-17 fl   Use 're' instead of 'regex' (Python 2.1) (0.4)
-# 2003-09-07 fl   Check gs.close status (from Federico Di Gregorio) (0.5)
-#
-# Copyright (c) 1997-2003 by Secret Labs AB.
-# Copyright (c) 1995-2003 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.5"
-
-import re, string
-import Image, ImageFile
-
-#
-# --------------------------------------------------------------------
-
-def i32(c):
-    return ord(c[0]) + (ord(c[1])<<8) + (ord(c[2])<<16) + (ord(c[3])<<24)
-
-def o32(i):
-    return chr(i&255) + chr(i>>8&255) + chr(i>>16&255) + chr(i>>24&255)
-
-split = re.compile(r"^%%([^:]*):[ \t]*(.*)[ \t]*$")
-field = re.compile(r"^%[%!\w]([^:]*)[ \t]*$")
-
-def Ghostscript(tile, size, fp):
-    """Render an image using Ghostscript (Unix only)"""
-
-    # Unpack decoder tile
-    decoder, tile, offset, data = tile[0]
-    length, bbox = data
-
-    import tempfile, os
-
-    file = tempfile.mktemp()
-
-    # Build ghostscript command
-    command = ["gs",
-               "-q",                    # quite mode
-               "-g%dx%d" % size,        # set output geometry (pixels)
-               "-dNOPAUSE -dSAFER",     # don't pause between pages, safe mode
-               "-sDEVICE=ppmraw",       # ppm driver
-               "-sOutputFile=%s" % file,# output file
-               "- >/dev/null 2>/dev/null"]
-
-    command = string.join(command)
-
-    # push data through ghostscript
-    try:
-        gs = os.popen(command, "w")
-        # adjust for image origin
-        if bbox[0] != 0 or bbox[1] != 0:
-            gs.write("%d %d translate\n" % (-bbox[0], -bbox[1]))
-        fp.seek(offset)
-        while length > 0:
-            s = fp.read(8192)
-            if not s:
-                break
-            length = length - len(s)
-            gs.write(s)
-        status = gs.close()
-        if status:
-            raise IOError("gs failed (status %d)" % status)
-        im = Image.core.open_ppm(file)
-    finally:
-        try: os.unlink(file)
-        except: pass
-
-    return im
-
-
-class PSFile:
-    """Wrapper that treats either CR or LF as end of line."""
-    def __init__(self, fp):
-        self.fp = fp
-        self.char = None
-    def __getattr__(self, id):
-        v = getattr(self.fp, id)
-        setattr(self, id, v)
-        return v
-    def seek(self, offset, whence=0):
-        self.char = None
-        self.fp.seek(offset, whence)
-    def tell(self):
-        pos = self.fp.tell()
-        if self.char:
-            pos = pos - 1
-        return pos
-    def readline(self):
-        s = ""
-        if self.char:
-            c = self.char
-            self.char = None
-        else:
-            c = self.fp.read(1)
-        while c not in "\r\n":
-            s = s + c
-            c = self.fp.read(1)
-        if c == "\r":
-            self.char = self.fp.read(1)
-            if self.char == "\n":
-                self.char = None
-        return s + "\n"
-
-
-def _accept(prefix):
-    return prefix[:4] == "%!PS" or i32(prefix) == 0xC6D3D0C5L
-
-##
-# Image plugin for Encapsulated Postscript.  This plugin supports only
-# a few variants of this format.
-
-class EpsImageFile(ImageFile.ImageFile):
-    """EPS File Parser for the Python Imaging Library"""
-
-    format = "EPS"
-    format_description = "Encapsulated Postscript"
-
-    def _open(self):
-
-        # FIXME: should check the first 512 bytes to see if this
-        # really is necessary (platform-dependent, though...)
-
-        fp = PSFile(self.fp)
-
-        # HEAD
-        s = fp.read(512)
-        if s[:4] == "%!PS":
-            offset = 0
-            fp.seek(0, 2)
-            length = fp.tell()
-        elif i32(s) == 0xC6D3D0C5L:
-            offset = i32(s[4:])
-            length = i32(s[8:])
-            fp.seek(offset)
-        else:
-            raise SyntaxError, "not an EPS file"
-
-        fp.seek(offset)
-
-        box = None
-
-        self.mode = "RGB"
-        self.size = 1, 1 # FIXME: huh?
-
-        #
-        # Load EPS header
-
-        s = fp.readline()
-
-        while s:
-
-            if len(s) > 255:
-                raise SyntaxError, "not an EPS file"
-
-            if s[-2:] == '\r\n':
-                s = s[:-2]
-            elif s[-1:] == '\n':
-                s = s[:-1]
-
-            try:
-                m = split.match(s)
-            except re.error, v:
-                raise SyntaxError, "not an EPS file"
-
-            if m:
-                k, v = m.group(1, 2)
-                self.info[k] = v
-                if k == "BoundingBox":
-                    try:
-                        # Note: The DSC spec says that BoundingBox
-                        # fields should be integers, but some drivers
-                        # put floating point values there anyway.
-                        box = map(int, map(float, string.split(v)))
-                        self.size = box[2] - box[0], box[3] - box[1]
-                        self.tile = [("eps", (0,0) + self.size, offset,
-                                      (length, box))]
-                    except:
-                        pass
-
-            else:
-
-                m = field.match(s)
-
-                if m:
-                    k = m.group(1)
-                    if k == "EndComments":
-                        break
-                    if k[:8] == "PS-Adobe":
-                        self.info[k[:8]] = k[9:]
-                    else:
-                        self.info[k] = ""
-                else:
-                    raise IOError, "bad EPS header"
-
-            s = fp.readline()
-
-            if s[:1] != "%":
-                break
-
-
-        #
-        # Scan for an "ImageData" descriptor
-
-        while s[0] == "%":
-
-            if len(s) > 255:
-                raise SyntaxError, "not an EPS file"
-
-            if s[-2:] == '\r\n':
-                s = s[:-2]
-            elif s[-1:] == '\n':
-                s = s[:-1]
-
-            if s[:11] == "%ImageData:":
-
-                [x, y, bi, mo, z3, z4, en, id] =\
-                    string.split(s[11:], maxsplit=7)
-
-                x = int(x); y = int(y)
-
-                bi = int(bi)
-                mo = int(mo)
-
-                en = int(en)
-
-                if en == 1:
-                    decoder = "eps_binary"
-                elif en == 2:
-                    decoder = "eps_hex"
-                else:
-                    break
-                if bi != 8:
-                    break
-                if mo == 1:
-                    self.mode = "L"
-                elif mo == 2:
-                    self.mode = "LAB"
-                elif mo == 3:
-                    self.mode = "RGB"
-                else:
-                    break
-
-                if id[:1] == id[-1:] == '"':
-                    id = id[1:-1]
-
-                # Scan forward to the actual image data
-                while 1:
-                    s = fp.readline()
-                    if not s:
-                        break
-                    if s[:len(id)] == id:
-                        self.size = x, y
-                        self.tile2 = [(decoder,
-                                       (0, 0, x, y),
-                                       fp.tell(),
-                                       0)]
-                        return
-
-            s = fp.readline()
-            if not s:
-                break
-
-        if not box:
-            raise IOError, "cannot determine EPS bounding box"
-
-    def load(self):
-        # Load EPS via Ghostscript
-        if not self.tile:
-            return
-        self.im = Ghostscript(self.tile, self.size, self.fp)
-        self.mode = self.im.mode
-        self.size = self.im.size
-        self.tile = []
-
-#
-# --------------------------------------------------------------------
-
-def _save(im, fp, filename, eps=1):
-    """EPS Writer for the Python Imaging Library."""
-
-    #
-    # make sure image data is available
-    im.load()
-
-    #
-    # determine postscript image mode
-    if im.mode == "L":
-        operator = (8, 1, "image")
-    elif im.mode == "RGB":
-        operator = (8, 3, "false 3 colorimage")
-    elif im.mode == "CMYK":
-        operator = (8, 4, "false 4 colorimage")
-    else:
-        raise ValueError, "image mode is not supported"
-
-    if eps:
-        #
-        # write EPS header
-        fp.write("%!PS-Adobe-3.0 EPSF-3.0\n")
-        fp.write("%%Creator: PIL 0.1 EpsEncode\n")
-        #fp.write("%%CreationDate: %s"...)
-        fp.write("%%%%BoundingBox: 0 0 %d %d\n" % im.size)
-        fp.write("%%Pages: 1\n")
-        fp.write("%%EndComments\n")
-        fp.write("%%Page: 1 1\n")
-        fp.write("%%ImageData: %d %d " % im.size)
-        fp.write("%d %d 0 1 1 \"%s\"\n" % operator)
-
-    #
-    # image header
-    fp.write("gsave\n")
-    fp.write("10 dict begin\n")
-    fp.write("/buf %d string def\n" % (im.size[0] * operator[1]))
-    fp.write("%d %d scale\n" % im.size)
-    fp.write("%d %d 8\n" % im.size) # <= bits
-    fp.write("[%d 0 0 -%d 0 %d]\n" % (im.size[0], im.size[1], im.size[1]))
-    fp.write("{ currentfile buf readhexstring pop } bind\n")
-    fp.write("%s\n" % operator[2])
-
-    ImageFile._save(im, fp, [("eps", (0,0)+im.size, 0, None)])
-
-    fp.write("\n%%%%EndBinary\n")
-    fp.write("grestore end\n")
-    fp.flush()
-
-#
-# --------------------------------------------------------------------
-
-Image.register_open(EpsImageFile.format, EpsImageFile, _accept)
-
-Image.register_save(EpsImageFile.format, _save)
-
-Image.register_extension(EpsImageFile.format, ".ps")
-Image.register_extension(EpsImageFile.format, ".eps")
-
-Image.register_mime(EpsImageFile.format, "application/postscript")
diff --git a/pythonPackages/pil/PIL/ExifTags.py b/pythonPackages/pil/PIL/ExifTags.py
deleted file mode 100644
index 01a6b74a3f..0000000000
--- a/pythonPackages/pil/PIL/ExifTags.py
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ExifTags.py 2631 2006-02-12 23:41:52Z fredrik $
-#
-# EXIF tags
-#
-# Copyright (c) 2003 by Secret Labs AB
-#
-# See the README file for information on usage and redistribution.
-#
-
-##
-# This module provides constants and clear-text names for various
-# well-known EXIF tags.
-##
-
-##
-# Maps EXIF tags to tag names.
-
-TAGS = {
-
-    # possibly incomplete
-    0x0100: "ImageWidth",
-    0x0101: "ImageLength",
-    0x0102: "BitsPerSample",
-    0x0103: "Compression",
-    0x0106: "PhotometricInterpretation",
-    0x010e: "ImageDescription",
-    0x010f: "Make",
-    0x0110: "Model",
-    0x0111: "StripOffsets",
-    0x0112: "Orientation",
-    0x0115: "SamplesPerPixel",
-    0x0116: "RowsPerStrip",
-    0x0117: "StripByteConunts",
-    0x011a: "XResolution",
-    0x011a: "XResolution",
-    0x011b: "YResolution",
-    0x011b: "YResolution",
-    0x011c: "PlanarConfiguration",
-    0x0128: "ResolutionUnit",
-    0x0128: "ResolutionUnit",
-    0x012d: "TransferFunction",
-    0x0131: "Software",
-    0x0132: "DateTime",
-    0x013b: "Artist",
-    0x013e: "WhitePoint",
-    0x013f: "PrimaryChromaticities",
-    0x0201: "JpegIFOffset",
-    0x0202: "JpegIFByteCount",
-    0x0211: "YCbCrCoefficients",
-    0x0211: "YCbCrCoefficients",
-    0x0212: "YCbCrSubSampling",
-    0x0213: "YCbCrPositioning",
-    0x0213: "YCbCrPositioning",
-    0x0214: "ReferenceBlackWhite",
-    0x0214: "ReferenceBlackWhite",
-    0x1000: "RelatedImageFileFormat",
-    0x1001: "RelatedImageLength",
-    0x1001: "RelatedImageWidth",
-    0x828d: "CFARepeatPatternDim",
-    0x828e: "CFAPattern",
-    0x828f: "BatteryLevel",
-    0x8298: "Copyright",
-    0x829a: "ExposureTime",
-    0x829d: "FNumber",
-    0x8769: "ExifOffset",
-    0x8773: "InterColorProfile",
-    0x8822: "ExposureProgram",
-    0x8824: "SpectralSensitivity",
-    0x8825: "GPSInfo",
-    0x8827: "ISOSpeedRatings",
-    0x8828: "OECF",
-    0x8829: "Interlace",
-    0x882a: "TimeZoneOffset",
-    0x882b: "SelfTimerMode",
-    0x9000: "ExifVersion",
-    0x9003: "DateTimeOriginal",
-    0x9004: "DateTimeDigitized",
-    0x9101: "ComponentsConfiguration",
-    0x9102: "CompressedBitsPerPixel",
-    0x9201: "ShutterSpeedValue",
-    0x9202: "ApertureValue",
-    0x9203: "BrightnessValue",
-    0x9204: "ExposureBiasValue",
-    0x9205: "MaxApertureValue",
-    0x9206: "SubjectDistance",
-    0x9207: "MeteringMode",
-    0x9208: "LightSource",
-    0x9209: "Flash",
-    0x920a: "FocalLength",
-    0x920b: "FlashEnergy",
-    0x920c: "SpatialFrequencyResponse",
-    0x920d: "Noise",
-    0x9211: "ImageNumber",
-    0x9212: "SecurityClassification",
-    0x9213: "ImageHistory",
-    0x9214: "SubjectLocation",
-    0x9215: "ExposureIndex",
-    0x9216: "TIFF/EPStandardID",
-    0x927c: "MakerNote",
-    0x9286: "UserComment",
-    0x9290: "SubsecTime",
-    0x9291: "SubsecTimeOriginal",
-    0x9292: "SubsecTimeDigitized",
-    0xa000: "FlashPixVersion",
-    0xa001: "ColorSpace",
-    0xa002: "ExifImageWidth",
-    0xa003: "ExifImageHeight",
-    0xa004: "RelatedSoundFile",
-    0xa005: "ExifInteroperabilityOffset",
-    0xa20b: "FlashEnergy",
-    0xa20c: "SpatialFrequencyResponse",
-    0xa20e: "FocalPlaneXResolution",
-    0xa20f: "FocalPlaneYResolution",
-    0xa210: "FocalPlaneResolutionUnit",
-    0xa214: "SubjectLocation",
-    0xa215: "ExposureIndex",
-    0xa217: "SensingMethod",
-    0xa300: "FileSource",
-    0xa301: "SceneType",
-    0xa302: "CFAPattern",
-
-}
-
-##
-# Maps EXIF GSP tags to tag names.
-
-GPSTAGS = {
-    0: "GPSVersionID",
-    1: "GPSLatitudeRef",
-    2: "GPSLatitude",
-    3: "GPSLongitudeRef",
-    4: "GPSLongitude",
-    5: "GPSAltitudeRef",
-    6: "GPSAltitude",
-    7: "GPSTimeStamp",
-    8: "GPSSatellites",
-    9: "GPSStatus",
-    10: "GPSMeasureMode",
-    11: "GPSDOP",
-    12: "GPSSpeedRef",
-    13: "GPSSpeed",
-    14: "GPSTrackRef",
-    15: "GPSTrack",
-    16: "GPSImgDirectionRef",
-    17: "GPSImgDirection",
-    18: "GPSMapDatum",
-    19: "GPSDestLatitudeRef",
-    20: "GPSDestLatitude",
-    21: "GPSDestLongitudeRef",
-    22: "GPSDestLongitude",
-    23: "GPSDestBearingRef",
-    24: "GPSDestBearing",
-    25: "GPSDestDistanceRef",
-    26: "GPSDestDistance"
-}
diff --git a/pythonPackages/pil/PIL/FitsStubImagePlugin.py b/pythonPackages/pil/PIL/FitsStubImagePlugin.py
deleted file mode 100644
index 05f5d46d14..0000000000
--- a/pythonPackages/pil/PIL/FitsStubImagePlugin.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: FitsStubImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# FITS stub adapter
-#
-# Copyright (c) 1998-2003 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image, ImageFile
-
-_handler = None
-
-##
-# Install application-specific FITS image handler.
-#
-# @param handler Handler object.
-
-def register_handler(handler):
-    global _handler
-    _handler = handler
-
-# --------------------------------------------------------------------
-# Image adapter
-
-def _accept(prefix):
-    return prefix[:6] == "SIMPLE"
-
-class FITSStubImageFile(ImageFile.StubImageFile):
-
-    format = "FITS"
-    format_description = "FITS"
-
-    def _open(self):
-
-        offset = self.fp.tell()
-
-        if not _accept(self.fp.read(6)):
-            raise SyntaxError("Not a FITS file")
-
-        # FIXME: add more sanity checks here; mandatory header items
-        # include SIMPLE, BITPIX, NAXIS, etc.
-
-        self.fp.seek(offset)
-
-        # make something up
-        self.mode = "F"
-        self.size = 1, 1
-
-        loader = self._load()
-        if loader:
-            loader.open(self)
-
-    def _load(self):
-        return _handler
-
-
-def _save(im, fp, filename):
-    if _handler is None or not hasattr("_handler", "save"):
-        raise IOError("FITS save handler not installed")
-    _handler.save(im, fp, filename)
-
-
-# --------------------------------------------------------------------
-# Registry
-
-Image.register_open(FITSStubImageFile.format, FITSStubImageFile, _accept)
-Image.register_save(FITSStubImageFile.format, _save)
-
-Image.register_extension(FITSStubImageFile.format, ".fit")
-Image.register_extension(FITSStubImageFile.format, ".fits")
diff --git a/pythonPackages/pil/PIL/FliImagePlugin.py b/pythonPackages/pil/PIL/FliImagePlugin.py
deleted file mode 100644
index 5b1bf8e629..0000000000
--- a/pythonPackages/pil/PIL/FliImagePlugin.py
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: FliImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# FLI/FLC file handling.
-#
-# History:
-#       95-09-01 fl     Created
-#       97-01-03 fl     Fixed parser, setup decoder tile
-#       98-07-15 fl     Renamed offset attribute to avoid name clash
-#
-# Copyright (c) Secret Labs AB 1997-98.
-# Copyright (c) Fredrik Lundh 1995-97.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.2"
-
-import Image, ImageFile, ImagePalette
-import string
-
-
-def i16(c):
-    return ord(c[0]) + (ord(c[1])<<8)
-
-def i32(c):
-    return ord(c[0]) + (ord(c[1])<<8) + (ord(c[2])<<16) + (ord(c[3])<<24)
-
-#
-# decoder
-
-def _accept(prefix):
-    return i16(prefix[4:6]) in [0xAF11, 0xAF12]
-
-##
-# Image plugin for the FLI/FLC animation format.  Use the <b>seek</b>
-# method to load individual frames.
-
-class FliImageFile(ImageFile.ImageFile):
-
-    format = "FLI"
-    format_description = "Autodesk FLI/FLC Animation"
-
-    def _open(self):
-
-        # HEAD
-        s = self.fp.read(128)
-        magic = i16(s[4:6])
-        if magic not in [0xAF11, 0xAF12]:
-            raise SyntaxError, "not an FLI/FLC file"
-
-        # image characteristics
-        self.mode = "P"
-        self.size = i16(s[8:10]), i16(s[10:12])
-
-        # animation speed
-        duration = i32(s[16:20])
-        if magic == 0xAF11:
-            duration = (duration * 1000) / 70
-        self.info["duration"] = duration
-
-        # look for palette
-        palette = map(lambda a: (a,a,a), range(256))
-
-        s = self.fp.read(16)
-
-        self.__offset = 128
-
-        if i16(s[4:6]) == 0xF100:
-            # prefix chunk; ignore it
-            self.__offset = self.__offset + i32(s)
-            s = self.fp.read(16)
-
-        if i16(s[4:6]) == 0xF1FA:
-            # look for palette chunk
-            s = self.fp.read(6)
-            if i16(s[4:6]) == 11:
-                self._palette(palette, 2)
-            elif i16(s[4:6]) == 4:
-                self._palette(palette, 0)
-
-        palette = map(lambda (r,g,b): chr(r)+chr(g)+chr(b), palette)
-        self.palette = ImagePalette.raw("RGB", string.join(palette, ""))
-
-        # set things up to decode first frame
-        self.frame = -1
-        self.__fp = self.fp
-
-        self.seek(0)
-
-    def _palette(self, palette, shift):
-        # load palette
-
-        i = 0
-        for e in range(i16(self.fp.read(2))):
-            s = self.fp.read(2)
-            i = i + ord(s[0])
-            n = ord(s[1])
-            if n == 0:
-                n = 256
-            s = self.fp.read(n * 3)
-            for n in range(0, len(s), 3):
-                r = ord(s[n]) << shift
-                g = ord(s[n+1]) << shift
-                b = ord(s[n+2]) << shift
-                palette[i] = (r, g, b)
-                i = i + 1
-
-    def seek(self, frame):
-
-        if frame != self.frame + 1:
-            raise ValueError, "cannot seek to frame %d" % frame
-        self.frame = frame
-
-        # move to next frame
-        self.fp = self.__fp
-        self.fp.seek(self.__offset)
-
-        s = self.fp.read(4)
-        if not s:
-            raise EOFError
-
-        framesize = i32(s)
-
-        self.decodermaxblock = framesize
-        self.tile = [("fli", (0,0)+self.size, self.__offset, None)]
-
-        self.__offset = self.__offset + framesize
-
-    def tell(self):
-
-        return self.frame
-
-#
-# registry
-
-Image.register_open("FLI", FliImageFile, _accept)
-
-Image.register_extension("FLI", ".fli")
-Image.register_extension("FLI", ".flc")
diff --git a/pythonPackages/pil/PIL/FontFile.py b/pythonPackages/pil/PIL/FontFile.py
deleted file mode 100644
index bf4b9059cc..0000000000
--- a/pythonPackages/pil/PIL/FontFile.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: FontFile.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# base class for raster font file parsers
-#
-# history:
-# 1997-06-05 fl   created
-# 1997-08-19 fl   restrict image width
-#
-# Copyright (c) 1997-1998 by Secret Labs AB
-# Copyright (c) 1997-1998 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import os
-import Image
-
-import marshal
-
-try:
-    import zlib
-except ImportError:
-    zlib = None
-
-WIDTH = 800
-
-def puti16(fp, values):
-    # write network order (big-endian) 16-bit sequence
-    for v in values:
-        if v < 0:
-            v = v + 65536
-        fp.write(chr(v>>8&255) + chr(v&255))
-
-##
-# Base class for raster font file handlers.
-
-class FontFile:
-
-    bitmap = None
-
-    def __init__(self):
-
-        self.info = {}
-        self.glyph = [None] * 256
-
-    def __getitem__(self, ix):
-        return self.glyph[ix]
-
-    def compile(self):
-        "Create metrics and bitmap"
-
-        if self.bitmap:
-            return
-
-        # create bitmap large enough to hold all data
-        h = w = maxwidth = 0
-        lines = 1
-        for glyph in self:
-            if glyph:
-                d, dst, src, im = glyph
-                h = max(h, src[3] - src[1])
-                w = w + (src[2] - src[0])
-                if w > WIDTH:
-                    lines = lines + 1
-                    w = (src[2] - src[0])
-                maxwidth = max(maxwidth, w)
-
-        xsize = maxwidth
-        ysize = lines * h
-
-        if xsize == 0 and ysize == 0:
-            return ""
-
-        self.ysize = h
-
-        # paste glyphs into bitmap
-        self.bitmap = Image.new("1", (xsize, ysize))
-        self.metrics = [None] * 256
-        x = y = 0
-        for i in range(256):
-            glyph = self[i]
-            if glyph:
-                d, dst, src, im = glyph
-                xx, yy = src[2] - src[0], src[3] - src[1]
-                x0, y0 = x, y
-                x = x + xx
-                if x > WIDTH:
-                    x, y = 0, y + h
-                    x0, y0 = x, y
-                    x = xx
-                s = src[0] + x0, src[1] + y0, src[2] + x0, src[3] + y0
-                self.bitmap.paste(im.crop(src), s)
-                # print chr(i), dst, s
-                self.metrics[i] = d, dst, s
-
-
-    def save1(self, filename):
-        "Save font in version 1 format"
-
-        self.compile()
-
-        # font data
-        self.bitmap.save(os.path.splitext(filename)[0] + ".pbm", "PNG")
-
-        # font metrics
-        fp = open(os.path.splitext(filename)[0] + ".pil", "wb")
-        fp.write("PILfont\n")
-        fp.write(";;;;;;%d;\n" % self.ysize) # HACK!!!
-        fp.write("DATA\n")
-        for id in range(256):
-            m = self.metrics[id]
-            if not m:
-                puti16(fp, [0] * 10)
-            else:
-                puti16(fp, m[0] + m[1] + m[2])
-        fp.close()
-
-
-    def save2(self, filename):
-        "Save font in version 2 format"
-
-        # THIS IS WORK IN PROGRESS
-
-        self.compile()
-
-        data = marshal.dumps((self.metrics, self.info))
-
-        if zlib:
-            data = "z" + zlib.compress(data, 9)
-        else:
-            data = "u" + data
-
-        fp = open(os.path.splitext(filename)[0] + ".pil", "wb")
-
-        fp.write("PILfont2\n" + self.name + "\n" + "DATA\n")
-
-        fp.write(data)
-
-        self.bitmap.save(fp, "PNG")
-
-        fp.close()
-
-
-    save = save1 # for now
diff --git a/pythonPackages/pil/PIL/FpxImagePlugin.py b/pythonPackages/pil/PIL/FpxImagePlugin.py
deleted file mode 100644
index d4a1aefe0c..0000000000
--- a/pythonPackages/pil/PIL/FpxImagePlugin.py
+++ /dev/null
@@ -1,226 +0,0 @@
-#
-# THIS IS WORK IN PROGRESS
-#
-# The Python Imaging Library.
-# $Id: FpxImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# FlashPix support for PIL
-#
-# History:
-# 97-01-25 fl   Created (reads uncompressed RGB images only)
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1997.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.1"
-
-
-import string
-
-import Image, ImageFile
-from OleFileIO import *
-
-
-# we map from colour field tuples to (mode, rawmode) descriptors
-MODES = {
-    # opacity
-    (0x00007ffe): ("A", "L"),
-    # monochrome
-    (0x00010000,): ("L", "L"),
-    (0x00018000, 0x00017ffe): ("RGBA", "LA"),
-    # photo YCC
-    (0x00020000, 0x00020001, 0x00020002): ("RGB", "YCC;P"),
-    (0x00028000, 0x00028001, 0x00028002, 0x00027ffe): ("RGBA", "YCCA;P"),
-    # standard RGB (NIFRGB)
-    (0x00030000, 0x00030001, 0x00030002): ("RGB","RGB"),
-    (0x00038000, 0x00038001, 0x00038002, 0x00037ffe): ("RGBA","RGBA"),
-}
-
-#
-# --------------------------------------------------------------------
-
-def _accept(prefix):
-    return prefix[:8] == MAGIC
-
-##
-# Image plugin for the FlashPix images.
-
-class FpxImageFile(ImageFile.ImageFile):
-
-    format = "FPX"
-    format_description = "FlashPix"
-
-    def _open(self):
-        #
-        # read the OLE directory and see if this is a likely
-        # to be a FlashPix file
-
-        try:
-            self.ole = OleFileIO(self.fp)
-        except IOError:
-            raise SyntaxError, "not an FPX file; invalid OLE file"
-
-        if self.ole.root.clsid != "56616700-C154-11CE-8553-00AA00A1F95B":
-            raise SyntaxError, "not an FPX file; bad root CLSID"
-
-        self._open_index(1)
-
-    def _open_index(self, index = 1):
-        #
-        # get the Image Contents Property Set
-
-        prop = self.ole.getproperties([
-            "Data Object Store %06d" % index,
-            "\005Image Contents"
-        ])
-
-        # size (highest resolution)
-
-        self.size = prop[0x1000002], prop[0x1000003]
-
-        size = max(self.size)
-        i = 1
-        while size > 64:
-            size = size / 2
-            i = i + 1
-        self.maxid = i - 1
-
-        # mode.  instead of using a single field for this, flashpix
-        # requires you to specify the mode for each channel in each
-        # resolution subimage, and leaves it to the decoder to make
-        # sure that they all match.  for now, we'll cheat and assume
-        # that this is always the case.
-
-        id = self.maxid << 16
-
-        s = prop[0x2000002|id]
-
-        colors = []
-        for i in range(i32(s, 4)):
-            # note: for now, we ignore the "uncalibrated" flag
-            colors.append(i32(s, 8+i*4) & 0x7fffffff)
-
-        self.mode, self.rawmode = MODES[tuple(colors)]
-
-        # load JPEG tables, if any
-        self.jpeg = {}
-        for i in range(256):
-            id = 0x3000001|(i << 16)
-            if prop.has_key(id):
-                self.jpeg[i] = prop[id]
-
-        # print len(self.jpeg), "tables loaded"
-
-        self._open_subimage(1, self.maxid)
-
-    def _open_subimage(self, index = 1, subimage = 0):
-        #
-        # setup tile descriptors for a given subimage
-
-        stream = [
-            "Data Object Store %06d" % index,
-            "Resolution %04d" % subimage,
-            "Subimage 0000 Header"
-        ]
-
-        fp = self.ole.openstream(stream)
-
-        # skip prefix
-        p = fp.read(28)
-
-        # header stream
-        s = fp.read(36)
-
-        size = i32(s, 4), i32(s, 8)
-        tilecount = i32(s, 12)
-        tilesize = i32(s, 16), i32(s, 20)
-        channels = i32(s, 24)
-        offset = i32(s, 28)
-        length = i32(s, 32)
-
-        # print size, self.mode, self.rawmode
-
-        if size != self.size:
-            raise IOError, "subimage mismatch"
-
-        # get tile descriptors
-        fp.seek(28 + offset)
-        s = fp.read(i32(s, 12) * length)
-
-        x = y = 0
-        xsize, ysize = size
-        xtile, ytile = tilesize
-        self.tile = []
-
-        for i in range(0, len(s), length):
-
-            compression = i32(s, i+8)
-
-            if compression == 0:
-                self.tile.append(("raw", (x,y,x+xtile,y+ytile),
-                        i32(s, i) + 28, (self.rawmode)))
-
-            elif compression == 1:
-
-                # FIXME: the fill decoder is not implemented
-                self.tile.append(("fill", (x,y,x+xtile,y+ytile),
-                        i32(s, i) + 28, (self.rawmode, s[12:16])))
-
-            elif compression == 2:
-
-                internal_color_conversion = ord(s[14])
-                jpeg_tables = ord(s[15])
-                rawmode = self.rawmode
-
-                if internal_color_conversion:
-                    # The image is stored as usual (usually YCbCr).
-                    if rawmode == "RGBA":
-                        # For "RGBA", data is stored as YCbCrA based on
-                        # negative RGB. The following trick works around
-                        # this problem :
-                        jpegmode, rawmode = "YCbCrK", "CMYK"
-                    else:
-                        jpegmode = None # let the decoder decide
-
-                else:
-                    # The image is stored as defined by rawmode
-                    jpegmode = rawmode
-
-                self.tile.append(("jpeg", (x,y,x+xtile,y+ytile),
-                        i32(s, i) + 28, (rawmode, jpegmode)))
-
-                # FIXME: jpeg tables are tile dependent; the prefix
-                # data must be placed in the tile descriptor itself!
-
-                if jpeg_tables:
-                    self.tile_prefix = self.jpeg[jpeg_tables]
-
-            else:
-                raise IOError, "unknown/invalid compression"
-
-            x = x + xtile
-            if x >= xsize:
-                x, y = 0, y + ytile
-                if y >= ysize:
-                    break # isn't really required
-
-        self.stream = stream
-        self.fp = None
-
-    def load(self):
-
-        if not self.fp:
-            self.fp = self.ole.openstream(self.stream[:2] + ["Subimage 0000 Data"])
-
-        ImageFile.ImageFile.load(self)
-
-#
-# --------------------------------------------------------------------
-
-Image.register_open("FPX", FpxImageFile, _accept)
-
-Image.register_extension("FPX", ".fpx")
diff --git a/pythonPackages/pil/PIL/GbrImagePlugin.py b/pythonPackages/pil/PIL/GbrImagePlugin.py
deleted file mode 100644
index 273e1f8b3a..0000000000
--- a/pythonPackages/pil/PIL/GbrImagePlugin.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: GbrImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# load a GIMP brush file
-#
-# History:
-#       96-03-14 fl     Created
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1996.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image, ImageFile
-
-def i32(c):
-    return ord(c[3]) + (ord(c[2])<<8) + (ord(c[1])<<16) + (ord(c[0])<<24L)
-
-def _accept(prefix):
-    return i32(prefix) >= 20 and i32(prefix[4:8]) == 1
-
-##
-# Image plugin for the GIMP brush format.
-
-class GbrImageFile(ImageFile.ImageFile):
-
-    format = "GBR"
-    format_description = "GIMP brush file"
-
-    def _open(self):
-
-        header_size = i32(self.fp.read(4))
-        version = i32(self.fp.read(4))
-        if header_size < 20 or version != 1:
-            raise SyntaxError, "not a GIMP brush"
-
-        width = i32(self.fp.read(4))
-        height = i32(self.fp.read(4))
-        bytes = i32(self.fp.read(4))
-        if width <= 0 or height <= 0 or bytes != 1:
-            raise SyntaxError, "not a GIMP brush"
-
-        comment = self.fp.read(header_size - 20)[:-1]
-
-        self.mode = "L"
-        self.size = width, height
-
-        self.info["comment"] = comment
-
-        # Since the brush is so small, we read the data immediately
-        self.data = self.fp.read(width * height)
-
-    def load(self):
-
-        if not self.data:
-            return
-
-        # create an image out of the brush data block
-        self.im = Image.core.new(self.mode, self.size)
-        self.im.fromstring(self.data)
-        self.data = ""
-
-#
-# registry
-
-Image.register_open("GBR", GbrImageFile, _accept)
-
-Image.register_extension("GBR", ".gbr")
diff --git a/pythonPackages/pil/PIL/GdImageFile.py b/pythonPackages/pil/PIL/GdImageFile.py
deleted file mode 100644
index e6ddfa72d9..0000000000
--- a/pythonPackages/pil/PIL/GdImageFile.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: GdImageFile.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# GD file handling
-#
-# History:
-# 1996-04-12 fl   Created
-#
-# Copyright (c) 1997 by Secret Labs AB.
-# Copyright (c) 1996 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-# NOTE: This format cannot be automatically recognized, so the
-# class is not registered for use with Image.open().  To open a
-# gd file, use the GdImageFile.open() function instead.
-
-# THE GD FORMAT IS NOT DESIGNED FOR DATA INTERCHANGE.  This
-# implementation is provided for convenience and demonstrational
-# purposes only.
-
-
-__version__ = "0.1"
-
-import string
-import Image, ImageFile, ImagePalette
-
-def i16(c):
-    return ord(c[1]) + (ord(c[0])<<8)
-
-##
-# Image plugin for the GD uncompressed format.  Note that this format
-# is not supported by the standard <b>Image.open</b> function.  To use
-# this plugin, you have to import the <b>GdImageFile</b> module and
-# use the <b>GdImageFile.open</b> function.
-
-class GdImageFile(ImageFile.ImageFile):
-
-    format = "GD"
-    format_description = "GD uncompressed images"
-
-    def _open(self):
-
-        # Header
-        s = self.fp.read(775)
-
-        self.mode = "L" # FIXME: "P"
-        self.size = i16(s[0:2]), i16(s[2:4])
-
-        # transparency index
-        tindex = i16(s[5:7])
-        if tindex < 256:
-            self.info["transparent"] = tindex
-
-        self.palette = ImagePalette.raw("RGB", s[7:])
-
-        self.tile = [("raw", (0,0)+self.size, 775, ("L", 0, -1))]
-
-##
-# Load texture from a GD image file.
-#
-# @param filename GD file name, or an opened file handle.
-# @param mode Optional mode.  In this version, if the mode argument
-#     is given, it must be "r".
-# @return An image instance.
-# @exception IOError If the image could not be read.
-
-def open(fp, mode = "r"):
-
-    if mode != "r":
-        raise ValueError("bad mode")
-
-    if type(fp) == type(""):
-        import __builtin__
-        filename = fp
-        fp = __builtin__.open(fp, "rb")
-    else:
-        filename = ""
-
-    try:
-        return GdImageFile(fp, filename)
-    except SyntaxError:
-        raise IOError("cannot identify this image file")
diff --git a/pythonPackages/pil/PIL/GifImagePlugin.py b/pythonPackages/pil/PIL/GifImagePlugin.py
deleted file mode 100644
index cce0fe2a16..0000000000
--- a/pythonPackages/pil/PIL/GifImagePlugin.py
+++ /dev/null
@@ -1,405 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: GifImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# GIF file handling
-#
-# History:
-# 1995-09-01 fl   Created
-# 1996-12-14 fl   Added interlace support
-# 1996-12-30 fl   Added animation support
-# 1997-01-05 fl   Added write support, fixed local colour map bug
-# 1997-02-23 fl   Make sure to load raster data in getdata()
-# 1997-07-05 fl   Support external decoder (0.4)
-# 1998-07-09 fl   Handle all modes when saving (0.5)
-# 1998-07-15 fl   Renamed offset attribute to avoid name clash
-# 2001-04-16 fl   Added rewind support (seek to frame 0) (0.6)
-# 2001-04-17 fl   Added palette optimization (0.7)
-# 2002-06-06 fl   Added transparency support for save (0.8)
-# 2004-02-24 fl   Disable interlacing for small images
-#
-# Copyright (c) 1997-2004 by Secret Labs AB
-# Copyright (c) 1995-2004 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.9"
-
-
-import Image, ImageFile, ImagePalette
-
-
-# --------------------------------------------------------------------
-# Helpers
-
-def i16(c):
-    return ord(c[0]) + (ord(c[1])<<8)
-
-def o16(i):
-    return chr(i&255) + chr(i>>8&255)
-
-
-# --------------------------------------------------------------------
-# Identify/read GIF files
-
-def _accept(prefix):
-    return prefix[:6] in ["GIF87a", "GIF89a"]
-
-##
-# Image plugin for GIF images.  This plugin supports both GIF87 and
-# GIF89 images.
-
-class GifImageFile(ImageFile.ImageFile):
-
-    format = "GIF"
-    format_description = "Compuserve GIF"
-
-    global_palette = None
-
-    def data(self):
-        s = self.fp.read(1)
-        if s and ord(s):
-            return self.fp.read(ord(s))
-        return None
-
-    def _open(self):
-
-        # Screen
-        s = self.fp.read(13)
-        if s[:6] not in ["GIF87a", "GIF89a"]:
-            raise SyntaxError, "not a GIF file"
-
-        self.info["version"] = s[:6]
-
-        self.size = i16(s[6:]), i16(s[8:])
-
-        self.tile = []
-
-        flags = ord(s[10])
-
-        bits = (flags & 7) + 1
-
-        if flags & 128:
-            # get global palette
-            self.info["background"] = ord(s[11])
-            # check if palette contains colour indices
-            p = self.fp.read(3<<bits)
-            for i in range(0, len(p), 3):
-                if not (chr(i/3) == p[i] == p[i+1] == p[i+2]):
-                    p = ImagePalette.raw("RGB", p)
-                    self.global_palette = self.palette = p
-                    break
-
-        self.__fp = self.fp # FIXME: hack
-        self.__rewind = self.fp.tell()
-        self.seek(0) # get ready to read first frame
-
-    def seek(self, frame):
-
-        if frame == 0:
-            # rewind
-            self.__offset = 0
-            self.dispose = None
-            self.__frame = -1
-            self.__fp.seek(self.__rewind)
-
-        if frame != self.__frame + 1:
-            raise ValueError, "cannot seek to frame %d" % frame
-        self.__frame = frame
-
-        self.tile = []
-
-        self.fp = self.__fp
-        if self.__offset:
-            # backup to last frame
-            self.fp.seek(self.__offset)
-            while self.data():
-                pass
-            self.__offset = 0
-
-        if self.dispose:
-            self.im = self.dispose
-            self.dispose = None
-
-        self.palette = self.global_palette
-
-        while 1:
-
-            s = self.fp.read(1)
-            if not s or s == ";":
-                break
-
-            elif s == "!":
-                #
-                # extensions
-                #
-                s = self.fp.read(1)
-                block = self.data()
-                if ord(s) == 249:
-                    #
-                    # graphic control extension
-                    #
-                    flags = ord(block[0])
-                    if flags & 1:
-                        self.info["transparency"] = ord(block[3])
-                    self.info["duration"] = i16(block[1:3]) * 10
-                    try:
-                        # disposal methods
-                        if flags & 8:
-                            # replace with background colour
-                            self.dispose = Image.core.fill("P", self.size,
-                                self.info["background"])
-                        elif flags & 16:
-                            # replace with previous contents
-                            self.dispose = self.im.copy()
-                    except (AttributeError, KeyError):
-                        pass
-                elif ord(s) == 255:
-                    #
-                    # application extension
-                    #
-                    self.info["extension"] = block, self.fp.tell()
-                    if block[:11] == "NETSCAPE2.0":
-                        self.info["loop"] = 1 # FIXME
-                while self.data():
-                    pass
-
-            elif s == ",":
-                #
-                # local image
-                #
-                s = self.fp.read(9)
-
-                # extent
-                x0, y0 = i16(s[0:]), i16(s[2:])
-                x1, y1 = x0 + i16(s[4:]), y0 + i16(s[6:])
-                flags = ord(s[8])
-
-                interlace = (flags & 64) != 0
-
-                if flags & 128:
-                    bits = (flags & 7) + 1
-                    self.palette =\
-                        ImagePalette.raw("RGB", self.fp.read(3<<bits))
-
-                # image data
-                bits = ord(self.fp.read(1))
-                self.__offset = self.fp.tell()
-                self.tile = [("gif",
-                             (x0, y0, x1, y1),
-                             self.__offset,
-                             (bits, interlace))]
-                break
-
-            else:
-                pass
-                # raise IOError, "illegal GIF tag `%x`" % ord(s)
-
-        if not self.tile:
-            # self.__fp = None
-            raise EOFError, "no more images in GIF file"
-
-        self.mode = "L"
-        if self.palette:
-            self.mode = "P"
-
-    def tell(self):
-        return self.__frame
-
-
-# --------------------------------------------------------------------
-# Write GIF files
-
-try:
-    import _imaging_gif
-except ImportError:
-    _imaging_gif = None
-
-RAWMODE = {
-    "1": "L",
-    "L": "L",
-    "P": "P",
-}
-
-def _save(im, fp, filename):
-
-    if _imaging_gif:
-        # call external driver
-        try:
-            _imaging_gif.save(im, fp, filename)
-            return
-        except IOError:
-            pass # write uncompressed file
-
-    try:
-        rawmode = RAWMODE[im.mode]
-        imOut = im
-    except KeyError:
-        # convert on the fly (EXPERIMENTAL -- I'm not sure PIL
-        # should automatically convert images on save...)
-        if Image.getmodebase(im.mode) == "RGB":
-            imOut = im.convert("P")
-            rawmode = "P"
-        else:
-            imOut = im.convert("L")
-            rawmode = "L"
-
-    # header
-    for s in getheader(imOut, im.encoderinfo):
-        fp.write(s)
-
-    flags = 0
-
-    try:
-        interlace = im.encoderinfo["interlace"]
-    except KeyError:
-        interlace = 1
-
-    # workaround for @PIL153
-    if min(im.size) < 16:
-        interlace = 0
-
-    if interlace:
-        flags = flags | 64
-
-    try:
-        transparency = im.encoderinfo["transparency"]
-    except KeyError:
-        pass
-    else:
-        # transparency extension block
-        fp.write("!" +
-                 chr(249) +             # extension intro
-                 chr(4) +               # length
-                 chr(1) +               # transparency info present
-                 o16(0) +               # duration
-                 chr(int(transparency)) # transparency index
-                 + chr(0))
-
-    # local image header
-    fp.write("," +
-             o16(0) + o16(0) +          # bounding box
-             o16(im.size[0]) +          # size
-             o16(im.size[1]) +
-             chr(flags) +               # flags
-             chr(8))                    # bits
-
-    imOut.encoderconfig = (8, interlace)
-
-    ImageFile._save(imOut, fp, [("gif", (0,0)+im.size, 0, rawmode)])
-
-    fp.write("\0") # end of image data
-
-    fp.write(";") # end of file
-
-    try:
-        fp.flush()
-    except: pass
-
-def _save_netpbm(im, fp, filename):
-
-    #
-    # If you need real GIF compression and/or RGB quantization, you
-    # can use the external NETPBM/PBMPLUS utilities.  See comments
-    # below for information on how to enable this.
-
-    import os
-    file = im._dump()
-    if im.mode != "RGB":
-        os.system("ppmtogif %s >%s" % (file, filename))
-    else:
-        os.system("ppmquant 256 %s | ppmtogif >%s" % (file, filename))
-    try: os.unlink(file)
-    except: pass
-
-
-# --------------------------------------------------------------------
-# GIF utilities
-
-def getheader(im, info=None):
-    """Return a list of strings representing a GIF header"""
-
-    optimize = info and info.get("optimize", 0)
-
-    s = [
-        "GIF87a" +              # magic
-        o16(im.size[0]) +       # size
-        o16(im.size[1]) +
-        chr(7 + 128) +          # flags: bits + palette
-        chr(0) +                # background
-        chr(0)                  # reserved/aspect
-    ]
-
-    if optimize:
-        # minimize color palette
-        i = 0
-        maxcolor = 0
-        for count in im.histogram():
-            if count:
-                maxcolor = i
-            i = i + 1
-    else:
-        maxcolor = 256
-
-    # global palette
-    if im.mode == "P":
-        # colour palette
-        s.append(im.im.getpalette("RGB")[:maxcolor*3])
-    else:
-        # greyscale
-        for i in range(maxcolor):
-            s.append(chr(i) * 3)
-
-    return s
-
-def getdata(im, offset = (0, 0), **params):
-    """Return a list of strings representing this image.
-       The first string is a local image header, the rest contains
-       encoded image data."""
-
-    class collector:
-        data = []
-        def write(self, data):
-            self.data.append(data)
-
-    im.load() # make sure raster data is available
-
-    fp = collector()
-
-    try:
-        im.encoderinfo = params
-
-        # local image header
-        fp.write("," +
-                 o16(offset[0]) +       # offset
-                 o16(offset[1]) +
-                 o16(im.size[0]) +      # size
-                 o16(im.size[1]) +
-                 chr(0) +               # flags
-                 chr(8))                # bits
-
-        ImageFile._save(im, fp, [("gif", (0,0)+im.size, 0, RAWMODE[im.mode])])
-
-        fp.write("\0") # end of image data
-
-    finally:
-        del im.encoderinfo
-
-    return fp.data
-
-
-# --------------------------------------------------------------------
-# Registry
-
-Image.register_open(GifImageFile.format, GifImageFile, _accept)
-Image.register_save(GifImageFile.format, _save)
-Image.register_extension(GifImageFile.format, ".gif")
-Image.register_mime(GifImageFile.format, "image/gif")
-
-#
-# Uncomment the following line if you wish to use NETPBM/PBMPLUS
-# instead of the built-in "uncompressed" GIF encoder
-
-# Image.register_save(GifImageFile.format, _save_netpbm)
diff --git a/pythonPackages/pil/PIL/GimpGradientFile.py b/pythonPackages/pil/PIL/GimpGradientFile.py
deleted file mode 100644
index e246d6dba5..0000000000
--- a/pythonPackages/pil/PIL/GimpGradientFile.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# Python Imaging Library
-# $Id: GimpGradientFile.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# stuff to read (and render) GIMP gradient files
-#
-# History:
-#       97-08-23 fl     Created
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1997.
-#
-# See the README file for information on usage and redistribution.
-#
-
-from math import pi, log, sin, sqrt
-import string
-
-# --------------------------------------------------------------------
-# Stuff to translate curve segments to palette values (derived from
-# the corresponding code in GIMP, written by Federico Mena Quintero.
-# See the GIMP distribution for more information.)
-#
-
-EPSILON = 1e-10
-
-def linear(middle, pos):
-    if pos <= middle:
-        if middle < EPSILON:
-            return 0.0
-        else:
-            return 0.5 * pos / middle
-    else:
-        pos = pos - middle
-        middle = 1.0 - middle
-        if middle < EPSILON:
-            return 1.0
-        else:
-            return 0.5 + 0.5 * pos / middle
-
-def curved(middle, pos):
-    return pos ** (log(0.5) / log(max(middle, EPSILON)))
-
-def sine(middle, pos):
-    return (sin((-pi / 2.0) + pi * linear(middle, pos)) + 1.0) / 2.0
-
-def sphere_increasing(middle, pos):
-    return sqrt(1.0 - (linear(middle, pos) - 1.0) ** 2)
-
-def sphere_decreasing(middle, pos):
-    return 1.0 - sqrt(1.0 - linear(middle, pos) ** 2)
-
-SEGMENTS = [ linear, curved, sine, sphere_increasing, sphere_decreasing ]
-
-class GradientFile:
-
-    gradient = None
-
-    def getpalette(self, entries = 256):
-
-        palette = []
-
-        ix = 0
-        x0, x1, xm, rgb0, rgb1, segment = self.gradient[ix]
-
-        for i in range(entries):
-
-            x = i / float(entries-1)
-
-            while x1 < x:
-                ix = ix + 1
-                x0, x1, xm, rgb0, rgb1, segment = self.gradient[ix]
-
-            w = x1 - x0
-
-            if w < EPSILON:
-                scale = segment(0.5, 0.5)
-            else:
-                scale = segment((xm - x0) / w, (x - x0) / w)
-
-            # expand to RGBA
-            r = chr(int(255 * ((rgb1[0] - rgb0[0]) * scale + rgb0[0]) + 0.5))
-            g = chr(int(255 * ((rgb1[1] - rgb0[1]) * scale + rgb0[1]) + 0.5))
-            b = chr(int(255 * ((rgb1[2] - rgb0[2]) * scale + rgb0[2]) + 0.5))
-            a = chr(int(255 * ((rgb1[3] - rgb0[3]) * scale + rgb0[3]) + 0.5))
-
-            # add to palette
-            palette.append(r + g + b + a)
-
-        return string.join(palette, ""), "RGBA"
-
-##
-# File handler for GIMP's gradient format.
-
-class GimpGradientFile(GradientFile):
-
-    def __init__(self, fp):
-
-        if fp.readline()[:13] != "GIMP Gradient":
-            raise SyntaxError, "not a GIMP gradient file"
-
-        count = int(fp.readline())
-
-        gradient = []
-
-        for i in range(count):
-
-            s = string.split(fp.readline())
-            w = map(float, s[:11])
-
-            x0, x1  = w[0], w[2]
-            xm      = w[1]
-            rgb0    = w[3:7]
-            rgb1    = w[7:11]
-
-            segment = SEGMENTS[int(s[11])]
-            cspace  = int(s[12])
-
-            if cspace != 0:
-                raise IOError, "cannot handle HSV colour space"
-
-            gradient.append((x0, x1, xm, rgb0, rgb1, segment))
-
-        self.gradient = gradient
diff --git a/pythonPackages/pil/PIL/GimpPaletteFile.py b/pythonPackages/pil/PIL/GimpPaletteFile.py
deleted file mode 100644
index 39391470b8..0000000000
--- a/pythonPackages/pil/PIL/GimpPaletteFile.py
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Python Imaging Library
-# $Id: GimpPaletteFile.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# stuff to read GIMP palette files
-#
-# History:
-# 1997-08-23 fl     Created
-# 2004-09-07 fl     Support GIMP 2.0 palette files.
-#
-# Copyright (c) Secret Labs AB 1997-2004.  All rights reserved.
-# Copyright (c) Fredrik Lundh 1997-2004.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import re, string
-
-##
-# File handler for GIMP's palette format.
-
-class GimpPaletteFile:
-
-    rawmode = "RGB"
-
-    def __init__(self, fp):
-
-        self.palette = map(lambda i: chr(i)*3, range(256))
-
-        if fp.readline()[:12] != "GIMP Palette":
-            raise SyntaxError, "not a GIMP palette file"
-
-        i = 0
-
-        while i <= 255:
-
-            s = fp.readline()
-
-            if not s:
-                break
-            # skip fields and comment lines
-            if re.match("\w+:|#", s):
-                continue
-            if len(s) > 100:
-                raise SyntaxError, "bad palette file"
-
-            v = tuple(map(int, string.split(s)[:3]))
-            if len(v) != 3:
-                raise ValueError, "bad palette entry"
-
-            if 0 <= i <= 255:
-                self.palette[i] = chr(v[0]) + chr(v[1]) + chr(v[2])
-
-            i = i + 1
-
-        self.palette = string.join(self.palette, "")
-
-
-    def getpalette(self):
-
-        return self.palette, self.rawmode
diff --git a/pythonPackages/pil/PIL/GribStubImagePlugin.py b/pythonPackages/pil/PIL/GribStubImagePlugin.py
deleted file mode 100644
index 73d5404e82..0000000000
--- a/pythonPackages/pil/PIL/GribStubImagePlugin.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: GribStubImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# GRIB stub adapter
-#
-# Copyright (c) 1996-2003 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image, ImageFile
-
-_handler = None
-
-##
-# Install application-specific GRIB image handler.
-#
-# @param handler Handler object.
-
-def register_handler(handler):
-    global _handler
-    _handler = handler
-
-# --------------------------------------------------------------------
-# Image adapter
-
-def _accept(prefix):
-    return prefix[0:4] == "GRIB" and prefix[7] == chr(1)
-
-class GribStubImageFile(ImageFile.StubImageFile):
-
-    format = "GRIB"
-    format_description = "GRIB"
-
-    def _open(self):
-
-        offset = self.fp.tell()
-
-        if not _accept(self.fp.read(8)):
-            raise SyntaxError("Not a GRIB file")
-
-        self.fp.seek(offset)
-
-        # make something up
-        self.mode = "F"
-        self.size = 1, 1
-
-        loader = self._load()
-        if loader:
-            loader.open(self)
-
-    def _load(self):
-        return _handler
-
-def _save(im, fp, filename):
-    if _handler is None or not hasattr("_handler", "save"):
-        raise IOError("GRIB save handler not installed")
-    _handler.save(im, fp, filename)
-
-
-# --------------------------------------------------------------------
-# Registry
-
-Image.register_open(GribStubImageFile.format, GribStubImageFile, _accept)
-Image.register_save(GribStubImageFile.format, _save)
-
-Image.register_extension(GribStubImageFile.format, ".grib")
diff --git a/pythonPackages/pil/PIL/Hdf5StubImagePlugin.py b/pythonPackages/pil/PIL/Hdf5StubImagePlugin.py
deleted file mode 100644
index 31d4f6e148..0000000000
--- a/pythonPackages/pil/PIL/Hdf5StubImagePlugin.py
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: Hdf5StubImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# HDF5 stub adapter
-#
-# Copyright (c) 2000-2003 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image, ImageFile
-
-_handler = None
-
-##
-# Install application-specific HDF5 image handler.
-#
-# @param handler Handler object.
-
-def register_handler(handler):
-    global _handler
-    _handler = handler
-
-# --------------------------------------------------------------------
-# Image adapter
-
-def _accept(prefix):
-    return prefix[:8] == "\x89HDF\r\n\x1a\n"
-
-class HDF5StubImageFile(ImageFile.StubImageFile):
-
-    format = "HDF5"
-    format_description = "HDF5"
-
-    def _open(self):
-
-        offset = self.fp.tell()
-
-        if not _accept(self.fp.read(8)):
-            raise SyntaxError("Not an HDF file")
-
-        self.fp.seek(offset)
-
-        # make something up
-        self.mode = "F"
-        self.size = 1, 1
-
-        loader = self._load()
-        if loader:
-            loader.open(self)
-
-    def _load(self):
-        return _handler
-
-
-def _save(im, fp, filename):
-    if _handler is None or not hasattr("_handler", "save"):
-        raise IOError("HDF5 save handler not installed")
-    _handler.save(im, fp, filename)
-
-
-# --------------------------------------------------------------------
-# Registry
-
-Image.register_open(HDF5StubImageFile.format, HDF5StubImageFile, _accept)
-Image.register_save(HDF5StubImageFile.format, _save)
-
-Image.register_extension(HDF5StubImageFile.format, ".h5")
-Image.register_extension(HDF5StubImageFile.format, ".hdf")
diff --git a/pythonPackages/pil/PIL/IcnsImagePlugin.py b/pythonPackages/pil/PIL/IcnsImagePlugin.py
deleted file mode 100644
index a85695da5b..0000000000
--- a/pythonPackages/pil/PIL/IcnsImagePlugin.py
+++ /dev/null
@@ -1,211 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# Mac OS X icns file decoder, based on icns.py by Bob Ippolito.
-#
-# history:
-# 2004-10-09 fl   Turned into a PIL plugin; removed 2.3 dependencies.
-#
-# Copyright (c) 2004 by Bob Ippolito.
-# Copyright (c) 2004 by Secret Labs.
-# Copyright (c) 2004 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image, ImageFile
-import string, struct
-
-HEADERSIZE = 8
-
-def nextheader(fobj):
-    return struct.unpack('>4sI', fobj.read(HEADERSIZE))
-
-def read_32t(fobj, (start, length), (width, height)):
-    # The 128x128 icon seems to have an extra header for some reason.
-    fobj.seek(start)
-    sig = fobj.read(4)
-    if sig != '\x00\x00\x00\x00':
-        raise SyntaxError, 'Unknown signature, expecting 0x00000000'
-    return read_32(fobj, (start + 4, length - 4), (width, height))
-
-def read_32(fobj, (start, length), size):
-    """
-    Read a 32bit RGB icon resource.  Seems to be either uncompressed or
-    an RLE packbits-like scheme.
-    """
-    fobj.seek(start)
-    sizesq = size[0] * size[1]
-    if length == sizesq * 3:
-        # uncompressed ("RGBRGBGB")
-        indata = fobj.read(length)
-        im = Image.frombuffer("RGB", size, indata, "raw", "RGB", 0, 1)
-    else:
-        # decode image
-        im = Image.new("RGB", size, None)
-        for band_ix in range(3):
-            data = []
-            bytesleft = sizesq
-            while bytesleft > 0:
-                byte = fobj.read(1)
-                if not byte:
-                    break
-                byte = ord(byte)
-                if byte & 0x80:
-                    blocksize = byte - 125
-                    byte = fobj.read(1)
-                    for i in range(blocksize):
-                        data.append(byte)
-                else:
-                    blocksize = byte + 1
-                    data.append(fobj.read(blocksize))
-                bytesleft = bytesleft - blocksize
-                if bytesleft <= 0:
-                    break
-            if bytesleft != 0:
-                raise SyntaxError(
-                    "Error reading %r channel [%r]" % (channel, bytesleft)
-                    )
-            band = Image.frombuffer(
-                "L", size, string.join(data, ""), "raw", "L", 0, 1
-                )
-            im.im.putband(band.im, band_ix)
-    return {"RGB": im}
-
-def read_mk(fobj, (start, length), size):
-    # Alpha masks seem to be uncompressed
-    fobj.seek(start)
-    band = Image.frombuffer(
-        "L", size, fobj.read(size[0]*size[1]), "raw", "L", 0, 1
-        )
-    return {"A": band}
-
-class IcnsFile:
-
-    SIZES = {
-        (128, 128): [
-            ('it32', read_32t),
-            ('t8mk', read_mk),
-        ],
-        (48, 48): [
-            ('ih32', read_32),
-            ('h8mk', read_mk),
-        ],
-        (32, 32): [
-            ('il32', read_32),
-            ('l8mk', read_mk),
-        ],
-        (16, 16): [
-            ('is32', read_32),
-            ('s8mk', read_mk),
-        ],
-    }
-
-    def __init__(self, fobj):
-        """
-        fobj is a file-like object as an icns resource
-        """
-        # signature : (start, length)
-        self.dct = dct = {}
-        self.fobj = fobj
-        sig, filesize = nextheader(fobj)
-        if sig != 'icns':
-            raise SyntaxError, 'not an icns file'
-        i = HEADERSIZE
-        while i < filesize:
-            sig, blocksize = nextheader(fobj)
-            i = i + HEADERSIZE
-            blocksize = blocksize - HEADERSIZE
-            dct[sig] = (i, blocksize)
-            fobj.seek(blocksize, 1)
-            i = i + blocksize
-
-    def itersizes(self):
-        sizes = []
-        for size, fmts in self.SIZES.items():
-            for (fmt, reader) in fmts:
-                if self.dct.has_key(fmt):
-                    sizes.append(size)
-                    break
-        return sizes
-
-    def bestsize(self):
-        sizes = self.itersizes()
-        if not sizes:
-            raise SyntaxError, "No 32bit icon resources found"
-        return max(sizes)
-
-    def dataforsize(self, size):
-        """
-        Get an icon resource as {channel: array}.  Note that
-        the arrays are bottom-up like windows bitmaps and will likely
-        need to be flipped or transposed in some way.
-        """
-        dct = {}
-        for code, reader in self.SIZES[size]:
-            desc = self.dct.get(code)
-            if desc is not None:
-                dct.update(reader(self.fobj, desc, size))
-        return dct
-
-    def getimage(self, size=None):
-        if size is None:
-            size = self.bestsize()
-        channels = self.dataforsize(size)
-        im = channels.get("RGB").copy()
-        try:
-            im.putalpha(channels["A"])
-        except KeyError:
-            pass
-        return im
-
-##
-# Image plugin for Mac OS icons.
-
-class IcnsImageFile(ImageFile.ImageFile):
-    """
-    PIL read-only image support for Mac OS .icns files.
-    Chooses the best resolution, but will possibly load
-    a different size image if you mutate the size attribute
-    before calling 'load'.
-
-    The info dictionary has a key 'sizes' that is a list
-    of sizes that the icns file has.
-    """
-
-    format = "ICNS"
-    format_description = "Mac OS icns resource"
-
-    def _open(self):
-        self.icns = IcnsFile(self.fp)
-        self.mode = 'RGBA'
-        self.size = self.icns.bestsize()
-        self.info['sizes'] = self.icns.itersizes()
-        # Just use this to see if it's loaded or not yet.
-        self.tile = ('',)
-
-    def load(self):
-        Image.Image.load(self)
-        if not self.tile:
-            return
-        self.load_prepare()
-        # This is likely NOT the best way to do it, but whatever.
-        im = self.icns.getimage(self.size)
-        self.im = im.im
-        self.mode = im.mode
-        self.size = im.size
-        self.fp = None
-        self.icns = None
-        self.tile = ()
-        self.load_end()
-
-
-Image.register_open("ICNS", IcnsImageFile, lambda x: x[:4] == 'icns')
-Image.register_extension("ICNS", '.icns')
-
-if __name__ == '__main__':
-    import os, sys
-    im = Image.open(open(sys.argv[1], "rb"))
-    im.save("out.png")
-    os.startfile("out.png")
diff --git a/pythonPackages/pil/PIL/IcoImagePlugin.py b/pythonPackages/pil/PIL/IcoImagePlugin.py
deleted file mode 100644
index 5cdd284392..0000000000
--- a/pythonPackages/pil/PIL/IcoImagePlugin.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: IcoImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# Windows Icon support for PIL
-#
-# Notes:
-#       uses BmpImagePlugin.py to read the bitmap data.
-#
-# History:
-#       96-05-27 fl     Created
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1996.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.1"
-
-import string
-
-import Image, BmpImagePlugin
-
-
-#
-# --------------------------------------------------------------------
-
-def i16(c):
-    return ord(c[0]) + (ord(c[1])<<8)
-
-def i32(c):
-    return ord(c[0]) + (ord(c[1])<<8) + (ord(c[2])<<16) + (ord(c[3])<<24)
-
-
-def _accept(prefix):
-    return prefix[:4] == "\0\0\1\0"
-
-##
-# Image plugin for Windows Icon files.
-
-class IcoImageFile(BmpImagePlugin.BmpImageFile):
-
-    format = "ICO"
-    format_description = "Windows Icon"
-
-    def _open(self):
-
-        # check magic
-        s = self.fp.read(6)
-        if not _accept(s):
-            raise SyntaxError, "not an ICO file"
-
-        # pick the largest icon in the file
-        m = ""
-        for i in range(i16(s[4:])):
-            s = self.fp.read(16)
-            if not m:
-                m = s
-            elif ord(s[0]) > ord(m[0]) and ord(s[1]) > ord(m[1]):
-                m = s
-            #print "width", ord(s[0])
-            #print "height", ord(s[1])
-            #print "colors", ord(s[2])
-            #print "reserved", ord(s[3])
-            #print "planes", i16(s[4:])
-            #print "bitcount", i16(s[6:])
-            #print "bytes", i32(s[8:])
-            #print "offset", i32(s[12:])
-
-        # load as bitmap
-        self._bitmap(i32(m[12:]))
-
-        # patch up the bitmap height
-        self.size = self.size[0], self.size[1]/2
-        d, e, o, a = self.tile[0]
-        self.tile[0] = d, (0,0)+self.size, o, a
-
-        return
-
-
-#
-# --------------------------------------------------------------------
-
-Image.register_open("ICO", IcoImageFile, _accept)
-
-Image.register_extension("ICO", ".ico")
diff --git a/pythonPackages/pil/PIL/ImImagePlugin.py b/pythonPackages/pil/PIL/ImImagePlugin.py
deleted file mode 100644
index 17b8c0ea97..0000000000
--- a/pythonPackages/pil/PIL/ImImagePlugin.py
+++ /dev/null
@@ -1,335 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImImagePlugin.py 2285 2005-02-07 23:52:14Z fredrik $
-#
-# IFUNC IM file handling for PIL
-#
-# history:
-# 1995-09-01 fl   Created.
-# 1997-01-03 fl   Save palette images
-# 1997-01-08 fl   Added sequence support
-# 1997-01-23 fl   Added P and RGB save support
-# 1997-05-31 fl   Read floating point images
-# 1997-06-22 fl   Save floating point images
-# 1997-08-27 fl   Read and save 1-bit images
-# 1998-06-25 fl   Added support for RGB+LUT images
-# 1998-07-02 fl   Added support for YCC images
-# 1998-07-15 fl   Renamed offset attribute to avoid name clash
-# 1998-12-29 fl   Added I;16 support
-# 2001-02-17 fl   Use 're' instead of 'regex' (Python 2.1) (0.7)
-# 2003-09-26 fl   Added LA/PA support
-#
-# Copyright (c) 1997-2003 by Secret Labs AB.
-# Copyright (c) 1995-2001 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.7"
-
-import re, string
-import Image, ImageFile, ImagePalette
-
-
-# --------------------------------------------------------------------
-# Standard tags
-
-COMMENT = "Comment"
-DATE = "Date"
-EQUIPMENT = "Digitalization equipment"
-FRAMES = "File size (no of images)"
-LUT = "Lut"
-NAME = "Name"
-SCALE = "Scale (x,y)"
-SIZE = "Image size (x*y)"
-MODE = "Image type"
-
-TAGS = { COMMENT:0, DATE:0, EQUIPMENT:0, FRAMES:0, LUT:0, NAME:0,
-         SCALE:0, SIZE:0, MODE:0 }
-
-OPEN = {
-    # ifunc93/p3cfunc formats
-    "0 1 image": ("1", "1"),
-    "L 1 image": ("1", "1"),
-    "Greyscale image": ("L", "L"),
-    "Grayscale image": ("L", "L"),
-    "RGB image": ("RGB", "RGB;L"),
-    "RLB image": ("RGB", "RLB"),
-    "RYB image": ("RGB", "RLB"),
-    "B1 image": ("1", "1"),
-    "B2 image": ("P", "P;2"),
-    "B4 image": ("P", "P;4"),
-    "X 24 image": ("RGB", "RGB"),
-    "L 32 S image": ("I", "I;32"),
-    "L 32 F image": ("F", "F;32"),
-    # old p3cfunc formats
-    "RGB3 image": ("RGB", "RGB;T"),
-    "RYB3 image": ("RGB", "RYB;T"),
-    # extensions
-    "LA image": ("LA", "LA;L"),
-    "RGBA image": ("RGBA", "RGBA;L"),
-    "RGBX image": ("RGBX", "RGBX;L"),
-    "CMYK image": ("CMYK", "CMYK;L"),
-    "YCC image": ("YCbCr", "YCbCr;L"),
-}
-
-# ifunc95 extensions
-for i in ["8", "8S", "16", "16S", "32", "32F"]:
-    OPEN["L %s image" % i] = ("F", "F;%s" % i)
-    OPEN["L*%s image" % i] = ("F", "F;%s" % i)
-for i in ["16", "16B"]:
-    OPEN["L %s image" % i] = ("I;%s" % i, "I;%s" % i)
-    OPEN["L*%s image" % i] = ("I;%s" % i, "I;%s" % i)
-for i in ["32S"]:
-    OPEN["L %s image" % i] = ("I", "I;%s" % i)
-    OPEN["L*%s image" % i] = ("I", "I;%s" % i)
-for i in range(2, 33):
-    OPEN["L*%s image" % i] = ("F", "F;%s" % i)
-
-
-# --------------------------------------------------------------------
-# Read IM directory
-
-split = re.compile(r"^([A-Za-z][^:]*):[ \t]*(.*)[ \t]*$")
-
-def number(s):
-    try:
-        return int(s)
-    except ValueError:
-        return float(s)
-
-##
-# Image plugin for the IFUNC IM file format.
-
-class ImImageFile(ImageFile.ImageFile):
-
-    format = "IM"
-    format_description = "IFUNC Image Memory"
-
-    def _open(self):
-
-        # Quick rejection: if there's not an LF among the first
-        # 100 bytes, this is (probably) not a text header.
-
-        if not "\n" in self.fp.read(100):
-            raise SyntaxError, "not an IM file"
-        self.fp.seek(0)
-
-        n = 0
-
-        # Default values
-        self.info[MODE] = "L"
-        self.info[SIZE] = (512, 512)
-        self.info[FRAMES] = 1
-
-        self.rawmode = "L"
-
-        while 1:
-
-            s = self.fp.read(1)
-
-            # Some versions of IFUNC uses \n\r instead of \r\n...
-            if s == "\r":
-                continue
-
-            if not s or s[0] == chr(0) or s[0] == chr(26):
-                break
-
-            # FIXME: this may read whole file if not a text file
-            s = s + self.fp.readline()
-
-            if len(s) > 100:
-                raise SyntaxError, "not an IM file"
-
-            if s[-2:] == '\r\n':
-                s = s[:-2]
-            elif s[-1:] == '\n':
-                s = s[:-1]
-
-            try:
-                m = split.match(s)
-            except re.error, v:
-                raise SyntaxError, "not an IM file"
-
-            if m:
-
-                k, v = m.group(1,2)
-
-                # Convert value as appropriate
-                if k in [FRAMES, SCALE, SIZE]:
-                    v = string.replace(v, "*", ",")
-                    v = tuple(map(number, string.split(v, ",")))
-                    if len(v) == 1:
-                        v = v[0]
-                elif k == MODE and OPEN.has_key(v):
-                    v, self.rawmode = OPEN[v]
-
-                # Add to dictionary. Note that COMMENT tags are
-                # combined into a list of strings.
-                if k == COMMENT:
-                    if self.info.has_key(k):
-                        self.info[k].append(v)
-                    else:
-                        self.info[k] = [v]
-                else:
-                    self.info[k] = v
-
-                if TAGS.has_key(k):
-                    n = n + 1
-
-            else:
-
-                raise SyntaxError, "Syntax error in IM header: " + s
-
-        if not n:
-            raise SyntaxError, "Not an IM file"
-
-        # Basic attributes
-        self.size = self.info[SIZE]
-        self.mode = self.info[MODE]
-
-        # Skip forward to start of image data
-        while s and s[0] != chr(26):
-            s = self.fp.read(1)
-        if not s:
-            raise SyntaxError, "File truncated"
-
-        if self.info.has_key(LUT):
-            # convert lookup table to palette or lut attribute
-            palette = self.fp.read(768)
-            greyscale = 1 # greyscale palette
-            linear = 1 # linear greyscale palette
-            for i in range(256):
-                if palette[i] == palette[i+256] == palette[i+512]:
-                    if palette[i] != chr(i):
-                        linear = 0
-                else:
-                    greyscale = 0
-            if self.mode == "L" or self.mode == "LA":
-                if greyscale:
-                    if not linear:
-                        self.lut = map(ord, palette[:256])
-                else:
-                    if self.mode == "L":
-                        self.mode = self.rawmode = "P"
-                    elif self.mode == "LA":
-                        self.mode = self.rawmode = "PA"
-                    self.palette = ImagePalette.raw("RGB;L", palette)
-            elif self.mode == "RGB":
-                if not greyscale or not linear:
-                    self.lut = map(ord, palette)
-
-        self.frame = 0
-
-        self.__offset = offs = self.fp.tell()
-
-        self.__fp = self.fp # FIXME: hack
-
-        if self.rawmode[:2] == "F;":
-
-            # ifunc95 formats
-            try:
-                # use bit decoder (if necessary)
-                bits = int(self.rawmode[2:])
-                if bits not in [8, 16, 32]:
-                    self.tile = [("bit", (0,0)+self.size, offs,
-                                 (bits, 8, 3, 0, -1))]
-                    return
-            except ValueError:
-                pass
-
-        if self.rawmode in ["RGB;T", "RYB;T"]:
-            # Old LabEye/3PC files.  Would be very surprised if anyone
-            # ever stumbled upon such a file ;-)
-            size = self.size[0] * self.size[1]
-            self.tile = [("raw", (0,0)+self.size, offs, ("G", 0, -1)),
-                         ("raw", (0,0)+self.size, offs+size, ("R", 0, -1)),
-                         ("raw", (0,0)+self.size, offs+2*size, ("B", 0, -1))]
-        else:
-            # LabEye/IFUNC files
-            self.tile = [("raw", (0,0)+self.size, offs, (self.rawmode, 0, -1))]
-
-    def seek(self, frame):
-
-        if frame < 0 or frame >= self.info[FRAMES]:
-            raise EOFError, "seek outside sequence"
-
-        if self.frame == frame:
-            return
-
-        self.frame = frame
-
-        if self.mode == "1":
-            bits = 1
-        else:
-            bits = 8 * len(self.mode)
-
-        size = ((self.size[0] * bits + 7) / 8) * self.size[1]
-        offs = self.__offset + frame * size
-
-        self.fp = self.__fp
-
-        self.tile = [("raw", (0,0)+self.size, offs, (self.rawmode, 0, -1))]
-
-    def tell(self):
-
-        return self.frame
-
-#
-# --------------------------------------------------------------------
-# Save IM files
-
-SAVE = {
-    # mode: (im type, raw mode)
-    "1": ("0 1", "1"),
-    "L": ("Greyscale", "L"),
-    "LA": ("LA", "LA;L"),
-    "P": ("Greyscale", "P"),
-    "PA": ("LA", "PA;L"),
-    "I": ("L 32S", "I;32S"),
-    "I;16": ("L 16", "I;16"),
-    "I;16B": ("L 16B", "I;16B"),
-    "F": ("L 32F", "F;32F"),
-    "RGB": ("RGB", "RGB;L"),
-    "RGBA": ("RGBA", "RGBA;L"),
-    "RGBX": ("RGBX", "RGBX;L"),
-    "CMYK": ("CMYK", "CMYK;L"),
-    "YCbCr": ("YCC", "YCbCr;L")
-}
-
-def _save(im, fp, filename, check=0):
-
-    try:
-        type, rawmode = SAVE[im.mode]
-    except KeyError:
-        raise ValueError, "Cannot save %s images as IM" % im.mode
-
-    try:
-        frames = im.encoderinfo["frames"]
-    except KeyError:
-        frames = 1
-
-    if check:
-        return check
-
-    fp.write("Image type: %s image\r\n" % type)
-    if filename:
-        fp.write("Name: %s\r\n" % filename)
-    fp.write("Image size (x*y): %d*%d\r\n" % im.size)
-    fp.write("File size (no of images): %d\r\n" % frames)
-    if im.mode == "P":
-        fp.write("Lut: 1\r\n")
-    fp.write("\000" * (511-fp.tell()) + "\032")
-    if im.mode == "P":
-        fp.write(im.im.getpalette("RGB", "RGB;L")) # 768 bytes
-    ImageFile._save(im, fp, [("raw", (0,0)+im.size, 0, (rawmode, 0, -1))])
-
-#
-# --------------------------------------------------------------------
-# Registry
-
-Image.register_open("IM", ImImageFile)
-Image.register_save("IM", _save)
-
-Image.register_extension("IM", ".im")
diff --git a/pythonPackages/pil/PIL/Image.py b/pythonPackages/pil/PIL/Image.py
deleted file mode 100644
index 04ed3163ba..0000000000
--- a/pythonPackages/pil/PIL/Image.py
+++ /dev/null
@@ -1,2093 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: Image.py 2933 2006-12-03 12:08:22Z fredrik $
-#
-# the Image class wrapper
-#
-# partial release history:
-# 1995-09-09 fl   Created
-# 1996-03-11 fl   PIL release 0.0 (proof of concept)
-# 1996-04-30 fl   PIL release 0.1b1
-# 1999-07-28 fl   PIL release 1.0 final
-# 2000-06-07 fl   PIL release 1.1
-# 2000-10-20 fl   PIL release 1.1.1
-# 2001-05-07 fl   PIL release 1.1.2
-# 2002-03-15 fl   PIL release 1.1.3
-# 2003-05-10 fl   PIL release 1.1.4
-# 2005-03-28 fl   PIL release 1.1.5
-# 2006-12-02 fl   PIL release 1.1.6
-#
-# Copyright (c) 1997-2006 by Secret Labs AB.  All rights reserved.
-# Copyright (c) 1995-2006 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-VERSION = "1.1.6"
-
-try:
-    import warnings
-except ImportError:
-    warnings = None
-
-class _imaging_not_installed:
-    # module placeholder
-    def __getattr__(self, id):
-        raise ImportError("The _imaging C module is not installed")
-
-try:
-    # give Tk a chance to set up the environment, in case we're
-    # using an _imaging module linked against libtcl/libtk (use
-    # __import__ to hide this from naive packagers; we don't really
-    # depend on Tk unless ImageTk is used, and that module already
-    # imports Tkinter)
-    __import__("FixTk")
-except ImportError:
-    pass
-
-try:
-    # If the _imaging C module is not present, you can still use
-    # the "open" function to identify files, but you cannot load
-    # them.  Note that other modules should not refer to _imaging
-    # directly; import Image and use the Image.core variable instead.
-    import _imaging
-    core = _imaging
-    del _imaging
-except ImportError, v:
-    core = _imaging_not_installed()
-    if str(v)[:20] == "Module use of python" and warnings:
-        # The _imaging C module is present, but not compiled for
-        # the right version (windows only).  Print a warning, if
-        # possible.
-        warnings.warn(
-            "The _imaging extension was built for another version "
-            "of Python; most PIL functions will be disabled",
-            RuntimeWarning
-            )
-
-import ImageMode
-import ImagePalette
-
-import os, string, sys
-
-# type stuff
-from types import IntType, StringType, TupleType
-
-try:
-    UnicodeStringType = type(unicode(""))
-    ##
-    # (Internal) Checks if an object is a string.  If the current
-    # Python version supports Unicode, this checks for both 8-bit
-    # and Unicode strings.
-    def isStringType(t):
-        return isinstance(t, StringType) or isinstance(t, UnicodeStringType)
-except NameError:
-    def isStringType(t):
-        return isinstance(t, StringType)
-
-##
-# (Internal) Checks if an object is a tuple.
-
-def isTupleType(t):
-    return isinstance(t, TupleType)
-
-##
-# (Internal) Checks if an object is an image object.
-
-def isImageType(t):
-    return hasattr(t, "im")
-
-##
-# (Internal) Checks if an object is a string, and that it points to a
-# directory.
-
-def isDirectory(f):
-    return isStringType(f) and os.path.isdir(f)
-
-from operator import isNumberType, isSequenceType
-
-#
-# Debug level
-
-DEBUG = 0
-
-#
-# Constants (also defined in _imagingmodule.c!)
-
-NONE = 0
-
-# transpose
-FLIP_LEFT_RIGHT = 0
-FLIP_TOP_BOTTOM = 1
-ROTATE_90 = 2
-ROTATE_180 = 3
-ROTATE_270 = 4
-
-# transforms
-AFFINE = 0
-EXTENT = 1
-PERSPECTIVE = 2
-QUAD = 3
-MESH = 4
-
-# resampling filters
-NONE = 0
-NEAREST = 0
-ANTIALIAS = 1 # 3-lobed lanczos
-LINEAR = BILINEAR = 2
-CUBIC = BICUBIC = 3
-
-# dithers
-NONE = 0
-NEAREST = 0
-ORDERED = 1 # Not yet implemented
-RASTERIZE = 2 # Not yet implemented
-FLOYDSTEINBERG = 3 # default
-
-# palettes/quantizers
-WEB = 0
-ADAPTIVE = 1
-
-# categories
-NORMAL = 0
-SEQUENCE = 1
-CONTAINER = 2
-
-# --------------------------------------------------------------------
-# Registries
-
-ID = []
-OPEN = {}
-MIME = {}
-SAVE = {}
-EXTENSION = {}
-
-# --------------------------------------------------------------------
-# Modes supported by this version
-
-_MODEINFO = {
-    # NOTE: this table will be removed in future versions.  use
-    # getmode* functions or ImageMode descriptors instead.
-
-    # official modes
-    "1": ("L", "L", ("1",)),
-    "L": ("L", "L", ("L",)),
-    "I": ("L", "I", ("I",)),
-    "F": ("L", "F", ("F",)),
-    "P": ("RGB", "L", ("P",)),
-    "RGB": ("RGB", "L", ("R", "G", "B")),
-    "RGBX": ("RGB", "L", ("R", "G", "B", "X")),
-    "RGBA": ("RGB", "L", ("R", "G", "B", "A")),
-    "CMYK": ("RGB", "L", ("C", "M", "Y", "K")),
-    "YCbCr": ("RGB", "L", ("Y", "Cb", "Cr")),
-
-    # Experimental modes include I;16, I;16B, RGBa, BGR;15,
-    # and BGR;24.  Use these modes only if you know exactly
-    # what you're doing...
-
-}
-
-if sys.byteorder == 'little':
-    _ENDIAN = '<'
-else:
-    _ENDIAN = '>'
-
-_MODE_CONV = {
-    # official modes
-    "1": ('|b1', None),
-    "L": ('|u1', None),
-    "I": ('%si4' % _ENDIAN, None), # FIXME: is this correct?
-    "F": ('%sf4' % _ENDIAN, None), # FIXME: is this correct?
-    "P": ('|u1', None),
-    "RGB": ('|u1', 3),
-    "RGBX": ('|u1', 4),
-    "RGBA": ('|u1', 4),
-    "CMYK": ('|u1', 4),
-    "YCbCr": ('|u1', 4),
-}
-
-def _conv_type_shape(im):
-    shape = im.size[::-1]
-    typ, extra = _MODE_CONV[im.mode]
-    if extra is None:
-        return shape, typ
-    else:
-        return shape+(extra,), typ
-
-
-MODES = _MODEINFO.keys()
-MODES.sort()
-
-# raw modes that may be memory mapped.  NOTE: if you change this, you
-# may have to modify the stride calculation in map.c too!
-_MAPMODES = ("L", "P", "RGBX", "RGBA", "CMYK", "I;16", "I;16B")
-
-##
-# Gets the "base" mode for given mode.  This function returns "L" for
-# images that contain grayscale data, and "RGB" for images that
-# contain color data.
-#
-# @param mode Input mode.
-# @return "L" or "RGB".
-# @exception KeyError If the input mode was not a standard mode.
-
-def getmodebase(mode):
-    return ImageMode.getmode(mode).basemode
-
-##
-# Gets the storage type mode.  Given a mode, this function returns a
-# single-layer mode suitable for storing individual bands.
-#
-# @param mode Input mode.
-# @return "L", "I", or "F".
-# @exception KeyError If the input mode was not a standard mode.
-
-def getmodetype(mode):
-    return ImageMode.getmode(mode).basetype
-
-##
-# Gets a list of individual band names.  Given a mode, this function
-# returns a tuple containing the names of individual bands (use
-# {@link #getmodetype} to get the mode used to store each individual
-# band.
-#
-# @param mode Input mode.
-# @return A tuple containing band names.  The length of the tuple
-#     gives the number of bands in an image of the given mode.
-# @exception KeyError If the input mode was not a standard mode.
-
-def getmodebandnames(mode):
-    return ImageMode.getmode(mode).bands
-
-##
-# Gets the number of individual bands for this mode.
-#
-# @param mode Input mode.
-# @return The number of bands in this mode.
-# @exception KeyError If the input mode was not a standard mode.
-
-def getmodebands(mode):
-    return len(ImageMode.getmode(mode).bands)
-
-# --------------------------------------------------------------------
-# Helpers
-
-_initialized = 0
-
-##
-# Explicitly loads standard file format drivers.
-
-def preinit():
-    "Load standard file format drivers."
-
-    global _initialized
-    if _initialized >= 1:
-        return
-
-    try:
-        import BmpImagePlugin
-    except ImportError:
-        pass
-    try:
-        import GifImagePlugin
-    except ImportError:
-        pass
-    try:
-        import JpegImagePlugin
-    except ImportError:
-        pass
-    try:
-        import PpmImagePlugin
-    except ImportError:
-        pass
-    try:
-        import PngImagePlugin
-    except ImportError:
-        pass
-#   try:
-#       import TiffImagePlugin
-#   except ImportError:
-#       pass
-
-    _initialized = 1
-
-##
-# Explicitly initializes the Python Imaging Library.  This function
-# loads all available file format drivers.
-
-def init():
-    "Load all file format drivers."
-
-    global _initialized
-    if _initialized >= 2:
-        return
-
-    visited = {}
-
-    directories = sys.path
-
-    try:
-        directories = directories + [os.path.dirname(__file__)]
-    except NameError:
-        pass
-
-    # only check directories (including current, if present in the path)
-    for directory in filter(isDirectory, directories):
-        fullpath = os.path.abspath(directory)
-        if visited.has_key(fullpath):
-            continue
-        for file in os.listdir(directory):
-            if file[-14:] == "ImagePlugin.py":
-                f, e = os.path.splitext(file)
-                try:
-                    sys.path.insert(0, directory)
-                    try:
-                        __import__(f, globals(), locals(), [])
-                    finally:
-                        del sys.path[0]
-                except ImportError:
-                    if DEBUG:
-                        print "Image: failed to import",
-                        print f, ":", sys.exc_value
-        visited[fullpath] = None
-
-    if OPEN or SAVE:
-        _initialized = 2
-
-
-# --------------------------------------------------------------------
-# Codec factories (used by tostring/fromstring and ImageFile.load)
-
-def _getdecoder(mode, decoder_name, args, extra=()):
-
-    # tweak arguments
-    if args is None:
-        args = ()
-    elif not isTupleType(args):
-        args = (args,)
-
-    try:
-        # get decoder
-        decoder = getattr(core, decoder_name + "_decoder")
-        # print decoder, (mode,) + args + extra
-        return apply(decoder, (mode,) + args + extra)
-    except AttributeError:
-        raise IOError("decoder %s not available" % decoder_name)
-
-def _getencoder(mode, encoder_name, args, extra=()):
-
-    # tweak arguments
-    if args is None:
-        args = ()
-    elif not isTupleType(args):
-        args = (args,)
-
-    try:
-        # get encoder
-        encoder = getattr(core, encoder_name + "_encoder")
-        # print encoder, (mode,) + args + extra
-        return apply(encoder, (mode,) + args + extra)
-    except AttributeError:
-        raise IOError("encoder %s not available" % encoder_name)
-
-
-# --------------------------------------------------------------------
-# Simple expression analyzer
-
-class _E:
-    def __init__(self, data): self.data = data
-    def __coerce__(self, other): return self, _E(other)
-    def __add__(self, other): return _E((self.data, "__add__", other.data))
-    def __mul__(self, other): return _E((self.data, "__mul__", other.data))
-
-def _getscaleoffset(expr):
-    stub = ["stub"]
-    data = expr(_E(stub)).data
-    try:
-        (a, b, c) = data # simplified syntax
-        if (a is stub and b == "__mul__" and isNumberType(c)):
-            return c, 0.0
-        if (a is stub and b == "__add__" and isNumberType(c)):
-            return 1.0, c
-    except TypeError: pass
-    try:
-        ((a, b, c), d, e) = data # full syntax
-        if (a is stub and b == "__mul__" and isNumberType(c) and
-            d == "__add__" and isNumberType(e)):
-            return c, e
-    except TypeError: pass
-    raise ValueError("illegal expression")
-
-
-# --------------------------------------------------------------------
-# Implementation wrapper
-
-##
-# This class represents an image object.  To create Image objects, use
-# the appropriate factory functions.  There's hardly ever any reason
-# to call the Image constructor directly.
-#
-# @see #open
-# @see #new
-# @see #fromstring
-
-class Image:
-
-    format = None
-    format_description = None
-
-    def __init__(self):
-        self.im = None
-        self.mode = ""
-        self.size = (0, 0)
-        self.palette = None
-        self.info = {}
-        self.category = NORMAL
-        self.readonly = 0
-
-    def _new(self, im):
-        new = Image()
-        new.im = im
-        new.mode = im.mode
-        new.size = im.size
-        new.palette = self.palette
-        if im.mode == "P":
-            new.palette = ImagePalette.ImagePalette()
-        try:
-            new.info = self.info.copy()
-        except AttributeError:
-            # fallback (pre-1.5.2)
-            new.info = {}
-            for k, v in self.info:
-                new.info[k] = v
-        return new
-
-    _makeself = _new # compatibility
-
-    def _copy(self):
-        self.load()
-        self.im = self.im.copy()
-        self.readonly = 0
-
-    def _dump(self, file=None, format=None):
-        import tempfile
-        if not file:
-            file = tempfile.mktemp()
-        self.load()
-        if not format or format == "PPM":
-            self.im.save_ppm(file)
-        else:
-            file = file + "." + format
-            self.save(file, format)
-        return file
-
-    def __getattr__(self, name):
-        if name == "__array_interface__":
-            # numpy array interface support
-            new = {}
-            shape, typestr = _conv_type_shape(self)
-            new['shape'] = shape
-            new['typestr'] = typestr
-            new['data'] = self.tostring()
-            return new
-        raise AttributeError(name)
-
-    ##
-    # Returns a string containing pixel data.
-    #
-    # @param encoder_name What encoder to use.  The default is to
-    #    use the standard "raw" encoder.
-    # @param *args Extra arguments to the encoder.
-    # @return An 8-bit string.
-
-    def tostring(self, encoder_name="raw", *args):
-        "Return image as a binary string"
-
-        # may pass tuple instead of argument list
-        if len(args) == 1 and isTupleType(args[0]):
-            args = args[0]
-
-        if encoder_name == "raw" and args == ():
-            args = self.mode
-
-        self.load()
-
-        # unpack data
-        e = _getencoder(self.mode, encoder_name, args)
-        e.setimage(self.im)
-
-        bufsize = max(65536, self.size[0] * 4) # see RawEncode.c
-
-        data = []
-        while 1:
-            l, s, d = e.encode(bufsize)
-            data.append(d)
-            if s:
-                break
-        if s < 0:
-            raise RuntimeError("encoder error %d in tostring" % s)
-
-        return string.join(data, "")
-
-    ##
-    # Returns the image converted to an X11 bitmap.  This method
-    # only works for mode "1" images.
-    #
-    # @param name The name prefix to use for the bitmap variables.
-    # @return A string containing an X11 bitmap.
-    # @exception ValueError If the mode is not "1"
-
-    def tobitmap(self, name="image"):
-        "Return image as an XBM bitmap"
-
-        self.load()
-        if self.mode != "1":
-            raise ValueError("not a bitmap")
-        data = self.tostring("xbm")
-        return string.join(["#define %s_width %d\n" % (name, self.size[0]),
-                "#define %s_height %d\n"% (name, self.size[1]),
-                "static char %s_bits[] = {\n" % name, data, "};"], "")
-
-    ##
-    # Loads this image with pixel data from a string.
-    # <p>
-    # This method is similar to the {@link #fromstring} function, but
-    # loads data into this image instead of creating a new image
-    # object.
-
-    def fromstring(self, data, decoder_name="raw", *args):
-        "Load data to image from binary string"
-
-        # may pass tuple instead of argument list
-        if len(args) == 1 and isTupleType(args[0]):
-            args = args[0]
-
-        # default format
-        if decoder_name == "raw" and args == ():
-            args = self.mode
-
-        # unpack data
-        d = _getdecoder(self.mode, decoder_name, args)
-        d.setimage(self.im)
-        s = d.decode(data)
-
-        if s[0] >= 0:
-            raise ValueError("not enough image data")
-        if s[1] != 0:
-            raise ValueError("cannot decode image data")
-
-    ##
-    # Allocates storage for the image and loads the pixel data.  In
-    # normal cases, you don't need to call this method, since the
-    # Image class automatically loads an opened image when it is
-    # accessed for the first time.
-    #
-    # @return An image access object.
-
-    def load(self):
-        "Explicitly load pixel data."
-        if self.im and self.palette and self.palette.dirty:
-            # realize palette
-            apply(self.im.putpalette, self.palette.getdata())
-            self.palette.dirty = 0
-            self.palette.mode = "RGB"
-            self.palette.rawmode = None
-            if self.info.has_key("transparency"):
-                self.im.putpalettealpha(self.info["transparency"], 0)
-                self.palette.mode = "RGBA"
-        if self.im:
-            return self.im.pixel_access(self.readonly)
-
-    ##
-    # Verifies the contents of a file. For data read from a file, this
-    # method attempts to determine if the file is broken, without
-    # actually decoding the image data.  If this method finds any
-    # problems, it raises suitable exceptions.  If you need to load
-    # the image after using this method, you must reopen the image
-    # file.
-
-    def verify(self):
-        "Verify file contents."
-        pass
-
-
-    ##
-    # Returns a converted copy of this image. For the "P" mode, this
-    # method translates pixels through the palette.  If mode is
-    # omitted, a mode is chosen so that all information in the image
-    # and the palette can be represented without a palette.
-    # <p>
-    # The current version supports all possible conversions between
-    # "L", "RGB" and "CMYK."
-    # <p>
-    # When translating a colour image to black and white (mode "L"),
-    # the library uses the ITU-R 601-2 luma transform:
-    # <p>
-    # <b>L = R * 299/1000 + G * 587/1000 + B * 114/1000</b>
-    # <p>
-    # When translating a greyscale image into a bilevel image (mode
-    # "1"), all non-zero values are set to 255 (white). To use other
-    # thresholds, use the {@link #Image.point} method.
-    #
-    # @def convert(mode, matrix=None)
-    # @param mode The requested mode.
-    # @param matrix An optional conversion matrix.  If given, this
-    #    should be 4- or 16-tuple containing floating point values.
-    # @return An Image object.
-
-    def convert(self, mode=None, data=None, dither=None,
-                palette=WEB, colors=256):
-        "Convert to other pixel format"
-
-        if not mode:
-            # determine default mode
-            if self.mode == "P":
-                self.load()
-                if self.palette:
-                    mode = self.palette.mode
-                else:
-                    mode = "RGB"
-            else:
-                return self.copy()
-
-        self.load()
-
-        if data:
-            # matrix conversion
-            if mode not in ("L", "RGB"):
-                raise ValueError("illegal conversion")
-            im = self.im.convert_matrix(mode, data)
-            return self._new(im)
-
-        if mode == "P" and palette == ADAPTIVE:
-            im = self.im.quantize(colors)
-            return self._new(im)
-
-        # colourspace conversion
-        if dither is None:
-            dither = FLOYDSTEINBERG
-
-        try:
-            im = self.im.convert(mode, dither)
-        except ValueError:
-            try:
-                # normalize source image and try again
-                im = self.im.convert(getmodebase(self.mode))
-                im = im.convert(mode, dither)
-            except KeyError:
-                raise ValueError("illegal conversion")
-
-        return self._new(im)
-
-    def quantize(self, colors=256, method=0, kmeans=0, palette=None):
-
-        # methods:
-        #    0 = median cut
-        #    1 = maximum coverage
-
-        # NOTE: this functionality will be moved to the extended
-        # quantizer interface in a later version of PIL.
-
-        self.load()
-
-        if palette:
-            # use palette from reference image
-            palette.load()
-            if palette.mode != "P":
-                raise ValueError("bad mode for palette image")
-            if self.mode != "RGB" and self.mode != "L":
-                raise ValueError(
-                    "only RGB or L mode images can be quantized to a palette"
-                    )
-            im = self.im.convert("P", 1, palette.im)
-            return self._makeself(im)
-
-        im = self.im.quantize(colors, method, kmeans)
-        return self._new(im)
-
-    ##
-    # Copies this image. Use this method if you wish to paste things
-    # into an image, but still retain the original.
-    #
-    # @return An Image object.
-
-    def copy(self):
-        "Copy raster data"
-
-        self.load()
-        im = self.im.copy()
-        return self._new(im)
-
-    ##
-    # Returns a rectangular region from this image. The box is a
-    # 4-tuple defining the left, upper, right, and lower pixel
-    # coordinate.
-    # <p>
-    # This is a lazy operation.  Changes to the source image may or
-    # may not be reflected in the cropped image.  To break the
-    # connection, call the {@link #Image.load} method on the cropped
-    # copy.
-    #
-    # @param The crop rectangle, as a (left, upper, right, lower)-tuple.
-    # @return An Image object.
-
-    def crop(self, box=None):
-        "Crop region from image"
-
-        self.load()
-        if box is None:
-            return self.copy()
-
-        # lazy operation
-        return _ImageCrop(self, box)
-
-    ##
-    # Configures the image file loader so it returns a version of the
-    # image that as closely as possible matches the given mode and
-    # size.  For example, you can use this method to convert a colour
-    # JPEG to greyscale while loading it, or to extract a 128x192
-    # version from a PCD file.
-    # <p>
-    # Note that this method modifies the Image object in place.  If
-    # the image has already been loaded, this method has no effect.
-    #
-    # @param mode The requested mode.
-    # @param size The requested size.
-
-    def draft(self, mode, size):
-        "Configure image decoder"
-
-        pass
-
-    def _expand(self, xmargin, ymargin=None):
-        if ymargin is None:
-            ymargin = xmargin
-        self.load()
-        return self._new(self.im.expand(xmargin, ymargin, 0))
-
-    ##
-    # Filters this image using the given filter.  For a list of
-    # available filters, see the <b>ImageFilter</b> module.
-    #
-    # @param filter Filter kernel.
-    # @return An Image object.
-    # @see ImageFilter
-
-    def filter(self, filter):
-        "Apply environment filter to image"
-
-        self.load()
-
-        from ImageFilter import Filter
-        if not isinstance(filter, Filter):
-            filter = filter()
-
-        if self.im.bands == 1:
-            return self._new(filter.filter(self.im))
-        # fix to handle multiband images since _imaging doesn't
-        ims = []
-        for c in range(self.im.bands):
-            ims.append(self._new(filter.filter(self.im.getband(c))))
-        return merge(self.mode, ims)
-
-    ##
-    # Returns a tuple containing the name of each band in this image.
-    # For example, <b>getbands</b> on an RGB image returns ("R", "G", "B").
-    #
-    # @return A tuple containing band names.
-
-    def getbands(self):
-        "Get band names"
-
-        return ImageMode.getmode(self.mode).bands
-
-    ##
-    # Calculates the bounding box of the non-zero regions in the
-    # image.
-    #
-    # @return The bounding box is returned as a 4-tuple defining the
-    #    left, upper, right, and lower pixel coordinate. If the image
-    #    is completely empty, this method returns None.
-
-    def getbbox(self):
-        "Get bounding box of actual data (non-zero pixels) in image"
-
-        self.load()
-        return self.im.getbbox()
-
-    ##
-    # Returns a list of colors used in this image.
-    #
-    # @param maxcolors Maximum number of colors.  If this number is
-    #    exceeded, this method returns None.  The default limit is
-    #    256 colors.
-    # @return An unsorted list of (count, pixel) values.
-
-    def getcolors(self, maxcolors=256):
-        "Get colors from image, up to given limit"
-
-        self.load()
-        if self.mode in ("1", "L", "P"):
-            h = self.im.histogram()
-            out = []
-            for i in range(256):
-                if h[i]:
-                    out.append((h[i], i))
-            if len(out) > maxcolors:
-                return None
-            return out
-        return self.im.getcolors(maxcolors)
-
-    ##
-    # Returns the contents of this image as a sequence object
-    # containing pixel values.  The sequence object is flattened, so
-    # that values for line one follow directly after the values of
-    # line zero, and so on.
-    # <p>
-    # Note that the sequence object returned by this method is an
-    # internal PIL data type, which only supports certain sequence
-    # operations.  To convert it to an ordinary sequence (e.g. for
-    # printing), use <b>list(im.getdata())</b>.
-    #
-    # @param band What band to return.  The default is to return
-    #    all bands.  To return a single band, pass in the index
-    #    value (e.g. 0 to get the "R" band from an "RGB" image).
-    # @return A sequence-like object.
-
-    def getdata(self, band = None):
-        "Get image data as sequence object."
-
-        self.load()
-        if band is not None:
-            return self.im.getband(band)
-        return self.im # could be abused
-
-    ##
-    # Gets the the minimum and maximum pixel values for each band in
-    # the image.
-    #
-    # @return For a single-band image, a 2-tuple containing the
-    #    minimum and maximum pixel value.  For a multi-band image,
-    #    a tuple containing one 2-tuple for each band.
-
-    def getextrema(self):
-        "Get min/max value"
-
-        self.load()
-        if self.im.bands > 1:
-            extrema = []
-            for i in range(self.im.bands):
-                extrema.append(self.im.getband(i).getextrema())
-            return tuple(extrema)
-        return self.im.getextrema()
-
-    ##
-    # Returns a PyCObject that points to the internal image memory.
-    #
-    # @return A PyCObject object.
-
-    def getim(self):
-        "Get PyCObject pointer to internal image memory"
-
-        self.load()
-        return self.im.ptr
-
-
-    ##
-    # Returns the image palette as a list.
-    #
-    # @return A list of color values [r, g, b, ...], or None if the
-    #    image has no palette.
-
-    def getpalette(self):
-        "Get palette contents."
-
-        self.load()
-        try:
-            return map(ord, self.im.getpalette())
-        except ValueError:
-            return None # no palette
-
-
-    ##
-    # Returns the pixel value at a given position.
-    #
-    # @param xy The coordinate, given as (x, y).
-    # @return The pixel value.  If the image is a multi-layer image,
-    #    this method returns a tuple.
-
-    def getpixel(self, xy):
-        "Get pixel value"
-
-        self.load()
-        return self.im.getpixel(xy)
-
-    ##
-    # Returns the horizontal and vertical projection.
-    #
-    # @return Two sequences, indicating where there are non-zero
-    #     pixels along the X-axis and the Y-axis, respectively.
-
-    def getprojection(self):
-        "Get projection to x and y axes"
-
-        self.load()
-        x, y = self.im.getprojection()
-        return map(ord, x), map(ord, y)
-
-    ##
-    # Returns a histogram for the image. The histogram is returned as
-    # a list of pixel counts, one for each pixel value in the source
-    # image. If the image has more than one band, the histograms for
-    # all bands are concatenated (for example, the histogram for an
-    # "RGB" image contains 768 values).
-    # <p>
-    # A bilevel image (mode "1") is treated as a greyscale ("L") image
-    # by this method.
-    # <p>
-    # If a mask is provided, the method returns a histogram for those
-    # parts of the image where the mask image is non-zero. The mask
-    # image must have the same size as the image, and be either a
-    # bi-level image (mode "1") or a greyscale image ("L").
-    #
-    # @def histogram(mask=None)
-    # @param mask An optional mask.
-    # @return A list containing pixel counts.
-
-    def histogram(self, mask=None, extrema=None):
-        "Take histogram of image"
-
-        self.load()
-        if mask:
-            mask.load()
-            return self.im.histogram((0, 0), mask.im)
-        if self.mode in ("I", "F"):
-            if extrema is None:
-                extrema = self.getextrema()
-            return self.im.histogram(extrema)
-        return self.im.histogram()
-
-    ##
-    # (Deprecated) Returns a copy of the image where the data has been
-    # offset by the given distances. Data wraps around the edges. If
-    # yoffset is omitted, it is assumed to be equal to xoffset.
-    # <p>
-    # This method is deprecated. New code should use the <b>offset</b>
-    # function in the <b>ImageChops</b> module.
-    #
-    # @param xoffset The horizontal distance.
-    # @param yoffset The vertical distance.  If omitted, both
-    #    distances are set to the same value.
-    # @return An Image object.
-
-    def offset(self, xoffset, yoffset=None):
-        "(deprecated) Offset image in horizontal and/or vertical direction"
-        if warnings:
-            warnings.warn(
-                "'offset' is deprecated; use 'ImageChops.offset' instead",
-                DeprecationWarning, stacklevel=2
-                )
-        import ImageChops
-        return ImageChops.offset(self, xoffset, yoffset)
-
-    ##
-    # Pastes another image into this image. The box argument is either
-    # a 2-tuple giving the upper left corner, a 4-tuple defining the
-    # left, upper, right, and lower pixel coordinate, or None (same as
-    # (0, 0)).  If a 4-tuple is given, the size of the pasted image
-    # must match the size of the region.
-    # <p>
-    # If the modes don't match, the pasted image is converted to the
-    # mode of this image (see the {@link #Image.convert} method for
-    # details).
-    # <p>
-    # Instead of an image, the source can be a integer or tuple
-    # containing pixel values.  The method then fills the region
-    # with the given colour.  When creating RGB images, you can
-    # also use colour strings as supported by the ImageColor module.
-    # <p>
-    # If a mask is given, this method updates only the regions
-    # indicated by the mask.  You can use either "1", "L" or "RGBA"
-    # images (in the latter case, the alpha band is used as mask).
-    # Where the mask is 255, the given image is copied as is.  Where
-    # the mask is 0, the current value is preserved.  Intermediate
-    # values can be used for transparency effects.
-    # <p>
-    # Note that if you paste an "RGBA" image, the alpha band is
-    # ignored.  You can work around this by using the same image as
-    # both source image and mask.
-    #
-    # @param im Source image or pixel value (integer or tuple).
-    # @param box An optional 4-tuple giving the region to paste into.
-    #    If a 2-tuple is used instead, it's treated as the upper left
-    #    corner.  If omitted or None, the source is pasted into the
-    #    upper left corner.
-    #    <p>
-    #    If an image is given as the second argument and there is no
-    #    third, the box defaults to (0, 0), and the second argument
-    #    is interpreted as a mask image.
-    # @param mask An optional mask image.
-    # @return An Image object.
-
-    def paste(self, im, box=None, mask=None):
-        "Paste other image into region"
-
-        if isImageType(box) and mask is None:
-            # abbreviated paste(im, mask) syntax
-            mask = box; box = None
-
-        if box is None:
-            # cover all of self
-            box = (0, 0) + self.size
-
-        if len(box) == 2:
-            # lower left corner given; get size from image or mask
-            if isImageType(im):
-                size = im.size
-            elif isImageType(mask):
-                size = mask.size
-            else:
-                # FIXME: use self.size here?
-                raise ValueError(
-                    "cannot determine region size; use 4-item box"
-                    )
-            box = box + (box[0]+size[0], box[1]+size[1])
-
-        if isStringType(im):
-            import ImageColor
-            im = ImageColor.getcolor(im, self.mode)
-
-        elif isImageType(im):
-            im.load()
-            if self.mode != im.mode:
-                if self.mode != "RGB" or im.mode not in ("RGBA", "RGBa"):
-                    # should use an adapter for this!
-                    im = im.convert(self.mode)
-            im = im.im
-
-        self.load()
-        if self.readonly:
-            self._copy()
-
-        if mask:
-            mask.load()
-            self.im.paste(im, box, mask.im)
-        else:
-            self.im.paste(im, box)
-
-    ##
-    # Maps this image through a lookup table or function.
-    #
-    # @param lut A lookup table, containing 256 values per band in the
-    #    image. A function can be used instead, it should take a single
-    #    argument. The function is called once for each possible pixel
-    #    value, and the resulting table is applied to all bands of the
-    #    image.
-    # @param mode Output mode (default is same as input).  In the
-    #    current version, this can only be used if the source image
-    #    has mode "L" or "P", and the output has mode "1".
-    # @return An Image object.
-
-    def point(self, lut, mode=None):
-        "Map image through lookup table"
-
-        self.load()
-
-        if not isSequenceType(lut):
-            # if it isn't a list, it should be a function
-            if self.mode in ("I", "I;16", "F"):
-                # check if the function can be used with point_transform
-                scale, offset = _getscaleoffset(lut)
-                return self._new(self.im.point_transform(scale, offset))
-            # for other modes, convert the function to a table
-            lut = map(lut, range(256)) * self.im.bands
-
-        if self.mode == "F":
-            # FIXME: _imaging returns a confusing error message for this case
-            raise ValueError("point operation not supported for this mode")
-
-        return self._new(self.im.point(lut, mode))
-
-    ##
-    # Adds or replaces the alpha layer in this image.  If the image
-    # does not have an alpha layer, it's converted to "LA" or "RGBA".
-    # The new layer must be either "L" or "1".
-    #
-    # @param im The new alpha layer.  This can either be an "L" or "1"
-    #    image having the same size as this image, or an integer or
-    #    other color value.
-
-    def putalpha(self, alpha):
-        "Set alpha layer"
-
-        self.load()
-        if self.readonly:
-            self._copy()
-
-        if self.mode not in ("LA", "RGBA"):
-            # attempt to promote self to a matching alpha mode
-            try:
-                mode = getmodebase(self.mode) + "A"
-                try:
-                    self.im.setmode(mode)
-                except (AttributeError, ValueError):
-                    # do things the hard way
-                    im = self.im.convert(mode)
-                    if im.mode not in ("LA", "RGBA"):
-                        raise ValueError # sanity check
-                    self.im = im
-                self.mode = self.im.mode
-            except (KeyError, ValueError):
-                raise ValueError("illegal image mode")
-
-        if self.mode == "LA":
-            band = 1
-        else:
-            band = 3
-
-        if isImageType(alpha):
-            # alpha layer
-            if alpha.mode not in ("1", "L"):
-                raise ValueError("illegal image mode")
-            alpha.load()
-            if alpha.mode == "1":
-                alpha = alpha.convert("L")
-        else:
-            # constant alpha
-            try:
-                self.im.fillband(band, alpha)
-            except (AttributeError, ValueError):
-                # do things the hard way
-                alpha = new("L", self.size, alpha)
-            else:
-                return
-
-        self.im.putband(alpha.im, band)
-
-    ##
-    # Copies pixel data to this image.  This method copies data from a
-    # sequence object into the image, starting at the upper left
-    # corner (0, 0), and continuing until either the image or the
-    # sequence ends.  The scale and offset values are used to adjust
-    # the sequence values: <b>pixel = value*scale + offset</b>.
-    #
-    # @param data A sequence object.
-    # @param scale An optional scale value.  The default is 1.0.
-    # @param offset An optional offset value.  The default is 0.0.
-
-    def putdata(self, data, scale=1.0, offset=0.0):
-        "Put data from a sequence object into an image."
-
-        self.load()
-        if self.readonly:
-            self._copy()
-
-        self.im.putdata(data, scale, offset)
-
-    ##
-    # Attaches a palette to this image.  The image must be a "P" or
-    # "L" image, and the palette sequence must contain 768 integer
-    # values, where each group of three values represent the red,
-    # green, and blue values for the corresponding pixel
-    # index. Instead of an integer sequence, you can use an 8-bit
-    # string.
-    #
-    # @def putpalette(data)
-    # @param data A palette sequence (either a list or a string).
-
-    def putpalette(self, data, rawmode="RGB"):
-        "Put palette data into an image."
-
-        self.load()
-        if self.mode not in ("L", "P"):
-            raise ValueError("illegal image mode")
-        if not isStringType(data):
-            data = string.join(map(chr, data), "")
-        self.mode = "P"
-        self.palette = ImagePalette.raw(rawmode, data)
-        self.palette.mode = "RGB"
-        self.load() # install new palette
-
-    ##
-    # Modifies the pixel at the given position. The colour is given as
-    # a single numerical value for single-band images, and a tuple for
-    # multi-band images.
-    # <p>
-    # Note that this method is relatively slow.  For more extensive
-    # changes, use {@link #Image.paste} or the <b>ImageDraw</b> module
-    # instead.
-    #
-    # @param xy The pixel coordinate, given as (x, y).
-    # @param value The pixel value.
-    # @see #Image.paste
-    # @see #Image.putdata
-    # @see ImageDraw
-
-    def putpixel(self, xy, value):
-        "Set pixel value"
-
-        self.load()
-        if self.readonly:
-            self._copy()
-
-        return self.im.putpixel(xy, value)
-
-    ##
-    # Returns a resized copy of this image.
-    #
-    # @def resize(size, filter=NEAREST)
-    # @param size The requested size in pixels, as a 2-tuple:
-    #    (width, height).
-    # @param filter An optional resampling filter.  This can be
-    #    one of <b>NEAREST</b> (use nearest neighbour), <b>BILINEAR</b>
-    #    (linear interpolation in a 2x2 environment), <b>BICUBIC</b>
-    #    (cubic spline interpolation in a 4x4 environment), or
-    #    <b>ANTIALIAS</b> (a high-quality downsampling filter).
-    #    If omitted, or if the image has mode "1" or "P", it is
-    #    set <b>NEAREST</b>.
-    # @return An Image object.
-
-    def resize(self, size, resample=NEAREST):
-        "Resize image"
-
-        if resample not in (NEAREST, BILINEAR, BICUBIC, ANTIALIAS):
-            raise ValueError("unknown resampling filter")
-
-        self.load()
-
-        if self.mode in ("1", "P"):
-            resample = NEAREST
-
-        if resample == ANTIALIAS:
-            # requires stretch support (imToolkit & PIL 1.1.3)
-            try:
-                im = self.im.stretch(size, resample)
-            except AttributeError:
-                raise ValueError("unsupported resampling filter")
-        else:
-            im = self.im.resize(size, resample)
-
-        return self._new(im)
-
-    ##
-    # Returns a rotated copy of this image.  This method returns a
-    # copy of this image, rotated the given number of degrees counter
-    # clockwise around its centre.
-    #
-    # @def rotate(angle, filter=NEAREST)
-    # @param angle In degrees counter clockwise.
-    # @param filter An optional resampling filter.  This can be
-    #    one of <b>NEAREST</b> (use nearest neighbour), <b>BILINEAR</b>
-    #    (linear interpolation in a 2x2 environment), or <b>BICUBIC</b>
-    #    (cubic spline interpolation in a 4x4 environment).
-    #    If omitted, or if the image has mode "1" or "P", it is
-    #    set <b>NEAREST</b>.
-    # @param expand Optional expansion flag.  If true, expands the output
-    #    image to make it large enough to hold the entire rotated image.
-    #    If false or omitted, make the output image the same size as the
-    #    input image.
-    # @return An Image object.
-
-    def rotate(self, angle, resample=NEAREST, expand=0):
-        "Rotate image.  Angle given as degrees counter-clockwise."
-
-        if expand:
-            import math
-            angle = -angle * math.pi / 180
-            matrix = [
-                 math.cos(angle), math.sin(angle), 0.0,
-                -math.sin(angle), math.cos(angle), 0.0
-                 ]
-            def transform(x, y, (a, b, c, d, e, f)=matrix):
-                return a*x + b*y + c, d*x + e*y + f
-
-            # calculate output size
-            w, h = self.size
-            xx = []
-            yy = []
-            for x, y in ((0, 0), (w, 0), (w, h), (0, h)):
-                x, y = transform(x, y)
-                xx.append(x)
-                yy.append(y)
-            w = int(math.ceil(max(xx)) - math.floor(min(xx)))
-            h = int(math.ceil(max(yy)) - math.floor(min(yy)))
-
-            # adjust center
-            x, y = transform(w / 2.0, h / 2.0)
-            matrix[2] = self.size[0] / 2.0 - x
-            matrix[5] = self.size[1] / 2.0 - y
-
-            return self.transform((w, h), AFFINE, matrix)
-
-        if resample not in (NEAREST, BILINEAR, BICUBIC):
-            raise ValueError("unknown resampling filter")
-
-        self.load()
-
-        if self.mode in ("1", "P"):
-            resample = NEAREST
-
-        return self._new(self.im.rotate(angle, resample))
-
-    ##
-    # Saves this image under the given filename.  If no format is
-    # specified, the format to use is determined from the filename
-    # extension, if possible.
-    # <p>
-    # Keyword options can be used to provide additional instructions
-    # to the writer. If a writer doesn't recognise an option, it is
-    # silently ignored. The available options are described later in
-    # this handbook.
-    # <p>
-    # You can use a file object instead of a filename. In this case,
-    # you must always specify the format. The file object must
-    # implement the <b>seek</b>, <b>tell</b>, and <b>write</b>
-    # methods, and be opened in binary mode.
-    #
-    # @def save(file, format=None, **options)
-    # @param file File name or file object.
-    # @param format Optional format override.  If omitted, the
-    #    format to use is determined from the filename extension.
-    #    If a file object was used instead of a filename, this
-    #    parameter should always be used.
-    # @param **options Extra parameters to the image writer.
-    # @return None
-    # @exception KeyError If the output format could not be determined
-    #    from the file name.  Use the format option to solve this.
-    # @exception IOError If the file could not be written.  The file
-    #    may have been created, and may contain partial data.
-
-    def save(self, fp, format=None, **params):
-        "Save image to file or stream"
-
-        if isStringType(fp):
-            filename = fp
-        else:
-            if hasattr(fp, "name") and isStringType(fp.name):
-                filename = fp.name
-            else:
-                filename = ""
-
-        # may mutate self!
-        self.load()
-
-        self.encoderinfo = params
-        self.encoderconfig = ()
-
-        preinit()
-
-        ext = string.lower(os.path.splitext(filename)[1])
-
-        if not format:
-            try:
-                format = EXTENSION[ext]
-            except KeyError:
-                init()
-                try:
-                    format = EXTENSION[ext]
-                except KeyError:
-                    raise KeyError(ext) # unknown extension
-
-        try:
-            save_handler = SAVE[string.upper(format)]
-        except KeyError:
-            init()
-            save_handler = SAVE[string.upper(format)] # unknown format
-
-        if isStringType(fp):
-            import __builtin__
-            fp = __builtin__.open(fp, "wb")
-            close = 1
-        else:
-            close = 0
-
-        try:
-            save_handler(self, fp, filename)
-        finally:
-            # do what we can to clean up
-            if close:
-                fp.close()
-
-    ##
-    # Seeks to the given frame in this sequence file. If you seek
-    # beyond the end of the sequence, the method raises an
-    # <b>EOFError</b> exception. When a sequence file is opened, the
-    # library automatically seeks to frame 0.
-    # <p>
-    # Note that in the current version of the library, most sequence
-    # formats only allows you to seek to the next frame.
-    #
-    # @param frame Frame number, starting at 0.
-    # @exception EOFError If the call attempts to seek beyond the end
-    #     of the sequence.
-    # @see #Image.tell
-
-    def seek(self, frame):
-        "Seek to given frame in sequence file"
-
-        # overridden by file handlers
-        if frame != 0:
-            raise EOFError
-
-    ##
-    # Displays this image. This method is mainly intended for
-    # debugging purposes.
-    # <p>
-    # On Unix platforms, this method saves the image to a temporary
-    # PPM file, and calls the <b>xv</b> utility.
-    # <p>
-    # On Windows, it saves the image to a temporary BMP file, and uses
-    # the standard BMP display utility to show it (usually Paint).
-    #
-    # @def show(title=None)
-    # @param title Optional title to use for the image window,
-    #    where possible.
-
-    def show(self, title=None, command=None):
-        "Display image (for debug purposes only)"
-
-        _showxv(self, title, command)
-
-    ##
-    # Split this image into individual bands. This method returns a
-    # tuple of individual image bands from an image. For example,
-    # splitting an "RGB" image creates three new images each
-    # containing a copy of one of the original bands (red, green,
-    # blue).
-    #
-    # @return A tuple containing bands.
-
-    def split(self):
-        "Split image into bands"
-
-        ims = []
-        self.load()
-        for i in range(self.im.bands):
-            ims.append(self._new(self.im.getband(i)))
-        return tuple(ims)
-
-    ##
-    # Returns the current frame number.
-    #
-    # @return Frame number, starting with 0.
-    # @see #Image.seek
-
-    def tell(self):
-        "Return current frame number"
-
-        return 0
-
-    ##
-    # Make this image into a thumbnail.  This method modifies the
-    # image to contain a thumbnail version of itself, no larger than
-    # the given size.  This method calculates an appropriate thumbnail
-    # size to preserve the aspect of the image, calls the {@link
-    # #Image.draft} method to configure the file reader (where
-    # applicable), and finally resizes the image.
-    # <p>
-    # Note that the bilinear and bicubic filters in the current
-    # version of PIL are not well-suited for thumbnail generation.
-    # You should use <b>ANTIALIAS</b> unless speed is much more
-    # important than quality.
-    # <p>
-    # Also note that this function modifies the Image object in place.
-    # If you need to use the full resolution image as well, apply this
-    # method to a {@link #Image.copy} of the original image.
-    #
-    # @param size Requested size.
-    # @param resample Optional resampling filter.  This can be one
-    #    of <b>NEAREST</b>, <b>BILINEAR</b>, <b>BICUBIC</b>, or
-    #    <b>ANTIALIAS</b> (best quality).  If omitted, it defaults
-    #    to <b>NEAREST</b> (this will be changed to ANTIALIAS in a
-    #    future version).
-    # @return None
-
-    def thumbnail(self, size, resample=NEAREST):
-        "Create thumbnail representation (modifies image in place)"
-
-        # FIXME: the default resampling filter will be changed
-        # to ANTIALIAS in future versions
-
-        # preserve aspect ratio
-        x, y = self.size
-        if x > size[0]: y = max(y * size[0] / x, 1); x = size[0]
-        if y > size[1]: x = max(x * size[1] / y, 1); y = size[1]
-        size = x, y
-
-        if size == self.size:
-            return
-
-        self.draft(None, size)
-
-        self.load()
-
-        try:
-            im = self.resize(size, resample)
-        except ValueError:
-            if resample != ANTIALIAS:
-                raise
-            im = self.resize(size, NEAREST) # fallback
-
-        self.im = im.im
-        self.mode = im.mode
-        self.size = size
-
-        self.readonly = 0
-
-    # FIXME: the different tranform methods need further explanation
-    # instead of bloating the method docs, add a separate chapter.
-
-    ##
-    # Transforms this image.  This method creates a new image with the
-    # given size, and the same mode as the original, and copies data
-    # to the new image using the given transform.
-    # <p>
-    # @def transform(size, method, data, resample=NEAREST)
-    # @param size The output size.
-    # @param method The transformation method.  This is one of
-    #   <b>EXTENT</b> (cut out a rectangular subregion), <b>AFFINE</b>
-    #   (affine transform), <b>PERSPECTIVE</b> (perspective
-    #   transform), <b>QUAD</b> (map a quadrilateral to a
-    #   rectangle), or <b>MESH</b> (map a number of source quadrilaterals
-    #   in one operation).
-    # @param data Extra data to the transformation method.
-    # @param resample Optional resampling filter.  It can be one of
-    #    <b>NEAREST</b> (use nearest neighbour), <b>BILINEAR</b>
-    #    (linear interpolation in a 2x2 environment), or
-    #    <b>BICUBIC</b> (cubic spline interpolation in a 4x4
-    #    environment). If omitted, or if the image has mode
-    #    "1" or "P", it is set to <b>NEAREST</b>.
-    # @return An Image object.
-
-    def transform(self, size, method, data=None, resample=NEAREST, fill=1):
-        "Transform image"
-
-        import ImageTransform
-        if isinstance(method, ImageTransform.Transform):
-            method, data = method.getdata()
-        if data is None:
-            raise ValueError("missing method data")
-        im = new(self.mode, size, None)
-        if method == MESH:
-            # list of quads
-            for box, quad in data:
-                im.__transformer(box, self, QUAD, quad, resample, fill)
-        else:
-            im.__transformer((0, 0)+size, self, method, data, resample, fill)
-
-        return im
-
-    def __transformer(self, box, image, method, data,
-                      resample=NEAREST, fill=1):
-
-        # FIXME: this should be turned into a lazy operation (?)
-
-        w = box[2]-box[0]
-        h = box[3]-box[1]
-
-        if method == AFFINE:
-            # change argument order to match implementation
-            data = (data[2], data[0], data[1],
-                    data[5], data[3], data[4])
-        elif method == EXTENT:
-            # convert extent to an affine transform
-            x0, y0, x1, y1 = data
-            xs = float(x1 - x0) / w
-            ys = float(y1 - y0) / h
-            method = AFFINE
-            data = (x0 + xs/2, xs, 0, y0 + ys/2, 0, ys)
-        elif method == PERSPECTIVE:
-            # change argument order to match implementation
-            data = (data[2], data[0], data[1],
-                    data[5], data[3], data[4],
-                    data[6], data[7])
-        elif method == QUAD:
-            # quadrilateral warp.  data specifies the four corners
-            # given as NW, SW, SE, and NE.
-            nw = data[0:2]; sw = data[2:4]; se = data[4:6]; ne = data[6:8]
-            x0, y0 = nw; As = 1.0 / w; At = 1.0 / h
-            data = (x0, (ne[0]-x0)*As, (sw[0]-x0)*At,
-                    (se[0]-sw[0]-ne[0]+x0)*As*At,
-                    y0, (ne[1]-y0)*As, (sw[1]-y0)*At,
-                    (se[1]-sw[1]-ne[1]+y0)*As*At)
-        else:
-            raise ValueError("unknown transformation method")
-
-        if resample not in (NEAREST, BILINEAR, BICUBIC):
-            raise ValueError("unknown resampling filter")
-
-        image.load()
-
-        self.load()
-
-        if image.mode in ("1", "P"):
-            resample = NEAREST
-
-        self.im.transform2(box, image.im, method, data, resample, fill)
-
-    ##
-    # Returns a flipped or rotated copy of this image.
-    #
-    # @param method One of <b>FLIP_LEFT_RIGHT</b>, <b>FLIP_TOP_BOTTOM</b>,
-    # <b>ROTATE_90</b>, <b>ROTATE_180</b>, or <b>ROTATE_270</b>.
-
-    def transpose(self, method):
-        "Transpose image (flip or rotate in 90 degree steps)"
-
-        self.load()
-        im = self.im.transpose(method)
-        return self._new(im)
-
-# --------------------------------------------------------------------
-# Lazy operations
-
-class _ImageCrop(Image):
-
-    def __init__(self, im, box):
-
-        Image.__init__(self)
-
-        x0, y0, x1, y1 = box
-        if x1 < x0:
-            x1 = x0
-        if y1 < y0:
-            y1 = y0
-
-        self.mode = im.mode
-        self.size = x1-x0, y1-y0
-
-        self.__crop = x0, y0, x1, y1
-
-        self.im = im.im
-
-    def load(self):
-
-        # lazy evaluation!
-        if self.__crop:
-            self.im = self.im.crop(self.__crop)
-            self.__crop = None
-
-        # FIXME: future versions should optimize crop/paste
-        # sequences!
-
-# --------------------------------------------------------------------
-# Factories
-
-#
-# Debugging
-
-def _wedge():
-    "Create greyscale wedge (for debugging only)"
-
-    return Image()._new(core.wedge("L"))
-
-##
-# Creates a new image with the given mode and size.
-#
-# @param mode The mode to use for the new image.
-# @param size A 2-tuple, containing (width, height) in pixels.
-# @param color What colour to use for the image.  Default is black.
-#    If given, this should be a single integer or floating point value
-#    for single-band modes, and a tuple for multi-band modes (one value
-#    per band).  When creating RGB images, you can also use colour
-#    strings as supported by the ImageColor module.  If the colour is
-#    None, the image is not initialised.
-# @return An Image object.
-
-def new(mode, size, color=0):
-    "Create a new image"
-
-    if color is None:
-        # don't initialize
-        return Image()._new(core.new(mode, size))
-
-    if isStringType(color):
-        # css3-style specifier
-
-        import ImageColor
-        color = ImageColor.getcolor(color, mode)
-
-    return Image()._new(core.fill(mode, size, color))
-
-##
-# Creates an image memory from pixel data in a string.
-# <p>
-# In its simplest form, this function takes three arguments
-# (mode, size, and unpacked pixel data).
-# <p>
-# You can also use any pixel decoder supported by PIL.  For more
-# information on available decoders, see the section <a
-# href="pil-decoder.htm"><i>Writing Your Own File Decoder</i></a>.
-# <p>
-# Note that this function decodes pixel data only, not entire images.
-# If you have an entire image in a string, wrap it in a
-# <b>StringIO</b> object, and use {@link #open} to load it.
-#
-# @param mode The image mode.
-# @param size The image size.
-# @param data An 8-bit string containing raw data for the given mode.
-# @param decoder_name What decoder to use.
-# @param *args Additional parameters for the given decoder.
-# @return An Image object.
-
-def fromstring(mode, size, data, decoder_name="raw", *args):
-    "Load image from string"
-
-    # may pass tuple instead of argument list
-    if len(args) == 1 and isTupleType(args[0]):
-        args = args[0]
-
-    if decoder_name == "raw" and args == ():
-        args = mode
-
-    im = new(mode, size)
-    im.fromstring(data, decoder_name, args)
-    return im
-
-##
-# (New in 1.1.4) Creates an image memory from pixel data in a string
-# or byte buffer.
-# <p>
-# This function is similar to {@link #fromstring}, but uses data in
-# the byte buffer, where possible.  This means that changes to the
-# original buffer object are reflected in this image).  Not all modes
-# can share memory; supported modes include "L", "RGBX", "RGBA", and
-# "CMYK".
-# <p>
-# Note that this function decodes pixel data only, not entire images.
-# If you have an entire image file in a string, wrap it in a
-# <b>StringIO</b> object, and use {@link #open} to load it.
-# <p>
-# In the current version, the default parameters used for the "raw"
-# decoder differs from that used for {@link fromstring}.  This is a
-# bug, and will probably be fixed in a future release.  The current
-# release issues a warning if you do this; to disable the warning,
-# you should provide the full set of parameters.  See below for
-# details.
-#
-# @param mode The image mode.
-# @param size The image size.
-# @param data An 8-bit string or other buffer object containing raw
-#     data for the given mode.
-# @param decoder_name What decoder to use.
-# @param *args Additional parameters for the given decoder.  For the
-#     default encoder ("raw"), it's recommended that you provide the
-#     full set of parameters:
-#     <b>frombuffer(mode, size, data, "raw", mode, 0, 1)</b>.
-# @return An Image object.
-# @since 1.1.4
-
-def frombuffer(mode, size, data, decoder_name="raw", *args):
-    "Load image from string or buffer"
-
-    # may pass tuple instead of argument list
-    if len(args) == 1 and isTupleType(args[0]):
-        args = args[0]
-
-    if decoder_name == "raw":
-        if args == ():
-            if warnings:
-                warnings.warn(
-                    "the frombuffer defaults may change in a future release; "
-                    "for portability, change the call to read:\n"
-                    "  frombuffer(mode, size, data, 'raw', mode, 0, 1)",
-                    RuntimeWarning, stacklevel=2
-                )
-            args = mode, 0, -1 # may change to (mode, 0, 1) post-1.1.6
-        if args[0] in _MAPMODES:
-            im = new(mode, (1,1))
-            im = im._new(
-                core.map_buffer(data, size, decoder_name, None, 0, args)
-                )
-            im.readonly = 1
-            return im
-
-    return apply(fromstring, (mode, size, data, decoder_name, args))
-
-
-##
-# (New in 1.1.6) Create an image memory from an object exporting
-# the array interface (using the buffer protocol).
-#
-# If obj is not contiguous, then the tostring method is called
-# and {@link frombuffer} is used.
-#
-# @param obj Object with array interface
-# @param mode Mode to use (will be determined from type if None)
-# @return An image memory.
-
-def fromarray(obj, mode=None):
-    arr = obj.__array_interface__
-    shape = arr['shape']
-    ndim = len(shape)
-    try:
-        strides = arr['strides']
-    except KeyError:
-        strides = None
-    if mode is None:
-        typestr = arr['typestr']
-        if not (typestr[0] == '|' or typestr[0] == _ENDIAN or
-                typestr[1:] not in ['u1', 'b1', 'i4', 'f4']):
-            raise TypeError("cannot handle data-type")
-        typestr = typestr[:2]
-        if typestr == 'i4':
-            mode = 'I'
-        elif typestr == 'f4':
-            mode = 'F'
-        elif typestr == 'b1':
-            mode = '1'
-        elif ndim == 2:
-            mode = 'L'
-        elif ndim == 3:
-            mode = 'RGB'
-        elif ndim == 4:
-            mode = 'RGBA'
-        else:
-            raise TypeError("Do not understand data.")
-    ndmax = 4
-    bad_dims=0
-    if mode in ['1','L','I','P','F']:
-        ndmax = 2
-    elif mode == 'RGB':
-        ndmax = 3
-    if ndim > ndmax:
-        raise ValueError("Too many dimensions.")
-
-    size = shape[:2][::-1]
-    if strides is not None:
-        obj = obj.tostring()
-
-    return frombuffer(mode, size, obj, "raw", mode, 0, 1)
-
-##
-# Opens and identifies the given image file.
-# <p>
-# This is a lazy operation; this function identifies the file, but the
-# actual image data is not read from the file until you try to process
-# the data (or call the {@link #Image.load} method).
-#
-# @def open(file, mode="r")
-# @param file A filename (string) or a file object.  The file object
-#    must implement <b>read</b>, <b>seek</b>, and <b>tell</b> methods,
-#    and be opened in binary mode.
-# @param mode The mode.  If given, this argument must be "r".
-# @return An Image object.
-# @exception IOError If the file cannot be found, or the image cannot be
-#    opened and identified.
-# @see #new
-
-def open(fp, mode="r"):
-    "Open an image file, without loading the raster data"
-
-    if mode != "r":
-        raise ValueError("bad mode")
-
-    if isStringType(fp):
-        import __builtin__
-        filename = fp
-        fp = __builtin__.open(fp, "rb")
-    else:
-        filename = ""
-
-    prefix = fp.read(16)
-
-    preinit()
-
-    for i in ID:
-        try:
-            factory, accept = OPEN[i]
-            if not accept or accept(prefix):
-                fp.seek(0)
-                return factory(fp, filename)
-        except (SyntaxError, IndexError, TypeError):
-            pass
-
-    init()
-
-    for i in ID:
-        try:
-            factory, accept = OPEN[i]
-            if not accept or accept(prefix):
-                fp.seek(0)
-                return factory(fp, filename)
-        except (SyntaxError, IndexError, TypeError):
-            pass
-
-    raise IOError("cannot identify image file")
-
-#
-# Image processing.
-
-##
-# Creates a new image by interpolating between two input images, using
-# a constant alpha.
-#
-# <pre>
-#    out = image1 * (1.0 - alpha) + image2 * alpha
-# </pre>
-#
-# @param im1 The first image.
-# @param im2 The second image.  Must have the same mode and size as
-#    the first image.
-# @param alpha The interpolation alpha factor.  If alpha is 0.0, a
-#    copy of the first image is returned. If alpha is 1.0, a copy of
-#    the second image is returned. There are no restrictions on the
-#    alpha value. If necessary, the result is clipped to fit into
-#    the allowed output range.
-# @return An Image object.
-
-def blend(im1, im2, alpha):
-    "Interpolate between images."
-
-    im1.load()
-    im2.load()
-    return im1._new(core.blend(im1.im, im2.im, alpha))
-
-##
-# Creates a new image by interpolating between two input images,
-# using the mask as alpha.
-#
-# @param image1 The first image.
-# @param image2 The second image.  Must have the same mode and
-#    size as the first image.
-# @param mask A mask image.  This image can can have mode
-#    "1", "L", or "RGBA", and must have the same size as the
-#    other two images.
-
-def composite(image1, image2, mask):
-    "Create composite image by blending images using a transparency mask"
-
-    image = image2.copy()
-    image.paste(image1, None, mask)
-    return image
-
-##
-# Applies the function (which should take one argument) to each pixel
-# in the given image. If the image has more than one band, the same
-# function is applied to each band. Note that the function is
-# evaluated once for each possible pixel value, so you cannot use
-# random components or other generators.
-#
-# @def eval(image, function)
-# @param image The input image.
-# @param function A function object, taking one integer argument.
-# @return An Image object.
-
-def eval(image, *args):
-    "Evaluate image expression"
-
-    return image.point(args[0])
-
-##
-# Creates a new image from a number of single-band images.
-#
-# @param mode The mode to use for the output image.
-# @param bands A sequence containing one single-band image for
-#     each band in the output image.  All bands must have the
-#     same size.
-# @return An Image object.
-
-def merge(mode, bands):
-    "Merge a set of single band images into a new multiband image."
-
-    if getmodebands(mode) != len(bands) or "*" in mode:
-        raise ValueError("wrong number of bands")
-    for im in bands[1:]:
-        if im.mode != getmodetype(mode):
-            raise ValueError("mode mismatch")
-        if im.size != bands[0].size:
-            raise ValueError("size mismatch")
-    im = core.new(mode, bands[0].size)
-    for i in range(getmodebands(mode)):
-        bands[i].load()
-        im.putband(bands[i].im, i)
-    return bands[0]._new(im)
-
-# --------------------------------------------------------------------
-# Plugin registry
-
-##
-# Register an image file plugin.  This function should not be used
-# in application code.
-#
-# @param id An image format identifier.
-# @param factory An image file factory method.
-# @param accept An optional function that can be used to quickly
-#    reject images having another format.
-
-def register_open(id, factory, accept=None):
-    id = string.upper(id)
-    ID.append(id)
-    OPEN[id] = factory, accept
-
-##
-# Registers an image MIME type.  This function should not be used
-# in application code.
-#
-# @param id An image format identifier.
-# @param mimetype The image MIME type for this format.
-
-def register_mime(id, mimetype):
-    MIME[string.upper(id)] = mimetype
-
-##
-# Registers an image save function.  This function should not be
-# used in application code.
-#
-# @param id An image format identifier.
-# @param driver A function to save images in this format.
-
-def register_save(id, driver):
-    SAVE[string.upper(id)] = driver
-
-##
-# Registers an image extension.  This function should not be
-# used in application code.
-#
-# @param id An image format identifier.
-# @param extension An extension used for this format.
-
-def register_extension(id, extension):
-    EXTENSION[string.lower(extension)] = string.upper(id)
-
-
-# --------------------------------------------------------------------
-# Simple display support
-
-def _showxv(image, title=None, command=None):
-
-    if os.name == "nt":
-        format = "BMP"
-    elif sys.platform == "darwin":
-        format = "JPEG"
-        if not command:
-            command = "open -a /Applications/Preview.app"
-    else:
-        format = None
-        if not command:
-            command = "xv"
-            if title:
-                command = command + " -name \"%s\"" % title
-
-    if image.mode == "I;16":
-        # @PIL88 @PIL101
-        # "I;16" isn't an 'official' mode, but we still want to
-        # provide a simple way to show 16-bit images.
-        base = "L"
-    else:
-        base = getmodebase(image.mode)
-    if base != image.mode and image.mode != "1":
-        file = image.convert(base)._dump(format=format)
-    else:
-        file = image._dump(format=format)
-
-    if os.name == "nt":
-        command = "start /wait %s && del /f %s" % (file, file)
-    elif sys.platform == "darwin":
-        # on darwin open returns immediately resulting in the temp
-        # file removal while app is opening
-        command = "(%s %s; sleep 20; rm -f %s)&" % (command, file, file)
-    else:
-        command = "(%s %s; rm -f %s)&" % (command, file, file)
-
-    os.system(command)
diff --git a/pythonPackages/pil/PIL/ImageChops.py b/pythonPackages/pil/PIL/ImageChops.py
deleted file mode 100644
index 6db07102ea..0000000000
--- a/pythonPackages/pil/PIL/ImageChops.py
+++ /dev/null
@@ -1,302 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageChops.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# standard channel operations
-#
-# History:
-# 1996-03-24 fl   Created
-# 1996-08-13 fl   Added logical operations (for "1" images)
-# 2000-10-12 fl   Added offset method (from Image.py)
-#
-# Copyright (c) 1997-2000 by Secret Labs AB
-# Copyright (c) 1996-2000 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-
-##
-# The <b>ImageChops</b> module contains a number of arithmetical image
-# operations, called <i>channel operations</i> ("chops"). These can be
-# used for various purposes, including special effects, image
-# compositions, algorithmic painting, and more.
-# <p>
-# At this time, channel operations are only implemented for 8-bit
-# images (e.g. &quot;L&quot; and &quot;RGB&quot;).
-# <p>
-# Most channel operations take one or two image arguments and returns
-# a new image.  Unless otherwise noted, the result of a channel
-# operation is always clipped to the range 0 to MAX (which is 255 for
-# all modes supported by the operations in this module).
-##
-
-##
-# Return an image with the same size as the given image, but filled
-# with the given pixel value.
-#
-# @param image Reference image.
-# @param value Pixel value.
-# @return An image object.
-
-def constant(image, value):
-    "Fill a channel with a given grey level"
-
-    return Image.new("L", image.size, value)
-
-##
-# Copy image.
-#
-# @param image Source image.
-# @return A copy of the source image.
-
-def duplicate(image):
-    "Create a copy of a channel"
-
-    return image.copy()
-
-##
-# Inverts an image
-# (MAX - image).
-#
-# @param image Source image.
-# @return An image object.
-
-def invert(image):
-    "Invert a channel"
-
-    image.load()
-    return image._new(image.im.chop_invert())
-
-##
-# Compare images, and return lighter pixel value
-# (max(image1, image2)).
-# <p>
-# Compares the two images, pixel by pixel, and returns a new image
-# containing the lighter values.
-#
-# @param image1 First image.
-# @param image1 Second image.
-# @return An image object.
-
-def lighter(image1, image2):
-    "Select the lighter pixels from each image"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_lighter(image2.im))
-
-##
-# Compare images, and return darker pixel value
-# (min(image1, image2)).
-# <p>
-# Compares the two images, pixel by pixel, and returns a new image
-# containing the darker values.
-#
-# @param image1 First image.
-# @param image1 Second image.
-# @return An image object.
-
-def darker(image1, image2):
-    "Select the darker pixels from each image"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_darker(image2.im))
-
-##
-# Calculate absolute difference
-# (abs(image1 - image2)).
-# <p>
-# Returns the absolute value of the difference between the two images.
-#
-# @param image1 First image.
-# @param image1 Second image.
-# @return An image object.
-
-def difference(image1, image2):
-    "Subtract one image from another"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_difference(image2.im))
-
-##
-# Superimpose positive images
-# (image1 * image2 / MAX).
-# <p>
-# Superimposes two images on top of each other. If you multiply an
-# image with a solid black image, the result is black. If you multiply
-# with a solid white image, the image is unaffected.
-#
-# @param image1 First image.
-# @param image1 Second image.
-# @return An image object.
-
-def multiply(image1, image2):
-    "Superimpose two positive images"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_multiply(image2.im))
-
-##
-# Superimpose negative images
-# (MAX - ((MAX - image1) * (MAX - image2) / MAX)).
-# <p>
-# Superimposes two inverted images on top of each other.
-#
-# @param image1 First image.
-# @param image1 Second image.
-# @return An image object.
-
-def screen(image1, image2):
-    "Superimpose two negative images"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_screen(image2.im))
-
-##
-# Add images
-# ((image1 + image2) / scale + offset).
-# <p>
-# Adds two images, dividing the result by scale and adding the
-# offset. If omitted, scale defaults to 1.0, and offset to 0.0.
-#
-# @param image1 First image.
-# @param image1 Second image.
-# @return An image object.
-
-def add(image1, image2, scale=1.0, offset=0):
-    "Add two images"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_add(image2.im, scale, offset))
-
-##
-# Subtract images
-# ((image1 - image2) / scale + offset).
-# <p>
-# Subtracts two images, dividing the result by scale and adding the
-# offset. If omitted, scale defaults to 1.0, and offset to 0.0.
-#
-# @param image1 First image.
-# @param image1 Second image.
-# @return An image object.
-
-def subtract(image1, image2, scale=1.0, offset=0):
-    "Subtract two images"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_subtract(image2.im, scale, offset))
-
-##
-# Add images without clipping
-# ((image1 + image2) % MAX).
-# <p>
-# Adds two images, without clipping the result.
-#
-# @param image1 First image.
-# @param image1 Second image.
-# @return An image object.
-
-def add_modulo(image1, image2):
-    "Add two images without clipping"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_add_modulo(image2.im))
-
-##
-# Subtract images without clipping
-# ((image1 - image2) % MAX).
-# <p>
-# Subtracts two images, without clipping the result.
-#
-# @param image1 First image.
-# @param image1 Second image.
-# @return An image object.
-
-def subtract_modulo(image1, image2):
-    "Subtract two images without clipping"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_subtract_modulo(image2.im))
-
-##
-# Logical AND
-# (image1 and image2).
-
-def logical_and(image1, image2):
-    "Logical and between two images"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_and(image2.im))
-
-##
-# Logical OR
-# (image1 or image2).
-
-def logical_or(image1, image2):
-    "Logical or between two images"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_or(image2.im))
-
-##
-# Logical XOR
-# (image1 xor image2).
-
-def logical_xor(image1, image2):
-    "Logical xor between two images"
-
-    image1.load()
-    image2.load()
-    return image1._new(image1.im.chop_xor(image2.im))
-
-##
-# Blend images using constant transparency weight.
-# <p>
-# Same as the <b>blend</b> function in the <b>Image</b> module.
-
-def blend(image1, image2, alpha):
-    "Blend two images using a constant transparency weight"
-
-    return Image.blend(image1, image2, alpha)
-
-##
-# Create composite using transparency mask.
-# <p>
-# Same as the <b>composite</b> function in the <b>Image</b> module.
-
-def composite(image1, image2, mask):
-    "Create composite image by blending images using a transparency mask"
-
-    return Image.composite(image1, image2, mask)
-
-##
-# Offset image data.
-# <p>
-# Returns a copy of the image where data has been offset by the given
-# distances.  Data wraps around the edges.  If yoffset is omitted, it
-# is assumed to be equal to xoffset.
-#
-# @param image Source image.
-# @param xoffset The horizontal distance.
-# @param yoffset The vertical distance.  If omitted, both
-#    distances are set to the same value.
-# @return An Image object.
-
-def offset(image, xoffset, yoffset=None):
-    "Offset image in horizontal and/or vertical direction"
-    if yoffset is None:
-        yoffset = xoffset
-    image.load()
-    return image._new(image.im.offset(xoffset, yoffset))
diff --git a/pythonPackages/pil/PIL/ImageColor.py b/pythonPackages/pil/PIL/ImageColor.py
deleted file mode 100644
index d97c0c4301..0000000000
--- a/pythonPackages/pil/PIL/ImageColor.py
+++ /dev/null
@@ -1,262 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: ImageColor.py 2813 2006-10-07 10:11:35Z fredrik $
-#
-# map CSS3-style colour description strings to RGB
-#
-# History:
-# 2002-10-24 fl   Added support for CSS-style color strings
-# 2002-12-15 fl   Added RGBA support
-# 2004-03-27 fl   Fixed remaining int() problems for Python 1.5.2
-# 2004-07-19 fl   Fixed gray/grey spelling issues
-#
-# Copyright (c) 2002-2004 by Secret Labs AB
-# Copyright (c) 2002-2004 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-import re, string
-
-try:
-    x = int("a", 16)
-except TypeError:
-    # python 1.5.2 doesn't support int(x,b)
-    str2int = string.atoi
-else:
-    str2int = int
-
-##
-# Convert color string to RGB tuple.
-#
-# @param color A CSS3-style colour string.
-# @return An RGB-tuple.
-# @exception ValueError If the color string could not be interpreted
-#    as an RGB value.
-
-def getrgb(color):
-    # FIXME: add RGBA support
-    try:
-        rgb = colormap[color]
-    except KeyError:
-        try:
-            # fall back on case-insensitive lookup
-            rgb = colormap[string.lower(color)]
-        except KeyError:
-            rgb = None
-    # found color in cache
-    if rgb:
-        if isinstance(rgb, type(())):
-            return rgb
-        colormap[color] = rgb = getrgb(rgb)
-        return rgb
-    # check for known string formats
-    m = re.match("#\w\w\w$", color)
-    if m:
-        return (
-            str2int(color[1]*2, 16),
-            str2int(color[2]*2, 16),
-            str2int(color[3]*2, 16)
-            )
-    m = re.match("#\w\w\w\w\w\w$", color)
-    if m:
-        return (
-            str2int(color[1:3], 16),
-            str2int(color[3:5], 16),
-            str2int(color[5:7], 16)
-            )
-    m = re.match("rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$", color)
-    if m:
-        return (
-            str2int(m.group(1)),
-            str2int(m.group(2)),
-            str2int(m.group(3))
-            )
-    m = re.match("rgb\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)$", color)
-    if m:
-        return (
-            int((str2int(m.group(1)) * 255) / 100.0 + 0.5),
-            int((str2int(m.group(2)) * 255) / 100.0 + 0.5),
-            int((str2int(m.group(3)) * 255) / 100.0 + 0.5)
-            )
-    m = re.match("hsl\(\s*(\d+)\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)$", color)
-    if m:
-        from colorsys import hls_to_rgb
-        rgb = hls_to_rgb(
-            float(m.group(1)) / 360.0,
-            float(m.group(3)) / 100.0,
-            float(m.group(2)) / 100.0,
-            )
-        return (
-            int(rgb[0] * 255 + 0.5),
-            int(rgb[1] * 255 + 0.5),
-            int(rgb[2] * 255 + 0.5)
-            )
-    raise ValueError("unknown color specifier: %r" % color)
-
-def getcolor(color, mode):
-    # same as getrgb, but converts the result to the given mode
-    color = getrgb(color)
-    if mode == "RGB":
-        return color
-    if mode == "RGBA":
-        r, g, b = color
-        return r, g, b, 255
-    if Image.getmodebase(mode) == "L":
-        r, g, b = color
-        return r*299/1000 + g*587/1000 + b*114/1000
-    return color
-
-colormap = {
-    # X11 colour table (from "CSS3 module: Color working draft"), with
-    # gray/grey spelling issues fixed.  This is a superset of HTML 4.0
-    # colour names used in CSS 1.
-    "aliceblue": "#f0f8ff",
-    "antiquewhite": "#faebd7",
-    "aqua": "#00ffff",
-    "aquamarine": "#7fffd4",
-    "azure": "#f0ffff",
-    "beige": "#f5f5dc",
-    "bisque": "#ffe4c4",
-    "black": "#000000",
-    "blanchedalmond": "#ffebcd",
-    "blue": "#0000ff",
-    "blueviolet": "#8a2be2",
-    "brown": "#a52a2a",
-    "burlywood": "#deb887",
-    "cadetblue": "#5f9ea0",
-    "chartreuse": "#7fff00",
-    "chocolate": "#d2691e",
-    "coral": "#ff7f50",
-    "cornflowerblue": "#6495ed",
-    "cornsilk": "#fff8dc",
-    "crimson": "#dc143c",
-    "cyan": "#00ffff",
-    "darkblue": "#00008b",
-    "darkcyan": "#008b8b",
-    "darkgoldenrod": "#b8860b",
-    "darkgray": "#a9a9a9",
-    "darkgrey": "#a9a9a9",
-    "darkgreen": "#006400",
-    "darkkhaki": "#bdb76b",
-    "darkmagenta": "#8b008b",
-    "darkolivegreen": "#556b2f",
-    "darkorange": "#ff8c00",
-    "darkorchid": "#9932cc",
-    "darkred": "#8b0000",
-    "darksalmon": "#e9967a",
-    "darkseagreen": "#8fbc8f",
-    "darkslateblue": "#483d8b",
-    "darkslategray": "#2f4f4f",
-    "darkslategrey": "#2f4f4f",
-    "darkturquoise": "#00ced1",
-    "darkviolet": "#9400d3",
-    "deeppink": "#ff1493",
-    "deepskyblue": "#00bfff",
-    "dimgray": "#696969",
-    "dimgrey": "#696969",
-    "dodgerblue": "#1e90ff",
-    "firebrick": "#b22222",
-    "floralwhite": "#fffaf0",
-    "forestgreen": "#228b22",
-    "fuchsia": "#ff00ff",
-    "gainsboro": "#dcdcdc",
-    "ghostwhite": "#f8f8ff",
-    "gold": "#ffd700",
-    "goldenrod": "#daa520",
-    "gray": "#808080",
-    "grey": "#808080",
-    "green": "#008000",
-    "greenyellow": "#adff2f",
-    "honeydew": "#f0fff0",
-    "hotpink": "#ff69b4",
-    "indianred": "#cd5c5c",
-    "indigo": "#4b0082",
-    "ivory": "#fffff0",
-    "khaki": "#f0e68c",
-    "lavender": "#e6e6fa",
-    "lavenderblush": "#fff0f5",
-    "lawngreen": "#7cfc00",
-    "lemonchiffon": "#fffacd",
-    "lightblue": "#add8e6",
-    "lightcoral": "#f08080",
-    "lightcyan": "#e0ffff",
-    "lightgoldenrodyellow": "#fafad2",
-    "lightgreen": "#90ee90",
-    "lightgray": "#d3d3d3",
-    "lightgrey": "#d3d3d3",
-    "lightpink": "#ffb6c1",
-    "lightsalmon": "#ffa07a",
-    "lightseagreen": "#20b2aa",
-    "lightskyblue": "#87cefa",
-    "lightslategray": "#778899",
-    "lightslategrey": "#778899",
-    "lightsteelblue": "#b0c4de",
-    "lightyellow": "#ffffe0",
-    "lime": "#00ff00",
-    "limegreen": "#32cd32",
-    "linen": "#faf0e6",
-    "magenta": "#ff00ff",
-    "maroon": "#800000",
-    "mediumaquamarine": "#66cdaa",
-    "mediumblue": "#0000cd",
-    "mediumorchid": "#ba55d3",
-    "mediumpurple": "#9370db",
-    "mediumseagreen": "#3cb371",
-    "mediumslateblue": "#7b68ee",
-    "mediumspringgreen": "#00fa9a",
-    "mediumturquoise": "#48d1cc",
-    "mediumvioletred": "#c71585",
-    "midnightblue": "#191970",
-    "mintcream": "#f5fffa",
-    "mistyrose": "#ffe4e1",
-    "moccasin": "#ffe4b5",
-    "navajowhite": "#ffdead",
-    "navy": "#000080",
-    "oldlace": "#fdf5e6",
-    "olive": "#808000",
-    "olivedrab": "#6b8e23",
-    "orange": "#ffa500",
-    "orangered": "#ff4500",
-    "orchid": "#da70d6",
-    "palegoldenrod": "#eee8aa",
-    "palegreen": "#98fb98",
-    "paleturquoise": "#afeeee",
-    "palevioletred": "#db7093",
-    "papayawhip": "#ffefd5",
-    "peachpuff": "#ffdab9",
-    "peru": "#cd853f",
-    "pink": "#ffc0cb",
-    "plum": "#dda0dd",
-    "powderblue": "#b0e0e6",
-    "purple": "#800080",
-    "red": "#ff0000",
-    "rosybrown": "#bc8f8f",
-    "royalblue": "#4169e1",
-    "saddlebrown": "#8b4513",
-    "salmon": "#fa8072",
-    "sandybrown": "#f4a460",
-    "seagreen": "#2e8b57",
-    "seashell": "#fff5ee",
-    "sienna": "#a0522d",
-    "silver": "#c0c0c0",
-    "skyblue": "#87ceeb",
-    "slateblue": "#6a5acd",
-    "slategray": "#708090",
-    "slategrey": "#708090",
-    "snow": "#fffafa",
-    "springgreen": "#00ff7f",
-    "steelblue": "#4682b4",
-    "tan": "#d2b48c",
-    "teal": "#008080",
-    "thistle": "#d8bfd8",
-    "tomato": "#ff6347",
-    "turquoise": "#40e0d0",
-    "violet": "#ee82ee",
-    "wheat": "#f5deb3",
-    "white": "#ffffff",
-    "whitesmoke": "#f5f5f5",
-    "yellow": "#ffff00",
-    "yellowgreen": "#9acd32",
-}
diff --git a/pythonPackages/pil/PIL/ImageDraw.py b/pythonPackages/pil/PIL/ImageDraw.py
deleted file mode 100644
index 7f9107bc7c..0000000000
--- a/pythonPackages/pil/PIL/ImageDraw.py
+++ /dev/null
@@ -1,378 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: ImageDraw.py 2817 2006-10-07 15:34:03Z fredrik $
-#
-# drawing interface operations
-#
-# History:
-# 1996-04-13 fl   Created (experimental)
-# 1996-08-07 fl   Filled polygons, ellipses.
-# 1996-08-13 fl   Added text support
-# 1998-06-28 fl   Handle I and F images
-# 1998-12-29 fl   Added arc; use arc primitive to draw ellipses
-# 1999-01-10 fl   Added shape stuff (experimental)
-# 1999-02-06 fl   Added bitmap support
-# 1999-02-11 fl   Changed all primitives to take options
-# 1999-02-20 fl   Fixed backwards compatibility
-# 2000-10-12 fl   Copy on write, when necessary
-# 2001-02-18 fl   Use default ink for bitmap/text also in fill mode
-# 2002-10-24 fl   Added support for CSS-style color strings
-# 2002-12-10 fl   Added experimental support for RGBA-on-RGB drawing
-# 2002-12-11 fl   Refactored low-level drawing API (work in progress)
-# 2004-08-26 fl   Made Draw() a factory function, added getdraw() support
-# 2004-09-04 fl   Added width support to line primitive
-# 2004-09-10 fl   Added font mode handling
-# 2006-06-19 fl   Added font bearing support (getmask2)
-#
-# Copyright (c) 1997-2006 by Secret Labs AB
-# Copyright (c) 1996-2006 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image, ImageColor
-
-try:
-    import warnings
-except ImportError:
-    warnings = None
-
-##
-# A simple 2D drawing interface for PIL images.
-# <p>
-# Application code should use the <b>Draw</b> factory, instead of
-# directly.
-
-class ImageDraw:
-
-    ##
-    # Create a drawing instance.
-    #
-    # @param im The image to draw in.
-    # @param mode Optional mode to use for color values.  For RGB
-    #    images, this argument can be RGB or RGBA (to blend the
-    #    drawing into the image).  For all other modes, this argument
-    #    must be the same as the image mode.  If omitted, the mode
-    #    defaults to the mode of the image.
-
-    def __init__(self, im, mode=None):
-        im.load()
-        if im.readonly:
-            im._copy() # make it writable
-        blend = 0
-        if mode is None:
-            mode = im.mode
-        if mode != im.mode:
-            if mode == "RGBA" and im.mode == "RGB":
-                blend = 1
-            else:
-                raise ValueError("mode mismatch")
-        if mode == "P":
-            self.palette = im.palette
-        else:
-            self.palette = None
-        self.im = im.im
-        self.draw = Image.core.draw(self.im, blend)
-        self.mode = mode
-        if mode in ("I", "F"):
-            self.ink = self.draw.draw_ink(1, mode)
-        else:
-            self.ink = self.draw.draw_ink(-1, mode)
-        if mode in ("1", "P", "I", "F"):
-            # FIXME: fix Fill2 to properly support matte for I+F images
-            self.fontmode = "1"
-        else:
-            self.fontmode = "L" # aliasing is okay for other modes
-        self.fill = 0
-        self.font = None
-
-    ##
-    # Set the default pen color.
-
-    def setink(self, ink):
-        # compatibility
-        if warnings:
-            warnings.warn(
-                "'setink' is deprecated; use keyword arguments instead",
-                DeprecationWarning, stacklevel=2
-                )
-        if Image.isStringType(ink):
-            ink = ImageColor.getcolor(ink, self.mode)
-        if self.palette and not Image.isNumberType(ink):
-            ink = self.palette.getcolor(ink)
-        self.ink = self.draw.draw_ink(ink, self.mode)
-
-    ##
-    # Set the default background color.
-
-    def setfill(self, onoff):
-        # compatibility
-        if warnings:
-            warnings.warn(
-                "'setfill' is deprecated; use keyword arguments instead",
-                DeprecationWarning, stacklevel=2
-                )
-        self.fill = onoff
-
-    ##
-    # Set the default font.
-
-    def setfont(self, font):
-        # compatibility
-        self.font = font
-
-    ##
-    # Get the current default font.
-
-    def getfont(self):
-        if not self.font:
-            # FIXME: should add a font repository
-            import ImageFont
-            self.font = ImageFont.load_default()
-        return self.font
-
-    def _getink(self, ink, fill=None):
-        if ink is None and fill is None:
-            if self.fill:
-                fill = self.ink
-            else:
-                ink = self.ink
-        else:
-            if ink is not None:
-                if Image.isStringType(ink):
-                    ink = ImageColor.getcolor(ink, self.mode)
-                if self.palette and not Image.isNumberType(ink):
-                    ink = self.palette.getcolor(ink)
-                ink = self.draw.draw_ink(ink, self.mode)
-            if fill is not None:
-                if Image.isStringType(fill):
-                    fill = ImageColor.getcolor(fill, self.mode)
-                if self.palette and not Image.isNumberType(fill):
-                    fill = self.palette.getcolor(fill)
-                fill = self.draw.draw_ink(fill, self.mode)
-        return ink, fill
-
-    ##
-    # Draw an arc.
-
-    def arc(self, xy, start, end, fill=None):
-        ink, fill = self._getink(fill)
-        if ink is not None:
-            self.draw.draw_arc(xy, start, end, ink)
-
-    ##
-    # Draw a bitmap.
-
-    def bitmap(self, xy, bitmap, fill=None):
-        bitmap.load()
-        ink, fill = self._getink(fill)
-        if ink is None:
-            ink = fill
-        if ink is not None:
-            self.draw.draw_bitmap(xy, bitmap.im, ink)
-
-    ##
-    # Draw a chord.
-
-    def chord(self, xy, start, end, fill=None, outline=None):
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_chord(xy, start, end, fill, 1)
-        if ink is not None:
-            self.draw.draw_chord(xy, start, end, ink, 0)
-
-    ##
-    # Draw an ellipse.
-
-    def ellipse(self, xy, fill=None, outline=None):
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_ellipse(xy, fill, 1)
-        if ink is not None:
-            self.draw.draw_ellipse(xy, ink, 0)
-
-    ##
-    # Draw a line, or a connected sequence of line segments.
-
-    def line(self, xy, fill=None, width=0):
-        ink, fill = self._getink(fill)
-        if ink is not None:
-            self.draw.draw_lines(xy, ink, width)
-
-    ##
-    # (Experimental) Draw a shape.
-
-    def shape(self, shape, fill=None, outline=None):
-        # experimental
-        shape.close()
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_outline(shape, fill, 1)
-        if ink is not None:
-            self.draw.draw_outline(shape, ink, 0)
-
-    ##
-    # Draw a pieslice.
-
-    def pieslice(self, xy, start, end, fill=None, outline=None):
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_pieslice(xy, start, end, fill, 1)
-        if ink is not None:
-            self.draw.draw_pieslice(xy, start, end, ink, 0)
-
-    ##
-    # Draw one or more individual pixels.
-
-    def point(self, xy, fill=None):
-        ink, fill = self._getink(fill)
-        if ink is not None:
-            self.draw.draw_points(xy, ink)
-
-    ##
-    # Draw a polygon.
-
-    def polygon(self, xy, fill=None, outline=None):
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_polygon(xy, fill, 1)
-        if ink is not None:
-            self.draw.draw_polygon(xy, ink, 0)
-
-    ##
-    # Draw a rectangle.
-
-    def rectangle(self, xy, fill=None, outline=None):
-        ink, fill = self._getink(outline, fill)
-        if fill is not None:
-            self.draw.draw_rectangle(xy, fill, 1)
-        if ink is not None:
-            self.draw.draw_rectangle(xy, ink, 0)
-
-    ##
-    # Draw text.
-
-    def text(self, xy, text, fill=None, font=None, anchor=None):
-        ink, fill = self._getink(fill)
-        if font is None:
-            font = self.getfont()
-        if ink is None:
-            ink = fill
-        if ink is not None:
-            try:
-                mask, offset = font.getmask2(text, self.fontmode)
-                xy = xy[0] + offset[0], xy[1] + offset[1]
-            except AttributeError:
-                try:
-                    mask = font.getmask(text, self.fontmode)
-                except TypeError:
-                    mask = font.getmask(text)
-            self.draw.draw_bitmap(xy, mask, ink)
-
-    ##
-    # Get the size of a given string, in pixels.
-
-    def textsize(self, text, font=None):
-        if font is None:
-            font = self.getfont()
-        return font.getsize(text)
-
-##
-# A simple 2D drawing interface for PIL images.
-#
-# @param im The image to draw in.
-# @param mode Optional mode to use for color values.  For RGB
-#    images, this argument can be RGB or RGBA (to blend the
-#    drawing into the image).  For all other modes, this argument
-#    must be the same as the image mode.  If omitted, the mode
-#    defaults to the mode of the image.
-
-def Draw(im, mode=None):
-    try:
-        return im.getdraw(mode)
-    except AttributeError:
-        return ImageDraw(im, mode)
-
-# experimental access to the outline API
-try:
-    Outline = Image.core.outline
-except:
-    Outline = None
-
-##
-# (Experimental) A more advanced 2D drawing interface for PIL images,
-# based on the WCK interface.
-#
-# @param im The image to draw in.
-# @param hints An optional list of hints.
-# @return A (drawing context, drawing resource factory) tuple.
-
-def getdraw(im=None, hints=None):
-    # FIXME: this needs more work!
-    # FIXME: come up with a better 'hints' scheme.
-    handler = None
-    if not hints or "nicest" in hints:
-        try:
-            import _imagingagg
-            handler = _imagingagg
-        except ImportError:
-            pass
-    if handler is None:
-        import ImageDraw2
-        handler = ImageDraw2
-    if im:
-        im = handler.Draw(im)
-    return im, handler
-
-##
-# (experimental) Fills a bounded region with a given color.
-#
-# @param image Target image.
-# @param xy Seed position (a 2-item coordinate tuple).
-# @param value Fill color.
-# @param border Optional border value.  If given, the region consists of
-#     pixels with a color different from the border color.  If not given,
-#     the region consists of pixels having the same color as the seed
-#     pixel.
-
-def floodfill(image, xy, value, border=None):
-    "Fill bounded region."
-    # based on an implementation by Eric S. Raymond
-    pixel = image.load()
-    x, y = xy
-    try:
-        background = pixel[x, y]
-        if background == value:
-            return # seed point already has fill color
-        pixel[x, y] = value
-    except IndexError:
-        return # seed point outside image
-    edge = [(x, y)]
-    if border is None:
-        while edge:
-            newedge = []
-            for (x, y) in edge:
-                for (s, t) in ((x+1, y), (x-1, y), (x, y+1), (x, y-1)):
-                    try:
-                        p = pixel[s, t]
-                    except IndexError:
-                        pass
-                    else:
-                        if p == background:
-                            pixel[s, t] = value
-                            newedge.append((s, t))
-            edge = newedge
-    else:
-        while edge:
-            newedge = []
-            for (x, y) in edge:
-                for (s, t) in ((x+1, y), (x-1, y), (x, y+1), (x, y-1)):
-                    try:
-                        p = pixel[s, t]
-                    except IndexError:
-                        pass
-                    else:
-                        if p != value and p != border:
-                            pixel[s, t] = value
-                            newedge.append((s, t))
-            edge = newedge
diff --git a/pythonPackages/pil/PIL/ImageDraw2.py b/pythonPackages/pil/PIL/ImageDraw2.py
deleted file mode 100644
index a2b6088532..0000000000
--- a/pythonPackages/pil/PIL/ImageDraw2.py
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: ImageDraw.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# WCK-style drawing interface operations
-#
-# History:
-# 2003-12-07 fl   created
-# 2005-05-15 fl   updated; added to PIL as ImageDraw2
-# 2005-05-15 fl   added text support
-# 2005-05-20 fl   added arc/chord/pieslice support
-#
-# Copyright (c) 2003-2005 by Secret Labs AB
-# Copyright (c) 2003-2005 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image, ImageColor, ImageDraw, ImageFont, ImagePath
-
-class Pen:
-    def __init__(self, color, width=1, opacity=255):
-        self.color = ImageColor.getrgb(color)
-        self.width = width
-
-class Brush:
-    def __init__(self, color, opacity=255):
-        self.color = ImageColor.getrgb(color)
-
-class Font:
-    def __init__(self, color, file, size=12):
-        # FIXME: add support for bitmap fonts
-        self.color = ImageColor.getrgb(color)
-        self.font = ImageFont.truetype(file, size)
-
-class Draw:
-
-    def __init__(self, image, size=None, color=None):
-        if not hasattr(image, "im"):
-            image = Image.new(image, size, color)
-        self.draw = ImageDraw.Draw(image)
-        self.image = image
-        self.transform = None
-
-    def flush(self):
-        return self.image
-
-    def render(self, op, xy, pen, brush=None):
-        # handle color arguments
-        outline = fill = None; width = 1
-        if isinstance(pen, Pen):
-            outline = pen.color
-            width = pen.width
-        elif isinstance(brush, Pen):
-            outline = brush.color
-            width = brush.width
-        if isinstance(brush, Brush):
-            fill = brush.color
-        elif isinstance(pen, Brush):
-            fill = pen.color
-        # handle transformation
-        if self.transform:
-            xy = ImagePath.Path(xy)
-            xy.transform(self.transform)
-        # render the item
-        if op == "line":
-            self.draw.line(xy, fill=outline, width=width)
-        else:
-            getattr(self.draw, op)(xy, fill=fill, outline=outline)
-
-    def settransform(self, (xoffset, yoffset)):
-        self.transform = (1, 0, xoffset, 0, 1, yoffset)
-
-    def arc(self, xy, start, end, *options):
-        self.render("arc", xy, start, end, *options)
-
-    def chord(self, xy, start, end, *options):
-        self.render("chord", xy, start, end, *options)
-
-    def ellipse(self, xy, *options):
-        self.render("ellipse", xy, *options)
-
-    def pieslice(self, xy, start, end, *options):
-        self.render("pieslice", xy, start, end, *options)
-
-    def line(self, xy, *options):
-        self.render("line", xy, *options)
-
-    def rectangle(self, xy, *options):
-        self.render("rectangle", xy, *options)
-
-    def ellipse(self, xy, *options):
-        self.render("ellipse", xy, *options)
-
-    def polygon(self, xy, *options):
-        self.render("polygon", xy, *options)
-
-    def symbol(self, xy, symbol, *options):
-        raise NotImplementedError("not in this version")
-
-    def text(self, xy, text, font):
-        if self.transform:
-            xy = ImagePath.Path(xy)
-            xy.transform(self.transform)
-        self.draw.text(xy, text, font=font.font, fill=font.color)
-
-    def textsize(self, text, font):
-        return self.draw.textsize(text, font=font.font)
diff --git a/pythonPackages/pil/PIL/ImageEnhance.py b/pythonPackages/pil/PIL/ImageEnhance.py
deleted file mode 100644
index cddd084f8f..0000000000
--- a/pythonPackages/pil/PIL/ImageEnhance.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageEnhance.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# image enhancement classes
-#
-# For a background, see "Image Processing By Interpolation and
-# Extrapolation", Paul Haeberli and Douglas Voorhies.  Available
-# at http://www.sgi.com/grafica/interp/index.html
-#
-# History:
-#       96-03-23 fl     Created
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1996.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image, ImageFilter
-
-class _Enhance:
-
-    ##
-    # Returns an enhanced image. The enhancement factor is a floating
-    # point value controlling the enhancement. Factor 1.0 always
-    # returns a copy of the original image, lower factors mean less
-    # colour (brightness, contrast, etc), and higher values more.
-    # There are no restrictions on this value.
-    #
-    # @param factor Enhancement factor.
-    # @return An enhanced image.
-
-    def enhance(self, factor):
-        return Image.blend(self.degenerate, self.image, factor)
-
-##
-# Color enhancement object.
-# <p>
-# This class can be used to adjust the colour balance of an image, in
-# a manner similar to the controls on a colour TV set.  An enhancement
-# factor of 0.0 gives a black and white image, a factor of 1.0 gives
-# the original image.
-
-class Color(_Enhance):
-    "Adjust image colour balance"
-    def __init__(self, image):
-        self.image = image
-        self.degenerate = image.convert("L").convert(image.mode)
-
-##
-# Contrast enhancement object.
-# <p>
-# This class can be used to control the contrast of an image, similar
-# to the contrast control on a TV set.  An enhancement factor of 0.0
-# gives an solid grey image, factor 1.0 gives the original image.
-
-class Contrast(_Enhance):
-    "Adjust image contrast"
-    def __init__(self, image):
-        self.image = image
-        mean = reduce(lambda a,b: a+b, image.convert("L").histogram())/256.0
-        self.degenerate = Image.new("L", image.size, mean).convert(image.mode)
-
-##
-# Brightness enhancement object.
-# <p>
-# This class can be used to control the brighntess of an image.  An
-# enhancement factor of 0.0 gives a black image, factor 1.0 gives the
-# original image.
-
-class Brightness(_Enhance):
-    "Adjust image brightness"
-    def __init__(self, image):
-        self.image = image
-        self.degenerate = Image.new(image.mode, image.size, 0)
-
-##
-# Sharpness enhancement object.
-# <p>
-# This class can be used to adjust the sharpness of an image.  The
-# enhancement factor 0.0 gives a blurred image, 1.0 gives the original
-# image, and a factor of 2.0 gives a sharpened image.
-
-class Sharpness(_Enhance):
-    "Adjust image sharpness"
-    def __init__(self, image):
-        self.image = image
-        self.degenerate = image.filter(ImageFilter.SMOOTH)
diff --git a/pythonPackages/pil/PIL/ImageFile.py b/pythonPackages/pil/PIL/ImageFile.py
deleted file mode 100644
index d51aff3fb9..0000000000
--- a/pythonPackages/pil/PIL/ImageFile.py
+++ /dev/null
@@ -1,520 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageFile.py 2930 2006-12-02 13:50:40Z fredrik $
-#
-# base class for image file handlers
-#
-# history:
-# 1995-09-09 fl   Created
-# 1996-03-11 fl   Fixed load mechanism.
-# 1996-04-15 fl   Added pcx/xbm decoders.
-# 1996-04-30 fl   Added encoders.
-# 1996-12-14 fl   Added load helpers
-# 1997-01-11 fl   Use encode_to_file where possible
-# 1997-08-27 fl   Flush output in _save
-# 1998-03-05 fl   Use memory mapping for some modes
-# 1999-02-04 fl   Use memory mapping also for "I;16" and "I;16B"
-# 1999-05-31 fl   Added image parser
-# 2000-10-12 fl   Set readonly flag on memory-mapped images
-# 2002-03-20 fl   Use better messages for common decoder errors
-# 2003-04-21 fl   Fall back on mmap/map_buffer if map is not available
-# 2003-10-30 fl   Added StubImageFile class
-# 2004-02-25 fl   Made incremental parser more robust
-#
-# Copyright (c) 1997-2004 by Secret Labs AB
-# Copyright (c) 1995-2004 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-import traceback, sys, string, os
-
-MAXBLOCK = 65536
-
-SAFEBLOCK = 1024*1024
-
-ERRORS = {
-    -1: "image buffer overrun error",
-    -2: "decoding error",
-    -3: "unknown error",
-    -8: "bad configuration",
-    -9: "out of memory error"
-}
-
-#
-# --------------------------------------------------------------------
-# Helpers
-
-def _tilesort(t1, t2):
-    # sort on offset
-    return cmp(t1[2], t2[2])
-
-#
-# --------------------------------------------------------------------
-# ImageFile base class
-
-##
-# Base class for image file handlers.
-
-class ImageFile(Image.Image):
-    "Base class for image file format handlers."
-
-    def __init__(self, fp=None, filename=None):
-        Image.Image.__init__(self)
-
-        self.tile = None
-        self.readonly = 1 # until we know better
-
-        self.decoderconfig = ()
-        self.decodermaxblock = MAXBLOCK
-
-        if Image.isStringType(fp):
-            # filename
-            self.fp = open(fp, "rb")
-            self.filename = fp
-        else:
-            # stream
-            self.fp = fp
-            self.filename = filename
-
-        try:
-            self._open()
-        except IndexError, v: # end of data
-            if Image.DEBUG > 1:
-                traceback.print_exc()
-            raise SyntaxError, v
-        except TypeError, v: # end of data (ord)
-            if Image.DEBUG > 1:
-                traceback.print_exc()
-            raise SyntaxError, v
-        except KeyError, v: # unsupported mode
-            if Image.DEBUG > 1:
-                traceback.print_exc()
-            raise SyntaxError, v
-        except EOFError, v: # got header but not the first frame
-            if Image.DEBUG > 1:
-                traceback.print_exc()
-            raise SyntaxError, v
-
-        if not self.mode or self.size[0] <= 0:
-            raise SyntaxError, "not identified by this driver"
-
-    def draft(self, mode, size):
-        "Set draft mode"
-
-        pass
-
-    def verify(self):
-        "Check file integrity"
-
-        # raise exception if something's wrong.  must be called
-        # directly after open, and closes file when finished.
-        self.fp = None
-
-    def load(self):
-        "Load image data based on tile list"
-
-        pixel = Image.Image.load(self)
-
-        if self.tile is None:
-            raise IOError("cannot load this image")
-        if not self.tile:
-            return pixel
-
-        self.map = None
-
-        readonly = 0
-
-        if self.filename and len(self.tile) == 1:
-            # try memory mapping
-            d, e, o, a = self.tile[0]
-            if d == "raw" and a[0] == self.mode and a[0] in Image._MAPMODES:
-                try:
-                    if hasattr(Image.core, "map"):
-                        # use built-in mapper
-                        self.map = Image.core.map(self.filename)
-                        self.map.seek(o)
-                        self.im = self.map.readimage(
-                            self.mode, self.size, a[1], a[2]
-                            )
-                    else:
-                        # use mmap, if possible
-                        import mmap
-                        file = open(self.filename, "r+")
-                        size = os.path.getsize(self.filename)
-                        # FIXME: on Unix, use PROT_READ etc
-                        self.map = mmap.mmap(file.fileno(), size)
-                        self.im = Image.core.map_buffer(
-                            self.map, self.size, d, e, o, a
-                            )
-                    readonly = 1
-                except (AttributeError, EnvironmentError, ImportError):
-                    self.map = None
-
-        self.load_prepare()
-
-        # look for read/seek overrides
-        try:
-            read = self.load_read
-        except AttributeError:
-            read = self.fp.read
-
-        try:
-            seek = self.load_seek
-        except AttributeError:
-            seek = self.fp.seek
-
-        if not self.map:
-
-            # sort tiles in file order
-            self.tile.sort(_tilesort)
-
-            try:
-                # FIXME: This is a hack to handle TIFF's JpegTables tag.
-                prefix = self.tile_prefix
-            except AttributeError:
-                prefix = ""
-
-            for d, e, o, a in self.tile:
-                d = Image._getdecoder(self.mode, d, a, self.decoderconfig)
-                seek(o)
-                try:
-                    d.setimage(self.im, e)
-                except ValueError:
-                    continue
-                b = prefix
-                t = len(b)
-                while 1:
-                    s = read(self.decodermaxblock)
-                    if not s:
-                        self.tile = []
-                        raise IOError("image file is truncated (%d bytes not processed)" % len(b))
-                    b = b + s
-                    n, e = d.decode(b)
-                    if n < 0:
-                        break
-                    b = b[n:]
-                    t = t + n
-
-        self.tile = []
-        self.readonly = readonly
-
-        self.fp = None # might be shared
-
-        if not self.map and e < 0:
-            error = ERRORS.get(e, "decoder error %d" % e)
-            raise IOError(error + " when reading image file")
-
-        # post processing
-        if hasattr(self, "tile_post_rotate"):
-            # FIXME: This is a hack to handle rotated PCD's
-            self.im = self.im.rotate(self.tile_post_rotate)
-            self.size = self.im.size
-
-        self.load_end()
-
-        return Image.Image.load(self)
-
-    def load_prepare(self):
-        # create image memory if necessary
-        if not self.im or\
-           self.im.mode != self.mode or self.im.size != self.size:
-            self.im = Image.core.new(self.mode, self.size)
-        # create palette (optional)
-        if self.mode == "P":
-            Image.Image.load(self)
-
-    def load_end(self):
-        # may be overridden
-        pass
-
-    # may be defined for contained formats
-    # def load_seek(self, pos):
-    #     pass
-
-    # may be defined for blocked formats (e.g. PNG)
-    # def load_read(self, bytes):
-    #     pass
-
-##
-# Base class for stub image loaders.
-# <p>
-# A stub loader is an image loader that can identify files of a
-# certain format, but relies on external code to load the file.
-
-class StubImageFile(ImageFile):
-    "Base class for stub image loaders."
-
-    def _open(self):
-        raise NotImplementedError(
-            "StubImageFile subclass must implement _open"
-            )
-
-    def load(self):
-        loader = self._load()
-        if loader is None:
-            raise IOError("cannot find loader for this %s file" % self.format)
-        image = loader.load(self)
-        assert image is not None
-        # become the other object (!)
-        self.__class__ = image.__class__
-        self.__dict__ = image.__dict__
-
-    ##
-    # (Hook) Find actual image loader.
-
-    def _load(self):
-        raise NotImplementedError(
-            "StubImageFile subclass must implement _load"
-            )
-
-##
-# (Internal) Support class for the <b>Parser</b> file.
-
-class _ParserFile:
-    # parser support class.
-
-    def __init__(self, data):
-        self.data = data
-        self.offset = 0
-
-    def close(self):
-        self.data = self.offset = None
-
-    def tell(self):
-        return self.offset
-
-    def seek(self, offset, whence=0):
-        if whence == 0:
-            self.offset = offset
-        elif whence == 1:
-            self.offset = self.offset + offset
-        else:
-            # force error in Image.open
-            raise IOError("illegal argument to seek")
-
-    def read(self, bytes=0):
-        pos = self.offset
-        if bytes:
-            data = self.data[pos:pos+bytes]
-        else:
-            data = self.data[pos:]
-        self.offset = pos + len(data)
-        return data
-
-    def readline(self):
-        # FIXME: this is slow!
-        s = ""
-        while 1:
-            c = self.read(1)
-            if not c:
-                break
-            s = s + c
-            if c == "\n":
-                break
-        return s
-
-##
-# Incremental image parser.  This class implements the standard
-# feed/close consumer interface.
-
-class Parser:
-
-    incremental = None
-    image = None
-    data = None
-    decoder = None
-    finished = 0
-
-    ##
-    # (Consumer) Reset the parser.  Note that you can only call this
-    # method immediately after you've created a parser; parser
-    # instances cannot be reused.
-
-    def reset(self):
-        assert self.data is None, "cannot reuse parsers"
-
-    ##
-    # (Consumer) Feed data to the parser.
-    #
-    # @param data A string buffer.
-    # @exception IOError If the parser failed to parse the image file.
-
-    def feed(self, data):
-        # collect data
-
-        if self.finished:
-            return
-
-        if self.data is None:
-            self.data = data
-        else:
-            self.data = self.data + data
-
-        # parse what we have
-        if self.decoder:
-
-            if self.offset > 0:
-                # skip header
-                skip = min(len(self.data), self.offset)
-                self.data = self.data[skip:]
-                self.offset = self.offset - skip
-                if self.offset > 0 or not self.data:
-                    return
-
-            n, e = self.decoder.decode(self.data)
-
-            if n < 0:
-                # end of stream
-                self.data = None
-                self.finished = 1
-                if e < 0:
-                    # decoding error
-                    self.image = None
-                    error = ERRORS.get(e, "decoder error %d" % e)
-                    raise IOError(error + " when reading image file")
-                else:
-                    # end of image
-                    return
-            self.data = self.data[n:]
-
-        elif self.image:
-
-            # if we end up here with no decoder, this file cannot
-            # be incrementally parsed.  wait until we've gotten all
-            # available data
-            pass
-
-        else:
-
-            # attempt to open this file
-            try:
-                try:
-                    fp = _ParserFile(self.data)
-                    im = Image.open(fp)
-                finally:
-                    fp.close() # explicitly close the virtual file
-            except IOError:
-                pass # not enough data
-            else:
-                flag = hasattr(im, "load_seek") or hasattr(im, "load_read")
-                if flag or len(im.tile) != 1:
-                    # custom load code, or multiple tiles
-                    self.decode = None
-                else:
-                    # initialize decoder
-                    im.load_prepare()
-                    d, e, o, a = im.tile[0]
-                    im.tile = []
-                    self.decoder = Image._getdecoder(
-                        im.mode, d, a, im.decoderconfig
-                        )
-                    self.decoder.setimage(im.im, e)
-
-                    # calculate decoder offset
-                    self.offset = o
-                    if self.offset <= len(self.data):
-                        self.data = self.data[self.offset:]
-                        self.offset = 0
-
-                self.image = im
-
-    ##
-    # (Consumer) Close the stream.
-    #
-    # @return An image object.
-    # @exception IOError If the parser failed to parse the image file.
-
-    def close(self):
-        # finish decoding
-        if self.decoder:
-            # get rid of what's left in the buffers
-            self.feed("")
-            self.data = self.decoder = None
-            if not self.finished:
-                raise IOError("image was incomplete")
-        if not self.image:
-            raise IOError("cannot parse this image")
-        if self.data:
-            # incremental parsing not possible; reopen the file
-            # not that we have all data
-            try:
-                fp = _ParserFile(self.data)
-                self.image = Image.open(fp)
-            finally:
-                fp.close() # explicitly close the virtual file
-        return self.image
-
-# --------------------------------------------------------------------
-
-##
-# (Helper) Save image body to file.
-#
-# @param im Image object.
-# @param fp File object.
-# @param tile Tile list.
-
-def _save(im, fp, tile):
-    "Helper to save image based on tile list"
-
-    im.load()
-    if not hasattr(im, "encoderconfig"):
-        im.encoderconfig = ()
-    tile.sort(_tilesort)
-    # FIXME: make MAXBLOCK a configuration parameter
-    bufsize = max(MAXBLOCK, im.size[0] * 4) # see RawEncode.c
-    try:
-        fh = fp.fileno()
-        fp.flush()
-    except AttributeError:
-        # compress to Python file-compatible object
-        for e, b, o, a in tile:
-            e = Image._getencoder(im.mode, e, a, im.encoderconfig)
-            if o > 0:
-                fp.seek(o, 0)
-            e.setimage(im.im, b)
-            while 1:
-                l, s, d = e.encode(bufsize)
-                fp.write(d)
-                if s:
-                    break
-            if s < 0:
-                raise IOError("encoder error %d when writing image file" % s)
-    else:
-        # slight speedup: compress to real file object
-        for e, b, o, a in tile:
-            e = Image._getencoder(im.mode, e, a, im.encoderconfig)
-            if o > 0:
-                fp.seek(o, 0)
-            e.setimage(im.im, b)
-            s = e.encode_to_file(fh, bufsize)
-            if s < 0:
-                raise IOError("encoder error %d when writing image file" % s)
-    try:
-        fp.flush()
-    except: pass
-
-
-##
-# Reads large blocks in a safe way.  Unlike fp.read(n), this function
-# doesn't trust the user.  If the requested size is larger than
-# SAFEBLOCK, the file is read block by block.
-#
-# @param fp File handle.  Must implement a <b>read</b> method.
-# @param size Number of bytes to read.
-# @return A string containing up to <i>size</i> bytes of data.
-
-def _safe_read(fp, size):
-    if size <= 0:
-        return ""
-    if size <= SAFEBLOCK:
-        return fp.read(size)
-    data = []
-    while size > 0:
-        block = fp.read(min(size, SAFEBLOCK))
-        if not block:
-            break
-        data.append(block)
-        size = size - len(block)
-    return string.join(data, "")
diff --git a/pythonPackages/pil/PIL/ImageFileIO.py b/pythonPackages/pil/PIL/ImageFileIO.py
deleted file mode 100644
index 7c6a5c18f3..0000000000
--- a/pythonPackages/pil/PIL/ImageFileIO.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageFileIO.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# kludge to get basic ImageFileIO functionality
-#
-# History:
-# 1998-08-06 fl   Recreated
-#
-# Copyright (c) Secret Labs AB 1998-2002.
-#
-# See the README file for information on usage and redistribution.
-#
-
-from StringIO import StringIO
-
-##
-# The <b>ImageFileIO</b> module can be used to read an image from a
-# socket, or any other stream device.
-# <p>
-# This module is deprecated. New code should use the <b>Parser</b>
-# class in the <a href="imagefile">ImageFile</a> module instead.
-#
-# @see ImageFile#Parser
-
-class ImageFileIO(StringIO):
-
-    ##
-    # Adds buffering to a stream file object, in order to
-    # provide <b>seek</b> and <b>tell</b> methods required
-    # by the <b>Image.open</b> method. The stream object must
-    # implement <b>read</b> and <b>close</b> methods.
-    #
-    # @param fp Stream file handle.
-    # @see Image#open
-
-    def __init__(self, fp):
-        data = fp.read()
-        StringIO.__init__(self, data)
-
-if __name__ == "__main__":
-
-    import Image
-    fp = open("/images/clenna.im", "rb")
-    im = Image.open(ImageFileIO(fp))
-    im.load() # make sure we can read the raster data
-    print im.mode, im.size
diff --git a/pythonPackages/pil/PIL/ImageFilter.py b/pythonPackages/pil/PIL/ImageFilter.py
deleted file mode 100644
index 58576860d4..0000000000
--- a/pythonPackages/pil/PIL/ImageFilter.py
+++ /dev/null
@@ -1,263 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageFilter.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# standard filters
-#
-# History:
-# 1995-11-27 fl   Created
-# 2002-06-08 fl   Added rank and mode filters
-# 2003-09-15 fl   Fixed rank calculation in rank filter; added expand call
-#
-# Copyright (c) 1997-2003 by Secret Labs AB.
-# Copyright (c) 1995-2002 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-class Filter:
-    pass
-
-##
-# Convolution filter kernel.
-
-class Kernel(Filter):
-
-    ##
-    # Create a convolution kernel.  The current version only
-    # supports 3x3 and 5x5 integer and floating point kernels.
-    # <p>
-    # In the current version, kernels can only be applied to
-    # "L" and "RGB" images.
-    #
-    # @def __init__(size, kernel, **options)
-    # @param size Kernel size, given as (width, height).  In
-    #    the current version, this must be (3,3) or (5,5).
-    # @param kernel A sequence containing kernel weights.
-    # @param **options Optional keyword arguments.
-    # @keyparam scale Scale factor.  If given, the result for each
-    #    pixel is divided by this value.  The default is the sum
-    #    of the kernel weights.
-    # @keyparam offset Offset.  If given, this value is added to the
-    #    result, after it has been divided by the scale factor.
-
-    def __init__(self, size, kernel, scale=None, offset=0):
-        if scale is None:
-            # default scale is sum of kernel
-            scale = reduce(lambda a,b: a+b, kernel)
-        if size[0] * size[1] != len(kernel):
-            raise ValueError("not enough coefficients in kernel")
-        self.filterargs = size, scale, offset, kernel
-
-    def filter(self, image):
-        if image.mode == "P":
-            raise ValueError("cannot filter palette images")
-        return apply(image.filter, self.filterargs)
-
-class BuiltinFilter(Kernel):
-    def __init__(self):
-        pass
-
-##
-# Rank filter.
-
-class RankFilter(Filter):
-    name = "Rank"
-
-    ##
-    # Create a rank filter.  The rank filter sorts all pixels in
-    # a window of the given size, and returns the rank'th value.
-    #
-    # @param size The kernel size, in pixels.
-    # @param rank What pixel value to pick.  Use 0 for a min filter,
-    #    size*size/2 for a median filter, size*size-1 for a max filter,
-    #    etc.
-
-    def __init__(self, size, rank):
-        self.size = size
-        self.rank = rank
-
-    def filter(self, image):
-        image = image.expand(self.size/2, self.size/2)
-        return image.rankfilter(self.size, self.rank)
-
-##
-# Median filter.  Picks the median pixel value in a window with the
-# given size.
-
-class MedianFilter(RankFilter):
-    name = "Median"
-
-    ##
-    # Create a median filter.
-    #
-    # @param size The kernel size, in pixels.
-
-    def __init__(self, size=3):
-        self.size = size
-        self.rank = size*size/2
-
-##
-# Min filter.  Picks the lowest pixel value in a window with the given
-# size.
-
-class MinFilter(RankFilter):
-    name = "Min"
-
-    ##
-    # Create a min filter.
-    #
-    # @param size The kernel size, in pixels.
-
-    def __init__(self, size=3):
-        self.size = size
-        self.rank = 0
-
-##
-# Max filter.  Picks the largest pixel value in a window with the
-# given size.
-
-class MaxFilter(RankFilter):
-    name = "Max"
-
-    ##
-    # Create a max filter.
-    #
-    # @param size The kernel size, in pixels.
-
-    def __init__(self, size=3):
-        self.size = size
-        self.rank = size*size-1
-
-##
-# Mode filter.  Picks the most frequent pixel value in a box with the
-# given size.  Pixel values that occur only once or twice are ignored;
-# if no pixel value occurs more than twice, the original pixel value
-# is preserved.
-
-class ModeFilter(Filter):
-    name = "Mode"
-
-    ##
-    # Create a mode filter.
-    #
-    # @param size The kernel size, in pixels.
-
-    def __init__(self, size=3):
-        self.size = size
-    def filter(self, image):
-        return image.modefilter(self.size)
-
-##
-# Blur filter.
-
-class BLUR(BuiltinFilter):
-    name = "Blur"
-    filterargs = (5, 5), 16, 0, (
-        1,  1,  1,  1,  1,
-        1,  0,  0,  0,  1,
-        1,  0,  0,  0,  1,
-        1,  0,  0,  0,  1,
-        1,  1,  1,  1,  1
-        )
-
-##
-# Contour filter.
-
-class CONTOUR(BuiltinFilter):
-    name = "Contour"
-    filterargs = (3, 3), 1, 255, (
-        -1, -1, -1,
-        -1,  8, -1,
-        -1, -1, -1
-        )
-
-##
-# Detail filter.
-
-class DETAIL(BuiltinFilter):
-    name = "Detail"
-    filterargs = (3, 3), 6, 0, (
-        0, -1,  0,
-        -1, 10, -1,
-        0, -1,  0
-        )
-
-##
-# Edge enhancement filter.
-
-class EDGE_ENHANCE(BuiltinFilter):
-    name = "Edge-enhance"
-    filterargs = (3, 3), 2, 0, (
-        -1, -1, -1,
-        -1, 10, -1,
-        -1, -1, -1
-        )
-
-##
-# Stronger edge enhancement filter.
-
-class EDGE_ENHANCE_MORE(BuiltinFilter):
-    name = "Edge-enhance More"
-    filterargs = (3, 3), 1, 0, (
-        -1, -1, -1,
-        -1,  9, -1,
-        -1, -1, -1
-        )
-
-##
-# Embossing filter.
-
-class EMBOSS(BuiltinFilter):
-    name = "Emboss"
-    filterargs = (3, 3), 1, 128, (
-        -1,  0,  0,
-        0,  1,  0,
-        0,  0,  0
-        )
-
-##
-# Edge-finding filter.
-
-class FIND_EDGES(BuiltinFilter):
-    name = "Find Edges"
-    filterargs = (3, 3), 1, 0, (
-        -1, -1, -1,
-        -1,  8, -1,
-        -1, -1, -1
-        )
-
-##
-# Smoothing filter.
-
-class SMOOTH(BuiltinFilter):
-    name = "Smooth"
-    filterargs = (3, 3), 13, 0, (
-        1,  1,  1,
-        1,  5,  1,
-        1,  1,  1
-        )
-
-##
-# Stronger smoothing filter.
-
-class SMOOTH_MORE(BuiltinFilter):
-    name = "Smooth More"
-    filterargs = (5, 5), 100, 0, (
-        1,  1,  1,  1,  1,
-        1,  5,  5,  5,  1,
-        1,  5, 44,  5,  1,
-        1,  5,  5,  5,  1,
-        1,  1,  1,  1,  1
-        )
-
-##
-# Sharpening filter.
-
-class SHARPEN(BuiltinFilter):
-    name = "Sharpen"
-    filterargs = (3, 3), 16, 0, (
-        -2, -2, -2,
-        -2, 32, -2,
-        -2, -2, -2
-        )
diff --git a/pythonPackages/pil/PIL/ImageFont.py b/pythonPackages/pil/PIL/ImageFont.py
deleted file mode 100644
index b987a33d13..0000000000
--- a/pythonPackages/pil/PIL/ImageFont.py
+++ /dev/null
@@ -1,377 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageFont.py 2813 2006-10-07 10:11:35Z fredrik $
-#
-# PIL raster font management
-#
-# History:
-# 1996-08-07 fl   created (experimental)
-# 1997-08-25 fl   minor adjustments to handle fonts from pilfont 0.3
-# 1999-02-06 fl   rewrote most font management stuff in C
-# 1999-03-17 fl   take pth files into account in load_path (from Richard Jones)
-# 2001-02-17 fl   added freetype support
-# 2001-05-09 fl   added TransposedFont wrapper class
-# 2002-03-04 fl   make sure we have a "L" or "1" font
-# 2002-12-04 fl   skip non-directory entries in the system path
-# 2003-04-29 fl   add embedded default font
-# 2003-09-27 fl   added support for truetype charmap encodings
-#
-# Todo:
-# Adapt to PILFONT2 format (16-bit fonts, compressed, single file)
-#
-# Copyright (c) 1997-2003 by Secret Labs AB
-# Copyright (c) 1996-2003 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-import os, string, sys
-
-# FIXME: add support for pilfont2 format (see FontFile.py)
-
-# --------------------------------------------------------------------
-# Font metrics format:
-#       "PILfont" LF
-#       fontdescriptor LF
-#       (optional) key=value... LF
-#       "DATA" LF
-#       binary data: 256*10*2 bytes (dx, dy, dstbox, srcbox)
-#
-# To place a character, cut out srcbox and paste at dstbox,
-# relative to the character position.  Then move the character
-# position according to dx, dy.
-# --------------------------------------------------------------------
-
-##
-# The <b>ImageFont</b> module defines a class with the same name.
-# Instances of this class store bitmap fonts, and are used with the
-# <b>text</b> method of the <b>ImageDraw</b> class.
-# <p>
-# PIL uses it's own font file format to store bitmap fonts. You can
-# use the <b>pilfont</b> utility to convert BDF and PCF font
-# descriptors (X window font formats) to this format.
-# <p>
-# Starting with version 1.1.4, PIL can be configured to support
-# TrueType and OpenType fonts.  For earlier version, TrueType
-# support is only available as part of the imToolkit package
-#
-# @see ImageDraw#ImageDraw.text
-# @see pilfont
-
-class ImageFont:
-    "PIL font wrapper"
-
-    def _load_pilfont(self, filename):
-
-        file = open(filename, "rb")
-
-        for ext in (".png", ".gif", ".pbm"):
-            try:
-                fullname = os.path.splitext(filename)[0] + ext
-                image = Image.open(fullname)
-            except:
-                pass
-            else:
-                if image and image.mode in ("1", "L"):
-                    break
-        else:
-            raise IOError("cannot find glyph data file")
-
-        self.file = fullname
-
-        return self._load_pilfont_data(file, image)
-
-    def _load_pilfont_data(self, file, image):
-
-        # read PILfont header
-        if file.readline() != "PILfont\n":
-            raise SyntaxError("Not a PILfont file")
-        d = string.split(file.readline(), ";")
-        self.info = [] # FIXME: should be a dictionary
-        s = file.readline()
-        while s and s != "DATA\n":
-            self.info.append(s)
-
-        # read PILfont metrics
-        data = file.read(256*20)
-
-        # check image
-        if image.mode not in ("1", "L"):
-            raise TypeError("invalid font image mode")
-
-        image.load()
-
-        self.font = Image.core.font(image.im, data)
-
-        # delegate critical operations to internal type
-        self.getsize = self.font.getsize
-        self.getmask = self.font.getmask
-
-##
-# Wrapper for FreeType fonts.  Application code should use the
-# <b>truetype</b> factory function to create font objects.
-
-class FreeTypeFont:
-    "FreeType font wrapper (requires _imagingft service)"
-
-    def __init__(self, file, size, index=0, encoding=""):
-        # FIXME: use service provider instead
-        import _imagingft
-        self.font = _imagingft.getfont(file, size, index, encoding)
-
-    def getname(self):
-        return self.font.family, self.font.style
-
-    def getmetrics(self):
-        return self.font.ascent, self.font.descent
-
-    def getsize(self, text):
-        return self.font.getsize(text)[0]
-
-    def getmask(self, text, mode=""):
-        return self.getmask2(text, mode)[0]
-
-    def getmask2(self, text, mode="", fill=Image.core.fill):
-        size, offset = self.font.getsize(text)
-        im = fill("L", size, 0)
-        self.font.render(text, im.id, mode=="1")
-        return im, offset
-
-##
-# Wrapper that creates a transposed font from any existing font
-# object.
-#
-# @param font A font object.
-# @param orientation An optional orientation.  If given, this should
-#     be one of Image.FLIP_LEFT_RIGHT, Image.FLIP_TOP_BOTTOM,
-#     Image.ROTATE_90, Image.ROTATE_180, or Image.ROTATE_270.
-
-class TransposedFont:
-    "Wrapper for writing rotated or mirrored text"
-
-    def __init__(self, font, orientation=None):
-        self.font = font
-        self.orientation = orientation # any 'transpose' argument, or None
-
-    def getsize(self, text):
-        w, h = self.font.getsize(text)
-        if self.orientation in (Image.ROTATE_90, Image.ROTATE_270):
-            return h, w
-        return w, h
-
-    def getmask(self, text, mode=""):
-        im = self.font.getmask(text, mode)
-        if self.orientation is not None:
-            return im.transpose(self.orientation)
-        return im
-
-##
-# Load font file.  This function loads a font object from the given
-# bitmap font file, and returns the corresponding font object.
-#
-# @param filename Name of font file.
-# @return A font object.
-# @exception IOError If the file could not be read.
-
-def load(filename):
-    "Load a font file."
-    f = ImageFont()
-    f._load_pilfont(filename)
-    return f
-
-##
-# Load a TrueType or OpenType font file, and create a font object.
-# This function loads a font object from the given file, and creates
-# a font object for a font of the given size.
-# <p>
-# This function requires the _imagingft service.
-#
-# @param filename A truetype font file.  Under Windows, if the file
-#    is not found in this filename, the loader also looks in Windows
-#    <b>fonts</b> directory
-# @param size The requested size, in points.
-# @param index Which font face to load (default is first available face).
-# @param encoding Which font encoding to use (default is Unicode).  Common
-#    encodings are "unic" (Unicode), "symb" (Microsoft Symbol), "ADOB"
-#    (Adobe Standard), "ADBE" (Adobe Expert), and "armn" (Apple Roman).
-#    See the FreeType documentation for more information.
-# @return A font object.
-# @exception IOError If the file could not be read.
-
-def truetype(filename, size, index=0, encoding=""):
-    "Load a truetype font file."
-    try:
-        return FreeTypeFont(filename, size, index, encoding)
-    except IOError:
-        if sys.platform == "win32":
-            # check the windows font repository
-            # NOTE: must use uppercase WINDIR, to work around bugs in
-            # 1.5.2's os.environ.get()
-            windir = os.environ.get("WINDIR")
-            if windir:
-                filename = os.path.join(windir, "fonts", filename)
-                return FreeTypeFont(filename, size, index, encoding)
-        raise
-
-##
-# Load font file.  Same as load, but searches for a bitmap font along
-# the Python path.
-#
-# @param filename Name of font file.
-# @return A font object.
-# @exception IOError If the file could not be read.
-# @see #load
-
-def load_path(filename):
-    "Load a font file, searching along the Python path."
-    for dir in sys.path:
-        if Image.isDirectory(dir):
-            try:
-                return load(os.path.join(dir, filename))
-            except IOError:
-                pass
-    raise IOError("cannot find font file")
-
-##
-# Load a (probably rather ugly) default font.
-#
-# @return A font object.
-
-def load_default():
-    "Load a default font."
-    from StringIO import StringIO
-    import base64
-    f = ImageFont()
-    f._load_pilfont_data(
-         # courB08
-         StringIO(base64.decodestring('''
-UElMZm9udAo7Ozs7OzsxMDsKREFUQQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAA//8AAQAAAAAAAAABAAEA
-BgAAAAH/+gADAAAAAQAAAAMABgAGAAAAAf/6AAT//QADAAAABgADAAYAAAAA//kABQABAAYAAAAL
-AAgABgAAAAD/+AAFAAEACwAAABAACQAGAAAAAP/5AAUAAAAQAAAAFQAHAAYAAP////oABQAAABUA
-AAAbAAYABgAAAAH/+QAE//wAGwAAAB4AAwAGAAAAAf/5AAQAAQAeAAAAIQAIAAYAAAAB//kABAAB
-ACEAAAAkAAgABgAAAAD/+QAE//0AJAAAACgABAAGAAAAAP/6AAX//wAoAAAALQAFAAYAAAAB//8A
-BAACAC0AAAAwAAMABgAAAAD//AAF//0AMAAAADUAAQAGAAAAAf//AAMAAAA1AAAANwABAAYAAAAB
-//kABQABADcAAAA7AAgABgAAAAD/+QAFAAAAOwAAAEAABwAGAAAAAP/5AAYAAABAAAAARgAHAAYA
-AAAA//kABQAAAEYAAABLAAcABgAAAAD/+QAFAAAASwAAAFAABwAGAAAAAP/5AAYAAABQAAAAVgAH
-AAYAAAAA//kABQAAAFYAAABbAAcABgAAAAD/+QAFAAAAWwAAAGAABwAGAAAAAP/5AAUAAABgAAAA
-ZQAHAAYAAAAA//kABQAAAGUAAABqAAcABgAAAAD/+QAFAAAAagAAAG8ABwAGAAAAAf/8AAMAAABv
-AAAAcQAEAAYAAAAA//wAAwACAHEAAAB0AAYABgAAAAD/+gAE//8AdAAAAHgABQAGAAAAAP/7AAT/
-/gB4AAAAfAADAAYAAAAB//oABf//AHwAAACAAAUABgAAAAD/+gAFAAAAgAAAAIUABgAGAAAAAP/5
-AAYAAQCFAAAAiwAIAAYAAP////oABgAAAIsAAACSAAYABgAA////+gAFAAAAkgAAAJgABgAGAAAA
-AP/6AAUAAACYAAAAnQAGAAYAAP////oABQAAAJ0AAACjAAYABgAA////+gAFAAAAowAAAKkABgAG
-AAD////6AAUAAACpAAAArwAGAAYAAAAA//oABQAAAK8AAAC0AAYABgAA////+gAGAAAAtAAAALsA
-BgAGAAAAAP/6AAQAAAC7AAAAvwAGAAYAAP////oABQAAAL8AAADFAAYABgAA////+gAGAAAAxQAA
-AMwABgAGAAD////6AAUAAADMAAAA0gAGAAYAAP////oABQAAANIAAADYAAYABgAA////+gAGAAAA
-2AAAAN8ABgAGAAAAAP/6AAUAAADfAAAA5AAGAAYAAP////oABQAAAOQAAADqAAYABgAAAAD/+gAF
-AAEA6gAAAO8ABwAGAAD////6AAYAAADvAAAA9gAGAAYAAAAA//oABQAAAPYAAAD7AAYABgAA////
-+gAFAAAA+wAAAQEABgAGAAD////6AAYAAAEBAAABCAAGAAYAAP////oABgAAAQgAAAEPAAYABgAA
-////+gAGAAABDwAAARYABgAGAAAAAP/6AAYAAAEWAAABHAAGAAYAAP////oABgAAARwAAAEjAAYA
-BgAAAAD/+gAFAAABIwAAASgABgAGAAAAAf/5AAQAAQEoAAABKwAIAAYAAAAA//kABAABASsAAAEv
-AAgABgAAAAH/+QAEAAEBLwAAATIACAAGAAAAAP/5AAX//AEyAAABNwADAAYAAAAAAAEABgACATcA
-AAE9AAEABgAAAAH/+QAE//wBPQAAAUAAAwAGAAAAAP/7AAYAAAFAAAABRgAFAAYAAP////kABQAA
-AUYAAAFMAAcABgAAAAD/+wAFAAABTAAAAVEABQAGAAAAAP/5AAYAAAFRAAABVwAHAAYAAAAA//sA
-BQAAAVcAAAFcAAUABgAAAAD/+QAFAAABXAAAAWEABwAGAAAAAP/7AAYAAgFhAAABZwAHAAYAAP//
-//kABQAAAWcAAAFtAAcABgAAAAD/+QAGAAABbQAAAXMABwAGAAAAAP/5AAQAAgFzAAABdwAJAAYA
-AP////kABgAAAXcAAAF+AAcABgAAAAD/+QAGAAABfgAAAYQABwAGAAD////7AAUAAAGEAAABigAF
-AAYAAP////sABQAAAYoAAAGQAAUABgAAAAD/+wAFAAABkAAAAZUABQAGAAD////7AAUAAgGVAAAB
-mwAHAAYAAAAA//sABgACAZsAAAGhAAcABgAAAAD/+wAGAAABoQAAAacABQAGAAAAAP/7AAYAAAGn
-AAABrQAFAAYAAAAA//kABgAAAa0AAAGzAAcABgAA////+wAGAAABswAAAboABQAGAAD////7AAUA
-AAG6AAABwAAFAAYAAP////sABgAAAcAAAAHHAAUABgAAAAD/+wAGAAABxwAAAc0ABQAGAAD////7
-AAYAAgHNAAAB1AAHAAYAAAAA//sABQAAAdQAAAHZAAUABgAAAAH/+QAFAAEB2QAAAd0ACAAGAAAA
-Av/6AAMAAQHdAAAB3gAHAAYAAAAA//kABAABAd4AAAHiAAgABgAAAAD/+wAF//0B4gAAAecAAgAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAB
-//sAAwACAecAAAHpAAcABgAAAAD/+QAFAAEB6QAAAe4ACAAGAAAAAP/5AAYAAAHuAAAB9AAHAAYA
-AAAA//oABf//AfQAAAH5AAUABgAAAAD/+QAGAAAB+QAAAf8ABwAGAAAAAv/5AAMAAgH/AAACAAAJ
-AAYAAAAA//kABQABAgAAAAIFAAgABgAAAAH/+gAE//sCBQAAAggAAQAGAAAAAP/5AAYAAAIIAAAC
-DgAHAAYAAAAB//kABf/+Ag4AAAISAAUABgAA////+wAGAAACEgAAAhkABQAGAAAAAP/7AAX//gIZ
-AAACHgADAAYAAAAA//wABf/9Ah4AAAIjAAEABgAAAAD/+QAHAAACIwAAAioABwAGAAAAAP/6AAT/
-+wIqAAACLgABAAYAAAAA//kABP/8Ai4AAAIyAAMABgAAAAD/+gAFAAACMgAAAjcABgAGAAAAAf/5
-AAT//QI3AAACOgAEAAYAAAAB//kABP/9AjoAAAI9AAQABgAAAAL/+QAE//sCPQAAAj8AAgAGAAD/
-///7AAYAAgI/AAACRgAHAAYAAAAA//kABgABAkYAAAJMAAgABgAAAAH//AAD//0CTAAAAk4AAQAG
-AAAAAf//AAQAAgJOAAACUQADAAYAAAAB//kABP/9AlEAAAJUAAQABgAAAAH/+QAF//4CVAAAAlgA
-BQAGAAD////7AAYAAAJYAAACXwAFAAYAAP////kABgAAAl8AAAJmAAcABgAA////+QAGAAACZgAA
-Am0ABwAGAAD////5AAYAAAJtAAACdAAHAAYAAAAA//sABQACAnQAAAJ5AAcABgAA////9wAGAAAC
-eQAAAoAACQAGAAD////3AAYAAAKAAAAChwAJAAYAAP////cABgAAAocAAAKOAAkABgAA////9wAG
-AAACjgAAApUACQAGAAD////4AAYAAAKVAAACnAAIAAYAAP////cABgAAApwAAAKjAAkABgAA////
-+gAGAAACowAAAqoABgAGAAAAAP/6AAUAAgKqAAACrwAIAAYAAP////cABQAAAq8AAAK1AAkABgAA
-////9wAFAAACtQAAArsACQAGAAD////3AAUAAAK7AAACwQAJAAYAAP////gABQAAAsEAAALHAAgA
-BgAAAAD/9wAEAAACxwAAAssACQAGAAAAAP/3AAQAAALLAAACzwAJAAYAAAAA//cABAAAAs8AAALT
-AAkABgAAAAD/+AAEAAAC0wAAAtcACAAGAAD////6AAUAAALXAAAC3QAGAAYAAP////cABgAAAt0A
-AALkAAkABgAAAAD/9wAFAAAC5AAAAukACQAGAAAAAP/3AAUAAALpAAAC7gAJAAYAAAAA//cABQAA
-Au4AAALzAAkABgAAAAD/9wAFAAAC8wAAAvgACQAGAAAAAP/4AAUAAAL4AAAC/QAIAAYAAAAA//oA
-Bf//Av0AAAMCAAUABgAA////+gAGAAADAgAAAwkABgAGAAD////3AAYAAAMJAAADEAAJAAYAAP//
-//cABgAAAxAAAAMXAAkABgAA////9wAGAAADFwAAAx4ACQAGAAD////4AAYAAAAAAAoABwASAAYA
-AP////cABgAAAAcACgAOABMABgAA////+gAFAAAADgAKABQAEAAGAAD////6AAYAAAAUAAoAGwAQ
-AAYAAAAA//gABgAAABsACgAhABIABgAAAAD/+AAGAAAAIQAKACcAEgAGAAAAAP/4AAYAAAAnAAoA
-LQASAAYAAAAA//gABgAAAC0ACgAzABIABgAAAAD/+QAGAAAAMwAKADkAEQAGAAAAAP/3AAYAAAA5
-AAoAPwATAAYAAP////sABQAAAD8ACgBFAA8ABgAAAAD/+wAFAAIARQAKAEoAEQAGAAAAAP/4AAUA
-AABKAAoATwASAAYAAAAA//gABQAAAE8ACgBUABIABgAAAAD/+AAFAAAAVAAKAFkAEgAGAAAAAP/5
-AAUAAABZAAoAXgARAAYAAAAA//gABgAAAF4ACgBkABIABgAAAAD/+AAGAAAAZAAKAGoAEgAGAAAA
-AP/4AAYAAABqAAoAcAASAAYAAAAA//kABgAAAHAACgB2ABEABgAAAAD/+AAFAAAAdgAKAHsAEgAG
-AAD////4AAYAAAB7AAoAggASAAYAAAAA//gABQAAAIIACgCHABIABgAAAAD/+AAFAAAAhwAKAIwA
-EgAGAAAAAP/4AAUAAACMAAoAkQASAAYAAAAA//gABQAAAJEACgCWABIABgAAAAD/+QAFAAAAlgAK
-AJsAEQAGAAAAAP/6AAX//wCbAAoAoAAPAAYAAAAA//oABQABAKAACgClABEABgAA////+AAGAAAA
-pQAKAKwAEgAGAAD////4AAYAAACsAAoAswASAAYAAP////gABgAAALMACgC6ABIABgAA////+QAG
-AAAAugAKAMEAEQAGAAD////4AAYAAgDBAAoAyAAUAAYAAP////kABQACAMgACgDOABMABgAA////
-+QAGAAIAzgAKANUAEw==
-''')), Image.open(StringIO(base64.decodestring('''
-iVBORw0KGgoAAAANSUhEUgAAAx4AAAAUAQAAAAArMtZoAAAEwElEQVR4nABlAJr/AHVE4czCI/4u
-Mc4b7vuds/xzjz5/3/7u/n9vMe7vnfH/9++vPn/xyf5zhxzjt8GHw8+2d83u8x27199/nxuQ6Od9
-M43/5z2I+9n9ZtmDBwMQECDRQw/eQIQohJXxpBCNVE6QCCAAAAD//wBlAJr/AgALyj1t/wINwq0g
-LeNZUworuN1cjTPIzrTX6ofHWeo3v336qPzfEwRmBnHTtf95/fglZK5N0PDgfRTslpGBvz7LFc4F
-IUXBWQGjQ5MGCx34EDFPwXiY4YbYxavpnhHFrk14CDAAAAD//wBlAJr/AgKqRooH2gAgPeggvUAA
-Bu2WfgPoAwzRAABAAAAAAACQgLz/3Uv4Gv+gX7BJgDeeGP6AAAD1NMDzKHD7ANWr3loYbxsAD791
-NAADfcoIDyP44K/jv4Y63/Z+t98Ovt+ub4T48LAAAAD//wBlAJr/AuplMlADJAAAAGuAphWpqhMx
-in0A/fRvAYBABPgBwBUgABBQ/sYAyv9g0bCHgOLoGAAAAAAAREAAwI7nr0ArYpow7aX8//9LaP/9
-SjdavWA8ePHeBIKB//81/83ndznOaXx379wAAAD//wBlAJr/AqDxW+D3AABAAbUh/QMnbQag/gAY
-AYDAAACgtgD/gOqAAAB5IA/8AAAk+n9w0AAA8AAAmFRJuPo27ciC0cD5oeW4E7KA/wD3ECMAn2tt
-y8PgwH8AfAxFzC0JzeAMtratAsC/ffwAAAD//wBlAJr/BGKAyCAA4AAAAvgeYTAwHd1kmQF5chkG
-ABoMIHcL5xVpTfQbUqzlAAAErwAQBgAAEOClA5D9il08AEh/tUzdCBsXkbgACED+woQg8Si9VeqY
-lODCn7lmF6NhnAEYgAAA/NMIAAAAAAD//2JgjLZgVGBg5Pv/Tvpc8hwGBjYGJADjHDrAwPzAjv/H
-/Wf3PzCwtzcwHmBgYGcwbZz8wHaCAQMDOwMDQ8MCBgYOC3W7mp+f0w+wHOYxO3OG+e376hsMZjk3
-AAAAAP//YmCMY2A4wMAIN5e5gQETPD6AZisDAwMDgzSDAAPjByiHcQMDAwMDg1nOze1lByRu5/47
-c4859311AYNZzg0AAAAA//9iYGDBYihOIIMuwIjGL39/fwffA8b//xv/P2BPtzzHwCBjUQAAAAD/
-/yLFBrIBAAAA//9i1HhcwdhizX7u8NZNzyLbvT97bfrMf/QHI8evOwcSqGUJAAAA//9iYBB81iSw
-pEE170Qrg5MIYydHqwdDQRMrAwcVrQAAAAD//2J4x7j9AAMDn8Q/BgYLBoaiAwwMjPdvMDBYM1Tv
-oJodAAAAAP//Yqo/83+dxePWlxl3npsel9lvLfPcqlE9725C+acfVLMEAAAA//9i+s9gwCoaaGMR
-evta/58PTEWzr21hufPjA8N+qlnBwAAAAAD//2JiWLci5v1+HmFXDqcnULE/MxgYGBj+f6CaJQAA
-AAD//2Ji2FrkY3iYpYC5qDeGgeEMAwPDvwQBBoYvcTwOVLMEAAAA//9isDBgkP///0EOg9z35v//
-Gc/eeW7BwPj5+QGZhANUswMAAAD//2JgqGBgYGBgqEMXlvhMPUsAAAAA//8iYDd1AAAAAP//AwDR
-w7IkEbzhVQAAAABJRU5ErkJggg==
-'''))))
-    return f
-
-if __name__ == "__main__":
-    # create font data chunk for embedding
-    import base64, os, sys
-    font = "../Images/courB08"
-    print "    f._load_pilfont_data("
-    print "         # %s" % os.path.basename(font)
-    print "         StringIO(base64.decodestring('''"
-    base64.encode(open(font + ".pil", "rb"), sys.stdout)
-    print "''')), Image.open(StringIO(base64.decodestring('''"
-    base64.encode(open(font + ".pbm", "rb"), sys.stdout)
-    print "'''))))"
diff --git a/pythonPackages/pil/PIL/ImageGL.py b/pythonPackages/pil/PIL/ImageGL.py
deleted file mode 100644
index 482f42d82d..0000000000
--- a/pythonPackages/pil/PIL/ImageGL.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageGL.py 2438 2005-05-25 21:09:48Z Fredrik $
-#
-# OpenGL pixmap/texture interface (requires imToolkit OpenGL extensions)
-#
-# History:
-# 2003-09-13 fl   Added
-#
-# Copyright (c) Secret Labs AB 2003.
-#
-# See the README file for information on usage and redistribution.
-#
-
-##
-# OpenGL pixmap/texture interface (requires imToolkit OpenGL
-# extensions.)
-##
-
-import _imaginggl
-
-##
-# Texture factory.
-
-class TextureFactory:
-    pass # overwritten by the _imaginggl module
-
-from _imaginggl import *
diff --git a/pythonPackages/pil/PIL/ImageGrab.py b/pythonPackages/pil/PIL/ImageGrab.py
deleted file mode 100644
index ecbfbac1e5..0000000000
--- a/pythonPackages/pil/PIL/ImageGrab.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: ImageGrab.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# screen grabber (windows only)
-#
-# History:
-# 2001-04-26 fl  created
-# 2001-09-17 fl  use builtin driver, if present
-# 2002-11-19 fl  added grabclipboard support
-#
-# Copyright (c) 2001-2002 by Secret Labs AB
-# Copyright (c) 2001-2002 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-
-##
-# (New in 1.1.3)  The <b>ImageGrab</b> module can be used to copy
-# the contents of the screen to a PIL image memory.
-# <p>
-# The current version works on Windows only.</p>
-#
-# @since 1.1.3
-##
-
-try:
-    # built-in driver (1.1.3 and later)
-    grabber = Image.core.grabscreen
-except AttributeError:
-    # stand-alone driver (pil plus)
-    import _grabscreen
-    grabber = _grabscreen.grab
-
-##
-# (New in 1.1.3) Take a snapshot of the screen.  The pixels inside the
-# bounding box are returned as an "RGB" image.  If the bounding box is
-# omitted, the entire screen is copied.
-#
-# @param bbox What region to copy.  Default is the entire screen.
-# @return An image
-# @since 1.1.3
-
-def grab(bbox=None):
-    size, data = grabber()
-    im = Image.fromstring(
-        "RGB", size, data,
-        # RGB, 32-bit line padding, origo in lower left corner
-        "raw", "BGR", (size[0]*3 + 3) & -4, -1
-        )
-    if bbox:
-        im = im.crop(bbox)
-    return im
-
-##
-# (New in 1.1.4) Take a snapshot of the clipboard image, if any.
-#
-# @return An image, a list of filenames, or None if the clipboard does
-#     not contain image data or filenames.  Note that if a list is
-#     returned, the filenames may not represent image files.
-# @since 1.1.4
-
-def grabclipboard():
-    debug = 0 # temporary interface
-    data = Image.core.grabclipboard(debug)
-    if Image.isStringType(data):
-        import BmpImagePlugin, StringIO
-        return BmpImagePlugin.DibImageFile(StringIO.StringIO(data))
-    return data
diff --git a/pythonPackages/pil/PIL/ImageMath.py b/pythonPackages/pil/PIL/ImageMath.py
deleted file mode 100644
index 117a5ae716..0000000000
--- a/pythonPackages/pil/PIL/ImageMath.py
+++ /dev/null
@@ -1,207 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: ImageMath.py 2508 2005-09-12 19:01:03Z fredrik $
-#
-# a simple math add-on for the Python Imaging Library
-#
-# History:
-# 1999-02-15 fl   Original PIL Plus release
-# 2005-05-05 fl   Simplified and cleaned up for PIL 1.1.6
-# 2005-09-12 fl   Fixed int() and float() for Python 2.4.1
-#
-# Copyright (c) 1999-2005 by Secret Labs AB
-# Copyright (c) 2005 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-import _imagingmath
-
-VERBOSE = 0
-
-def _isconstant(v):
-    return isinstance(v, type(0)) or isinstance(v, type(0.0))
-
-class _Operand:
-    # wraps an image operand, providing standard operators
-
-    def __init__(self, im):
-        self.im = im
-
-    def __fixup(self, im1):
-        # convert image to suitable mode
-        if isinstance(im1, _Operand):
-            # argument was an image.
-            if im1.im.mode in ("1", "L"):
-                return im1.im.convert("I")
-            elif im1.im.mode in ("I", "F"):
-                return im1.im
-            else:
-                raise ValueError, "unsupported mode: %s" % im1.im.mode
-        else:
-            # argument was a constant
-            if _isconstant(im1) and self.im.mode in ("1", "L", "I"):
-                return Image.new("I", self.im.size, im1)
-            else:
-                return Image.new("F", self.im.size, im1)
-
-    def apply(self, op, im1, im2=None, mode=None):
-        im1 = self.__fixup(im1)
-        if im2 is None:
-            # unary operation
-            out = Image.new(mode or im1.mode, im1.size, None)
-            im1.load()
-            try:
-                op = getattr(_imagingmath, op+"_"+im1.mode)
-            except AttributeError:
-                raise TypeError, "bad operand type for '%s'" % op
-            _imagingmath.unop(op, out.im.id, im1.im.id)
-        else:
-            # binary operation
-            im2 = self.__fixup(im2)
-            if im1.mode != im2.mode:
-                # convert both arguments to floating point
-                if im1.mode != "F": im1 = im1.convert("F")
-                if im2.mode != "F": im2 = im2.convert("F")
-                if im1.mode != im2.mode:
-                    raise ValueError, "mode mismatch"
-            if im1.size != im2.size:
-                # crop both arguments to a common size
-                size = (min(im1.size[0], im2.size[0]),
-                        min(im1.size[1], im2.size[1]))
-                if im1.size != size: im1 = im1.crop((0, 0) + size)
-                if im2.size != size: im2 = im2.crop((0, 0) + size)
-                out = Image.new(mode or im1.mode, size, None)
-            else:
-                out = Image.new(mode or im1.mode, im1.size, None)
-            im1.load(); im2.load()
-            try:
-                op = getattr(_imagingmath, op+"_"+im1.mode)
-            except AttributeError:
-                raise TypeError, "bad operand type for '%s'" % op
-            _imagingmath.binop(op, out.im.id, im1.im.id, im2.im.id)
-        return _Operand(out)
-
-    # unary operators
-    def __nonzero__(self):
-        # an image is "true" if it contains at least one non-zero pixel
-        return self.im.getbbox() is not None
-    def __abs__(self):
-        return self.apply("abs", self)
-    def __pos__(self):
-        return self
-    def __neg__(self):
-        return self.apply("neg", self)
-
-    # binary operators
-    def __add__(self, other):
-        return self.apply("add", self, other)
-    def __radd__(self, other):
-        return self.apply("add", other, self)
-    def __sub__(self, other):
-        return self.apply("sub", self, other)
-    def __rsub__(self, other):
-        return self.apply("sub", other, self)
-    def __mul__(self, other):
-        return self.apply("mul", self, other)
-    def __rmul__(self, other):
-        return self.apply("mul", other, self)
-    def __div__(self, other):
-        return self.apply("div", self, other)
-    def __rdiv__(self, other):
-        return self.apply("div", other, self)
-    def __mod__(self, other):
-        return self.apply("mod", self, other)
-    def __rmod__(self, other):
-        return self.apply("mod", other, self)
-    def __pow__(self, other):
-        return self.apply("pow", self, other)
-    def __rpow__(self, other):
-        return self.apply("pow", other, self)
-
-    # bitwise
-    def __invert__(self):
-        return self.apply("invert", self)
-    def __and__(self, other):
-        return self.apply("and", self, other)
-    def __rand__(self, other):
-        return self.apply("and", other, self)
-    def __or__(self, other):
-        return self.apply("or", self, other)
-    def __ror__(self, other):
-        return self.apply("or", other, self)
-    def __xor__(self, other):
-        return self.apply("xor", self, other)
-    def __rxor__(self, other):
-        return self.apply("xor", other, self)
-    def __lshift__(self, other):
-        return self.apply("lshift", self, other)
-    def __rshift__(self, other):
-        return self.apply("rshift", self, other)
-
-    # logical
-    def __eq__(self, other):
-        return self.apply("eq", self, other)
-    def __ne__(self, other):
-        return self.apply("ne", self, other)
-    def __lt__(self, other):
-        return self.apply("lt", self, other)
-    def __le__(self, other):
-        return self.apply("le", self, other)
-    def __gt__(self, other):
-        return self.apply("gt", self, other)
-    def __ge__(self, other):
-        return self.apply("ge", self, other)
-
-# conversions
-def imagemath_int(self):
-    return _Operand(self.im.convert("I"))
-def imagemath_float(self):
-    return _Operand(self.im.convert("F"))
-
-# logical
-def imagemath_equal(self, other):
-    return self.apply("eq", self, other, mode="I")
-def imagemath_notequal(self, other):
-    return self.apply("ne", self, other, mode="I")
-
-def imagemath_min(self, other):
-    return self.apply("min", self, other)
-def imagemath_max(self, other):
-    return self.apply("max", self, other)
-
-def imagemath_convert(self, mode):
-    return _Operand(self.im.convert(mode))
-
-ops = {}
-for k, v in globals().items():
-    if k[:10] == "imagemath_":
-        ops[k[10:]] = v
-
-##
-# Evaluates an image expression.
-#
-# @param expression A string containing a Python-style expression.
-# @keyparam options Values to add to the evaluation context.  You
-#    can either use a dictionary, or one or more keyword arguments.
-# @return The evaluated expression.  This is usually an image object,
-#    but can also be an integer, a floating point value, or a pixel
-#    tuple, depending on the expression.
-
-def eval(expression, _dict={}, **kw):
-
-    # build execution namespace
-    args = ops.copy()
-    args.update(_dict)
-    args.update(kw)
-    for k, v in args.items():
-        if hasattr(v, "im"):
-            args[k] = _Operand(v)
-
-    import __builtin__
-    out =__builtin__.eval(expression, args)
-    try:
-        return out.im
-    except AttributeError:
-        return out
diff --git a/pythonPackages/pil/PIL/ImageMode.py b/pythonPackages/pil/PIL/ImageMode.py
deleted file mode 100644
index 62ba59bfbb..0000000000
--- a/pythonPackages/pil/PIL/ImageMode.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: /work/modules/pil/PIL/ImageFilter.py 486 2004-10-06T08:55:20.930352Z fredrik  $
-#
-# standard mode descriptors
-#
-# History:
-# 2006-03-20 fl   Added
-#
-# Copyright (c) 2006 by Secret Labs AB.
-# Copyright (c) 2006 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-# mode descriptor cache
-_modes = {}
-
-##
-# Wrapper for mode strings.
-
-class ModeDescriptor:
-
-    def __init__(self, mode, bands, basemode, basetype):
-        self.mode = mode
-        self.bands = bands
-        self.basemode = basemode
-        self.basetype = basetype
-
-    def __str__(self):
-        return self.mode
-
-##
-# Gets a mode descriptor for the given mode.
-
-def getmode(mode):
-    if not _modes:
-        # initialize mode cache
-        import Image
-        # core modes
-        for m, (basemode, basetype, bands) in Image._MODEINFO.items():
-            _modes[m] = ModeDescriptor(m, bands, basemode, basetype)
-        # extra experimental modes
-        _modes["LA"] = ModeDescriptor("LA", ("L", "A"), "L", "L")
-        _modes["PA"] = ModeDescriptor("PA", ("P", "A"), "RGB", "L")
-    return _modes[mode]
diff --git a/pythonPackages/pil/PIL/ImageOps.py b/pythonPackages/pil/PIL/ImageOps.py
deleted file mode 100644
index 89b5e7200f..0000000000
--- a/pythonPackages/pil/PIL/ImageOps.py
+++ /dev/null
@@ -1,408 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageOps.py 2760 2006-06-19 13:31:40Z fredrik $
-#
-# standard image operations
-#
-# History:
-# 2001-10-20 fl   Created
-# 2001-10-23 fl   Added autocontrast operator
-# 2001-12-18 fl   Added Kevin's fit operator
-# 2004-03-14 fl   Fixed potential division by zero in equalize
-# 2005-05-05 fl   Fixed equalize for low number of values
-#
-# Copyright (c) 2001-2004 by Secret Labs AB
-# Copyright (c) 2001-2004 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-import operator
-
-##
-# (New in 1.1.3) The <b>ImageOps</b> module contains a number of
-# 'ready-made' image processing operations.  This module is somewhat
-# experimental, and most operators only work on L and RGB images.
-#
-# @since 1.1.3
-##
-
-#
-# helpers
-
-def _border(border):
-    if type(border) is type(()):
-        if len(border) == 2:
-            left, top = right, bottom = border
-        elif len(border) == 4:
-            left, top, right, bottom = border
-    else:
-        left = top = right = bottom = border
-    return left, top, right, bottom
-
-def _color(color, mode):
-    if Image.isStringType(color):
-        import ImageColor
-        color = ImageColor.getcolor(color, mode)
-    return color
-
-def _lut(image, lut):
-    if image.mode == "P":
-        # FIXME: apply to lookup table, not image data
-        raise NotImplementedError("mode P support coming soon")
-    elif image.mode in ("L", "RGB"):
-        if image.mode == "RGB" and len(lut) == 256:
-            lut = lut + lut + lut
-        return image.point(lut)
-    else:
-        raise IOError, "not supported for this image mode"
-
-#
-# actions
-
-##
-# Maximize (normalize) image contrast.  This function calculates a
-# histogram of the input image, removes <i>cutoff</i> percent of the
-# lightest and darkest pixels from the histogram, and remaps the image
-# so that the darkest pixel becomes black (0), and the lightest
-# becomes white (255).
-#
-# @param image The image to process.
-# @param cutoff How many percent to cut off from the histogram.
-# @param ignore The background pixel value (use None for no background).
-# @return An image.
-
-def autocontrast(image, cutoff=0, ignore=None):
-    "Maximize image contrast, based on histogram"
-    histogram = image.histogram()
-    lut = []
-    for layer in range(0, len(histogram), 256):
-        h = histogram[layer:layer+256]
-        if ignore is not None:
-            # get rid of outliers
-            try:
-                h[ignore] = 0
-            except TypeError:
-                # assume sequence
-                for ix in ignore:
-                    h[ix] = 0
-        if cutoff:
-            # cut off pixels from both ends of the histogram
-            # get number of pixels
-            n = 0
-            for ix in range(256):
-                n = n + h[ix]
-            # remove cutoff% pixels from the low end
-            cut = n * cutoff / 100
-            for lo in range(256):
-                if cut > h[lo]:
-                    cut = cut - h[lo]
-                    h[lo] = 0
-                else:
-                    h[lo] = h[lo] - cut
-                    cut = 0
-                if cut <= 0:
-                    break
-            # remove cutoff% samples from the hi end
-            cut = n * cutoff / 100
-            for hi in range(255, -1, -1):
-                if cut > h[hi]:
-                    cut = cut - h[hi]
-                    h[hi] = 0
-                else:
-                    h[hi] = h[hi] - cut
-                    cut = 0
-                if cut <= 0:
-                    break
-        # find lowest/highest samples after preprocessing
-        for lo in range(256):
-            if h[lo]:
-                break
-        for hi in range(255, -1, -1):
-            if h[hi]:
-                break
-        if hi <= lo:
-            # don't bother
-            lut.extend(range(256))
-        else:
-            scale = 255.0 / (hi - lo)
-            offset = -lo * scale
-            for ix in range(256):
-                ix = int(ix * scale + offset)
-                if ix < 0:
-                    ix = 0
-                elif ix > 255:
-                    ix = 255
-                lut.append(ix)
-    return _lut(image, lut)
-
-##
-# Colorize grayscale image.  The <i>black</i> and <i>white</i>
-# arguments should be RGB tuples; this function calculates a colour
-# wedge mapping all black pixels in the source image to the first
-# colour, and all white pixels to the second colour.
-#
-# @param image The image to colourize.
-# @param black The colour to use for black input pixels.
-# @param white The colour to use for white input pixels.
-# @return An image.
-
-def colorize(image, black, white):
-    "Colorize a grayscale image"
-    assert image.mode == "L"
-    black = _color(black, "RGB")
-    white = _color(white, "RGB")
-    red = []; green = []; blue = []
-    for i in range(256):
-        red.append(black[0]+i*(white[0]-black[0])/255)
-        green.append(black[1]+i*(white[1]-black[1])/255)
-        blue.append(black[2]+i*(white[2]-black[2])/255)
-    image = image.convert("RGB")
-    return _lut(image, red + green + blue)
-
-##
-# Remove border from image.  The same amount of pixels are removed
-# from all four sides.  This function works on all image modes.
-#
-# @param image The image to crop.
-# @param border The number of pixels to remove.
-# @return An image.
-# @see Image#Image.crop
-
-def crop(image, border=0):
-    "Crop border off image"
-    left, top, right, bottom = _border(border)
-    return image.crop(
-        (left, top, image.size[0]-right, image.size[1]-bottom)
-        )
-
-##
-# Deform the image.
-#
-# @param image The image to deform.
-# @param deformer A deformer object.  Any object that implements a
-#     <b>getmesh</b> method can be used.
-# @param resample What resampling filter to use.
-# @return An image.
-
-def deform(image, deformer, resample=Image.BILINEAR):
-    "Deform image using the given deformer"
-    return image.transform(
-        image.size, Image.MESH, deformer.getmesh(image), resample
-        )
-
-##
-# Equalize the image histogram.  This function applies a non-linear
-# mapping to the input image, in order to create a uniform
-# distribution of grayscale values in the output image.
-#
-# @param image The image to equalize.
-# @param mask An optional mask.  If given, only the pixels selected by
-#     the mask are included in the analysis.
-# @return An image.
-
-def equalize(image, mask=None):
-    "Equalize image histogram"
-    if image.mode == "P":
-        image = image.convert("RGB")
-    h = image.histogram(mask)
-    lut = []
-    for b in range(0, len(h), 256):
-        histo = filter(None, h[b:b+256])
-        if len(histo) <= 1:
-            lut.extend(range(256))
-        else:
-            step = (reduce(operator.add, histo) - histo[-1]) / 255
-            if not step:
-                lut.extend(range(256))
-            else:
-                n = step / 2
-                for i in range(256):
-                    lut.append(n / step)
-                    n = n + h[i+b]
-    return _lut(image, lut)
-
-##
-# Add border to the image
-#
-# @param image The image to expand.
-# @param border Border width, in pixels.
-# @param fill Pixel fill value (a colour value).  Default is 0 (black).
-# @return An image.
-
-def expand(image, border=0, fill=0):
-    "Add border to image"
-    left, top, right, bottom = _border(border)
-    width = left + image.size[0] + right
-    height = top + image.size[1] + bottom
-    out = Image.new(image.mode, (width, height), _color(fill, image.mode))
-    out.paste(image, (left, top))
-    return out
-
-##
-# Returns a sized and cropped version of the image, cropped to the
-# requested aspect ratio and size.
-# <p>
-# The <b>fit</b> function was contributed by Kevin Cazabon.
-#
-# @param size The requested output size in pixels, given as a
-#     (width, height) tuple.
-# @param method What resampling method to use.  Default is Image.NEAREST.
-# @param bleed Remove a border around the outside of the image (from all
-#     four edges.  The value is a decimal percentage (use 0.01 for one
-#     percent).  The default value is 0 (no border).
-# @param centering Control the cropping position.  Use (0.5, 0.5) for
-#     center cropping (e.g. if cropping the width, take 50% off of the
-#     left side, and therefore 50% off the right side).  (0.0, 0.0)
-#     will crop from the top left corner (i.e. if cropping the width,
-#     take all of the crop off of the right side, and if cropping the
-#     height, take all of it off the bottom).  (1.0, 0.0) will crop
-#     from the bottom left corner, etc. (i.e. if cropping the width,
-#     take all of the crop off the left side, and if cropping the height
-#     take none from the top, and therefore all off the bottom).
-# @return An image.
-
-def fit(image, size, method=Image.NEAREST, bleed=0.0, centering=(0.5, 0.5)):
-    """
-    This method returns a sized and cropped version of the image,
-    cropped to the aspect ratio and size that you request.
-    """
-
-    # by Kevin Cazabon, Feb 17/2000
-    # kevin@cazabon.com
-    # http://www.cazabon.com
-
-    # ensure inputs are valid
-    if type(centering) != type([]):
-        centering = [centering[0], centering[1]]
-
-    if centering[0] > 1.0 or centering[0] < 0.0:
-        centering [0] = 0.50
-    if centering[1] > 1.0 or centering[1] < 0.0:
-        centering[1] = 0.50
-
-    if bleed > 0.49999 or bleed < 0.0:
-        bleed = 0.0
-
-    # calculate the area to use for resizing and cropping, subtracting
-    # the 'bleed' around the edges
-
-    # number of pixels to trim off on Top and Bottom, Left and Right
-    bleedPixels = (
-        int((float(bleed) * float(image.size[0])) + 0.5),
-        int((float(bleed) * float(image.size[1])) + 0.5)
-        )
-
-    liveArea = (
-        bleedPixels[0], bleedPixels[1], image.size[0] - bleedPixels[0] - 1,
-        image.size[1] - bleedPixels[1] - 1
-        )
-
-    liveSize = (liveArea[2] - liveArea[0], liveArea[3] - liveArea[1])
-
-    # calculate the aspect ratio of the liveArea
-    liveAreaAspectRatio = float(liveSize[0])/float(liveSize[1])
-
-    # calculate the aspect ratio of the output image
-    aspectRatio = float(size[0]) / float(size[1])
-
-    # figure out if the sides or top/bottom will be cropped off
-    if liveAreaAspectRatio >= aspectRatio:
-        # liveArea is wider than what's needed, crop the sides
-        cropWidth = int((aspectRatio * float(liveSize[1])) + 0.5)
-        cropHeight = liveSize[1]
-    else:
-        # liveArea is taller than what's needed, crop the top and bottom
-        cropWidth = liveSize[0]
-        cropHeight = int((float(liveSize[0])/aspectRatio) + 0.5)
-
-    # make the crop
-    leftSide = int(liveArea[0] + (float(liveSize[0]-cropWidth) * centering[0]))
-    if leftSide < 0:
-        leftSide = 0
-    topSide = int(liveArea[1] + (float(liveSize[1]-cropHeight) * centering[1]))
-    if topSide < 0:
-        topSide = 0
-
-    out = image.crop(
-        (leftSide, topSide, leftSide + cropWidth, topSide + cropHeight)
-        )
-
-    # resize the image and return it
-    return out.resize(size, method)
-
-##
-# Flip the image vertically (top to bottom).
-#
-# @param image The image to flip.
-# @return An image.
-
-def flip(image):
-    "Flip image vertically"
-    return image.transpose(Image.FLIP_TOP_BOTTOM)
-
-##
-# Convert the image to grayscale.
-#
-# @param image The image to convert.
-# @return An image.
-
-def grayscale(image):
-    "Convert to grayscale"
-    return image.convert("L")
-
-##
-# Invert (negate) the image.
-#
-# @param image The image to invert.
-# @return An image.
-
-def invert(image):
-    "Invert image (negate)"
-    lut = []
-    for i in range(256):
-        lut.append(255-i)
-    return _lut(image, lut)
-
-##
-# Flip image horizontally (left to right).
-#
-# @param image The image to mirror.
-# @return An image.
-
-def mirror(image):
-    "Flip image horizontally"
-    return image.transpose(Image.FLIP_LEFT_RIGHT)
-
-##
-# Reduce the number of bits for each colour channel.
-#
-# @param image The image to posterize.
-# @param bits The number of bits to keep for each channel (1-8).
-# @return An image.
-
-def posterize(image, bits):
-    "Reduce the number of bits per color channel"
-    lut = []
-    mask = ~(2**(8-bits)-1)
-    for i in range(256):
-        lut.append(i & mask)
-    return _lut(image, lut)
-
-##
-# Invert all pixel values above a threshold.
-#
-# @param image The image to posterize.
-# @param threshold All pixels above this greyscale level are inverted.
-# @return An image.
-
-def solarize(image, threshold=128):
-    "Invert all values above threshold"
-    lut = []
-    for i in range(256):
-        if i < threshold:
-            lut.append(i)
-        else:
-            lut.append(255-i)
-    return _lut(image, lut)
diff --git a/pythonPackages/pil/PIL/ImagePalette.py b/pythonPackages/pil/PIL/ImagePalette.py
deleted file mode 100644
index 0e9a93a690..0000000000
--- a/pythonPackages/pil/PIL/ImagePalette.py
+++ /dev/null
@@ -1,161 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImagePalette.py 2339 2005-03-25 08:02:17Z fredrik $
-#
-# image palette object
-#
-# History:
-# 1996-03-11 fl   Rewritten.
-# 1997-01-03 fl   Up and running.
-# 1997-08-23 fl   Added load hack
-# 2001-04-16 fl   Fixed randint shadow bug in random()
-#
-# Copyright (c) 1997-2001 by Secret Labs AB
-# Copyright (c) 1996-1997 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import array
-import Image
-
-##
-# Colour palette wrapper for palette mapped images.
-
-class ImagePalette:
-    "Colour palette for palette mapped images"
-
-    def __init__(self, mode = "RGB", palette = None):
-        self.mode = mode
-        self.rawmode = None # if set, palette contains raw data
-        self.palette = palette or range(256)*len(self.mode)
-        self.colors = {}
-        self.dirty = None
-        if len(self.mode)*256 != len(self.palette):
-            raise ValueError, "wrong palette size"
-
-    def getdata(self):
-        # experimental: get palette contains in format suitable
-        # for the low-level im.putpalette primitive
-        if self.rawmode:
-            return self.rawmode, self.palette
-        return self.mode + ";L", self.tostring()
-
-    def tostring(self):
-        # experimental: convert palette to string
-        if self.rawmode:
-            raise ValueError("palette contains raw palette data")
-        if Image.isStringType(self.palette):
-            return self.palette
-        return array.array("B", self.palette).tostring()
-
-    def getcolor(self, color):
-        # experimental: given an rgb tuple, allocate palette entry
-        if self.rawmode:
-            raise ValueError("palette contains raw palette data")
-        if Image.isTupleType(color):
-            try:
-                return self.colors[color]
-            except KeyError:
-                # allocate new color slot
-                if Image.isStringType(self.palette):
-                    self.palette = map(int, self.palette)
-                index = len(self.colors)
-                if index >= 256:
-                    raise ValueError("cannot allocate more than 256 colors")
-                self.colors[color] = index
-                self.palette[index] = color[0]
-                self.palette[index+256] = color[1]
-                self.palette[index+512] = color[2]
-                self.dirty = 1
-                return index
-        else:
-            raise ValueError("unknown color specifier: %r" % color)
-
-    def save(self, fp):
-        # (experimental) save palette to text file
-        if self.rawmode:
-            raise ValueError("palette contains raw palette data")
-        if type(fp) == type(""):
-            fp = open(fp, "w")
-        fp.write("# Palette\n")
-        fp.write("# Mode: %s\n" % self.mode)
-        for i in range(256):
-            fp.write("%d" % i)
-            for j in range(i, len(self.palette), 256):
-                fp.write(" %d" % self.palette[j])
-            fp.write("\n")
-        fp.close()
-
-# --------------------------------------------------------------------
-# Internal
-
-def raw(rawmode, data):
-    palette = ImagePalette()
-    palette.rawmode = rawmode
-    palette.palette = data
-    palette.dirty = 1
-    return palette
-
-# --------------------------------------------------------------------
-# Factories
-
-def new(mode, data):
-    return Image.core.new_palette(mode, data)
-
-def negative(mode = "RGB"):
-    palette = range(256)
-    palette.reverse()
-    return ImagePalette(mode, palette * len(mode))
-
-def random(mode = "RGB"):
-    from random import randint
-    palette = map(lambda a, randint=randint:
-                  randint(0, 255), [0]*256*len(mode))
-    return ImagePalette(mode, palette)
-
-def wedge(mode = "RGB"):
-    return ImagePalette(mode, range(256) * len(mode))
-
-def load(filename):
-
-    # FIXME: supports GIMP gradients only
-
-    fp = open(filename, "rb")
-
-    lut = None
-
-    if not lut:
-        try:
-            import GimpPaletteFile
-            fp.seek(0)
-            p = GimpPaletteFile.GimpPaletteFile(fp)
-            lut = p.getpalette()
-        except (SyntaxError, ValueError):
-            pass
-
-    if not lut:
-        try:
-            import GimpGradientFile
-            fp.seek(0)
-            p = GimpGradientFile.GimpGradientFile(fp)
-            lut = p.getpalette()
-        except (SyntaxError, ValueError):
-            pass
-
-    if not lut:
-        try:
-            import PaletteFile
-            fp.seek(0)
-            p = PaletteFile.PaletteFile(fp)
-            lut = p.getpalette()
-        except (SyntaxError, ValueError):
-            pass
-
-    if not lut:
-        raise IOError, "cannot load palette"
-
-    return lut # data, rawmode
-
-
-# add some psuedocolour palettes as well
diff --git a/pythonPackages/pil/PIL/ImagePath.py b/pythonPackages/pil/PIL/ImagePath.py
deleted file mode 100644
index 120a607477..0000000000
--- a/pythonPackages/pil/PIL/ImagePath.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: ImagePath.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# path interface
-#
-# History:
-# 1996-11-04 fl   Created
-# 2002-04-14 fl   Added documentation stub class
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1996.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-
-##
-# Path wrapper.
-
-class Path:
-
-    ##
-    # Creates a path object.
-    #
-    # @param xy Sequence.  The sequence can contain 2-tuples [(x, y), ...]
-    #     or a flat list of numbers [x, y, ...].
-
-    def __init__(self, xy):
-        pass
-
-    ##
-    # Compacts the path, by removing points that are close to each
-    # other.  This method modifies the path in place.
-
-    def compact(self, distance=2):
-        pass
-
-    ##
-    # Gets the bounding box.
-
-    def getbbox(self):
-        pass
-
-    ##
-    # Maps the path through a function.
-
-    def map(self, function):
-        pass
-
-    ##
-    # Converts the path to Python list.
-    #
-    # @param flat By default, this function returns a list of 2-tuples
-    #     [(x, y), ...].  If this argument is true, it returns a flat
-    #     list [x, y, ...] instead.
-    # @return A list of coordinates.
-
-    def tolist(self, flat=0):
-        pass
-
-    ##
-    # Transforms the path.
-
-    def transform(self, matrix):
-        pass
-
-
-# override with C implementation
-Path = Image.core.path
diff --git a/pythonPackages/pil/PIL/ImageQt.py b/pythonPackages/pil/PIL/ImageQt.py
deleted file mode 100644
index 2e9f476439..0000000000
--- a/pythonPackages/pil/PIL/ImageQt.py
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageQt.py 2741 2006-06-18 16:17:20Z fredrik $
-#
-# a simple Qt image interface.
-#
-# history:
-# 2006-06-03 fl: created
-# 2006-06-04 fl: inherit from QImage instead of wrapping it
-# 2006-06-05 fl: removed toimage helper; move string support to ImageQt
-#
-# Copyright (c) 2006 by Secret Labs AB
-# Copyright (c) 2006 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-
-from PyQt4.QtGui import QImage, qRgb
-
-##
-# (Internal) Turns an RGB color into a Qt compatible color integer.
-
-def rgb(r, g, b):
-    # use qRgb to pack the colors, and then turn the resulting long
-    # into a negative integer with the same bitpattern.
-    return (qRgb(r, g, b) & 0xffffff) - 0x1000000
-
-##
-# An PIL image wrapper for Qt.  This is a subclass of PyQt4's QImage
-# class.
-#
-# @param im A PIL Image object, or a file name (given either as Python
-#     string or a PyQt string object).
-
-class ImageQt(QImage):
-
-    def __init__(self, im):
-
-        data = None
-        colortable = None
-
-        # handle filename, if given instead of image name
-        if hasattr(im, "toUtf8"):
-            # FIXME - is this really the best way to do this?
-            im = unicode(im.toUtf8(), "utf-8")
-        if Image.isStringType(im):
-            im = Image.open(im)
-
-        if im.mode == "1":
-            format = QImage.Format_Mono
-        elif im.mode == "L":
-            format = QImage.Format_Indexed8
-            colortable = []
-            for i in range(256):
-                colortable.append(rgb(i, i, i))
-        elif im.mode == "P":
-            format = QImage.Format_Indexed8
-            colortable = []
-            palette = im.getpalette()
-            for i in range(0, len(palette), 3):
-                colortable.append(rgb(*palette[i:i+3]))
-        elif im.mode == "RGB":
-            data = im.tostring("raw", "BGRX")
-            format = QImage.Format_RGB32
-        elif im.mode == "RGBA":
-            try:
-                data = im.tostring("raw", "BGRA")
-            except SystemError:
-                # workaround for earlier versions
-                r, g, b, a = im.split()
-                im = Image.merge("RGBA", (b, g, r, a))
-            format = QImage.Format_ARGB32
-        else:
-            raise ValueError("unsupported image mode %r" % im.mode)
-
-        # must keep a reference, or Qt will crash!
-        self.__data = data or im.tostring()
-
-        QImage.__init__(self, self.__data, im.size[0], im.size[1], format)
-
-        if colortable:
-            self.setColorTable(colortable)
diff --git a/pythonPackages/pil/PIL/ImageSequence.py b/pythonPackages/pil/PIL/ImageSequence.py
deleted file mode 100644
index 452b096faf..0000000000
--- a/pythonPackages/pil/PIL/ImageSequence.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageSequence.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# sequence support classes
-#
-# history:
-# 1997-02-20 fl     Created
-#
-# Copyright (c) 1997 by Secret Labs AB.
-# Copyright (c) 1997 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-##
-# This class implements an iterator object that can be used to loop
-# over an image sequence.
-
-class Iterator:
-
-    ##
-    # Create an iterator.
-    #
-    # @param im An image object.
-
-    def __init__(self, im):
-        if not hasattr(im, "seek"):
-            raise AttributeError("im must have seek method")
-        self.im = im
-
-    def __getitem__(self, ix):
-        try:
-            if ix:
-                self.im.seek(ix)
-            return self.im
-        except EOFError:
-            raise IndexError # end of sequence
diff --git a/pythonPackages/pil/PIL/ImageStat.py b/pythonPackages/pil/PIL/ImageStat.py
deleted file mode 100644
index d53e645224..0000000000
--- a/pythonPackages/pil/PIL/ImageStat.py
+++ /dev/null
@@ -1,179 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageStat.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# global image statistics
-#
-# History:
-# 1996-04-05 fl   Created
-# 1997-05-21 fl   Added mask; added rms, var, stddev attributes
-# 1997-08-05 fl   Added median
-# 1998-07-05 hk   Fixed integer overflow error
-#
-# Notes:
-# This class shows how to implement delayed evaluation of attributes.
-# To get a certain value, simply access the corresponding attribute.
-# The __getattr__ dispatcher takes care of the rest.
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1996-97.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-import operator, math
-
-##
-# The <b>ImageStat</b> module calculates global statistics for an
-# image, or a region of an image.
-##
-
-##
-# Calculate statistics for the given image.  If a mask is included,
-# only the regions covered by that mask are included in the
-# statistics.
-
-class Stat:
-    "Get image or feature statistics"
-
-    ##
-    # Create a statistics object.
-    #
-    # @def __init__(image, mask=None)
-    # @param image A PIL image, or a precalculate histogram.
-    # @param mask An optional mask.
-
-    def __init__(self, image_or_list, mask = None):
-        try:
-            if mask:
-                self.h = image_or_list.histogram(mask)
-            else:
-                self.h = image_or_list.histogram()
-        except AttributeError:
-            self.h = image_or_list # assume it to be a histogram list
-        if type(self.h) != type([]):
-            raise TypeError, "first argument must be image or list"
-        self.bands = range(len(self.h) / 256)
-
-    def __getattr__(self, id):
-        "Calculate missing attribute"
-        if id[:4] == "_get":
-            raise AttributeError, id
-        # calculate missing attribute
-        v = getattr(self, "_get" + id)()
-        setattr(self, id, v)
-        return v
-
-    def _getextrema(self):
-        "Get min/max values for each band in the image"
-
-        def minmax(histogram):
-            n = 255
-            x = 0
-            for i in range(256):
-                if histogram[i]:
-                    n = min(n, i)
-                    x = max(x, i)
-            return n, x # returns (255, 0) if there's no data in the histogram
-
-        v = []
-        for i in range(0, len(self.h), 256):
-            v.append(minmax(self.h[i:]))
-        return v
-
-    def _getcount(self):
-        "Get total number of pixels in each layer"
-
-        v = []
-        for i in range(0, len(self.h), 256):
-            v.append(reduce(operator.add, self.h[i:i+256]))
-        return v
-
-    def _getsum(self):
-        "Get sum of all pixels in each layer"
-
-        v = []
-        for i in range(0, len(self.h), 256):
-            sum = 0.0
-            for j in range(256):
-                sum = sum + j * self.h[i+j]
-            v.append(sum)
-        return v
-
-    def _getsum2(self):
-        "Get squared sum of all pixels in each layer"
-
-        v = []
-        for i in range(0, len(self.h), 256):
-            sum2 = 0.0
-            for j in range(256):
-                sum2 = sum2 + (j ** 2) * float(self.h[i+j])
-            v.append(sum2)
-        return v
-
-    def _getmean(self):
-        "Get average pixel level for each layer"
-
-        v = []
-        for i in self.bands:
-            v.append(self.sum[i] / self.count[i])
-        return v
-
-    def _getmedian(self):
-        "Get median pixel level for each layer"
-
-        v = []
-        for i in self.bands:
-            s = 0
-            l = self.count[i]/2
-            b = i * 256
-            for j in range(256):
-                s = s + self.h[b+j]
-                if s > l:
-                    break
-            v.append(j)
-        return v
-
-    def _getrms(self):
-        "Get RMS for each layer"
-
-        v = []
-        for i in self.bands:
-            v.append(math.sqrt(self.sum2[i] / self.count[i]))
-        return v
-
-
-    def _getvar(self):
-        "Get variance for each layer"
-
-        v = []
-        for i in self.bands:
-            n = self.count[i]
-            v.append((self.sum2[i]-(self.sum[i]**2.0)/n)/n)
-        return v
-
-    def _getstddev(self):
-        "Get standard deviation for each layer"
-
-        v = []
-        for i in self.bands:
-            v.append(math.sqrt(self.var[i]))
-        return v
-
-Global = Stat # compatibility
-
-if __name__ == "__main__":
-
-    im = Image.open("Images/lena.ppm")
-
-    st = Stat(im)
-
-    print "extrema", st.extrema
-    print "sum    ", st.sum
-    print "mean   ", st.mean
-    print "median ", st.median
-    print "rms    ", st.rms
-    print "sum2   ", st.sum2
-    print "var    ", st.var
-    print "stddev ", st.stddev
diff --git a/pythonPackages/pil/PIL/ImageTk.py b/pythonPackages/pil/PIL/ImageTk.py
deleted file mode 100644
index 30f7c0ec50..0000000000
--- a/pythonPackages/pil/PIL/ImageTk.py
+++ /dev/null
@@ -1,296 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageTk.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# a Tk display interface
-#
-# History:
-# 96-04-08 fl   Created
-# 96-09-06 fl   Added getimage method
-# 96-11-01 fl   Rewritten, removed image attribute and crop method
-# 97-05-09 fl   Use PyImagingPaste method instead of image type
-# 97-05-12 fl   Minor tweaks to match the IFUNC95 interface
-# 97-05-17 fl   Support the "pilbitmap" booster patch
-# 97-06-05 fl   Added file= and data= argument to image constructors
-# 98-03-09 fl   Added width and height methods to Image classes
-# 98-07-02 fl   Use default mode for "P" images without palette attribute
-# 98-07-02 fl   Explicitly destroy Tkinter image objects
-# 99-07-24 fl   Support multiple Tk interpreters (from Greg Couch)
-# 99-07-26 fl   Automatically hook into Tkinter (if possible)
-# 99-08-15 fl   Hook uses _imagingtk instead of _imaging
-#
-# Copyright (c) 1997-1999 by Secret Labs AB
-# Copyright (c) 1996-1997 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Tkinter, Image
-
-##
-# The <b>ImageTk</b> module contains support to create and modify
-# Tkinter <b>BitmapImage</b> and <b>PhotoImage</b> objects.
-# <p>
-# For examples, see the demo programs in the <i>Scripts</i>
-# directory.
-##
-
-# --------------------------------------------------------------------
-# Check for Tkinter interface hooks
-
-_pilbitmap_ok = None
-
-def _pilbitmap_check():
-    global _pilbitmap_ok
-    if _pilbitmap_ok is None:
-        try:
-            im = Image.new("1", (1,1))
-            Tkinter.BitmapImage(data="PIL:%d" % im.im.id)
-            _pilbitmap_ok = 1
-        except Tkinter.TclError:
-            _pilbitmap_ok = 0
-    return _pilbitmap_ok
-
-# --------------------------------------------------------------------
-# PhotoImage
-
-##
-# Creates a Tkinter-compatible photo image.  This can be used
-# everywhere Tkinter expects an image object.  If the image is an RGBA
-# image, pixels having alpha 0 are treated as transparent.
-
-class PhotoImage:
-
-    ##
-    # Create a photo image object. The constructor takes either
-    # a PIL image, or a mode and a size.  Alternatively, you can
-    # use the <b>file</b> or <b>data</b> options to initialize
-    # the photo image object.
-    # <p>
-    # @def __init__(image=None, size=None, **options)
-    # @param image Either a PIL image, or a mode string.  If a
-    #    mode string is used, a size must also be given.
-    # @param size If the first argument is a mode string, this
-    #    defines the size of the image.
-    # @keyparam file A filename to load the image from (using
-    #    Image.open(file)).
-    # @keyparam data An 8-bit string containing image data (as
-    #    loaded from an image file).
-
-    def __init__(self, image=None, size=None, **kw):
-
-        # Tk compatibility: file or data
-        if image is None:
-            if kw.has_key("file"):
-                image = Image.open(kw["file"])
-                del kw["file"]
-            elif kw.has_key("data"):
-                from StringIO import StringIO
-                image = Image.open(StringIO(kw["data"]))
-                del kw["data"]
-
-        if hasattr(image, "mode") and hasattr(image, "size"):
-            # got an image instead of a mode
-            mode = image.mode
-            if mode == "P":
-                # palette mapped data
-                image.load()
-                try:
-                    mode = image.palette.mode
-                except AttributeError:
-                    mode = "RGB" # default
-            size = image.size
-            kw["width"], kw["height"] = size
-        else:
-            mode = image
-            image = None
-
-        if mode not in ["1", "L", "RGB", "RGBA"]:
-            mode = Image.getmodebase(mode)
-
-        self.__mode = mode
-        self.__size = size
-        self.__photo = apply(Tkinter.PhotoImage, (), kw)
-        self.tk = self.__photo.tk
-        if image:
-            self.paste(image)
-
-    def __del__(self):
-        name = self.__photo.name
-        self.__photo.name = None
-        try:
-            self.__photo.tk.call("image", "delete", name)
-        except:
-            pass # ignore internal errors
-
-    ##
-    # Get the Tkinter photo image identifier.  This method is
-    # automatically called by Tkinter whenever a PhotoImage object is
-    # passed to a Tkinter method.
-    #
-    # @return A Tkinter photo image identifier (a string).
-
-    def __str__(self):
-        return str(self.__photo)
-
-    ##
-    # Get the width of the image.
-    #
-    # @return The width, in pixels.
-
-    def width(self):
-        return self.__size[0]
-
-    ##
-    # Get the height of the image.
-    #
-    # @return The height, in pixels.
-
-    def height(self):
-        return self.__size[1]
-
-    ##
-    # Paste a PIL image into the photo image.  Note that this can
-    # be very slow if the photo image is displayed.
-    #
-    # @param im A PIL image.  The size must match the target region.
-    #    If the mode does not match, the image is converted to the
-    #    mode of the bitmap image.
-    # @param box A 4-tuple defining the left, upper, right, and
-    #    lower pixel coordinate.  If None is given instead of a
-    #    tuple, all of the image is assumed.
-
-    def paste(self, im, box=None):
-
-        # convert to blittable
-        im.load()
-        image = im.im
-        if image.isblock() and im.mode == self.__mode:
-            block = image
-        else:
-            block = image.new_block(self.__mode, im.size)
-            image.convert2(block, image) # convert directly between buffers
-
-        tk = self.__photo.tk
-
-        try:
-            tk.call("PyImagingPhoto", self.__photo, block.id)
-        except Tkinter.TclError, v:
-            # activate Tkinter hook
-            try:
-                import _imagingtk
-                try:
-                    _imagingtk.tkinit(tk.interpaddr(), 1)
-                except AttributeError:
-                    _imagingtk.tkinit(id(tk), 0)
-                tk.call("PyImagingPhoto", self.__photo, block.id)
-            except (ImportError, AttributeError, Tkinter.TclError):
-                raise # configuration problem; cannot attach to Tkinter
-
-# --------------------------------------------------------------------
-# BitmapImage
-
-##
-# Create a Tkinter-compatible bitmap image.  This can be used
-# everywhere Tkinter expects an image object.
-
-class BitmapImage:
-
-    ##
-    # Create a Tkinter-compatible bitmap image.
-    # <p>
-    # The given image must have mode "1".  Pixels having value 0 are
-    # treated as transparent.  Options, if any, are passed on to
-    # Tkinter.  The most commonly used option is <b>foreground</b>,
-    # which is used to specify the colour for the non-transparent
-    # parts.  See the Tkinter documentation for information on how to
-    # specify colours.
-    #
-    # @def __init__(image=None, **options)
-    # @param image A PIL image.
-
-    def __init__(self, image=None, **kw):
-
-        # Tk compatibility: file or data
-        if image is None:
-            if kw.has_key("file"):
-                image = Image.open(kw["file"])
-                del kw["file"]
-            elif kw.has_key("data"):
-                from StringIO import StringIO
-                image = Image.open(StringIO(kw["data"]))
-                del kw["data"]
-
-        self.__mode = image.mode
-        self.__size = image.size
-
-        if _pilbitmap_check():
-            # fast way (requires the pilbitmap booster patch)
-            image.load()
-            kw["data"] = "PIL:%d" % image.im.id
-            self.__im = image # must keep a reference
-        else:
-            # slow but safe way
-            kw["data"] = image.tobitmap()
-        self.__photo = apply(Tkinter.BitmapImage, (), kw)
-
-    def __del__(self):
-        name = self.__photo.name
-        self.__photo.name = None
-        try:
-            self.__photo.tk.call("image", "delete", name)
-        except:
-            pass # ignore internal errors
-
-    ##
-    # Get the width of the image.
-    #
-    # @return The width, in pixels.
-
-    def width(self):
-        return self.__size[0]
-
-    ##
-    # Get the height of the image.
-    #
-    # @return The height, in pixels.
-
-    def height(self):
-        return self.__size[1]
-
-    ##
-    # Get the Tkinter bitmap image identifier.  This method is
-    # automatically called by Tkinter whenever a BitmapImage object
-    # is passed to a Tkinter method.
-    #
-    # @return A Tkinter bitmap image identifier (a string).
-
-    def __str__(self):
-        return str(self.__photo)
-
-##
-# Copies the contents of a PhotoImage to a PIL image memory.
-
-def getimage(photo):
-    photo.tk.call("PyImagingPhotoGet", photo)
-
-# --------------------------------------------------------------------
-# Helper for the Image.show method.
-
-def _show(image, title):
-
-    class UI(Tkinter.Label):
-        def __init__(self, master, im):
-            if im.mode == "1":
-                self.image = BitmapImage(im, foreground="white", master=master)
-            else:
-                self.image = PhotoImage(im, master=master)
-            Tkinter.Label.__init__(self, master, image=self.image,
-                bg="black", bd=0)
-
-    if not Tkinter._default_root:
-        raise IOError, "tkinter not initialized"
-    top = Tkinter.Toplevel()
-    if title:
-        top.title(title)
-    UI(top, image).pack()
diff --git a/pythonPackages/pil/PIL/ImageTransform.py b/pythonPackages/pil/PIL/ImageTransform.py
deleted file mode 100644
index 2944cd3e3e..0000000000
--- a/pythonPackages/pil/PIL/ImageTransform.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageTransform.py 2813 2006-10-07 10:11:35Z fredrik $
-#
-# transform wrappers
-#
-# History:
-# 2002-04-08 fl   Created
-#
-# Copyright (c) 2002 by Secret Labs AB
-# Copyright (c) 2002 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-
-class Transform:
-    def __init__(self, data):
-        self.data = data
-    def getdata(self):
-        return self.method, self.data
-
-##
-# Define an affine image transform.
-# <p>
-# This function takes a 6-tuple (<i>a, b, c, d, e, f</i>) which
-# contain the first two rows from an affine transform matrix. For
-# each pixel (<i>x, y</i>) in the output image, the new value is
-# taken from a position (a <i>x</i> + b <i>y</i> + c,
-# d <i>x</i> + e <i>y</i> + f) in the input image, rounded to
-# nearest pixel.
-# <p>
-# This function can be used to scale, translate, rotate, and shear the
-# original image.
-#
-# @def AffineTransform(matrix)
-# @param matrix A 6-tuple (<i>a, b, c, d, e, f</i>) containing
-#    the first two rows from an affine transform matrix.
-# @see Image#Image.transform
-
-class AffineTransform(Transform):
-    method = Image.AFFINE
-
-##
-# Define a transform to extract a subregion from an image.
-# <p>
-# Maps a rectangle (defined by two corners) from the image to a
-# rectangle of the given size.  The resulting image will contain
-# data sampled from between the corners, such that (<i>x0, y0</i>)
-# in the input image will end up at (0,0) in the output image,
-# and (<i>x1, y1</i>) at <i>size</i>.
-# <p>
-# This method can be used to crop, stretch, shrink, or mirror an
-# arbitrary rectangle in the current image. It is slightly slower than
-# <b>crop</b>, but about as fast as a corresponding <b>resize</b>
-# operation.
-#
-# @def ExtentTransform(bbox)
-# @param bbox A 4-tuple (<i>x0, y0, x1, y1</i>) which specifies
-#    two points in the input image's coordinate system.
-# @see Image#Image.transform
-
-class ExtentTransform(Transform):
-    method = Image.EXTENT
-
-##
-# Define an quad image transform.
-# <p>
-# Maps a quadrilateral (a region defined by four corners) from the
-# image to a rectangle of the given size.
-#
-# @def QuadTransform(xy)
-# @param xy An 8-tuple (<i>x0, y0, x1, y1, x2, y2, y3, y3</i>) which
-#   contain the upper left, lower left, lower right, and upper right
-#   corner of the source quadrilateral.
-# @see Image#Image.transform
-
-class QuadTransform(Transform):
-    method = Image.QUAD
-
-##
-# Define an mesh image transform.  A mesh transform consists of one
-# or more individual quad transforms.
-#
-# @def MeshTransform(data)
-# @param data A list of (bbox, quad) tuples.
-# @see Image#Image.transform
-
-class MeshTransform(Transform):
-    method = Image.MESH
diff --git a/pythonPackages/pil/PIL/ImageWin.py b/pythonPackages/pil/PIL/ImageWin.py
deleted file mode 100644
index 13c56b9b2d..0000000000
--- a/pythonPackages/pil/PIL/ImageWin.py
+++ /dev/null
@@ -1,215 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImageWin.py 2662 2006-03-21 22:41:02Z fredrik $
-#
-# a Windows DIB display interface
-#
-# History:
-# 1996-05-20 fl   Created
-# 1996-09-20 fl   Fixed subregion exposure
-# 1997-09-21 fl   Added draw primitive (for tzPrint)
-# 2003-05-21 fl   Added experimental Window/ImageWindow classes
-# 2003-09-05 fl   Added fromstring/tostring methods
-#
-# Copyright (c) Secret Labs AB 1997-2003.
-# Copyright (c) Fredrik Lundh 1996-2003.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-
-##
-# The <b>ImageWin</b> module contains support to create and display
-# images under Windows 95/98, NT, 2000 and later.
-
-class HDC:
-    def __init__(self, dc):
-        self.dc = dc
-    def __int__(self):
-        return self.dc
-
-class HWND:
-    def __init__(self, wnd):
-        self.wnd = wnd
-    def __int__(self):
-        return self.wnd
-
-##
-# Create a Windows bitmap with the given mode and size.  The mode can
-# be one of "1", "L", "P", or "RGB".
-#
-# If the display requires a palette, this constructor creates a
-# suitable palette and associates it with the image. For an "L" image,
-# 128 greylevels are allocated. For an "RGB" image, a 6x6x6 colour
-# cube is used, together with 20 greylevels.
-#
-# To make sure that palettes work properly under Windows, you must
-# call the <b>palette</b> method upon certain events from Windows.
-
-class Dib:
-
-    ##
-    # Create Windows bitmap.
-    #
-    # @param image Either a PIL image, or a mode string.  If a
-    #    mode string is used, a size must also be given.  The
-    #    mode can be one of "1", "L", "P", or "RGB".
-    # @param size If the first argument is a mode string, this
-    #    defines the size of the image.
-
-    def __init__(self, image, size=None):
-        if hasattr(image, "mode") and hasattr(image, "size"):
-            mode = image.mode
-            size = image.size
-        else:
-            mode = image
-            image = None
-        if mode not in ["1", "L", "P", "RGB"]:
-            mode = Image.getmodebase(mode)
-        self.image = Image.core.display(mode, size)
-        self.mode = mode
-        self.size = size
-        if image:
-            self.paste(image)
-
-    ##
-    # Copy the bitmap contents to a device context.
-    #
-    # @param handle Device context (HDC), cast to a Python integer,
-    #    or a HDC or HWND instance.  In PythonWin, you can use the
-    #    <b>GetHandleAttrib</b> method of the <b>CDC</b> class to get
-    #    a suitable handle.
-
-    def expose(self, handle):
-        if isinstance(handle, HWND):
-            dc = self.image.getdc(handle)
-            try:
-                result = self.image.expose(dc)
-            finally:
-                self.image.releasedc(handle, dc)
-        else:
-            result = self.image.expose(handle)
-        return result
-
-    def draw(self, handle, dst, src=None):
-        if not src:
-            src = (0,0) + self.size
-        if isinstance(handle, HWND):
-            dc = self.image.getdc(handle)
-            try:
-                result = self.image.draw(dc, dst, src)
-            finally:
-                self.image.releasedc(handle, dc)
-        else:
-            result = self.image.draw(handle, dst, src)
-        return result
-
-    ##
-    # Installs the palette associated with the image in the
-    # given device context.
-    # <p>
-    # This method should be called upon <b>QUERYNEWPALETTE</b>
-    # and <b>PALETTECHANGED</b> events from Windows. If this
-    # method returns a non-zero value, one or more display
-    # palette entries were changed, and the image should be
-    # redrawn.
-    #
-    # @param handle Device context (HDC), cast to a Python integer,
-    #     or an HDC or HWND instance.
-    # @return A true value if one or more entries were changed
-    #    (this indicates that the image should be redrawn).
-
-    def query_palette(self, handle):
-        if isinstance(handle, HWND):
-            handle = self.image.getdc(handle)
-            try:
-                result = self.image.query_palette(handle)
-            finally:
-                self.image.releasedc(handle, handle)
-        else:
-            result = self.image.query_palette(handle)
-        return result
-
-    ##
-    # Paste a PIL image into the bitmap image.
-    #
-    # @param im A PIL image.  The size must match the target region.
-    #    If the mode does not match, the image is converted to the
-    #    mode of the bitmap image.
-    # @param box A 4-tuple defining the left, upper, right, and
-    #    lower pixel coordinate.  If None is given instead of a
-    #    tuple, all of the image is assumed.
-
-    def paste(self, im, box=None):
-        im.load()
-        if self.mode != im.mode:
-            im = im.convert(self.mode)
-        if box:
-            self.image.paste(im.im, box)
-        else:
-            self.image.paste(im.im)
-
-    ##
-    # Load display memory contents from string buffer.
-    #
-    # @param buffer A string buffer containing display data (usually
-    #     data returned from <b>tostring</b>)
-
-    def fromstring(self, buffer):
-        return self.image.fromstring(buffer)
-
-    ##
-    # Copy display memory contents to string buffer.
-    #
-    # @return A string buffer containing display data.
-
-    def tostring(self):
-        return self.image.tostring()
-
-
-##
-# Create a Window with the given title size.
-
-class Window:
-
-    def __init__(self, title="PIL", width=None, height=None):
-        self.hwnd = Image.core.createwindow(
-            title, self.__dispatcher, width or 0, height or 0
-            )
-
-    def __dispatcher(self, action, *args):
-        return apply(getattr(self, "ui_handle_" + action), args)
-
-    def ui_handle_clear(self, dc, x0, y0, x1, y1):
-        pass
-
-    def ui_handle_damage(self, x0, y0, x1, y1):
-        pass
-
-    def ui_handle_destroy(self):
-        pass
-
-    def ui_handle_repair(self, dc, x0, y0, x1, y1):
-        pass
-
-    def ui_handle_resize(self, width, height):
-        pass
-
-    def mainloop(self):
-        Image.core.eventloop()
-
-##
-# Create an image window which displays the given image.
-
-class ImageWindow(Window):
-
-    def __init__(self, image, title="PIL"):
-        if not isinstance(image, Dib):
-            image = Dib(image)
-        self.image = image
-        width, height = image.size
-        Window.__init__(self, title, width=width, height=height)
-
-    def ui_handle_repair(self, dc, x0, y0, x1, y1):
-        self.image.draw(dc, (x0, y0, x1, y1))
diff --git a/pythonPackages/pil/PIL/ImtImagePlugin.py b/pythonPackages/pil/PIL/ImtImagePlugin.py
deleted file mode 100644
index f321ae3e8b..0000000000
--- a/pythonPackages/pil/PIL/ImtImagePlugin.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: ImtImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# IM Tools support for PIL
-#
-# history:
-# 1996-05-27 fl   Created (read 8-bit images only)
-# 2001-02-17 fl   Use 're' instead of 'regex' (Python 2.1) (0.2)
-#
-# Copyright (c) Secret Labs AB 1997-2001.
-# Copyright (c) Fredrik Lundh 1996-2001.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.2"
-
-import string, re
-
-import Image, ImageFile
-
-#
-# --------------------------------------------------------------------
-
-field = re.compile(r"([a-z]*) ([^ \r\n]*)")
-
-##
-# Image plugin for IM Tools images.
-
-class ImtImageFile(ImageFile.ImageFile):
-
-    format = "IMT"
-    format_description = "IM Tools"
-
-    def _open(self):
-
-        # Quick rejection: if there's not a LF among the first
-        # 100 bytes, this is (probably) not a text header.
-
-        if not "\n" in self.fp.read(100):
-            raise SyntaxError, "not an IM file"
-        self.fp.seek(0)
-
-        xsize = ysize = 0
-
-        while 1:
-
-            s = self.fp.read(1)
-            if not s:
-                break
-
-            if s == chr(12):
-
-                # image data begins
-                self.tile = [("raw", (0,0)+self.size,
-                             self.fp.tell(),
-                             (self.mode, 0, 1))]
-
-                break
-
-            else:
-
-                # read key/value pair
-                # FIXME: dangerous, may read whole file
-                s = s + self.fp.readline()
-                if len(s) == 1 or len(s) > 100:
-                    break
-                if s[0] == "*":
-                    continue # comment
-
-                m = field.match(s)
-                if not m:
-                    break
-                k, v = m.group(1,2)
-                if k == "width":
-                    xsize = int(v)
-                    self.size = xsize, ysize
-                elif k == "height":
-                    ysize = int(v)
-                    self.size = xsize, ysize
-                elif k == "pixel" and v == "n8":
-                    self.mode = "L"
-
-
-#
-# --------------------------------------------------------------------
-
-Image.register_open("IMT", ImtImageFile)
-
-#
-# no extension registered (".im" is simply too common)
diff --git a/pythonPackages/pil/PIL/IptcImagePlugin.py b/pythonPackages/pil/PIL/IptcImagePlugin.py
deleted file mode 100644
index 35357590cb..0000000000
--- a/pythonPackages/pil/PIL/IptcImagePlugin.py
+++ /dev/null
@@ -1,280 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: IptcImagePlugin.py 2813 2006-10-07 10:11:35Z fredrik $
-#
-# IPTC/NAA file handling
-#
-# history:
-# 1995-10-01 fl   Created
-# 1998-03-09 fl   Cleaned up and added to PIL
-# 2002-06-18 fl   Added getiptcinfo helper
-#
-# Copyright (c) Secret Labs AB 1997-2002.
-# Copyright (c) Fredrik Lundh 1995.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.3"
-
-
-import Image, ImageFile
-import os, tempfile
-
-
-COMPRESSION = {
-    1: "raw",
-    5: "jpeg"
-}
-
-PAD = chr(0) * 4
-
-#
-# Helpers
-
-def i16(c):
-    return ord(c[1]) + (ord(c[0])<<8)
-
-def i32(c):
-    return ord(c[3]) + (ord(c[2])<<8) + (ord(c[1])<<16) + (ord(c[0])<<24)
-
-def i(c):
-    return i32((PAD + c)[-4:])
-
-def dump(c):
-    for i in c:
-        print "%02x" % ord(i),
-    print
-
-##
-# Image plugin for IPTC/NAA datastreams.  To read IPTC/NAA fields
-# from TIFF and JPEG files, use the <b>getiptcinfo</b> function.
-
-class IptcImageFile(ImageFile.ImageFile):
-
-    format = "IPTC"
-    format_description = "IPTC/NAA"
-
-    def getint(self, key):
-        return i(self.info[key])
-
-    def field(self):
-        #
-        # get a IPTC field header
-        s = self.fp.read(5)
-        if not len(s):
-            return None, 0
-
-        tag = ord(s[1]), ord(s[2])
-
-        # syntax
-        if ord(s[0]) != 0x1C or tag[0] < 1 or tag[0] > 9:
-            raise SyntaxError, "invalid IPTC/NAA file"
-
-        # field size
-        size = ord(s[3])
-        if size > 132:
-            raise IOError, "illegal field length in IPTC/NAA file"
-        elif size == 128:
-            size = 0
-        elif size > 128:
-            size = i(self.fp.read(size-128))
-        else:
-            size = i16(s[3:])
-
-        return tag, size
-
-    def _is_raw(self, offset, size):
-        #
-        # check if the file can be mapped
-
-        # DISABLED: the following only slows things down...
-        return 0
-
-        self.fp.seek(offset)
-        t, sz = self.field()
-        if sz != size[0]:
-            return 0
-        y = 1
-        while 1:
-            self.fp.seek(sz, 1)
-            t, s = self.field()
-            if t != (8, 10):
-                break
-            if s != sz:
-                return 0
-            y = y + 1
-        return y == size[1]
-
-    def _open(self):
-
-        # load descriptive fields
-        while 1:
-            offset = self.fp.tell()
-            tag, size = self.field()
-            if not tag or tag == (8,10):
-                break
-            if size:
-                self.info[tag] = self.fp.read(size)
-            else:
-                self.info[tag] = None
-            # print tag, self.info[tag]
-
-        # mode
-        layers = ord(self.info[(3,60)][0])
-        component = ord(self.info[(3,60)][1])
-        if self.info.has_key((3,65)):
-            id = ord(self.info[(3,65)][0])-1
-        else:
-            id = 0
-        if layers == 1 and not component:
-            self.mode = "L"
-        elif layers == 3 and component:
-            self.mode = "RGB"[id]
-        elif layers == 4 and component:
-            self.mode = "CMYK"[id]
-
-        # size
-        self.size = self.getint((3,20)), self.getint((3,30))
-
-        # compression
-        try:
-            compression = COMPRESSION[self.getint((3,120))]
-        except KeyError:
-            raise IOError, "Unknown IPTC image compression"
-
-        # tile
-        if tag == (8,10):
-            if compression == "raw" and self._is_raw(offset, self.size):
-                self.tile = [(compression, (offset, size + 5, -1),
-                             (0, 0, self.size[0], self.size[1]))]
-            else:
-                self.tile = [("iptc", (compression, offset),
-                             (0, 0, self.size[0], self.size[1]))]
-
-    def load(self):
-
-        if len(self.tile) != 1 or self.tile[0][0] != "iptc":
-            return ImageFile.ImageFile.load(self)
-
-        type, tile, box = self.tile[0]
-
-        encoding, offset = tile
-
-        self.fp.seek(offset)
-
-        # Copy image data to temporary file
-        outfile = tempfile.mktemp()
-        o = open(outfile, "wb")
-        if encoding == "raw":
-            # To simplify access to the extracted file,
-            # prepend a PPM header
-            o.write("P5\n%d %d\n255\n" % self.size)
-        while 1:
-            type, size = self.field()
-            if type != (8, 10):
-                break
-            while size > 0:
-                s = self.fp.read(min(size, 8192))
-                if not s:
-                    break
-                o.write(s)
-                size = size - len(s)
-        o.close()
-
-        try:
-            try:
-                # fast
-                self.im = Image.core.open_ppm(outfile)
-            except:
-                # slightly slower
-                im = Image.open(outfile)
-                im.load()
-                self.im = im.im
-        finally:
-            try: os.unlink(outfile)
-            except: pass
-
-
-Image.register_open("IPTC", IptcImageFile)
-
-Image.register_extension("IPTC", ".iim")
-
-##
-# Get IPTC information from TIFF, JPEG, or IPTC file.
-#
-# @param im An image containing IPTC data.
-# @return A dictionary containing IPTC information, or None if
-#     no IPTC information block was found.
-
-def getiptcinfo(im):
-
-    import TiffImagePlugin, JpegImagePlugin
-    import StringIO
-
-    data = None
-
-    if isinstance(im, IptcImageFile):
-        # return info dictionary right away
-        return im.info
-
-    elif isinstance(im, JpegImagePlugin.JpegImageFile):
-        # extract the IPTC/NAA resource
-        try:
-            app = im.app["APP13"]
-            if app[:14] == "Photoshop 3.0\x00":
-                app = app[14:]
-                # parse the image resource block
-                offset = 0
-                while app[offset:offset+4] == "8BIM":
-                    offset = offset + 4
-                    # resource code
-                    code = JpegImagePlugin.i16(app, offset)
-                    offset = offset + 2
-                    # resource name (usually empty)
-                    name_len = ord(app[offset])
-                    name = app[offset+1:offset+1+name_len]
-                    offset = 1 + offset + name_len
-                    if offset & 1:
-                        offset = offset + 1
-                    # resource data block
-                    size = JpegImagePlugin.i32(app, offset)
-                    offset = offset + 4
-                    if code == 0x0404:
-                        # 0x0404 contains IPTC/NAA data
-                        data = app[offset:offset+size]
-                        break
-                    offset = offset + size
-                    if offset & 1:
-                        offset = offset + 1
-        except (AttributeError, KeyError):
-            pass
-
-    elif isinstance(im, TiffImagePlugin.TiffImageFile):
-        # get raw data from the IPTC/NAA tag (PhotoShop tags the data
-        # as 4-byte integers, so we cannot use the get method...)
-        try:
-            type, data = im.tag.tagdata[TiffImagePlugin.IPTC_NAA_CHUNK]
-        except (AttributeError, KeyError):
-            pass
-
-    if data is None:
-        return None # no properties
-
-    # create an IptcImagePlugin object without initializing it
-    class FakeImage:
-        pass
-    im = FakeImage()
-    im.__class__ = IptcImageFile
-
-    # parse the IPTC information chunk
-    im.info = {}
-    im.fp = StringIO.StringIO(data)
-
-    try:
-        im._open()
-    except (IndexError, KeyError):
-        pass # expected failure
-
-    return im.info
diff --git a/pythonPackages/pil/PIL/JpegImagePlugin.py b/pythonPackages/pil/PIL/JpegImagePlugin.py
deleted file mode 100644
index b8ba8e48a9..0000000000
--- a/pythonPackages/pil/PIL/JpegImagePlugin.py
+++ /dev/null
@@ -1,430 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: JpegImagePlugin.py 2763 2006-06-22 21:43:28Z fredrik $
-#
-# JPEG (JFIF) file handling
-#
-# See "Digital Compression and Coding of Continous-Tone Still Images,
-# Part 1, Requirements and Guidelines" (CCITT T.81 / ISO 10918-1)
-#
-# History:
-# 1995-09-09 fl   Created
-# 1995-09-13 fl   Added full parser
-# 1996-03-25 fl   Added hack to use the IJG command line utilities
-# 1996-05-05 fl   Workaround Photoshop 2.5 CMYK polarity bug
-# 1996-05-28 fl   Added draft support, JFIF version (0.1)
-# 1996-12-30 fl   Added encoder options, added progression property (0.2)
-# 1997-08-27 fl   Save mode 1 images as BW (0.3)
-# 1998-07-12 fl   Added YCbCr to draft and save methods (0.4)
-# 1998-10-19 fl   Don't hang on files using 16-bit DQT's (0.4.1)
-# 2001-04-16 fl   Extract DPI settings from JFIF files (0.4.2)
-# 2002-07-01 fl   Skip pad bytes before markers; identify Exif files (0.4.3)
-# 2003-04-25 fl   Added experimental EXIF decoder (0.5)
-# 2003-06-06 fl   Added experimental EXIF GPSinfo decoder
-# 2003-09-13 fl   Extract COM markers
-#
-# Copyright (c) 1997-2003 by Secret Labs AB.
-# Copyright (c) 1995-1996 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.5"
-
-import array, string
-import Image, ImageFile
-
-def i16(c,o=0):
-    return ord(c[o+1]) + (ord(c[o])<<8)
-
-def i32(c,o=0):
-    return ord(c[o+3]) + (ord(c[o+2])<<8) + (ord(c[o+1])<<16) + (ord(c[o])<<24)
-
-#
-# Parser
-
-def Skip(self, marker):
-    n = i16(self.fp.read(2))-2
-    ImageFile._safe_read(self.fp, n)
-
-def APP(self, marker):
-    #
-    # Application marker.  Store these in the APP dictionary.
-    # Also look for well-known application markers.
-
-    n = i16(self.fp.read(2))-2
-    s = ImageFile._safe_read(self.fp, n)
-
-    app = "APP%d" % (marker&15)
-
-    self.app[app] = s # compatibility
-    self.applist.append((app, s))
-
-    if marker == 0xFFE0 and s[:4] == "JFIF":
-        # extract JFIF information
-        self.info["jfif"] = version = i16(s, 5) # version
-        self.info["jfif_version"] = divmod(version, 256)
-        # extract JFIF properties
-        try:
-            jfif_unit = ord(s[7])
-            jfif_density = i16(s, 8), i16(s, 10)
-        except:
-            pass
-        else:
-            if jfif_unit == 1:
-                self.info["dpi"] = jfif_density
-            self.info["jfif_unit"] = jfif_unit
-            self.info["jfif_density"] = jfif_density
-    elif marker == 0xFFE1 and s[:5] == "Exif\0":
-        # extract Exif information (incomplete)
-        self.info["exif"] = s # FIXME: value will change
-    elif marker == 0xFFE2 and s[:5] == "FPXR\0":
-        # extract FlashPix information (incomplete)
-        self.info["flashpix"] = s # FIXME: value will change
-    elif marker == 0xFFEE and s[:5] == "Adobe":
-        self.info["adobe"] = i16(s, 5)
-        # extract Adobe custom properties
-        try:
-            adobe_transform = ord(s[1])
-        except:
-            pass
-        else:
-            self.info["adobe_transform"] = adobe_transform
-
-def COM(self, marker):
-    #
-    # Comment marker.  Store these in the APP dictionary.
-
-    n = i16(self.fp.read(2))-2
-    s = ImageFile._safe_read(self.fp, n)
-
-    self.app["COM"] = s # compatibility
-    self.applist.append(("COM", s))
-
-def SOF(self, marker):
-    #
-    # Start of frame marker.  Defines the size and mode of the
-    # image.  JPEG is colour blind, so we use some simple
-    # heuristics to map the number of layers to an appropriate
-    # mode.  Note that this could be made a bit brighter, by
-    # looking for JFIF and Adobe APP markers.
-
-    n = i16(self.fp.read(2))-2
-    s = ImageFile._safe_read(self.fp, n)
-    self.size = i16(s[3:]), i16(s[1:])
-
-    self.bits = ord(s[0])
-    if self.bits != 8:
-        raise SyntaxError("cannot handle %d-bit layers" % self.bits)
-
-    self.layers = ord(s[5])
-    if self.layers == 1:
-        self.mode = "L"
-    elif self.layers == 3:
-        self.mode = "RGB"
-    elif self.layers == 4:
-        self.mode = "CMYK"
-    else:
-        raise SyntaxError("cannot handle %d-layer images" % self.layers)
-
-    if marker in [0xFFC2, 0xFFC6, 0xFFCA, 0xFFCE]:
-        self.info["progression"] = 1
-
-    for i in range(6, len(s), 3):
-        t = s[i:i+3]
-        # 4-tuples: id, vsamp, hsamp, qtable
-        self.layer.append((t[0], ord(t[1])/16, ord(t[1])&15, ord(t[2])))
-
-def DQT(self, marker):
-    #
-    # Define quantization table.  Support baseline 8-bit tables
-    # only.  Note that there might be more than one table in
-    # each marker.
-
-    # FIXME: The quantization tables can be used to estimate the
-    # compression quality.
-
-    n = i16(self.fp.read(2))-2
-    s = ImageFile._safe_read(self.fp, n)
-    while len(s):
-        if len(s) < 65:
-            raise SyntaxError("bad quantization table marker")
-        v = ord(s[0])
-        if v/16 == 0:
-            self.quantization[v&15] = array.array("b", s[1:65])
-            s = s[65:]
-        else:
-            return # FIXME: add code to read 16-bit tables!
-            # raise SyntaxError, "bad quantization table element size"
-
-
-#
-# JPEG marker table
-
-MARKER = {
-    0xFFC0: ("SOF0", "Baseline DCT", SOF),
-    0xFFC1: ("SOF1", "Extended Sequential DCT", SOF),
-    0xFFC2: ("SOF2", "Progressive DCT", SOF),
-    0xFFC3: ("SOF3", "Spatial lossless", SOF),
-    0xFFC4: ("DHT", "Define Huffman table", Skip),
-    0xFFC5: ("SOF5", "Differential sequential DCT", SOF),
-    0xFFC6: ("SOF6", "Differential progressive DCT", SOF),
-    0xFFC7: ("SOF7", "Differential spatial", SOF),
-    0xFFC8: ("JPG", "Extension", None),
-    0xFFC9: ("SOF9", "Extended sequential DCT (AC)", SOF),
-    0xFFCA: ("SOF10", "Progressive DCT (AC)", SOF),
-    0xFFCB: ("SOF11", "Spatial lossless DCT (AC)", SOF),
-    0xFFCC: ("DAC", "Define arithmetic coding conditioning", Skip),
-    0xFFCD: ("SOF13", "Differential sequential DCT (AC)", SOF),
-    0xFFCE: ("SOF14", "Differential progressive DCT (AC)", SOF),
-    0xFFCF: ("SOF15", "Differential spatial (AC)", SOF),
-    0xFFD0: ("RST0", "Restart 0", None),
-    0xFFD1: ("RST1", "Restart 1", None),
-    0xFFD2: ("RST2", "Restart 2", None),
-    0xFFD3: ("RST3", "Restart 3", None),
-    0xFFD4: ("RST4", "Restart 4", None),
-    0xFFD5: ("RST5", "Restart 5", None),
-    0xFFD6: ("RST6", "Restart 6", None),
-    0xFFD7: ("RST7", "Restart 7", None),
-    0xFFD8: ("SOI", "Start of image", None),
-    0xFFD9: ("EOI", "End of image", None),
-    0xFFDA: ("SOS", "Start of scan", Skip),
-    0xFFDB: ("DQT", "Define quantization table", DQT),
-    0xFFDC: ("DNL", "Define number of lines", Skip),
-    0xFFDD: ("DRI", "Define restart interval", Skip),
-    0xFFDE: ("DHP", "Define hierarchical progression", SOF),
-    0xFFDF: ("EXP", "Expand reference component", Skip),
-    0xFFE0: ("APP0", "Application segment 0", APP),
-    0xFFE1: ("APP1", "Application segment 1", APP),
-    0xFFE2: ("APP2", "Application segment 2", APP),
-    0xFFE3: ("APP3", "Application segment 3", APP),
-    0xFFE4: ("APP4", "Application segment 4", APP),
-    0xFFE5: ("APP5", "Application segment 5", APP),
-    0xFFE6: ("APP6", "Application segment 6", APP),
-    0xFFE7: ("APP7", "Application segment 7", APP),
-    0xFFE8: ("APP8", "Application segment 8", APP),
-    0xFFE9: ("APP9", "Application segment 9", APP),
-    0xFFEA: ("APP10", "Application segment 10", APP),
-    0xFFEB: ("APP11", "Application segment 11", APP),
-    0xFFEC: ("APP12", "Application segment 12", APP),
-    0xFFED: ("APP13", "Application segment 13", APP),
-    0xFFEE: ("APP14", "Application segment 14", APP),
-    0xFFEF: ("APP15", "Application segment 15", APP),
-    0xFFF0: ("JPG0", "Extension 0", None),
-    0xFFF1: ("JPG1", "Extension 1", None),
-    0xFFF2: ("JPG2", "Extension 2", None),
-    0xFFF3: ("JPG3", "Extension 3", None),
-    0xFFF4: ("JPG4", "Extension 4", None),
-    0xFFF5: ("JPG5", "Extension 5", None),
-    0xFFF6: ("JPG6", "Extension 6", None),
-    0xFFF7: ("JPG7", "Extension 7", None),
-    0xFFF8: ("JPG8", "Extension 8", None),
-    0xFFF9: ("JPG9", "Extension 9", None),
-    0xFFFA: ("JPG10", "Extension 10", None),
-    0xFFFB: ("JPG11", "Extension 11", None),
-    0xFFFC: ("JPG12", "Extension 12", None),
-    0xFFFD: ("JPG13", "Extension 13", None),
-    0xFFFE: ("COM", "Comment", COM)
-}
-
-
-def _accept(prefix):
-    return prefix[0] == "\377"
-
-##
-# Image plugin for JPEG and JFIF images.
-
-class JpegImageFile(ImageFile.ImageFile):
-
-    format = "JPEG"
-    format_description = "JPEG (ISO 10918)"
-
-    def _open(self):
-
-        s = self.fp.read(1)
-
-        if ord(s[0]) != 255:
-            raise SyntaxError("not a JPEG file")
-
-        # Create attributes
-        self.bits = self.layers = 0
-
-        # JPEG specifics (internal)
-        self.layer = []
-        self.huffman_dc = {}
-        self.huffman_ac = {}
-        self.quantization = {}
-        self.app = {} # compatibility
-        self.applist = []
-
-        while 1:
-
-            s = s + self.fp.read(1)
-
-            i = i16(s)
-
-            if MARKER.has_key(i):
-                name, description, handler = MARKER[i]
-                # print hex(i), name, description
-                if handler is not None:
-                    handler(self, i)
-                if i == 0xFFDA: # start of scan
-                    rawmode = self.mode
-                    if self.mode == "CMYK":
-                        rawmode = "CMYK;I"
-                    self.tile = [("jpeg", (0,0) + self.size, 0, (rawmode, ""))]
-                    # self.__offset = self.fp.tell()
-                    break
-                s = self.fp.read(1)
-            elif i == 0 or i == 65535:
-                # padded marker or junk; move on
-                s = "\xff"
-            else:
-                raise SyntaxError("no marker found")
-
-    def draft(self, mode, size):
-
-        if len(self.tile) != 1:
-            return
-
-        d, e, o, a = self.tile[0]
-        scale = 0
-
-        if a[0] == "RGB" and mode in ["L", "YCbCr"]:
-            self.mode = mode
-            a = mode, ""
-
-        if size:
-            scale = max(self.size[0] / size[0], self.size[1] / size[1])
-            for s in [8, 4, 2, 1]:
-                if scale >= s:
-                    break
-            e = e[0], e[1], (e[2]-e[0]+s-1)/s+e[0], (e[3]-e[1]+s-1)/s+e[1]
-            self.size = ((self.size[0]+s-1)/s, (self.size[1]+s-1)/s)
-            scale = s
-
-        self.tile = [(d, e, o, a)]
-        self.decoderconfig = (scale, 1)
-
-        return self
-
-    def load_djpeg(self):
-
-        # ALTERNATIVE: handle JPEGs via the IJG command line utilities
-
-        import tempfile, os
-        file = tempfile.mktemp()
-        os.system("djpeg %s >%s" % (self.filename, file))
-
-        try:
-            self.im = Image.core.open_ppm(file)
-        finally:
-            try: os.unlink(file)
-            except: pass
-
-        self.mode = self.im.mode
-        self.size = self.im.size
-
-        self.tile = []
-
-    def _getexif(self):
-        # Extract EXIF information.  This method is highly experimental,
-        # and is likely to be replaced with something better in a future
-        # version.
-        import TiffImagePlugin, StringIO
-        def fixup(value):
-            if len(value) == 1:
-                return value[0]
-            return value
-        # The EXIF record consists of a TIFF file embedded in a JPEG
-        # application marker (!).
-        try:
-            data = self.info["exif"]
-        except KeyError:
-            return None
-        file = StringIO.StringIO(data[6:])
-        head = file.read(8)
-        exif = {}
-        # process dictionary
-        info = TiffImagePlugin.ImageFileDirectory(head)
-        info.load(file)
-        for key, value in info.items():
-            exif[key] = fixup(value)
-        # get exif extension
-        file.seek(exif[0x8769])
-        info = TiffImagePlugin.ImageFileDirectory(head)
-        info.load(file)
-        for key, value in info.items():
-            exif[key] = fixup(value)
-        # get gpsinfo extension
-        try:
-            file.seek(exif[0x8825])
-        except KeyError:
-            pass
-        else:
-            info = TiffImagePlugin.ImageFileDirectory(head)
-            info.load(file)
-            exif[0x8825] = gps = {}
-            for key, value in info.items():
-                gps[key] = fixup(value)
-        return exif
-
-# --------------------------------------------------------------------
-# stuff to save JPEG files
-
-RAWMODE = {
-    "1": "L",
-    "L": "L",
-    "RGB": "RGB",
-    "RGBA": "RGB",
-    "RGBX": "RGB",
-    "CMYK": "CMYK;I",
-    "YCbCr": "YCbCr",
-}
-
-def _save(im, fp, filename):
-
-    try:
-        rawmode = RAWMODE[im.mode]
-    except KeyError:
-        raise IOError("cannot write mode %s as JPEG" % im.mode)
-
-    info = im.encoderinfo
-
-    dpi = info.get("dpi", (0, 0))
-
-    # get keyword arguments
-    im.encoderconfig = (
-        info.get("quality", 0),
-        # "progressive" is the official name, but older documentation
-        # says "progression"
-        # FIXME: issue a warning if the wrong form is used (post-1.1.5)
-        info.has_key("progressive") or info.has_key("progression"),
-        info.get("smooth", 0),
-        info.has_key("optimize"),
-        info.get("streamtype", 0),
-        dpi[0], dpi[1]
-        )
-
-    ImageFile._save(im, fp, [("jpeg", (0,0)+im.size, 0, rawmode)])
-
-def _save_cjpeg(im, fp, filename):
-    # ALTERNATIVE: handle JPEGs via the IJG command line utilities.
-    import os
-    file = im._dump()
-    os.system("cjpeg %s >%s" % (file, filename))
-    try: os.unlink(file)
-    except: pass
-
-# -------------------------------------------------------------------q-
-# Registry stuff
-
-Image.register_open("JPEG", JpegImageFile, _accept)
-Image.register_save("JPEG", _save)
-
-Image.register_extension("JPEG", ".jfif")
-Image.register_extension("JPEG", ".jpe")
-Image.register_extension("JPEG", ".jpg")
-Image.register_extension("JPEG", ".jpeg")
-
-Image.register_mime("JPEG", "image/jpeg")
diff --git a/pythonPackages/pil/PIL/McIdasImagePlugin.py b/pythonPackages/pil/PIL/McIdasImagePlugin.py
deleted file mode 100644
index b3b48ec966..0000000000
--- a/pythonPackages/pil/PIL/McIdasImagePlugin.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: McIdasImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# Basic McIdas support for PIL
-#
-# History:
-#       97-05-05 fl     Created (8-bit images only)
-#
-# Thanks to Richard Jones <richard.jones@bom.gov.au> for specs
-# and samples.
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1997.
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.1"
-
-import string
-
-import Image, ImageFile
-
-def i16(c,i=0):
-    return ord(c[1+i])+(ord(c[i])<<8)
-
-def i32(c,i=0):
-    return ord(c[3+i])+(ord(c[2+i])<<8)+(ord(c[1+i])<<16)+(ord(c[i])<<24)
-
-def _accept(s):
-    return i32(s) == 0 and i32(s, 4) == 4
-
-##
-# Image plugin for McIdas area images.
-
-class McIdasImageFile(ImageFile.ImageFile):
-
-    format = "MCIDAS"
-    format_description = "McIdas area file"
-
-    def _open(self):
-
-        # parse area file directory
-        s = self.fp.read(256)
-        if not _accept(s):
-            raise SyntaxError, "not an McIdas area file"
-
-        # get mode
-        if i32(s, 40) != 1 or i32(s, 52) != 1:
-            raise SyntaxError, "unsupported McIdas format"
-
-        self.mode = "L"
-
-        # get size
-        self.size = i32(s, 36), i32(s, 32)
-
-        # setup image descriptor
-        prefix = i32(s, 56)
-        offset = i32(s, 132)
-
-        self.tile = [("raw", (0, 0) + self.size, offset,
-                     ("L", prefix + self.size[0], 1))]
-
-        # FIXME: should store the navigation and calibration blocks
-        # somewhere (or perhaps extract some basic information from
-        # them...)
-
-# --------------------------------------------------------------------
-# registry
-
-Image.register_open("MCIDAS", McIdasImageFile, _accept)
-
-# no default extension
diff --git a/pythonPackages/pil/PIL/MicImagePlugin.py b/pythonPackages/pil/PIL/MicImagePlugin.py
deleted file mode 100644
index b7b108e4e7..0000000000
--- a/pythonPackages/pil/PIL/MicImagePlugin.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: MicImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# Microsoft Image Composer support for PIL
-#
-# Notes:
-#       uses TiffImagePlugin.py to read the actual image streams
-#
-# History:
-#       97-01-20 fl     Created
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1997.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.1"
-
-import string
-
-import Image, TiffImagePlugin
-from OleFileIO import *
-
-
-#
-# --------------------------------------------------------------------
-
-
-def _accept(prefix):
-    return prefix[:8] == MAGIC
-
-##
-# Image plugin for Microsoft's Image Composer file format.
-
-class MicImageFile(TiffImagePlugin.TiffImageFile):
-
-    format = "MIC"
-    format_description = "Microsoft Image Composer"
-
-    def _open(self):
-
-        # read the OLE directory and see if this is a likely
-        # to be a Microsoft Image Composer file
-
-        try:
-            self.ole = OleFileIO(self.fp)
-        except IOError:
-            raise SyntaxError, "not an MIC file; invalid OLE file"
-
-        # find ACI subfiles with Image members (maybe not the
-        # best way to identify MIC files, but what the... ;-)
-
-        self.images = []
-        for file in self.ole.listdir():
-            if file[1:] and file[0][-4:] == ".ACI" and file[1] == "Image":
-                self.images.append(file)
-
-        # if we didn't find any images, this is probably not
-        # an MIC file.
-        if not self.images:
-            raise SyntaxError, "not an MIC file; no image entries"
-
-        self.__fp = self.fp
-        self.frame = 0
-
-        if len(self.images) > 1:
-            self.category = Image.CONTAINER
-
-        self.seek(0)
-
-    def seek(self, frame):
-
-        try:
-            filename = self.images[frame]
-        except IndexError:
-            raise EOFError, "no such frame"
-
-        self.fp = self.ole.openstream(filename)
-
-        TiffImagePlugin.TiffImageFile._open(self)
-
-        self.frame = frame
-
-    def tell(self):
-
-        return self.frame
-
-#
-# --------------------------------------------------------------------
-
-Image.register_open("MIC", MicImageFile, _accept)
-
-Image.register_extension("MIC", ".mic")
diff --git a/pythonPackages/pil/PIL/MpegImagePlugin.py b/pythonPackages/pil/PIL/MpegImagePlugin.py
deleted file mode 100644
index 9623c7a972..0000000000
--- a/pythonPackages/pil/PIL/MpegImagePlugin.py
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: MpegImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# MPEG file handling
-#
-# History:
-#       95-09-09 fl     Created
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1995.
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.1"
-
-import array, string
-import Image, ImageFile
-
-#
-# Bitstream parser
-
-class BitStream:
-
-    def __init__(self, fp):
-        self.fp = fp
-        self.bits = 0
-        self.bitbuffer = 0
-
-    def next(self):
-        return ord(self.fp.read(1))
-
-    def peek(self, bits):
-        while self.bits < bits:
-            c = self.next()
-            if c < 0:
-                self.bits = 0
-                continue
-            self.bitbuffer = (self.bitbuffer << 8) + c
-            self.bits = self.bits + 8
-        return self.bitbuffer >> (self.bits - bits) & (1L << bits) - 1
-
-    def skip(self, bits):
-        while self.bits < bits:
-            self.bitbuffer = (self.bitbuffer << 8) + ord(self.fp.read(1))
-            self.bits = self.bits + 8
-        self.bits = self.bits - bits
-
-    def read(self, bits):
-        v = self.peek(bits)
-        self.bits = self.bits - bits
-        return v
-
-##
-# Image plugin for MPEG streams.  This plugin can identify a stream,
-# but it cannot read it.
-
-class MpegImageFile(ImageFile.ImageFile):
-
-    format = "MPEG"
-    format_description = "MPEG"
-
-    def _open(self):
-
-        s = BitStream(self.fp)
-
-        if s.read(32) != 0x1B3:
-            raise SyntaxError, "not an MPEG file"
-
-        self.mode = "RGB"
-        self.size = s.read(12), s.read(12)
-
-
-# --------------------------------------------------------------------
-# Registry stuff
-
-Image.register_open("MPEG", MpegImageFile)
-
-Image.register_extension("MPEG", ".mpg")
-Image.register_extension("MPEG", ".mpeg")
-
-Image.register_mime("MPEG", "video/mpeg")
diff --git a/pythonPackages/pil/PIL/MspImagePlugin.py b/pythonPackages/pil/PIL/MspImagePlugin.py
deleted file mode 100644
index 40aac19f07..0000000000
--- a/pythonPackages/pil/PIL/MspImagePlugin.py
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: MspImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# MSP file handling
-#
-# This is the format used by the Paint program in Windows 1 and 2.
-#
-# History:
-#       95-09-05 fl     Created
-#       97-01-03 fl     Read/write MSP images
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1995-97.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.1"
-
-import Image, ImageFile
-
-
-#
-# read MSP files
-
-def i16(c):
-    return ord(c[0]) + (ord(c[1])<<8)
-
-def _accept(prefix):
-    return prefix[:4] in ["DanM", "LinS"]
-
-##
-# Image plugin for Windows MSP images.  This plugin supports both
-# uncompressed (Windows 1.0).
-
-class MspImageFile(ImageFile.ImageFile):
-
-    format = "MSP"
-    format_description = "Windows Paint"
-
-    def _open(self):
-
-        # Header
-        s = self.fp.read(32)
-        if s[:4] not in ["DanM", "LinS"]:
-            raise SyntaxError, "not an MSP file"
-
-        # Header checksum
-        sum = 0
-        for i in range(0, 32, 2):
-            sum = sum ^ i16(s[i:i+2])
-        if sum != 0:
-            raise SyntaxError, "bad MSP checksum"
-
-        self.mode = "1"
-        self.size = i16(s[4:]), i16(s[6:])
-
-        if s[:4] == "DanM":
-            self.tile = [("raw", (0,0)+self.size, 32, ("1", 0, 1))]
-        else:
-            self.tile = [("msp", (0,0)+self.size, 32+2*self.size[1], None)]
-
-#
-# write MSP files (uncompressed only)
-
-def o16(i):
-    return chr(i&255) + chr(i>>8&255)
-
-def _save(im, fp, filename):
-
-    if im.mode != "1":
-        raise IOError, "cannot write mode %s as MSP" % im.mode
-
-    # create MSP header
-    header = [0] * 16
-
-    header[0], header[1] = i16("Da"), i16("nM") # version 1
-    header[2], header[3] = im.size
-    header[4], header[5] = 1, 1
-    header[6], header[7] = 1, 1
-    header[8], header[9] = im.size
-
-    sum = 0
-    for h in header:
-        sum = sum ^ h
-    header[12] = sum # FIXME: is this the right field?
-
-    # header
-    for h in header:
-        fp.write(o16(h))
-
-    # image body
-    ImageFile._save(im, fp, [("raw", (0,0)+im.size, 32, ("1", 0, 1))])
-
-#
-# registry
-
-Image.register_open("MSP", MspImageFile, _accept)
-Image.register_save("MSP", _save)
-
-Image.register_extension("MSP", ".msp")
diff --git a/pythonPackages/pil/PIL/OleFileIO.py b/pythonPackages/pil/PIL/OleFileIO.py
deleted file mode 100644
index 9383eca766..0000000000
--- a/pythonPackages/pil/PIL/OleFileIO.py
+++ /dev/null
@@ -1,528 +0,0 @@
-#
-# THIS IS WORK IN PROGRESS
-#
-# The Python Imaging Library
-# $Id: OleFileIO.py 2339 2005-03-25 08:02:17Z fredrik $
-#
-# stuff to deal with OLE2 Structured Storage files.  this module is
-# used by PIL to read Image Composer and FlashPix files, but can also
-# be used to read other files of this type.
-#
-# History:
-# 1997-01-20 fl   Created
-# 1997-01-22 fl   Fixed 64-bit portability quirk
-# 2003-09-09 fl   Fixed typo in OleFileIO.loadfat (noted by Daniel Haertle)
-# 2004-02-29 fl   Changed long hex constants to signed integers
-#
-# Notes:
-# FIXME: sort out sign problem (eliminate long hex constants)
-# FIXME: change filename to use "a/b/c" instead of ["a", "b", "c"]
-# FIXME: provide a glob mechanism function (using fnmatchcase)
-#
-# Literature:
-#
-# "FlashPix Format Specification, Appendix A", Kodak and Microsoft,
-#  September 1996.
-#
-# Quotes:
-#
-# "If this document and functionality of the Software conflict,
-#  the actual functionality of the Software represents the correct
-#  functionality" -- Microsoft, in the OLE format specification
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1997.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import string, StringIO
-
-
-def i16(c, o = 0):
-    return ord(c[o])+(ord(c[o+1])<<8)
-
-def i32(c, o = 0):
-    return ord(c[o])+(ord(c[o+1])<<8)+(ord(c[o+2])<<16)+(ord(c[o+3])<<24)
-
-
-MAGIC = '\320\317\021\340\241\261\032\341'
-
-#
-# --------------------------------------------------------------------
-# property types
-
-VT_EMPTY=0; VT_NULL=1; VT_I2=2; VT_I4=3; VT_R4=4; VT_R8=5; VT_CY=6;
-VT_DATE=7; VT_BSTR=8; VT_DISPATCH=9; VT_ERROR=10; VT_BOOL=11;
-VT_VARIANT=12; VT_UNKNOWN=13; VT_DECIMAL=14; VT_I1=16; VT_UI1=17;
-VT_UI2=18; VT_UI4=19; VT_I8=20; VT_UI8=21; VT_INT=22; VT_UINT=23;
-VT_VOID=24; VT_HRESULT=25; VT_PTR=26; VT_SAFEARRAY=27; VT_CARRAY=28;
-VT_USERDEFINED=29; VT_LPSTR=30; VT_LPWSTR=31; VT_FILETIME=64;
-VT_BLOB=65; VT_STREAM=66; VT_STORAGE=67; VT_STREAMED_OBJECT=68;
-VT_STORED_OBJECT=69; VT_BLOB_OBJECT=70; VT_CF=71; VT_CLSID=72;
-VT_VECTOR=0x1000;
-
-# map property id to name (for debugging purposes)
-
-VT = {}
-for k, v in vars().items():
-    if k[:3] == "VT_":
-        VT[v] = k
-
-#
-# --------------------------------------------------------------------
-# Some common document types (root.clsid fields)
-
-WORD_CLSID = "00020900-0000-0000-C000-000000000046"
-
-
-#
-# --------------------------------------------------------------------
-
-class _OleStream(StringIO.StringIO):
-
-    """OLE2 Stream
-
-    Returns a read-only file object which can be used to read
-    the contents of a OLE stream.  To open a stream, use the
-    openstream method in the OleFile class.
-
-    This function can be used with either ordinary streams,
-    or ministreams, depending on the offset, sectorsize, and
-    fat table arguments.
-    """
-
-    # FIXME: should store the list of sects obtained by following
-    # the fat chain, and load new sectors on demand instead of
-    # loading it all in one go.
-
-    def __init__(self, fp, sect, size, offset, sectorsize, fat):
-
-        data = []
-
-        while sect != -2: # 0xFFFFFFFEL:
-            fp.seek(offset + sectorsize * sect)
-            data.append(fp.read(sectorsize))
-            sect = fat[sect]
-
-        data = string.join(data, "")
-
-        # print len(data), size
-
-        StringIO.StringIO.__init__(self, data[:size])
-
-#
-# --------------------------------------------------------------------
-
-# FIXME: should add a counter in here to avoid looping forever
-# if the tree is broken.
-
-class _OleDirectoryEntry:
-
-    """OLE2 Directory Entry
-
-    Encapsulates a stream directory entry.  Note that the
-    constructor builds a tree of all subentries, so we only
-    have to call it with the root object.
-    """
-
-    def __init__(self, sidlist, sid):
-
-        # store directory parameters.  the caller provides
-        # a complete list of directory entries, as read from
-        # the directory stream.
-
-        name, type, sect, size, sids, clsid = sidlist[sid]
-
-        self.sid  = sid
-        self.name = name
-        self.type = type # 1=storage 2=stream
-        self.sect = sect
-        self.size = size
-        self.clsid = clsid
-
-        # process child nodes, if any
-
-        self.kids = []
-
-        sid = sidlist[sid][4][2]
-
-        if sid != -1:
-
-            # the directory entries are organized as a red-black tree.
-            # the following piece of code does an ordered traversal of
-            # such a tree (at least that's what I hope ;-)
-
-            stack = [self.sid]
-
-            # start at leftmost position
-
-            left, right, child = sidlist[sid][4]
-
-            while left != -1: # 0xFFFFFFFFL:
-                stack.append(sid)
-                sid = left
-                left, right, child = sidlist[sid][4]
-
-            while sid != self.sid:
-
-                self.kids.append(_OleDirectoryEntry(sidlist, sid))
-
-                # try to move right
-                left, right, child = sidlist[sid][4]
-                if right != -1: # 0xFFFFFFFFL:
-                    # and then back to the left
-                    sid = right
-                    while 1:
-                        left, right, child = sidlist[sid][4]
-                        if left == -1: # 0xFFFFFFFFL:
-                            break
-                        stack.append(sid)
-                        sid = left
-                else:
-                    # couldn't move right; move up instead
-                    while 1:
-                        ptr = stack[-1]
-                        del stack[-1]
-                        left, right, child = sidlist[ptr][4]
-                        if right != sid:
-                            break
-                        sid = right
-                    left, right, child = sidlist[sid][4]
-                    if right != ptr:
-                        sid = ptr
-
-            # in the OLE file, entries are sorted on (length, name).
-            # for convenience, we sort them on name instead.
-
-            self.kids.sort()
-
-    def __cmp__(self, other):
-        "Compare entries by name"
-
-        return cmp(self.name, other.name)
-
-    def dump(self, tab = 0):
-        "Dump this entry, and all its subentries (for debug purposes only)"
-
-        TYPES = ["(invalid)", "(storage)", "(stream)", "(lockbytes)",
-                 "(property)", "(root)"]
-
-        print " "*tab + repr(self.name), TYPES[self.type],
-        if self.type in (2, 5):
-            print self.size, "bytes",
-        print
-        if self.type in (1, 5) and self.clsid:
-            print " "*tab + "{%s}" % self.clsid
-
-        for kid in self.kids:
-            kid.dump(tab + 2)
-
-#
-# --------------------------------------------------------------------
-
-##
-# This class encapsulates the interface to an OLE 2 structured
-# storage file.  Use the {@link listdir} and {@link openstream}
-# methods to access the contents of this file.
-
-class OleFileIO:
-    """OLE container object
-
-    This class encapsulates the interface to an OLE 2 structured
-    storage file.  Use the listdir and openstream methods to access
-    the contents of this file.
-
-    Object names are given as a list of strings, one for each subentry
-    level.  The root entry should be omitted.  For example, the following
-    code extracts all image streams from a Microsoft Image Composer file:
-
-        ole = OleFileIO("fan.mic")
-
-        for entry in ole.listdir():
-            if entry[1:2] == "Image":
-                fin = ole.openstream(entry)
-                fout = open(entry[0:1], "wb")
-                while 1:
-                    s = fin.read(8192)
-                    if not s:
-                        break
-                    fout.write(s)
-
-    You can use the viewer application provided with the Python Imaging
-    Library to view the resulting files (which happens to be standard
-    TIFF files).
-    """
-
-    def __init__(self, filename = None):
-
-        if filename:
-            self.open(filename)
-
-    ##
-    # Open an OLE2 file.
-
-    def open(self, filename):
-        """Open an OLE2 file"""
-
-        if type(filename) == type(""):
-            self.fp = open(filename, "rb")
-        else:
-            self.fp = filename
-
-        header = self.fp.read(512)
-
-        if len(header) != 512 or header[:8] != MAGIC:
-            raise IOError, "not an OLE2 structured storage file"
-
-        # file clsid (probably never used, so we don't store it)
-        clsid = self._clsid(header[8:24])
-
-        # FIXME: could check version and byte order fields
-
-        self.sectorsize = 1 << i16(header, 30)
-        self.minisectorsize = 1 << i16(header, 32)
-
-        self.minisectorcutoff = i32(header, 56)
-
-        # Load file allocation tables
-        self.loadfat(header)
-
-        # Load direcory.  This sets both the sidlist (ordered by id)
-        # and the root (ordered by hierarchy) members.
-        self.loaddirectory(i32(header, 48))
-
-        self.ministream = None
-        self.minifatsect = i32(header, 60)
-
-    def loadfat(self, header):
-        # Load the FAT table.  The header contains a sector numbers
-        # for the first 109 FAT sectors.  Additional sectors are
-        # described by DIF blocks (FIXME: not yet implemented)
-
-        sect = header[76:512]
-        fat = []
-        for i in range(0, len(sect), 4):
-            ix = i32(sect, i)
-            if ix == -2 or ix == -1: # ix == 0xFFFFFFFEL or ix == 0xFFFFFFFFL:
-                break
-            s = self.getsect(ix)
-            fat = fat + map(lambda i, s=s: i32(s, i), range(0, len(s), 4))
-        self.fat = fat
-
-    def loadminifat(self):
-        # Load the MINIFAT table.  This is stored in a standard sub-
-        # stream, pointed to by a header field.
-
-        s = self._open(self.minifatsect).read()
-
-        self.minifat = map(lambda i, s=s: i32(s, i), range(0, len(s), 4))
-
-    def getsect(self, sect):
-        # Read given sector
-
-        self.fp.seek(512 + self.sectorsize * sect)
-        return self.fp.read(self.sectorsize)
-
-    def _unicode(self, s):
-        # Map unicode string to Latin 1
-
-        # FIXME: some day, Python will provide an official way to handle
-        # Unicode strings, but until then, this will have to do...
-        return filter(ord, s)
-
-    def loaddirectory(self, sect):
-        # Load the directory.  The directory is stored in a standard
-        # substream, independent of its size.
-
-        # read directory stream
-        fp = self._open(sect)
-
-        # create list of sid entries
-        self.sidlist = []
-        while 1:
-            entry = fp.read(128)
-            if not entry:
-                break
-            type = ord(entry[66])
-            name = self._unicode(entry[0:0+i16(entry, 64)])
-            ptrs = i32(entry, 68), i32(entry, 72), i32(entry, 76)
-            sect, size = i32(entry, 116), i32(entry, 120)
-            clsid = self._clsid(entry[80:96])
-            self.sidlist.append((name, type, sect, size, ptrs, clsid))
-
-        # create hierarchical list of directory entries
-        self.root = _OleDirectoryEntry(self.sidlist, 0)
-
-    def dumpdirectory(self):
-        # Dump directory (for debugging only)
-
-        self.root.dump()
-
-    def _clsid(self, clsid):
-        if clsid == "\0" * len(clsid):
-            return ""
-        return (("%08X-%04X-%04X-%02X%02X-" + "%02X" * 6) %
-                ((i32(clsid, 0), i16(clsid, 4), i16(clsid, 6)) +
-                tuple(map(ord, clsid[8:16]))))
-
-    def _list(self, files, prefix, node):
-        # listdir helper
-
-        prefix = prefix + [node.name]
-        for entry in node.kids:
-            if entry.kids:
-                self._list(files, prefix, entry)
-            else:
-                files.append(prefix[1:] + [entry.name])
-
-    def _find(self, filename):
-        # openstream helper
-
-        node = self.root
-        for name in filename:
-            for kid in node.kids:
-                if kid.name == name:
-                    break
-            else:
-                raise IOError, "file not found"
-            node = kid
-        return node.sid
-
-    def _open(self, start, size = 0x7FFFFFFF):
-        # openstream helper.
-
-        if size < self.minisectorcutoff:
-            # ministream object
-            if not self.ministream:
-                self.loadminifat()
-                self.ministream = self._open(self.sidlist[0][2])
-            return _OleStream(self.ministream, start, size, 0,
-                              self.minisectorsize, self.minifat)
-
-        # standard stream
-        return _OleStream(self.fp, start, size, 512,
-                          self.sectorsize, self.fat)
-
-    ##
-    # Returns a list of streams stored in this file.
-
-    def listdir(self):
-        """Return a list of streams stored in this file"""
-
-        files = []
-        self._list(files, [], self.root)
-        return files
-
-    ##
-    # Opens a stream as a read-only file object.
-
-    def openstream(self, filename):
-        """Open a stream as a read-only file object"""
-
-        slot = self._find(filename)
-        name, type, sect, size, sids, clsid = self.sidlist[slot]
-        if type != 2:
-            raise IOError, "this file is not a stream"
-        return self._open(sect, size)
-
-    ##
-    # Gets a list of properties described in substream.
-
-    def getproperties(self, filename):
-        """Return properties described in substream"""
-
-        fp = self.openstream(filename)
-
-        data = {}
-
-        # header
-        s = fp.read(28)
-        clsid = self._clsid(s[8:24])
-
-        # format id
-        s = fp.read(20)
-        fmtid = self._clsid(s[:16])
-        fp.seek(i32(s, 16))
-
-        # get section
-        s = "****" + fp.read(i32(fp.read(4))-4)
-
-        for i in range(i32(s, 4)):
-
-            id = i32(s, 8+i*8)
-            offset = i32(s, 12+i*8)
-            type = i32(s, offset)
-
-            # test for common types first (should perhaps use
-            # a dictionary instead?)
-
-            if type == VT_I2:
-                value = i16(s, offset+4)
-                if value >= 32768:
-                    value = value - 65536
-            elif type == VT_UI2:
-                value = i16(s, offset+4)
-            elif type in (VT_I4, VT_ERROR):
-                value = i32(s, offset+4)
-            elif type == VT_UI4:
-                value = i32(s, offset+4) # FIXME
-            elif type in (VT_BSTR, VT_LPSTR):
-                count = i32(s, offset+4)
-                value = s[offset+8:offset+8+count-1]
-            elif type == VT_BLOB:
-                count = i32(s, offset+4)
-                value = s[offset+8:offset+8+count]
-            elif type == VT_LPWSTR:
-                count = i32(s, offset+4)
-                value = self._unicode(s[offset+8:offset+8+count*2])
-            elif type == VT_FILETIME:
-                value = long(i32(s, offset+4)) + (long(i32(s, offset+8))<<32)
-                # FIXME: this is a 64-bit int: "number of 100ns periods
-                # since Jan 1,1601".  Should map this to Python time
-                value = value / 10000000L # seconds
-            elif type == VT_UI1:
-                value = ord(s[offset+4])
-            elif type == VT_CLSID:
-                value = self._clsid(s[offset+4:offset+20])
-            elif type == VT_CF:
-                count = i32(s, offset+4)
-                value = s[offset+8:offset+8+count]
-            else:
-                value = None # everything else yields "None"
-
-            # FIXME: add support for VT_VECTOR
-
-            #print "%08x" % id, repr(value),
-            #print "(%s)" % VT[i32(s, offset) & 0xFFF]
-
-            data[id] = value
-
-        return data
-
-#
-# --------------------------------------------------------------------
-# This script can be used to dump the directory of any OLE2 structured
-# storage file.
-
-if __name__ == "__main__":
-
-    import sys
-
-    for file in sys.argv[1:]:
-        try:
-            ole = OleFileIO(file)
-            print "-" * 68
-            print file
-            print "-" * 68
-            ole.dumpdirectory()
-            for file in ole.listdir():
-                if file[-1][0] == "\005":
-                    print file
-                    props = ole.getproperties(file)
-                    props = props.items()
-                    props.sort()
-                    for k, v in props:
-                        print "   ", k, v
-        except IOError, v:
-            print "***", "cannot read", file, "-", v
diff --git a/pythonPackages/pil/PIL/PSDraw.py b/pythonPackages/pil/PIL/PSDraw.py
deleted file mode 100644
index 7e88f557d9..0000000000
--- a/pythonPackages/pil/PIL/PSDraw.py
+++ /dev/null
@@ -1,199 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: PSDraw.py 2813 2006-10-07 10:11:35Z fredrik $
-#
-# simple postscript graphics interface
-#
-# History:
-# 1996-04-20 fl   Created
-# 1999-01-10 fl   Added gsave/grestore to image method
-# 2005-05-04 fl   Fixed floating point issue in image (from Eric Etheridge)
-#
-# Copyright (c) 1997-2005 by Secret Labs AB.  All rights reserved.
-# Copyright (c) 1996 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import EpsImagePlugin
-import string
-
-##
-# Simple Postscript graphics interface.
-
-class PSDraw:
-
-    def __init__(self, fp=None):
-        if not fp:
-            import sys
-            fp = sys.stdout
-        self.fp = fp
-
-    def begin_document(self, id = None):
-        "Write Postscript DSC header"
-        # FIXME: incomplete
-        self.fp.write("%!PS-Adobe-3.0\n"
-                      "save\n"
-                      "/showpage { } def\n"
-                      "%%EndComments\n"
-                      "%%BeginDocument\n")
-        #self.fp.write(ERROR_PS) # debugging!
-        self.fp.write(EDROFF_PS)
-        self.fp.write(VDI_PS)
-        self.fp.write("%%EndProlog\n")
-        self.isofont = {}
-
-    def end_document(self):
-        "Write Postscript DSC footer"
-        self.fp.write("%%EndDocument\n"
-                      "restore showpage\n"
-                      "%%End\n")
-        if hasattr(self.fp, "flush"):
-            self.fp.flush()
-
-    def setfont(self, font, size):
-        if not self.isofont.has_key(font):
-            # reencode font
-            self.fp.write("/PSDraw-%s ISOLatin1Encoding /%s E\n" %\
-                          (font, font))
-            self.isofont[font] = 1
-        # rough
-        self.fp.write("/F0 %d /PSDraw-%s F\n" % (size, font))
-
-    def setink(self, ink):
-        print "*** NOT YET IMPLEMENTED ***"
-
-    def line(self, xy0, xy1):
-        xy = xy0 + xy1
-        self.fp.write("%d %d %d %d Vl\n" % xy)
-
-    def rectangle(self, box):
-        self.fp.write("%d %d M %d %d 0 Vr\n" % box)
-
-    def text(self, xy, text):
-        text = string.joinfields(string.splitfields(text, "("), "\\(")
-        text = string.joinfields(string.splitfields(text, ")"), "\\)")
-        xy = xy + (text,)
-        self.fp.write("%d %d M (%s) S\n" % xy)
-
-    def image(self, box, im, dpi = None):
-        "Write an PIL image"
-        # default resolution depends on mode
-        if not dpi:
-            if im.mode == "1":
-                dpi = 200 # fax
-            else:
-                dpi = 100 # greyscale
-        # image size (on paper)
-        x = float(im.size[0] * 72) / dpi
-        y = float(im.size[1] * 72) / dpi
-        # max allowed size
-        xmax = float(box[2] - box[0])
-        ymax = float(box[3] - box[1])
-        if x > xmax:
-            y = y * xmax / x; x = xmax
-        if y > ymax:
-            x = x * ymax / y; y = ymax
-        dx = (xmax - x) / 2 + box[0]
-        dy = (ymax - y) / 2 + box[1]
-        self.fp.write("gsave\n%f %f translate\n" % (dx, dy))
-        if (x, y) != im.size:
-            # EpsImagePlugin._save prints the image at (0,0,xsize,ysize)
-            sx = x / im.size[0]
-            sy = y / im.size[1]
-            self.fp.write("%f %f scale\n" % (sx, sy))
-        EpsImagePlugin._save(im, self.fp, None, 0)
-        self.fp.write("\ngrestore\n")
-
-# --------------------------------------------------------------------
-# Postscript driver
-
-#
-# EDROFF.PS -- Postscript driver for Edroff 2
-#
-# History:
-# 94-01-25 fl: created (edroff 2.04)
-#
-# Copyright (c) Fredrik Lundh 1994.
-#
-
-EDROFF_PS = """\
-/S { show } bind def
-/P { moveto show } bind def
-/M { moveto } bind def
-/X { 0 rmoveto } bind def
-/Y { 0 exch rmoveto } bind def
-/E {    findfont
-        dup maxlength dict begin
-        {
-                1 index /FID ne { def } { pop pop } ifelse
-        } forall
-        /Encoding exch def
-        dup /FontName exch def
-        currentdict end definefont pop
-} bind def
-/F {    findfont exch scalefont dup setfont
-        [ exch /setfont cvx ] cvx bind def
-} bind def
-"""
-
-#
-# VDI.PS -- Postscript driver for VDI meta commands
-#
-# History:
-# 94-01-25 fl: created (edroff 2.04)
-#
-# Copyright (c) Fredrik Lundh 1994.
-#
-
-VDI_PS = """\
-/Vm { moveto } bind def
-/Va { newpath arcn stroke } bind def
-/Vl { moveto lineto stroke } bind def
-/Vc { newpath 0 360 arc closepath } bind def
-/Vr {   exch dup 0 rlineto
-        exch dup neg 0 exch rlineto
-        exch neg 0 rlineto
-        0 exch rlineto
-        100 div setgray fill 0 setgray } bind def
-/Tm matrix def
-/Ve {   Tm currentmatrix pop
-        translate scale newpath 0 0 .5 0 360 arc closepath
-        Tm setmatrix
-} bind def
-/Vf { currentgray exch setgray fill setgray } bind def
-"""
-
-#
-# ERROR.PS -- Error handler
-#
-# History:
-# 89-11-21 fl: created (pslist 1.10)
-#
-
-ERROR_PS = """\
-/landscape false def
-/errorBUF 200 string def
-/errorNL { currentpoint 10 sub exch pop 72 exch moveto } def
-errordict begin /handleerror {
-    initmatrix /Courier findfont 10 scalefont setfont
-    newpath 72 720 moveto $error begin /newerror false def
-    (PostScript Error) show errorNL errorNL
-    (Error: ) show
-        /errorname load errorBUF cvs show errorNL errorNL
-    (Command: ) show
-        /command load dup type /stringtype ne { errorBUF cvs } if show
-        errorNL errorNL
-    (VMstatus: ) show
-        vmstatus errorBUF cvs show ( bytes available, ) show
-        errorBUF cvs show ( bytes used at level ) show
-        errorBUF cvs show errorNL errorNL
-    (Operand stargck: ) show errorNL /ostargck load {
-        dup type /stringtype ne { errorBUF cvs } if 72 0 rmoveto show errorNL
-    } forall errorNL
-    (Execution stargck: ) show errorNL /estargck load {
-        dup type /stringtype ne { errorBUF cvs } if 72 0 rmoveto show errorNL
-    } forall
-    end showpage
-} def end
-"""
diff --git a/pythonPackages/pil/PIL/PaletteFile.py b/pythonPackages/pil/PIL/PaletteFile.py
deleted file mode 100644
index bbbebfaa18..0000000000
--- a/pythonPackages/pil/PIL/PaletteFile.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Python Imaging Library
-# $Id: PaletteFile.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# stuff to read simple, teragon-style palette files
-#
-# History:
-#       97-08-23 fl     Created
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1997.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import string
-
-##
-# File handler for Teragon-style palette files.
-
-class PaletteFile:
-
-    rawmode = "RGB"
-
-    def __init__(self, fp):
-
-        self.palette = map(lambda i: (i, i, i), range(256))
-
-        while 1:
-
-            s = fp.readline()
-
-            if not s:
-                break
-            if len(s) > 100:
-                raise SyntaxError, "bad palette file"
-
-            v = map(int, string.split(s))
-            try:
-                [i, r, g, b] = v
-            except ValueError:
-                [i, r] = v
-                g = b = r
-
-            if 0 <= i <= 255:
-                self.palette[i] = chr(r) + chr(g) + chr(b)
-
-        self.palette = string.join(self.palette, "")
-
-
-    def getpalette(self):
-
-        return self.palette, self.rawmode
diff --git a/pythonPackages/pil/PIL/PalmImagePlugin.py b/pythonPackages/pil/PIL/PalmImagePlugin.py
deleted file mode 100644
index 19f0c2f84b..0000000000
--- a/pythonPackages/pil/PIL/PalmImagePlugin.py
+++ /dev/null
@@ -1,226 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: PalmImagePlugin.py 2438 2005-05-25 21:09:48Z Fredrik $
-#
-
-##
-# Image plugin for Palm pixmap images (output only).
-##
-
-__version__ = "1.0"
-
-import Image, ImageFile
-import StringIO
-
-_Palm8BitColormapValues = (
-    ( 255, 255, 255 ), ( 255, 204, 255 ), ( 255, 153, 255 ), ( 255, 102, 255 ),
-    ( 255,  51, 255 ), ( 255,   0, 255 ), ( 255, 255, 204 ), ( 255, 204, 204 ),
-    ( 255, 153, 204 ), ( 255, 102, 204 ), ( 255,  51, 204 ), ( 255,   0, 204 ),
-    ( 255, 255, 153 ), ( 255, 204, 153 ), ( 255, 153, 153 ), ( 255, 102, 153 ),
-    ( 255,  51, 153 ), ( 255,   0, 153 ), ( 204, 255, 255 ), ( 204, 204, 255 ),
-    ( 204, 153, 255 ), ( 204, 102, 255 ), ( 204,  51, 255 ), ( 204,   0, 255 ),
-    ( 204, 255, 204 ), ( 204, 204, 204 ), ( 204, 153, 204 ), ( 204, 102, 204 ),
-    ( 204,  51, 204 ), ( 204,   0, 204 ), ( 204, 255, 153 ), ( 204, 204, 153 ),
-    ( 204, 153, 153 ), ( 204, 102, 153 ), ( 204,  51, 153 ), ( 204,   0, 153 ),
-    ( 153, 255, 255 ), ( 153, 204, 255 ), ( 153, 153, 255 ), ( 153, 102, 255 ),
-    ( 153,  51, 255 ), ( 153,   0, 255 ), ( 153, 255, 204 ), ( 153, 204, 204 ),
-    ( 153, 153, 204 ), ( 153, 102, 204 ), ( 153,  51, 204 ), ( 153,   0, 204 ),
-    ( 153, 255, 153 ), ( 153, 204, 153 ), ( 153, 153, 153 ), ( 153, 102, 153 ),
-    ( 153,  51, 153 ), ( 153,   0, 153 ), ( 102, 255, 255 ), ( 102, 204, 255 ),
-    ( 102, 153, 255 ), ( 102, 102, 255 ), ( 102,  51, 255 ), ( 102,   0, 255 ),
-    ( 102, 255, 204 ), ( 102, 204, 204 ), ( 102, 153, 204 ), ( 102, 102, 204 ),
-    ( 102,  51, 204 ), ( 102,   0, 204 ), ( 102, 255, 153 ), ( 102, 204, 153 ),
-    ( 102, 153, 153 ), ( 102, 102, 153 ), ( 102,  51, 153 ), ( 102,   0, 153 ),
-    (  51, 255, 255 ), (  51, 204, 255 ), (  51, 153, 255 ), (  51, 102, 255 ),
-    (  51,  51, 255 ), (  51,   0, 255 ), (  51, 255, 204 ), (  51, 204, 204 ),
-    (  51, 153, 204 ), (  51, 102, 204 ), (  51,  51, 204 ), (  51,   0, 204 ),
-    (  51, 255, 153 ), (  51, 204, 153 ), (  51, 153, 153 ), (  51, 102, 153 ),
-    (  51,  51, 153 ), (  51,   0, 153 ), (   0, 255, 255 ), (   0, 204, 255 ),
-    (   0, 153, 255 ), (   0, 102, 255 ), (   0,  51, 255 ), (   0,   0, 255 ),
-    (   0, 255, 204 ), (   0, 204, 204 ), (   0, 153, 204 ), (   0, 102, 204 ),
-    (   0,  51, 204 ), (   0,   0, 204 ), (   0, 255, 153 ), (   0, 204, 153 ),
-    (   0, 153, 153 ), (   0, 102, 153 ), (   0,  51, 153 ), (   0,   0, 153 ),
-    ( 255, 255, 102 ), ( 255, 204, 102 ), ( 255, 153, 102 ), ( 255, 102, 102 ),
-    ( 255,  51, 102 ), ( 255,   0, 102 ), ( 255, 255,  51 ), ( 255, 204,  51 ),
-    ( 255, 153,  51 ), ( 255, 102,  51 ), ( 255,  51,  51 ), ( 255,   0,  51 ),
-    ( 255, 255,   0 ), ( 255, 204,   0 ), ( 255, 153,   0 ), ( 255, 102,   0 ),
-    ( 255,  51,   0 ), ( 255,   0,   0 ), ( 204, 255, 102 ), ( 204, 204, 102 ),
-    ( 204, 153, 102 ), ( 204, 102, 102 ), ( 204,  51, 102 ), ( 204,   0, 102 ),
-    ( 204, 255,  51 ), ( 204, 204,  51 ), ( 204, 153,  51 ), ( 204, 102,  51 ),
-    ( 204,  51,  51 ), ( 204,   0,  51 ), ( 204, 255,   0 ), ( 204, 204,   0 ),
-    ( 204, 153,   0 ), ( 204, 102,   0 ), ( 204,  51,   0 ), ( 204,   0,   0 ),
-    ( 153, 255, 102 ), ( 153, 204, 102 ), ( 153, 153, 102 ), ( 153, 102, 102 ),
-    ( 153,  51, 102 ), ( 153,   0, 102 ), ( 153, 255,  51 ), ( 153, 204,  51 ),
-    ( 153, 153,  51 ), ( 153, 102,  51 ), ( 153,  51,  51 ), ( 153,   0,  51 ),
-    ( 153, 255,   0 ), ( 153, 204,   0 ), ( 153, 153,   0 ), ( 153, 102,   0 ),
-    ( 153,  51,   0 ), ( 153,   0,   0 ), ( 102, 255, 102 ), ( 102, 204, 102 ),
-    ( 102, 153, 102 ), ( 102, 102, 102 ), ( 102,  51, 102 ), ( 102,   0, 102 ),
-    ( 102, 255,  51 ), ( 102, 204,  51 ), ( 102, 153,  51 ), ( 102, 102,  51 ),
-    ( 102,  51,  51 ), ( 102,   0,  51 ), ( 102, 255,   0 ), ( 102, 204,   0 ),
-    ( 102, 153,   0 ), ( 102, 102,   0 ), ( 102,  51,   0 ), ( 102,   0,   0 ),
-    (  51, 255, 102 ), (  51, 204, 102 ), (  51, 153, 102 ), (  51, 102, 102 ),
-    (  51,  51, 102 ), (  51,   0, 102 ), (  51, 255,  51 ), (  51, 204,  51 ),
-    (  51, 153,  51 ), (  51, 102,  51 ), (  51,  51,  51 ), (  51,   0,  51 ),
-    (  51, 255,   0 ), (  51, 204,   0 ), (  51, 153,   0 ), (  51, 102,   0 ),
-    (  51,  51,   0 ), (  51,   0,   0 ), (   0, 255, 102 ), (   0, 204, 102 ),
-    (   0, 153, 102 ), (   0, 102, 102 ), (   0,  51, 102 ), (   0,   0, 102 ),
-    (   0, 255,  51 ), (   0, 204,  51 ), (   0, 153,  51 ), (   0, 102,  51 ),
-    (   0,  51,  51 ), (   0,   0,  51 ), (   0, 255,   0 ), (   0, 204,   0 ),
-    (   0, 153,   0 ), (   0, 102,   0 ), (   0,  51,   0 ), (  17,  17,  17 ),
-    (  34,  34,  34 ), (  68,  68,  68 ), (  85,  85,  85 ), ( 119, 119, 119 ),
-    ( 136, 136, 136 ), ( 170, 170, 170 ), ( 187, 187, 187 ), ( 221, 221, 221 ),
-    ( 238, 238, 238 ), ( 192, 192, 192 ), ( 128,   0,   0 ), ( 128,   0, 128 ),
-    (   0, 128,   0 ), (   0, 128, 128 ), (   0,   0,   0 ), (   0,   0,   0 ),
-    (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ),
-    (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ),
-    (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ),
-    (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ),
-    (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ),
-    (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ), (   0,   0,   0 ))
-
-# so build a prototype image to be used for palette resampling
-def build_prototype_image():
-    image = Image.new("L", (1,len(_Palm8BitColormapValues),))
-    image.putdata(range(len(_Palm8BitColormapValues)))
-    palettedata = ()
-    for i in range(len(_Palm8BitColormapValues)):
-        palettedata = palettedata + _Palm8BitColormapValues[i]
-    for i in range(256 - len(_Palm8BitColormapValues)):
-        palettedata = palettedata + (0, 0, 0)
-    image.putpalette(palettedata)
-    return image
-
-Palm8BitColormapImage = build_prototype_image()
-
-# OK, we now have in Palm8BitColormapImage, a "P"-mode image with the right palette
-#
-# --------------------------------------------------------------------
-
-_FLAGS = {
-    "custom-colormap": 0x4000,
-    "is-compressed":   0x8000,
-    "has-transparent": 0x2000,
-    }
-
-_COMPRESSION_TYPES = {
-    "none":     0xFF,
-    "rle":      0x01,
-    "scanline": 0x00,
-    }
-
-def o16b(i):
-    return chr(i>>8&255) + chr(i&255)
-
-#
-# --------------------------------------------------------------------
-
-##
-# (Internal) Image save plugin for the Palm format.
-
-def _save(im, fp, filename, check=0):
-
-    if im.mode == "P":
-
-        # we assume this is a color Palm image with the standard colormap,
-        # unless the "info" dict has a "custom-colormap" field
-
-        rawmode = "P"
-        bpp = 8
-        version = 1
-
-    elif im.mode == "L" and im.encoderinfo.has_key("bpp") and im.encoderinfo["bpp"] in (1, 2, 4):
-
-        # this is 8-bit grayscale, so we shift it to get the high-order bits, and invert it because
-        # Palm does greyscale from white (0) to black (1)
-        bpp = im.encoderinfo["bpp"]
-        im = im.point(lambda x, shift=8-bpp, maxval=(1 << bpp)-1: maxval - (x >> shift))
-        # we ignore the palette here
-        im.mode = "P"
-        rawmode = "P;" + str(bpp)
-        version = 1
-
-    elif im.mode == "L" and im.info.has_key("bpp") and im.info["bpp"] in (1, 2, 4):
-
-        # here we assume that even though the inherent mode is 8-bit grayscale, only
-        # the lower bpp bits are significant.  We invert them to match the Palm.
-        bpp = im.info["bpp"]
-        im = im.point(lambda x, maxval=(1 << bpp)-1: maxval - (x & maxval))
-        # we ignore the palette here
-        im.mode = "P"
-        rawmode = "P;" + str(bpp)
-        version = 1
-
-    elif im.mode == "1":
-
-        # monochrome -- write it inverted, as is the Palm standard
-        rawmode = "1;I"
-        bpp = 1
-        version = 0
-
-    else:
-
-        raise IOError, "cannot write mode %s as Palm" % im.mode
-
-    if check:
-        return check
-
-    #
-    # make sure image data is available
-    im.load()
-
-    # write header
-
-    cols = im.size[0]
-    rows = im.size[1]
-
-    rowbytes = ((cols + (16/bpp - 1)) / (16 / bpp)) * 2;
-    transparent_index = 0
-    compression_type = _COMPRESSION_TYPES["none"]
-
-    flags = 0;
-    if im.mode == "P" and im.info.has_key("custom-colormap"):
-        flags = flags & _FLAGS["custom-colormap"]
-        colormapsize = 4 * 256 + 2;
-        colormapmode = im.palette.mode
-        colormap = im.getdata().getpalette()
-    else:
-        colormapsize = 0
-
-    if im.info.has_key("offset"):
-        offset = (rowbytes * rows + 16 + 3 + colormapsize) / 4;
-    else:
-        offset = 0
-
-    fp.write(o16b(cols) + o16b(rows) + o16b(rowbytes) + o16b(flags))
-    fp.write(chr(bpp))
-    fp.write(chr(version))
-    fp.write(o16b(offset))
-    fp.write(chr(transparent_index))
-    fp.write(chr(compression_type))
-    fp.write(o16b(0))   # reserved by Palm
-
-    # now write colormap if necessary
-
-    if colormapsize > 0:
-        fp.write(o16b(256))
-        for i in range(256):
-            fp.write(chr(i))
-            if colormapmode == 'RGB':
-                fp.write(chr(colormap[3 * i]) + chr(colormap[3 * i + 1]) + chr(colormap[3 * i + 2]))
-            elif colormapmode == 'RGBA':
-                fp.write(chr(colormap[4 * i]) + chr(colormap[4 * i + 1]) + chr(colormap[4 * i + 2]))
-
-    # now convert data to raw form
-    ImageFile._save(im, fp, [("raw", (0,0)+im.size, 0, (rawmode, rowbytes, 1))])
-
-    fp.flush()
-
-
-#
-# --------------------------------------------------------------------
-
-Image.register_save("Palm", _save)
-
-Image.register_extension("Palm", ".palm")
-
-Image.register_mime("Palm", "image/palm")
diff --git a/pythonPackages/pil/PIL/PcdImagePlugin.py b/pythonPackages/pil/PIL/PcdImagePlugin.py
deleted file mode 100644
index 957da24342..0000000000
--- a/pythonPackages/pil/PIL/PcdImagePlugin.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: PcdImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# PCD file handling
-#
-# History:
-#       96-05-10 fl     Created
-#       96-05-27 fl     Added draft mode (128x192, 256x384)
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1996.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.1"
-
-
-import Image, ImageFile
-
-##
-# Image plugin for PhotoCD images.  This plugin only reads the 768x512
-# image from the file; higher resolutions are encoded in a proprietary
-# encoding.
-
-class PcdImageFile(ImageFile.ImageFile):
-
-    format = "PCD"
-    format_description = "Kodak PhotoCD"
-
-    def _open(self):
-
-        # rough
-        self.fp.seek(2048)
-        s = self.fp.read(2048)
-
-        if s[:4] != "PCD_":
-            raise SyntaxError, "not a PCD file"
-
-        orientation = ord(s[1538]) & 3
-        if orientation == 1:
-            self.tile_post_rotate = 90 # hack
-        elif orientation == 3:
-            self.tile_post_rotate = -90
-
-        self.mode = "RGB"
-        self.size = 768, 512 # FIXME: not correct for rotated images!
-        self.tile = [("pcd", (0,0)+self.size, 96*2048, None)]
-
-    def draft(self, mode, size):
-
-        if len(self.tile) != 1:
-            return
-
-        d, e, o, a = self.tile[0]
-
-        if size:
-            scale = max(self.size[0] / size[0], self.size[1] / size[1])
-            for s, o in [(4,0*2048), (2,0*2048), (1,96*2048)]:
-                if scale >= s:
-                    break
-            # e = e[0], e[1], (e[2]-e[0]+s-1)/s+e[0], (e[3]-e[1]+s-1)/s+e[1]
-            # self.size = ((self.size[0]+s-1)/s, (self.size[1]+s-1)/s)
-
-        self.tile = [(d, e, o, a)]
-
-        return self
-
-#
-# registry
-
-Image.register_open("PCD", PcdImageFile)
-
-Image.register_extension("PCD", ".pcd")
diff --git a/pythonPackages/pil/PIL/PcfFontFile.py b/pythonPackages/pil/PIL/PcfFontFile.py
deleted file mode 100644
index 9a689b2468..0000000000
--- a/pythonPackages/pil/PIL/PcfFontFile.py
+++ /dev/null
@@ -1,256 +0,0 @@
-#
-# THIS IS WORK IN PROGRESS
-#
-# The Python Imaging Library
-# $Id: PcfFontFile.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# portable compiled font file parser
-#
-# history:
-# 1997-08-19 fl   created
-# 2003-09-13 fl   fixed loading of unicode fonts
-#
-# Copyright (c) 1997-2003 by Secret Labs AB.
-# Copyright (c) 1997-2003 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-import FontFile
-
-import string
-
-# --------------------------------------------------------------------
-# declarations
-
-PCF_MAGIC = 0x70636601 # "\x01fcp"
-
-PCF_PROPERTIES = (1<<0)
-PCF_ACCELERATORS = (1<<1)
-PCF_METRICS = (1<<2)
-PCF_BITMAPS = (1<<3)
-PCF_INK_METRICS = (1<<4)
-PCF_BDF_ENCODINGS = (1<<5)
-PCF_SWIDTHS = (1<<6)
-PCF_GLYPH_NAMES = (1<<7)
-PCF_BDF_ACCELERATORS = (1<<8)
-
-BYTES_PER_ROW = [
-    lambda bits: ((bits+7)  >> 3),
-    lambda bits: ((bits+15) >> 3) & ~1,
-    lambda bits: ((bits+31) >> 3) & ~3,
-    lambda bits: ((bits+63) >> 3) & ~7,
-]
-
-
-def l16(c):
-    return ord(c[0]) + (ord(c[1])<<8)
-def l32(c):
-    return ord(c[0]) + (ord(c[1])<<8) + (ord(c[2])<<16) + (ord(c[3])<<24)
-
-def b16(c):
-    return ord(c[1]) + (ord(c[0])<<8)
-def b32(c):
-    return ord(c[3]) + (ord(c[2])<<8) + (ord(c[1])<<16) + (ord(c[0])<<24)
-
-def sz(s, o):
-    return s[o:string.index(s, "\0", o)]
-
-##
-# Font file plugin for the X11 PCF format.
-
-class PcfFontFile(FontFile.FontFile):
-
-    name = "name"
-
-    def __init__(self, fp):
-
-        magic = l32(fp.read(4))
-        if magic != PCF_MAGIC:
-            raise SyntaxError, "not a PCF file"
-
-        FontFile.FontFile.__init__(self)
-
-        count = l32(fp.read(4))
-        self.toc = {}
-        for i in range(count):
-            type = l32(fp.read(4))
-            self.toc[type] = l32(fp.read(4)), l32(fp.read(4)), l32(fp.read(4))
-
-        self.fp = fp
-
-        self.info = self._load_properties()
-
-        metrics = self._load_metrics()
-        bitmaps = self._load_bitmaps(metrics)
-        encoding = self._load_encoding()
-
-        #
-        # create glyph structure
-
-        for ch in range(256):
-            ix = encoding[ch]
-            if ix is not None:
-                x, y, l, r, w, a, d, f = metrics[ix]
-                glyph = (w, 0), (l, d-y, x+l, d), (0, 0, x, y), bitmaps[ix]
-                self.glyph[ch] = glyph
-
-    def _getformat(self, tag):
-
-        format, size, offset = self.toc[tag]
-
-        fp = self.fp
-        fp.seek(offset)
-
-        format = l32(fp.read(4))
-
-        if format & 4:
-            i16, i32 = b16, b32
-        else:
-            i16, i32 = l16, l32
-
-        return fp, format, i16, i32
-
-    def _load_properties(self):
-
-        #
-        # font properties
-
-        properties = {}
-
-        fp, format, i16, i32 = self._getformat(PCF_PROPERTIES)
-
-        nprops = i32(fp.read(4))
-
-        # read property description
-        p = []
-        for i in range(nprops):
-            p.append((i32(fp.read(4)), ord(fp.read(1)), i32(fp.read(4))))
-        if nprops & 3:
-            fp.seek(4 - (nprops & 3), 1) # pad
-
-        data = fp.read(i32(fp.read(4)))
-
-        for k, s, v in p:
-            k = sz(data, k)
-            if s:
-                v = sz(data, v)
-            properties[k] = v
-
-        return properties
-
-    def _load_metrics(self):
-
-        #
-        # font metrics
-
-        metrics = []
-
-        fp, format, i16, i32 = self._getformat(PCF_METRICS)
-
-        append = metrics.append
-
-        if (format & 0xff00) == 0x100:
-
-            # "compressed" metrics
-            for i in range(i16(fp.read(2))):
-                left = ord(fp.read(1)) - 128
-                right = ord(fp.read(1)) - 128
-                width = ord(fp.read(1)) - 128
-                ascent = ord(fp.read(1)) - 128
-                descent = ord(fp.read(1)) - 128
-                xsize = right - left
-                ysize = ascent + descent
-                append(
-                    (xsize, ysize, left, right, width,
-                     ascent, descent, 0)
-                    )
-
-        else:
-
-            # "jumbo" metrics
-            for i in range(i32(fp.read(4))):
-                left = i16(fp.read(2))
-                right = i16(fp.read(2))
-                width = i16(fp.read(2))
-                ascent = i16(fp.read(2))
-                descent = i16(fp.read(2))
-                attributes = i16(fp.read(2))
-                xsize = right - left
-                ysize = ascent + descent
-                append(
-                    (xsize, ysize, left, right, width,
-                     ascent, descent, attributes)
-                    )
-
-        return metrics
-
-    def _load_bitmaps(self, metrics):
-
-        #
-        # bitmap data
-
-        bitmaps = []
-
-        fp, format, i16, i32 = self._getformat(PCF_BITMAPS)
-
-        nbitmaps = i32(fp.read(4))
-
-        if nbitmaps != len(metrics):
-            raise IOError, "Wrong number of bitmaps"
-
-        offsets = []
-        for i in range(nbitmaps):
-            offsets.append(i32(fp.read(4)))
-
-        bitmapSizes = []
-        for i in range(4):
-            bitmapSizes.append(i32(fp.read(4)))
-
-        byteorder = format & 4 # non-zero => MSB
-        bitorder  = format & 8 # non-zero => MSB
-        padindex  = format & 3
-
-        bitmapsize = bitmapSizes[padindex]
-        offsets.append(bitmapsize)
-
-        data = fp.read(bitmapsize)
-
-        pad  = BYTES_PER_ROW[padindex]
-        mode = "1;R"
-        if bitorder:
-            mode = "1"
-
-        for i in range(nbitmaps):
-            x, y, l, r, w, a, d, f = metrics[i]
-            b, e = offsets[i], offsets[i+1]
-            bitmaps.append(
-                Image.fromstring("1", (x, y), data[b:e], "raw", mode, pad(x))
-                )
-
-        return bitmaps
-
-    def _load_encoding(self):
-
-        # map character code to bitmap index
-        encoding = [None] * 256
-
-        fp, format, i16, i32 = self._getformat(PCF_BDF_ENCODINGS)
-
-        firstCol, lastCol = i16(fp.read(2)), i16(fp.read(2))
-        firstRow, lastRow = i16(fp.read(2)), i16(fp.read(2))
-
-        default = i16(fp.read(2))
-
-        nencoding = (lastCol - firstCol + 1) * (lastRow - firstRow + 1)
-
-        for i in range(nencoding):
-            encodingOffset = i16(fp.read(2))
-            if encodingOffset != 0xFFFF:
-                try:
-                    encoding[i+firstCol] = encodingOffset
-                except IndexError:
-                    break # only load ISO-8859-1 glyphs
-
-        return encoding
diff --git a/pythonPackages/pil/PIL/PcxImagePlugin.py b/pythonPackages/pil/PIL/PcxImagePlugin.py
deleted file mode 100644
index 8c0cd11705..0000000000
--- a/pythonPackages/pil/PIL/PcxImagePlugin.py
+++ /dev/null
@@ -1,167 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: PcxImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# PCX file handling
-#
-# This format was originally used by ZSoft's popular PaintBrush
-# program for the IBM PC.  It is also supported by many MS-DOS and
-# Windows applications, including the Windows PaintBrush program in
-# Windows 3.
-#
-# history:
-# 1995-09-01 fl   Created
-# 1996-05-20 fl   Fixed RGB support
-# 1997-01-03 fl   Fixed 2-bit and 4-bit support
-# 1999-02-03 fl   Fixed 8-bit support (broken in 1.0b1)
-# 1999-02-07 fl   Added write support
-# 2002-06-09 fl   Made 2-bit and 4-bit support a bit more robust
-# 2002-07-30 fl   Seek from to current position, not beginning of file
-# 2003-06-03 fl   Extract DPI settings (info["dpi"])
-#
-# Copyright (c) 1997-2003 by Secret Labs AB.
-# Copyright (c) 1995-2003 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.6"
-
-import Image, ImageFile, ImagePalette
-
-def i16(c,o):
-    return ord(c[o]) + (ord(c[o+1])<<8)
-
-def _accept(prefix):
-    return ord(prefix[0]) == 10 and ord(prefix[1]) in [0, 2, 3, 5]
-
-##
-# Image plugin for Paintbrush images.
-
-class PcxImageFile(ImageFile.ImageFile):
-
-    format = "PCX"
-    format_description = "Paintbrush"
-
-    def _open(self):
-
-        # header
-        s = self.fp.read(128)
-        if not _accept(s):
-            raise SyntaxError, "not a PCX file"
-
-        # image
-        bbox = i16(s,4), i16(s,6), i16(s,8)+1, i16(s,10)+1
-        if bbox[2] <= bbox[0] or bbox[3] <= bbox[1]:
-            raise SyntaxError, "bad PCX image size"
-
-        # format
-        version = ord(s[1])
-        bits = ord(s[3])
-        planes = ord(s[65])
-        stride = i16(s,66)
-
-        self.info["dpi"] = i16(s,12), i16(s,14)
-
-        if bits == 1 and planes == 1:
-            mode = rawmode = "1"
-
-        elif bits == 1 and planes in (2, 4):
-            mode = "P"
-            rawmode = "P;%dL" % planes
-            self.palette = ImagePalette.raw("RGB", s[16:64])
-
-        elif version == 5 and bits == 8 and planes == 1:
-            mode = rawmode = "L"
-            # FIXME: hey, this doesn't work with the incremental loader !!!
-            self.fp.seek(-769, 2)
-            s = self.fp.read(769)
-            if len(s) == 769 and ord(s[0]) == 12:
-                # check if the palette is linear greyscale
-                for i in range(256):
-                    if s[i*3+1:i*3+4] != chr(i)*3:
-                        mode = rawmode = "P"
-                        break
-                if mode == "P":
-                    self.palette = ImagePalette.raw("RGB", s[1:])
-            self.fp.seek(128)
-
-        elif version == 5 and bits == 8 and planes == 3:
-            mode = "RGB"
-            rawmode = "RGB;L"
-
-        else:
-            raise IOError, "unknown PCX mode"
-
-        self.mode = mode
-        self.size = bbox[2]-bbox[0], bbox[3]-bbox[1]
-
-        bbox = (0, 0) + self.size
-
-        self.tile = [("pcx", bbox, self.fp.tell(), (rawmode, planes * stride))]
-
-# --------------------------------------------------------------------
-# save PCX files
-
-SAVE = {
-    # mode: (version, bits, planes, raw mode)
-    "1": (2, 1, 1, "1"),
-    "L": (5, 8, 1, "L"),
-    "P": (5, 8, 1, "P"),
-    "RGB": (5, 8, 3, "RGB;L"),
-}
-
-def o16(i):
-    return chr(i&255) + chr(i>>8&255)
-
-def _save(im, fp, filename, check=0):
-
-    try:
-        version, bits, planes, rawmode = SAVE[im.mode]
-    except KeyError:
-        raise ValueError, "Cannot save %s images as PCX" % im.mode
-
-    if check:
-        return check
-
-    # bytes per plane
-    stride = (im.size[0] * bits + 7) / 8
-
-    # under windows, we could determine the current screen size with
-    # "Image.core.display_mode()[1]", but I think that's overkill...
-
-    screen = im.size
-
-    dpi = 100, 100
-
-    # PCX header
-    fp.write(
-        chr(10) + chr(version) + chr(1) + chr(bits) + o16(0) +
-        o16(0) + o16(im.size[0]-1) + o16(im.size[1]-1) + o16(dpi[0]) +
-        o16(dpi[1]) + chr(0)*24 + chr(255)*24 + chr(0) + chr(planes) +
-        o16(stride) + o16(1) + o16(screen[0]) + o16(screen[1]) +
-        chr(0)*54
-        )
-
-    assert fp.tell() == 128
-
-    ImageFile._save(im, fp, [("pcx", (0,0)+im.size, 0,
-                              (rawmode, bits*planes))])
-
-    if im.mode == "P":
-        # colour palette
-        fp.write(chr(12))
-        fp.write(im.im.getpalette("RGB", "RGB")) # 768 bytes
-    elif im.mode == "L":
-        # greyscale palette
-        fp.write(chr(12))
-        for i in range(256):
-            fp.write(chr(i)*3)
-
-# --------------------------------------------------------------------
-# registry
-
-Image.register_open("PCX", PcxImageFile, _accept)
-Image.register_save("PCX", _save)
-
-Image.register_extension("PCX", ".pcx")
diff --git a/pythonPackages/pil/PIL/PdfImagePlugin.py b/pythonPackages/pil/PIL/PdfImagePlugin.py
deleted file mode 100644
index 86567d69ac..0000000000
--- a/pythonPackages/pil/PIL/PdfImagePlugin.py
+++ /dev/null
@@ -1,210 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: PdfImagePlugin.py 2438 2005-05-25 21:09:48Z Fredrik $
-#
-# PDF (Acrobat) file handling
-#
-# History:
-# 1996-07-16 fl   Created
-# 1997-01-18 fl   Fixed header
-# 2004-02-21 fl   Fixes for 1/L/CMYK images, etc.
-# 2004-02-24 fl   Fixes for 1 and P images.
-#
-# Copyright (c) 1997-2004 by Secret Labs AB.  All rights reserved.
-# Copyright (c) 1996-1997 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-##
-# Image plugin for PDF images (output only).
-##
-
-__version__ = "0.4"
-
-import Image, ImageFile
-import StringIO
-
-
-#
-# --------------------------------------------------------------------
-
-# object ids:
-#  1. catalogue
-#  2. pages
-#  3. image
-#  4. page
-#  5. page contents
-
-def _obj(fp, obj, **dict):
-    fp.write("%d 0 obj\n" % obj)
-    if dict:
-        fp.write("<<\n")
-        for k, v in dict.items():
-            if v is not None:
-                fp.write("/%s %s\n" % (k, v))
-        fp.write(">>\n")
-
-def _endobj(fp):
-    fp.write("endobj\n")
-
-##
-# (Internal) Image save plugin for the PDF format.
-
-def _save(im, fp, filename):
-
-    #
-    # make sure image data is available
-    im.load()
-
-    xref = [0]*(5+1) # placeholders
-
-    fp.write("%PDF-1.2\n")
-    fp.write("% created by PIL PDF driver " + __version__ + "\n")
-
-    #
-    # Get image characteristics
-
-    width, height = im.size
-
-    # FIXME: Should replace ASCIIHexDecode with RunLengthDecode (packbits)
-    # or LZWDecode (tiff/lzw compression).  Note that PDF 1.2 also supports
-    # Flatedecode (zip compression).
-
-    bits = 8
-    params = None
-
-    if im.mode == "1":
-        filter = "/ASCIIHexDecode"
-        colorspace = "/DeviceGray"
-        procset = "/ImageB" # grayscale
-        bits = 1
-    elif im.mode == "L":
-        filter = "/DCTDecode"
-        # params = "<< /Predictor 15 /Columns %d >>" % (width-2)
-        colorspace = "/DeviceGray"
-        procset = "/ImageB" # grayscale
-    elif im.mode == "P":
-        filter = "/ASCIIHexDecode"
-        colorspace = "[ /Indexed /DeviceRGB 255 <"
-        palette = im.im.getpalette("RGB")
-        for i in range(256):
-            r = ord(palette[i*3])
-            g = ord(palette[i*3+1])
-            b = ord(palette[i*3+2])
-            colorspace = colorspace + "%02x%02x%02x " % (r, g, b)
-        colorspace = colorspace + "> ]"
-        procset = "/ImageI" # indexed color
-    elif im.mode == "RGB":
-        filter = "/DCTDecode"
-        colorspace = "/DeviceRGB"
-        procset = "/ImageC" # color images
-    elif im.mode == "CMYK":
-        filter = "/DCTDecode"
-        colorspace = "/DeviceCMYK"
-        procset = "/ImageC" # color images
-    else:
-        raise ValueError("cannot save mode %s" % im.mode)
-
-    #
-    # catalogue
-
-    xref[1] = fp.tell()
-    _obj(fp, 1, Type = "/Catalog",
-                Pages = "2 0 R")
-    _endobj(fp)
-
-    #
-    # pages
-
-    xref[2] = fp.tell()
-    _obj(fp, 2, Type = "/Pages",
-                Count = 1,
-                Kids = "[4 0 R]")
-    _endobj(fp)
-
-    #
-    # image
-
-    op = StringIO.StringIO()
-
-    if filter == "/ASCIIHexDecode":
-        if bits == 1:
-            # FIXME: the hex encoder doesn't support packed 1-bit
-            # images; do things the hard way...
-            data = im.tostring("raw", "1")
-            im = Image.new("L", (len(data), 1), None)
-            im.putdata(data)
-        ImageFile._save(im, op, [("hex", (0,0)+im.size, 0, im.mode)])
-    elif filter == "/DCTDecode":
-        ImageFile._save(im, op, [("jpeg", (0,0)+im.size, 0, im.mode)])
-    elif filter == "/FlateDecode":
-        ImageFile._save(im, op, [("zip", (0,0)+im.size, 0, im.mode)])
-    elif filter == "/RunLengthDecode":
-        ImageFile._save(im, op, [("packbits", (0,0)+im.size, 0, im.mode)])
-    else:
-        raise ValueError("unsupported PDF filter (%s)" % filter)
-
-    xref[3] = fp.tell()
-    _obj(fp, 3, Type = "/XObject",
-                Subtype = "/Image",
-                Width = width,
-                Height = height,
-                Length = len(op.getvalue()),
-                Filter = filter,
-                BitsPerComponent = bits,
-                DecodeParams = params,
-                ColorSpace = colorspace)
-
-    fp.write("stream\n")
-    fp.write(op.getvalue())
-    fp.write("\nendstream\n")
-
-    _endobj(fp)
-
-    #
-    # page
-
-    xref[4] = fp.tell()
-    _obj(fp, 4)
-    fp.write("<<\n/Type /Page\n/Parent 2 0 R\n"\
-             "/Resources <<\n/ProcSet [ /PDF %s ]\n"\
-             "/XObject << /image 3 0 R >>\n>>\n"\
-             "/MediaBox [ 0 0 %d %d ]\n/Contents 5 0 R\n>>\n" %\
-             (procset, width, height))
-    _endobj(fp)
-
-    #
-    # page contents
-
-    op = StringIO.StringIO()
-
-    op.write("q %d 0 0 %d 0 0 cm /image Do Q\n" % (width, height))
-
-    xref[5] = fp.tell()
-    _obj(fp, 5, Length = len(op.getvalue()))
-
-    fp.write("stream\n")
-    fp.write(op.getvalue())
-    fp.write("\nendstream\n")
-
-    _endobj(fp)
-
-    #
-    # trailer
-    startxref = fp.tell()
-    fp.write("xref\n0 %d\n0000000000 65535 f \n" % len(xref))
-    for x in xref[1:]:
-        fp.write("%010d 00000 n \n" % x)
-    fp.write("trailer\n<<\n/Size %d\n/Root 1 0 R\n>>\n" % len(xref))
-    fp.write("startxref\n%d\n%%%%EOF\n" % startxref)
-    fp.flush()
-
-#
-# --------------------------------------------------------------------
-
-Image.register_save("PDF", _save)
-
-Image.register_extension("PDF", ".pdf")
-
-Image.register_mime("PDF", "application/pdf")
diff --git a/pythonPackages/pil/PIL/PixarImagePlugin.py b/pythonPackages/pil/PIL/PixarImagePlugin.py
deleted file mode 100644
index d4b136f422..0000000000
--- a/pythonPackages/pil/PIL/PixarImagePlugin.py
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: PixarImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# PIXAR raster support for PIL
-#
-# history:
-#       97-01-29 fl     Created
-#
-# notes:
-#       This is incomplete; it is based on a few samples created with
-#       Photoshop 2.5 and 3.0, and a summary description provided by
-#       Greg Coats <gcoats@labiris.er.usgs.gov>.  Hopefully, "L" and
-#       "RGBA" support will be added in future versions.
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1997.
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.1"
-
-import Image, ImageFile
-
-#
-# helpers
-
-def i16(c):
-    return ord(c[0]) + (ord(c[1])<<8)
-
-def i32(c):
-    return ord(c[0]) + (ord(c[1])<<8) + (ord(c[2])<<16) + (ord(c[3])<<24)
-
-##
-# Image plugin for PIXAR raster images.
-
-class PixarImageFile(ImageFile.ImageFile):
-
-    format = "PIXAR"
-    format_description = "PIXAR raster image"
-
-    def _open(self):
-
-        # assuming a 4-byte magic label (FIXME: add "_accept" hook)
-        s = self.fp.read(4)
-        if s != "\200\350\000\000":
-            raise SyntaxError, "not a PIXAR file"
-
-        # read rest of header
-        s = s + self.fp.read(508)
-
-        self.size = i16(s[418:420]), i16(s[416:418])
-
-        # get channel/depth descriptions
-        mode = i16(s[424:426]), i16(s[426:428])
-
-        if mode == (14, 2):
-            self.mode = "RGB"
-        # FIXME: to be continued...
-
-        # create tile descriptor (assuming "dumped")
-        self.tile = [("raw", (0,0)+self.size, 1024, (self.mode, 0, 1))]
-
-#
-# --------------------------------------------------------------------
-
-Image.register_open("PIXAR", PixarImageFile)
-
-#
-# FIXME: what's the standard extension?
diff --git a/pythonPackages/pil/PIL/PngImagePlugin.py b/pythonPackages/pil/PIL/PngImagePlugin.py
deleted file mode 100644
index 0e8ce9f0d5..0000000000
--- a/pythonPackages/pil/PIL/PngImagePlugin.py
+++ /dev/null
@@ -1,558 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: PngImagePlugin.py 2203 2004-12-19 14:32:32Z fredrik $
-#
-# PNG support code
-#
-# See "PNG (Portable Network Graphics) Specification, version 1.0;
-# W3C Recommendation", 1996-10-01, Thomas Boutell (ed.).
-#
-# history:
-# 1996-05-06 fl   Created (couldn't resist it)
-# 1996-12-14 fl   Upgraded, added read and verify support (0.2)
-# 1996-12-15 fl   Separate PNG stream parser
-# 1996-12-29 fl   Added write support, added getchunks
-# 1996-12-30 fl   Eliminated circular references in decoder (0.3)
-# 1998-07-12 fl   Read/write 16-bit images as mode I (0.4)
-# 2001-02-08 fl   Added transparency support (from Zircon) (0.5)
-# 2001-04-16 fl   Don't close data source in "open" method (0.6)
-# 2004-02-24 fl   Don't even pretend to support interlaced files (0.7)
-# 2004-08-31 fl   Do basic sanity check on chunk identifiers (0.8)
-# 2004-09-20 fl   Added PngInfo chunk container
-# 2004-12-18 fl   Added DPI read support (based on code by Niki Spahiev)
-#
-# Copyright (c) 1997-2004 by Secret Labs AB
-# Copyright (c) 1996 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.8.2"
-
-import re, string
-
-import Image, ImageFile, ImagePalette
-
-
-def i16(c):
-    return ord(c[1]) + (ord(c[0])<<8)
-def i32(c):
-    return ord(c[3]) + (ord(c[2])<<8) + (ord(c[1])<<16) + (ord(c[0])<<24)
-
-is_cid = re.compile("\w\w\w\w").match
-
-
-_MAGIC = "\211PNG\r\n\032\n"
-
-
-_MODES = {
-    # supported bits/color combinations, and corresponding modes/rawmodes
-    (1, 0): ("1", "1"),
-    (2, 0): ("L", "L;2"),
-    (4, 0): ("L", "L;4"),
-    (8, 0): ("L", "L"),
-    (16,0): ("I", "I;16B"),
-    (8, 2): ("RGB", "RGB"),
-    (16,2): ("RGB", "RGB;16B"),
-    (1, 3): ("P", "P;1"),
-    (2, 3): ("P", "P;2"),
-    (4, 3): ("P", "P;4"),
-    (8, 3): ("P", "P"),
-    (8, 4): ("LA", "LA"),
-    (16,4): ("RGBA", "LA;16B"), # LA;16B->LA not yet available
-    (8, 6): ("RGBA", "RGBA"),
-    (16,6): ("RGBA", "RGBA;16B"),
-}
-
-
-# --------------------------------------------------------------------
-# Support classes.  Suitable for PNG and related formats like MNG etc.
-
-class ChunkStream:
-
-    def __init__(self, fp):
-
-        self.fp = fp
-        self.queue = []
-
-        if not hasattr(Image.core, "crc32"):
-            self.crc = self.crc_skip
-
-    def read(self):
-        "Fetch a new chunk. Returns header information."
-
-        if self.queue:
-            cid, pos, len = self.queue[-1]
-            del self.queue[-1]
-            self.fp.seek(pos)
-        else:
-            s = self.fp.read(8)
-            cid = s[4:]
-            pos = self.fp.tell()
-            len = i32(s)
-
-        if not is_cid(cid):
-            raise SyntaxError, "broken PNG file (chunk %s)" % repr(cid)
-
-        return cid, pos, len
-
-    def close(self):
-        self.queue = self.crc = self.fp = None
-
-    def push(self, cid, pos, len):
-
-        self.queue.append((cid, pos, len))
-
-    def call(self, cid, pos, len):
-        "Call the appropriate chunk handler"
-
-        if Image.DEBUG:
-            print "STREAM", cid, pos, len
-        return getattr(self, "chunk_" + cid)(pos, len)
-
-    def crc(self, cid, data):
-        "Read and verify checksum"
-
-        crc1 = Image.core.crc32(data, Image.core.crc32(cid))
-        crc2 = i16(self.fp.read(2)), i16(self.fp.read(2))
-        if crc1 != crc2:
-            raise SyntaxError, "broken PNG file"\
-                "(bad header checksum in %s)" % cid
-
-    def crc_skip(self, cid, data):
-        "Read checksum.  Used if the C module is not present"
-
-        self.fp.read(4)
-
-    def verify(self, endchunk = "IEND"):
-
-        # Simple approach; just calculate checksum for all remaining
-        # blocks.  Must be called directly after open.
-
-        cids = []
-
-        while 1:
-            cid, pos, len = self.read()
-            if cid == endchunk:
-                break
-            self.crc(cid, ImageFile._safe_read(self.fp, len))
-            cids.append(cid)
-
-        return cids
-
-
-# --------------------------------------------------------------------
-# PNG chunk container (for use with save(pnginfo=))
-
-class PngInfo:
-
-    def __init__(self):
-        self.chunks = []
-
-    def add(self, cid, data):
-        self.chunks.append((cid, data))
-
-    def add_text(self, key, value, zip=0):
-        if zip:
-            import zlib
-            self.add("zTXt", key + "\0\0" + zlib.compress(value))
-        else:
-            self.add("tEXt", key + "\0" + value)
-
-# --------------------------------------------------------------------
-# PNG image stream (IHDR/IEND)
-
-class PngStream(ChunkStream):
-
-    def __init__(self, fp):
-
-        ChunkStream.__init__(self, fp)
-
-        # local copies of Image attributes
-        self.im_info = {}
-        self.im_size = (0,0)
-        self.im_mode = None
-        self.im_tile = None
-        self.im_palette = None
-
-    def chunk_IHDR(self, pos, len):
-
-        # image header
-        s = ImageFile._safe_read(self.fp, len)
-        self.im_size = i32(s), i32(s[4:])
-        try:
-            self.im_mode, self.im_rawmode = _MODES[(ord(s[8]), ord(s[9]))]
-        except:
-            pass
-        if ord(s[12]):
-            self.im_info["interlace"] = 1
-        if ord(s[11]):
-            raise SyntaxError, "unknown filter category"
-        return s
-
-    def chunk_IDAT(self, pos, len):
-
-        # image data
-        self.im_tile = [("zip", (0,0)+self.im_size, pos, self.im_rawmode)]
-        self.im_idat = len
-        raise EOFError
-
-    def chunk_IEND(self, pos, len):
-
-        # end of PNG image
-        raise EOFError
-
-    def chunk_PLTE(self, pos, len):
-
-        # palette
-        s = ImageFile._safe_read(self.fp, len)
-        if self.im_mode == "P":
-            self.im_palette = "RGB", s
-        return s
-
-    def chunk_tRNS(self, pos, len):
-
-        # transparency
-        s = ImageFile._safe_read(self.fp, len)
-        if self.im_mode == "P":
-            i = string.find(s, chr(0))
-            if i >= 0:
-                self.im_info["transparency"] = i
-        elif self.im_mode == "L":
-            self.im_info["transparency"] = i16(s)
-        return s
-
-    def chunk_gAMA(self, pos, len):
-
-        # gamma setting
-        s = ImageFile._safe_read(self.fp, len)
-        self.im_info["gamma"] = i32(s) / 100000.0
-        return s
-
-    def chunk_pHYs(self, pos, len):
-
-        # pixels per unit
-        s = ImageFile._safe_read(self.fp, len)
-        px, py = i32(s), i32(s[4:])
-        unit = ord(s[8])
-        if unit == 1: # meter
-            dpi = int(px * 0.0254 + 0.5), int(py * 0.0254 + 0.5)
-            self.im_info["dpi"] = dpi
-        elif unit == 0:
-            self.im_info["aspect"] = px, py
-        return s
-
-    def chunk_tEXt(self, pos, len):
-
-        # text
-        s = ImageFile._safe_read(self.fp, len)
-        try:
-            k, v = string.split(s, "\0", 1)
-        except ValueError:
-            k = s; v = "" # fallback for broken tEXt tags
-        if k:
-            self.im_info[k] = v
-        return s
-
-
-# --------------------------------------------------------------------
-# PNG reader
-
-def _accept(prefix):
-    return prefix[:8] == _MAGIC
-
-##
-# Image plugin for PNG images.
-
-class PngImageFile(ImageFile.ImageFile):
-
-    format = "PNG"
-    format_description = "Portable network graphics"
-
-    def _open(self):
-
-        if self.fp.read(8) != _MAGIC:
-            raise SyntaxError, "not a PNG file"
-
-        #
-        # Parse headers up to the first IDAT chunk
-
-        self.png = PngStream(self.fp)
-
-        while 1:
-
-            #
-            # get next chunk
-
-            cid, pos, len = self.png.read()
-
-            try:
-                s = self.png.call(cid, pos, len)
-            except EOFError:
-                break
-            except AttributeError:
-                if Image.DEBUG:
-                    print cid, pos, len, "(unknown)"
-                s = ImageFile._safe_read(self.fp, len)
-
-            self.png.crc(cid, s)
-
-        #
-        # Copy relevant attributes from the PngStream.  An alternative
-        # would be to let the PngStream class modify these attributes
-        # directly, but that introduces circular references which are
-        # difficult to break if things go wrong in the decoder...
-        # (believe me, I've tried ;-)
-
-        self.mode = self.png.im_mode
-        self.size = self.png.im_size
-        self.info = self.png.im_info
-        self.tile = self.png.im_tile
-
-        if self.png.im_palette:
-            rawmode, data = self.png.im_palette
-            self.palette = ImagePalette.raw(rawmode, data)
-
-        self.__idat = len # used by load_read()
-
-
-    def verify(self):
-        "Verify PNG file"
-
-        if self.fp is None:
-            raise RuntimeError("verify must be called directly after open")
-
-        # back up to beginning of IDAT block
-        self.fp.seek(self.tile[0][2] - 8)
-
-        self.png.verify()
-        self.png.close()
-
-        self.fp = None
-
-    def load_prepare(self):
-        "internal: prepare to read PNG file"
-
-        if self.info.get("interlace"):
-            raise IOError("cannot read interlaced PNG files")
-
-        ImageFile.ImageFile.load_prepare(self)
-
-    def load_read(self, bytes):
-        "internal: read more image data"
-
-        while self.__idat == 0:
-            # end of chunk, skip forward to next one
-
-            self.fp.read(4) # CRC
-
-            cid, pos, len = self.png.read()
-
-            if cid not in ["IDAT", "DDAT"]:
-                self.png.push(cid, pos, len)
-                return ""
-
-            self.__idat = len # empty chunks are allowed
-
-        # read more data from this chunk
-        if bytes <= 0:
-            bytes = self.__idat
-        else:
-            bytes = min(bytes, self.__idat)
-
-        self.__idat = self.__idat - bytes
-
-        return self.fp.read(bytes)
-
-
-    def load_end(self):
-        "internal: finished reading image data"
-
-        self.png.close()
-        self.png = None
-
-
-# --------------------------------------------------------------------
-# PNG writer
-
-def o16(i):
-    return chr(i>>8&255) + chr(i&255)
-
-def o32(i):
-    return chr(i>>24&255) + chr(i>>16&255) + chr(i>>8&255) + chr(i&255)
-
-_OUTMODES = {
-    # supported PIL modes, and corresponding rawmodes/bits/color combinations
-    "1":   ("1", chr(1)+chr(0)),
-    "L;1": ("L;1", chr(1)+chr(0)),
-    "L;2": ("L;2", chr(2)+chr(0)),
-    "L;4": ("L;4", chr(4)+chr(0)),
-    "L":   ("L", chr(8)+chr(0)),
-    "LA":  ("LA", chr(8)+chr(4)),
-    "I":   ("I;16B", chr(16)+chr(0)),
-    "P;1": ("P;1", chr(1)+chr(3)),
-    "P;2": ("P;2", chr(2)+chr(3)),
-    "P;4": ("P;4", chr(4)+chr(3)),
-    "P":   ("P", chr(8)+chr(3)),
-    "RGB": ("RGB", chr(8)+chr(2)),
-    "RGBA":("RGBA", chr(8)+chr(6)),
-}
-
-def putchunk(fp, cid, *data):
-    "Write a PNG chunk (including CRC field)"
-
-    data = string.join(data, "")
-
-    fp.write(o32(len(data)) + cid)
-    fp.write(data)
-    hi, lo = Image.core.crc32(data, Image.core.crc32(cid))
-    fp.write(o16(hi) + o16(lo))
-
-class _idat:
-    # wrap output from the encoder in IDAT chunks
-
-    def __init__(self, fp, chunk):
-        self.fp = fp
-        self.chunk = chunk
-    def write(self, data):
-        self.chunk(self.fp, "IDAT", data)
-
-def _save(im, fp, filename, chunk=putchunk, check=0):
-    # save an image to disk (called by the save method)
-
-    mode = im.mode
-
-    if mode == "P":
-
-        #
-        # attempt to minimize storage requirements for palette images
-
-        if im.encoderinfo.has_key("bits"):
-
-            # number of bits specified by user
-            n = 1 << im.encoderinfo["bits"]
-
-        else:
-
-            # check palette contents
-            n = 256 # FIXME
-
-        if n <= 2:
-            bits = 1
-        elif n <= 4:
-            bits = 2
-        elif n <= 16:
-            bits = 4
-        else:
-            bits = 8
-
-        if bits != 8:
-            mode = "%s;%d" % (mode, bits)
-
-    # encoder options
-    if im.encoderinfo.has_key("dictionary"):
-        dictionary = im.encoderinfo["dictionary"]
-    else:
-        dictionary = ""
-
-    im.encoderconfig = (im.encoderinfo.has_key("optimize"), dictionary)
-
-    # get the corresponding PNG mode
-    try:
-        rawmode, mode = _OUTMODES[mode]
-    except KeyError:
-        raise IOError, "cannot write mode %s as PNG" % mode
-
-    if check:
-        return check
-
-    #
-    # write minimal PNG file
-
-    fp.write(_MAGIC)
-
-    chunk(fp, "IHDR",
-          o32(im.size[0]), o32(im.size[1]),     #  0: size
-          mode,                                 #  8: depth/type
-          chr(0),                               # 10: compression
-          chr(0),                               # 11: filter category
-          chr(0))                               # 12: interlace flag
-
-    if im.mode == "P":
-        chunk(fp, "PLTE", im.im.getpalette("RGB"))
-
-    if im.encoderinfo.has_key("transparency"):
-        if im.mode == "P":
-            transparency = max(0, min(255, im.encoderinfo["transparency"]))
-            chunk(fp, "tRNS", chr(255) * transparency + chr(0))
-        elif im.mode == "L":
-            transparency = max(0, min(65535, im.encoderinfo["transparency"]))
-            chunk(fp, "tRNS", o16(transparency))
-        else:
-            raise IOError, "cannot use transparency for this mode"
-
-    if 0:
-        # FIXME: to be supported some day
-        chunk(fp, "gAMA", o32(int(gamma * 100000.0)))
-
-    dpi = im.encoderinfo.get("dpi")
-    if dpi:
-        chunk(fp, "pHYs",
-              o32(int(dpi[0] / 0.0254 + 0.5)),
-              o32(int(dpi[1] / 0.0254 + 0.5)),
-              chr(1))
-
-    info = im.encoderinfo.get("pnginfo")
-    if info:
-        for cid, data in info.chunks:
-            chunk(fp, cid, data)
-
-    ImageFile._save(im, _idat(fp, chunk), [("zip", (0,0)+im.size, 0, rawmode)])
-
-    chunk(fp, "IEND", "")
-
-    try:
-        fp.flush()
-    except:
-        pass
-
-
-# --------------------------------------------------------------------
-# PNG chunk converter
-
-def getchunks(im, **params):
-    """Return a list of PNG chunks representing this image."""
-
-    class collector:
-        data = []
-        def write(self, data):
-            pass
-        def append(self, chunk):
-            self.data.append(chunk)
-
-    def append(fp, cid, *data):
-        data = string.join(data, "")
-        hi, lo = Image.core.crc32(data, Image.core.crc32(cid))
-        crc = o16(hi) + o16(lo)
-        fp.append((cid, data, crc))
-
-    fp = collector()
-
-    try:
-        im.encoderinfo = params
-        _save(im, fp, None, append)
-    finally:
-        del im.encoderinfo
-
-    return fp.data
-
-
-# --------------------------------------------------------------------
-# Registry
-
-Image.register_open("PNG", PngImageFile, _accept)
-Image.register_save("PNG", _save)
-
-Image.register_extension("PNG", ".png")
-
-Image.register_mime("PNG", "image/png")
diff --git a/pythonPackages/pil/PIL/PpmImagePlugin.py b/pythonPackages/pil/PIL/PpmImagePlugin.py
deleted file mode 100644
index b9b9f815d2..0000000000
--- a/pythonPackages/pil/PIL/PpmImagePlugin.py
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: PpmImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# PPM support for PIL
-#
-# History:
-#       96-03-24 fl     Created
-#       98-03-06 fl     Write RGBA images (as RGB, that is)
-#
-# Copyright (c) Secret Labs AB 1997-98.
-# Copyright (c) Fredrik Lundh 1996.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.2"
-
-import string
-
-import Image, ImageFile
-
-#
-# --------------------------------------------------------------------
-
-MODES = {
-    # standard
-    "P4": "1",
-    "P5": "L",
-    "P6": "RGB",
-    # extensions
-    "P0CMYK": "CMYK",
-    # PIL extensions (for test purposes only)
-    "PyP": "P",
-    "PyRGBA": "RGBA",
-    "PyCMYK": "CMYK"
-}
-
-def _accept(prefix):
-    return prefix[0] == "P" and prefix[1] in "0456y"
-
-##
-# Image plugin for PBM, PGM, and PPM images.
-
-class PpmImageFile(ImageFile.ImageFile):
-
-    format = "PPM"
-    format_description = "Pbmplus image"
-
-    def _token(self, s = ""):
-        while 1: # read until next whitespace
-            c = self.fp.read(1)
-            if not c or c in string.whitespace:
-                break
-            s = s + c
-        return s
-
-    def _open(self):
-
-        # check magic
-        s = self.fp.read(1)
-        if s != "P":
-            raise SyntaxError, "not a PPM file"
-        mode = MODES[self._token(s)]
-
-        if mode == "1":
-            self.mode = "1"
-            rawmode = "1;I"
-        else:
-            self.mode = rawmode = mode
-
-        for ix in range(3):
-            while 1:
-                while 1:
-                    s = self.fp.read(1)
-                    if s not in string.whitespace:
-                        break
-                if s != "#":
-                    break
-                s = self.fp.readline()
-            s = int(self._token(s))
-            if ix == 0:
-                xsize = s
-            elif ix == 1:
-                ysize = s
-                if mode == "1":
-                    break
-
-        self.size = xsize, ysize
-        self.tile = [("raw",
-                     (0, 0, xsize, ysize),
-                     self.fp.tell(),
-                     (rawmode, 0, 1))]
-
-        # ALTERNATIVE: load via builtin debug function
-        # self.im = Image.core.open_ppm(self.filename)
-        # self.mode = self.im.mode
-        # self.size = self.im.size
-
-#
-# --------------------------------------------------------------------
-
-def _save(im, fp, filename):
-    if im.mode == "1":
-        rawmode, head = "1;I", "P4"
-    elif im.mode == "L":
-        rawmode, head = "L", "P5"
-    elif im.mode == "RGB":
-        rawmode, head = "RGB", "P6"
-    elif im.mode == "RGBA":
-        rawmode, head = "RGB", "P6"
-    else:
-        raise IOError, "cannot write mode %s as PPM" % im.mode
-    fp.write(head + "\n%d %d\n" % im.size)
-    if head != "P4":
-        fp.write("255\n")
-    ImageFile._save(im, fp, [("raw", (0,0)+im.size, 0, (rawmode, 0, 1))])
-
-    # ALTERNATIVE: save via builtin debug function
-    # im._dump(filename)
-
-#
-# --------------------------------------------------------------------
-
-Image.register_open("PPM", PpmImageFile, _accept)
-Image.register_save("PPM", _save)
-
-Image.register_extension("PPM", ".pbm")
-Image.register_extension("PPM", ".pgm")
-Image.register_extension("PPM", ".ppm")
diff --git a/pythonPackages/pil/PIL/PsdImagePlugin.py b/pythonPackages/pil/PIL/PsdImagePlugin.py
deleted file mode 100644
index 1e68c0db58..0000000000
--- a/pythonPackages/pil/PIL/PsdImagePlugin.py
+++ /dev/null
@@ -1,271 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: PsdImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# Adobe PSD 2.5/3.0 file handling
-#
-# History:
-# 1995-09-01 fl   Created
-# 1997-01-03 fl   Read most PSD images
-# 1997-01-18 fl   Fixed P and CMYK support
-# 2001-10-21 fl   Added seek/tell support (for layers)
-#
-# Copyright (c) 1997-2001 by Secret Labs AB.
-# Copyright (c) 1995-2001 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.4"
-
-import string
-import Image, ImageFile, ImagePalette
-
-MODES = {
-    # (photoshop mode, bits) -> (pil mode, required channels)
-    (0, 1): ("1", 1),
-    (0, 8): ("L", 1),
-    (1, 8): ("L", 1),
-    (2, 8): ("P", 1),
-    (3, 8): ("RGB", 3),
-    (4, 8): ("CMYK", 4),
-    (7, 8): ("L", 1), # FIXME: multilayer
-    (8, 8): ("L", 1), # duotone
-    (9, 8): ("LAB", 3)
-}
-
-#
-# helpers
-
-def i16(c):
-    return ord(c[1]) + (ord(c[0])<<8)
-
-def i32(c):
-    return ord(c[3]) + (ord(c[2])<<8) + (ord(c[1])<<16) + (ord(c[0])<<24)
-
-# --------------------------------------------------------------------.
-# read PSD images
-
-def _accept(prefix):
-    return prefix[:4] == "8BPS"
-
-##
-# Image plugin for Photoshop images.
-
-class PsdImageFile(ImageFile.ImageFile):
-
-    format = "PSD"
-    format_description = "Adobe Photoshop"
-
-    def _open(self):
-
-        read = self.fp.read
-
-        #
-        # header
-
-        s = read(26)
-        if s[:4] != "8BPS" or i16(s[4:]) != 1:
-            raise SyntaxError, "not a PSD file"
-
-        psd_bits = i16(s[22:])
-        psd_channels = i16(s[12:])
-        psd_mode = i16(s[24:])
-
-        mode, channels = MODES[(psd_mode, psd_bits)]
-
-        if channels > psd_channels:
-            raise IOError, "not enough channels"
-
-        self.mode = mode
-        self.size = i32(s[18:]), i32(s[14:])
-
-        #
-        # color mode data
-
-        size = i32(read(4))
-        if size:
-            data = read(size)
-            if mode == "P" and size == 768:
-                self.palette = ImagePalette.raw("RGB;L", data)
-
-        #
-        # image resources
-
-        self.resources = []
-
-        size = i32(read(4))
-        if size:
-            # load resources
-            end = self.fp.tell() + size
-            while self.fp.tell() < end:
-                signature = read(4)
-                id = i16(read(2))
-                name = read(ord(read(1)))
-                if not (len(name) & 1):
-                    read(1) # padding
-                data = read(i32(read(4)))
-                if (len(data) & 1):
-                    read(1) # padding
-                self.resources.append((id, name, data))
-
-        #
-        # layer and mask information
-
-        self.layers = []
-
-        size = i32(read(4))
-        if size:
-            end = self.fp.tell() + size
-            size = i32(read(4))
-            if size:
-                self.layers = _layerinfo(self.fp)
-            self.fp.seek(end)
-
-        #
-        # image descriptor
-
-        self.tile = _maketile(self.fp, mode, (0, 0) + self.size, channels)
-
-        # keep the file open
-        self._fp = self.fp
-        self.frame = 0
-
-    def seek(self, layer):
-        # seek to given layer (1..max)
-        if layer == self.frame:
-            return
-        try:
-            if layer <= 0:
-                raise IndexError
-            name, mode, bbox, tile = self.layers[layer-1]
-            self.mode = mode
-            self.tile = tile
-            self.frame = layer
-            self.fp = self._fp
-            return name, bbox
-        except IndexError:
-            raise EOFError, "no such layer"
-
-    def tell(self):
-        # return layer number (0=image, 1..max=layers)
-        return self.frame
-
-    def load_prepare(self):
-        # create image memory if necessary
-        if not self.im or\
-           self.im.mode != self.mode or self.im.size != self.size:
-            self.im = Image.core.fill(self.mode, self.size, 0)
-        # create palette (optional)
-        if self.mode == "P":
-            Image.Image.load(self)
-
-def _layerinfo(file):
-    # read layerinfo block
-    layers = []
-    read = file.read
-
-    for i in range(abs(i16(read(2)))):
-
-        # bounding box
-        y0 = i32(read(4)); x0 = i32(read(4))
-        y1 = i32(read(4)); x1 = i32(read(4))
-
-        # image info
-        info = []
-        mode = []
-        for i in range(i16(read(2))):
-            type = i16(read(2))
-            if type == 65535:
-                m = "A"
-            else:
-                m = "RGB"[type]
-            mode.append(m)
-            size = i32(read(4))
-            info.append((m, size))
-
-        # figure out the image mode
-        mode.sort()
-        if mode == ["R"]:
-            mode = "L"
-        elif mode == ["B", "G", "R"]:
-            mode = "RGB"
-        elif mode == ["A", "B", "G", "R"]:
-            mode = "RGBA"
-        else:
-            mode = None # unknown
-
-        # skip over blend flags and extra information
-        filler = read(12)
-        name = None # FIXME
-        file.seek(i32(read(4)), 1)
-
-        layers.append((name, mode, (x0, y0, x1, y1)))
-
-    # get tiles
-    i = 0
-    for name, mode, bbox in layers:
-        tile = []
-        for m in mode:
-            t = _maketile(file, m, bbox, 1)
-            if t:
-                tile.extend(t)
-        layers[i] = name, mode, bbox, tile
-        i = i + 1
-
-    return layers
-
-def _maketile(file, mode, bbox, channels):
-
-    tile = None
-    read = file.read
-
-    compression = i16(read(2))
-
-    xsize = bbox[2] - bbox[0]
-    ysize = bbox[3] - bbox[1]
-
-    offset = file.tell()
-
-    if compression == 0:
-        #
-        # raw compression
-        tile = []
-        for channel in range(channels):
-            layer = mode[channel]
-            if mode == "CMYK":
-                layer = layer + ";I"
-            tile.append(("raw", bbox, offset, layer))
-            offset = offset + xsize*ysize
-
-    elif compression == 1:
-        #
-        # packbits compression
-        i = 0
-        tile = []
-        bytecount = read(channels * ysize * 2)
-        offset = file.tell()
-        for channel in range(channels):
-            layer = mode[channel]
-            if mode == "CMYK":
-                layer = layer + ";I"
-            tile.append(
-                ("packbits", bbox, offset, layer)
-                )
-            for y in range(ysize):
-                offset = offset + i16(bytecount[i:i+2])
-                i = i + 2
-
-    file.seek(offset)
-
-    if offset & 1:
-        read(1) # padding
-
-    return tile
-
-# --------------------------------------------------------------------
-# registry
-
-Image.register_open("PSD", PsdImageFile, _accept)
-
-Image.register_extension("PSD", ".psd")
diff --git a/pythonPackages/pil/PIL/SgiImagePlugin.py b/pythonPackages/pil/PIL/SgiImagePlugin.py
deleted file mode 100644
index 0ab741e830..0000000000
--- a/pythonPackages/pil/PIL/SgiImagePlugin.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: SgiImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# SGI image file handling
-#
-# See "The SGI Image File Format (Draft version 0.97)", Paul Haeberli.
-# <ftp://ftp.sgi.com/graphics/SGIIMAGESPEC>
-#
-# History:
-# 1995-09-10 fl     Created
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1995.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.1"
-
-
-import string
-import Image, ImageFile
-
-
-def i16(c):
-    return ord(c[1]) + (ord(c[0])<<8)
-
-def i32(c):
-    return ord(c[3]) + (ord(c[2])<<8) + (ord(c[1])<<16) + (ord(c[0])<<24)
-
-
-def _accept(prefix):
-    return i16(prefix) == 474
-
-##
-# Image plugin for SGI images.
-
-class SgiImageFile(ImageFile.ImageFile):
-
-    format = "SGI"
-    format_description = "SGI Image File Format"
-
-    def _open(self):
-
-        # HEAD
-        s = self.fp.read(512)
-        if i16(s) != 474:
-            raise SyntaxError, "not an SGI image file"
-
-        # relevant header entries
-        compression = ord(s[2])
-
-        # bytes, dimension, zsize
-        layout = ord(s[3]), i16(s[4:]), i16(s[10:])
-
-        # determine mode from bytes/zsize
-        if layout == (1, 2, 1):
-            self.mode = "L"
-        elif layout == (1, 3, 3):
-            self.mode = "RGB"
-        else:
-            raise SyntaxError, "unsupported SGI image mode"
-
-        # size
-        self.size = i16(s[6:]), i16(s[8:])
-
-        # decoder info
-        if compression == 0:
-            if self.mode == "RGB":
-                # RGB images are band interleaved
-                size = self.size[0]*self.size[1]
-                self.tile = [("raw", (0,0)+self.size, 512, ("R",0,1)),
-                             ("raw", (0,0)+self.size, 512+size, ("G",0,1)),
-                             ("raw", (0,0)+self.size, 512+2*size, ("B",0,1))]
-            else:
-                self.tile = [("raw", (0,0)+self.size, 512, (self.mode, 0, 1))]
-        if compression == 1:
-            self.tile = [("sgi_rle", (0,0)+self.size, 512, (self.mode, 0, 1))]
-
-#
-# registry
-
-Image.register_open("SGI", SgiImageFile, _accept)
-
-Image.register_extension("SGI", ".bw")
-Image.register_extension("SGI", ".rgb")
-Image.register_extension("SGI", ".rgba")
-
-Image.register_extension("SGI", ".sgi") # really?
diff --git a/pythonPackages/pil/PIL/SpiderImagePlugin.py b/pythonPackages/pil/PIL/SpiderImagePlugin.py
deleted file mode 100644
index e0fd045495..0000000000
--- a/pythonPackages/pil/PIL/SpiderImagePlugin.py
+++ /dev/null
@@ -1,294 +0,0 @@
-#
-# The Python Imaging Library.
-#
-# SPIDER image file handling
-#
-# History:
-# 2004-08-02    Created BB
-# 2006-03-02    added save method
-# 2006-03-13    added support for stack images
-#
-# Copyright (c) 2004 by Health Research Inc. (HRI) RENSSELAER, NY 12144.
-# Copyright (c) 2004 by William Baxter.
-# Copyright (c) 2004 by Secret Labs AB.
-# Copyright (c) 2004 by Fredrik Lundh.
-#
-
-##
-# Image plugin for the Spider image format.  This format is is used
-# by the SPIDER software, in processing image data from electron
-# microscopy and tomography.
-##
-
-#
-# SpiderImagePlugin.py
-#
-# The Spider image format is used by SPIDER software, in processing
-# image data from electron microscopy and tomography.
-#
-# Spider home page:
-# http://www.wadsworth.org/spider_doc/spider/docs/spider.html
-#
-# Details about the Spider image format:
-# http://www.wadsworth.org/spider_doc/spider/docs/image_doc.html
-#
-
-import Image, ImageFile
-import os, string, struct, sys
-
-def isInt(f):
-    try:
-        i = int(f)
-        if f-i == 0: return 1
-        else:        return 0
-    except:
-        return 0
-
-iforms = [1,3,-11,-12,-21,-22]
-
-# There is no magic number to identify Spider files, so just check a
-# series of header locations to see if they have reasonable values.
-# Returns no.of bytes in the header, if it is a valid Spider header,
-# otherwise returns 0
-
-def isSpiderHeader(t):
-    h = (99,) + t   # add 1 value so can use spider header index start=1
-    # header values 1,2,5,12,13,22,23 should be integers
-    for i in [1,2,5,12,13,22,23]:
-        if not isInt(h[i]): return 0
-    # check iform
-    iform = int(h[5])
-    if not iform in iforms: return 0
-    # check other header values
-    labrec = int(h[13])   # no. records in file header
-    labbyt = int(h[22])   # total no. of bytes in header
-    lenbyt = int(h[23])   # record length in bytes
-    #print "labrec = %d, labbyt = %d, lenbyt = %d" % (labrec,labbyt,lenbyt)
-    if labbyt != (labrec * lenbyt): return 0
-    # looks like a valid header
-    return labbyt
-
-def isSpiderImage(filename):
-    fp = open(filename,'rb')
-    f = fp.read(92)   # read 23 * 4 bytes
-    fp.close()
-    bigendian = 1
-    t = struct.unpack('>23f',f)    # try big-endian first
-    hdrlen = isSpiderHeader(t)
-    if hdrlen == 0:
-        bigendian = 0
-        t = struct.unpack('<23f',f)  # little-endian
-        hdrlen = isSpiderHeader(t)
-    return hdrlen
-
-
-class SpiderImageFile(ImageFile.ImageFile):
-
-    format = "SPIDER"
-    format_description = "Spider 2D image"
-
-    def _open(self):
-        # check header
-        n = 27 * 4  # read 27 float values
-        f = self.fp.read(n)
-
-        try:
-            self.bigendian = 1
-            t = struct.unpack('>27f',f)    # try big-endian first
-            hdrlen = isSpiderHeader(t)
-            if hdrlen == 0:
-                self.bigendian = 0
-                t = struct.unpack('<27f',f)  # little-endian
-                hdrlen = isSpiderHeader(t)
-            if hdrlen == 0:
-                raise SyntaxError, "not a valid Spider file"
-        except struct.error:
-            raise SyntaxError, "not a valid Spider file"
-
-        h = (99,) + t   # add 1 value : spider header index starts at 1
-        iform = int(h[5])
-        if iform != 1:
-            raise SyntaxError, "not a Spider 2D image"
-
-        self.size = int(h[12]), int(h[2]) # size in pixels (width, height)
-        self.istack = int(h[24])
-        self.imgnumber = int(h[27])
-
-        if self.istack == 0 and self.imgnumber == 0:
-            # stk=0, img=0: a regular 2D image
-            offset = hdrlen
-            self.nimages = 1
-        elif self.istack > 0 and self.imgnumber == 0:
-            # stk>0, img=0: Opening the stack for the first time
-            self.imgbytes = int(h[12]) * int(h[2]) * 4
-            self.hdrlen = hdrlen
-            self.nimages = int(h[26])
-            # Point to the first image in the stack
-            offset = hdrlen * 2
-            self.imgnumber = 1
-        elif self.istack == 0 and self.imgnumber > 0:
-            # stk=0, img>0: an image within the stack
-            offset = hdrlen + self.stkoffset
-            self.istack = 2  # So Image knows it's still a stack
-        else:
-            raise SyntaxError, "inconsistent stack header values"
-
-        if self.bigendian:
-            self.rawmode = "F;32BF"
-        else:
-            self.rawmode = "F;32F"
-        self.mode = "F"
-
-        self.tile = [("raw", (0, 0) + self.size, offset,
-                    (self.rawmode, 0, 1))]
-        self.__fp = self.fp # FIXME: hack
-
-    # 1st image index is zero (although SPIDER imgnumber starts at 1)
-    def tell(self):
-        if self.imgnumber < 1:
-            return 0
-        else:
-            return self.imgnumber - 1
-
-    def seek(self, frame):
-        if self.istack == 0:
-            return
-        if frame >= self.nimages:
-            raise EOFError, "attempt to seek past end of file"
-        self.stkoffset = self.hdrlen + frame * (self.hdrlen + self.imgbytes)
-        self.fp = self.__fp
-        self.fp.seek(self.stkoffset)
-        self._open()
-
-    # returns a byte image after rescaling to 0..255
-    def convert2byte(self, depth=255):
-        (min, max) = self.getextrema()
-        m = 1
-        if max != min:
-            m = depth / (max-min)
-        b = -m * min
-        return self.point(lambda i, m=m, b=b: i * m + b).convert("L")
-
-    # returns a ImageTk.PhotoImage object, after rescaling to 0..255
-    def tkPhotoImage(self):
-        import ImageTk
-        return ImageTk.PhotoImage(self.convert2byte(), palette=256)
-
-# --------------------------------------------------------------------
-# Image series
-
-# given a list of filenames, return a list of images
-def loadImageSeries(filelist=None):
-    " create a list of Image.images for use in montage "
-    if filelist == None or len(filelist) < 1:
-        return
-
-    imglist = []
-    for img in filelist:
-        if not os.path.exists(img):
-            print "unable to find %s" % img
-            continue
-        try:
-            im = Image.open(img).convert2byte()
-        except:
-            if not isSpiderImage(img):
-                print img + " is not a Spider image file"
-            continue
-        im.info['filename'] = img
-        imglist.append(im)
-    return imglist
-
-# --------------------------------------------------------------------
-# For saving images in Spider format
-
-def makeSpiderHeader(im):
-    nsam,nrow = im.size
-    lenbyt = nsam * 4  # There are labrec records in the header
-    labrec = 1024 / lenbyt
-    if 1024%lenbyt != 0: labrec += 1
-    labbyt = labrec * lenbyt
-    hdr = []
-    nvalues = labbyt / 4
-    for i in range(nvalues):
-        hdr.append(0.0)
-
-    if len(hdr) < 23:
-        return []
-
-    # NB these are Fortran indices
-    hdr[1]  = 1.0           # nslice (=1 for an image)
-    hdr[2]  = float(nrow)   # number of rows per slice
-    hdr[5]  = 1.0           # iform for 2D image
-    hdr[12] = float(nsam)   # number of pixels per line
-    hdr[13] = float(labrec) # number of records in file header
-    hdr[22] = float(labbyt) # total number of bytes in header
-    hdr[23] = float(lenbyt) # record length in bytes
-
-    # adjust for Fortran indexing
-    hdr = hdr[1:]
-    hdr.append(0.0)
-    # pack binary data into a string
-    hdrstr = []
-    for v in hdr:
-        hdrstr.append(struct.pack('f',v))
-    return hdrstr
-
-def _save(im, fp, filename):
-    if im.mode[0] != "F":
-        im = im.convert('F')
-
-    hdr = makeSpiderHeader(im)
-    if len(hdr) < 256:
-        raise IOError, "Error creating Spider header"
-
-    # write the SPIDER header
-    try:
-        fp = open(filename, 'wb')
-    except:
-        raise IOError, "Unable to open %s for writing" % filename
-    fp.writelines(hdr)
-
-    rawmode = "F;32NF"  #32-bit native floating point
-    ImageFile._save(im, fp, [("raw", (0,0)+im.size, 0, (rawmode,0,1))])
-
-    fp.close()
-
-def _save_spider(im, fp, filename):
-    # get the filename extension and register it with Image
-    fn, ext = os.path.splitext(filename)
-    Image.register_extension("SPIDER", ext)
-    _save(im, fp, filename)
-
-# --------------------------------------------------------------------
-
-Image.register_open("SPIDER", SpiderImageFile)
-Image.register_save("SPIDER", _save_spider)
-
-if __name__ == "__main__":
-
-    if not sys.argv[1:]:
-        print "Syntax: python SpiderImagePlugin.py Spiderimage [outfile]"
-        sys.exit()
-
-    filename = sys.argv[1]
-    if not isSpiderImage(filename):
-        print "input image must be in Spider format"
-        sys.exit()
-
-    outfile = ""
-    if len(sys.argv[1:]) > 1:
-        outfile = sys.argv[2]
-
-    im = Image.open(filename)
-    print "image: " + str(im)
-    print "format: " + str(im.format)
-    print "size: " + str(im.size)
-    print "mode: " + str(im.mode)
-    print "max, min: ",
-    print im.getextrema()
-
-    if outfile != "":
-        # perform some image operation
-        im = im.transpose(Image.FLIP_LEFT_RIGHT)
-        print "saving a flipped version of %s as %s " % (os.path.basename(filename), outfile)
-        im.save(outfile, "SPIDER")
diff --git a/pythonPackages/pil/PIL/SunImagePlugin.py b/pythonPackages/pil/PIL/SunImagePlugin.py
deleted file mode 100644
index 2e7fe523d8..0000000000
--- a/pythonPackages/pil/PIL/SunImagePlugin.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: SunImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# Sun image file handling
-#
-# History:
-# 1995-09-10 fl   Created
-# 1996-05-28 fl   Fixed 32-bit alignment
-# 1998-12-29 fl   Import ImagePalette module
-# 2001-12-18 fl   Fixed palette loading (from Jean-Claude Rimbault)
-#
-# Copyright (c) 1997-2001 by Secret Labs AB
-# Copyright (c) 1995-1996 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.3"
-
-
-import string
-import Image, ImageFile, ImagePalette
-
-
-def i16(c):
-    return ord(c[1]) + (ord(c[0])<<8)
-
-def i32(c):
-    return ord(c[3]) + (ord(c[2])<<8) + (ord(c[1])<<16) + (ord(c[0])<<24)
-
-
-def _accept(prefix):
-    return i32(prefix) == 0x59a66a95
-
-##
-# Image plugin for Sun raster files.
-
-class SunImageFile(ImageFile.ImageFile):
-
-    format = "SUN"
-    format_description = "Sun Raster File"
-
-    def _open(self):
-
-        # HEAD
-        s = self.fp.read(32)
-        if i32(s) != 0x59a66a95:
-            raise SyntaxError, "not an SUN raster file"
-
-        offset = 32
-
-        self.size = i32(s[4:8]), i32(s[8:12])
-
-        depth = i32(s[12:16])
-        if depth == 1:
-            self.mode, rawmode = "1", "1;I"
-        elif depth == 8:
-            self.mode = rawmode = "L"
-        elif depth == 24:
-            self.mode, rawmode = "RGB", "BGR"
-        else:
-            raise SyntaxError, "unsupported mode"
-
-        compression = i32(s[20:24])
-
-        if i32(s[24:28]) != 0:
-            length = i32(s[28:32])
-            offset = offset + length
-            self.palette = ImagePalette.raw("RGB;L", self.fp.read(length))
-            if self.mode == "L":
-                self.mode = rawmode = "P"
-
-        stride = (((self.size[0] * depth + 7) / 8) + 3) & (~3)
-
-        if compression == 1:
-            self.tile = [("raw", (0,0)+self.size, offset, (rawmode, stride))]
-        elif compression == 2:
-            self.tile = [("sun_rle", (0,0)+self.size, offset, rawmode)]
-
-#
-# registry
-
-Image.register_open("SUN", SunImageFile, _accept)
-
-Image.register_extension("SUN", ".ras")
diff --git a/pythonPackages/pil/PIL/TarIO.py b/pythonPackages/pil/PIL/TarIO.py
deleted file mode 100644
index fbab8cabb8..0000000000
--- a/pythonPackages/pil/PIL/TarIO.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: TarIO.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# read files from within a tar file
-#
-# History:
-# 95-06-18 fl   Created
-# 96-05-28 fl   Open files in binary mode
-#
-# Copyright (c) Secret Labs AB 1997.
-# Copyright (c) Fredrik Lundh 1995-96.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import ContainerIO
-import string
-
-##
-# A file object that provides read access to a given member of a TAR
-# file.
-
-class TarIO(ContainerIO.ContainerIO):
-
-    ##
-    # Create file object.
-    #
-    # @param tarfile Name of TAR file.
-    # @param file Name of member file.
-
-    def __init__(self, tarfile, file):
-
-        fh = open(tarfile, "rb")
-
-        while 1:
-
-            s = fh.read(512)
-            if len(s) != 512:
-                raise IOError, "unexpected end of tar file"
-
-            name = s[:100]
-            i = string.find(name, chr(0))
-            if i == 0:
-                raise IOError, "cannot find subfile"
-            if i > 0:
-                name = name[:i]
-
-            size = string.atoi(s[124:136], 8)
-
-            if file == name:
-                break
-
-            fh.seek((size + 511) & (~511), 1)
-
-        # Open region
-        ContainerIO.ContainerIO.__init__(self, fh, fh.tell(), size)
diff --git a/pythonPackages/pil/PIL/TgaImagePlugin.py b/pythonPackages/pil/PIL/TgaImagePlugin.py
deleted file mode 100644
index e709de80f4..0000000000
--- a/pythonPackages/pil/PIL/TgaImagePlugin.py
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: TgaImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# TGA file handling
-#
-# History:
-# 95-09-01 fl   created (reads 24-bit files only)
-# 97-01-04 fl   support more TGA versions, including compressed images
-# 98-07-04 fl   fixed orientation and alpha layer bugs
-# 98-09-11 fl   fixed orientation for runlength decoder
-#
-# Copyright (c) Secret Labs AB 1997-98.
-# Copyright (c) Fredrik Lundh 1995-97.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.3"
-
-import Image, ImageFile, ImagePalette
-
-
-def i16(c):
-    return ord(c[0]) + (ord(c[1])<<8)
-
-def i32(c):
-    return ord(c[0]) + (ord(c[1])<<8) + (ord(c[2])<<16) + (ord(c[3])<<24)
-
-
-MODES = {
-    # map imagetype/depth to rawmode
-    (1, 8):  "P",
-    (3, 1):  "1",
-    (3, 8):  "L",
-    (2, 16): "BGR;5",
-    (2, 24): "BGR",
-    (2, 32): "BGRA",
-}
-
-
-def _accept(prefix):
-    return prefix[0] == "\0"
-
-##
-# Image plugin for Targa files.
-
-class TgaImageFile(ImageFile.ImageFile):
-
-    format = "TGA"
-    format_description = "Targa"
-
-    def _open(self):
-
-        # process header
-        s = self.fp.read(18)
-
-        id = ord(s[0])
-
-        colormaptype = ord(s[1])
-        imagetype = ord(s[2])
-
-        depth = ord(s[16])
-
-        flags = ord(s[17])
-
-        self.size = i16(s[12:]), i16(s[14:])
-
-        # validate header fields
-        if id != 0 or colormaptype not in (0, 1) or\
-           self.size[0] <= 0 or self.size[1] <= 0 or\
-           depth not in (8, 16, 24, 32):
-            raise SyntaxError, "not a TGA file"
-
-        # image mode
-        if imagetype in (3, 11):
-            self.mode = "L"
-            if depth == 1:
-                self.mode = "1" # ???
-        elif imagetype in (1, 9):
-            self.mode = "P"
-        elif imagetype in (2, 10):
-            self.mode = "RGB"
-            if depth == 32:
-                self.mode = "RGBA"
-        else:
-            raise SyntaxError, "unknown TGA mode"
-
-        # orientation
-        orientation = flags & 0x30
-        if orientation == 0x20:
-            orientation = 1
-        elif not orientation:
-            orientation = -1
-        else:
-            raise SyntaxError, "unknown TGA orientation"
-
-        if imagetype & 8:
-            self.info["compression"] = "tga_rle"
-
-        if colormaptype:
-            # read palette
-            start, size, mapdepth = i16(s[3:]), i16(s[5:]), i16(s[7:])
-            if mapdepth == 16:
-                self.palette = ImagePalette.raw("BGR;16",
-                    "\0"*2*start + self.fp.read(2*size))
-            elif mapdepth == 24:
-                self.palette = ImagePalette.raw("BGR",
-                    "\0"*3*start + self.fp.read(3*size))
-            elif mapdepth == 32:
-                self.palette = ImagePalette.raw("BGRA",
-                    "\0"*4*start + self.fp.read(4*size))
-
-        # setup tile descriptor
-        try:
-            rawmode = MODES[(imagetype&7, depth)]
-            if imagetype & 8:
-                # compressed
-                self.tile = [("tga_rle", (0, 0)+self.size,
-                              self.fp.tell(), (rawmode, orientation, depth))]
-            else:
-                self.tile = [("raw", (0, 0)+self.size,
-                              self.fp.tell(), (rawmode, 0, orientation))]
-        except KeyError:
-            pass # cannot decode
-
-#
-# registry
-
-Image.register_open("TGA", TgaImageFile, _accept)
-
-Image.register_extension("TGA", ".tga")
diff --git a/pythonPackages/pil/PIL/TiffImagePlugin.py b/pythonPackages/pil/PIL/TiffImagePlugin.py
deleted file mode 100644
index 178066c8f0..0000000000
--- a/pythonPackages/pil/PIL/TiffImagePlugin.py
+++ /dev/null
@@ -1,763 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: TiffImagePlugin.py 2803 2006-07-31 19:18:57Z fredrik $
-#
-# TIFF file handling
-#
-# TIFF is a flexible, if somewhat aged, image file format originally
-# defined by Aldus.  Although TIFF supports a wide variety of pixel
-# layouts and compression methods, the name doesn't really stand for
-# "thousands of incompatible file formats," it just feels that way.
-#
-# To read TIFF data from a stream, the stream must be seekable.  For
-# progressive decoding, make sure to use TIFF files where the tag
-# directory is placed first in the file.
-#
-# History:
-# 1995-09-01 fl   Created
-# 1996-05-04 fl   Handle JPEGTABLES tag
-# 1996-05-18 fl   Fixed COLORMAP support
-# 1997-01-05 fl   Fixed PREDICTOR support
-# 1997-08-27 fl   Added support for rational tags (from Perry Stoll)
-# 1998-01-10 fl   Fixed seek/tell (from Jan Blom)
-# 1998-07-15 fl   Use private names for internal variables
-# 1999-06-13 fl   Rewritten for PIL 1.0 (1.0)
-# 2000-10-11 fl   Additional fixes for Python 2.0 (1.1)
-# 2001-04-17 fl   Fixed rewind support (seek to frame 0) (1.2)
-# 2001-05-12 fl   Added write support for more tags (from Greg Couch) (1.3)
-# 2001-12-18 fl   Added workaround for broken Matrox library
-# 2002-01-18 fl   Don't mess up if photometric tag is missing (D. Alan Stewart)
-# 2003-05-19 fl   Check FILLORDER tag
-# 2003-09-26 fl   Added RGBa support
-# 2004-02-24 fl   Added DPI support; fixed rational write support
-# 2005-02-07 fl   Added workaround for broken Corel Draw 10 files
-# 2006-01-09 fl   Added support for float/double tags (from Russell Nelson)
-#
-# Copyright (c) 1997-2006 by Secret Labs AB.  All rights reserved.
-# Copyright (c) 1995-1997 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "1.3.5"
-
-import Image, ImageFile
-import ImagePalette
-
-import array, string, sys
-
-try:
-    if sys.byteorder == "little":
-        byteorder = "II"
-    else:
-        byteorder = "MM"
-except AttributeError:
-    if ord(array.array("i",[1]).tostring()[0]):
-        byteorder = "II"
-    else:
-        byteorder = "MM"
-
-#
-# --------------------------------------------------------------------
-# Read TIFF files
-
-def il16(c,o=0):
-    return ord(c[o]) + (ord(c[o+1])<<8)
-def il32(c,o=0):
-    return ord(c[o]) + (ord(c[o+1])<<8) + (ord(c[o+2])<<16) + (ord(c[o+3])<<24)
-def ol16(i):
-    return chr(i&255) + chr(i>>8&255)
-def ol32(i):
-    return chr(i&255) + chr(i>>8&255) + chr(i>>16&255) + chr(i>>24&255)
-
-def ib16(c,o=0):
-    return ord(c[o+1]) + (ord(c[o])<<8)
-def ib32(c,o=0):
-    return ord(c[o+3]) + (ord(c[o+2])<<8) + (ord(c[o+1])<<16) + (ord(c[o])<<24)
-
-# a few tag names, just to make the code below a bit more readable
-IMAGEWIDTH = 256
-IMAGELENGTH = 257
-BITSPERSAMPLE = 258
-COMPRESSION = 259
-PHOTOMETRIC_INTERPRETATION = 262
-FILLORDER = 266
-IMAGEDESCRIPTION = 270
-STRIPOFFSETS = 273
-SAMPLESPERPIXEL = 277
-ROWSPERSTRIP = 278
-STRIPBYTECOUNTS = 279
-X_RESOLUTION = 282
-Y_RESOLUTION = 283
-PLANAR_CONFIGURATION = 284
-RESOLUTION_UNIT = 296
-SOFTWARE = 305
-DATE_TIME = 306
-ARTIST = 315
-PREDICTOR = 317
-COLORMAP = 320
-EXTRASAMPLES = 338
-SAMPLEFORMAT = 339
-JPEGTABLES = 347
-COPYRIGHT = 33432
-IPTC_NAA_CHUNK = 33723 # newsphoto properties
-PHOTOSHOP_CHUNK = 34377 # photoshop properties
-
-COMPRESSION_INFO = {
-    # Compression => pil compression name
-    1: "raw",
-    2: "tiff_ccitt",
-    3: "group3",
-    4: "group4",
-    5: "tiff_lzw",
-    6: "tiff_jpeg", # obsolete
-    7: "jpeg",
-    32771: "tiff_raw_16", # 16-bit padding
-    32773: "packbits"
-}
-
-OPEN_INFO = {
-    # (PhotoInterpretation, SampleFormat, FillOrder, BitsPerSample,
-    #  ExtraSamples) => mode, rawmode
-    (0, 1, 1, (1,), ()): ("1", "1;I"),
-    (0, 1, 2, (1,), ()): ("1", "1;IR"),
-    (0, 1, 1, (8,), ()): ("L", "L;I"),
-    (0, 1, 2, (8,), ()): ("L", "L;IR"),
-    (1, 1, 1, (1,), ()): ("1", "1"),
-    (1, 1, 2, (1,), ()): ("1", "1;R"),
-    (1, 1, 1, (8,), ()): ("L", "L"),
-    (1, 1, 1, (8,8), (2,)): ("LA", "LA"),
-    (1, 1, 2, (8,), ()): ("L", "L;R"),
-    (1, 1, 1, (16,), ()): ("I;16", "I;16"),
-    (1, 2, 1, (16,), ()): ("I;16S", "I;16S"),
-    (1, 2, 1, (32,), ()): ("I", "I;32S"),
-    (1, 3, 1, (32,), ()): ("F", "F;32F"),
-    (2, 1, 1, (8,8,8), ()): ("RGB", "RGB"),
-    (2, 1, 2, (8,8,8), ()): ("RGB", "RGB;R"),
-    (2, 1, 1, (8,8,8,8), (0,)): ("RGBX", "RGBX"),
-    (2, 1, 1, (8,8,8,8), (1,)): ("RGBA", "RGBa"),
-    (2, 1, 1, (8,8,8,8), (2,)): ("RGBA", "RGBA"),
-    (2, 1, 1, (8,8,8,8), (999,)): ("RGBA", "RGBA"), # corel draw 10
-    (3, 1, 1, (1,), ()): ("P", "P;1"),
-    (3, 1, 2, (1,), ()): ("P", "P;1R"),
-    (3, 1, 1, (2,), ()): ("P", "P;2"),
-    (3, 1, 2, (2,), ()): ("P", "P;2R"),
-    (3, 1, 1, (4,), ()): ("P", "P;4"),
-    (3, 1, 2, (4,), ()): ("P", "P;4R"),
-    (3, 1, 1, (8,), ()): ("P", "P"),
-    (3, 1, 1, (8,8), (2,)): ("PA", "PA"),
-    (3, 1, 2, (8,), ()): ("P", "P;R"),
-    (5, 1, 1, (8,8,8,8), ()): ("CMYK", "CMYK"),
-    (6, 1, 1, (8,8,8), ()): ("YCbCr", "YCbCr"),
-    (8, 1, 1, (8,8,8), ()): ("LAB", "LAB"),
-}
-
-PREFIXES = ["MM\000\052", "II\052\000", "II\xBC\000"]
-
-def _accept(prefix):
-    return prefix[:4] in PREFIXES
-
-##
-# Wrapper for TIFF IFDs.
-
-class ImageFileDirectory:
-
-    # represents a TIFF tag directory.  to speed things up,
-    # we don't decode tags unless they're asked for.
-
-    def __init__(self, prefix="II"):
-        self.prefix = prefix[:2]
-        if self.prefix == "MM":
-            self.i16, self.i32 = ib16, ib32
-            # FIXME: save doesn't yet support big-endian mode...
-        elif self.prefix == "II":
-            self.i16, self.i32 = il16, il32
-            self.o16, self.o32 = ol16, ol32
-        else:
-            raise SyntaxError("not a TIFF IFD")
-        self.reset()
-
-    def reset(self):
-        self.tags = {}
-        self.tagdata = {}
-        self.next = None
-
-    # dictionary API (sort of)
-
-    def keys(self):
-        return self.tagdata.keys() + self.tags.keys()
-
-    def items(self):
-        items = self.tags.items()
-        for tag in self.tagdata.keys():
-            items.append((tag, self[tag]))
-        return items
-
-    def __len__(self):
-        return len(self.tagdata) + len(self.tags)
-
-    def __getitem__(self, tag):
-        try:
-            return self.tags[tag]
-        except KeyError:
-            type, data = self.tagdata[tag] # unpack on the fly
-            size, handler = self.load_dispatch[type]
-            self.tags[tag] = data = handler(self, data)
-            del self.tagdata[tag]
-            return data
-
-    def get(self, tag, default=None):
-        try:
-            return self[tag]
-        except KeyError:
-            return default
-
-    def getscalar(self, tag, default=None):
-        try:
-            value = self[tag]
-            if len(value) != 1:
-                if tag == SAMPLEFORMAT:
-                    # work around broken (?) matrox library
-                    # (from Ted Wright, via Bob Klimek)
-                    raise KeyError # use default
-                raise ValueError, "not a scalar"
-            return value[0]
-        except KeyError:
-            if default is None:
-                raise
-            return default
-
-    def has_key(self, tag):
-        return self.tags.has_key(tag) or self.tagdata.has_key(tag)
-
-    def __setitem__(self, tag, value):
-        if type(value) is not type(()):
-            value = (value,)
-        self.tags[tag] = value
-
-    # load primitives
-
-    load_dispatch = {}
-
-    def load_byte(self, data):
-        l = []
-        for i in range(len(data)):
-            l.append(ord(data[i]))
-        return tuple(l)
-    load_dispatch[1] = (1, load_byte)
-
-    def load_string(self, data):
-        if data[-1:] == '\0':
-            data = data[:-1]
-        return data
-    load_dispatch[2] = (1, load_string)
-
-    def load_short(self, data):
-        l = []
-        for i in range(0, len(data), 2):
-            l.append(self.i16(data, i))
-        return tuple(l)
-    load_dispatch[3] = (2, load_short)
-
-    def load_long(self, data):
-        l = []
-        for i in range(0, len(data), 4):
-            l.append(self.i32(data, i))
-        return tuple(l)
-    load_dispatch[4] = (4, load_long)
-
-    def load_rational(self, data):
-        l = []
-        for i in range(0, len(data), 8):
-            l.append((self.i32(data, i), self.i32(data, i+4)))
-        return tuple(l)
-    load_dispatch[5] = (8, load_rational)
-
-    def load_float(self, data):
-        a = array.array("f", data)
-        if self.prefix != byteorder:
-            a.byteswap()
-        return tuple(a)
-    load_dispatch[11] = (4, load_float)
-
-    def load_double(self, data):
-        a = array.array("d", data)
-        if self.prefix != byteorder:
-            a.byteswap()
-        return tuple(a)
-    load_dispatch[12] = (8, load_double)
-
-    def load_undefined(self, data):
-        # Untyped data
-        return data
-    load_dispatch[7] = (1, load_undefined)
-
-    def load(self, fp):
-        # load tag dictionary
-
-        self.reset()
-
-        i16 = self.i16
-        i32 = self.i32
-
-        for i in range(i16(fp.read(2))):
-
-            ifd = fp.read(12)
-
-            tag, typ = i16(ifd), i16(ifd, 2)
-
-            if Image.DEBUG:
-                import TiffTags
-                tagname = TiffTags.TAGS.get(tag, "unknown")
-                typname = TiffTags.TYPES.get(typ, "unknown")
-                print "tag: %s (%d)" % (tagname, tag),
-                print "- type: %s (%d)" % (typname, typ),
-
-            try:
-                dispatch = self.load_dispatch[typ]
-            except KeyError:
-                if Image.DEBUG:
-                    print "- unsupported type", typ
-                continue # ignore unsupported type
-
-            size, handler = dispatch
-
-            size = size * i32(ifd, 4)
-
-            # Get and expand tag value
-            if size > 4:
-                here = fp.tell()
-                fp.seek(i32(ifd, 8))
-                data = ImageFile._safe_read(fp, size)
-                fp.seek(here)
-            else:
-                data = ifd[8:8+size]
-
-            if len(data) != size:
-                raise IOError, "not enough data"
-
-            self.tagdata[tag] = typ, data
-
-            if Image.DEBUG:
-                if tag in (COLORMAP, IPTC_NAA_CHUNK, PHOTOSHOP_CHUNK):
-                    print "- value: <table: %d bytes>" % size
-                else:
-                    print "- value:", self[tag]
-
-        self.next = i32(fp.read(4))
-
-    # save primitives
-
-    def save(self, fp):
-
-        o16 = self.o16
-        o32 = self.o32
-
-        fp.write(o16(len(self.tags)))
-
-        # always write in ascending tag order
-        tags = self.tags.items()
-        tags.sort()
-
-        directory = []
-        append = directory.append
-
-        offset = fp.tell() + len(self.tags) * 12 + 4
-
-        stripoffsets = None
-
-        # pass 1: convert tags to binary format
-        for tag, value in tags:
-
-            if Image.DEBUG:
-                import TiffTags
-                tagname = TiffTags.TAGS.get(tag, "unknown")
-                print "save: %s (%d)" % (tagname, tag),
-                print "- value:", value
-
-            if type(value[0]) is type(""):
-                # string data
-                typ = 2
-                data = value = string.join(value, "\0") + "\0"
-
-            else:
-                # integer data
-                if tag == STRIPOFFSETS:
-                    stripoffsets = len(directory)
-                    typ = 4 # to avoid catch-22
-                elif tag in (X_RESOLUTION, Y_RESOLUTION):
-                    # identify rational data fields
-                    typ = 5
-                else:
-                    typ = 3
-                    for v in value:
-                        if v >= 65536:
-                            typ = 4
-                if typ == 3:
-                    data = string.join(map(o16, value), "")
-                else:
-                    data = string.join(map(o32, value), "")
-
-            # figure out if data fits into the directory
-            if len(data) == 4:
-                append((tag, typ, len(value), data, ""))
-            elif len(data) < 4:
-                append((tag, typ, len(value), data + (4-len(data))*"\0", ""))
-            else:
-                count = len(value)
-                if typ == 5:
-                    count = count / 2        # adjust for rational data field
-                append((tag, typ, count, o32(offset), data))
-                offset = offset + len(data)
-                if offset & 1:
-                    offset = offset + 1 # word padding
-
-        # update strip offset data to point beyond auxiliary data
-        if stripoffsets is not None:
-            tag, typ, count, value, data = directory[stripoffsets]
-            assert not data, "multistrip support not yet implemented"
-            value = o32(self.i32(value) + offset)
-            directory[stripoffsets] = tag, typ, count, value, data
-
-        # pass 2: write directory to file
-        for tag, typ, count, value, data in directory:
-            if Image.DEBUG > 1:
-                print tag, typ, count, repr(value), repr(data)
-            fp.write(o16(tag) + o16(typ) + o32(count) + value)
-        fp.write("\0\0\0\0") # end of directory
-
-        # pass 3: write auxiliary data to file
-        for tag, typ, count, value, data in directory:
-            fp.write(data)
-            if len(data) & 1:
-                fp.write("\0")
-
-        return offset
-
-##
-# Image plugin for TIFF files.
-
-class TiffImageFile(ImageFile.ImageFile):
-
-    format = "TIFF"
-    format_description = "Adobe TIFF"
-
-    def _open(self):
-        "Open the first image in a TIFF file"
-
-        # Header
-        ifh = self.fp.read(8)
-
-        if ifh[:4] not in PREFIXES:
-            raise SyntaxError, "not a TIFF file"
-
-        # image file directory (tag dictionary)
-        self.tag = self.ifd = ImageFileDirectory(ifh[:2])
-
-        # setup frame pointers
-        self.__first = self.__next = self.ifd.i32(ifh, 4)
-        self.__frame = -1
-        self.__fp = self.fp
-
-        # and load the first frame
-        self._seek(0)
-
-    def seek(self, frame):
-        "Select a given frame as current image"
-
-        if frame < 0:
-            frame = 0
-        self._seek(frame)
-
-    def tell(self):
-        "Return the current frame number"
-
-        return self._tell()
-
-    def _seek(self, frame):
-
-        self.fp = self.__fp
-        if frame < self.__frame:
-            # rewind file
-            self.__frame = -1
-            self.__next = self.__first
-        while self.__frame < frame:
-            if not self.__next:
-                raise EOFError, "no more images in TIFF file"
-            self.fp.seek(self.__next)
-            self.tag.load(self.fp)
-            self.__next = self.tag.next
-            self.__frame = self.__frame + 1
-        self._setup()
-
-    def _tell(self):
-
-        return self.__frame
-
-    def _decoder(self, rawmode, layer):
-        "Setup decoder contexts"
-
-        args = None
-        if rawmode == "RGB" and self._planar_configuration == 2:
-            rawmode = rawmode[layer]
-        compression = self._compression
-        if compression == "raw":
-            args = (rawmode, 0, 1)
-        elif compression == "jpeg":
-            args = rawmode, ""
-            if self.tag.has_key(JPEGTABLES):
-                # Hack to handle abbreviated JPEG headers
-                self.tile_prefix = self.tag[JPEGTABLES]
-        elif compression == "packbits":
-            args = rawmode
-        elif compression == "tiff_lzw":
-            args = rawmode
-            if self.tag.has_key(317):
-                # Section 14: Differencing Predictor
-                self.decoderconfig = (self.tag[PREDICTOR][0],)
-
-        return args
-
-    def _setup(self):
-        "Setup this image object based on current tags"
-
-        if self.tag.has_key(0xBC01):
-            raise IOError, "Windows Media Photo files not yet supported"
-
-        getscalar = self.tag.getscalar
-
-        # extract relevant tags
-        self._compression = COMPRESSION_INFO[getscalar(COMPRESSION, 1)]
-        self._planar_configuration = getscalar(PLANAR_CONFIGURATION, 1)
-
-        # photometric is a required tag, but not everyone is reading
-        # the specification
-        photo = getscalar(PHOTOMETRIC_INTERPRETATION, 0)
-
-        fillorder = getscalar(FILLORDER, 1)
-
-        if Image.DEBUG:
-            print "*** Summary ***"
-            print "- compression:", self._compression
-            print "- photometric_interpretation:", photo
-            print "- planar_configuration:", self._planar_configuration
-            print "- fill_order:", fillorder
-
-        # size
-        xsize = getscalar(IMAGEWIDTH)
-        ysize = getscalar(IMAGELENGTH)
-        self.size = xsize, ysize
-
-        if Image.DEBUG:
-            print "- size:", self.size
-
-        format = getscalar(SAMPLEFORMAT, 1)
-
-        # mode: check photometric interpretation and bits per pixel
-        key = (
-            photo, format, fillorder,
-            self.tag.get(BITSPERSAMPLE, (1,)),
-            self.tag.get(EXTRASAMPLES, ())
-            )
-        if Image.DEBUG:
-            print "format key:", key
-        try:
-            self.mode, rawmode = OPEN_INFO[key]
-        except KeyError:
-            if Image.DEBUG:
-                print "- unsupported format"
-            raise SyntaxError, "unknown pixel mode"
-
-        if Image.DEBUG:
-            print "- raw mode:", rawmode
-            print "- pil mode:", self.mode
-
-        self.info["compression"] = self._compression
-
-        xdpi = getscalar(X_RESOLUTION, (1, 1))
-        ydpi = getscalar(Y_RESOLUTION, (1, 1))
-
-        if xdpi and ydpi and getscalar(RESOLUTION_UNIT, 1) == 1:
-            xdpi = xdpi[0] / (xdpi[1] or 1)
-            ydpi = ydpi[0] / (ydpi[1] or 1)
-            self.info["dpi"] = xdpi, ydpi
-
-        # build tile descriptors
-        x = y = l = 0
-        self.tile = []
-        if self.tag.has_key(STRIPOFFSETS):
-            # striped image
-            h = getscalar(ROWSPERSTRIP, ysize)
-            w = self.size[0]
-            a = None
-            for o in self.tag[STRIPOFFSETS]:
-                if not a:
-                    a = self._decoder(rawmode, l)
-                self.tile.append(
-                    (self._compression,
-                    (0, min(y, ysize), w, min(y+h, ysize)),
-                    o, a))
-                y = y + h
-                if y >= self.size[1]:
-                    x = y = 0
-                    l = l + 1
-                    a = None
-        elif self.tag.has_key(324):
-            # tiled image
-            w = getscalar(322)
-            h = getscalar(323)
-            a = None
-            for o in self.tag[324]:
-                if not a:
-                    a = self._decoder(rawmode, l)
-                # FIXME: this doesn't work if the image size
-                # is not a multiple of the tile size...
-                self.tile.append(
-                    (self._compression,
-                    (x, y, x+w, y+h),
-                    o, a))
-                x = x + w
-                if x >= self.size[0]:
-                    x, y = 0, y + h
-                    if y >= self.size[1]:
-                        x = y = 0
-                        l = l + 1
-                        a = None
-        else:
-            if Image.DEBUG:
-                print "- unsupported data organization"
-            raise SyntaxError("unknown data organization")
-
-        # fixup palette descriptor
-        if self.mode == "P":
-            palette = map(lambda a: chr(a / 256), self.tag[COLORMAP])
-            self.palette = ImagePalette.raw("RGB;L", string.join(palette, ""))
-
-#
-# --------------------------------------------------------------------
-# Write TIFF files
-
-# little endian is default
-
-SAVE_INFO = {
-    # mode => rawmode, photometrics, sampleformat, bitspersample, extra
-    "1": ("1", 1, 1, (1,), None),
-    "L": ("L", 1, 1, (8,), None),
-    "LA": ("LA", 1, 1, (8,8), 2),
-    "P": ("P", 3, 1, (8,), None),
-    "PA": ("PA", 3, 1, (8,8), 2),
-    "I": ("I;32S", 1, 2, (32,), None),
-    "I;16": ("I;16", 1, 1, (16,), None),
-    "I;16S": ("I;16S", 1, 2, (16,), None),
-    "F": ("F;32F", 1, 3, (32,), None),
-    "RGB": ("RGB", 2, 1, (8,8,8), None),
-    "RGBX": ("RGBX", 2, 1, (8,8,8,8), 0),
-    "RGBA": ("RGBA", 2, 1, (8,8,8,8), 2),
-    "CMYK": ("CMYK", 5, 1, (8,8,8,8), None),
-    "YCbCr": ("YCbCr", 6, 1, (8,8,8), None),
-    "LAB": ("LAB", 8, 1, (8,8,8), None),
-}
-
-def _cvt_res(value):
-    # convert value to TIFF rational number -- (numerator, denominator)
-    if type(value) in (type([]), type(())):
-        assert(len(value) % 2 == 0)
-        return value
-    if type(value) == type(1):
-        return (value, 1)
-    value = float(value)
-    return (int(value * 65536), 65536)
-
-def _save(im, fp, filename):
-
-    try:
-        rawmode, photo, format, bits, extra = SAVE_INFO[im.mode]
-    except KeyError:
-        raise IOError, "cannot write mode %s as TIFF" % im.mode
-
-    ifd = ImageFileDirectory()
-
-    # tiff header (write via IFD to get everything right)
-    fp.write(ifd.prefix + ifd.o16(42) + ifd.o32(8))
-
-    ifd[IMAGEWIDTH] = im.size[0]
-    ifd[IMAGELENGTH] = im.size[1]
-
-    # additions written by Greg Couch, gregc@cgl.ucsf.edu
-    # inspired by image-sig posting from Kevin Cazabon, kcazabon@home.com
-    if hasattr(im, 'tag'):
-        # preserve tags from original TIFF image file
-        for key in (RESOLUTION_UNIT, X_RESOLUTION, Y_RESOLUTION):
-            if im.tag.tagdata.has_key(key):
-                ifd[key] = im.tag.tagdata.get(key)
-    if im.encoderinfo.has_key("description"):
-        ifd[IMAGEDESCRIPTION] = im.encoderinfo["description"]
-    if im.encoderinfo.has_key("resolution"):
-        ifd[X_RESOLUTION] = ifd[Y_RESOLUTION] \
-                                = _cvt_res(im.encoderinfo["resolution"])
-    if im.encoderinfo.has_key("x resolution"):
-        ifd[X_RESOLUTION] = _cvt_res(im.encoderinfo["x resolution"])
-    if im.encoderinfo.has_key("y resolution"):
-        ifd[Y_RESOLUTION] = _cvt_res(im.encoderinfo["y resolution"])
-    if im.encoderinfo.has_key("resolution unit"):
-        unit = im.encoderinfo["resolution unit"]
-        if unit == "inch":
-            ifd[RESOLUTION_UNIT] = 2
-        elif unit == "cm" or unit == "centimeter":
-            ifd[RESOLUTION_UNIT] = 3
-        else:
-            ifd[RESOLUTION_UNIT] = 1
-    if im.encoderinfo.has_key("software"):
-        ifd[SOFTWARE] = im.encoderinfo["software"]
-    if im.encoderinfo.has_key("date time"):
-        ifd[DATE_TIME] = im.encoderinfo["date time"]
-    if im.encoderinfo.has_key("artist"):
-        ifd[ARTIST] = im.encoderinfo["artist"]
-    if im.encoderinfo.has_key("copyright"):
-        ifd[COPYRIGHT] = im.encoderinfo["copyright"]
-
-    dpi = im.encoderinfo.get("dpi")
-    if dpi:
-        ifd[RESOLUTION_UNIT] = 1
-        ifd[X_RESOLUTION] = _cvt_res(dpi[0])
-        ifd[Y_RESOLUTION] = _cvt_res(dpi[1])
-
-    if bits != (1,):
-        ifd[BITSPERSAMPLE] = bits
-        if len(bits) != 1:
-            ifd[SAMPLESPERPIXEL] = len(bits)
-    if extra is not None:
-        ifd[EXTRASAMPLES] = extra
-    if format != 1:
-        ifd[SAMPLEFORMAT] = format
-
-    ifd[PHOTOMETRIC_INTERPRETATION] = photo
-
-    if im.mode == "P":
-        lut = im.im.getpalette("RGB", "RGB;L")
-        ifd[COLORMAP] = tuple(map(lambda v: ord(v) * 256, lut))
-
-    # data orientation
-    stride = len(bits) * ((im.size[0]*bits[0]+7)/8)
-    ifd[ROWSPERSTRIP] = im.size[1]
-    ifd[STRIPBYTECOUNTS] = stride * im.size[1]
-    ifd[STRIPOFFSETS] = 0 # this is adjusted by IFD writer
-    ifd[COMPRESSION] = 1 # no compression
-
-    offset = ifd.save(fp)
-
-    ImageFile._save(im, fp, [
-        ("raw", (0,0)+im.size, offset, (rawmode, stride, 1))
-        ])
-
-#
-# --------------------------------------------------------------------
-# Register
-
-Image.register_open("TIFF", TiffImageFile, _accept)
-Image.register_save("TIFF", _save)
-
-Image.register_extension("TIFF", ".tif")
-Image.register_extension("TIFF", ".tiff")
-
-Image.register_mime("TIFF", "image/tiff")
diff --git a/pythonPackages/pil/PIL/TiffTags.py b/pythonPackages/pil/PIL/TiffTags.py
deleted file mode 100644
index 2795fc3f6d..0000000000
--- a/pythonPackages/pil/PIL/TiffTags.py
+++ /dev/null
@@ -1,200 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: TiffTags.py 2340 2005-03-25 08:05:37Z fredrik $
-#
-# TIFF tags
-#
-# This module provides clear-text names for various well-known
-# TIFF tags.  the TIFF codec works just fine without it.
-#
-# Copyright (c) Secret Labs AB 1999.
-#
-# See the README file for information on usage and redistribution.
-#
-
-##
-# This module provides constants and clear-text names for various
-# well-known TIFF tags.
-##
-
-##
-# Map tag numbers (or tag number, tag value tuples) to tag names.
-
-TAGS = {
-
-    254: "NewSubfileType",
-    255: "SubfileType",
-    256: "ImageWidth",
-    257: "ImageLength",
-    258: "BitsPerSample",
-
-    259: "Compression",
-    (259, 1): "Uncompressed",
-    (259, 2): "CCITT 1d",
-    (259, 3): "Group 3 Fax",
-    (259, 4): "Group 4 Fax",
-    (259, 5): "LZW",
-    (259, 6): "JPEG",
-    (259, 32773): "PackBits",
-
-    262: "PhotometricInterpretation",
-    (262, 0): "WhiteIsZero",
-    (262, 1): "BlackIsZero",
-    (262, 2): "RGB",
-    (262, 3): "RGB Palette",
-    (262, 4): "Transparency Mask",
-    (262, 5): "CMYK",
-    (262, 6): "YCbCr",
-    (262, 8): "CieLAB",
-    (262, 32803): "CFA", # TIFF/EP, Adobe DNG
-    (262, 32892): "LinearRaw", # Adobe DNG
-
-    263: "Thresholding",
-    264: "CellWidth",
-    265: "CellHeight",
-    266: "FillOrder",
-    269: "DocumentName",
-
-    270: "ImageDescription",
-    271: "Make",
-    272: "Model",
-    273: "StripOffsets",
-    274: "Orientation",
-    277: "SamplesPerPixel",
-    278: "RowsPerStrip",
-    279: "StripByteCounts",
-
-    280: "MinSampleValue",
-    281: "MaxSampleValue",
-    282: "XResolution",
-    283: "YResolution",
-    284: "PlanarConfiguration",
-    (284, 1): "Contigous",
-    (284, 2): "Separate",
-
-    285: "PageName",
-    286: "XPosition",
-    287: "YPosition",
-    288: "FreeOffsets",
-    289: "FreeByteCounts",
-
-    290: "GrayResponseUnit",
-    291: "GrayResponseCurve",
-    292: "T4Options",
-    293: "T6Options",
-    296: "ResolutionUnit",
-    297: "PageNumber",
-
-    301: "TransferFunction",
-    305: "Software",
-    306: "DateTime",
-
-    315: "Artist",
-    316: "HostComputer",
-    317: "Predictor",
-    318: "WhitePoint",
-    319: "PrimaryChromaticies",
-
-    320: "ColorMap",
-    321: "HalftoneHints",
-    322: "TileWidth",
-    323: "TileLength",
-    324: "TileOffsets",
-    325: "TileByteCounts",
-
-    332: "InkSet",
-    333: "InkNames",
-    334: "NumberOfInks",
-    336: "DotRange",
-    337: "TargetPrinter",
-    338: "ExtraSamples",
-    339: "SampleFormat",
-
-    340: "SMinSampleValue",
-    341: "SMaxSampleValue",
-    342: "TransferRange",
-
-    347: "JPEGTables",
-
-    # obsolete JPEG tags
-    512: "JPEGProc",
-    513: "JPEGInterchangeFormat",
-    514: "JPEGInterchangeFormatLength",
-    515: "JPEGRestartInterval",
-    517: "JPEGLosslessPredictors",
-    518: "JPEGPointTransforms",
-    519: "JPEGQTables",
-    520: "JPEGDCTables",
-    521: "JPEGACTables",
-
-    529: "YCbCrCoefficients",
-    530: "YCbCrSubSampling",
-    531: "YCbCrPositioning",
-    532: "ReferenceBlackWhite",
-
-    33432: "Copyright",
-
-    # various extensions (should check specs for "official" names)
-    33723: "IptcNaaInfo",
-    34377: "PhotoshopInfo",
-
-    # Adobe DNG
-    50706: "DNGVersion",
-    50707: "DNGBackwardVersion",
-    50708: "UniqueCameraModel",
-    50709: "LocalizedCameraModel",
-    50710: "CFAPlaneColor",
-    50711: "CFALayout",
-    50712: "LinearizationTable",
-    50713: "BlackLevelRepeatDim",
-    50714: "BlackLevel",
-    50715: "BlackLevelDeltaH",
-    50716: "BlackLevelDeltaV",
-    50717: "WhiteLevel",
-    50718: "DefaultScale",
-    50741: "BestQualityScale",
-    50719: "DefaultCropOrigin",
-    50720: "DefaultCropSize",
-    50778: "CalibrationIlluminant1",
-    50779: "CalibrationIlluminant2",
-    50721: "ColorMatrix1",
-    50722: "ColorMatrix2",
-    50723: "CameraCalibration1",
-    50724: "CameraCalibration2",
-    50725: "ReductionMatrix1",
-    50726: "ReductionMatrix2",
-    50727: "AnalogBalance",
-    50728: "AsShotNeutral",
-    50729: "AsShotWhiteXY",
-    50730: "BaselineExposure",
-    50731: "BaselineNoise",
-    50732: "BaselineSharpness",
-    50733: "BayerGreenSplit",
-    50734: "LinearResponseLimit",
-    50735: "CameraSerialNumber",
-    50736: "LensInfo",
-    50737: "ChromaBlurRadius",
-    50738: "AntiAliasStrength",
-    50740: "DNGPrivateData",
-    50741: "MakerNoteSafety",
-}
-
-##
-# Map type numbers to type names.
-
-TYPES = {
-
-    1: "byte",
-    2: "ascii",
-    3: "short",
-    4: "long",
-    5: "rational",
-    6: "signed byte",
-    7: "undefined",
-    8: "signed short",
-    9: "signed long",
-    10: "signed rational",
-    11: "float",
-    12: "double",
-
-}
diff --git a/pythonPackages/pil/PIL/WalImageFile.py b/pythonPackages/pil/PIL/WalImageFile.py
deleted file mode 100644
index 34e7fc23ff..0000000000
--- a/pythonPackages/pil/PIL/WalImageFile.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: WalImageFile.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# WAL file handling
-#
-# History:
-# 2003-04-23 fl   created
-#
-# Copyright (c) 2003 by Fredrik Lundh.
-#
-# See the README file for information on usage and redistribution.
-#
-
-# NOTE: This format cannot be automatically recognized, so the reader
-# is not registered for use with Image.open().  To open a WEL file, use
-# the WalImageFile.open() function instead.
-
-# This reader is based on the specification available from:
-#    http://www.flipcode.com/tutorials/tut_q2levels.shtml
-# and has been tested with a few sample files found using google.
-
-import Image
-
-def i32(c, o=0):
-    return ord(c[o])+(ord(c[o+1])<<8)+(ord(c[o+2])<<16)+(ord(c[o+3])<<24)
-
-##
-# Load texture from a Quake2 WAL texture file.
-# <p>
-# By default, a Quake2 standard palette is attached to the texture.
-# To override the palette, use the <b>putpalette</b> method.
-#
-# @param filename WAL file name, or an opened file handle.
-# @return An image instance.
-
-def open(filename):
-    # FIXME: modify to return a WalImageFile instance instead of
-    # plain Image object ?
-
-    if hasattr(filename, "read"):
-        fp = filename
-    else:
-        import __builtin__
-        fp = __builtin__.open(filename, "rb")
-
-    # read header fields
-    header = fp.read(32+24+32+12)
-    size = i32(header, 32), i32(header, 36)
-    offset = i32(header, 40)
-
-    # load pixel data
-    fp.seek(offset)
-
-    im = Image.fromstring("P", size, fp.read(size[0] * size[1]))
-    im.putpalette(quake2palette)
-
-    im.format = "WAL"
-    im.format_description = "Quake2 Texture"
-
-    # strings are null-terminated
-    im.info["name"] = header[:32].split("\0", 1)[0]
-    next_name = header[56:56+32].split("\0", 1)[0]
-    if next_name:
-        im.info["next_name"] = next_name
-
-    return im
-
-
-quake2palette = (
-    # default palette taken from piffo 0.93 by Hans Häggström
-    "\x01\x01\x01\x0b\x0b\x0b\x12\x12\x12\x17\x17\x17\x1b\x1b\x1b\x1e"
-    "\x1e\x1e\x22\x22\x22\x26\x26\x26\x29\x29\x29\x2c\x2c\x2c\x2f\x2f"
-    "\x2f\x32\x32\x32\x35\x35\x35\x37\x37\x37\x3a\x3a\x3a\x3c\x3c\x3c"
-    "\x24\x1e\x13\x22\x1c\x12\x20\x1b\x12\x1f\x1a\x10\x1d\x19\x10\x1b"
-    "\x17\x0f\x1a\x16\x0f\x18\x14\x0d\x17\x13\x0d\x16\x12\x0d\x14\x10"
-    "\x0b\x13\x0f\x0b\x10\x0d\x0a\x0f\x0b\x0a\x0d\x0b\x07\x0b\x0a\x07"
-    "\x23\x23\x26\x22\x22\x25\x22\x20\x23\x21\x1f\x22\x20\x1e\x20\x1f"
-    "\x1d\x1e\x1d\x1b\x1c\x1b\x1a\x1a\x1a\x19\x19\x18\x17\x17\x17\x16"
-    "\x16\x14\x14\x14\x13\x13\x13\x10\x10\x10\x0f\x0f\x0f\x0d\x0d\x0d"
-    "\x2d\x28\x20\x29\x24\x1c\x27\x22\x1a\x25\x1f\x17\x38\x2e\x1e\x31"
-    "\x29\x1a\x2c\x25\x17\x26\x20\x14\x3c\x30\x14\x37\x2c\x13\x33\x28"
-    "\x12\x2d\x24\x10\x28\x1f\x0f\x22\x1a\x0b\x1b\x14\x0a\x13\x0f\x07"
-    "\x31\x1a\x16\x30\x17\x13\x2e\x16\x10\x2c\x14\x0d\x2a\x12\x0b\x27"
-    "\x0f\x0a\x25\x0f\x07\x21\x0d\x01\x1e\x0b\x01\x1c\x0b\x01\x1a\x0b"
-    "\x01\x18\x0a\x01\x16\x0a\x01\x13\x0a\x01\x10\x07\x01\x0d\x07\x01"
-    "\x29\x23\x1e\x27\x21\x1c\x26\x20\x1b\x25\x1f\x1a\x23\x1d\x19\x21"
-    "\x1c\x18\x20\x1b\x17\x1e\x19\x16\x1c\x18\x14\x1b\x17\x13\x19\x14"
-    "\x10\x17\x13\x0f\x14\x10\x0d\x12\x0f\x0b\x0f\x0b\x0a\x0b\x0a\x07"
-    "\x26\x1a\x0f\x23\x19\x0f\x20\x17\x0f\x1c\x16\x0f\x19\x13\x0d\x14"
-    "\x10\x0b\x10\x0d\x0a\x0b\x0a\x07\x33\x22\x1f\x35\x29\x26\x37\x2f"
-    "\x2d\x39\x35\x34\x37\x39\x3a\x33\x37\x39\x30\x34\x36\x2b\x31\x34"
-    "\x27\x2e\x31\x22\x2b\x2f\x1d\x28\x2c\x17\x25\x2a\x0f\x20\x26\x0d"
-    "\x1e\x25\x0b\x1c\x22\x0a\x1b\x20\x07\x19\x1e\x07\x17\x1b\x07\x14"
-    "\x18\x01\x12\x16\x01\x0f\x12\x01\x0b\x0d\x01\x07\x0a\x01\x01\x01"
-    "\x2c\x21\x21\x2a\x1f\x1f\x29\x1d\x1d\x27\x1c\x1c\x26\x1a\x1a\x24"
-    "\x18\x18\x22\x17\x17\x21\x16\x16\x1e\x13\x13\x1b\x12\x12\x18\x10"
-    "\x10\x16\x0d\x0d\x12\x0b\x0b\x0d\x0a\x0a\x0a\x07\x07\x01\x01\x01"
-    "\x2e\x30\x29\x2d\x2e\x27\x2b\x2c\x26\x2a\x2a\x24\x28\x29\x23\x27"
-    "\x27\x21\x26\x26\x1f\x24\x24\x1d\x22\x22\x1c\x1f\x1f\x1a\x1c\x1c"
-    "\x18\x19\x19\x16\x17\x17\x13\x13\x13\x10\x0f\x0f\x0d\x0b\x0b\x0a"
-    "\x30\x1e\x1b\x2d\x1c\x19\x2c\x1a\x17\x2a\x19\x14\x28\x17\x13\x26"
-    "\x16\x10\x24\x13\x0f\x21\x12\x0d\x1f\x10\x0b\x1c\x0f\x0a\x19\x0d"
-    "\x0a\x16\x0b\x07\x12\x0a\x07\x0f\x07\x01\x0a\x01\x01\x01\x01\x01"
-    "\x28\x29\x38\x26\x27\x36\x25\x26\x34\x24\x24\x31\x22\x22\x2f\x20"
-    "\x21\x2d\x1e\x1f\x2a\x1d\x1d\x27\x1b\x1b\x25\x19\x19\x21\x17\x17"
-    "\x1e\x14\x14\x1b\x13\x12\x17\x10\x0f\x13\x0d\x0b\x0f\x0a\x07\x07"
-    "\x2f\x32\x29\x2d\x30\x26\x2b\x2e\x24\x29\x2c\x21\x27\x2a\x1e\x25"
-    "\x28\x1c\x23\x26\x1a\x21\x25\x18\x1e\x22\x14\x1b\x1f\x10\x19\x1c"
-    "\x0d\x17\x1a\x0a\x13\x17\x07\x10\x13\x01\x0d\x0f\x01\x0a\x0b\x01"
-    "\x01\x3f\x01\x13\x3c\x0b\x1b\x39\x10\x20\x35\x14\x23\x31\x17\x23"
-    "\x2d\x18\x23\x29\x18\x3f\x3f\x3f\x3f\x3f\x39\x3f\x3f\x31\x3f\x3f"
-    "\x2a\x3f\x3f\x20\x3f\x3f\x14\x3f\x3c\x12\x3f\x39\x0f\x3f\x35\x0b"
-    "\x3f\x32\x07\x3f\x2d\x01\x3d\x2a\x01\x3b\x26\x01\x39\x21\x01\x37"
-    "\x1d\x01\x34\x1a\x01\x32\x16\x01\x2f\x12\x01\x2d\x0f\x01\x2a\x0b"
-    "\x01\x27\x07\x01\x23\x01\x01\x1d\x01\x01\x17\x01\x01\x10\x01\x01"
-    "\x3d\x01\x01\x19\x19\x3f\x3f\x01\x01\x01\x01\x3f\x16\x16\x13\x10"
-    "\x10\x0f\x0d\x0d\x0b\x3c\x2e\x2a\x36\x27\x20\x30\x21\x18\x29\x1b"
-    "\x10\x3c\x39\x37\x37\x32\x2f\x31\x2c\x28\x2b\x26\x21\x30\x22\x20"
-)
-
-if __name__ == "__main__":
-    im = open("../hacks/sample.wal")
-    print im.info, im.mode, im.size
-    im.save("../out.png")
diff --git a/pythonPackages/pil/PIL/WmfImagePlugin.py b/pythonPackages/pil/PIL/WmfImagePlugin.py
deleted file mode 100644
index 21911606eb..0000000000
--- a/pythonPackages/pil/PIL/WmfImagePlugin.py
+++ /dev/null
@@ -1,148 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: WmfImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# WMF stub codec
-#
-# history:
-# 1996-12-14 fl   Created
-# 2004-02-22 fl   Turned into a stub driver
-# 2004-02-23 fl   Added EMF support
-#
-# Copyright (c) Secret Labs AB 1997-2004.  All rights reserved.
-# Copyright (c) Fredrik Lundh 1996.
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.2"
-
-import Image, ImageFile
-
-_handler = None
-
-##
-# Install application-specific WMF image handler.
-#
-# @param handler Handler object.
-
-def register_handler(handler):
-    global _handler
-    _handler = handler
-
-# --------------------------------------------------------------------
-
-def word(c, o=0):
-    return ord(c[o]) + (ord(c[o+1])<<8)
-
-def short(c, o=0):
-    v = ord(c[o]) + (ord(c[o+1])<<8)
-    if v >= 32768:
-        v = v - 65536
-    return v
-
-def dword(c, o=0):
-    return ord(c[o]) + (ord(c[o+1])<<8) + (ord(c[o+2])<<16) + (ord(c[o+3])<<24)
-
-def long(c, o=0):
-    return dword(c, o)
-
-#
-# --------------------------------------------------------------------
-# Read WMF file
-
-def _accept(prefix):
-    return (
-        prefix[:6] == "\xd7\xcd\xc6\x9a\x00\x00" or
-        prefix[:4] == "\x01\x00\x00\x00"
-        )
-
-##
-# Image plugin for Windows metafiles.
-
-class WmfStubImageFile(ImageFile.StubImageFile):
-
-    format = "WMF"
-    format_description = "Windows Metafile"
-
-    def _open(self):
-
-        # check placable header
-        s = self.fp.read(80)
-
-        if s[:6] == "\xd7\xcd\xc6\x9a\x00\x00":
-
-            # placeable windows metafile
-
-            # get units per inch
-            inch = word(s, 14)
-
-            # get bounding box
-            x0 = short(s, 6); y0 = short(s, 8)
-            x1 = short(s, 10); y1 = short(s, 12)
-
-            # normalize size to 72 dots per inch
-            size = (x1 - x0) * 72 / inch, (y1 - y0) * 72 / inch
-
-            self.info["wmf_bbox"] = x0, y0, x1, y1
-
-            self.info["dpi"] = 72
-
-            # print self.mode, self.size, self.info
-
-            # sanity check (standard metafile header)
-            if s[22:26] != "\x01\x00\t\x00":
-                raise SyntaxError("Unsupported WMF file format")
-
-        elif long(s) == 1 and s[40:44] == " EMF":
-            # enhanced metafile
-
-            # get bounding box
-            x0 = long(s, 8); y0 = long(s, 12)
-            x1 = long(s, 16); y1 = long(s, 20)
-
-            # get frame (in 0.01 millimeter units)
-            frame = long(s, 24), long(s, 28), long(s, 32), long(s, 36)
-
-            # normalize size to 72 dots per inch
-            size = x1 - x0, y1 - y0
-
-            # calculate dots per inch from bbox and frame
-            xdpi = 2540 * (x1 - y0) / (frame[2] - frame[0])
-            ydpi = 2540 * (y1 - y0) / (frame[3] - frame[1])
-
-            self.info["wmf_bbox"] = x0, y0, x1, y1
-
-            if xdpi == ydpi:
-                self.info["dpi"] = xdpi
-            else:
-                self.info["dpi"] = xdpi, ydpi
-
-        else:
-            raise SyntaxError("Unsupported file format")
-
-        self.mode = "RGB"
-        self.size = size
-
-        loader = self._load()
-        if loader:
-            loader.open(self)
-
-    def _load(self):
-        return _handler
-
-
-def _save(im, fp, filename):
-    if _handler is None or not hasattr("_handler", "save"):
-        raise IOError("WMF save handler not installed")
-    _handler.save(im, fp, filename)
-
-#
-# --------------------------------------------------------------------
-# Registry stuff
-
-Image.register_open(WmfStubImageFile.format, WmfStubImageFile, _accept)
-Image.register_save(WmfStubImageFile.format, _save)
-
-Image.register_extension(WmfStubImageFile.format, ".wmf")
-Image.register_extension(WmfStubImageFile.format, ".emf")
diff --git a/pythonPackages/pil/PIL/XVThumbImagePlugin.py b/pythonPackages/pil/PIL/XVThumbImagePlugin.py
deleted file mode 100644
index 4a9c0d6489..0000000000
--- a/pythonPackages/pil/PIL/XVThumbImagePlugin.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: XVThumbImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# XV Thumbnail file handler by Charles E. "Gene" Cash
-# (gcash@magicnet.net)
-#
-# see xvcolor.c and xvbrowse.c in the sources to John Bradley's XV,
-# available from ftp://ftp.cis.upenn.edu/pub/xv/
-#
-# history:
-# 98-08-15 cec  created (b/w only)
-# 98-12-09 cec  added color palette
-# 98-12-28 fl   added to PIL (with only a few very minor modifications)
-#
-# To do:
-# FIXME: make save work (this requires quantization support)
-#
-
-__version__ = "0.1"
-
-import string
-import Image, ImageFile, ImagePalette
-
-# standard color palette for thumbnails (RGB332)
-PALETTE = ""
-for r in range(8):
-    for g in range(8):
-        for b in range(4):
-            PALETTE = PALETTE + (chr((r*255)/7)+chr((g*255)/7)+chr((b*255)/3))
-
-##
-# Image plugin for XV thumbnail images.
-
-class XVThumbImageFile(ImageFile.ImageFile):
-
-    format = "XVThumb"
-    format_description = "XV thumbnail image"
-
-    def _open(self):
-
-        # check magic
-        s = self.fp.read(6)
-        if s != "P7 332":
-            raise SyntaxError, "not an XV thumbnail file"
-
-        # skip info comments
-        while 1:
-            s = string.strip(self.fp.readline())
-            if s == "#END_OF_COMMENTS":
-                break
-
-        # read header line
-        s = string.split(self.fp.readline())
-
-        self.mode = "P"
-        self.size = int(s[0]), int(s[1])
-
-        self.palette = ImagePalette.raw("RGB", PALETTE)
-
-        self.tile = [
-            ("raw", (0, 0)+self.size,
-             self.fp.tell(), (self.mode, 0, 1)
-             )]
-
-# --------------------------------------------------------------------
-
-Image.register_open("XVThumb", XVThumbImageFile)
diff --git a/pythonPackages/pil/PIL/XbmImagePlugin.py b/pythonPackages/pil/PIL/XbmImagePlugin.py
deleted file mode 100644
index a1dccea5cd..0000000000
--- a/pythonPackages/pil/PIL/XbmImagePlugin.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: XbmImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# XBM File handling
-#
-# History:
-# 1995-09-08 fl   Created
-# 1996-11-01 fl   Added save support
-# 1997-07-07 fl   Made header parser more tolerant
-# 1997-07-22 fl   Fixed yet another parser bug
-# 2001-02-17 fl   Use 're' instead of 'regex' (Python 2.1) (0.4)
-# 2001-05-13 fl   Added hotspot handling (based on code from Bernhard Herzog)
-# 2004-02-24 fl   Allow some whitespace before first #define
-#
-# Copyright (c) 1997-2004 by Secret Labs AB
-# Copyright (c) 1996-1997 by Fredrik Lundh
-#
-# See the README file for information on usage and redistribution.
-#
-
-__version__ = "0.6"
-
-import re, string
-import Image, ImageFile
-
-# XBM header
-xbm_head = re.compile(
-    "\s*#define[ \t]+[^_]*_width[ \t]+(?P<width>[0-9]+)[\r\n]+"
-    "#define[ \t]+[^_]*_height[ \t]+(?P<height>[0-9]+)[\r\n]+"
-    "(?P<hotspot>"
-    "#define[ \t]+[^_]*_x_hot[ \t]+(?P<xhot>[0-9]+)[\r\n]+"
-    "#define[ \t]+[^_]*_y_hot[ \t]+(?P<yhot>[0-9]+)[\r\n]+"
-    ")?"
-    "[\\000-\\377]*_bits\\[\\]"
-)
-
-def _accept(prefix):
-    return string.lstrip(prefix)[:7] == "#define"
-
-##
-# Image plugin for X11 bitmaps.
-
-class XbmImageFile(ImageFile.ImageFile):
-
-    format = "XBM"
-    format_description = "X11 Bitmap"
-
-    def _open(self):
-
-        m = xbm_head.match(self.fp.read(512))
-
-        if m:
-
-            xsize = int(m.group("width"))
-            ysize = int(m.group("height"))
-
-            if m.group("hotspot"):
-                self.info["hotspot"] = (
-                    int(m.group("xhot")), int(m.group("yhot"))
-                    )
-
-            self.mode = "1"
-            self.size = xsize, ysize
-
-            self.tile = [("xbm", (0, 0)+self.size, m.end(), None)]
-
-
-def _save(im, fp, filename):
-
-    if im.mode != "1":
-        raise IOError, "cannot write mode %s as XBM" % im.mode
-
-    fp.write("#define im_width %d\n" % im.size[0])
-    fp.write("#define im_height %d\n" % im.size[1])
-
-    hotspot = im.encoderinfo.get("hotspot")
-    if hotspot:
-        fp.write("#define im_x_hot %d\n" % hotspot[0])
-        fp.write("#define im_y_hot %d\n" % hotspot[1])
-
-    fp.write("static char im_bits[] = {\n")
-
-    ImageFile._save(im, fp, [("xbm", (0,0)+im.size, 0, None)])
-
-    fp.write("};\n")
-
-
-Image.register_open("XBM", XbmImageFile, _accept)
-Image.register_save("XBM", _save)
-
-Image.register_extension("XBM", ".xbm")
-
-Image.register_mime("XBM", "image/xbm")
diff --git a/pythonPackages/pil/PIL/XpmImagePlugin.py b/pythonPackages/pil/PIL/XpmImagePlugin.py
deleted file mode 100644
index b8ac01f37f..0000000000
--- a/pythonPackages/pil/PIL/XpmImagePlugin.py
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: XpmImagePlugin.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# XPM File handling
-#
-# History:
-# 1996-12-29 fl   Created
-# 2001-02-17 fl   Use 're' instead of 'regex' (Python 2.1) (0.7)
-#
-# Copyright (c) Secret Labs AB 1997-2001.
-# Copyright (c) Fredrik Lundh 1996-2001.
-#
-# See the README file for information on usage and redistribution.
-#
-
-
-__version__ = "0.2"
-
-
-import re, string
-import Image, ImageFile, ImagePalette
-
-# XPM header
-xpm_head = re.compile("\"([0-9]*) ([0-9]*) ([0-9]*) ([0-9]*)")
-
-
-def _accept(prefix):
-    return prefix[:9] == "/* XPM */"
-
-##
-# Image plugin for X11 pixel maps.
-
-class XpmImageFile(ImageFile.ImageFile):
-
-    format = "XPM"
-    format_description = "X11 Pixel Map"
-
-    def _open(self):
-
-        if not _accept(self.fp.read(9)):
-            raise SyntaxError, "not an XPM file"
-
-        # skip forward to next string
-        while 1:
-            s = self.fp.readline()
-            if not s:
-                raise SyntaxError, "broken XPM file"
-            m = xpm_head.match(s)
-            if m:
-                break
-
-        self.size = int(m.group(1)), int(m.group(2))
-
-        pal = int(m.group(3))
-        bpp = int(m.group(4))
-
-        if pal > 256 or bpp != 1:
-            raise ValueError, "cannot read this XPM file"
-
-        #
-        # load palette description
-
-        palette = ["\0\0\0"] * 256
-
-        for i in range(pal):
-
-            s = self.fp.readline()
-            if s[-2:] == '\r\n':
-                s = s[:-2]
-            elif s[-1:] in '\r\n':
-                s = s[:-1]
-
-            c = ord(s[1])
-            s = string.split(s[2:-2])
-
-            for i in range(0, len(s), 2):
-
-                if s[i] == "c":
-
-                    # process colour key
-                    rgb = s[i+1]
-                    if rgb == "None":
-                        self.info["transparency"] = c
-                    elif rgb[0] == "#":
-                        # FIXME: handle colour names (see ImagePalette.py)
-                        rgb = string.atoi(rgb[1:], 16)
-                        palette[c] = chr((rgb >> 16) & 255) +\
-                                     chr((rgb >> 8) & 255) +\
-                                     chr(rgb & 255)
-                    else:
-                        # unknown colour
-                        raise ValueError, "cannot read this XPM file"
-                    break
-
-            else:
-
-                # missing colour key
-                raise ValueError, "cannot read this XPM file"
-
-        self.mode = "P"
-        self.palette = ImagePalette.raw("RGB", string.join(palette, ""))
-
-        self.tile = [("raw", (0, 0)+self.size, self.fp.tell(), ("P", 0, 1))]
-
-    def load_read(self, bytes):
-
-        #
-        # load all image data in one chunk
-
-        xsize, ysize = self.size
-
-        s = [None] * ysize
-
-        for i in range(ysize):
-            s[i] = string.ljust(self.fp.readline()[1:xsize+1], xsize)
-
-        self.fp = None
-
-        return string.join(s, "")
-
-#
-# Registry
-
-Image.register_open("XPM", XpmImageFile, _accept)
-
-Image.register_extension("XPM", ".xpm")
-
-Image.register_mime("XPM", "image/xpm")
diff --git a/pythonPackages/pil/PIL/__init__.py b/pythonPackages/pil/PIL/__init__.py
deleted file mode 100644
index 32908830c2..0000000000
--- a/pythonPackages/pil/PIL/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# The Python Imaging Library.
-# $Id: __init__.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# package placeholder
-#
-# Copyright (c) 1999 by Secret Labs AB.
-#
-# See the README file for information on usage and redistribution.
-#
-
-# ;-)
diff --git a/pythonPackages/pil/README b/pythonPackages/pil/README
deleted file mode 100644
index 46a53de101..0000000000
--- a/pythonPackages/pil/README
+++ /dev/null
@@ -1,270 +0,0 @@
-The Python Imaging Library
-$Id: README 2939 2006-12-03 13:43:51Z fredrik $
-
-Release 1.1.6 (December 3, 2006)
-
-====================================================================
-The Python Imaging Library 1.1.6
-====================================================================
-
-Contents
---------
-
-+ Introduction
-+ Support Options
-  - Commercial support
-  - Free support
-+ Software License
-+ Build instructions (all platforms)
-  - Additional notes for Mac OS X
-  - Additional notes for Windows
-
---------------------------------------------------------------------
-Introduction
---------------------------------------------------------------------
-
-The Python Imaging Library (PIL) adds image processing capabilities
-to your Python environment.  This library provides extensive file
-format support, an efficient internal representation, and powerful
-image processing capabilities.
-
-This source kit has been built and tested on Windows NT/2000/XP, Mac
-OS X, and most major Unix platforms (including Alpha, Solaris, and
-Intel systems).  We believe that it should work on most modern
-platforms (people are using it on Crays, after all ;-)
-
-The main distribution site for this software is:
-
-        http://www.pythonware.com/products/pil/
-
-That site also contains information about free and commercial support
-options, PIL add-ons, answers to frequently asked questions, and more.
-
-
-Development versions (alphas, betas) are available here:
-
-        http://effbot.org/downloads/
-
-
-The PIL handbook is not included in this distribution; to get the
-latest version, check:
-
-        http://www.pythonware.com/library/
-        http://effbot.org/books/imagingbook/ (drafts)
-
-
-For installation and licensing details, see below.
-
-
---------------------------------------------------------------------
-Support Options
---------------------------------------------------------------------
-
-+ Commercial Support
-
-Secret Labs (PythonWare) offers support contracts for companies using
-the Python Imaging Library in commercial applications, and in mission-
-critical environments.  The support contract includes technical support,
-bug fixes, extensions to the PIL library, sample applications, and more.
-
-For the full story, check:
-
-        http://www.pythonware.com/products/pil/support.htm
-
-
-+ Free Support
-
-For support and general questions on the Python Imaging Library, send
-e-mail to the Image SIG mailing list:
-
-        image-sig@python.org
-
-You can join the Image SIG by sending a mail to:
-
-        image-sig-request@python.org
-
-Put "subscribe" in the message body to automatically subscribe to the
-list, or "help" to get additional information.  Alternatively, you can
-send your questions to the Python mailing list, python-list@python.org,
-or post them to the newsgroup comp.lang.python.  DO NOT SEND SUPPORT
-QUESTIONS TO PYTHONWARE ADDRESSES.
-
-
---------------------------------------------------------------------
-Software License
---------------------------------------------------------------------
-
-The Python Imaging Library is
-
-Copyright (c) 1997-2006 by Secret Labs AB
-Copyright (c) 1995-2006 by Fredrik Lundh
-
-By obtaining, using, and/or copying this software and/or its
-associated documentation, you agree that you have read, understood,
-and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its
-associated documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appears in all
-copies, and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of Secret Labs
-AB or the author not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-
---------------------------------------------------------------------
-Build instructions (all platforms)
---------------------------------------------------------------------
-
-For a list of changes in this release, see the CHANGES document.
-
-0. If you're in a hurry, try this:
-
-        $ gunzip Imaging-1.1.6.tar.gz
-        $ tar xvf Imaging-1.1.6.tar
-        $ cd Imaging-1.1.6
-        $ python setup.py install
-
-   If you prefer to know what you're doing, read on.
-
-
-1. Prerequisites.
-
-   If you need any of the features described below, make sure you
-   have the necessary libraries before building PIL.
-
-   feature              library
-   -----------------------------------------------------------------
-   JPEG support         libjpeg (6a or 6b)
-
-                        http://www.ijg.org
-                        http://www.ijg.org/files/jpegsrc.v6b.tar.gz
-                        ftp://ftp.uu.net/graphics/jpeg/
-
-   PNG support          zlib (1.2.3 or later is recommended)
-
-                        http://www.gzip.org/zlib/
-
-   OpenType/TrueType    freetype2 (2.1.3 or later is recommended)
-   support              
-                        http://www.freetype.org
-                        http://freetype.sourceforge.net  
-
-   If you have a recent Linux version, the libraries provided with
-   the operating system usually work just fine.  If some library is
-   missing, installing a prebuilt version (jpeg-devel, zlib-devel,
-   etc) is usually easier than building from source.
-
-   If you're using Mac OS X, you can use the 'fink' tool to install
-   missing libraries (also see the Mac OS X section below).
-
-   Similar tools are available for many other platforms (such as
-   'apt-get' for Debian).
-
-
-2. To build under Python 1.5.2, you need to install the stand-alone
-   version of the distutils library:
-
-       http://www.python.org/sigs/distutils-sig/download.html
-
-   For newer releases, the distutils library is included in the
-   Python standard library.
-
-
-3. If you didn't build Python from sources, make sure you have
-   Python's build support files on your machine.  If you've down-
-   loaded a prebuilt package (e.g. a Linux RPM), you probably
-   need additional developer packages.  Look for packages named
-   "python-devel", "py-dev", or similar.
-
-
-4. When you have everything you need, unpack the PIL distribution
-   (the file Imaging-1.1.6.tar.gz) in your Python extensions
-   directory (if you have one, that is.  If not, feel free to
-   unpack it in any other suitable directory).
-
-        $ cd Python-2.4/Extensions # example
-        $ gunzip Imaging-1.1.6.tar.gz
-        $ tar xvf Imaging-1.1.6.tar
-
-
-5. Build the library.  We recommend that you do an in-place build,
-   and run the self test before installing.
-
-        $ cd Imaging-1.1.6
-        $ python setup.py build_ext -i
-        $ python selftest.py
-
-   When the build finishes, a summary report is shown.  Make sure
-   that the optional components you need are included.
-
-        ----------------------------------------------------------------
-        PIL 1.1.6 BUILD SUMMARY
-        ----------------------------------------------------------------
-        *** TKINTER support not available (Tcl/Tk 8.3 libraries needed)
-        --- JPEG support ok
-        --- ZLIB (PNG/ZIP) support ok
-        --- FREETYPE support ok
-        ----------------------------------------------------------------
-
-   If the build script won't find a given component, you can edit the
-   setup.py file and set the appropriate ROOT variable.  For details,
-   see instructions in the file.
-
-
-6. If the setup.py and selftest.py commands finish without any
-   errors, you're ready to install the library:
-
-        $ python setup.py install
-
-   (depending on how Python has been installed on your machine,
-   you might have to log in as a superuser to run the 'install'
-   command.)
-
-
---------------------------------------------------------------------
-Additional notes for Mac OS X
---------------------------------------------------------------------
-
-On Mac OS X you will usually install additional software such as
-libjpeg or freetype with the "fink" tool, and then it ends up in
-"/sw".  If you have installed the libraries elsewhere, you may have
-to tweak the "setup.py" file before building.
-
-
---------------------------------------------------------------------
-Additional notes for Windows
---------------------------------------------------------------------
-
-On Windows, you need to tweak the ROOT settings in the "setup.py"
-file, to make it find the external libraries.  See comments in the
-file for details.
-
-Make sure to build PIL and the external libraries with the same
-runtime linking options as was used for the Python interpreter
-(usually /MD, under Visual Studio).
-
-
-Note that most Python distributions include libraries compiled for
-Microsoft Visual Studio.  To build extensions using other tool chains,
-see the "Using non-Microsoft compilers on Windows" section in the
-distutils handbook:
-
-        http://www.python.org/doc/current/inst/non-ms-compilers.html
-
-For additional information on how to build extensions using the
-popular MinGW compiler, see:
-
-        http://mingw.org (compiler)
-        http://sebsauvage.net/python/mingw.html (build instructions)
-        http://sourceforge.net/projects/gnuwin32 (prebuilt libraries)
-
diff --git a/pythonPackages/pil/Sane/CHANGES b/pythonPackages/pil/Sane/CHANGES
deleted file mode 100644
index 95c14697e8..0000000000
--- a/pythonPackages/pil/Sane/CHANGES
+++ /dev/null
@@ -1,34 +0,0 @@
-
-from V1.0 to V2.0
-
-_sane.c:
-  - Values for option constraints are correctly translated to floats
-    if value type is TYPE_FIXED for SANE_CONSTRAINT_RANGE and
-    SANE_CONSTRAINT_WORD_LIST
-  - added constants INFO_INEXACT, INFO_RELOAD_OPTIONS,
-    INFO_RELOAD_PARAMS (possible return values of set_option())
-    to module dictionnary.
-  - removed additional return variable 'i' from SaneDev_get_option(),
-    because it is only set when SANE_ACTION_SET_VALUE is used.
-  - scanDev.get_parameters() now returns the scanner mode as 'format',
-    no more the typical PIL codes. So 'L' became 'gray', 'RGB' is now
-    'color', 'R' is 'red', 'G' is 'green', 'B' is 'red'. This matches 
-    the way scanDev.mode is set.
-    This should be the only incompatibility vs. version 1.0.
-
-sane.py
-  - ScanDev got new method __load_option_dict() called from __init__()
-    and from __setattr__() if backend reported that the frontend should
-    reload the options.
-  - Nice human-readable __repr__() method added for class Option
-  - if __setattr__ (i.e. set_option) reports that all other options
-    have to be reloaded due to a change in the backend then they are reloaded.
-  - due to the change in SaneDev_get_option() only the 'value' is
-    returned from get_option().
-  - in __setattr__ integer values are automatically converted to floats
-    if SANE backend expects SANE_FIXED (i.e. fix-point float)
-  - The scanner options can now directly be accessed via scanDev[optionName]
-    instead scanDev.opt[optionName]. (The old way still works).
-
-V1.0:
-  A.M. Kuchling's original pysane package.
\ No newline at end of file
diff --git a/pythonPackages/pil/Sane/README b/pythonPackages/pil/Sane/README
deleted file mode 100644
index ddff0cf247..0000000000
--- a/pythonPackages/pil/Sane/README
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Python SANE module V1.1 (30 Sep. 2004)
-
-The SANE module provides an interface to the SANE scanner and frame
-grabber interface for Linux.  This module was contributed by Andrew
-Kuchling and is extended and currently maintained by Ralph Heinkel 
-(rheinkel-at-email.de). If you write to me please make sure to have the
-word 'SANE' or 'sane' in the subject of your mail, otherwise it might
-be classified as spam in the future.
-
-
-To build this module, type (in the Sane directory): 
-
-	python setup.py build
-
-In order to install the module type:
-
-	python setup.py install
-
-
-For some basic documentation please look at the file sanedoc.txt
-The two demo_*.py scripts give basic examples on how to use the software.
diff --git a/pythonPackages/pil/Sane/_sane.c b/pythonPackages/pil/Sane/_sane.c
deleted file mode 100644
index 21e542fa51..0000000000
--- a/pythonPackages/pil/Sane/_sane.c
+++ /dev/null
@@ -1,1325 +0,0 @@
-/***********************************************************
-(C) Copyright 2003 A.M. Kuchling.  All Rights Reserved
-(C) Copyright 2004 A.M. Kuchling, Ralph Heinkel  All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of A.M. Kuchling and
-Ralph Heinkel not be used in advertising or publicity pertaining to 
-distribution of the software without specific, written prior permission.
-
-A.M. KUCHLING, R.H. HEINKEL DISCLAIM ALL WARRANTIES WITH REGARD TO THIS 
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-******************************************************************/
-
-/* SaneDev objects */
-
-#include "Python.h"
-#include "Imaging.h"
-#include <sane/sane.h>
-
-#include <sys/time.h>
-
-static PyObject *ErrorObject;
-
-typedef struct {
-	PyObject_HEAD
-	SANE_Handle h;
-} SaneDevObject;
-
-#ifdef WITH_THREAD
-PyThreadState *_save;
-#endif
-
-/* Raise a SANE exception */
-PyObject * 
-PySane_Error(SANE_Status st)
-{
-  const char *string;
-  
-  if (st==SANE_STATUS_GOOD) {Py_INCREF(Py_None); return (Py_None);}
-  string=sane_strstatus(st);
-  PyErr_SetString(ErrorObject, string);
-  return NULL;
-}
-
-staticforward PyTypeObject SaneDev_Type;
-
-#define SaneDevObject_Check(v)	((v)->ob_type == &SaneDev_Type)
-
-static SaneDevObject *
-newSaneDevObject(void)
-{
-	SaneDevObject *self;
-	self = PyObject_NEW(SaneDevObject, &SaneDev_Type);
-	if (self == NULL)
-		return NULL;
-	self->h=NULL;
-	return self;
-}
-
-/* SaneDev methods */
-
-static void
-SaneDev_dealloc(SaneDevObject *self)
-{
-  if (self->h) sane_close(self->h);
-  self->h=NULL;
-  PyObject_DEL(self);
-}
-
-static PyObject *
-SaneDev_close(SaneDevObject *self, PyObject *args)
-{
-  if (!PyArg_ParseTuple(args, ""))
-    return NULL;
-  if (self->h) sane_close(self->h);
-  self->h=NULL;
-  Py_INCREF(Py_None);
-  return (Py_None);
-}
-
-static PyObject *
-SaneDev_get_parameters(SaneDevObject *self, PyObject *args)
-{
-  SANE_Status st;
-  SANE_Parameters p;
-  char *format="unknown format";
-  
-  if (!PyArg_ParseTuple(args, ""))
-    return NULL;
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-  Py_BEGIN_ALLOW_THREADS
-  st=sane_get_parameters(self->h, &p);
-  Py_END_ALLOW_THREADS
-  
-  if (st) return PySane_Error(st);
-  switch (p.format)
-    {
-    case(SANE_FRAME_GRAY):  format="gray"; break;
-    case(SANE_FRAME_RGB):   format="color"; break;
-    case(SANE_FRAME_RED):   format="red"; break;
-    case(SANE_FRAME_GREEN): format="green"; break;
-    case(SANE_FRAME_BLUE):  format="blue"; break;
-    }
-  
-  return Py_BuildValue("si(ii)ii", format, p.last_frame, p.pixels_per_line, 
-		       p.lines, p.depth, p.bytes_per_line);
-}
-
-
-static PyObject *
-SaneDev_fileno(SaneDevObject *self, PyObject *args)
-{
-  SANE_Status st;
-  SANE_Int fd;
-  
-  if (!PyArg_ParseTuple(args, ""))
-    return NULL;
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-  st=sane_get_select_fd(self->h, &fd);
-  if (st) return PySane_Error(st);
-  return PyInt_FromLong(fd);
-}
-
-static PyObject *
-SaneDev_start(SaneDevObject *self, PyObject *args)
-{
-  SANE_Status st;
-  
-  if (!PyArg_ParseTuple(args, ""))
-    return NULL;
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-  /* sane_start can take several seconds, if the user initiates
-     a new scan, while the scan head of a flatbed scanner moves
-     back to the start position after finishing a previous scan.
-     Hence it is worth to allow threads here.
-  */
-  Py_BEGIN_ALLOW_THREADS
-  st=sane_start(self->h);
-  Py_END_ALLOW_THREADS
-  if (st) return PySane_Error(st);
-  Py_INCREF(Py_None);
-  return Py_None;
-}
-
-static PyObject *
-SaneDev_cancel(SaneDevObject *self, PyObject *args)
-{
-  if (!PyArg_ParseTuple(args, ""))
-    return NULL;
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-  sane_cancel(self->h);
-  Py_INCREF(Py_None);
-  return Py_None;
-}
-
-static PyObject *
-SaneDev_get_options(SaneDevObject *self, PyObject *args)
-{
-  const SANE_Option_Descriptor *d;
-  PyObject *list, *value;
-  int i=1;
-  
-  if (!PyArg_ParseTuple(args, ""))
-    return NULL;
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-  if (!(list = PyList_New(0)))
-	    return NULL;
-
-  do 
-    {
-      d=sane_get_option_descriptor(self->h, i);
-      if (d!=NULL) 
-	{
-	  PyObject *constraint=NULL;
-	  int j;
-	  
-	  switch (d->constraint_type)
-	    {
-	    case(SANE_CONSTRAINT_NONE): 
-	      Py_INCREF(Py_None); constraint=Py_None; break;
-	    case(SANE_CONSTRAINT_RANGE): 
-	      if (d->type == SANE_TYPE_INT)
-		constraint=Py_BuildValue("iii", d->constraint.range->min, 
-					 d->constraint.range->max, 
-					 d->constraint.range->quant);
-	      else
-		constraint=Py_BuildValue("ddd", 
-					 SANE_UNFIX(d->constraint.range->min), 
-					 SANE_UNFIX(d->constraint.range->max), 
-					 SANE_UNFIX(d->constraint.range->quant));
-	      break;
-	    case(SANE_CONSTRAINT_WORD_LIST): 
-	      constraint=PyList_New(d->constraint.word_list[0]);
-	      if (d->type == SANE_TYPE_INT)
-		for (j=1; j<=d->constraint.word_list[0]; j++)
-		  PyList_SetItem(constraint, j-1, 
-				 PyInt_FromLong(d->constraint.word_list[j]));
-	      else
-		for (j=1; j<=d->constraint.word_list[0]; j++)
-		  PyList_SetItem(constraint, j-1, 
-				 PyFloat_FromDouble(SANE_UNFIX(d->constraint.word_list[j])));
-	      break;
-	    case(SANE_CONSTRAINT_STRING_LIST): 
-	      constraint=PyList_New(0);
-	      for(j=0; d->constraint.string_list[j]!=NULL; j++)
-		PyList_Append(constraint, 
-			      PyString_FromString(d->constraint.string_list[j]));
-	      break;
-	    }
-	  value=Py_BuildValue("isssiiiiO", i, d->name, d->title, d->desc, 
-			      d->type, d->unit, d->size, d->cap, constraint);
-	  PyList_Append(list, value);
-	}
-      i++;
-    } while (d!=NULL);
-  return list;
-}
-
-static PyObject *
-SaneDev_get_option(SaneDevObject *self, PyObject *args)
-{
-  SANE_Status st;
-  const SANE_Option_Descriptor *d;
-  PyObject *value=NULL;
-  int n;
-  void *v;
-  
-  if (!PyArg_ParseTuple(args, "i", &n))
-    {
-      return NULL;
-    }
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-  d=sane_get_option_descriptor(self->h, n);
-  v=malloc(d->size+1);
-  st=sane_control_option(self->h, n, SANE_ACTION_GET_VALUE,
-			 v, NULL);
-
-  if (st) 
-    {
-      free(v); 
-      return PySane_Error(st);
-    }
-  
-  switch(d->type)
-    {
-    case(SANE_TYPE_BOOL):
-    case(SANE_TYPE_INT):
-      value=Py_BuildValue("i", *( (SANE_Int*)v) );
-      break;
-    case(SANE_TYPE_FIXED):
-      value=Py_BuildValue("d", SANE_UNFIX((*((SANE_Fixed*)v))) );
-      break;
-    case(SANE_TYPE_STRING):
-      value=Py_BuildValue("s", v);
-      break;
-    case(SANE_TYPE_BUTTON):
-    case(SANE_TYPE_GROUP):
-      value=Py_BuildValue("O", Py_None);
-      break;
-    }
-  
-  free(v);
-  return value;
-}
-
-static PyObject *
-SaneDev_set_option(SaneDevObject *self, PyObject *args)
-{
-  SANE_Status st;
-  const SANE_Option_Descriptor *d;
-  SANE_Int i;
-  PyObject *value;
-  int n;
-  void *v;
-  
-  if (!PyArg_ParseTuple(args, "iO", &n, &value))
-    return NULL;
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-  d=sane_get_option_descriptor(self->h, n);
-  v=malloc(d->size+1);
-
-  switch(d->type)
-    {
-    case(SANE_TYPE_BOOL):
-      if (!PyInt_Check(value)) 
-	{
-	  PyErr_SetString(PyExc_TypeError, "SANE_BOOL requires an integer");
-	  free(v);
-	  return NULL;
-	}
-	/* fall through */
-    case(SANE_TYPE_INT):
-      if (!PyInt_Check(value)) 
-	{
-	  PyErr_SetString(PyExc_TypeError, "SANE_INT requires an integer");
-	  free(v);
-	  return NULL;
-	}
-      *( (SANE_Int*)v) = PyInt_AsLong(value);
-      break;
-    case(SANE_TYPE_FIXED):
-      if (!PyFloat_Check(value)) 
-	{
-	  PyErr_SetString(PyExc_TypeError, "SANE_FIXED requires a floating point number");
-	  free(v);
-	  return NULL;
-	}
-      *( (SANE_Fixed*)v) = SANE_FIX(PyFloat_AsDouble(value));
-      break;
-    case(SANE_TYPE_STRING):
-      if (!PyString_Check(value)) 
-	{
-	  PyErr_SetString(PyExc_TypeError, "SANE_STRING requires a string");
-	  free(v);
-	  return NULL;
-	}
-      strncpy(v, PyString_AsString(value), d->size-1);
-      ((char*)v)[d->size-1] = 0;
-      break;
-    case(SANE_TYPE_BUTTON): 
-    case(SANE_TYPE_GROUP):
-      break;
-    }
-  
-  st=sane_control_option(self->h, n, SANE_ACTION_SET_VALUE,
-			 v, &i);
-  if (st) {free(v); return PySane_Error(st);}
-  
-  free(v);
-  return Py_BuildValue("i", i);
-}
-
-static PyObject *
-SaneDev_set_auto_option(SaneDevObject *self, PyObject *args)
-{
-  SANE_Status st;
-  const SANE_Option_Descriptor *d;
-  SANE_Int i;
-  int n;
-  
-  if (!PyArg_ParseTuple(args, "i", &n))
-    return NULL;
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-  d=sane_get_option_descriptor(self->h, n);
-  st=sane_control_option(self->h, n, SANE_ACTION_SET_AUTO,
-			 NULL, &i);
-  if (st) {return PySane_Error(st);}
-  
-  return Py_BuildValue("i", i);
- }
-
-#define READSIZE 32768
-
-static PyObject *
-SaneDev_snap(SaneDevObject *self, PyObject *args)
-{
-  SANE_Status st; 
-   /* The buffer should be a multiple of 3 in size, so each sane_read
-      operation will return an integral number of RGB triples. */
-  SANE_Byte buffer[READSIZE];  /* XXX how big should the buffer be? */
-  SANE_Int len, lastlen;
-  Imaging im;
-  SANE_Parameters p;
-  int px, py, remain, cplen, bufpos, padbytes;
-  long L;
-  char errmsg[80];
-  union 
-    { char c[2];
-      INT16 i16;
-    } 
-  endian;
-  PyObject *pyNoCancel = NULL;
-  int noCancel = 0;
-    
-  endian.i16 = 1;
-  
-  if (!PyArg_ParseTuple(args, "l|O", &L, &pyNoCancel))
-    return NULL;
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-  im=(Imaging)L;
-  
-  if (pyNoCancel)
-    noCancel = PyObject_IsTrue(pyNoCancel);
-
-  st=SANE_STATUS_GOOD; px=py=0;
-  /* xxx not yet implemented
-     - handscanner support (i.e., unknown image length during start)
-     - generally: move the functionality from method snap in sane.py
-       down here -- I don't like this cross-dependency.
-       we need to call sane_get_parameters here, and we can create
-       the result Image object here.
-  */
-  
-  Py_UNBLOCK_THREADS
-  sane_get_parameters(self->h, &p);
-  if (p.format == SANE_FRAME_GRAY)
-    {
-      switch (p.depth)
-        {
-          case 1: 
-            remain = p.bytes_per_line * im->ysize;
-            padbytes = p.bytes_per_line - (im->xsize+7)/8;
-            bufpos = 0;
-            lastlen = len = 0;
-            while (st!=SANE_STATUS_EOF && py < im->ysize)
-              {
-                while (len > 0 && py < im->ysize)
-                  {
-                    int i, j, k;
-                    j = buffer[bufpos++];
-                    k = 0x80;
-                    for (i = 0; i < 8 && px < im->xsize; i++)
-                      {
-                        im->image8[py][px++] = (k&j) ? 0 : 0xFF;
-                        k = k >> 1;
-                      }
-                    len--;
-                    if (px >= im->xsize)
-                      {
-                        bufpos += padbytes;
-                        len -= padbytes;
-                        py++;
-                        px = 0;
-                      }
-                  }
-                st=sane_read(self->h, buffer, 
-                             remain<READSIZE ? remain : READSIZE, &len);
-                if (st && (st!=SANE_STATUS_EOF))
-                  {
-                    sane_cancel(self->h);
-                    Py_BLOCK_THREADS
-                    return PySane_Error(st);
-                  }
-                bufpos -= lastlen;
-                lastlen = len;
-                remain -= len;
-                /* skip possible pad bytes at the start of the buffer */
-                len -= bufpos;
-              }
-            break;
-          case 8:
-            remain = p.bytes_per_line * im->ysize;
-            padbytes = p.bytes_per_line - im->xsize;
-            bufpos = 0;
-            len = 0;
-            while (st!=SANE_STATUS_EOF && py < im->ysize)
-              {
-                while (len > 0 && py < im->ysize)
-                  {
-                    cplen = len;
-                    if (px + cplen >= im->xsize)
-                        cplen = im->xsize - px;
-                    memcpy(&im->image8[py][px], &buffer[bufpos], cplen);
-                    len -= cplen;
-                    bufpos += cplen;
-                    px += cplen;
-                    if (px >= im->xsize)
-                      {
-                        px = 0;
-                        py++;
-                        bufpos += padbytes;
-                        len -= padbytes;
-                      }
-                  }
-                bufpos = -len;
-
-                st=sane_read(self->h, buffer, 
-                             remain<READSIZE ? remain : READSIZE, &len);
-                if (st && (st!=SANE_STATUS_EOF))
-                  {
-                    sane_cancel(self->h);
-                    Py_BLOCK_THREADS
-                    return PySane_Error(st);
-                  }
-                remain -= len;
-                len -= bufpos;
-              }
-              break;
-          case 16:
-            remain = p.bytes_per_line * im->ysize;
-            padbytes = p.bytes_per_line - 2 * im->xsize;
-            bufpos = endian.c[0];
-            lastlen = len = 0;
-            while (st!=SANE_STATUS_EOF && py < im->ysize)
-              {
-                while (len > 0 && py < im->ysize)
-                  {
-                    im->image8[py][px++] = buffer[bufpos];
-                    bufpos += 2;
-                    len -= 2;
-                    if (px >= im->xsize)
-                      {
-                        bufpos += padbytes;
-                        len -= padbytes;
-                        py++;
-                        px = 0;
-                      }
-                  }
-                st=sane_read(self->h, buffer, 
-                             remain<READSIZE ? remain : READSIZE, &len);
-                if (st && (st!=SANE_STATUS_EOF))
-                  {
-                    sane_cancel(self->h);
-                    Py_BLOCK_THREADS
-                    return PySane_Error(st);
-                  }
-                remain -= len;
-                bufpos -= lastlen;
-                lastlen = len;
-                len -= bufpos;
-              }
-            break;
-          default:
-            /* other depths are not formally "illegal" according to the 
-               Sane API, but it's agreed by Sane developers that other
-               depths than 1, 8, 16 should not be used
-            */
-            sane_cancel(self->h);
-            Py_BLOCK_THREADS
-            snprintf(errmsg, 80, "unsupported pixel depth: %i", p.depth);
-            PyErr_SetString(ErrorObject, errmsg);
-            return NULL;
-        }
-    }
-  else if (p.format == SANE_FRAME_RGB)
-    {
-      int incr, color, pxs, pxmax, bit, val, mask;
-      switch (p.depth)
-        {
-          case 1: 
-            remain = p.bytes_per_line * im->ysize;
-            padbytes = p.bytes_per_line - ((im->xsize+7)/8) * 3;
-            bufpos = 0;
-            len = 0;
-            lastlen = 0;
-            pxmax = 4 * im->xsize;
-            while (st!=SANE_STATUS_EOF && py < im->ysize)
-              {
-                pxs = px;
-                for (color = 0; color < 3; color++)
-                  {
-                    while (len <= 0 && st == SANE_STATUS_GOOD)
-                      {
-                        st=sane_read(self->h, buffer, 
-                                     remain<READSIZE ? remain : READSIZE, &len);
-                        if (st && (st!=SANE_STATUS_EOF))
-                          {
-                            sane_cancel(self->h);
-                            Py_BLOCK_THREADS
-                            return PySane_Error(st);
-                          }
-                        bufpos -= lastlen;
-                        remain -= len;
-                        lastlen = len;
-                        /* skip possible pad bytes at the start of the buffer */
-                        len -= bufpos;
-                      }
-                    if (st == SANE_STATUS_EOF) break;
-                    pxs = px;
-                    val = buffer[bufpos++];
-                    len--;
-                    mask = 0x80;
-                    for (bit = 0; (bit < 8) && (px < pxmax); bit++)
-                      {
-                         ((UINT8**)(im->image32))[py][px] = (val&mask) ? 0xFF : 0;
-                        mask = mask >> 1;
-                        px += 4;
-                      }
-                    pxs++;
-                    px = pxs;
-                  }
-                if (st == SANE_STATUS_EOF)
-                  break;
-                for (bit = 0; bit < 8 && px < pxmax; bit++)
-                  {
-                     ((UINT8**)(im->image32))[py][px] = 0;
-                     px += 4;
-                  }
-                px -= 3;
-                if (px >= pxmax)
-                  {
-                    bufpos += padbytes;
-                    len -= padbytes;
-                    py++;
-                    px = 0;
-                  }
-              }
-            break;
-          case 8:
-          case 16:
-            if (p.depth == 8)
-              {
-                padbytes = p.bytes_per_line - 3 * im->xsize;
-                bufpos = 0;
-                incr = 1;
-              }
-            else 
-              {
-                padbytes = p.bytes_per_line - 6 * im->xsize;
-                bufpos = endian.c[0];
-                incr = 2;
-              }
-            remain = p.bytes_per_line * im->ysize;
-            len = 0;
-            lastlen = 0;
-            pxmax = 4 * im->xsize;
-            /* probably not very efficient. But we have to deal with these
-               possible conditions:
-               - we may have padding bytes at the end of a scan line
-               - the number of bytes read with sane_read may be smaller
-                 than the number of pad bytes
-               - the buffer may become empty after setting any of the 
-                 red/green/blue pixel values
-             
-            */
-            while (st != SANE_STATUS_EOF && py < im->ysize)
-              {
-                for (color = 0; color < 3; color++)
-                  {
-                    while (len <= 0 && st == SANE_STATUS_GOOD)
-                      {
-                        bufpos -= lastlen;
-                        if (remain == 0)
-                          {
-                            sane_cancel(self->h);
-                            Py_BLOCK_THREADS
-                            PyErr_SetString(ErrorObject, "internal _sane error: premature end of scan");
-                            return NULL;
-                          }
-                        st = sane_read(self->h, buffer,
-                              remain<(READSIZE) ? remain : (READSIZE), &len);
-                        if (st && (st!=SANE_STATUS_EOF))
-                          {
-                            sane_cancel(self->h);
-                            Py_BLOCK_THREADS
-                            return PySane_Error(st);
-                          }
-                        lastlen = len;
-                        remain -= len;
-                        len -= bufpos;
-                      }
-                    if (st == SANE_STATUS_EOF) break;
-                    ((UINT8**)(im->image32))[py][px++] = buffer[bufpos]; 
-                    bufpos += incr;
-                    len -= incr;
-                  }
-                if (st == SANE_STATUS_EOF) break;
-
-                ((UINT8**)(im->image32))[py][px++] = 0;
-
-                if (px >= pxmax)
-                  {
-                    px = 0;
-                    py++;
-                    bufpos += padbytes;
-                    len -= padbytes;
-                  }
-              }
-            break;
-          default:
-            Py_BLOCK_THREADS
-            sane_cancel(self->h);
-            snprintf(errmsg, 80, "unsupported pixel depth: %i", p.depth);
-            PyErr_SetString(ErrorObject, errmsg);
-            return NULL;
-        }
-      
-    }
-  else /* should be SANE_FRAME_RED, GREEN or BLUE */
-    {
-      int lastlen, pxa, pxmax, offset, incr, frame_count = 0;
-      /* at least the Sane test backend behaves a bit weird, if 
-         it returns "premature EOF" for sane_read, i.e., if the 
-         option "return value of sane_read" is set to SANE_STATUS_EOF.
-         In this case, the test backend does not advance to the next frame,
-         so p.last_frame will never be set...
-         So let's count the number of frames we try to acquire
-      */
-      while (!p.last_frame && frame_count < 4)
-        {
-          frame_count++;
-          st = sane_get_parameters(self->h, &p);
-          if (st)
-            {
-              sane_cancel(self->h);
-              Py_BLOCK_THREADS
-              return PySane_Error(st);
-            }
-          remain = p.bytes_per_line * im->ysize;
-          bufpos = 0;
-          len = 0;
-          lastlen = 0;
-          py = 0;
-          switch (p.format)
-            { 
-              case SANE_FRAME_RED:
-                offset = 0;
-                break;
-              case SANE_FRAME_GREEN:
-                offset = 1;
-                break;
-              case SANE_FRAME_BLUE:
-                offset = 2;
-                break;
-              default:
-                sane_cancel(self->h);
-                Py_BLOCK_THREADS
-                snprintf(errmsg, 80, "unknown/invalid frame format: %i", p.format);
-                PyErr_SetString(ErrorObject, errmsg);
-                return NULL;
-            }
-          px = offset;
-          pxa = 3;
-          pxmax = im->xsize * 4;
-          switch (p.depth)
-            {
-              case 1:
-                padbytes = p.bytes_per_line - (im->xsize+7)/8;
-                st = SANE_STATUS_GOOD;
-                while (st != SANE_STATUS_EOF && py < im->ysize)
-                  {
-                    while (len > 0)
-                      {
-                        int bit, mask, val;
-                        val = buffer[bufpos++]; len--;
-                        mask = 0x80;
-                        for (bit = 0; bit < 8 && px < pxmax; bit++)
-                          {
-                            ((UINT8**)(im->image32))[py][px] 
-                                = val&mask ? 0xFF : 0;
-                            ((UINT8**)(im->image32))[py][pxa] = 0;
-                            px += 4;
-                            pxa += 4;
-                            mask = mask >> 1;
-                          }
- 
-                        if (px >= pxmax)
-                          {
-                            px = offset;
-                            pxa = 3;
-                            py++;
-                            bufpos += padbytes;
-                            len -= padbytes;
-                          }
-                      }
-                    while (len <= 0 && st == SANE_STATUS_GOOD && remain > 0)
-                      {
-                        bufpos -= lastlen;
-                        st = sane_read(self->h, buffer,
-                              remain<(READSIZE) ? remain : (READSIZE), &len);
-                        if (st && (st!=SANE_STATUS_EOF))
-                          {
-                            sane_cancel(self->h);
-                            Py_BLOCK_THREADS
-                            return PySane_Error(st);
-                          }
-                        remain -= len;
-                        lastlen = len;
-                        len -= bufpos;
-                      }
-                  }
-                break;
-              case 8:
-              case 16:
-                if (p.depth == 8)
-                  {
-                    padbytes = p.bytes_per_line - im->xsize;
-                    incr = 1;
-                  }
-                else
-                  {
-                    padbytes = p.bytes_per_line - 2 * im->xsize;
-                    incr = 2;
-                    bufpos = endian.c[0];
-                  }
-                st = SANE_STATUS_GOOD;
-                while (st != SANE_STATUS_EOF && py < im->ysize)
-                  {
-                    while (len <= 0)
-                      {
-                        bufpos -= lastlen;
-                        if (remain == 0)
-                          {
-                            sane_cancel(self->h);
-                            Py_BLOCK_THREADS
-                            PyErr_SetString(ErrorObject, "internal _sane error: premature end of scan");
-                            return NULL;
-                          }
-                        st = sane_read(self->h, buffer,
-                              remain<(READSIZE) ? remain : (READSIZE), &len);
-                        if (st && (st!=SANE_STATUS_EOF))
-                          {
-                            sane_cancel(self->h);
-                            Py_BLOCK_THREADS
-                            return PySane_Error(st);
-                          }
-                        if (st == SANE_STATUS_EOF)
-                          break;
-                        lastlen = len;
-                        remain -= len;
-                        if (bufpos >= len)
-                          len = 0;
-                        else
-                          len -= bufpos;
-                      }
-                    if (st == SANE_STATUS_EOF)
-                      break;
-                    ((UINT8**)(im->image32))[py][px] = buffer[bufpos];
-                    ((UINT8**)(im->image32))[py][pxa] = 0;
-                    bufpos += incr;
-                    len -= incr;
-                    px += 4;
-                    pxa += 4;
-
-                    if (px >= pxmax)
-                      {
-                        px = offset;
-                        pxa = 3;
-                        py++;
-                        bufpos += padbytes;
-                        len -= padbytes;
-                      }
-                  }
-                break;
-              default:
-                sane_cancel(self->h);
-                Py_BLOCK_THREADS
-                snprintf(errmsg, 80, "unsupported pixel depth: %i", p.depth);
-                PyErr_SetString(ErrorObject, errmsg);
-                return NULL;
-            }
-          if (!p.last_frame)
-            {
-              /* all sane_read calls in the above loop may return
-                 SANE_STATUS_GOOD, but the backend may need another sane_read
-                 call which returns SANE_STATUS_EOF in order to start
-                 a new frame.
-              */
-              do {
-                   st = sane_read(self->h, buffer, READSIZE, &len);
-                 }
-              while (st == SANE_STATUS_GOOD);
-              if (st != SANE_STATUS_EOF)
-                {
-                   Py_BLOCK_THREADS
-                   sane_cancel(self->h);
-                   return PySane_Error(st);
-                }
-              
-              st = sane_start(self->h);
-              if (st) 
-                {
-                   Py_BLOCK_THREADS
-                   return PySane_Error(st);
-                }
-            }
-        }
-    }
-  /* enforce SANE_STATUS_EOF. Can be necessary for ADF scans for some backends */
-  do {
-       st = sane_read(self->h, buffer, READSIZE, &len);
-     }
-  while (st == SANE_STATUS_GOOD);
-  if (st != SANE_STATUS_EOF)
-    {
-      sane_cancel(self->h);
-      Py_BLOCK_THREADS
-      return PySane_Error(st);
-    }
-  
-  if (!noCancel)
-    sane_cancel(self->h);
-  Py_BLOCK_THREADS
-  Py_INCREF(Py_None);
-  return Py_None;
-}
-
-
-#ifdef WITH_NUMARRAY
-
-#include "numarray/libnumarray.h"
-
-/* this global variable is set to 1 in 'init_sane()' after successfully
-   importing the numarray module. */
-int NUMARRAY_IMPORTED = 0;
-
-static PyObject *
-SaneDev_arr_snap(SaneDevObject *self, PyObject *args)
-{
-  SANE_Status st; 
-  SANE_Byte buffer[READSIZE];
-  SANE_Int len;
-  SANE_Parameters p;
-
-  PyArrayObject *pyArr = NULL;
-  NumarrayType arrType;
-  int line, line_index, buffer_index, remain_bytes_line, num_pad_bytes;
-  int cp_num_bytes, total_remain, bpp, arr_bytes_per_line;
-  int pixels_per_line = -1;
-  char errmsg[80];
-
-  if (!NUMARRAY_IMPORTED)
-    {
-      PyErr_SetString(ErrorObject, "numarray package not available");
-      return NULL;
-    }
-
-  if (!PyArg_ParseTuple(args, "|i", &pixels_per_line))
-    return NULL;
-  if (self->h==NULL)
-    {
-      PyErr_SetString(ErrorObject, "SaneDev object is closed");
-      return NULL;
-    }
-
-  sane_get_parameters(self->h, &p);
-  if (p.format != SANE_FRAME_GRAY)
-    {
-      sane_cancel(self->h);
-      snprintf(errmsg, 80, "numarray only supports gray-scale images");
-      PyErr_SetString(ErrorObject, errmsg);
-      return NULL;
-    }
-
-  if (p.depth == 8)
-    {
-      bpp=1;   /* bytes-per-pixel */
-      arrType = tUInt8;
-    }
-  else if (p.depth == 16)
-    {
-      bpp=2;   /* bytes-per-pixel */
-      arrType = tUInt16;
-    }
-  else
-    {
-      sane_cancel(self->h);
-      snprintf(errmsg, 80, "arrsnap: unsupported pixel depth: %i", p.depth);
-      PyErr_SetString(ErrorObject, errmsg);
-      return NULL;
-    }
-
-  if (pixels_per_line < 1)
-    /* The user can choose a smaller result array than the actual scan */
-    pixels_per_line = p.pixels_per_line;
-  else
-    if (pixels_per_line > p.pixels_per_line)
-      {
-	PyErr_SetString(ErrorObject,"given pixels_per_line too big");
-	return NULL;
-      }
-  /* important: NumArray have indices like (y, x) !! */
-  if (!(pyArr = NA_NewArray(NULL, arrType, 2, p.lines, pixels_per_line)))
-    {
-      PyErr_SetString(ErrorObject, "failed to create NumArray object");
-      return NULL;
-    }
-    
-  arr_bytes_per_line = pixels_per_line * bpp;
-  st=SANE_STATUS_GOOD;
-#ifdef WRITE_PGM
-  FILE *fp;
-  fp = fopen("sane_p5.pgm", "w");
-  fprintf(fp, "P5\n%d %d\n%d\n", p.pixels_per_line, 
-	  p.lines, (int) pow(2.0, (double) p.depth)-1);
-#endif
-  line_index = line = 0;
-  remain_bytes_line = arr_bytes_per_line;
-  total_remain = p.bytes_per_line * p.lines;
-  num_pad_bytes = p.bytes_per_line - arr_bytes_per_line;
-  
-  while (st!=SANE_STATUS_EOF)
-    {
-      Py_BEGIN_ALLOW_THREADS
-      st = sane_read(self->h, buffer, 
-		     READSIZE < total_remain ? READSIZE : total_remain, &len);
-      Py_END_ALLOW_THREADS
-#ifdef WRITE_PGM
-      printf("p5_write: read %d of %d\n", len, READSIZE);
-      fwrite(buffer, 1, len, fp);
-#endif
-
-      buffer_index = 0;
-      total_remain -= len;
-
-      while (len > 0)
-	{
-	  /* copy at most the number of bytes that fit into (the rest of)
-	     one line: */
-	  cp_num_bytes = (len > remain_bytes_line ? remain_bytes_line : len);
-	  remain_bytes_line -= cp_num_bytes;
-	  len -= cp_num_bytes;
-#ifdef DEBUG
-	  printf("copying %d bytes from b_idx %d to d_idx %d\n",
-		 cp_num_bytes, buffer_index, 
-		 line * arr_bytes_per_line + line_index);
-	  printf("len is now %d\n", len);
-#endif
-	  memcpy(pyArr->data + line * arr_bytes_per_line + line_index,
-		 buffer + buffer_index, cp_num_bytes);
-
-	  buffer_index += cp_num_bytes;
-	  if (remain_bytes_line ==0)
-	    {
-	      /* The line has been completed, so reinitialize remain_bytes_line
-		 increase the line counter, and reset line_index */
-#ifdef DEBUG
-	      printf("line %d full, skipping %d bytes\n",line,num_pad_bytes);
-#endif
-	      remain_bytes_line = arr_bytes_per_line;
-	      line++;
-	      line_index = 0;
-	      /* Skip the number of bytes in the input stream which 
-		 are not used: */
-	      len -= num_pad_bytes;
-	      buffer_index += num_pad_bytes;
-	    }
-	  else
-	    line_index += cp_num_bytes;
-	}
-    }
-#ifdef WRITE_PGM
-  fclose(fp);
-  printf("p5_write finished\n");
-#endif
-  sane_cancel(self->h);
-  return (PyObject*) pyArr;
-}
-
-
-
-#endif /* WITH_NUMARRAY */
-
-static PyMethodDef SaneDev_methods[] = {
-	{"get_parameters",	(PyCFunction)SaneDev_get_parameters,	1},
-
-	{"get_options",	(PyCFunction)SaneDev_get_options,	1},
-	{"get_option",	(PyCFunction)SaneDev_get_option,	1},
-	{"set_option",	(PyCFunction)SaneDev_set_option,	1},
-	{"set_auto_option",	(PyCFunction)SaneDev_set_auto_option,	1},
-
-	{"start",	(PyCFunction)SaneDev_start,	1},
-	{"cancel",	(PyCFunction)SaneDev_cancel,	1},
-	{"snap",	(PyCFunction)SaneDev_snap,	1},
-#ifdef WITH_NUMARRAY
-	{"arr_snap",	(PyCFunction)SaneDev_arr_snap,	1},
-#endif /* WITH_NUMARRAY */
-	{"fileno",	(PyCFunction)SaneDev_fileno,	1},
- 	{"close",	(PyCFunction)SaneDev_close,	1},
-	{NULL,		NULL}		/* sentinel */
-};
-
-static PyObject *
-SaneDev_getattr(SaneDevObject *self, char *name)
-{
-	return Py_FindMethod(SaneDev_methods, (PyObject *)self, name);
-}
-
-staticforward PyTypeObject SaneDev_Type = {
-	PyObject_HEAD_INIT(&PyType_Type)
-	0,			/*ob_size*/
-	"SaneDev",			/*tp_name*/
-	sizeof(SaneDevObject),	/*tp_basicsize*/
-	0,			/*tp_itemsize*/
-	/* methods */
-	(destructor)SaneDev_dealloc, /*tp_dealloc*/
-	0,			/*tp_print*/
-	(getattrfunc)SaneDev_getattr, /*tp_getattr*/
-	0, /*tp_setattr*/
-	0,			/*tp_compare*/
-	0,			/*tp_repr*/
-	0,			/*tp_as_number*/
-	0,			/*tp_as_sequence*/
-	0,			/*tp_as_mapping*/
-	0,			/*tp_hash*/
-};
-
-/* --------------------------------------------------------------------- */
-
-static PyObject *
-PySane_init(PyObject *self, PyObject *args)
-{
-  SANE_Status st;
-  SANE_Int version;
-  
-  if (!PyArg_ParseTuple(args, ""))
-    return NULL;
-
-  /* XXX Authorization is not yet supported */
-  st=sane_init(&version, NULL); 
-  if (st) return PySane_Error(st);
-  return Py_BuildValue("iiii", version, SANE_VERSION_MAJOR(version),
-		       SANE_VERSION_MINOR(version), SANE_VERSION_BUILD(version));
-}
-
-static PyObject *
-PySane_exit(PyObject *self, PyObject *args)
-{
-  if (!PyArg_ParseTuple(args, ""))
-    return NULL;
-
-  sane_exit();
-  Py_INCREF(Py_None);
-  return Py_None;
-}
-
-static PyObject *
-PySane_get_devices(PyObject *self, PyObject *args)
-{
-  SANE_Device **devlist;
-  SANE_Device *dev;
-  SANE_Status st;
-  PyObject *list;
-  int local_only, i;
-  
-  if (!PyArg_ParseTuple(args, "|i", &local_only))
-    {
-      return NULL;
-    }
-  
-  st=sane_get_devices(&devlist, local_only);
-  if (st) return PySane_Error(st);
-  if (!(list = PyList_New(0)))
-	    return NULL;
-  for(i=0; devlist[i]!=NULL; i++)
-    {
-      dev=devlist[i];
-      PyList_Append(list, Py_BuildValue("ssss", dev->name, dev->vendor, 
-					dev->model, dev->type));
-    }
-  
-  return list;
-}
-
-/* Function returning new SaneDev object */
-
-static PyObject *
-PySane_open(PyObject *self, PyObject *args)
-{
-	SaneDevObject *rv;
-	SANE_Status st;
-	char *name;
-
-	if (!PyArg_ParseTuple(args, "s", &name))
-		return NULL;
-	rv = newSaneDevObject();
-	if ( rv == NULL )
-	    return NULL;
-	st = sane_open(name, &(rv->h));
-	if (st) 
-	  {
-	    Py_DECREF(rv);
-	    return PySane_Error(st);
-	  }
-	return (PyObject *)rv;
-}
-
-static PyObject *
-PySane_OPTION_IS_ACTIVE(PyObject *self, PyObject *args)
-{
-  SANE_Int cap;
-  long lg;
-  
-  if (!PyArg_ParseTuple(args, "l", &lg))
-    return NULL;
-  cap=lg;
-  return PyInt_FromLong( SANE_OPTION_IS_ACTIVE(cap));
-}
-
-static PyObject *
-PySane_OPTION_IS_SETTABLE(PyObject *self, PyObject *args)
-{
-  SANE_Int cap;
-  long lg;
-  
-  if (!PyArg_ParseTuple(args, "l", &lg))
-    return NULL;
-  cap=lg;
-  return PyInt_FromLong( SANE_OPTION_IS_SETTABLE(cap));
-}
-
-
-/* List of functions defined in the module */
-
-static PyMethodDef PySane_methods[] = {
-	{"init",	PySane_init,		1},
-	{"exit",	PySane_exit,		1},
-	{"get_devices",	PySane_get_devices,	1},
-	{"_open",	PySane_open,	1},
-	{"OPTION_IS_ACTIVE",	PySane_OPTION_IS_ACTIVE,	1},
-	{"OPTION_IS_SETTABLE",	PySane_OPTION_IS_SETTABLE,	1},
-	{NULL,		NULL}		/* sentinel */
-};
-
-
-static void
-insint(PyObject *d, char *name, int value)
-{
-	PyObject *v = PyInt_FromLong((long) value);
-	if (!v || PyDict_SetItemString(d, name, v))
-		Py_FatalError("can't initialize sane module");
-
-	Py_DECREF(v);
-}
-
-void
-init_sane(void)
-{
-	PyObject *m, *d;
-
-	/* Create the module and add the functions */
-	m = Py_InitModule("_sane", PySane_methods);
-
-	/* Add some symbolic constants to the module */
-	d = PyModule_GetDict(m);
-	ErrorObject = PyString_FromString("_sane.error");
-	PyDict_SetItemString(d, "error", ErrorObject);
-
-	insint(d, "INFO_INEXACT", SANE_INFO_INEXACT);
-	insint(d, "INFO_RELOAD_OPTIONS", SANE_INFO_RELOAD_OPTIONS);
-	insint(d, "RELOAD_PARAMS", SANE_INFO_RELOAD_PARAMS);
-
-	insint(d, "FRAME_GRAY", SANE_FRAME_GRAY);
-	insint(d, "FRAME_RGB", SANE_FRAME_RGB);
-	insint(d, "FRAME_RED", SANE_FRAME_RED);
-	insint(d, "FRAME_GREEN", SANE_FRAME_GREEN);
-	insint(d, "FRAME_BLUE", SANE_FRAME_BLUE);
-
-	insint(d, "CONSTRAINT_NONE", SANE_CONSTRAINT_NONE);
-	insint(d, "CONSTRAINT_RANGE", SANE_CONSTRAINT_RANGE);
-	insint(d, "CONSTRAINT_WORD_LIST", SANE_CONSTRAINT_WORD_LIST);
-	insint(d, "CONSTRAINT_STRING_LIST", SANE_CONSTRAINT_STRING_LIST);
-
-	insint(d, "TYPE_BOOL", SANE_TYPE_BOOL);
-	insint(d, "TYPE_INT", SANE_TYPE_INT);
-	insint(d, "TYPE_FIXED", SANE_TYPE_FIXED);
-	insint(d, "TYPE_STRING", SANE_TYPE_STRING);
-	insint(d, "TYPE_BUTTON", SANE_TYPE_BUTTON);
-	insint(d, "TYPE_GROUP", SANE_TYPE_GROUP);
-
-	insint(d, "UNIT_NONE", SANE_UNIT_NONE);
-	insint(d, "UNIT_PIXEL", SANE_UNIT_PIXEL);
-	insint(d, "UNIT_BIT", SANE_UNIT_BIT);
-	insint(d, "UNIT_MM", SANE_UNIT_MM);
-	insint(d, "UNIT_DPI", SANE_UNIT_DPI);
-	insint(d, "UNIT_PERCENT", SANE_UNIT_PERCENT);
-	insint(d, "UNIT_MICROSECOND", SANE_UNIT_MICROSECOND);
-
-	insint(d, "CAP_SOFT_SELECT", SANE_CAP_SOFT_SELECT);
-	insint(d, "CAP_HARD_SELECT", SANE_CAP_HARD_SELECT);
-	insint(d, "CAP_SOFT_DETECT", SANE_CAP_SOFT_DETECT);
-	insint(d, "CAP_EMULATED", SANE_CAP_EMULATED);
-	insint(d, "CAP_AUTOMATIC", SANE_CAP_AUTOMATIC);
-	insint(d, "CAP_INACTIVE", SANE_CAP_INACTIVE);
-	insint(d, "CAP_ADVANCED", SANE_CAP_ADVANCED);
-
-	/* handy for checking array lengths: */
-	insint(d, "SANE_WORD_SIZE", sizeof(SANE_Word));
-
-	/* possible return values of set_option() */
-	insint(d, "INFO_INEXACT", SANE_INFO_INEXACT);
-	insint(d, "INFO_RELOAD_OPTIONS", SANE_INFO_RELOAD_OPTIONS);
-	insint(d, "INFO_RELOAD_PARAMS", SANE_INFO_RELOAD_PARAMS);
-	
-	/* Check for errors */
-	if (PyErr_Occurred())
-		Py_FatalError("can't initialize module _sane");
-
-#ifdef WITH_NUMARRAY
-	import_libnumarray();
-	if (PyErr_Occurred())
-	  PyErr_Clear();
-	else
-	  /* this global variable is declared just in front of the 
-	     arr_snap() function and should be set to 1 after
-	     successfully importing the numarray module. */
-	  NUMARRAY_IMPORTED = 1;
-
-#endif /* WITH_NUMARRAY */
-}
diff --git a/pythonPackages/pil/Sane/demo_numarray.py b/pythonPackages/pil/Sane/demo_numarray.py
deleted file mode 100644
index 0104af2d55..0000000000
--- a/pythonPackages/pil/Sane/demo_numarray.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Shows how to scan a 16 bit grayscale image into a numarray object
-#
-
-# Get the path set up to find PIL modules if not installed yet:
-import sys ; sys.path.append('../PIL')
-
-from numarray import *
-import sane
-import Image
-
-def toImage(arr):
-    if arr.type().bytes == 1:
-        # need to swap coordinates btw array and image (with [::-1])
-        im = Image.fromstring('L', arr.shape[::-1], arr.tostring())
-    else:
-        arr_c = arr - arr.min()
-        arr_c *= (255./arr_c.max())
-        arr = arr_c.astype(UInt8)
-        # need to swap coordinates btw array and image (with [::-1])
-        im = Image.fromstring('L', arr.shape[::-1], arr.tostring())
-    return im
-
-print 'SANE version:', sane.init()
-print 'Available devices=', sane.get_devices()
-
-s = sane.open(sane.get_devices()[0][0])
-
-# Set scan parameters
-s.mode = 'gray'
-s.br_x=320. ; s.br_y=240.
-
-print 'Device parameters:', s.get_parameters()
-
-s.depth=16
-arr16 = s.arr_scan()
-toImage(arr16).show()
diff --git a/pythonPackages/pil/Sane/demo_pil.py b/pythonPackages/pil/Sane/demo_pil.py
deleted file mode 100644
index 016361f8a8..0000000000
--- a/pythonPackages/pil/Sane/demo_pil.py
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env python
-
-#
-# Shows how to scan a color image into a PIL rgb-image
-#
-
-# Get the path set up to find PIL modules if not installed yet:
-import sys ; sys.path.append('../PIL')
-
-import sane
-print 'SANE version:', sane.init()
-print 'Available devices=', sane.get_devices()
-
-s = sane.open(sane.get_devices()[0][0])
-
-s.mode = 'color'
-s.br_x=320. ; s.br_y=240.
-
-print 'Device parameters:', s.get_parameters()
-
-# Initiate the scan
-s.start()
-
-# Get an Image object
-# (For my B&W QuickCam, this is a grey-scale image.  Other scanning devices
-#  may return a
-im=s.snap()
-
-# Write the image out as a GIF file
-#im.save('foo.gif')
-
-# The show method() simply saves the image to a temporary file and calls "xv".
-im.show()
diff --git a/pythonPackages/pil/Sane/sane.py b/pythonPackages/pil/Sane/sane.py
deleted file mode 100644
index 27be5a259c..0000000000
--- a/pythonPackages/pil/Sane/sane.py
+++ /dev/null
@@ -1,289 +0,0 @@
-# sane.py
-#
-# Python wrapper on top of the _sane module, which is in turn a very
-# thin wrapper on top of the SANE library.  For a complete understanding
-# of SANE, consult the documentation at the SANE home page:
-# http://www.mostang.com/sane/ .
-
-__version__ = '2.0'
-__author__  = ['Andrew Kuchling', 'Ralph Heinkel']
-
-from PIL import Image
-
-import _sane
-from _sane import *
-
-TYPE_STR = { TYPE_BOOL:   "TYPE_BOOL",   TYPE_INT:    "TYPE_INT",
-             TYPE_FIXED:  "TYPE_FIXED",  TYPE_STRING: "TYPE_STRING",
-             TYPE_BUTTON: "TYPE_BUTTON", TYPE_GROUP:  "TYPE_GROUP" }
-
-UNIT_STR = { UNIT_NONE:        "UNIT_NONE",
-             UNIT_PIXEL:       "UNIT_PIXEL",
-             UNIT_BIT:         "UNIT_BIT",
-             UNIT_MM:          "UNIT_MM",
-             UNIT_DPI:         "UNIT_DPI",
-             UNIT_PERCENT:     "UNIT_PERCENT",
-             UNIT_MICROSECOND: "UNIT_MICROSECOND" }
-
-
-class Option:
-    """Class representing a SANE option.
-    Attributes:
-    index -- number from 0 to n, giving the option number
-    name -- a string uniquely identifying the option
-    title -- single-line string containing a title for the option
-    desc -- a long string describing the option; useful as a help message
-    type -- type of this option.  Possible values: TYPE_BOOL,
-            TYPE_INT, TYPE_STRING, and so forth.
-    unit -- units of this option.  Possible values: UNIT_NONE,
-            UNIT_PIXEL, etc.
-    size -- size of the value in bytes
-    cap -- capabilities available; CAP_EMULATED, CAP_SOFT_SELECT, etc.
-    constraint -- constraint on values.  Possible values:
-        None : No constraint
-        (min,max,step)  Integer values, from min to max, stepping by
-        list of integers or strings: only the listed values are allowed
-    """
-
-    def __init__(self, args, scanDev):
-        import string
-        self.scanDev = scanDev # needed to get current value of this option
-        self.index, self.name = args[0], args[1]
-        self.title, self.desc = args[2], args[3]
-        self.type, self.unit  = args[4], args[5]
-        self.size, self.cap   = args[6], args[7]
-        self.constraint = args[8]
-        def f(x):
-            if x=='-': return '_'
-            else: return x
-        if type(self.name)!=type(''): self.py_name=str(self.name)
-        else: self.py_name=string.join(map(f, self.name), '')
-
-    def is_active(self):
-        return _sane.OPTION_IS_ACTIVE(self.cap)
-    def is_settable(self):
-        return _sane.OPTION_IS_SETTABLE(self.cap)
-    def __repr__(self):
-        if self.is_settable():
-            settable = 'yes'
-        else:
-            settable = 'no'
-        if self.is_active():
-            active = 'yes'
-            curValue = repr(getattr(self.scanDev, self.py_name))
-        else:
-            active = 'no'
-            curValue = '<not available, inactive option>'
-        s = """\nName:      %s
-Cur value: %s
-Index:     %d
-Title:     %s
-Desc:      %s
-Type:      %s
-Unit:      %s
-Constr:    %s
-active:    %s
-settable:  %s\n""" % (self.py_name, curValue,
-                      self.index, self.title, self.desc,
-                      TYPE_STR[self.type], UNIT_STR[self.unit],
-                      `self.constraint`, active, settable)
-        return s
-
-
-class _SaneIterator:
-    """ intended for ADF scans.
-    """
-
-    def __init__(self, device):
-        self.device = device
-
-    def __iter__(self):
-        return self
-
-    def __del__(self):
-        self.device.cancel()
-
-    def next(self):
-        try:
-            self.device.start()
-        except error, v:
-            if v == 'Document feeder out of documents':
-                raise StopIteration
-            else:
-                raise
-        return self.device.snap(1)
-
-
-
-class SaneDev:
-    """Class representing a SANE device.
-    Methods:
-    start()    -- initiate a scan, using the current settings
-    snap()     -- snap a picture, returning an Image object
-    arr_snap() -- snap a picture, returning a numarray object
-    cancel()   -- cancel an in-progress scanning operation
-    fileno()   -- return the file descriptor for the scanner (handy for select)
-
-    Also available, but rather low-level:
-    get_parameters() -- get the current parameter settings of the device
-    get_options()    -- return a list of tuples describing all the options.
-
-    Attributes:
-    optlist -- list of option names
-
-    You can also access an option name to retrieve its value, and to
-    set it.  For example, if one option has a .name attribute of
-    imagemode, and scanner is a SaneDev object, you can do:
-         print scanner.imagemode
-         scanner.imagemode = 'Full frame'
-         scanner.['imagemode'] returns the corresponding Option object.
-    """
-    def __init__(self, devname):
-        d=self.__dict__
-        d['sane_signature'] = self._getSaneSignature(devname)
-        d['scanner_model']  = d['sane_signature'][1:3]
-        d['dev'] = _sane._open(devname)
-        self.__load_option_dict()
-
-    def _getSaneSignature(self, devname):
-        devices = get_devices()
-        if not devices:
-            raise RuntimeError('no scanner available')
-        for dev in devices:
-            if devname == dev[0]:
-                return dev
-        raise RuntimeError('no such scan device "%s"' % devname)
-
-    def __load_option_dict(self):
-        d=self.__dict__
-        d['opt']={}
-        optlist=d['dev'].get_options()
-        for t in optlist:
-            o=Option(t, self)
-            if o.type!=TYPE_GROUP:
-                d['opt'][o.py_name]=o
-
-    def __setattr__(self, key, value):
-        dev=self.__dict__['dev']
-        optdict=self.__dict__['opt']
-        if not optdict.has_key(key):
-            self.__dict__[key]=value ; return
-        opt=optdict[key]
-        if opt.type==TYPE_GROUP:
-            raise AttributeError, "Groups can't be set: "+key
-        if not _sane.OPTION_IS_ACTIVE(opt.cap):
-            raise AttributeError, 'Inactive option: '+key
-        if not _sane.OPTION_IS_SETTABLE(opt.cap):
-            raise AttributeError, "Option can't be set by software: "+key
-        if type(value) == int and opt.type == TYPE_FIXED:
-            # avoid annoying errors of backend if int is given instead float:
-            value = float(value)
-        self.last_opt = dev.set_option(opt.index, value)
-        # do binary AND to find if we have to reload options:
-        if self.last_opt & INFO_RELOAD_OPTIONS:
-            self.__load_option_dict()
-
-    def __getattr__(self, key):
-        dev=self.__dict__['dev']
-        optdict=self.__dict__['opt']
-        if key=='optlist':
-            return self.opt.keys()
-        if key=='area':
-            return (self.tl_x, self.tl_y),(self.br_x, self.br_y)
-        if not optdict.has_key(key):
-            raise AttributeError, 'No such attribute: '+key
-        opt=optdict[key]
-        if opt.type==TYPE_BUTTON:
-            raise AttributeError, "Buttons don't have values: "+key
-        if opt.type==TYPE_GROUP:
-            raise AttributeError, "Groups don't have values: "+key
-        if not _sane.OPTION_IS_ACTIVE(opt.cap):
-            raise AttributeError, 'Inactive option: '+key
-        value = dev.get_option(opt.index)
-        return value
-
-    def __getitem__(self, key):
-        return self.opt[key]
-
-    def get_parameters(self):
-        """Return a 5-tuple holding all the current device settings:
-   (format, last_frame, (pixels_per_line, lines), depth, bytes_per_line)
-
-- format is one of 'L' (grey), 'RGB', 'R' (red), 'G' (green), 'B' (blue).
-- last_frame [bool] indicates if this is the last frame of a multi frame image
-- (pixels_per_line, lines) specifies the size of the scanned image (x,y)
-- lines denotes the number of scanlines per frame
-- depth gives number of pixels per sample
-"""
-        return self.dev.get_parameters()
-
-    def get_options(self):
-        "Return a list of tuples describing all the available options"
-        return self.dev.get_options()
-
-    def start(self):
-        "Initiate a scanning operation"
-        return self.dev.start()
-
-    def cancel(self):
-        "Cancel an in-progress scanning operation"
-        return self.dev.cancel()
-
-    def snap(self, no_cancel=0):
-        "Snap a picture, returning a PIL image object with the results"
-        (mode, last_frame,
-         (xsize, ysize), depth, bytes_per_line) = self.get_parameters()
-        if mode in ['gray', 'red', 'green', 'blue']:
-            format = 'L'
-        elif mode == 'color':
-            format = 'RGB'
-        else:
-            raise ValueError('got unknown "mode" from self.get_parameters()')
-        im=Image.new(format, (xsize,ysize))
-        self.dev.snap( im.im.id, no_cancel )
-        return im
-
-    def scan(self):
-        self.start()
-        return self.snap()
-
-    def multi_scan(self):
-        return _SaneIterator(self)
-
-    def arr_snap(self, multipleOf=1):
-        """Snap a picture, returning a numarray object with the results.
-        By default the resulting array has the same number of pixels per
-        line as specified in self.get_parameters()[2][0]
-        However sometimes it is necessary to obtain arrays where
-        the number of pixels per line is e.g. a multiple of 4. This can then
-        be achieved with the option 'multipleOf=4'. So if the scanner
-        scanned 34 pixels per line, you will obtain an array with 32 pixels
-        per line.
-        """
-        (mode, last_frame, (xsize, ysize), depth, bpl) = self.get_parameters()
-        if not mode in ['gray', 'red', 'green', 'blue']:
-            raise RuntimeError('arr_snap() only works with monochrome images')
-        if multipleOf < 1:
-            raise ValueError('option "multipleOf" must be a positive number')
-        elif multipleOf > 1:
-            pixels_per_line = xsize - divmod(xsize, 4)[1]
-        else:
-            pixels_per_line = xsize
-        return self.dev.arr_snap(pixels_per_line)
-
-    def arr_scan(self, multipleOf=1):
-        self.start()
-        return self.arr_snap(multipleOf=multipleOf)
-
-    def fileno(self):
-        "Return the file descriptor for the scanning device"
-        return self.dev.fileno()
-
-    def close(self):
-        self.dev.close()
-
-
-def open(devname):
-    "Open a device for scanning"
-    new=SaneDev(devname)
-    return new
diff --git a/pythonPackages/pil/Sane/sanedoc.txt b/pythonPackages/pil/Sane/sanedoc.txt
deleted file mode 100644
index db86938e31..0000000000
--- a/pythonPackages/pil/Sane/sanedoc.txt
+++ /dev/null
@@ -1,294 +0,0 @@
-The _sane_ module is an Python interface to the SANE (Scanning is Now
-Easy) library, which provides access to various raster scanning
-devices such as flatbed scanners and digital cameras.  For more
-information about SANE, consult the SANE Web site at
-http://www.mostang.com/sane/ .  Note that this
-documentation doesn't duplicate all the information in the SANE
-documentation, which you must also consult to get a complete
-understanding.
-
-This module has been originally developed by A.M. Kuchling (amk1@erols.com),
-now development has been taken over by Ralph Heinkel (rheinkel-at-email.de).
-If you write to me please make sure to have the word 'SANE' or 'sane' in 
-the subject of your mail, otherwise it might be classified as spam in the
-future.
-
-
-The module exports two object types, a bunch of constants, and two
-functions.  
-
-get_devices()
-  Return a list of 4-tuples containing the available scanning
-  devices.  Each tuple contains 4 strings: the device name, suitable for
-  passing to _open()_; the device's vendor; the model; and the type of
-  device, such as 'virtual device' or 'video camera'.
-
-  >>> import sane ; sane.get_devices()
-  [('epson:libusb:001:004', 'Epson', 'GT-8300', 'flatbed scanner')]
-
-open(devicename)
-  Open a device, given a string containing its name.  SANE
-  devices have names like 'epson:libusb:001:004'.  If the attempt
-  to open the device fails, a _sane.error_ exception will be raised.  If
-  there are no problems, a SaneDev object will be returned.
-  As an easy way to open the scanner (if only one is available) just type
-  >>> sane.open(sane.get_devices()[0][0])
-
-
-SaneDev objects
-===============
-
-The basic process of scanning an image consists of getting a SaneDev
-object for the device, setting various parameters, starting the scan,
-and then reading the image data.  Images are composed of one or more
-frames; greyscale and one-pass colour scanners return a single frame
-containing all the image data, but 3-pass scanners will usually return
-3 frames, one for each of the red, green, blue channels.
-
-Methods:
---------
-fileno()
-  Returns a file descriptor for the scanning device.  This
-  method's existence means that SaneDev objects can be used by the
-  select module.
-
-get_parameters()
-  Return a tuple containing information about the current settings of
-  the device and the current frame: (format, last_frame,
-  pixels_per_line, lines, depth, bytes_per_line).
-
-	mode  -- 'gray' for greyscale image, 'color' for RGB image, or
-	          one of 'red', 'green', 'blue' if the image is a single
-                  channel of an RGB image (from PIL's point of view,
-                  this is equivalent to 'L').
-	last_frame -- A Boolean value, which is true if this is the
-                  last frame of the image, and false otherwise.
-	pixels_per_line -- Width of the frame.
-	lines -- Height of the frame.
-	depth -- Depth of the image, measured in bits.  SANE will only
-	         allow using 8, 16, or 24-bit depths.
-	bytes_per_line -- Bytes required to store a single line of
-                 data, as computed from pixels_per_line and depth.
-
-start()
-   Start a scan.  This function must be called before the
-   _snap()_ method can be used.
-	
-cancel()
-   Cancel a scan already in progress.
-
-snap(no_cancel=0)
-   Snap a single frame of data, returning a PIL Image object
-   containing the data. If no_cancel is false, the Sane library function
-   sane_cancel is called after the scan. This is reasonable in most cases,
-   but may cause backends for duplex ADF scanners to drop the backside image, 
-   when snap() is called for the front side image. If no_cancel is true,
-   cancel() should be called manually, after all scans are finished.
-
-scan()
-   This is just a shortcut for s.start(); s.snap()
-   Returns a PIL image
-
-multi_scan()
-   This method returns an iterator. It is intended to be used for 
-   scanning with an automatic document feeder. The next() method of the 
-   iterator tries to start a scan. If this is successful, it returns a
-   PIL Image object, like scan(); if the document feeder runs out of 
-   paper, it raises StopIteration, thereby signaling that the sequence
-   is ran out of items.
-   
-arr_snap(multipleOf=1)
-   same as snap, but the result is a NumArray object. (Not that
-   num_array must be installed already at compilation time, otherwise
-   this feature will not be activated).
-   By default the resulting array has the same number of pixels per
-   line as specified in self.get_parameters()[2][0]
-   However sometimes it is necessary to obtain arrays where
-   the number of pixels per line is e.g. a multiple of 4. This can then
-   be achieved with the option 'multipleOf=4'. So if the scanner
-   scanned 34 pixels per line, you will obtain an array with 32 pixels
-   per line.
-   Note that this only works with monochrome images (e.g. gray-scales)
-
-arr_scan(multipleOf=1)
-   This is just a shortcut for s.start(); s.arr_snap(multipleOf=1)
-   Returns a NumArray object
-
-close()
-   Closes the object.
-
-
-Attributes:
------------
-SaneDev objects have a few fixed attributes which are always
-available, and a larger collection of attributes which vary depending
-on the device. An Epson 1660 photo scanner has attributes like
-'mode', 'depth', etc. 
-Another (pseudo scanner), the _pnm:0_ device, takes a PNM file and
-simulates a scanner using the image data; a SaneDev object
-representing the _pnm:0_ device therefore has a _filename_ attribute
-which can be changed to specify the filename, _contrast_ and
-_brightness_ attributes to modify the returned image, and so forth.
-
-The values of the scanner options may be an integer, floating-point 
-value, or string, depending on the nature of the option.
-
-sane_signature
-  The tuple for this scandev that is returned by sane.get_devices()
-  e.g. ('epson:libusb:001:006', 'Epson', 'GT-8300', 'flatbed scanner')
-
-scanner_model
-  same as sane_signature[1:3], i.e. ('Epson', 'GT-8300') for the case above.
-
-optlist
-   A list containing the all the options supported by this device.
-
-   >>> import sane ; s=sane.open('epson:libusb:001:004') ; s.optlist
-   ['focus_position', 'color_correction', 'sharpness', ...., 'br_x']
-
-A closer look at all options listed in s.optlist can be obtained
-through the SaneOption objects.
-
-SaneOption objects
-==================
-
-SANE's option handling is its most elaborate subsystem, intended to
-allow automatically generating dialog boxes and prompts for user
-configuration of the scanning device.  The SaneOption object can be
-used to get a human-readable name and description for an option, the
-units to use, and what the legal values are.  No information about the
-current value of the option is available; for that, read the
-corresponding attribute of a SaneDev object.
-
-This documentation does not explain all the details of SANE's option
-handling; consult the SANE documentation for all the details.
-
-A scandevice option is accessed via __getitem__. For example
-s['mode'] returns the option descriptor for the mode-option which
-controls whether the scanner works in color, grayscale, or b/w mode.
-
->>> s['mode']
-Name:      mode
-Cur value: Color
-Index:     2
-Title:     Scan mode
-Desc:      Selects the scan mode (e.g., lineart, monochrome, or color).
-Type:      TYPE_STRING
-Unit:      UNIT_NONE
-Constr:    ['Binary', 'Gray', 'Color']
-active:    yes
-settable:  yes
-
-In order to change 'mode' to 'gray', just type:
->>> s.mode = 'gray'
-
-
-With the attributes and methods of sane-option objects it is possible 
-to access individual option values:
-
-is_active() 
-  Returns true if the option is active.
-
-is_settable() 
-  Returns true if the option can be set under software control.
-
-
-Attributes:
-
-cap
-  An integer containing various flags about the object's
-  capabilities; whether it's active, whether it's settable, etc.  Also
-  available as the _capability_ attribute.
-
-constraint
-  The constraint placed on the value of this option.  If it's
-  _None_, there are essentially no constraint of the value.  It may also
-  be a list of integers or strings, in which case the value *must* be
-  one of the possibilities in the list.  Numeric values may have a
-  3-tuple as the constraint; this 3-tuple contains _(minimum, maximum,
-  increment)_, and the value must be in the defined range.
-
-desc
-  A lengthy description of what the option does; it may be shown
-  to the user for clarification.
-
-index
-  An integer giving the option's index in the option list.
-
-name
-  A short name for the option, as it comes from the sane-backend. 
-
-py_name 
-  The option's name, as a legal Python identifier.  The name
-  attribute may contain the '-' character, so it will be converted to
-  '_' for the py_name attribute.
-
-size
-  For a string-valued option, this is the maximum length allowed. 
-
-title
-  A single-line string that can be used as a title string.
-	
-type
-  A constant giving the type of this option: will be one of the following 
-  constants found in the SANE module:
-	TYPE_BOOL
-	TYPE_INT
-	TYPE_FIXED
-	TYPE_STRING
-	TYPE_BUTTON
-	TYPE_GROUP
-
-unit
-  For numeric-valued options, this is a constant representing
-  the unit used for this option.  It will be one of the following
-  constants found in the SANE module:
-	UNIT_NONE
-	UNIT_PIXEL
-	UNIT_BIT
-	UNIT_MM
-	UNIT_DPI
-	UNIT_PERCENT
-
-
-
-Example us usage:
-=================
->>> import sane
->>> print 'SANE version:', sane.init()
->>> print 'Available devices=', sane.get_devices()
-SANE version: (16777230, 1, 0, 14)
->>> s = sane.open(sane.get_devices()[0][0])
->>> print 'Device parameters:', s.get_parameters()
-Device parameters: ('L', 1, (424, 585), 1, 53)
->>> print s.resolution
-50
-
-## In order to scan a color image into a PIL object:
->>> s.mode = 'color'
->>> s.start()
->>> img = s.snap()
->>> img.show()
-
-
-## In order to obtain a 16-bit grayscale image at 100DPI in a numarray object
-## with bottom-right coordinates set to (160, 120) [in millimeter] :
->>> s.mode = 'gray'
->>> s.br_x=160. ; s.br_y=120.    
->>> s.resolution = 100
->>> s.depth=16
->>> s.start()
->>> s.get_parameters()[2]   # just check the size
-(624, 472)
->>> arr16 = s.arr_snap()
->>> arr16
-array([[63957, 64721, 65067, ..., 65535, 65535, 65535],
-       [63892, 64342, 64236, ..., 65535, 65535, 65535],
-       [64286, 64248, 64705, ..., 65535, 65535, 65535],
-       ...,
-       [65518, 65249, 65058, ..., 65535, 65535, 65535],
-       [64435, 65047, 65081, ..., 65535, 65535, 65535],
-       [65309, 65438, 65535, ..., 65535, 65535, 65535]], type=UInt16)
->>> arr16.shape   # inverse order of coordinates, first y, then x!
-(472, 624)
-
diff --git a/pythonPackages/pil/Sane/setup.py b/pythonPackages/pil/Sane/setup.py
deleted file mode 100644
index 3837198ec9..0000000000
--- a/pythonPackages/pil/Sane/setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from distutils.core import setup, Extension
-
-PIL_BUILD_DIR   = '..'
-PIL_IMAGING_DIR = PIL_BUILD_DIR+'/libImaging'
-
-defs = []
-try:
-    import numarray
-    defs.append(('WITH_NUMARRAY',None))
-except ImportError:
-    pass
-
-sane = Extension('_sane',
-                 include_dirs = [PIL_IMAGING_DIR],
-                 libraries = ['sane'],
-                 library_dirs = [PIL_IMAGING_DIR],
-                 define_macros = defs,
-                 sources = ['_sane.c'])
-
-setup (name = 'pysane',
-       version = '2.0',
-       description = 'This is the pysane package',
-       py_modules = ['sane'],
-       ext_modules = [sane])
diff --git a/pythonPackages/pil/Scripts/README b/pythonPackages/pil/Scripts/README
deleted file mode 100644
index a09b0621a1..0000000000
--- a/pythonPackages/pil/Scripts/README
+++ /dev/null
@@ -1,83 +0,0 @@
--------
-Scripts
--------
-
-This directory contains a number of more or less trivial utilities
-and demo programs.
-
-Comments and contributions are welcome.
-
-</F>
-
---------------------------------------------------------------------
-pildriver.py (by Eric S. Raymond)
-
-A class implementing an image-processing calculator for scripts.
-Parses lists of commnds (or, called interactively, command-line
-arguments) into image loads, transformations, and saves.   
-
---------------------------------------------------------------------
-viewer.py
-
-A simple image viewer.  Can display all file formats handled by
-PIL.  Transparent images are properly handled.
-
---------------------------------------------------------------------
-thresholder.py
-
-A simple utility that demonstrates how a transparent 1-bit overlay
-can be used to show the current thresholding of an 8-bit image.
-
---------------------------------------------------------------------
-enhancer.py
-
-Illustrates the ImageEnhance module.  Drag the sliders to modify the
-images.  This might be very slow on some platforms, depending on the
-Tk version.
-
---------------------------------------------------------------------
-painter.py
-
-Illustrates how a painting program could be based on PIL and Tk.
-Press the left mouse button and drag over the image to remove the
-colour.  Some clever tricks have been used to get decent performance
-when updating the screen; see the sources for details.
-
---------------------------------------------------------------------
-player.py
-
-A simple image sequence player.  You can use either a sequence format
-like FLI/FLC, GIF, or ARG, or give a number of images which are
-interpreted as frames in a sequence.  All frames must have the same
-size.
-
---------------------------------------------------------------------
-gifmaker.py
-
-Convert a sequence file to a GIF animation.
-
-Note that the GIF encoder provided with this release of PIL writes
-uncompressed GIF files only, so the resulting animations are rather
-large compared with these created by other tools.
-
---------------------------------------------------------------------
-explode.py
-
-Split a sequence file into individual frames.
-
---------------------------------------------------------------------
-image2py.py
-
-Convert an image to a Python module containing an IMAGE variable.
-Note that the module using the module must include JPEG and ZIP
-decoders, unless the -u option is used.
-
---------------------------------------------------------------------
-olesummary.py
-
-Uses the OleFileIO module to dump the summary information from an OLE
-structured storage file.  This works with most OLE files, including
-Word documents, FlashPix images, etc.
-
-Note that datetime fields currently show the number of seconds since
-January 1st, 1601.
diff --git a/pythonPackages/pil/Scripts/enhancer.py b/pythonPackages/pil/Scripts/enhancer.py
deleted file mode 100644
index d581658045..0000000000
--- a/pythonPackages/pil/Scripts/enhancer.py
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: enhancer.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# this demo script creates four windows containing an image and a slider.
-# drag the slider to modify the image.
-#
-
-from Tkinter import *
-import Image, ImageTk, ImageEnhance
-import sys
-
-#
-# enhancer widget
-
-class Enhance(Frame):
-    def __init__(self, master, image, name, enhancer, lo, hi):
-        Frame.__init__(self, master)
-
-        # set up the image
-        self.tkim = ImageTk.PhotoImage(image.mode, image.size)
-        self.enhancer = enhancer(image)
-        self.update("1.0") # normalize
-
-        # image window
-        Label(self, image=self.tkim).pack()
-
-        # scale
-        s = Scale(self, label=name, orient=HORIZONTAL,
-                  from_=lo, to=hi, resolution=0.01,
-                  command=self.update)
-        s.set(self.value)
-        s.pack()
-
-    def update(self, value):
-        self.value = eval(value)
-        self.tkim.paste(self.enhancer.enhance(self.value))
-
-#
-# main
-
-root = Tk()
-
-im = Image.open(sys.argv[1])
-
-im.thumbnail((200, 200))
-
-Enhance(root, im, "Color", ImageEnhance.Color, 0.0, 4.0).pack()
-Enhance(Toplevel(), im, "Sharpness", ImageEnhance.Sharpness, -2.0, 2.0).pack()
-Enhance(Toplevel(), im, "Brightness", ImageEnhance.Brightness, -1.0, 3.0).pack()
-Enhance(Toplevel(), im, "Contrast", ImageEnhance.Contrast, -1.0, 3.0).pack()
-
-root.mainloop()
diff --git a/pythonPackages/pil/Scripts/explode.py b/pythonPackages/pil/Scripts/explode.py
deleted file mode 100644
index 04454026bb..0000000000
--- a/pythonPackages/pil/Scripts/explode.py
+++ /dev/null
@@ -1,107 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: explode.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# split an animation into a number of frame files
-#
-
-import Image
-import os, string, sys
-
-class Interval:
-
-    def __init__(self, interval = "0"):
-
-        self.setinterval(interval)
-
-    def setinterval(self, interval):
-
-        self.hilo = []
-
-        for s in string.split(interval, ","):
-            if not string.strip(s):
-                continue
-            try:
-                v = string.atoi(s)
-                if v < 0:
-                    lo, hi = 0, -v
-                else:
-                    lo = hi = v
-            except ValueError:
-                i = string.find(s, "-")
-                lo, hi = string.atoi(s[:i]), string.atoi(s[i+1:])
-
-            self.hilo.append((hi, lo))
-
-        if not self.hilo:
-            self.hilo = [(sys.maxint, 0)]
-
-    def __getitem__(self, index):
-
-        for hi, lo in self.hilo:
-            if hi >= index >= lo:
-                return 1
-        return 0
-
-# --------------------------------------------------------------------
-# main program
-
-html = 0
-
-if sys.argv[1:2] == ["-h"]:
-    html = 1
-    del sys.argv[1]
-
-if not sys.argv[2:]:
-    print
-    print "Syntax: python explode.py infile template [range]"
-    print
-    print "The template argument is used to construct the names of the"
-    print "individual frame files.  The frames are numbered file001.ext,"
-    print "file002.ext, etc.  You can insert %d to control the placement"
-    print "and syntax of the frame number."
-    print
-    print "The optional range argument specifies which frames to extract."
-    print "You can give one or more ranges like 1-10, 5, -15 etc.  If"
-    print "omitted, all frames are extracted."
-    sys.exit(1)
-
-infile = sys.argv[1]
-outfile = sys.argv[2]
-
-frames = Interval(string.join(sys.argv[3:], ","))
-
-try:
-    # check if outfile contains a placeholder
-    outfile % 1
-except TypeError:
-    file, ext = os.path.splitext(outfile)
-    outfile = file + "%03d" + ext
-
-ix = 1
-
-im = Image.open(infile)
-
-if html:
-    file, ext = os.path.splitext(outfile)
-    html = open(file+".html", "w")
-    html.write("<html>\n<body>\n")
-
-while 1:
-
-    if frames[ix]:
-        im.save(outfile % ix)
-        print outfile % ix
-
-        if html:
-            html.write("<img src='%s'><br>\n" % outfile % ix)
-
-    try:
-        im.seek(ix)
-    except EOFError:
-        break
-
-    ix = ix + 1
-
-if html:
-    html.write("</body>\n</html>\n")
diff --git a/pythonPackages/pil/Scripts/gifmaker.py b/pythonPackages/pil/Scripts/gifmaker.py
deleted file mode 100644
index f27f9b82fa..0000000000
--- a/pythonPackages/pil/Scripts/gifmaker.py
+++ /dev/null
@@ -1,135 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: gifmaker.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# convert sequence format to GIF animation
-#
-# history:
-#       97-01-03 fl     created
-#
-# Copyright (c) Secret Labs AB 1997.  All rights reserved.
-# Copyright (c) Fredrik Lundh 1997.
-#
-# See the README file for information on usage and redistribution.
-#
-
-#
-# For special purposes, you can import this module and call
-# the makedelta or compress functions yourself.  For example,
-# if you have an application that generates a sequence of
-# images, you can convert it to a GIF animation using some-
-# thing like the following code:
-#
-#       import Image
-#       import gifmaker
-#
-#       sequence = []
-#
-#       # generate sequence
-#       for i in range(100):
-#           im = <generate image i>
-#           sequence.append(im)
-#
-#       # write GIF animation
-#       fp = open("out.gif", "wb")
-#       gifmaker.makedelta(fp, sequence)
-#       fp.close()
-#
-# Alternatively, use an iterator to generate the sequence, and
-# write data directly to a socket.  Or something...
-#
-
-import Image, ImageChops
-import string
-
-from GifImagePlugin import getheader, getdata
-
-# --------------------------------------------------------------------
-# sequence iterator
-
-class image_sequence:
-    def __init__(self, im):
-        self.im = im
-    def __getitem__(self, ix):
-        try:
-            if ix:
-                self.im.seek(ix)
-            return self.im
-        except EOFError:
-            raise IndexError # end of sequence
-
-# --------------------------------------------------------------------
-# straightforward delta encoding
-
-def makedelta(fp, sequence):
-    """Convert list of image frames to a GIF animation file"""
-
-    frames = 0
-
-    previous = None
-
-    for im in sequence:
-
-        #
-        # FIXME: write graphics control block before each frame
-
-        if not previous:
-
-            # global header
-            for s in getheader(im) + getdata(im):
-                fp.write(s)
-
-        else:
-
-            # delta frame
-            delta = ImageChops.subtract_modulo(im, previous)
-
-            bbox = delta.getbbox()
-
-            if bbox:
-
-                # compress difference
-                for s in getdata(im.crop(bbox), offset = bbox[:2]):
-                    fp.write(s)
-
-            else:
-                # FIXME: what should we do in this case?
-                pass
-
-        previous = im.copy()
-
-        frames = frames + 1
-
-    fp.write(";")
-
-    return frames
-
-# --------------------------------------------------------------------
-# main hack
-
-def compress(infile, outfile):
-
-    # open input image, and force loading of first frame
-    im = Image.open(infile)
-    im.load()
-
-    # open output file
-    fp = open(outfile, "wb")
-
-    seq = image_sequence(im)
-
-    makedelta(fp, seq)
-
-    fp.close()
-
-
-if __name__ == "__main__":
-
-    import sys
-
-    if len(sys.argv) < 3:
-        print "GIFMAKER -- create GIF animations"
-        print "Usage: gifmaker infile outfile"
-        sys.exit(1)
-
-    compress(sys.argv[1], sys.argv[2])
diff --git a/pythonPackages/pil/Scripts/image2py.py b/pythonPackages/pil/Scripts/image2py.py
deleted file mode 100644
index f769a7fd95..0000000000
--- a/pythonPackages/pil/Scripts/image2py.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: image2py.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# convert an image to a Python module
-#
-# to use the module, import it and access the "IMAGE" variable
-#
-#       import img1
-#       im = img1.IMAGE
-#
-# the variable name can be changed with the -n option
-#
-# note that the application using this module must include JPEG
-# and/or ZIP decoders, unless the -u option is used.
-#
-# Copyright (c) Secret Labs AB 1997.  All rights reserved.
-# Copyright (c) Fredrik Lundh 1997.
-#
-# See the README file for information on usage and redistribution.
-#
-
-import Image
-import getopt, string, StringIO, sys
-
-octdigits = "01234567"
-
-def usage():
-    print "image2py 0.1/97-01-03 -- convert image to python module"
-    print
-    print "Usage: image2py [options] imagefile pyfile"
-    print
-    print "Options:"
-    print "  -n <name>    set variable name (default is 'IMAGE')"
-    print "  -l           use lossy compression (JPEG) if suitable"
-    print "  -u           disable compression"
-    print
-    print "Provided you use distinct variable names, the output"
-    print "files can be concatenated into one large module file."
-    sys.exit(1)
-
-try:
-    opt, argv = getopt.getopt(sys.argv[1:], "n:lu")
-except getopt.error, v:
-    usage()
-
-name = "IMAGE"
-lossy = 0
-compress = 1
-
-for o, a in opt:
-    if o == "-n":
-        name = a
-    elif o == "-l":
-        lossy = 1
-    elif o == "-u":
-        compress = 0
-
-if len(argv) != 2:
-    usage()
-
-# --------------------------------------------------------------------
-# convert image to string
-
-im = Image.open(argv[0])
-
-if im.format == "JPEG" and compress:
-
-    # store as is
-    data = open(argv[0], "rb").read()
-
-else:
-
-    # load and store as PNG
-    fp = StringIO.StringIO()
-
-    if compress:
-        if lossy and im.mode in ["L", "RGB"]:
-            im.save(fp, "JPEG")
-        else:
-            im.convert("RGB").save(fp, "PNG")
-    else:
-        im.save(fp, "PPM") # FIXME: won't work with "P" images
-
-    data = fp.getvalue()
-
-# --------------------------------------------------------------------
-# convert string to python module (this is not very fast...)
-
-fp = open(argv[1], "w")
-
-data = repr(data)
-
-fp.write("# generated by image2py %s\n" % argv[0])
-fp.write("import Image, StringIO\n")
-
-word = "%s = Image.open(StringIO.StringIO('" % name
-
-fp.write(word)
-c = len(word)
-
-i = 1
-while i < len(data)-1:
-    if data[i] != "\\":
-        word = data[i]
-        i = i + 1
-    else:
-        if data[i+1] in octdigits:
-            for n in range(2, 5):
-                if data[i+n] not in octdigits:
-                    break
-            word = data[i:i+n]
-            i = i + n
-        else:
-            word = data[i:i+2]
-            i = i + 2
-    l = len(word)
-    if c + l >= 78-1:
-        # fp.write("'\n'")
-        fp.write("\\\n")
-        c = 0
-    fp.write(word)
-    c = c + l
-
-fp.write("'))\n")
diff --git a/pythonPackages/pil/Scripts/painter.py b/pythonPackages/pil/Scripts/painter.py
deleted file mode 100644
index bf7a114927..0000000000
--- a/pythonPackages/pil/Scripts/painter.py
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: painter.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# this demo script illustrates pasting into an already displayed
-# photoimage.  note that the current version of Tk updates the whole
-# image everytime we paste, so to get decent performance, we split
-# the image into a set of tiles.
-#
-
-from Tkinter import *
-import Image, ImageTk
-import sys
-
-#
-# painter widget
-
-class PaintCanvas(Canvas):
-    def __init__(self, master, image):
-        Canvas.__init__(self, master, width=image.size[0], height=image.size[1])
-
-        # fill the canvas
-        self.tile = {}
-        self.tilesize = tilesize = 32
-        xsize, ysize = image.size
-        for x in range(0, xsize, tilesize):
-            for y in range(0, ysize, tilesize):
-                box = x, y, min(xsize, x+tilesize), min(ysize, y+tilesize)
-                tile = ImageTk.PhotoImage(image.crop(box))
-                self.create_image(x, y, image=tile, anchor=NW)
-                self.tile[(x,y)] = box, tile
-
-        self.image = image
-
-        self.bind("<B1-Motion>", self.paint)
-
-    def paint(self, event):
-        xy = event.x - 10, event.y - 10, event.x + 10, event.y + 10
-        im = self.image.crop(xy)
-
-        # process the image in some fashion
-        im = im.convert("L")
-
-        self.image.paste(im, xy)
-        self.repair(xy)
-
-    def repair(self, box):
-        # update canvas
-        dx = box[0] % self.tilesize
-        dy = box[1] % self.tilesize
-        for x in range(box[0]-dx, box[2]+1, self.tilesize):
-            for y in range(box[1]-dy, box[3]+1, self.tilesize):
-                try:
-                    xy, tile = self.tile[(x, y)]
-                    tile.paste(self.image.crop(xy))
-                except KeyError:
-                    pass # outside the image
-        self.update_idletasks()
-
-#
-# main
-
-root = Tk()
-
-im = Image.open(sys.argv[1])
-
-if im.mode != "RGB":
-    im = im.convert("RGB")
-
-PaintCanvas(root, im).pack()
-
-root.mainloop()
diff --git a/pythonPackages/pil/Scripts/pilconvert.py b/pythonPackages/pil/Scripts/pilconvert.py
deleted file mode 100644
index 176f2a60be..0000000000
--- a/pythonPackages/pil/Scripts/pilconvert.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#! /usr/local/bin/python
-#
-# The Python Imaging Library.
-# $Id: pilconvert.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# convert image files
-#
-# History:
-# 0.1   96-04-20 fl     Created
-# 0.2   96-10-04 fl     Use draft mode when converting images
-# 0.3   96-12-30 fl     Optimize output (PNG, JPEG)
-# 0.4   97-01-18 fl     Made optimize an option (PNG, JPEG)
-# 0.5   98-12-30 fl     Fixed -f option (from Anthony Baxter)
-#
-
-import site
-import getopt, string, sys
-
-from PIL import Image
-
-def usage():
-    print "PIL Convert 0.5/1998-12-30 -- convert image files"
-    print "Usage: pilconvert [option] infile outfile"
-    print
-    print "Options:"
-    print
-    print "  -c <format>  convert to format (default is given by extension)"
-    print
-    print "  -g           convert to greyscale"
-    print "  -p           convert to palette image (using standard palette)"
-    print "  -r           convert to rgb"
-    print
-    print "  -o           optimize output (trade speed for size)"
-    print "  -q <value>   set compression quality (0-100, JPEG only)"
-    print
-    print "  -f           list supported file formats"
-    sys.exit(1)
-
-if len(sys.argv) == 1:
-    usage()
-
-try:
-    opt, argv = getopt.getopt(sys.argv[1:], "c:dfgopq:r")
-except getopt.error, v:
-    print v
-    sys.exit(1)
-
-format = None
-convert = None
-
-options = { }
-
-for o, a in opt:
-
-    if o == "-f":
-        Image.init()
-        id = Image.ID[:]
-        id.sort()
-        print "Supported formats (* indicates output format):"
-        for i in id:
-            if Image.SAVE.has_key(i):
-                print i+"*",
-            else:
-                print i,
-        sys.exit(1)
-
-    elif o == "-c":
-        format = a
-
-    if o == "-g":
-        convert = "L"
-    elif o == "-p":
-        convert = "P"
-    elif o == "-r":
-        convert = "RGB"
-
-    elif o == "-o":
-        options["optimize"] = 1
-    elif o == "-q":
-        options["quality"] = string.atoi(a)
-
-if len(argv) != 2:
-    usage()
-
-try:
-    im = Image.open(argv[0])
-    if convert and im.mode != convert:
-        im.draft(convert, im.size)
-        im = im.convert(convert)
-    if format:
-        apply(im.save, (argv[1], format), options)
-    else:
-        apply(im.save, (argv[1],), options)
-except:
-    print "cannot convert image",
-    print "(%s:%s)" % (sys.exc_type, sys.exc_value)
diff --git a/pythonPackages/pil/Scripts/pildriver.py b/pythonPackages/pil/Scripts/pildriver.py
deleted file mode 100644
index 089e0bdfde..0000000000
--- a/pythonPackages/pil/Scripts/pildriver.py
+++ /dev/null
@@ -1,523 +0,0 @@
-#!/usr/bin/env python
-"""PILdriver, an image-processing calculator using PIL.
-
-An instance of class PILDriver is essentially a software stack machine
-(Polish-notation interpreter) for sequencing PIL image
-transformations.  The state of the instance is the interpreter stack.
-
-The only method one will normally invoke after initialization is the
-`execute' method.  This takes an argument list of tokens, pushes them
-onto the instance's stack, and then tries to clear the stack by
-successive evaluation of PILdriver operators.  Any part of the stack
-not cleaned off persists and is part of the evaluation context for
-the next call of the execute method.
-
-PILDriver doesn't catch any exceptions, on the theory that these
-are actually diagnostic information that should be interpreted by
-the calling code.
-
-When called as a script, the command-line arguments are passed to
-a PILDriver instance.  If there are no command-line arguments, the
-module runs an interactive interpreter, each line of which is split into
-space-separated tokens and passed to the execute method.
-
-In the method descriptions below, a first line beginning with the string
-`usage:' means this method can be invoked with the token that follows
-it.  Following <>-enclosed arguments describe how the method interprets
-the entries on the stack.  Each argument specification begins with a
-type specification: either `int', `float', `string', or `image'.
-
-All operations consume their arguments off the stack (use `dup' to
-keep copies around).  Use `verbose 1' to see the stack state displayed
-before each operation.
-
-Usage examples:
-
-    `show crop 0 0 200 300 open test.png' loads test.png, crops out a portion
-of its upper-left-hand corner and displays the cropped portion.
-
-    `save rotated.png rotate 30 open test.tiff' loads test.tiff, rotates it
-30 degrees, and saves the result as rotated.png (in PNG format).
-"""
-# by Eric S. Raymond <esr@thyrsus.com>
-# $Id: pildriver.py 2813 2006-10-07 10:11:35Z fredrik $
-
-# TO DO:
-# 1. Add PILFont capabilities, once that's documented.
-# 2. Add PILDraw operations.
-# 3. Add support for composing and decomposing multiple-image files.
-#
-
-import Image, string
-
-class PILDriver:
-
-    verbose = 0
-
-    def do_verbose(self):
-        """usage: verbose <int:num>
-
-        Set verbosity flag from top of stack.
-        """
-        self.verbose = self.do_pop()
-
-    # The evaluation stack (internal only)
-
-    stack = []          # Stack of pending operations
-
-    def push(self, item):
-        "Push an argument onto the evaluation stack."
-        self.stack = [item] + self.stack
-
-    def top(self):
-        "Return the top-of-stack element."
-        return self.stack[0]
-
-    # Stack manipulation (callable)
-
-    def do_clear(self):
-        """usage: clear
-
-        Clear the stack.
-        """
-        self.stack = []
-
-    def do_pop(self):
-        """usage: pop
-
-        Discard the top element on the stack.
-        """
-        top = self.stack[0]
-        self.stack = self.stack[1:]
-        return top
-
-    def do_dup(self):
-        """usage: dup
-
-        Duplicate the top-of-stack item.
-        """
-        if hasattr(self, 'format'):     # If it's an image, do a real copy
-            dup = self.stack[0].copy()
-        else:
-            dup = self.stack[0]
-        self.stack = [dup] + self.stack
-
-    def do_swap(self):
-        """usage: swap
-
-        Swap the top-of-stack item with the next one down.
-        """
-        self.stack = [self.stack[1], self.stack[0]] + self.stack[2:]
-
-    # Image module functions (callable)
-
-    def do_new(self):
-        """usage: new <int:xsize> <int:ysize> <int:color>:
-
-        Create and push a greyscale image of given size and color.
-        """
-        xsize = int(self.do_pop())
-        ysize = int(self.do_pop())
-        color = int(self.do_pop())
-        self.push(Image.new("L", (xsize, ysize), color))
-
-    def do_open(self):
-        """usage: open <string:filename>
-
-        Open the indicated image, read it, push the image on the stack.
-        """
-        self.push(Image.open(self.do_pop()))
-
-    def do_blend(self):
-        """usage: blend <image:pic1> <image:pic2> <float:alpha>
-
-        Replace two images and an alpha with the blended image.
-        """
-        image1 = self.do_pop()
-        image2 = self.do_pop()
-        alpha = float(self.do_pop())
-        self.push(Image.blend(image1, image2, alpha))
-
-    def do_composite(self):
-        """usage: composite <image:pic1> <image:pic2> <image:mask>
-
-        Replace two images and a mask with their composite.
-        """
-        image1 = self.do_pop()
-        image2 = self.do_pop()
-        mask = self.do_pop()
-        self.push(Image.composite(image1, image2, mask))
-
-    def do_merge(self):
-        """usage: merge <string:mode> <image:pic1> [<image:pic2> [<image:pic3> [<image:pic4>]]]
-
-        Merge top-of stack images in a way described by the mode.
-        """
-        mode = self.do_pop()
-        bandlist = []
-        for band in mode:
-            bandlist.append(self.do_pop())
-        self.push(Image.merge(mode, bandlist))
-
-    # Image class methods
-
-    def do_convert(self):
-        """usage: convert <string:mode> <image:pic1>
-
-        Convert the top image to the given mode.
-        """
-        mode = self.do_pop()
-        image = self.do_pop()
-        self.push(image.convert(mode))
-
-    def do_copy(self):
-        """usage: copy <image:pic1>
-
-        Make and push a true copy of the top image.
-        """
-        self.dup()
-
-    def do_crop(self):
-        """usage: crop <int:left> <int:upper> <int:right> <int:lower> <image:pic1>
-
-        Crop and push a rectangular region from the current image.
-        """
-        left = int(self.do_pop())
-        upper = int(self.do_pop())
-        right = int(self.do_pop())
-        lower = int(self.do_pop())
-        image = self.do_pop()
-        self.push(image.crop((left, upper, right, lower)))
-
-    def do_draft(self):
-        """usage: draft <string:mode> <int:xsize> <int:ysize>
-
-        Configure the loader for a given mode and size.
-        """
-        mode = self.do_pop()
-        xsize = int(self.do_pop())
-        ysize = int(self.do_pop())
-        self.push(self.draft(mode, (xsize, ysize)))
-
-    def do_filter(self):
-        """usage: filter <string:filtername> <image:pic1>
-
-        Process the top image with the given filter.
-        """
-        import ImageFilter
-        filter = eval("ImageFilter." + string.upper(self.do_pop()))
-        image = self.do_pop()
-        self.push(image.filter(filter))
-
-    def do_getbbox(self):
-        """usage: getbbox
-
-        Push left, upper, right, and lower pixel coordinates of the top image.
-        """
-        bounding_box = self.do_pop().getbbox()
-        self.push(bounding_box[3])
-        self.push(bounding_box[2])
-        self.push(bounding_box[1])
-        self.push(bounding_box[0])
-
-    def do_getextrema(self):
-        """usage: extrema
-
-        Push minimum and maximum pixel values of the top image.
-        """
-        extrema = self.do_pop().extrema()
-        self.push(extrema[1])
-        self.push(extrema[0])
-
-    def do_offset(self):
-        """usage: offset <int:xoffset> <int:yoffset> <image:pic1>
-
-        Offset the pixels in the top image.
-        """
-        xoff = int(self.do_pop())
-        yoff = int(self.do_pop())
-        image = self.do_pop()
-        self.push(image.offset(xoff, yoff))
-
-    def do_paste(self):
-        """usage: paste <image:figure> <int:xoffset> <int:yoffset> <image:ground>
-
-        Paste figure image into ground with upper left at given offsets.
-        """
-        figure = self.do_pop()
-        xoff = int(self.do_pop())
-        yoff = int(self.do_pop())
-        ground = self.do_pop()
-        if figure.mode == "RGBA":
-            ground.paste(figure, (xoff, yoff), figure)
-        else:
-            ground.paste(figure, (xoff, yoff))
-        self.push(ground)
-
-    def do_resize(self):
-        """usage: resize <int:xsize> <int:ysize> <image:pic1>
-
-        Resize the top image.
-        """
-        ysize = int(self.do_pop())
-        xsize = int(self.do_pop())
-        image = self.do_pop()
-        self.push(image.resize((xsize, ysize)))
-
-    def do_rotate(self):
-        """usage: rotate <int:angle> <image:pic1>
-
-        Rotate image through a given angle
-        """
-        angle = int(self.do_pop())
-        image = self.do_pop()
-        self.push(image.rotate(angle))
-
-    def do_save(self):
-        """usage: save <string:filename> <image:pic1>
-
-        Save image with default options.
-        """
-        filename = self.do_pop()
-        image = self.do_pop()
-        image.save(filename)
-
-    def do_save2(self):
-        """usage: save2 <string:filename> <string:options> <image:pic1>
-
-        Save image with specified options.
-        """
-        filename = self.do_pop()
-        options = self.do_pop()
-        image = self.do_pop()
-        image.save(filename, None, options)
-
-    def do_show(self):
-        """usage: show <image:pic1>
-
-        Display and pop the top image.
-        """
-        self.do_pop().show()
-
-    def do_thumbnail(self):
-        """usage: thumbnail <int:xsize> <int:ysize> <image:pic1>
-
-        Modify the top image in the stack to contain a thumbnail of itself.
-        """
-        ysize = int(self.do_pop())
-        xsize = int(self.do_pop())
-        self.top().thumbnail((xsize, ysize))
-
-    def do_transpose(self):
-        """usage: transpose <string:operator> <image:pic1>
-
-        Transpose the top image.
-        """
-        transpose = string.upper(self.do_pop())
-        image = self.do_pop()
-        self.push(image.transpose(transpose))
-
-    # Image attributes
-
-    def do_format(self):
-        """usage: format <image:pic1>
-
-        Push the format of the top image onto the stack.
-        """
-        self.push(self.pop().format)
-
-    def do_mode(self):
-        """usage: mode <image:pic1>
-
-        Push the mode of the top image onto the stack.
-        """
-        self.push(self.pop().mode)
-
-    def do_size(self):
-        """usage: size <image:pic1>
-
-        Push the image size on the stack as (y, x).
-        """
-        size = self.pop().size
-        self.push(size[0])
-        self.push(size[1])
-
-    # ImageChops operations
-
-    def do_invert(self):
-        """usage: invert <image:pic1>
-
-        Invert the top image.
-        """
-        import ImageChops
-        self.push(ImageChops.invert(self.do_pop()))
-
-    def do_lighter(self):
-        """usage: lighter <image:pic1> <image:pic2>
-
-        Pop the two top images, push an image of the lighter pixels of both.
-        """
-        import ImageChops
-        image1 = self.do_pop()
-        image2 = self.do_pop()
-        self.push(ImageChops.lighter(image1, image2))
-
-    def do_darker(self):
-        """usage: darker <image:pic1> <image:pic2>
-
-        Pop the two top images, push an image of the darker pixels of both.
-        """
-        import ImageChops
-        image1 = self.do_pop()
-        image2 = self.do_pop()
-        self.push(ImageChops.darker(image1, image2))
-
-    def do_difference(self):
-        """usage: difference <image:pic1> <image:pic2>
-
-        Pop the two top images, push the difference image
-        """
-        import ImageChops
-        image1 = self.do_pop()
-        image2 = self.do_pop()
-        self.push(ImageChops.difference(image1, image2))
-
-    def do_multiply(self):
-        """usage: multiply <image:pic1> <image:pic2>
-
-        Pop the two top images, push the multiplication image.
-        """
-        import ImageChops
-        image1 = self.do_pop()
-        image2 = self.do_pop()
-        self.push(ImageChops.multiply(image1, image2))
-
-    def do_screen(self):
-        """usage: screen <image:pic1> <image:pic2>
-
-        Pop the two top images, superimpose their inverted versions.
-        """
-        import ImageChops
-        image2 = self.do_pop()
-        image1 = self.do_pop()
-        self.push(ImageChops.screen(image1, image2))
-
-    def do_add(self):
-        """usage: add <image:pic1> <image:pic2> <int:offset> <float:scale>
-
-        Pop the two top images, produce the scaled sum with offset.
-        """
-        import ImageChops
-        image1 = self.do_pop()
-        image2 = self.do_pop()
-        scale = float(self.do_pop())
-        offset = int(self.do_pop())
-        self.push(ImageChops.add(image1, image2, scale, offset))
-
-    def do_subtract(self):
-        """usage: subtract <image:pic1> <image:pic2> <int:offset> <float:scale>
-
-        Pop the two top images, produce the scaled difference with offset.
-        """
-        import ImageChops
-        image1 = self.do_pop()
-        image2 = self.do_pop()
-        scale = float(self.do_pop())
-        offset = int(self.do_pop())
-        self.push(ImageChops.subtract(image1, image2, scale, offset))
-
-    # ImageEnhance classes
-
-    def do_color(self):
-        """usage: color <image:pic1>
-
-        Enhance color in the top image.
-        """
-        import ImageEnhance
-        factor = float(self.do_pop())
-        image = self.do_pop()
-        enhancer = ImageEnhance.Color(image)
-        self.push(enhancer.enhance(factor))
-
-    def do_contrast(self):
-        """usage: contrast <image:pic1>
-
-        Enhance contrast in the top image.
-        """
-        import ImageEnhance
-        factor = float(self.do_pop())
-        image = self.do_pop()
-        enhancer = ImageEnhance.Color(image)
-        self.push(enhancer.enhance(factor))
-
-    def do_brightness(self):
-        """usage: brightness <image:pic1>
-
-        Enhance brightness in the top image.
-        """
-        import ImageEnhance
-        factor = float(self.do_pop())
-        image = self.do_pop()
-        enhancer = ImageEnhance.Color(image)
-        self.push(enhancer.enhance(factor))
-
-    def do_sharpness(self):
-        """usage: sharpness <image:pic1>
-
-        Enhance sharpness in the top image.
-        """
-        import ImageEnhance
-        factor = float(self.do_pop())
-        image = self.do_pop()
-        enhancer = ImageEnhance.Color(image)
-        self.push(enhancer.enhance(factor))
-
-    # The interpreter loop
-
-    def execute(self, list):
-        "Interpret a list of PILDriver commands."
-        list.reverse()
-        while len(list) > 0:
-            self.push(list[0])
-            list = list[1:]
-            if self.verbose:
-                print "Stack: " + `self.stack`
-            top = self.top()
-            if type(top) != type(""):
-                continue;
-            funcname = "do_" + top
-            if not hasattr(self, funcname):
-                continue
-            else:
-                self.do_pop()
-                func = getattr(self, funcname)
-                func()
-
-if __name__ == '__main__':
-    import sys
-    try:
-        import readline
-    except ImportError:
-        pass # not available on all platforms
-
-    # If we see command-line arguments, interpret them as a stack state
-    # and execute.  Otherwise go interactive.
-
-    driver = PILDriver()
-    if len(sys.argv[1:]) > 0:
-        driver.execute(sys.argv[1:])
-    else:
-        print "PILDriver says hello."
-        while 1:
-            try:
-                line = raw_input('pildriver> ');
-            except EOFError:
-                print "\nPILDriver says goodbye."
-                break
-            driver.execute(string.split(line))
-            print driver.stack
-
-# The following sets edit modes for GNU EMACS
-# Local Variables:
-# mode:python
-# End:
diff --git a/pythonPackages/pil/Scripts/pilfile.py b/pythonPackages/pil/Scripts/pilfile.py
deleted file mode 100644
index a634032c3d..0000000000
--- a/pythonPackages/pil/Scripts/pilfile.py
+++ /dev/null
@@ -1,94 +0,0 @@
-#! /usr/local/bin/python
-#
-# The Python Imaging Library.
-# $Id: pilfile.py 2813 2006-10-07 10:11:35Z fredrik $
-#
-# a utility to identify image files
-#
-# this script identifies image files, extracting size and
-# pixel mode information for known file formats.  Note that
-# you don't need the PIL C extension to use this module.
-#
-# History:
-# 0.0 1995-09-01 fl   Created
-# 0.1 1996-05-18 fl   Modified options, added debugging mode
-# 0.2 1996-12-29 fl   Added verify mode
-# 0.3 1999-06-05 fl   Don't mess up on class exceptions (1.5.2 and later)
-# 0.4 2003-09-30 fl   Expand wildcards on Windows; robustness tweaks
-#
-
-import site
-import getopt, glob, sys
-
-from PIL import Image
-
-if len(sys.argv) == 1:
-    print "PIL File 0.4/2003-09-30 -- identify image files"
-    print "Usage: pilfile [option] files..."
-    print "Options:"
-    print "  -f  list supported file formats"
-    print "  -i  show associated info and tile data"
-    print "  -v  verify file headers"
-    print "  -q  quiet, don't warn for unidentified/missing/broken files"
-    sys.exit(1)
-
-try:
-    opt, args = getopt.getopt(sys.argv[1:], "fqivD")
-except getopt.error, v:
-    print v
-    sys.exit(1)
-
-verbose = quiet = verify = 0
-
-for o, a in opt:
-    if o == "-f":
-        Image.init()
-        id = Image.ID[:]
-        id.sort()
-        print "Supported formats:"
-        for i in id:
-            print i,
-        sys.exit(1)
-    elif o == "-i":
-        verbose = 1
-    elif o == "-q":
-        quiet = 1
-    elif o == "-v":
-        verify = 1
-    elif o == "-D":
-        Image.DEBUG = Image.DEBUG + 1
-
-def globfix(files):
-    # expand wildcards where necessary
-    if sys.platform == "win32":
-        out = []
-        for file in files:
-            if glob.has_magic(file):
-                out.extend(glob.glob(file))
-            else:
-                out.append(file)
-        return out
-    return files
-
-for file in globfix(args):
-    try:
-        im = Image.open(file)
-        print "%s:" % file, im.format, "%dx%d" % im.size, im.mode,
-        if verbose:
-            print im.info, im.tile,
-        print
-        if verify:
-            try:
-                im.verify()
-            except:
-                if not quiet:
-                    print "failed to verify image",
-                    print "(%s:%s)" % (sys.exc_type, sys.exc_value)
-    except IOError, v:
-        if not quiet:
-            print file, "failed:", v
-    except:
-        import traceback
-        if not quiet:
-            print file, "failed:", "unexpected error"
-            traceback.print_exc(file=sys.stdout)
diff --git a/pythonPackages/pil/Scripts/pilfont.py b/pythonPackages/pil/Scripts/pilfont.py
deleted file mode 100644
index b475463639..0000000000
--- a/pythonPackages/pil/Scripts/pilfont.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: pilfont.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# PIL raster font compiler
-#
-# history:
-# 1997-08-25 fl   created
-# 2002-03-10 fl   use "from PIL import"
-#
-
-VERSION = "0.4"
-
-import site
-import glob, os, sys
-
-# drivers
-from PIL import BdfFontFile
-from PIL import PcfFontFile
-
-if len(sys.argv) <= 1:
-    print "PILFONT", VERSION, "-- PIL font compiler."
-    print
-    print "Usage: pilfont fontfiles..."
-    print
-    print "Convert given font files to the PIL raster font format."
-    print "This version of pilfont supports X BDF and PCF fonts."
-    sys.exit(1)
-
-files = []
-for f in sys.argv[1:]:
-    files = files + glob.glob(f)
-
-for f in files:
-
-    print f + "...",
-
-    try:
-
-        fp = open(f, "rb")
-
-        try:
-            p = PcfFontFile.PcfFontFile(fp)
-        except SyntaxError:
-            fp.seek(0)
-            p = BdfFontFile.BdfFontFile(fp)
-
-        p.save(f)
-
-    except (SyntaxError, IOError):
-        print "failed"
-
-    else:
-        print "OK"
diff --git a/pythonPackages/pil/Scripts/pilprint.py b/pythonPackages/pil/Scripts/pilprint.py
deleted file mode 100644
index 222cbff11a..0000000000
--- a/pythonPackages/pil/Scripts/pilprint.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#! /usr/local/bin/python
-#
-# The Python Imaging Library.
-# $Id: pilprint.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# print image files to postscript printer
-#
-# History:
-# 0.1   1996-04-20 fl   Created
-# 0.2   1996-10-04 fl   Use draft mode when converting.
-# 0.3   2003-05-06 fl   Fixed a typo or two.
-#
-
-VERSION = "pilprint 0.3/2003-05-05"
-
-import Image
-import PSDraw
-
-letter = ( 1.0*72, 1.0*72, 7.5*72, 10.0*72 )
-
-def description(file, image):
-    import os
-    title = os.path.splitext(os.path.split(file)[1])[0]
-    format = " (%dx%d "
-    if image.format:
-        format = " (" + image.format + " %dx%d "
-    return title + format % image.size + image.mode + ")"
-
-import getopt, os, sys
-
-if len(sys.argv) == 1:
-    print "PIL Print 0.2a1/96-10-04 -- print image files"
-    print "Usage: pilprint files..."
-    print "Options:"
-    print "  -c            colour printer (default is monochrome)"
-    print "  -p            print via lpr (default is stdout)"
-    print "  -P <printer>  same as -p but use given printer"
-    sys.exit(1)
-
-try:
-    opt, argv = getopt.getopt(sys.argv[1:], "cdpP:")
-except getopt.error, v:
-    print v
-    sys.exit(1)
-
-printer = None # print to stdout
-monochrome = 1 # reduce file size for most common case
-
-for o, a in opt:
-    if o == "-d":
-        # debug: show available drivers
-        Image.init()
-        print Image.ID
-        sys.exit(1)
-    elif o == "-c":
-        # colour printer
-        monochrome = 0
-    elif o == "-p":
-        # default printer channel
-        printer = "lpr"
-    elif o == "-P":
-        # printer channel
-        printer = "lpr -P%s" % a
-
-for file in argv:
-    try:
-
-        im = Image.open(file)
-
-        title = description(file, im)
-
-        if monochrome and im.mode not in ["1", "L"]:
-            im.draft("L", im.size)
-            im = im.convert("L")
-
-        if printer:
-            fp = os.popen(printer, "w")
-        else:
-            fp = sys.stdout
-
-        ps = PSDraw.PSDraw(fp)
-
-        ps.begin_document()
-        ps.setfont("Helvetica-Narrow-Bold", 18)
-        ps.text((letter[0], letter[3]+24), title)
-        ps.setfont("Helvetica-Narrow-Bold", 8)
-        ps.text((letter[0], letter[1]-30), VERSION)
-        ps.image(letter, im)
-        ps.end_document()
-
-    except:
-        print "cannot print image",
-        print "(%s:%s)" % (sys.exc_type, sys.exc_value)
diff --git a/pythonPackages/pil/Scripts/player.py b/pythonPackages/pil/Scripts/player.py
deleted file mode 100644
index b6ef256da3..0000000000
--- a/pythonPackages/pil/Scripts/player.py
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: player.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-
-from Tkinter import *
-import Image, ImageTk
-import sys
-
-
-Image.DEBUG = 0
-
-
-# --------------------------------------------------------------------
-# experimental: support ARG animation scripts
-
-import ArgImagePlugin
-
-def applet_hook(animation, images):
-    app = animation(animation_display, images)
-    app.run()
-
-ArgImagePlugin.APPLET_HOOK = applet_hook
-
-class AppletDisplay:
-    def __init__(self, ui):
-        self.__ui = ui
-    def paste(self, im, bbox):
-        self.__ui.image.paste(im, bbox)
-    def update(self):
-        self.__ui.update_idletasks()
-
-# --------------------------------------------------------------------
-# an image animation player
-
-class UI(Label):
-
-    def __init__(self, master, im):
-        if type(im) == type([]):
-            # list of images
-            self.im = im[1:]
-            im = self.im[0]
-        else:
-            # sequence
-            self.im = im
-
-        if im.mode == "1":
-            self.image = ImageTk.BitmapImage(im, foreground="white")
-        else:
-            self.image = ImageTk.PhotoImage(im)
-
-        # APPLET SUPPORT (very crude, and not 100% safe)
-        global animation_display
-        animation_display = AppletDisplay(self)
-
-        Label.__init__(self, master, image=self.image, bg="black", bd=0)
-
-        self.update()
-
-        try:
-            duration = im.info["duration"]
-        except KeyError:
-            duration = 100
-        self.after(duration, self.next)
-
-    def next(self):
-
-        if type(self.im) == type([]):
-
-            try:
-                im = self.im[0]
-                del self.im[0]
-                self.image.paste(im)
-            except IndexError:
-                return # end of list
-
-        else:
-
-            try:
-                im = self.im
-                im.seek(im.tell() + 1)
-                self.image.paste(im)
-            except EOFError:
-                return # end of file
-
-        try:
-            duration = im.info["duration"]
-        except KeyError:
-            duration = 100
-        self.after(duration, self.next)
-
-        self.update_idletasks()
-
-
-# --------------------------------------------------------------------
-# script interface
-
-if __name__ == "__main__":
-
-    if not sys.argv[1:]:
-        print "Syntax: python player.py imagefile(s)"
-        sys.exit(1)
-
-    filename = sys.argv[1]
-
-    root = Tk()
-    root.title(filename)
-
-    if len(sys.argv) > 2:
-        # list of images
-        print "loading..."
-        im = []
-        for filename in sys.argv[1:]:
-            im.append(Image.open(filename))
-    else:
-        # sequence
-        im = Image.open(filename)
-
-    UI(root, im).pack()
-
-    root.mainloop()
diff --git a/pythonPackages/pil/Scripts/thresholder.py b/pythonPackages/pil/Scripts/thresholder.py
deleted file mode 100644
index be5cbd4d02..0000000000
--- a/pythonPackages/pil/Scripts/thresholder.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: thresholder.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-# this demo script illustrates how a 1-bit BitmapImage can be used
-# as a dynamically updated overlay
-#
-
-from Tkinter import *
-import Image, ImageTk
-import sys
-
-#
-# an image viewer
-
-class UI(Frame):
-    def __init__(self, master, im, value = 128):
-        Frame.__init__(self, master)
-
-        self.image = im
-        self.value = value
-
-        self.canvas = Canvas(self, width=im.size[0], height=im.size[1])
-        self.backdrop = ImageTk.PhotoImage(im)
-        self.canvas.create_image(0, 0, image=self.backdrop, anchor=NW)
-        self.canvas.pack()
-
-        scale = Scale(self, orient=HORIZONTAL, from_=0, to=255,
-                      resolution=1, command=self.update, length=256)
-        scale.set(value)
-        scale.bind("<ButtonRelease-1>", self.redraw)
-        scale.pack()
-
-        # uncomment the following line for instant feedback (might
-        # be too slow on some platforms)
-        # self.redraw()
-
-    def update(self, value):
-        self.value = eval(value)
-
-        self.redraw()
-
-    def redraw(self, event = None):
-
-        # create overlay (note the explicit conversion to mode "1")
-        im = self.image.point(lambda v,t=self.value: v>=t, "1")
-        self.overlay = ImageTk.BitmapImage(im, foreground="green")
-
-        # update canvas
-        self.canvas.delete("overlay")
-        self.canvas.create_image(0, 0, image=self.overlay, anchor=NW,
-                tags="overlay")
-
-# --------------------------------------------------------------------
-# main
-
-root = Tk()
-
-im = Image.open(sys.argv[1])
-
-if im.mode != "L":
-    im = im.convert("L")
-
-# im.thumbnail((320,200))
-
-UI(root, im).pack()
-
-root.mainloop()
diff --git a/pythonPackages/pil/Scripts/viewer.py b/pythonPackages/pil/Scripts/viewer.py
deleted file mode 100644
index 4027e17fa2..0000000000
--- a/pythonPackages/pil/Scripts/viewer.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# The Python Imaging Library
-# $Id: viewer.py 2134 2004-10-06 08:55:20Z fredrik $
-#
-
-from Tkinter import *
-import Image, ImageTk
-
-#
-# an image viewer
-
-class UI(Label):
-
-    def __init__(self, master, im):
-
-        if im.mode == "1":
-            # bitmap image
-            self.image = ImageTk.BitmapImage(im, foreground="white")
-            Label.__init__(self, master, image=self.image, bg="black", bd=0)
-
-        else:
-            # photo image
-            self.image = ImageTk.PhotoImage(im)
-            Label.__init__(self, master, image=self.image, bd=0)
-
-#
-# script interface
-
-if __name__ == "__main__":
-
-    import sys
-
-    if not sys.argv[1:]:
-        print "Syntax: python viewer.py imagefile"
-        sys.exit(1)
-
-    filename = sys.argv[1]
-
-    root = Tk()
-    root.title(filename)
-
-    im = Image.open(filename)
-
-    UI(root, im).pack()
-
-    root.mainloop()
diff --git a/pythonPackages/pil/Tk/booster.txt b/pythonPackages/pil/Tk/booster.txt
deleted file mode 100644
index 2d787983b7..0000000000
--- a/pythonPackages/pil/Tk/booster.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-====================================================================
-The Photoimage Booster Patch (for Windows 95/NT)
-====================================================================
-
-  This patch kit boosts performance for 16/24-bit displays.  The
-first patch is required on Tk 4.2 (where it fixes the problems for
-16-bit displays) and later versions, with the exception for Tk 8.0b1
-where Sun added something similar themselves, only to remove it in
-8.0b2.  By installing both patches, Tk's PhotoImage handling becomes
-much faster on both 16-bit and 24-bit displays.  The patch has been
-tested with Tk 4.2 and 8.0.
-
-  Here's a benchmark, made with a sample program which loads two
-512x512 greyscale PGM's, and two 512x512 colour PPM's, and displays
-each of them in a separate toplevel windows.  Tcl/Tk was compiled
-with Visual C 4.0, and run on a P100 under Win95.  Image load times
-are not included in the timings:
-
-			8-bit		16-bit		24-bit
---------------------------------------------------------------------
-1. original 4.2 code	5.52 s		8.57 s		3.79 s
-2. booster patch	5.49 s		1.87 s		1.82 s
-
-   speedup		None		4.6x		2.1x
-
-====================================================================
-
-Here's the patches:
-
-1. For portability and speed, the best thing under Windows is to
-treat 16-bit displays as if they were 24-bit. The Windows device
-drivers take care of the rest.
-
-   ----------------------------------------------------------------
-   If you have Tk 4.1 or Tk 8.0b1, you don't have to apply this
-   patch!  It only applies to Tk 4.2, Tk 8.0a[12] and Tk 8.0b2.
-   ----------------------------------------------------------------
-
-In win/tkWinImage.c, change the following line in XCreateImage:
-
-    imagePtr->bits_per_pixel = depth;
-
-to
-
-/* ==================================================================== */
-/* The tk photo image booster patch -- patch section 1                  */
-/* ==================================================================== */
-
-    if (visual->class == TrueColor)
-	/* true colour is stored as 3 bytes: (blue, green, red) */
-	imagePtr->bits_per_pixel = 24;
-    else
-	imagePtr->bits_per_pixel = depth;
-
-/* ==================================================================== */
-
-
-2. The DitherInstance implementation is not good.  It's especially
-bad on highend truecolour displays.  IMO, it should be rewritten from
-scratch (some other day...).
-
-  Anyway, the following band-aid makes the situation a little bit
-better under Windows.  This hack trades some marginal quality (no
-dithering on 16-bit displays) for a dramatic performance boost.
-Requires patch 1, unless you're using Tk 4.1 or Tk 8.0b1.
-
-In generic/tkImgPhoto.c, add the #ifdef section to the DitherInstance
-function:
-
-    for (; height > 0; height -= nLines) {
-	if (nLines > height) {
-	    nLines = height;
-	}
-	dstLinePtr = (unsigned char *) imagePtr->data;
-	yEnd = yStart + nLines;
-
-/* ==================================================================== */
-/* The tk photo image booster patch -- patch section 2                  */
-/* ==================================================================== */
-
-#ifdef __WIN32__
-	if (colorPtr->visualInfo.class == TrueColor
-		&& instancePtr->gamma == 1.0) {
-	    /* Windows hicolor/truecolor booster */
-	    for (y = yStart; y < yEnd; ++y) {
-		destBytePtr = dstLinePtr;
-		srcPtr = srcLinePtr;
-		for (x = xStart; x < xEnd; ++x) {
-		    destBytePtr[0] = srcPtr[2];
-		    destBytePtr[1] = srcPtr[1];
-		    destBytePtr[2] = srcPtr[0];
-		    destBytePtr += 3; srcPtr += 3;
-		}
-		srcLinePtr += lineLength;
-		dstLinePtr += bytesPerLine;
-	    }
-	} else
-#endif
-
-/* ==================================================================== */
-
-	for (y = yStart; y < yEnd; ++y) {
-	    srcPtr = srcLinePtr;
-	    errPtr = errLinePtr;
-	    destBytePtr = dstLinePtr;
-
-====================================================================
-last updated: 97-07-03/fl
diff --git a/pythonPackages/pil/Tk/install.txt b/pythonPackages/pil/Tk/install.txt
deleted file mode 100644
index e24d36301c..0000000000
--- a/pythonPackages/pil/Tk/install.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-====================================================================
-Using PIL With Tkinter 
-====================================================================
-
-Starting with 1.0 final (release candidate 2 and later, to be
-precise), PIL can attach itself to Tkinter in flight.  As a result,
-you no longer need to rebuild the Tkinter extension to be able to
-use PIL.
-
-However, if you cannot get the this to work on your platform, you
-can do it in the old way:
-
-* Adding Tkinter support
-
-1. Compile Python's _tkinter.c with the WITH_APPINIT and WITH_PIL
-   flags set, and link it with tkImaging.c and tkappinit.c.  To
-   do this, copy the former to the Modules directory, and edit
-   the _tkinter line in Setup (or Setup.in) according to the
-   instructions in that file.
-
-   NOTE: if you have an old Python version, the tkappinit.c
-   file is not included by default.  If this is the case, you
-   will have to add the following lines to tkappinit.c, after
-   the MOREBUTTONS stuff:
-
-	{
-	    extern void TkImaging_Init(Tcl_Interp* interp);
-	    TkImaging_Init(interp);
-	}
-
-   This registers a Tcl command called "PyImagingPhoto", which is
-   use to communicate between PIL and Tk's PhotoImage handler.
-
-   You must also change the _tkinter line in Setup (or Setup.in)
-   to something like:
-
-   _tkinter _tkinter.c tkImaging.c tkappinit.c -DWITH_APPINIT
-	-I/usr/local/include -L/usr/local/lib -ltk8.0 -ltcl8.0 -lX11
-
-
-
diff --git a/pythonPackages/pil/Tk/pilbitmap.txt b/pythonPackages/pil/Tk/pilbitmap.txt
deleted file mode 100644
index e7c46c65fe..0000000000
--- a/pythonPackages/pil/Tk/pilbitmap.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-====================================================================
-The PIL Bitmap Booster Patch
-====================================================================
-
-The pilbitmap booster patch greatly improves performance of the
-ImageTk.BitmapImage constructor.  Unfortunately, the design of Tk
-doesn't allow us to do this from the tkImaging interface module, so
-you have to patch the Tk sources.
-
-Once installed, the ImageTk module will automatically detect this
-patch.
-
-(Note: this patch has been tested with Tk 8.0 on Win32 only, but it
-should work just fine on other platforms as well).
-
-1. To the beginning of TkGetBitmapData (in generic/tkImgBmap.c), add
-   the following stuff:
-
-------------------------------------------------------------------------
-    int width, height, numBytes, hotX, hotY;
-    char *p, *end, *expandedFileName;
-    ParseInfo pi;
-    char *data = NULL;
-    Tcl_DString buffer;
-
-/* ==================================================================== */
-/* The pilbitmap booster patch -- patch section                         */
-/* ==================================================================== */
-
-    char *PILGetBitmapData();
-
-    if (string) {
-        /* Is this a PIL bitmap reference? */
-        data = PILGetBitmapData(string, widthPtr, heightPtr, hotXPtr, hotYPtr);
-        if (data)
-            return data;
-    }
-
-/* ==================================================================== */
-
-    pi.string = string;
-    if (string == NULL) {
-        if (Tcl_IsSafe(interp)) {
-------------------------------------------------------------------------
-
-
-2. Append the following to the same file (you may wish to include
-Imaging.h instead of copying the struct declaration...)
-
-------------------------------------------------------------------------
-
-/* ==================================================================== */
-/* The pilbitmap booster patch -- code section                          */
-/* ==================================================================== */
-
-/* Imaging declaration boldly copied from Imaging.h (!) */
-
-typedef struct ImagingInstance *Imaging; /* a.k.a. ImagingImage :-) */
-
-typedef unsigned char UINT8;
-typedef int INT32;
-
-struct ImagingInstance {
-
-    /* Format */
-    char mode[4+1];     /* Band names ("1", "L", "P", "RGB", "RGBA", "CMYK") */
-    int type;           /* Always 0 in this version */
-    int depth;          /* Always 8 in this version */
-    int bands;          /* Number of bands (1, 3, or 4) */
-    int xsize;          /* Image dimension. */
-    int ysize;
-
-    /* Colour palette (for "P" images only) */
-    void* palette;
-
-    /* Data pointers */
-    UINT8 **image8;     /* Set for 8-bit image (pixelsize=1). */
-    INT32 **image32;    /* Set for 32-bit image (pixelsize=4). */
-
-    /* Internals */
-    char **image;       /* Actual raster data. */
-    char *block;        /* Set if data is allocated in a single block. */
-
-    int pixelsize;      /* Size of a pixel, in bytes (1 or 4) */
-    int linesize;       /* Size of a line, in bytes (xsize * pixelsize) */
-
-    /* Virtual methods */
-    void (*im_delete)(Imaging *);
-
-};
-
-/* The pilbitmap booster patch allows you to pass PIL images to the
-   Tk bitmap decoder.  Passing images this way is much more efficient
-   than using the "tobitmap" method. */
-
-char *
-PILGetBitmapData(string, widthPtr, heightPtr, hotXPtr, hotYPtr)
-    char *string;
-    int *widthPtr, *heightPtr;
-    int *hotXPtr, *hotYPtr;
-{
-    char* data;
-    char* p;
-    int y;
-    Imaging im;
-
-    if (strncmp(string, "PIL:", 4) != 0)
-        return NULL;
-
-    im = (Imaging) atol(string + 4);
-
-    if (strcmp(im->mode, "1") != 0 && strcmp(im->mode, "L") != 0)
-        return NULL;
-
-    data = p = (char *) ckalloc((unsigned) ((im->xsize+7)/8) * im->ysize);
-
-    for (y = 0; y < im->ysize; y++) {
-        char* in = im->image8[y];
-        int i, m, b;
-        b = 0; m = 1;
-        for (i = 0; i < im->xsize; i++) {
-            if (in[i] != 0)
-                b |= m;
-            m <<= 1;
-            if (m == 256){
-                *p++ = b;
-                b = 0; m = 1;
-            }
-        }
-        if (m != 1)
-            *p++ = b;
-    }
-
-    *widthPtr = im->xsize;
-    *heightPtr = im->ysize;
-    *hotXPtr = -1;
-    *hotYPtr = -1;
-
-    return data;
-}
-
-/* ==================================================================== */
-
-------------------------------------------------------------------------
-
-3. Recompile Tk and relink the _tkinter module (where necessary).
-
-====================================================================
-Last updated: 97-05-17/fl
diff --git a/pythonPackages/pil/Tk/tkImaging.c b/pythonPackages/pil/Tk/tkImaging.c
deleted file mode 100644
index 5e37d05a6b..0000000000
--- a/pythonPackages/pil/Tk/tkImaging.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: tkImaging.c,v 1.1 1996/05/09 22:11:39 fredrik Exp $
- *
- * TK interface for Python Imaging objects
- *
- * Copies (parts of) a named display memory to a photo image object.
- * Also contains code to create an display memory.  Under Tk, a
- * display memory is simply an "L" or "RGB" image memory that is
- * allocated in a single block.
- *
- * To use this module, add the following lines to your Tcl_AppInit
- * function (in tkappinit.c).  Put them after the calls to Tcl_Init
- * and Tk_Init:
- *	
- *	{
- *          extern void TkImaging_Init(Tcl_Interp* interp);
- *          TkImaging_Init(interp);
- *      }
- *
- * This registers a Tcl command called "PyImagingPhoto", which
- * is use to communicate between PIL and Tk's PhotoImage handler.
- *
- * Compile and link tkImaging.c with tkappinit.c and _tkinter
- * (see the Setup file for details on how to use tkappinit.c).
- * Note that _tkinter.c must be compiled with WITH_APPINIT.
- *
- * History:
- * 1995-09-12 fl  Created
- * 1996-04-08 fl  Ready for release
- * 1997-05-09 fl  Use command instead of image type
- * 2001-03-18 fl  Initialize alpha layer pointer (struct changed in 8.3)
- * 2003-04-23 fl  Fixed building for Tk 8.4.1 and later (Jack Jansen)
- * 2004-06-24 fl  Fixed building for Tk 8.4.6 and later.
- *
- * Copyright (c) 1997-2004 by Secret Labs AB
- * Copyright (c) 1995-2004 by Fredrik Lundh
- *
- * See the README file for information on usage and redistribution.
- */
-
-/* This is needed for (at least) Tk 8.4.1, otherwise the signature of
-** Tk_PhotoPutBlock changes.
-*/
-#define USE_COMPOSITELESS_PHOTO_PUT_BLOCK
-
-/* This is needed for (at least) Tk 8.4.6 and later, to avoid warnings
-   for the Tcl_CreateCommand command. */
-#define USE_COMPAT_CONST
-
-#include "tk.h"
-
-#include "Imaging.h"
-
-#include <stdlib.h>
-
-
-static Imaging
-ImagingFind(const char* name)
-{
-    long id;
-
-    /* FIXME: use CObject instead? */
-    id = atol(name);
-    if (!id)
-	return NULL;
-
-    return (Imaging) id;
-}
-
-
-static int
-PyImagingPhotoPut(ClientData clientdata, Tcl_Interp* interp,
-               int argc, char **argv)
-{
-    Imaging im;
-    Tk_PhotoHandle photo;
-    Tk_PhotoImageBlock block;
-
-    if (argc != 3) {
-        Tcl_AppendResult(interp, "usage: ", argv[0],
-                         " destPhoto srcImage", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /* get Tcl PhotoImage handle */
-    photo = Tk_FindPhoto(interp, argv[1]);
-    if (photo == NULL) {
-        Tcl_AppendResult(
-            interp, "destination photo must exist", (char *) NULL
-            );
-        return TCL_ERROR;
-    }
-
-    /* get PIL Image handle */
-    im = ImagingFind(argv[2]);
-    if (!im) {
-	Tcl_AppendResult(interp, "bad name", (char*) NULL);
-	return TCL_ERROR;
-    }
-    if (!im->block) {
-	Tcl_AppendResult(interp, "bad display memory", (char*) NULL);
-	return TCL_ERROR;
-    }
-
-    /* Active region */
-#if 0
-    if (src_xoffset + xsize > im->xsize)
-	xsize = im->xsize - src_xoffset;
-    if (src_yoffset + ysize > im->ysize)
-	ysize = im->ysize - src_yoffset;
-    if (xsize < 0 || ysize < 0
-	|| src_xoffset >= im->xsize
-	|| src_yoffset >= im->ysize)
-	return TCL_OK;
-#endif
-
-    /* Mode */
-
-    if (strcmp(im->mode, "1") == 0 || strcmp(im->mode, "L") == 0) {
-	block.pixelSize = 1;
-	block.offset[0] = block.offset[1] = block.offset[2] = 0;
-    } else if (strncmp(im->mode, "RGB", 3) == 0) {
-	block.pixelSize = 4;
-	block.offset[0] = 0;
-	block.offset[1] = 1;
-	block.offset[2] = 2;
-	block.offset[3] = 0; /* no alpha (or reserved, under 8.2) */
-    } else {
-        Tcl_AppendResult(interp, "Bad mode", (char*) NULL);
-	return TCL_ERROR;
-    }
-
-    block.width = im->xsize;
-    block.height = im->ysize;
-    block.pitch = im->linesize;
-    block.pixelPtr = (unsigned char*) im->block;
-#if 0
-    block.pixelPtr = (unsigned char*) im->block +
-	             src_yoffset * im->linesize +
-	             src_xoffset * im->pixelsize;
-#endif
-
-    if (strcmp(im->mode, "RGBA") == 0) {
-        /* Copy non-transparent pixels to photo image */
-        int x, y;
-        Tk_PhotoImageBlock run;
-
-        /* Clear current contents */
-        Tk_PhotoBlank(photo);
-
-        /* Setup run descriptor */
-        run.height = 1;
-        run.pitch = block.pitch;
-        run.pixelSize = block.pixelSize;
-        run.offset[0] = 0;
-        run.offset[1] = 1;
-        run.offset[2] = 2;
-	run.offset[3] = 0; /* no alpha (or reserved, under 8.2) */
-
-        /* Copy opaque runs to photo image */
-        for (y = 0; y < block.height; y++) {
-            unsigned char* p = block.pixelPtr + y*block.pitch;
-            unsigned char* s = p;
-            int   w = 0;
-            for (x = 0; x < block.width; x++) {
-                if (p[3]) {
-                    /* opaque: add pixel to current run */
-                    if (w == 0)
-                        s = p;
-                    w = w + 1;
-                } else if (s) {
-                    /* copy run to photo image */
-                    if (w > 0) {
-                        run.width = w;
-                        run.pixelPtr = s;
-                        Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1);
-                    }
-                    w = 0;
-                }
-                p += block.pixelSize;
-            }
-            if (w > 0) {
-                /* copy final run, if any */
-                run.width = w;
-                run.pixelPtr = s;
-                Tk_PhotoPutBlock(photo, &run, x-w, y, run.width, 1);
-          }
-        }
-
-    } else
-
-        /* Copy opaque block to photo image, and leave the rest to TK */
-        Tk_PhotoPutBlock(photo, &block, 0, 0, block.width, block.height);
-
-    return TCL_OK;
-}
-
-
-static int
-PyImagingPhotoGet(ClientData clientdata, Tcl_Interp* interp,
-               int argc, char **argv)
-{
-    Tk_PhotoHandle photo;
-    Tk_PhotoImageBlock block;
-
-    if (argc != 2) {
-        Tcl_AppendResult(interp, "usage: ", argv[0],
-                         " srcPhoto", (char *) NULL);
-        return TCL_ERROR;
-    }
-
-    /* get Tcl PhotoImage handle */
-    photo = Tk_FindPhoto(interp, argv[1]);
-    if (photo == NULL) {
-        Tcl_AppendResult(
-            interp, "source photo must exist", (char *) NULL
-            );
-        return TCL_ERROR;
-    }
-
-    Tk_PhotoGetImage(photo, &block);
-
-    printf("pixelPtr = %p\n", block.pixelPtr);
-    printf("width = %d\n", block.width);
-    printf("height = %d\n", block.height);
-    printf("pitch = %d\n", block.pitch);
-    printf("pixelSize = %d\n", block.pixelSize);
-    printf("offset = %d %d %d %d\n", block.offset[0], block.offset[1],
-           block.offset[2], block.offset[3]);
-
-    Tcl_AppendResult(
-        interp, "this function is not yet support", (char *) NULL
-        );
-
-    return TCL_ERROR;
-}
-
-
-void
-TkImaging_Init(Tcl_Interp* interp)
-{
-    Tcl_CreateCommand(interp, "PyImagingPhoto", PyImagingPhotoPut,
-                      (ClientData) 0, (Tcl_CmdDeleteProc*) NULL);
-    Tcl_CreateCommand(interp, "PyImagingPhotoGet", PyImagingPhotoGet,
-                      (ClientData) 0, (Tcl_CmdDeleteProc*) NULL);
-}
diff --git a/pythonPackages/pil/_imaging.c b/pythonPackages/pil/_imaging.c
deleted file mode 100644
index d5112ad771..0000000000
--- a/pythonPackages/pil/_imaging.c
+++ /dev/null
@@ -1,3149 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: _imaging.c 2935 2006-12-03 12:20:39Z fredrik $
- *
- * the imaging library bindings
- *
- * history:
- * 1995-09-24 fl   Created
- * 1996-03-24 fl   Ready for first public release (release 0.0)
- * 1996-03-25 fl   Added fromstring (for Jack's "img" library)
- * 1996-03-28 fl   Added channel operations
- * 1996-03-31 fl   Added point operation
- * 1996-04-08 fl   Added new/new_block/new_array factories
- * 1996-04-13 fl   Added decoders
- * 1996-05-04 fl   Added palette hack
- * 1996-05-12 fl   Compile cleanly as C++
- * 1996-05-19 fl   Added matrix conversions, gradient fills
- * 1996-05-27 fl   Added display_mode
- * 1996-07-22 fl   Added getbbox, offset
- * 1996-07-23 fl   Added sequence semantics
- * 1996-08-13 fl   Added logical operators, point mode
- * 1996-08-16 fl   Modified paste interface
- * 1996-09-06 fl   Added putdata methods, use abstract interface
- * 1996-11-01 fl   Added xbm encoder
- * 1996-11-04 fl   Added experimental path stuff, draw_lines, etc
- * 1996-12-10 fl   Added zip decoder, crc32 interface
- * 1996-12-14 fl   Added modulo arithmetics
- * 1996-12-29 fl   Added zip encoder
- * 1997-01-03 fl   Added fli and msp decoders
- * 1997-01-04 fl   Added experimental sun_rle and tga_rle decoders
- * 1997-01-05 fl   Added gif encoder, getpalette hack
- * 1997-02-23 fl   Added histogram mask
- * 1997-05-12 fl   Minor tweaks to match the IFUNC95 interface
- * 1997-05-21 fl   Added noise generator, spread effect
- * 1997-06-05 fl   Added mandelbrot generator
- * 1997-08-02 fl   Modified putpalette to coerce image mode if necessary
- * 1998-01-11 fl   Added INT32 support
- * 1998-01-22 fl   Fixed draw_points to draw the last point too
- * 1998-06-28 fl   Added getpixel, getink, draw_ink
- * 1998-07-12 fl   Added getextrema
- * 1998-07-17 fl   Added point conversion to arbitrary formats
- * 1998-09-21 fl   Added support for resampling filters
- * 1998-09-22 fl   Added support for quad transform
- * 1998-12-29 fl   Added support for arcs, chords, and pieslices
- * 1999-01-10 fl   Added some experimental arrow graphics stuff
- * 1999-02-06 fl   Added draw_bitmap, font acceleration stuff
- * 2001-04-17 fl   Fixed some egcs compiler nits
- * 2001-09-17 fl   Added screen grab primitives (win32)
- * 2002-03-09 fl   Added stretch primitive
- * 2002-03-10 fl   Fixed filter handling in rotate
- * 2002-06-06 fl   Added I, F, and RGB support to putdata
- * 2002-06-08 fl   Added rankfilter
- * 2002-06-09 fl   Added support for user-defined filter kernels
- * 2002-11-19 fl   Added clipboard grab primitives (win32)
- * 2002-12-11 fl   Added draw context
- * 2003-04-26 fl   Tweaks for Python 2.3 beta 1
- * 2003-05-21 fl   Added createwindow primitive (win32)
- * 2003-09-13 fl   Added thread section hooks
- * 2003-09-15 fl   Added expand helper
- * 2003-09-26 fl   Added experimental LA support
- * 2004-02-21 fl   Handle zero-size images in quantize
- * 2004-06-05 fl   Added ptr attribute (used to access Imaging objects)
- * 2004-06-05 fl   Don't crash when fetching pixels from zero-wide images
- * 2004-09-17 fl   Added getcolors
- * 2004-10-04 fl   Added modefilter
- * 2005-10-02 fl   Added access proxy
- * 2006-06-18 fl   Always draw last point in polyline
- *
- * Copyright (c) 1997-2006 by Secret Labs AB 
- * Copyright (c) 1995-2006 by Fredrik Lundh
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Python.h"
-
-#include "Imaging.h"
-
-
-/* Configuration stuff. Feel free to undef things you don't need. */
-#define WITH_IMAGECHOPS /* ImageChops support */
-#define WITH_IMAGEDRAW /* ImageDraw support */
-#define WITH_MAPPING /* use memory mapping to read some file formats */
-#define WITH_IMAGEPATH /* ImagePath stuff */
-#define WITH_ARROW /* arrow graphics stuff (experimental) */
-#define WITH_EFFECTS /* special effects */
-#define WITH_QUANTIZE /* quantization support */
-#define WITH_RANKFILTER /* rank filter */
-#define WITH_MODEFILTER /* mode filter */
-#define WITH_THREADING /* "friendly" threading support */
-
-#define WITH_DEBUG /* extra debugging interfaces */
-
-/* PIL Plus extensions */
-#undef  WITH_CRACKCODE /* pil plus */
-
-#undef	VERBOSE
-
-#define CLIP(x) ((x) <= 0 ? 0 : (x) < 256 ? (x) : 255)
-
-#define B16(p, i) ((((int)p[(i)]) << 8) + p[(i)+1])
-#define L16(p, i) ((((int)p[(i)+1]) << 8) + p[(i)])
-#define S16(v) ((v) < 32768 ? (v) : ((v) - 65536))
-
-#if PY_VERSION_HEX < 0x01060000
-#define PyObject_New PyObject_NEW
-#define PyObject_Del PyMem_DEL
-#endif
-
-#if PY_VERSION_HEX < 0x02050000
-#define ssizeargfunc intargfunc
-#define ssizessizeargfunc intintargfunc
-#define ssizeobjargproc intobjargproc
-#define ssizessizeobjargproc intintobjargproc
-#endif
-
-/* -------------------------------------------------------------------- */
-/* OBJECT ADMINISTRATION						*/
-/* -------------------------------------------------------------------- */
-
-typedef struct {
-    PyObject_HEAD
-    Imaging image;
-} ImagingObject;
-
-staticforward PyTypeObject Imaging_Type;
-
-#ifdef WITH_IMAGEDRAW
-
-typedef struct
-{
-    /* to write a character, cut out sxy from glyph data, place
-       at current position plus dxy, and advance by (dx, dy) */
-    int dx, dy;
-    int dx0, dy0, dx1, dy1;
-    int sx0, sy0, sx1, sy1;
-} Glyph;
-
-typedef struct {
-    PyObject_HEAD
-    ImagingObject* ref;
-    Imaging bitmap;
-    int ysize;
-    int baseline;
-    Glyph glyphs[256];
-} ImagingFontObject;
-
-staticforward PyTypeObject ImagingFont_Type;
-
-typedef struct {
-    PyObject_HEAD
-    ImagingObject* image;
-    UINT8 ink[4];
-    int blend;
-} ImagingDrawObject;
-
-staticforward PyTypeObject ImagingDraw_Type;
-
-#endif
-
-typedef struct {
-    PyObject_HEAD
-    ImagingObject* image;
-    int readonly;
-} PixelAccessObject;
-
-staticforward PyTypeObject PixelAccess_Type;
-
-PyObject* 
-PyImagingNew(Imaging imOut)
-{
-    ImagingObject* imagep;
-
-    if (!imOut)
-	return NULL;
-
-    imagep = PyObject_New(ImagingObject, &Imaging_Type);
-    if (imagep == NULL) {
-	ImagingDelete(imOut);
-	return NULL;
-    }
-
-#ifdef VERBOSE
-    printf("imaging %p allocated\n", imagep);
-#endif
-
-    imagep->image = imOut;
-
-    return (PyObject*) imagep;
-}
-
-static void
-_dealloc(ImagingObject* imagep)
-{
-
-#ifdef VERBOSE
-    printf("imaging %p deleted\n", imagep);
-#endif
-
-    ImagingDelete(imagep->image);
-    PyObject_Del(imagep);
-}
-
-#define PyImaging_Check(op) ((op)->ob_type == &Imaging_Type)
-
-Imaging PyImaging_AsImaging(PyObject *op)
-{
-    if (!PyImaging_Check(op)) {
-	PyErr_BadInternalCall();
-	return NULL;
-    }
-
-    return ((ImagingObject *)op)->image;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* THREAD HANDLING                                                      */
-/* -------------------------------------------------------------------- */
-
-void ImagingSectionEnter(ImagingSectionCookie* cookie)
-{
-#ifdef WITH_THREADING
-    *cookie = (PyThreadState *) PyEval_SaveThread();
-#endif
-}
-
-void ImagingSectionLeave(ImagingSectionCookie* cookie)
-{
-#ifdef WITH_THREADING
-    PyEval_RestoreThread((PyThreadState*) *cookie);
-#endif
-}
-
-/* -------------------------------------------------------------------- */
-/* EXCEPTION REROUTING                                                  */
-/* -------------------------------------------------------------------- */
-
-/* error messages */
-static const char* must_be_sequence = "argument must be a sequence";
-static const char* wrong_mode = "unrecognized image mode";
-static const char* wrong_raw_mode = "unrecognized raw mode";
-static const char* outside_image = "image index out of range";
-static const char* outside_palette = "palette index out of range";
-static const char* no_palette = "image has no palette";
-static const char* readonly = "image is readonly";
-/* static const char* no_content = "image has no content"; */
-
-void *
-ImagingError_IOError(void)
-{
-    PyErr_SetString(PyExc_IOError, "error when accessing file");
-    return NULL;
-}
-
-void *
-ImagingError_MemoryError(void)
-{
-    return PyErr_NoMemory();
-}
-
-void *
-ImagingError_Mismatch(void)
-{
-    PyErr_SetString(PyExc_ValueError, "images do not match");
-    return NULL;
-}
-
-void *
-ImagingError_ModeError(void)
-{
-    PyErr_SetString(PyExc_ValueError, "image has wrong mode");
-    return NULL;
-}
-
-void *
-ImagingError_ValueError(const char *message)
-{
-    PyErr_SetString(
-        PyExc_ValueError,
-        (message) ? (char*) message : "unrecognized argument value"
-        );
-    return NULL;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* HELPERS								*/
-/* -------------------------------------------------------------------- */
-
-static int
-getbands(const char* mode)
-{
-    Imaging im;
-    int bands;
-
-    /* FIXME: add primitive to libImaging to avoid extra allocation */
-    im = ImagingNew(mode, 0, 0);
-    if (!im)
-        return -1;
-
-    bands = im->bands;
-
-    ImagingDelete(im);
-
-    return bands;
-}
-
-#define TYPE_UINT8 (0x100|sizeof(UINT8))
-#define TYPE_INT32 (0x200|sizeof(INT32))
-#define TYPE_FLOAT32 (0x300|sizeof(FLOAT32))
-#define TYPE_DOUBLE (0x400|sizeof(double))
-
-static void*
-getlist(PyObject* arg, int* length, const char* wrong_length, int type)
-{
-    int i, n;
-    void* list;
-
-    if (!PySequence_Check(arg)) {
-	PyErr_SetString(PyExc_TypeError, must_be_sequence);
-	return NULL;
-    }
-
-    n = PyObject_Length(arg);
-    if (length && wrong_length && n != *length) {
-	PyErr_SetString(PyExc_ValueError, wrong_length);
-	return NULL;
-    }
-
-    list = malloc(n * (type & 0xff));
-    if (!list) {
-        PyErr_NoMemory();
-	return NULL;
-    }
-
-    switch (type) {
-    case TYPE_UINT8:
-        if (PyList_Check(arg)) {
-            for (i = 0; i < n; i++) {
-                PyObject *op = PyList_GET_ITEM(arg, i);
-                int temp = PyInt_AsLong(op);
-                ((UINT8*)list)[i] = CLIP(temp);
-            }
-        } else {
-            for (i = 0; i < n; i++) {
-                PyObject *op = PySequence_GetItem(arg, i);
-                int temp = PyInt_AsLong(op);
-                Py_XDECREF(op);
-                ((UINT8*)list)[i] = CLIP(temp);
-            }
-        }
-        break;
-    case TYPE_INT32:
-        if (PyList_Check(arg)) {
-            for (i = 0; i < n; i++) {
-                PyObject *op = PyList_GET_ITEM(arg, i);
-                int temp = PyInt_AsLong(op);
-                ((INT32*)list)[i] = temp;
-            }
-        } else {
-            for (i = 0; i < n; i++) {
-                PyObject *op = PySequence_GetItem(arg, i);
-                int temp = PyInt_AsLong(op);
-                Py_XDECREF(op);
-                ((INT32*)list)[i] = temp;
-            }
-        }
-        break;
-    case TYPE_FLOAT32:
-        if (PyList_Check(arg)) {
-            for (i = 0; i < n; i++) {
-                PyObject *op = PyList_GET_ITEM(arg, i);
-                double temp = PyFloat_AsDouble(op);
-                ((FLOAT32*)list)[i] = (FLOAT32) temp;
-            }
-        } else {
-            for (i = 0; i < n; i++) {
-                PyObject *op = PySequence_GetItem(arg, i);
-                double temp = PyFloat_AsDouble(op);
-                Py_XDECREF(op);
-                ((FLOAT32*)list)[i] = (FLOAT32) temp;
-            }
-        }
-        break;
-    case TYPE_DOUBLE:
-        if (PyList_Check(arg)) {
-            for (i = 0; i < n; i++) {
-                PyObject *op = PyList_GET_ITEM(arg, i);
-                double temp = PyFloat_AsDouble(op);
-                ((double*)list)[i] = temp;
-            }
-        } else {
-            for (i = 0; i < n; i++) {
-                PyObject *op = PySequence_GetItem(arg, i);
-                double temp = PyFloat_AsDouble(op);
-                Py_XDECREF(op);
-                ((double*)list)[i] = temp;
-            }
-        }
-        break;
-    }
-
-    if (length)
-        *length = n;
-
-    PyErr_Clear();
-
-    return list;
-}
-
-static inline PyObject*
-getpixel(Imaging im, int x, int y)
-{
-    UINT8 *p;
-
-    if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) {
-	PyErr_SetString(PyExc_IndexError, outside_image);
-	return NULL;
-    }
-
-    /* single layer */
-    if (im->image8 != NULL) {
-        p = (UINT8*) &im->image8[y][x];
-        switch (im->type) {
-        case IMAGING_TYPE_UINT8:
-            return PyInt_FromLong(p[0]);
-        case IMAGING_TYPE_SPECIAL:
-            /* FIXME: are 16-bit images signed or unsigned??? */
-            if (strcmp(im->mode, "I;16") == 0) {
-                p = (UINT8*) &im->image8[y][x+x];
-                return PyInt_FromLong(L16(p, 0));
-            }
-            if (strcmp(im->mode, "I;16B") == 0) {
-                p = (UINT8*) &im->image8[y][x+x];
-                return PyInt_FromLong(B16(p, 0));
-            }
-        }
-    }
-
-    /* multilayer */
-    if (im->image32 != NULL) {
-        p = (UINT8*) &im->image32[y][x];
-        switch (im->type) {
-        case IMAGING_TYPE_UINT8:
-            /* unsigned integer */
-            if (im->bands == 2)
-                return Py_BuildValue("ii", p[0], p[3]);
-            if (im->bands == 3)
-                return Py_BuildValue("iii", p[0], p[1], p[2]);
-            return Py_BuildValue("iiii", p[0], p[1], p[2], p[3]);
-        case IMAGING_TYPE_INT32:
-            /* signed integer */
-            return PyInt_FromLong(*(INT32*) p);
-        case IMAGING_TYPE_FLOAT32:
-            /* floating point */
-            return PyFloat_FromDouble(*(FLOAT32*) p);
-        }
-    }
-        
-    /* unknown type */
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static char*
-getink(PyObject* color, Imaging im, char* ink)
-{
-    int r, g, b, a;
-    double f;
-
-    /* fill ink buffer (four bytes) with something that can
-       be cast to either UINT8 or INT32 */
-
-    if (im->image8) {
-        /* unsigned integer, single layer */
-        r = PyInt_AsLong(color);
-        if (r == -1 && PyErr_Occurred())
-            return NULL;
-        ink[0] = CLIP(r);
-        ink[1] = ink[2] = ink[3] = 0;
-        return ink;
-    } else {
-        switch (im->type) {
-        case IMAGING_TYPE_UINT8:
-            /* unsigned integer */
-            a = 255;
-            if (PyInt_Check(color)) {
-                r = PyInt_AS_LONG(color);
-                /* compatibility: ABGR */
-                a = (UINT8) (r >> 24);
-                b = (UINT8) (r >> 16);
-                g = (UINT8) (r >> 8);
-                r = (UINT8) r;
-            } else {
-                if (im->bands == 2) {
-                    if (!PyArg_ParseTuple(color, "i|i", &r, &a))
-                        return NULL;
-                    g = b = r;
-                } else {
-                    if (!PyArg_ParseTuple(color, "iii|i", &r, &g, &b, &a))
-                        return NULL;
-                }
-            }
-            ink[0] = CLIP(r);
-            ink[1] = CLIP(g);
-            ink[2] = CLIP(b);
-            ink[3] = CLIP(a);
-            return ink;
-        case IMAGING_TYPE_INT32:
-            /* signed integer */
-            r = PyInt_AsLong(color);
-            if (r == -1 && PyErr_Occurred())
-                return NULL;
-            *(INT32*) ink = r;
-            return ink;
-        case IMAGING_TYPE_FLOAT32:
-            /* floating point */
-            f = PyFloat_AsDouble(color);
-            if (f == -1.0 && PyErr_Occurred())
-                return NULL;
-            *(FLOAT32*) ink = (FLOAT32) f;
-            return ink;
-        }
-    }
-
-    PyErr_SetString(PyExc_ValueError, wrong_mode);
-    return NULL;
-}
-
-/* -------------------------------------------------------------------- */
-/* FACTORIES								*/
-/* -------------------------------------------------------------------- */
-
-static PyObject* 
-_fill(PyObject* self, PyObject* args)
-{
-    char* mode;
-    int xsize, ysize;
-    PyObject* color;
-    char buffer[4];
-    Imaging im;
-    
-    xsize = ysize = 256;
-    color = NULL;
-
-    if (!PyArg_ParseTuple(args, "s|(ii)O", &mode, &xsize, &ysize, &color))
-	return NULL;
-
-    im = ImagingNew(mode, xsize, ysize);
-    if (!im)
-        return NULL;
-
-    if (color) {
-        if (!getink(color, im, buffer)) {
-            ImagingDelete(im);
-            return NULL;
-        }
-    } else
-        buffer[0] = buffer[1] = buffer[2] = buffer[3] = 0;
-
-    ImagingFill(im, buffer);
-
-    return PyImagingNew(im);
-}
-
-static PyObject* 
-_new(PyObject* self, PyObject* args)
-{
-    char* mode;
-    int xsize, ysize;
-
-    if (!PyArg_ParseTuple(args, "s(ii)", &mode, &xsize, &ysize))
-	return NULL;
-
-    return PyImagingNew(ImagingNew(mode, xsize, ysize));
-}
-
-static PyObject* 
-_new_array(PyObject* self, PyObject* args)
-{
-    char* mode;
-    int xsize, ysize;
-
-    if (!PyArg_ParseTuple(args, "s(ii)", &mode, &xsize, &ysize))
-	return NULL;
-
-    return PyImagingNew(ImagingNewArray(mode, xsize, ysize));
-}
-
-static PyObject* 
-_new_block(PyObject* self, PyObject* args)
-{
-    char* mode;
-    int xsize, ysize;
-
-    if (!PyArg_ParseTuple(args, "s(ii)", &mode, &xsize, &ysize))
-	return NULL;
-
-    return PyImagingNew(ImagingNewBlock(mode, xsize, ysize));
-}
-
-static PyObject* 
-_getcount(PyObject* self, PyObject* args)
-{
-    if (!PyArg_ParseTuple(args, ":getcount"))
-	return NULL;
-
-    return PyInt_FromLong(ImagingNewCount);
-}
-
-static PyObject* 
-_linear_gradient(PyObject* self, PyObject* args)
-{
-    char* mode;
-
-    if (!PyArg_ParseTuple(args, "s", &mode))
-	return NULL;
-
-    return PyImagingNew(ImagingFillLinearGradient(mode));
-}
-
-static PyObject* 
-_radial_gradient(PyObject* self, PyObject* args)
-{
-    char* mode;
-
-    if (!PyArg_ParseTuple(args, "s", &mode))
-	return NULL;
-
-    return PyImagingNew(ImagingFillRadialGradient(mode));
-}
-
-static PyObject* 
-_open_ppm(PyObject* self, PyObject* args)
-{
-    char* filename;
-
-    if (!PyArg_ParseTuple(args, "s", &filename))
-	return NULL;
-
-    return PyImagingNew(ImagingOpenPPM(filename));
-}
-
-static PyObject* 
-_blend(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep1;
-    ImagingObject* imagep2;
-    double alpha;
-    
-    alpha = 0.5;
-    if (!PyArg_ParseTuple(args, "O!O!|d",
-			  &Imaging_Type, &imagep1,
-			  &Imaging_Type, &imagep2,
-			  &alpha))
-	return NULL;
-
-    return PyImagingNew(ImagingBlend(imagep1->image, imagep2->image,
-				     (float) alpha));
-}
-
-/* -------------------------------------------------------------------- */
-/* METHODS								*/
-/* -------------------------------------------------------------------- */
-
-static PyObject* 
-_convert(ImagingObject* self, PyObject* args)
-{
-    char* mode;
-    int dither = 0;
-    ImagingObject *paletteimage = NULL;
-
-    if (!PyArg_ParseTuple(args, "s|iO", &mode, &dither, &paletteimage))
-	return NULL;
-    if (paletteimage != NULL) {
-      if (!PyImaging_Check(paletteimage)) {
-	PyObject_Print((PyObject *)paletteimage, stderr, 0);
-	PyErr_SetString(PyExc_ValueError, "palette argument must be image with mode 'P'");
-	return NULL;
-      }
-      if (paletteimage->image->palette == NULL) {
-	PyErr_SetString(PyExc_ValueError, "null palette");
-	return NULL;
-      }
-    }
-
-    return PyImagingNew(ImagingConvert(self->image, mode, paletteimage ? paletteimage->image->palette : NULL, dither));
-}
-
-static PyObject* 
-_convert2(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep1;
-    ImagingObject* imagep2;
-    if (!PyArg_ParseTuple(args, "O!O!",
-			  &Imaging_Type, &imagep1,
-			  &Imaging_Type, &imagep2))
-	return NULL;
-
-    if (!ImagingConvert2(imagep1->image, imagep2->image))
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_convert_matrix(ImagingObject* self, PyObject* args)
-{
-    char* mode;
-    float m[12];
-    if (!PyArg_ParseTuple(args, "s(ffff)", &mode, m+0, m+1, m+2, m+3)) {
-	PyErr_Clear();
-	if (!PyArg_ParseTuple(args, "s(ffffffffffff)", &mode,
-			      m+0, m+1, m+2, m+3,
-			      m+4, m+5, m+6, m+7,
-			      m+8, m+9, m+10, m+11))
-	    return NULL;
-    }
-
-    return PyImagingNew(ImagingConvertMatrix(self->image, mode, m));
-}
-
-static PyObject* 
-_copy(ImagingObject* self, PyObject* args)
-{
-    if (!PyArg_ParseTuple(args, ""))
-	return NULL;
-
-    return PyImagingNew(ImagingCopy(self->image));
-}
-
-static PyObject* 
-_copy2(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep1;
-    ImagingObject* imagep2;
-    if (!PyArg_ParseTuple(args, "O!O!",
-			  &Imaging_Type, &imagep1,
-			  &Imaging_Type, &imagep2))
-	return NULL;
-
-    if (!ImagingCopy2(imagep1->image, imagep2->image))
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_crop(ImagingObject* self, PyObject* args)
-{
-    int x0, y0, x1, y1;
-    if (!PyArg_ParseTuple(args, "(iiii)", &x0, &y0, &x1, &y1))
-	return NULL;
-
-    return PyImagingNew(ImagingCrop(self->image, x0, y0, x1, y1));
-}
-
-static PyObject* 
-_expand(ImagingObject* self, PyObject* args)
-{
-    int x, y;
-    int mode = 0;
-    if (!PyArg_ParseTuple(args, "ii|i", &x, &y, &mode))
-	return NULL;
-
-    return PyImagingNew(ImagingExpand(self->image, x, y, mode));
-}
-
-static PyObject* 
-_filter(ImagingObject* self, PyObject* args)
-{
-    PyObject* imOut;
-    int kernelsize;
-    FLOAT32* kerneldata;
-
-    int xsize, ysize;
-    float divisor, offset;
-    PyObject* kernel = NULL;
-    if (!PyArg_ParseTuple(args, "(ii)ffO", &xsize, &ysize,
-                         &divisor, &offset, &kernel))
-        return NULL;
-    
-    /* get user-defined kernel */
-    kerneldata = getlist(kernel, &kernelsize, NULL, TYPE_FLOAT32);
-    if (!kerneldata)
-        return NULL;
-    if (kernelsize != xsize * ysize) {
-        free(kerneldata);
-        return ImagingError_ValueError("bad kernel size");
-    }
-
-    imOut = PyImagingNew(
-        ImagingFilter(self->image, xsize, ysize, kerneldata, offset, divisor)
-        );
-
-    free(kerneldata);
-
-    return imOut;
-}
-
-static PyObject* 
-_getpalette(ImagingObject* self, PyObject* args)
-{
-    PyObject* palette;
-    int palettesize = 256;
-    int bits;
-    ImagingShuffler pack;
-
-    char* mode = "RGB";
-    char* rawmode = "RGB";
-    if (!PyArg_ParseTuple(args, "|ss", &mode, &rawmode))
-	return NULL;
-
-    if (!self->image->palette) {
-	PyErr_SetString(PyExc_ValueError, no_palette);
-	return NULL;
-    }
-
-    pack = ImagingFindPacker(mode, rawmode, &bits);
-    if (!pack) {
-	PyErr_SetString(PyExc_ValueError, wrong_raw_mode);
-	return NULL;
-    }
-
-    palette = PyString_FromStringAndSize(NULL, palettesize * bits / 8);
-    if (!palette)
-	return NULL;
-
-    pack((UINT8*) PyString_AsString(palette),
-	 self->image->palette->palette, palettesize);
-
-    return palette;
-}
-
-static inline int
-_getxy(PyObject* xy, int* x, int *y)
-{
-    PyObject* value;
-
-    if (!PyTuple_Check(xy) || PyTuple_GET_SIZE(xy) != 2)
-        goto badarg;
-        
-    value = PyTuple_GET_ITEM(xy, 0);
-    if (PyInt_Check(value))
-        *x = PyInt_AS_LONG(value);
-    else if (PyFloat_Check(value))
-        *x = (int) PyFloat_AS_DOUBLE(value);
-    else
-        goto badval;
-
-    value = PyTuple_GET_ITEM(xy, 1);
-    if (PyInt_Check(value))
-        *y = PyInt_AS_LONG(value);
-    else if (PyFloat_Check(value))
-        *y = (int) PyFloat_AS_DOUBLE(value);
-    else
-        goto badval;
-
-    return 0;
-
-  badarg:
-    PyErr_SetString(
-        PyExc_TypeError,
-        "argument must be sequence of length 2"
-        );
-    return -1;
-
-  badval:
-    PyErr_SetString(
-        PyExc_TypeError,
-        "an integer is required"
-        );
-    return -1;
-}
-
-static PyObject* 
-_getpixel(ImagingObject* self, PyObject* args)
-{
-    PyObject* xy;
-    int x, y;
-
-    if (PyTuple_GET_SIZE(args) != 1) {
-        PyErr_SetString(
-            PyExc_TypeError,
-            "argument 1 must be sequence of length 2"
-            );
-        return NULL;
-    }
-
-    xy = PyTuple_GET_ITEM(args, 0);
-
-    if (_getxy(xy, &x, &y))
-        return NULL;
-
-    return getpixel(self->image, x, y);
-}
-
-static PyObject*
-_histogram(ImagingObject* self, PyObject* args)
-{
-    ImagingHistogram h;
-    PyObject* list;
-    int i;
-    union {
-        UINT8 u[2];
-        INT32 i[2];
-        FLOAT32 f[2];
-    } extrema;
-    void* ep;
-    int i0, i1;
-    double f0, f1;
-
-    PyObject* extremap = NULL;
-    ImagingObject* maskp = NULL;
-    if (!PyArg_ParseTuple(args, "|OO!", &extremap, &Imaging_Type, &maskp))
-	return NULL;
-
-    if (extremap) {
-        ep = &extrema;
-        switch (self->image->type) {
-        case IMAGING_TYPE_UINT8:
-            if (!PyArg_ParseTuple(extremap, "ii", &i0, &i1))
-                return NULL;
-            /* FIXME: clip */
-            extrema.u[0] = i0;
-            extrema.u[1] = i1;
-            break;
-        case IMAGING_TYPE_INT32:
-            if (!PyArg_ParseTuple(extremap, "ii", &i0, &i1))
-                return NULL;
-            extrema.i[0] = i0;
-            extrema.i[1] = i1;
-            break;
-        case IMAGING_TYPE_FLOAT32:
-            if (!PyArg_ParseTuple(extremap, "dd", &f0, &f1))
-                return NULL;
-            extrema.f[0] = (FLOAT32) f0;
-            extrema.f[1] = (FLOAT32) f1;
-            break;
-        default:
-            ep = NULL;
-            break;
-        }
-    } else
-        ep = NULL;
-
-    h = ImagingGetHistogram(self->image, (maskp) ? maskp->image : NULL, ep);
-
-    if (!h)
-	return NULL;
-
-    /* Build an integer list containing the histogram */
-    list = PyList_New(h->bands * 256);
-    for (i = 0; i < h->bands * 256; i++) {
-	PyObject* item;
-	item = PyInt_FromLong(h->histogram[i]);
-	if (item == NULL) {
-	    Py_DECREF(list);
-	    list = NULL;
-	    break;
-	}
-	PyList_SetItem(list, i, item);
-    }
-
-    ImagingHistogramDelete(h);
-
-    return list;
-}
-
-#ifdef WITH_MODEFILTER
-static PyObject* 
-_modefilter(ImagingObject* self, PyObject* args)
-{
-    int size;
-    if (!PyArg_ParseTuple(args, "i", &size))
-	return NULL;
-
-    return PyImagingNew(ImagingModeFilter(self->image, size));
-}
-#endif
-
-static PyObject* 
-_offset(ImagingObject* self, PyObject* args)
-{
-    int xoffset, yoffset;
-    if (!PyArg_ParseTuple(args, "ii", &xoffset, &yoffset))
-	return NULL;
-
-    return PyImagingNew(ImagingOffset(self->image, xoffset, yoffset));
-}
-
-static PyObject* 
-_paste(ImagingObject* self, PyObject* args)
-{
-    int status;
-    char ink[4];
-
-    PyObject* source;
-    int x0, y0, x1, y1;
-    ImagingObject* maskp = NULL;
-    if (!PyArg_ParseTuple(args, "O(iiii)|O!",
-			  &source,
-			  &x0, &y0, &x1, &y1,
-			  &Imaging_Type, &maskp))
-	return NULL;
-
-    if (PyImaging_Check(source))
-        status = ImagingPaste(
-            self->image, PyImaging_AsImaging(source),
-            (maskp) ? maskp->image : NULL,
-            x0, y0, x1, y1
-            );
-
-    else {
-        if (!getink(source, self->image, ink))
-            return NULL;
-        status = ImagingFill2(
-            self->image, ink,
-            (maskp) ? maskp->image : NULL,
-            x0, y0, x1, y1
-            );
-    }
-
-    if (status < 0)
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-_point(ImagingObject* self, PyObject* args)
-{
-    static const char* wrong_number = "wrong number of lut entries";
-
-    int n, i;
-    int bands;
-    Imaging im;
-
-    PyObject* list;
-    char* mode;
-    if (!PyArg_ParseTuple(args, "Oz", &list, &mode))
-	return NULL;
-
-    if (mode && !strcmp(mode, "F")) {
-        FLOAT32* data;
-
-        /* map from 8-bit data to floating point */
-        n = 256;
-        data = getlist(list, &n, wrong_number, TYPE_FLOAT32);
-        if (!data)
-            return NULL;
-        im = ImagingPoint(self->image, mode, (void*) data);
-        free(data);
-
-    } else if (!strcmp(self->image->mode, "I") && mode && !strcmp(mode, "L")) {
-        UINT8* data;
-
-        /* map from 16-bit subset of 32-bit data to 8-bit */
-        /* FIXME: support arbitrary number of entries (requires API change) */
-        n = 65536;
-        data = getlist(list, &n, wrong_number, TYPE_UINT8);
-        if (!data)
-            return NULL;
-        im = ImagingPoint(self->image, mode, (void*) data);
-        free(data);
-
-    } else {
-        INT32* data;
-        UINT8 lut[1024];
-
-        if (mode) {
-            bands = getbands(mode);
-            if (bands < 0)
-                return NULL;
-        } else
-            bands = self->image->bands;
-
-        /* map to integer data */
-        n = 256 * bands;
-        data = getlist(list, &n, wrong_number, TYPE_INT32);
-        if (!data)
-            return NULL;
-
-        if (mode && !strcmp(mode, "I"))
-            im = ImagingPoint(self->image, mode, (void*) data);
-        else if (mode && bands > 1) {
-            for (i = 0; i < 256; i++) {
-                lut[i*4] = CLIP(data[i]);
-                lut[i*4+1] = CLIP(data[i+256]);
-                lut[i*4+2] = CLIP(data[i+512]);
-                if (n > 768)
-                    lut[i*4+3] = CLIP(data[i+768]);
-            }
-            im = ImagingPoint(self->image, mode, (void*) lut);
-        } else {
-            /* map individual bands */
-            for (i = 0; i < n; i++)
-                lut[i] = CLIP(data[i]);
-            im = ImagingPoint(self->image, mode, (void*) lut);
-        }
-        free(data);
-    }
-
-    return PyImagingNew(im);
-}
-
-static PyObject*
-_point_transform(ImagingObject* self, PyObject* args)
-{
-    double scale = 1.0;
-    double offset = 0.0;
-    if (!PyArg_ParseTuple(args, "|dd", &scale, &offset))
-	return NULL;
-
-    return PyImagingNew(ImagingPointTransform(self->image, scale, offset));
-}
-
-static PyObject*
-_putdata(ImagingObject* self, PyObject* args)
-{
-    Imaging image;
-    int n, i, x, y;
-
-    PyObject* data;
-    double scale = 1.0;
-    double offset = 0.0;
-    if (!PyArg_ParseTuple(args, "O|dd", &data, &scale, &offset))
-	return NULL;
-
-    if (!PySequence_Check(data)) {
-	PyErr_SetString(PyExc_TypeError, must_be_sequence);
-	return NULL;
-    }
-
-    image = self->image;
-
-    n = PyObject_Length(data);
-    if (n > (int) (image->xsize * image->ysize)) {
-	PyErr_SetString(PyExc_TypeError, "too many data entries");
-	return NULL;
-    }
-
-    if (image->image8) {
-        if (PyString_Check(data)) {
-            unsigned char* p;
-            p = (unsigned char*) PyString_AS_STRING((PyStringObject*) data);
-            if (scale == 1.0 && offset == 0.0)
-                /* Plain string data */
-                for (i = y = 0; i < n; i += image->xsize, y++) {
-                    x = n - i;
-                    if (x > (int) image->xsize)
-                        x = image->xsize;
-                    memcpy(image->image8[y], p+i, x);
-                }
-            else 
-                /* Scaled and clipped string data */
-                for (i = x = y = 0; i < n; i++) {
-                    image->image8[y][x] = CLIP((int) (p[i] * scale + offset));
-                    if (++x >= (int) image->xsize)
-                        x = 0, y++;
-                }
-        } else {
-            if (scale == 1.0 && offset == 0.0) {
-                /* Clipped data */
-                if (PyList_Check(data)) {
-                    for (i = x = y = 0; i < n; i++) {
-                        PyObject *op = PyList_GET_ITEM(data, i);
-                        image->image8[y][x] = CLIP(PyInt_AsLong(op));
-                        if (++x >= (int) image->xsize)
-                            x = 0, y++;
-                    }
-                } else {
-                    for (i = x = y = 0; i < n; i++) {
-                        PyObject *op = PySequence_GetItem(data, i);
-                        image->image8[y][x] = CLIP(PyInt_AsLong(op));
-                        Py_XDECREF(op);
-                        if (++x >= (int) image->xsize)
-                            x = 0, y++;
-                    }
-                }
-            } else {
-                if (PyList_Check(data)) {
-                    /* Scaled and clipped data */
-                    for (i = x = y = 0; i < n; i++) {
-                        PyObject *op = PyList_GET_ITEM(data, i);
-                        image->image8[y][x] = CLIP(
-                            (int) (PyFloat_AsDouble(op) * scale + offset));
-                        if (++x >= (int) image->xsize)
-                            x = 0, y++;
-                    }
-                } else {
-                    for (i = x = y = 0; i < n; i++) {
-                        PyObject *op = PySequence_GetItem(data, i);
-                        image->image8[y][x] = CLIP(
-                            (int) (PyFloat_AsDouble(op) * scale + offset));
-                        Py_XDECREF(op);
-                        if (++x >= (int) image->xsize)
-                            x = 0, y++;
-                    }
-                }
-            }
-            PyErr_Clear(); /* Avoid weird exceptions */
-        }
-    } else {
-        /* 32-bit images */
-        switch (image->type) {
-        case IMAGING_TYPE_INT32:
-            for (i = x = y = 0; i < n; i++) {
-                PyObject *op = PySequence_GetItem(data, i);
-                IMAGING_PIXEL_INT32(image, x, y) =
-                    (INT32) (PyFloat_AsDouble(op) * scale + offset);
-                Py_XDECREF(op);
-                if (++x >= (int) image->xsize)
-                    x = 0, y++;
-            }
-            PyErr_Clear(); /* Avoid weird exceptions */
-            break;
-        case IMAGING_TYPE_FLOAT32:
-            for (i = x = y = 0; i < n; i++) {
-                PyObject *op = PySequence_GetItem(data, i);
-                IMAGING_PIXEL_FLOAT32(image, x, y) =
-                    (FLOAT32) (PyFloat_AsDouble(op) * scale + offset);
-                Py_XDECREF(op);
-                if (++x >= (int) image->xsize)
-                    x = 0, y++;
-            }
-            PyErr_Clear(); /* Avoid weird exceptions */
-            break;
-        default:
-            for (i = x = y = 0; i < n; i++) {
-                char ink[4];
-                PyObject *op = PySequence_GetItem(data, i);
-                if (!op || !getink(op, image, ink)) {
-                    Py_DECREF(op);
-                    return NULL;
-                }
-                /* FIXME: what about scale and offset? */
-                image->image32[y][x] = *((INT32*) ink);
-                Py_XDECREF(op);
-                if (++x >= (int) image->xsize)
-                    x = 0, y++;
-            }
-            PyErr_Clear(); /* Avoid weird exceptions */
-            break;
-        }
-    }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-#ifdef WITH_QUANTIZE
-
-#include "Quant.h"
-static PyObject* 
-_quantize(ImagingObject* self, PyObject* args)
-{
-    int colours = 256;
-    int method = 0;
-    int kmeans = 0;
-    if (!PyArg_ParseTuple(args, "|iii", &colours, &method, &kmeans))
-	return NULL;
-
-    if (!self->image->xsize || !self->image->ysize) {
-        /* no content; return an empty image */
-        return PyImagingNew(
-            ImagingNew("P", self->image->xsize, self->image->ysize)
-            );
-    }
-
-    return PyImagingNew(ImagingQuantize(self->image, colours, method, kmeans));
-}
-#endif
-
-static PyObject* 
-_putpalette(ImagingObject* self, PyObject* args)
-{
-    ImagingShuffler unpack;
-    int bits;
-
-    char* rawmode;
-    UINT8* palette;
-    int palettesize;
-    if (!PyArg_ParseTuple(args, "ss#", &rawmode, &palette, &palettesize))
-	return NULL;
-
-    if (strcmp(self->image->mode, "L") != 0 && strcmp(self->image->mode, "P")) {
-	PyErr_SetString(PyExc_ValueError, wrong_mode);
-	return NULL;
-    }
-
-    unpack = ImagingFindUnpacker("RGB", rawmode, &bits);
-    if (!unpack) {
-	PyErr_SetString(PyExc_ValueError, wrong_raw_mode);
-	return NULL;
-    }
-
-    ImagingPaletteDelete(self->image->palette);
-
-    strcpy(self->image->mode, "P");
-
-    self->image->palette = ImagingPaletteNew("RGB");
-
-    unpack(self->image->palette->palette, palette, palettesize * 8 / bits);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_putpalettealpha(ImagingObject* self, PyObject* args)
-{
-    int index;
-    int alpha = 0;
-    if (!PyArg_ParseTuple(args, "i|i", &index, &alpha))
-	return NULL;
-
-    if (!self->image->palette) {
-	PyErr_SetString(PyExc_ValueError, no_palette);
-	return NULL;
-    }
-
-    if (index < 0 || index >= 256) {
-	PyErr_SetString(PyExc_ValueError, outside_palette);
-	return NULL;
-    }
-
-    strcpy(self->image->palette->mode, "RGBA");
-    self->image->palette->palette[index*4+3] = (UINT8) alpha;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_putpixel(ImagingObject* self, PyObject* args)
-{
-    Imaging im;
-    char ink[4];
-
-    int x, y;
-    PyObject* color;
-    if (!PyArg_ParseTuple(args, "(ii)O", &x, &y, &color))
-	return NULL;
-
-    im = self->image;
-    
-    if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) {
-	PyErr_SetString(PyExc_IndexError, outside_image);
-	return NULL;
-    }
-
-    if (!getink(color, im, ink))
-        return NULL;
-
-    if (im->image8)
-	im->image8[y][x] = ink[0];
-    else
-	im->image32[y][x] = *((INT32*) ink);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-#ifdef WITH_RANKFILTER
-static PyObject* 
-_rankfilter(ImagingObject* self, PyObject* args)
-{
-    int size, rank;
-    if (!PyArg_ParseTuple(args, "ii", &size, &rank))
-	return NULL;
-
-    return PyImagingNew(ImagingRankFilter(self->image, size, rank));
-}
-#endif
-
-static PyObject* 
-_resize(ImagingObject* self, PyObject* args)
-{
-    Imaging imIn;
-    Imaging imOut;
-
-    int xsize, ysize;
-    int filter = IMAGING_TRANSFORM_NEAREST;
-    if (!PyArg_ParseTuple(args, "(ii)|i", &xsize, &ysize, &filter))
-	return NULL;
-
-    imIn = self->image;
-
-    imOut = ImagingNew(imIn->mode, xsize, ysize);
-    if (imOut)
-        ImagingResize(imOut, imIn, filter);
-    
-    return PyImagingNew(imOut);
-}
-
-static PyObject* 
-_rotate(ImagingObject* self, PyObject* args)
-{
-    Imaging imOut;
-    Imaging imIn;
-    
-    double theta;
-    int filter = IMAGING_TRANSFORM_NEAREST;
-    if (!PyArg_ParseTuple(args, "d|i", &theta, &filter))
-	return NULL;
-
-    imIn = self->image;
-
-    theta = fmod(theta, 360.0);
-    if (theta < 0.0)
-	theta += 360;
-
-    if (filter && imIn->type != IMAGING_TYPE_SPECIAL) {
-        /* Rotate with resampling filter */
-        imOut = ImagingNew(imIn->mode, imIn->xsize, imIn->ysize);
-        ImagingRotate(imOut, imIn, theta, filter);
-    } else if (theta == 90.0 || theta == 270.0) {
-        /* Use fast version */
-        imOut = ImagingNew(imIn->mode, imIn->ysize, imIn->xsize);
-        if (imOut) {
-            if (theta == 90.0)
-                ImagingRotate90(imOut, imIn);
-            else
-                ImagingRotate270(imOut, imIn);
-        }
-    } else {
-        imOut = ImagingNew(imIn->mode, imIn->xsize, imIn->ysize);
-        if (imOut) {
-            if (theta == 0.0)
-                /* No rotation: simply copy the input image */
-                ImagingCopy2(imOut, imIn);
-            else if (theta == 180.0)
-                /* Use fast version */
-                ImagingRotate180(imOut, imIn);
-            else
-                /* Use ordinary version */
-                ImagingRotate(imOut, imIn, theta, 0);
-        }
-    }
-
-    return PyImagingNew(imOut);
-}
-
-#define IS_RGB(mode)\
-    (!strcmp(mode, "RGB") || !strcmp(mode, "RGBA") || !strcmp(mode, "RGBX"))
-
-static PyObject* 
-im_setmode(ImagingObject* self, PyObject* args)
-{
-    /* attempt to modify the mode of an image in place */
-
-    Imaging im;
-
-    char* mode;
-    int modelen;
-    if (!PyArg_ParseTuple(args, "s#:setmode", &mode, &modelen))
-	return NULL;
-
-    im = self->image;
-
-    /* FIXME: move this to a libImaging primitive (?) */
-    /* FIXME: add support for 1->L and L->1 */
-
-    if (!strcmp(im->mode, mode)) {
-        ; /* same mode; always succeeds */
-    } else if (IS_RGB(im->mode) && IS_RGB(mode)) {
-        /* color to color */
-        strcpy(im->mode, mode);
-        im->bands = modelen;
-        if (!strcmp(mode, "RGBA"))
-            ImagingFillBand(im, 3, 255);
-    } else
-        return ImagingError_ModeError();
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_stretch(ImagingObject* self, PyObject* args)
-{
-    Imaging imIn;
-    Imaging imTemp;
-    Imaging imOut;
-
-    int xsize, ysize;
-    int filter = IMAGING_TRANSFORM_NEAREST;
-    if (!PyArg_ParseTuple(args, "(ii)|i", &xsize, &ysize, &filter))
-	return NULL;
-
-    imIn = self->image;
-
-    /* two-pass resize: minimize size of intermediate image */
-    if (imIn->xsize * ysize < xsize * imIn->ysize)
-        imTemp = ImagingNew(imIn->mode, imIn->xsize, ysize);
-    else 
-        imTemp = ImagingNew(imIn->mode, xsize, imIn->ysize);
-    if (!imTemp)
-        return NULL;
-
-    /* first pass */
-    if (!ImagingStretch(imTemp, imIn, filter)) {
-        ImagingDelete(imTemp);
-        return NULL;
-    }
-
-    imOut = ImagingNew(imIn->mode, xsize, ysize);
-    if (!imOut) {
-        ImagingDelete(imTemp);
-        return NULL;
-    }
-
-    /* second pass */
-    if (!ImagingStretch(imOut, imTemp, filter)) {
-        ImagingDelete(imOut);
-        ImagingDelete(imTemp);
-        return NULL;
-    }
-
-    ImagingDelete(imTemp);
-    
-    return PyImagingNew(imOut);
-}
-
-static PyObject* 
-_transform2(ImagingObject* self, PyObject* args)
-{
-    static const char* wrong_number = "wrong number of matrix entries";
-
-    Imaging imIn;
-    Imaging imOut;
-    int n;
-    double *a;
-
-    ImagingObject* imagep;
-    int x0, y0, x1, y1;
-    int method;
-    PyObject* data;
-    int filter = IMAGING_TRANSFORM_NEAREST;
-    int fill = 1;
-    if (!PyArg_ParseTuple(args, "(iiii)O!iO|ii",
-                          &x0, &y0, &x1, &y1,
-			  &Imaging_Type, &imagep,
-                          &method, &data,
-                          &filter, &fill))
-	return NULL;
-
-    switch (method) {
-    case IMAGING_TRANSFORM_AFFINE:
-        n = 6;
-        break;
-    case IMAGING_TRANSFORM_PERSPECTIVE:
-        n = 8;
-        break;
-    case IMAGING_TRANSFORM_QUAD:
-        n = 8;
-        break;
-    default:
-        n = -1; /* force error */
-    }
-
-    a = getlist(data, &n, wrong_number, TYPE_DOUBLE);
-    if (!a)
-        return NULL;
-
-    imOut = self->image;
-    imIn = imagep->image;
-
-    /* FIXME: move transform dispatcher into libImaging */
-
-    switch (method) {
-    case IMAGING_TRANSFORM_AFFINE:
-        imOut = ImagingTransformAffine(
-            imOut, imIn, x0, y0, x1, y1, a, filter, 1
-            );
-        break;
-    case IMAGING_TRANSFORM_PERSPECTIVE:
-        imOut = ImagingTransformPerspective(
-            imOut, imIn, x0, y0, x1, y1, a, filter, 1
-            );
-        break;
-    case IMAGING_TRANSFORM_QUAD:
-        imOut = ImagingTransformQuad(
-            imOut, imIn, x0, y0, x1, y1, a, filter, 1
-            );
-        break;
-    default:
-        ImagingError_ValueError("bad transform method");
-    }
-
-    free(a);
-
-    if (!imOut)
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_transpose(ImagingObject* self, PyObject* args)
-{
-    Imaging imIn;
-    Imaging imOut;
-
-    int op;
-    if (!PyArg_ParseTuple(args, "i", &op))
-	return NULL;
-
-    imIn = self->image;
-    
-    switch (op) {
-    case 0: /* flip left right */
-    case 1: /* flip top bottom */
-    case 3: /* rotate 180 */
-        imOut = ImagingNew(imIn->mode, imIn->xsize, imIn->ysize);
-        break;
-    case 2: /* rotate 90 */
-    case 4: /* rotate 270 */
-        imOut = ImagingNew(imIn->mode, imIn->ysize, imIn->xsize);
-        break;
-    default:
-        PyErr_SetString(PyExc_ValueError, "No such transpose operation");
-        return NULL;
-    }
-
-    if (imOut)
-        switch (op) {
-        case 0:
-            ImagingFlipLeftRight(imOut, imIn);
-            break;
-        case 1:
-            ImagingFlipTopBottom(imOut, imIn);
-            break;
-        case 2:
-            ImagingRotate90(imOut, imIn);
-            break;
-        case 3:
-            ImagingRotate180(imOut, imIn);
-            break;
-        case 4:
-            ImagingRotate270(imOut, imIn);
-            break;
-        }
-
-    return PyImagingNew(imOut);
-}
-
-/* -------------------------------------------------------------------- */
-
-static PyObject* 
-_isblock(ImagingObject* self, PyObject* args)
-{
-    return PyInt_FromLong((long) self->image->block);
-}
-
-static PyObject* 
-_getbbox(ImagingObject* self, PyObject* args)
-{
-    int bbox[4];
-    if (!ImagingGetBBox(self->image, bbox)) {
-	Py_INCREF(Py_None);
-	return Py_None;
-    }
-
-    return Py_BuildValue("iiii", bbox[0], bbox[1], bbox[2], bbox[3]);
-}
-
-static PyObject* 
-_getcolors(ImagingObject* self, PyObject* args)
-{
-    ImagingColorItem* items;
-    int i, colors;
-    PyObject* out;
-
-    int maxcolors = 256;
-    if (!PyArg_ParseTuple(args, "i:getcolors", &maxcolors))
-	return NULL;
-
-    items = ImagingGetColors(self->image, maxcolors, &colors);
-    if (!items)
-        return NULL;
-
-    if (colors > maxcolors) {
-        out = Py_None;
-        Py_INCREF(out);
-    } else {
-        out = PyList_New(colors);
-        for (i = 0; i < colors; i++) {
-            ImagingColorItem* v = &items[i];
-            PyObject* item = Py_BuildValue(
-                "iN", v->count, getpixel(self->image, v->x, v->y)
-                );
-            PyList_SetItem(out, i, item);
-        }
-    }
-
-    free(items);
-
-    return out;
-}
-
-static PyObject* 
-_getextrema(ImagingObject* self, PyObject* args)
-{
-    union {
-        UINT8 u[2];
-        INT32 i[2];
-        FLOAT32 f[2];
-    } extrema;
-    int status;
-    
-    status = ImagingGetExtrema(self->image, &extrema);
-    if (status < 0)
-        return NULL;
-
-    if (status)
-        switch (self->image->type) {
-        case IMAGING_TYPE_UINT8:
-            return Py_BuildValue("ii", extrema.u[0], extrema.u[1]);
-        case IMAGING_TYPE_INT32:
-            return Py_BuildValue("ii", extrema.i[0], extrema.i[1]);
-        case IMAGING_TYPE_FLOAT32:
-            return Py_BuildValue("dd", extrema.f[0], extrema.f[1]);
-        }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_getprojection(ImagingObject* self, PyObject* args)
-{
-    unsigned char* xprofile;
-    unsigned char* yprofile;
-    PyObject* result;
-
-    xprofile = malloc(self->image->xsize);
-    yprofile = malloc(self->image->ysize);
-
-    if (xprofile == NULL || yprofile == NULL) {
-	free(xprofile);
-	free(yprofile);
-	PyErr_NoMemory();
-	return NULL;
-    }
-
-    ImagingGetProjection(self->image, (unsigned char *)xprofile, (unsigned char *)yprofile);
-
-    result = Py_BuildValue("s#s#", xprofile, self->image->xsize,
-			   yprofile, self->image->ysize);
-
-    free(xprofile);
-    free(yprofile);
-
-    return result;
-}
-
-/* -------------------------------------------------------------------- */
-
-static PyObject* 
-_getband(ImagingObject* self, PyObject* args)
-{
-    int band;
-
-    if (!PyArg_ParseTuple(args, "i", &band))
-	return NULL;
-
-    return PyImagingNew(ImagingGetBand(self->image, band));
-}
-
-static PyObject* 
-_fillband(ImagingObject* self, PyObject* args)
-{
-    int band;
-    int color;
-
-    if (!PyArg_ParseTuple(args, "ii", &band, &color))
-	return NULL;
-
-    if (!ImagingFillBand(self->image, band, color))
-        return NULL;
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_putband(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-    int band;
-    if (!PyArg_ParseTuple(args, "O!i",
-			  &Imaging_Type, &imagep,
-			  &band))
-	return NULL;
-
-    if (!ImagingPutBand(self->image, imagep->image, band))
-	return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-/* -------------------------------------------------------------------- */
-
-#ifdef WITH_IMAGECHOPS
-
-static PyObject* 
-_chop_invert(ImagingObject* self, PyObject* args)
-{
-    return PyImagingNew(ImagingNegative(self->image));
-}
-
-static PyObject* 
-_chop_lighter(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopLighter(self->image, imagep->image));
-}
-
-static PyObject* 
-_chop_darker(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopDarker(self->image, imagep->image));
-}
-
-static PyObject* 
-_chop_difference(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopDifference(self->image, imagep->image));
-}
-
-static PyObject* 
-_chop_multiply(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopMultiply(self->image, imagep->image));
-}
-
-static PyObject* 
-_chop_screen(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopScreen(self->image, imagep->image));
-}
-
-static PyObject* 
-_chop_add(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-    float scale;
-    int offset;
-
-    scale = 1.0;
-    offset = 0;
-
-    if (!PyArg_ParseTuple(args, "O!|fi", &Imaging_Type, &imagep,
-			  &scale, &offset))
-	return NULL;
-
-    return PyImagingNew(ImagingChopAdd(self->image, imagep->image,
-				       scale, offset));
-}
-
-static PyObject* 
-_chop_subtract(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-    float scale;
-    int offset;
-
-    scale = 1.0;
-    offset = 0;
-
-    if (!PyArg_ParseTuple(args, "O!|fi", &Imaging_Type, &imagep,
-			  &scale, &offset))
-	return NULL;
-
-    return PyImagingNew(ImagingChopSubtract(self->image, imagep->image,
-					    scale, offset));
-}
-
-static PyObject* 
-_chop_and(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopAnd(self->image, imagep->image));
-}
-
-static PyObject* 
-_chop_or(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopOr(self->image, imagep->image));
-}
-
-static PyObject* 
-_chop_xor(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopXor(self->image, imagep->image));
-}
-
-static PyObject* 
-_chop_add_modulo(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopAddModulo(self->image, imagep->image));
-}
-
-static PyObject* 
-_chop_subtract_modulo(ImagingObject* self, PyObject* args)
-{
-    ImagingObject* imagep;
-
-    if (!PyArg_ParseTuple(args, "O!", &Imaging_Type, &imagep))
-	return NULL;
-
-    return PyImagingNew(ImagingChopSubtractModulo(self->image, imagep->image));
-}
-
-#endif
-
-
-/* -------------------------------------------------------------------- */
-
-#ifdef WITH_IMAGEDRAW
-
-static PyObject*
-_font_new(PyObject* self_, PyObject* args)
-{
-    ImagingFontObject *self;
-    int i, y0, y1;
-    static const char* wrong_length = "descriptor table has wrong size";
-
-    ImagingObject* imagep;
-    unsigned char* glyphdata;
-    int glyphdata_length;
-    if (!PyArg_ParseTuple(args, "O!s#",
-			  &Imaging_Type, &imagep,
-			  &glyphdata, &glyphdata_length))
-        return NULL;
-
-    if (glyphdata_length != 256 * 20) {
-	PyErr_SetString(PyExc_ValueError, wrong_length);
-	return NULL;
-    }
-
-    self = PyObject_New(ImagingFontObject, &ImagingFont_Type);
-    if (self == NULL)
-	return NULL;
-
-    /* glyph bitmap */
-    self->bitmap = imagep->image;
-
-    y0 = y1 = 0;
-
-    /* glyph glyphs */
-    for (i = 0; i < 256; i++) {
-        self->glyphs[i].dx = S16(B16(glyphdata, 0));
-        self->glyphs[i].dy = S16(B16(glyphdata, 2));
-        self->glyphs[i].dx0 = S16(B16(glyphdata, 4));
-        self->glyphs[i].dy0 = S16(B16(glyphdata, 6));
-        self->glyphs[i].dx1 = S16(B16(glyphdata, 8));
-        self->glyphs[i].dy1 = S16(B16(glyphdata, 10));
-        self->glyphs[i].sx0 = S16(B16(glyphdata, 12));
-        self->glyphs[i].sy0 = S16(B16(glyphdata, 14));
-        self->glyphs[i].sx1 = S16(B16(glyphdata, 16));
-        self->glyphs[i].sy1 = S16(B16(glyphdata, 18));
-        if (self->glyphs[i].dy0 < y0)
-            y0 = self->glyphs[i].dy0;
-        if (self->glyphs[i].dy1 > y1)
-            y1 = self->glyphs[i].dy1;
-        glyphdata += 20;
-    }
-
-    self->baseline = -y0;
-    self->ysize = y1 - y0;
-
-    /* keep a reference to the bitmap object */
-    Py_INCREF(imagep);
-    self->ref = imagep;
-
-    return (PyObject*) self;
-}
-
-static void
-_font_dealloc(ImagingFontObject* self)
-{
-    Py_XDECREF(self->ref);
-    PyObject_Del(self);
-}
-
-static inline int
-textwidth(ImagingFontObject* self, const unsigned char* text)
-{
-    int xsize;
-
-    for (xsize = 0; *text; text++)
-        xsize += self->glyphs[*text].dx;
-
-    return xsize;
-}
-
-static PyObject*
-_font_getmask(ImagingFontObject* self, PyObject* args)
-{
-    Imaging im;
-    Imaging bitmap;
-    int x, b;
-    int status;
-    Glyph* glyph;
-
-    unsigned char* text;
-    char* mode = "";
-    if (!PyArg_ParseTuple(args, "s|s:getmask", &text, &mode))
-        return NULL;
-
-    im = ImagingNew(self->bitmap->mode, textwidth(self, text), self->ysize);
-    if (!im)
-        return NULL;
-
-    b = 0;
-    ImagingFill(im, &b);
-
-    b = self->baseline;
-    for (x = 0; *text; text++) {
-        glyph = &self->glyphs[*text];
-        bitmap = ImagingCrop(
-            self->bitmap,
-            glyph->sx0, glyph->sy0, glyph->sx1, glyph->sy1
-            );
-        if (!bitmap)
-            goto failed;
-        status = ImagingPaste(
-            im, bitmap, NULL,
-            glyph->dx0+x, glyph->dy0+b, glyph->dx1+x, glyph->dy1+b
-            );
-        ImagingDelete(bitmap);
-        if (status < 0)
-            goto failed;
-        x = x + glyph->dx;
-        b = b + glyph->dy;
-    }
-
-    return PyImagingNew(im);
-
-  failed:
-    ImagingDelete(im);
-    return NULL;
-}
-
-static PyObject*
-_font_getsize(ImagingFontObject* self, PyObject* args)
-{
-    unsigned char* text;
-    if (!PyArg_ParseTuple(args, "s:getsize", &text))
-        return NULL;
-
-    return Py_BuildValue("ii", textwidth(self, text), self->ysize);
-}
-
-static struct PyMethodDef _font_methods[] = {
-    {"getmask", (PyCFunction)_font_getmask, 1},
-    {"getsize", (PyCFunction)_font_getsize, 1},
-    {NULL, NULL} /* sentinel */
-};
-
-static PyObject*  
-_font_getattr(ImagingFontObject* self, char* name)
-{
-    return Py_FindMethod(_font_methods, (PyObject*) self, name);
-}
-
-/* -------------------------------------------------------------------- */
-
-static PyObject*
-_draw_new(PyObject* self_, PyObject* args)
-{
-    ImagingDrawObject *self;
-
-    ImagingObject* imagep;
-    int blend = 0;
-    if (!PyArg_ParseTuple(args, "O!|i", &Imaging_Type, &imagep, &blend))
-        return NULL;
-
-    self = PyObject_New(ImagingDrawObject, &ImagingDraw_Type);
-    if (self == NULL)
-	return NULL;
-
-    /* keep a reference to the image object */
-    Py_INCREF(imagep);
-    self->image = imagep;
-
-    self->ink[0] = self->ink[1] = self->ink[2] = self->ink[3] = 0;
-
-    self->blend = blend;
-
-    return (PyObject*) self;
-}
-
-static void
-_draw_dealloc(ImagingDrawObject* self)
-{
-    Py_XDECREF(self->image);
-    PyObject_Del(self);
-}
-
-extern int PyPath_Flatten(PyObject* data, double **xy);
-
-static PyObject* 
-_draw_ink(ImagingDrawObject* self, PyObject* args)
-{
-    INT32 ink = 0;
-    PyObject* color;
-    char* mode = NULL; /* not used in this release */
-    if (!PyArg_ParseTuple(args, "O|s", &color, &mode))
-        return NULL;
-
-    if (!getink(color, self->image->image, (char*) &ink))
-        return NULL;
-
-    return PyInt_FromLong((int) ink);
-}
-
-static PyObject* 
-_draw_arc(ImagingDrawObject* self, PyObject* args)
-{
-    int x0, y0, x1, y1;
-    int ink;
-    int start, end;
-    int op = 0;
-    if (!PyArg_ParseTuple(args, "(iiii)iii|i",
-                          &x0, &y0, &x1, &y1,
-                          &start, &end, &ink))
-	return NULL;
-
-    if (ImagingDrawArc(self->image->image, x0, y0, x1, y1, start, end,
-                       &ink, op) < 0)
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw_bitmap(ImagingDrawObject* self, PyObject* args)
-{
-    double *xy;
-    int n;
-
-    PyObject *data;
-    ImagingObject* bitmap;
-    int ink;
-    if (!PyArg_ParseTuple(args, "OO!i", &data, &Imaging_Type, &bitmap, &ink))
-	return NULL;
-
-    n = PyPath_Flatten(data, &xy);
-    if (n < 0)
-	return NULL;
-    if (n != 1) {
-	PyErr_SetString(
-            PyExc_TypeError,
-            "coordinate list must contain exactly 1 coordinate"
-            );
-	return NULL;
-    }
-
-    n = ImagingDrawBitmap(
-        self->image->image, (int) xy[0], (int) xy[1], bitmap->image,
-        &ink, self->blend
-        );
-
-    free(xy);
-
-    if (n < 0)
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw_chord(ImagingDrawObject* self, PyObject* args)
-{
-    int x0, y0, x1, y1;
-    int ink, fill;
-    int start, end;
-    if (!PyArg_ParseTuple(args, "(iiii)iiii",
-                          &x0, &y0, &x1, &y1, &start, &end, &ink, &fill))
-	return NULL;
-
-    if (ImagingDrawChord(self->image->image, x0, y0, x1, y1,
-                         start, end, &ink, fill, self->blend) < 0)
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw_ellipse(ImagingDrawObject* self, PyObject* args)
-{
-    double* xy;
-    int n;
-
-    PyObject* data;
-    int ink;
-    int fill = 0;
-    if (!PyArg_ParseTuple(args, "Oi|i", &data, &ink, &fill))
-	return NULL;
-
-    n = PyPath_Flatten(data, &xy);
-    if (n < 0)
-	return NULL;
-    if (n != 2) {
-	PyErr_SetString(
-            PyExc_TypeError,
-            "coordinate list must contain exactly 2 coordinates"
-            );
-	return NULL;
-    }
-
-    n = ImagingDrawEllipse(
-        self->image->image, (int) xy[0], (int) xy[1], (int) xy[2], (int) xy[3],
-        &ink, fill, self->blend
-        );
-    
-    free(xy);
-
-    if (n < 0)
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw_line(ImagingDrawObject* self, PyObject* args)
-{
-    int x0, y0, x1, y1;
-    int ink;
-    if (!PyArg_ParseTuple(args, "(ii)(ii)i", &x0, &y0, &x1, &y1, &ink))
-	return NULL;
-
-    if (ImagingDrawLine(self->image->image, x0, y0, x1, y1,
-                        &ink, self->blend) < 0)
-	return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw_lines(ImagingDrawObject* self, PyObject* args)
-{
-    double *xy;
-    int i, n;
-
-    PyObject *data;
-    int ink;
-    int width = 0;
-    if (!PyArg_ParseTuple(args, "Oi|i", &data, &ink, &width))
-	return NULL;
-
-    n = PyPath_Flatten(data, &xy);
-    if (n < 0)
-	return NULL;
-
-    if (width <= 1) {
-        double *p = NULL;
-	for (i = 0; i < n-1; i++) {
-            p = &xy[i+i];
-            if (ImagingDrawLine(
-                    self->image->image,
-                    (int) p[0], (int) p[1], (int) p[2], (int) p[3],
-                    &ink, self->blend) < 0) {
-                free(xy);
-                return NULL;
-            }
-        }
-        if (p) /* draw last point */
-            ImagingDrawPoint(
-                    self->image->image,
-                    (int) p[2], (int) p[3],
-                    &ink, self->blend
-                );
-    } else {
-        for (i = 0; i < n-1; i++) {
-            double *p = &xy[i+i];
-            if (ImagingDrawWideLine(
-                    self->image->image,
-                    (int) p[0], (int) p[1], (int) p[2], (int) p[3],
-                    &ink, width, self->blend) < 0) {
-                free(xy);
-                return NULL;
-            }
-        }
-    }
-
-    free(xy);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw_point(ImagingDrawObject* self, PyObject* args)
-{
-    int x, y;
-    int ink;
-    if (!PyArg_ParseTuple(args, "(ii)i", &x, &y, &ink))
-	return NULL;
-
-    if (ImagingDrawPoint(self->image->image, x, y, &ink, self->blend) < 0)
-	return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw_points(ImagingDrawObject* self, PyObject* args)
-{
-    double *xy;
-    int i, n;
-
-    PyObject *data;
-    int ink;
-    if (!PyArg_ParseTuple(args, "Oi", &data, &ink))
-	return NULL;
-
-    n = PyPath_Flatten(data, &xy);
-    if (n < 0)
-	return NULL;
-
-    for (i = 0; i < n; i++) {
-	double *p = &xy[i+i];
-	if (ImagingDrawPoint(self->image->image, (int) p[0], (int) p[1],
-                             &ink, self->blend) < 0) {
-	    free(xy);
-	    return NULL;
-	}
-    }
-
-    free(xy);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-#ifdef	WITH_ARROW
-
-/* from outline.c */
-extern ImagingOutline PyOutline_AsOutline(PyObject* outline);
-
-static PyObject* 
-_draw_outline(ImagingDrawObject* self, PyObject* args)
-{
-    ImagingOutline outline;
-
-    PyObject* outline_;
-    int ink;
-    int fill = 0;
-    if (!PyArg_ParseTuple(args, "Oi|i", &outline_, &ink, &fill))
-	return NULL;
-
-    outline = PyOutline_AsOutline(outline_);
-    if (!outline) {
-        PyErr_SetString(PyExc_TypeError, "expected outline object");
-        return NULL;
-    }
-
-    if (ImagingDrawOutline(self->image->image, outline,
-                           &ink, fill, self->blend) < 0)
-	return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-#endif
-
-static PyObject* 
-_draw_pieslice(ImagingDrawObject* self, PyObject* args)
-{
-    int x0, y0, x1, y1;
-    int ink, fill;
-    int start, end;
-    if (!PyArg_ParseTuple(args, "(iiii)iiii",
-                          &x0, &y0, &x1, &y1, &start, &end, &ink, &fill))
-	return NULL;
-
-    if (ImagingDrawPieslice(self->image->image, x0, y0, x1, y1,
-                            start, end, &ink, fill, self->blend) < 0)
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw_polygon(ImagingDrawObject* self, PyObject* args)
-{
-    double *xy;
-    int *ixy;
-    int n, i;
-
-    PyObject* data;
-    int ink;
-    int fill = 0;
-    if (!PyArg_ParseTuple(args, "Oi|i", &data, &ink, &fill))
-	return NULL;
-
-    n = PyPath_Flatten(data, &xy);
-    if (n < 0)
-	return NULL;
-    if (n < 2) {
-	PyErr_SetString(
-            PyExc_TypeError,
-            "coordinate list must contain at least 2 coordinates"
-            );
-	return NULL;
-    }
-
-    /* Copy list of vertices to array */
-    ixy = (int*) malloc(n * 2 * sizeof(int));
-
-    for (i = 0; i < n; i++) {
-	ixy[i+i] = (int) xy[i+i];
-	ixy[i+i+1] = (int) xy[i+i+1];
-    }
-
-    free(xy);
-
-    if (ImagingDrawPolygon(self->image->image, n, ixy,
-                           &ink, fill, self->blend) < 0) {
-	free(ixy);
-	return NULL;
-    }
-
-    free(ixy);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw_rectangle(ImagingDrawObject* self, PyObject* args)
-{
-    double* xy;
-    int n;
-
-    PyObject* data;
-    int ink;
-    int fill = 0;
-    if (!PyArg_ParseTuple(args, "Oi|i", &data, &ink, &fill))
-	return NULL;
-
-    n = PyPath_Flatten(data, &xy);
-    if (n < 0)
-	return NULL;
-    if (n != 2) {
-	PyErr_SetString(
-            PyExc_TypeError,
-            "coordinate list must contain exactly 2 coordinates"
-            );
-	return NULL;
-    }
-
-    n = ImagingDrawRectangle(
-        self->image->image, (int) xy[0], (int) xy[1],
-        (int) xy[2], (int) xy[3], &ink, fill, self->blend
-        );
-    
-    free(xy);
-
-    if (n < 0)
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static struct PyMethodDef _draw_methods[] = {
-#ifdef WITH_IMAGEDRAW
-    /* Graphics (ImageDraw) */
-    {"draw_line", (PyCFunction)_draw_line, 1},
-    {"draw_lines", (PyCFunction)_draw_lines, 1},
-#ifdef WITH_ARROW
-    {"draw_outline", (PyCFunction)_draw_outline, 1},
-#endif
-    {"draw_polygon", (PyCFunction)_draw_polygon, 1},
-    {"draw_rectangle", (PyCFunction)_draw_rectangle, 1},
-    {"draw_point", (PyCFunction)_draw_point, 1},
-    {"draw_points", (PyCFunction)_draw_points, 1},
-    {"draw_arc", (PyCFunction)_draw_arc, 1},
-    {"draw_bitmap", (PyCFunction)_draw_bitmap, 1},
-    {"draw_chord", (PyCFunction)_draw_chord, 1},
-    {"draw_ellipse", (PyCFunction)_draw_ellipse, 1},
-    {"draw_pieslice", (PyCFunction)_draw_pieslice, 1},
-    {"draw_ink", (PyCFunction)_draw_ink, 1},
-#endif
-    {NULL, NULL} /* sentinel */
-};
-
-static PyObject*  
-_draw_getattr(ImagingDrawObject* self, char* name)
-{
-    return Py_FindMethod(_draw_methods, (PyObject*) self, name);
-}
-
-#endif
-
-
-static PyObject*
-pixel_access_new(ImagingObject* imagep, PyObject* args)
-{
-    PixelAccessObject *self;
-
-    int readonly = 0;
-    if (!PyArg_ParseTuple(args, "|i", &readonly))
-        return NULL;
-
-    self = PyObject_New(PixelAccessObject, &PixelAccess_Type);
-    if (self == NULL)
-	return NULL;
-
-    /* keep a reference to the image object */
-    Py_INCREF(imagep);
-    self->image = imagep;
-
-    self->readonly = readonly;
-
-    return (PyObject*) self;
-}
-
-static void
-pixel_access_dealloc(PixelAccessObject* self)
-{
-    Py_XDECREF(self->image);
-    PyObject_Del(self);
-}
-
-static PyObject *
-pixel_access_getitem(PixelAccessObject *self, PyObject *xy)
-{
-    int x, y;
-    if (_getxy(xy, &x, &y))
-        return NULL;
-
-    return getpixel(self->image->image, x, y);
-}
-
-static int
-pixel_access_setitem(PixelAccessObject *self, PyObject *xy, PyObject *color)
-{
-    Imaging im = self->image->image;
-    char ink[4];
-    int x, y;
-
-    if (self->readonly) {
-        ImagingError_ValueError(readonly);
-        return -1;
-    }
-
-    if (_getxy(xy, &x, &y))
-        return -1;
-
-    if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize) {
-	PyErr_SetString(PyExc_IndexError, outside_image);
-	return -1;
-    }
-
-    if (!color) /* FIXME: raise exception? */
-        return 0;
-
-    if (!getink(color, im, ink))
-        return -1;
-
-    if (im->image8)
-	im->image8[y][x] = ink[0];
-    else
-	im->image32[y][x] = *((INT32*) ink);
-
-    return 0;
-}
-
-/* -------------------------------------------------------------------- */
-/* EFFECTS (experimental)        					*/
-/* -------------------------------------------------------------------- */
-
-#ifdef WITH_EFFECTS
-
-static PyObject* 
-_effect_mandelbrot(ImagingObject* self, PyObject* args)
-{
-    int xsize = 512;
-    int ysize = 512;
-    double extent[4];
-    int quality = 100;
-
-    extent[0] = -3; extent[1] = -2.5;
-    extent[2] = 2;  extent[3] = 2.5;
-
-    if (!PyArg_ParseTuple(args, "|(ii)(dddd)i", &xsize, &ysize,
-                          &extent[0], &extent[1], &extent[2], &extent[3],
-                          &quality))
-	return NULL;
-
-    return PyImagingNew(ImagingEffectMandelbrot(xsize, ysize, extent, quality));
-}
-
-static PyObject* 
-_effect_noise(ImagingObject* self, PyObject* args)
-{
-    int xsize, ysize;
-    float sigma = 128;
-    if (!PyArg_ParseTuple(args, "(ii)|f", &xsize, &ysize, &sigma))
-	return NULL;
-
-    return PyImagingNew(ImagingEffectNoise(xsize, ysize, sigma));
-}
-
-static PyObject* 
-_effect_spread(ImagingObject* self, PyObject* args)
-{
-    int dist;
-
-    if (!PyArg_ParseTuple(args, "i", &dist))
-	return NULL;
-
-    return PyImagingNew(ImagingEffectSpread(self->image, dist));
-}
-
-#endif
-
-/* -------------------------------------------------------------------- */
-/* UTILITIES								*/
-/* -------------------------------------------------------------------- */
-
-static PyObject* 
-_crc32(PyObject* self, PyObject* args)
-{
-    unsigned char* buffer;
-    int bytes;
-    int hi, lo;
-    UINT32 crc;
-
-    hi = lo = 0;
-
-    if (!PyArg_ParseTuple(args, "s#|(ii)", &buffer, &bytes, &hi, &lo))
-	return NULL;
-
-    crc = ((UINT32) (hi & 0xFFFF) << 16) + (lo & 0xFFFF);
-
-    crc = ImagingCRC32(crc, (unsigned char *)buffer, bytes);
-
-    return Py_BuildValue("ii", (crc >> 16) & 0xFFFF, crc & 0xFFFF);
-}
-
-static PyObject* 
-_getcodecstatus(PyObject* self, PyObject* args)
-{
-    int status;
-    char* msg;
-
-    if (!PyArg_ParseTuple(args, "i", &status))
-	return NULL;
-
-    switch (status) {
-    case IMAGING_CODEC_OVERRUN:
-	msg = "buffer overrun."; break;
-    case IMAGING_CODEC_BROKEN:
-	msg = "broken data stream."; break;
-    case IMAGING_CODEC_UNKNOWN:
-	msg = "unrecognized data stream contents."; break;
-    case IMAGING_CODEC_CONFIG:
-	msg = "codec configuration error."; break;
-    case IMAGING_CODEC_MEMORY:
-	msg = "out of memory."; break;
-    default:
-	Py_INCREF(Py_None);
-	return Py_None;
-    }
-
-    return PyString_FromString(msg);
-}
-
-/* -------------------------------------------------------------------- */
-/* DEBUGGING HELPERS							*/
-/* -------------------------------------------------------------------- */
-
-
-#ifdef WITH_DEBUG
-
-static PyObject* 
-_save_ppm(ImagingObject* self, PyObject* args)
-{
-    char* filename;
-
-    if (!PyArg_ParseTuple(args, "s", &filename))
-	return NULL;
-
-    if (!ImagingSavePPM(self->image, filename))
-        return NULL;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-#endif
-
-/* -------------------------------------------------------------------- */
-
-/* methods */
-
-static struct PyMethodDef methods[] = {
-
-    /* Put commonly used methods first */
-    {"getpixel", (PyCFunction)_getpixel, 1},
-    {"putpixel", (PyCFunction)_putpixel, 1},
-
-    {"pixel_access", (PyCFunction)pixel_access_new, 1},
-
-    /* Standard processing methods (Image) */
-    {"convert", (PyCFunction)_convert, 1},
-    {"convert2", (PyCFunction)_convert2, 1},
-    {"convert_matrix", (PyCFunction)_convert_matrix, 1},
-    {"copy", (PyCFunction)_copy, 1},
-    {"copy2", (PyCFunction)_copy2, 1},
-#ifdef WITH_CRACKCODE
-    {"crackcode", (PyCFunction)_crackcode, 1},
-#endif
-    {"crop", (PyCFunction)_crop, 1},
-    {"expand", (PyCFunction)_expand, 1},
-    {"filter", (PyCFunction)_filter, 1},
-    {"histogram", (PyCFunction)_histogram, 1},
-#ifdef WITH_MODEFILTER
-    {"modefilter", (PyCFunction)_modefilter, 1},
-#endif
-    {"offset", (PyCFunction)_offset, 1},
-    {"paste", (PyCFunction)_paste, 1},
-    {"point", (PyCFunction)_point, 1},
-    {"point_transform", (PyCFunction)_point_transform, 1},
-    {"putdata", (PyCFunction)_putdata, 1},
-#ifdef WITH_QUANTIZE
-    {"quantize", (PyCFunction)_quantize, 1},
-#endif
-#ifdef WITH_RANKFILTER
-    {"rankfilter", (PyCFunction)_rankfilter, 1},
-#endif
-    {"resize", (PyCFunction)_resize, 1},
-    {"rotate", (PyCFunction)_rotate, 1},
-    {"stretch", (PyCFunction)_stretch, 1},
-    {"transpose", (PyCFunction)_transpose, 1},
-    {"transform2", (PyCFunction)_transform2, 1},
-
-    {"isblock", (PyCFunction)_isblock, 1},
-
-    {"getbbox", (PyCFunction)_getbbox, 1},
-    {"getcolors", (PyCFunction)_getcolors, 1},
-    {"getextrema", (PyCFunction)_getextrema, 1},
-    {"getprojection", (PyCFunction)_getprojection, 1},
-
-    {"getband", (PyCFunction)_getband, 1},
-    {"putband", (PyCFunction)_putband, 1},
-    {"fillband", (PyCFunction)_fillband, 1},
-
-    {"setmode", (PyCFunction)im_setmode, 1},
-    
-    {"getpalette", (PyCFunction)_getpalette, 1},
-    {"putpalette", (PyCFunction)_putpalette, 1},
-    {"putpalettealpha", (PyCFunction)_putpalettealpha, 1},
-
-#ifdef WITH_IMAGECHOPS
-    /* Channel operations (ImageChops) */
-    {"chop_invert", (PyCFunction)_chop_invert, 1},
-    {"chop_lighter", (PyCFunction)_chop_lighter, 1},
-    {"chop_darker", (PyCFunction)_chop_darker, 1},
-    {"chop_difference", (PyCFunction)_chop_difference, 1},
-    {"chop_multiply", (PyCFunction)_chop_multiply, 1},
-    {"chop_screen", (PyCFunction)_chop_screen, 1},
-    {"chop_add", (PyCFunction)_chop_add, 1},
-    {"chop_subtract", (PyCFunction)_chop_subtract, 1},
-    {"chop_add_modulo", (PyCFunction)_chop_add_modulo, 1},
-    {"chop_subtract_modulo", (PyCFunction)_chop_subtract_modulo, 1},
-    {"chop_and", (PyCFunction)_chop_and, 1},
-    {"chop_or", (PyCFunction)_chop_or, 1},
-    {"chop_xor", (PyCFunction)_chop_xor, 1},
-#endif
-
-#ifdef WITH_EFFECTS
-    /* Special effects */
-    {"effect_spread", (PyCFunction)_effect_spread, 1},
-#endif
-
-    /* Misc. */
-    {"new_array", (PyCFunction)_new_array, 1},
-    {"new_block", (PyCFunction)_new_block, 1},
-
-#ifdef WITH_DEBUG
-    {"save_ppm", (PyCFunction)_save_ppm, 1},
-#endif
-
-    {NULL, NULL} /* sentinel */
-};
-
-
-/* attributes */
-
-static PyObject*  
-_getattr(ImagingObject* self, char* name)
-{
-    PyObject* res;
-
-    res = Py_FindMethod(methods, (PyObject*) self, name);
-    if (res)
-	return res;
-    PyErr_Clear();
-    if (strcmp(name, "mode") == 0)
-	return PyString_FromString(self->image->mode);
-    if (strcmp(name, "size") == 0)
-	return Py_BuildValue("ii", self->image->xsize, self->image->ysize);
-    if (strcmp(name, "bands") == 0)
-	return PyInt_FromLong(self->image->bands);
-    if (strcmp(name, "id") == 0)
-	return PyInt_FromLong((long) self->image);
-    if (strcmp(name, "ptr") == 0)
-        return PyCObject_FromVoidPtrAndDesc(self->image, IMAGING_MAGIC, NULL);
-    PyErr_SetString(PyExc_AttributeError, name);
-    return NULL;
-}
-
-
-/* basic sequence semantics */
-
-static int
-image_length(ImagingObject *self)
-{
-    Imaging im = self->image;
-
-    return im->xsize * im->ysize;
-}
-
-static PyObject *
-image_item(ImagingObject *self, int i)
-{
-    int x, y;
-    Imaging im = self->image;
-
-    if (im->xsize > 0) {
-        x = i % im->xsize;
-        y = i / im->xsize;
-    } else
-        x = y = 0; /* leave it to getpixel to raise an exception */
-
-    return getpixel(im, x, y);
-}
-
-static PySequenceMethods image_as_sequence = {
-    (inquiry)image_length, /*sq_length*/
-    (binaryfunc)0, /*sq_concat*/
-    (ssizeargfunc)0, /*sq_repeat*/
-    (ssizeargfunc)image_item, /*sq_item*/
-    (ssizessizeargfunc)0, /*sq_slice*/
-    (ssizeobjargproc)0, /*sq_ass_item*/
-    (ssizessizeobjargproc)0, /*sq_ass_slice*/
-};
-
-
-/* type description */
-
-statichere PyTypeObject Imaging_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,				/*ob_size*/
-    "ImagingCore",		/*tp_name*/
-    sizeof(ImagingObject),	/*tp_size*/
-    0,				/*tp_itemsize*/
-    /* methods */
-    (destructor)_dealloc,	/*tp_dealloc*/
-    0,				/*tp_print*/
-    (getattrfunc)_getattr,	/*tp_getattr*/
-    0,				/*tp_setattr*/
-    0,				/*tp_compare*/
-    0,				/*tp_repr*/
-    0,                          /*tp_as_number */
-    &image_as_sequence,         /*tp_as_sequence */
-    0,                          /*tp_as_mapping */
-    0                           /*tp_hash*/
-};
-
-#ifdef WITH_IMAGEDRAW
-
-statichere PyTypeObject ImagingFont_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,				/*ob_size*/
-    "ImagingFont",		/*tp_name*/
-    sizeof(ImagingFontObject),	/*tp_size*/
-    0,				/*tp_itemsize*/
-    /* methods */
-    (destructor)_font_dealloc,	/*tp_dealloc*/
-    0,				/*tp_print*/
-    (getattrfunc)_font_getattr,	/*tp_getattr*/
-};
-
-statichere PyTypeObject ImagingDraw_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,				/*ob_size*/
-    "ImagingDraw",		/*tp_name*/
-    sizeof(ImagingDrawObject),	/*tp_size*/
-    0,				/*tp_itemsize*/
-    /* methods */
-    (destructor)_draw_dealloc,	/*tp_dealloc*/
-    0,				/*tp_print*/
-    (getattrfunc)_draw_getattr,	/*tp_getattr*/
-};
-
-#endif
-
-static PyMappingMethods pixel_access_as_mapping = {
-    (inquiry)0, /*mp_length*/
-    (binaryfunc)pixel_access_getitem, /*mp_subscript*/
-    (objobjargproc)pixel_access_setitem, /*mp_ass_subscript*/
-};
-
-/* type description */
-
-statichere PyTypeObject PixelAccess_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0, "PixelAccess", sizeof(PixelAccessObject), 0,
-    /* methods */
-    (destructor)pixel_access_dealloc, /*tp_dealloc*/
-    0, /*tp_print*/
-    0, /*tp_getattr*/
-    0, /*tp_setattr*/
-    0, /*tp_compare*/
-    0, /*tp_repr*/
-    0, /*tp_as_number */
-    0, /*tp_as_sequence */
-    &pixel_access_as_mapping, /*tp_as_mapping */
-    0 /*tp_hash*/
-};
-
-/* -------------------------------------------------------------------- */
-
-/* FIXME: this is something of a mess.  Should replace this with
-   pluggable codecs, but not before PIL 1.1 */
-
-/* Decoders (in decode.c) */
-extern PyObject* PyImaging_BitDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_FliDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_GifDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_HexDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_JpegDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_TiffLzwDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_MspDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_PackbitsDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_PcdDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_PcxDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_RawDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_SunRleDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_TgaRleDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_XbmDecoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_ZipDecoderNew(PyObject* self, PyObject* args);
-
-/* Encoders (in encode.c) */
-extern PyObject* PyImaging_EpsEncoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_GifEncoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_JpegEncoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_PcxEncoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_RawEncoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_XbmEncoderNew(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_ZipEncoderNew(PyObject* self, PyObject* args);
-
-/* Display support (in display.c) */
-#ifdef WIN32
-extern PyObject* PyImaging_CreateWindowWin32(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_DisplayWin32(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_DisplayModeWin32(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_GrabScreenWin32(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_GrabClipboardWin32(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_ListWindowsWin32(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_EventLoopWin32(PyObject* self, PyObject* args);
-#endif
-
-/* Experimental path stuff (in path.c) */
-extern PyObject* PyPath_Create(ImagingObject* self, PyObject* args);
-
-/* Experimental outline stuff (in outline.c) */
-extern PyObject* PyOutline_Create(ImagingObject* self, PyObject* args);
-
-extern PyObject* PyImaging_Mapper(PyObject* self, PyObject* args);
-extern PyObject* PyImaging_MapBuffer(PyObject* self, PyObject* args);
-
-static PyMethodDef functions[] = {
-
-    /* Object factories */
-    {"blend", (PyCFunction)_blend, 1},
-    {"fill", (PyCFunction)_fill, 1},
-    {"new", (PyCFunction)_new, 1},
-
-    {"getcount", (PyCFunction)_getcount, 1},
-
-    /* Functions */
-    {"convert", (PyCFunction)_convert2, 1},
-    {"copy", (PyCFunction)_copy2, 1},
-
-    /* Codecs */
-    {"bit_decoder", (PyCFunction)PyImaging_BitDecoderNew, 1},
-    {"eps_encoder", (PyCFunction)PyImaging_EpsEncoderNew, 1},
-    {"fli_decoder", (PyCFunction)PyImaging_FliDecoderNew, 1},
-    {"gif_decoder", (PyCFunction)PyImaging_GifDecoderNew, 1},
-    {"gif_encoder", (PyCFunction)PyImaging_GifEncoderNew, 1},
-    {"hex_decoder", (PyCFunction)PyImaging_HexDecoderNew, 1},
-    {"hex_encoder", (PyCFunction)PyImaging_EpsEncoderNew, 1}, /* EPS=HEX! */
-#ifdef HAVE_LIBJPEG
-    {"jpeg_decoder", (PyCFunction)PyImaging_JpegDecoderNew, 1},
-    {"jpeg_encoder", (PyCFunction)PyImaging_JpegEncoderNew, 1},
-#endif
-    {"tiff_lzw_decoder", (PyCFunction)PyImaging_TiffLzwDecoderNew, 1},
-    {"msp_decoder", (PyCFunction)PyImaging_MspDecoderNew, 1},
-    {"packbits_decoder", (PyCFunction)PyImaging_PackbitsDecoderNew, 1},
-    {"pcd_decoder", (PyCFunction)PyImaging_PcdDecoderNew, 1},
-    {"pcx_decoder", (PyCFunction)PyImaging_PcxDecoderNew, 1},
-    {"pcx_encoder", (PyCFunction)PyImaging_PcxEncoderNew, 1},
-    {"raw_decoder", (PyCFunction)PyImaging_RawDecoderNew, 1},
-    {"raw_encoder", (PyCFunction)PyImaging_RawEncoderNew, 1},
-    {"sun_rle_decoder", (PyCFunction)PyImaging_SunRleDecoderNew, 1},
-    {"tga_rle_decoder", (PyCFunction)PyImaging_TgaRleDecoderNew, 1},
-    {"xbm_decoder", (PyCFunction)PyImaging_XbmDecoderNew, 1},
-    {"xbm_encoder", (PyCFunction)PyImaging_XbmEncoderNew, 1},
-#ifdef HAVE_LIBZ
-    {"zip_decoder", (PyCFunction)PyImaging_ZipDecoderNew, 1},
-    {"zip_encoder", (PyCFunction)PyImaging_ZipEncoderNew, 1},
-#endif
-
-    /* Memory mapping */
-#ifdef WITH_MAPPING
-#ifdef WIN32
-    {"map", (PyCFunction)PyImaging_Mapper, 1},
-#endif
-    {"map_buffer", (PyCFunction)PyImaging_MapBuffer, 1},
-#endif
-
-    /* Display support */
-#ifdef WIN32
-    {"display", (PyCFunction)PyImaging_DisplayWin32, 1},
-    {"display_mode", (PyCFunction)PyImaging_DisplayModeWin32, 1},
-    {"grabscreen", (PyCFunction)PyImaging_GrabScreenWin32, 1},
-    {"grabclipboard", (PyCFunction)PyImaging_GrabClipboardWin32, 1},
-    {"createwindow", (PyCFunction)PyImaging_CreateWindowWin32, 1},
-    {"eventloop", (PyCFunction)PyImaging_EventLoopWin32, 1},
-    {"listwindows", (PyCFunction)PyImaging_ListWindowsWin32, 1},
-#endif
-
-    /* Utilities */
-    {"crc32", (PyCFunction)_crc32, 1},
-    {"getcodecstatus", (PyCFunction)_getcodecstatus, 1},
-
-    /* Debugging stuff */
-    {"open_ppm", (PyCFunction)_open_ppm, 1},
-
-    /* Special effects (experimental) */
-#ifdef WITH_EFFECTS
-    {"effect_mandelbrot", (PyCFunction)_effect_mandelbrot, 1},
-    {"effect_noise", (PyCFunction)_effect_noise, 1},
-    {"linear_gradient", (PyCFunction)_linear_gradient, 1},
-    {"radial_gradient", (PyCFunction)_radial_gradient, 1},
-    {"wedge", (PyCFunction)_linear_gradient, 1}, /* Compatibility */
-#endif
-
-    /* Drawing support stuff */
-#ifdef WITH_IMAGEDRAW
-    {"font", (PyCFunction)_font_new, 1},
-    {"draw", (PyCFunction)_draw_new, 1},
-#endif
-
-    /* Experimental path stuff */
-#ifdef WITH_IMAGEPATH
-    {"path", (PyCFunction)PyPath_Create, 1},
-#endif
-    
-    /* Experimental arrow graphics stuff */
-#ifdef WITH_ARROW
-    {"outline", (PyCFunction)PyOutline_Create, 1},
-#endif
-
-    {NULL, NULL} /* sentinel */
-};
-
-DL_EXPORT(void)
-init_imaging(void)
-{
-    /* Patch object type */
-    Imaging_Type.ob_type = &PyType_Type;
-#ifdef WITH_IMAGEDRAW
-    ImagingFont_Type.ob_type = &PyType_Type;
-    ImagingDraw_Type.ob_type = &PyType_Type;
-#endif
-    PixelAccess_Type.ob_type = &PyType_Type;
-
-    Py_InitModule("_imaging", functions);
-}
diff --git a/pythonPackages/pil/_imagingft.c b/pythonPackages/pil/_imagingft.c
deleted file mode 100644
index 9ab8470c59..0000000000
--- a/pythonPackages/pil/_imagingft.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- * PIL FreeType Driver
- * $Id: _imagingft.c 2756 2006-06-19 06:07:18Z fredrik $
- *
- * a FreeType 2.X driver for PIL
- *
- * history:
- * 2001-02-17 fl  Created (based on old experimental freetype 1.0 code)
- * 2001-04-18 fl  Fixed some egcs compiler nits
- * 2002-11-08 fl  Added unicode support; more font metrics, etc
- * 2003-05-20 fl  Fixed compilation under 1.5.2 and newer non-unicode builds
- * 2003-09-27 fl  Added charmap encoding support
- * 2004-05-15 fl  Fixed compilation for FreeType 2.1.8
- * 2004-09-10 fl  Added support for monochrome bitmaps
- * 2006-06-18 fl  Fixed glyph bearing calculation
- *
- * Copyright (c) 1998-2006 by Secret Labs AB
- */
-
-#include "Python.h"
-#include "Imaging.h"
-
-#ifndef USE_FREETYPE_2_0
-/* undef/comment out to use freetype 2.0 */
-#define USE_FREETYPE_2_1
-#endif
-
-#if defined(USE_FREETYPE_2_1)
-/* freetype 2.1 and newer */
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#else
-/* freetype 2.0 */
-#include <freetype/freetype.h>
-#endif
-
-#if PY_VERSION_HEX < 0x01060000
-#define PyObject_New PyObject_NEW
-#define PyObject_Del PyMem_DEL
-#endif
-
-#if PY_VERSION_HEX >= 0x01060000
-#if PY_VERSION_HEX  < 0x02020000 || defined(Py_USING_UNICODE)
-/* defining this enables unicode support (default under 1.6a1 and later) */
-#define HAVE_UNICODE
-#endif
-#endif
-
-#ifndef FT_LOAD_TARGET_MONO
-#define FT_LOAD_TARGET_MONO  FT_LOAD_MONOCHROME
-#endif
-
-/* -------------------------------------------------------------------- */
-/* error table */
-
-#undef FTERRORS_H
-#undef __FTERRORS_H__
-
-#define FT_ERRORDEF( e, v, s )  { e, s },
-#define FT_ERROR_START_LIST  {
-#define FT_ERROR_END_LIST    { 0, 0 } };
-
-struct {
-    int code;
-    const char* message;
-} ft_errors[] =
-
-#include <freetype/fterrors.h>
-
-/* -------------------------------------------------------------------- */
-/* font objects */
-
-static FT_Library library;
-
-typedef struct {
-    PyObject_HEAD
-    FT_Face face;
-} FontObject;
-
-staticforward PyTypeObject Font_Type;
-
-/* round a 26.6 pixel coordinate to the nearest larger integer */
-#define PIXEL(x) ((((x)+63) & -64)>>6)
-
-static PyObject*
-geterror(int code)
-{
-    int i;
-
-    for (i = 0; ft_errors[i].message; i++)
-        if (ft_errors[i].code == code) {
-            PyErr_SetString(PyExc_IOError, ft_errors[i].message);
-            return NULL;
-        }
-
-    PyErr_SetString(PyExc_IOError, "unknown freetype error");
-    return NULL;
-}
-
-static PyObject*
-getfont(PyObject* self_, PyObject* args, PyObject* kw)
-{
-    /* create a font object from a file name and a size (in pixels) */
-
-    FontObject* self;
-    int error;
-
-    char* filename;
-    int size;
-    int index = 0;
-    unsigned char* encoding = NULL;
-    static char* kwlist[] = {
-        "filename", "size", "index", "encoding", NULL
-    };
-    if (!PyArg_ParseTupleAndKeywords(args, kw, "si|is", kwlist,
-                                     &filename, &size, &index, &encoding))
-        return NULL;
-
-    if (!library && FT_Init_FreeType(&library)) {
-        PyErr_SetString(
-            PyExc_IOError,
-            "cannot initialize FreeType library"
-            );
-        return NULL;
-    }
-
-    self = PyObject_New(FontObject, &Font_Type);
-    if (!self)
-        return NULL;
-
-    error = FT_New_Face(library, filename, index, &self->face);
-
-    if (!error)
-        error = FT_Set_Pixel_Sizes(self->face, 0, size);
-
-    if (!error && encoding && strlen((char*) encoding) == 4) {
-        FT_Encoding encoding_tag = FT_MAKE_TAG(
-            encoding[0], encoding[1], encoding[2], encoding[3]
-            );
-        error = FT_Select_Charmap(self->face, encoding_tag);
-    }
-
-    if (error) {
-        PyObject_Del(self);
-        return geterror(error);
-    }
-
-    return (PyObject*) self;
-}
-    
-static int
-font_getchar(PyObject* string, int index, FT_ULong* char_out)
-{
-#if defined(HAVE_UNICODE)
-    if (PyUnicode_Check(string)) {
-        Py_UNICODE* p = PyUnicode_AS_UNICODE(string);
-        int size = PyUnicode_GET_SIZE(string);
-        if (index >= size)
-            return 0;
-        *char_out = p[index];
-        return 1;
-    }
-#endif
-    if (PyString_Check(string)) {
-        unsigned char* p = (unsigned char*) PyString_AS_STRING(string);
-        int size = PyString_GET_SIZE(string);
-        if (index >= size)
-            return 0;
-        *char_out = (unsigned char) p[index];
-        return 1;
-    }
-    return 0;
-}
-
-static PyObject*
-font_getsize(FontObject* self, PyObject* args)
-{
-    int i, x;
-    FT_ULong ch;
-    FT_Face face;
-    int xoffset;
-    FT_Bool kerning = FT_HAS_KERNING(self->face);
-    FT_UInt last_index = 0;
-
-    /* calculate size and bearing for a given string */
-
-    PyObject* string;
-    if (!PyArg_ParseTuple(args, "O:getsize", &string))
-        return NULL;
-
-#if defined(HAVE_UNICODE)
-    if (!PyUnicode_Check(string) && !PyString_Check(string)) {
-#else
-    if (!PyString_Check(string)) {
-#endif
-        PyErr_SetString(PyExc_TypeError, "expected string");
-        return NULL;
-    }
-
-    face = NULL;
-    xoffset = 0;
-
-    for (x = i = 0; font_getchar(string, i, &ch); i++) {
-        int index, error;
-        face = self->face;
-        index = FT_Get_Char_Index(face, ch);
-        if (kerning && last_index && index) {
-            FT_Vector delta;
-            FT_Get_Kerning(self->face, last_index, index, ft_kerning_default,
-                           &delta);
-            x += delta.x;
-        }
-        error = FT_Load_Glyph(face, index, FT_LOAD_DEFAULT);
-        if (error)
-            return geterror(error);
-        if (i == 0)
-            xoffset = face->glyph->metrics.horiBearingX;
-        x += face->glyph->metrics.horiAdvance;
-        last_index = index;
-    }
-
-    if (face) {
-        int offset;
-        /* left bearing */
-        if (xoffset < 0)
-            x -= xoffset;
-        else
-            xoffset = 0;
-        /* right bearing */
-        offset = face->glyph->metrics.horiAdvance -
-            face->glyph->metrics.width -
-            face->glyph->metrics.horiBearingX;
-        if (offset < 0)
-            x -= offset;
-    }
-
-    return Py_BuildValue(
-        "(ii)(ii)",
-        PIXEL(x), PIXEL(self->face->size->metrics.height),
-        PIXEL(xoffset), 0
-        );
-}
-
-static PyObject*
-font_getabc(FontObject* self, PyObject* args)
-{
-    FT_ULong ch;
-    FT_Face face;
-    double a, b, c;
-
-    /* calculate ABC values for a given string */
-
-    PyObject* string;
-    if (!PyArg_ParseTuple(args, "O:getabc", &string))
-        return NULL;
-
-#if defined(HAVE_UNICODE)
-    if (!PyUnicode_Check(string) && !PyString_Check(string)) {
-#else
-    if (!PyString_Check(string)) {
-#endif
-        PyErr_SetString(PyExc_TypeError, "expected string");
-        return NULL;
-    }
-
-    if (font_getchar(string, 0, &ch)) {
-        int index, error;
-        face = self->face;
-        index = FT_Get_Char_Index(face, ch);
-        error = FT_Load_Glyph(face, index, FT_LOAD_DEFAULT);
-        if (error)
-            return geterror(error);
-        a = face->glyph->metrics.horiBearingX / 64.0;
-        b = face->glyph->metrics.width / 64.0;
-        c = (face->glyph->metrics.horiAdvance - 
-             face->glyph->metrics.horiBearingX -
-             face->glyph->metrics.width) / 64.0;
-    } else
-        a = b = c = 0.0;
-
-    return Py_BuildValue("ddd", a, b, c);
-}
-
-static PyObject*
-font_render(FontObject* self, PyObject* args)
-{
-    int i, x, y;
-    Imaging im;
-    int index, error, ascender;
-    int load_flags;
-    unsigned char *source;
-    FT_ULong ch;
-    FT_GlyphSlot glyph;
-    FT_Bool kerning = FT_HAS_KERNING(self->face);
-    FT_UInt last_index = 0;
-
-    /* render string into given buffer (the buffer *must* have
-       the right size, or this will crash) */
-    PyObject* string;
-    long id;
-    int mask = 0;
-    if (!PyArg_ParseTuple(args, "Ol|i:render", &string, &id, &mask))
-        return NULL;
-
-#if defined(HAVE_UNICODE)
-    if (!PyUnicode_Check(string) && !PyString_Check(string)) {
-#else
-    if (!PyString_Check(string)) {
-#endif
-        PyErr_SetString(PyExc_TypeError, "expected string");
-        return NULL;
-    }
-
-    im = (Imaging) id;
-
-    load_flags = FT_LOAD_RENDER;
-    if (mask)
-        load_flags |= FT_LOAD_TARGET_MONO;
-
-    for (x = i = 0; font_getchar(string, i, &ch); i++) {
-        if (i == 0 && self->face->glyph->metrics.horiBearingX < 0)
-            x = PIXEL(self->face->glyph->metrics.horiBearingX);
-        index = FT_Get_Char_Index(self->face, ch);
-        if (kerning && last_index && index) {
-            FT_Vector delta;
-            FT_Get_Kerning(self->face, last_index, index, ft_kerning_default,
-                           &delta);
-            x += delta.x >> 6;
-        }
-        error = FT_Load_Glyph(self->face, index, load_flags);
-        if (error)
-            return geterror(error);
-        glyph = self->face->glyph;
-        if (mask) {
-            /* use monochrome mask (on palette images, etc) */
-            int xx, x0, x1;
-            source = (unsigned char*) glyph->bitmap.buffer;
-            ascender = PIXEL(self->face->size->metrics.ascender);
-            xx = x + glyph->bitmap_left;
-            x0 = 0;
-            x1 = glyph->bitmap.width;
-            if (xx < 0)
-                x0 = -xx;
-            if (xx + x1 > im->xsize)
-                x1 = im->xsize - xx;
-            for (y = 0; y < glyph->bitmap.rows; y++) {
-                int yy = y + ascender - glyph->bitmap_top;
-                if (yy >= 0 && yy < im->ysize) {
-                    /* blend this glyph into the buffer */
-                    unsigned char *target = im->image8[yy] + xx;
-                    int i, j, m = 128;
-                    for (i = j = 0; j < x1; j++) {
-                        if (j >= x0 && (source[i] & m))
-                            target[j] = 255;
-                        if (!(m >>= 1)) {
-                            m = 128;
-                            i++;
-                        }
-                    }
-                }
-                source += glyph->bitmap.pitch;
-            }
-        } else {
-            /* use antialiased rendering */
-            int xx, x0, x1;
-            source = (unsigned char*) glyph->bitmap.buffer;
-            ascender = PIXEL(self->face->size->metrics.ascender);
-            xx = x + glyph->bitmap_left;
-            x0 = 0;
-            x1 = glyph->bitmap.width;
-            if (xx < 0)
-                x0 = -xx;
-            if (xx + x1 > im->xsize)
-                x1 = im->xsize - xx;
-            for (y = 0; y < glyph->bitmap.rows; y++) {
-                int yy = y + ascender - glyph->bitmap_top;
-                if (yy >= 0 && yy < im->ysize) {
-                    /* blend this glyph into the buffer */
-                    int i;
-                    unsigned char *target = im->image8[yy] + xx;
-                    for (i = x0; i < x1; i++) {
-                        if (target[i] < source[i])
-                            target[i] = source[i];
-                    }
-                }
-                source += glyph->bitmap.pitch;
-            }
-        }
-        x += PIXEL(glyph->metrics.horiAdvance);
-        last_index = index;
-    }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static void
-font_dealloc(FontObject* self)
-{
-    FT_Done_Face(self->face);
-    PyObject_Del(self);
-}
-
-static PyMethodDef font_methods[] = {
-    {"render", (PyCFunction) font_render, METH_VARARGS},
-    {"getsize", (PyCFunction) font_getsize, METH_VARARGS},
-    {"getabc", (PyCFunction) font_getabc, METH_VARARGS},
-    {NULL, NULL}
-};
-
-static PyObject*  
-font_getattr(FontObject* self, char* name)
-{
-    PyObject* res;
-
-    res = Py_FindMethod(font_methods, (PyObject*) self, name);
-
-    if (res)
-        return res;
-
-    PyErr_Clear();
-
-    /* attributes */
-    if (!strcmp(name, "family"))
-        return PyString_FromString(self->face->family_name);
-    if (!strcmp(name, "style"))
-        return PyString_FromString(self->face->style_name);
-
-    if (!strcmp(name, "ascent"))
-        return PyInt_FromLong(PIXEL(self->face->size->metrics.ascender));
-    if (!strcmp(name, "descent"))
-        return PyInt_FromLong(-PIXEL(self->face->size->metrics.descender));
-
-    if (!strcmp(name, "glyphs"))
-        /* number of glyphs provided by this font */
-        return PyInt_FromLong(self->face->num_glyphs);
-
-    PyErr_SetString(PyExc_AttributeError, name);
-    return NULL;
-}
-
-statichere PyTypeObject Font_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0, "Font", sizeof(FontObject), 0,
-    /* methods */
-    (destructor)font_dealloc, /* tp_dealloc */
-    0, /* tp_print */
-    (getattrfunc)font_getattr, /* tp_getattr */
-};
-
-static PyMethodDef _functions[] = {
-    {"getfont", (PyCFunction) getfont, METH_VARARGS|METH_KEYWORDS},
-    {NULL, NULL}
-};
-
-DL_EXPORT(void)
-init_imagingft(void)
-{
-    /* Patch object type */
-    Font_Type.ob_type = &PyType_Type;
-
-    Py_InitModule("_imagingft", _functions);
-}
diff --git a/pythonPackages/pil/_imagingmath.c b/pythonPackages/pil/_imagingmath.c
deleted file mode 100644
index fdc5781083..0000000000
--- a/pythonPackages/pil/_imagingmath.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: _imagingmath.c 2396 2005-05-07 09:17:22Z Fredrik $
- *
- * a simple math add-on for the Python Imaging Library
- *
- * history:
- * 1999-02-15 fl   Created
- * 2005-05-05 fl   Simplified and cleaned up for PIL 1.1.6
- *
- * Copyright (c) 1999-2005 by Secret Labs AB
- * Copyright (c) 2005 by Fredrik Lundh
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Python.h"
-
-#include "Imaging.h"
-
-#include "math.h"
-#include "float.h"
-
-#define UNOP(name, op, type)\
-void name(Imaging out, Imaging im1)\
-{\
-    int x, y;\
-    for (y = 0; y < out->ysize; y++) {\
-        type* p0 = (type*) out->image[y];\
-        type* p1 = (type*) im1->image[y];\
-        for (x = 0; x < out->xsize; x++) {\
-            *p0 = op(type, *p1);\
-            p0++; p1++;\
-        }\
-    }\
-}
-
-#define BINOP(name, op, type)\
-void name(Imaging out, Imaging im1, Imaging im2)\
-{\
-    int x, y;\
-    for (y = 0; y < out->ysize; y++) {\
-        type* p0 = (type*) out->image[y];\
-        type* p1 = (type*) im1->image[y];\
-        type* p2 = (type*) im2->image[y];\
-        for (x = 0; x < out->xsize; x++) {\
-            *p0 = op(type, *p1, *p2);\
-            p0++; p1++; p2++;\
-        }\
-    }\
-}
-
-#define NEG(type, v1) -(v1)
-#define INVERT(type, v1) ~(v1)
-
-#define ADD(type, v1, v2) (v1)+(v2)
-#define SUB(type, v1, v2) (v1)-(v2)
-#define MUL(type, v1, v2) (v1)*(v2)
-
-#define MIN(type, v1, v2) ((v1)<(v2))?(v1):(v2)
-#define MAX(type, v1, v2) ((v1)>(v2))?(v1):(v2)
-
-#define AND(type, v1, v2) (v1)&(v2)
-#define OR(type, v1, v2) (v1)|(v2)
-#define XOR(type, v1, v2) (v1)^(v2)
-#define LSHIFT(type, v1, v2) (v1)<<(v2)
-#define RSHIFT(type, v1, v2) (v1)>>(v2)
-
-#define ABS_I(type, v1) abs((v1))
-#define ABS_F(type, v1) fabs((v1))
-
-/* --------------------------------------------------------------------
- * some day, we should add FPE protection mechanisms.  see pyfpe.h for
- * details.
- *   
- * PyFPE_START_PROTECT("Error in foobar", return 0)
- * PyFPE_END_PROTECT(result)
- */
-
-#define DIV_I(type, v1, v2) ((v2)!=0)?(v1)/(v2):0
-#define DIV_F(type, v1, v2) ((v2)!=0.0F)?(v1)/(v2):0.0F
-
-#define MOD_I(type, v1, v2) ((v2)!=0)?(v1)%(v2):0
-#define MOD_F(type, v1, v2) ((v2)!=0.0F)?fmod((v1),(v2)):0.0F
-
-#define DIFF_I(type, v1, v2) abs((v1)-(v2))
-#define DIFF_F(type, v1, v2) fabs((v1)-(v2))
-
-#define EQ(type, v1, v2) (v1)==(v2)
-#define NE(type, v1, v2) (v1)!=(v2)
-#define LT(type, v1, v2) (v1)<(v2)
-#define LE(type, v1, v2) (v1)<=(v2)
-#define GT(type, v1, v2) (v1)>(v2)
-#define GE(type, v1, v2) (v1)>=(v2)
-
-UNOP(abs_I, ABS_I, INT32)
-UNOP(neg_I, NEG, INT32)
-
-BINOP(add_I, ADD, INT32)
-BINOP(sub_I, SUB, INT32)
-BINOP(mul_I, MUL, INT32)
-BINOP(div_I, DIV_I, INT32)
-BINOP(mod_I, MOD_I, INT32)
-BINOP(diff_I, DIFF_I, INT32)
-
-UNOP(invert_I, INVERT, INT32)
-BINOP(and_I, AND, INT32)
-BINOP(or_I, OR, INT32)
-BINOP(xor_I, XOR, INT32)
-BINOP(lshift_I, LSHIFT, INT32)
-BINOP(rshift_I, RSHIFT, INT32)
-
-BINOP(min_I, MIN, INT32)
-BINOP(max_I, MAX, INT32)
-
-BINOP(eq_I, EQ, INT32)
-BINOP(ne_I, NE, INT32)
-BINOP(lt_I, LT, INT32)
-BINOP(le_I, LE, INT32)
-BINOP(gt_I, GT, INT32)
-BINOP(ge_I, GE, INT32)
-
-UNOP(abs_F, ABS_F, FLOAT32)
-UNOP(neg_F, NEG, FLOAT32)
-
-BINOP(add_F, ADD, FLOAT32)
-BINOP(sub_F, SUB, FLOAT32)
-BINOP(mul_F, MUL, FLOAT32)
-BINOP(div_F, DIV_F, FLOAT32)
-BINOP(mod_F, MOD_F, FLOAT32)
-BINOP(diff_F, DIFF_F, FLOAT32)
-
-BINOP(min_F, MIN, FLOAT32)
-BINOP(max_F, MAX, FLOAT32)
-
-BINOP(eq_F, EQ, FLOAT32)
-BINOP(ne_F, NE, FLOAT32)
-BINOP(lt_F, LT, FLOAT32)
-BINOP(le_F, LE, FLOAT32)
-BINOP(gt_F, GT, FLOAT32)
-BINOP(ge_F, GE, FLOAT32)
-
-static PyObject *
-_unop(PyObject* self, PyObject* args)
-{
-    Imaging out;
-    Imaging im1;
-    void (*unop)(Imaging, Imaging);
-
-    long op, i0, i1;
-    if (!PyArg_ParseTuple(args, "lll", &op, &i0, &i1))
-        return NULL;
-
-    out = (Imaging) i0;
-    im1 = (Imaging) i1;
-
-    unop = (void*) op;
-    
-    unop(out, im1);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_binop(PyObject* self, PyObject* args)
-{
-    Imaging out;
-    Imaging im1;
-    Imaging im2;
-    void (*binop)(Imaging, Imaging, Imaging);
-
-    long op, i0, i1, i2;
-    if (!PyArg_ParseTuple(args, "llll", &op, &i0, &i1, &i2))
-        return NULL;
-
-    out = (Imaging) i0;
-    im1 = (Imaging) i1;
-    im2 = (Imaging) i2;
-
-    binop = (void*) op;
-    
-    binop(out, im1, im2);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyMethodDef _functions[] = {
-    {"unop", _unop, 1},
-    {"binop", _binop, 1},
-    {NULL, NULL}
-};
-
-static void
-install(PyObject *d, char* name, void* value)
-{
-    PyObject *v = PyInt_FromLong((long) value);
-    if (!v || PyDict_SetItemString(d, name, v))
-        PyErr_Clear();
-    Py_XDECREF(v);
-}
-
-DL_EXPORT(void)
-init_imagingmath(void)
-{
-    PyObject* m;
-    PyObject* d;
-
-    m = Py_InitModule("_imagingmath", _functions);
-    d = PyModule_GetDict(m);
-
-    install(d, "abs_I", abs_I);
-    install(d, "neg_I", neg_I);
-    install(d, "add_I", add_I);
-    install(d, "sub_I", sub_I);
-    install(d, "diff_I", diff_I);
-    install(d, "mul_I", mul_I);
-    install(d, "div_I", div_I);
-    install(d, "mod_I", mod_I);
-    install(d, "min_I", min_I);
-    install(d, "max_I", max_I);
-
-    install(d, "invert_I", invert_I);
-    install(d, "and_I", and_I);
-    install(d, "or_I", or_I);
-    install(d, "xor_I", xor_I);
-    install(d, "lshift_I", lshift_I);
-    install(d, "rshift_I", rshift_I);
-
-    install(d, "eq_I", eq_I);
-    install(d, "ne_I", ne_I);
-    install(d, "lt_I", lt_I);
-    install(d, "le_I", le_I);
-    install(d, "gt_I", gt_I);
-    install(d, "ge_I", ge_I);
-
-    install(d, "abs_F", abs_F);
-    install(d, "neg_F", neg_F);
-    install(d, "add_F", add_F);
-    install(d, "sub_F", sub_F);
-    install(d, "diff_F", diff_F);
-    install(d, "mul_F", mul_F);
-    install(d, "div_F", div_F);
-    install(d, "mod_F", mod_F);
-    install(d, "min_F", min_F);
-    install(d, "max_F", max_F);
-
-    install(d, "eq_F", eq_F);
-    install(d, "ne_F", ne_F);
-    install(d, "lt_F", lt_F);
-    install(d, "le_F", le_F);
-    install(d, "gt_F", gt_F);
-    install(d, "ge_F", ge_F);
-
-}
diff --git a/pythonPackages/pil/_imagingtk.c b/pythonPackages/pil/_imagingtk.c
deleted file mode 100644
index 5e8a94a81b..0000000000
--- a/pythonPackages/pil/_imagingtk.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: _imagingtk.c 1756 2004-03-28 17:15:33Z fredrik $
- *
- * tkinter hooks
- *
- * history:
- * 99-07-26 fl	created
- * 99-08-15 fl	moved to its own support module
- *
- * Copyright (c) Secret Labs AB 1999.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Python.h"
-#include "Imaging.h"
-
-#include "tk.h"
-
-/* must link with Tk/tkImaging.c */
-extern void TkImaging_Init(Tcl_Interp* interp);
-
-/* copied from _tkinter.c (this isn't as bad as it may seem: for new
-   versions, we use _tkinter's interpaddr hook instead, and all older
-   versions use this structure layout) */
-
-typedef struct {
-    PyObject_HEAD
-    Tcl_Interp* interp;
-} TkappObject;
-
-static PyObject* 
-_tkinit(PyObject* self, PyObject* args)
-{
-    Tcl_Interp* interp;
-
-    long arg;
-    int is_interp;
-    if (!PyArg_ParseTuple(args, "li", &arg, &is_interp))
-        return NULL;
-
-    if (is_interp)
-        interp = (Tcl_Interp*) arg;
-    else {
-        TkappObject* app;
-	/* Do it the hard way.  This will break if the TkappObject
-	   layout changes */
-        app = (TkappObject*) arg;
-        interp = app->interp;
-    }
-
-    /* This will bomb if interp is invalid... */
-    TkImaging_Init(interp);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyMethodDef functions[] = {
-    /* Tkinter interface stuff */
-    {"tkinit", (PyCFunction)_tkinit, 1},
-    {NULL, NULL} /* sentinel */
-};
-
-DL_EXPORT(void)
-init_imagingtk(void)
-{
-    Py_InitModule("_imagingtk", functions);
-}
diff --git a/pythonPackages/pil/decode.c b/pythonPackages/pil/decode.c
deleted file mode 100644
index 89d1c3b904..0000000000
--- a/pythonPackages/pil/decode.c
+++ /dev/null
@@ -1,689 +0,0 @@
-/* 
- * The Python Imaging Library.
- * $Id: decode.c 2751 2006-06-18 19:50:45Z fredrik $
- *
- * standard decoder interfaces for the Imaging library
- *
- * history:
- * 1996-03-28 fl   Moved from _imagingmodule.c
- * 1996-04-15 fl   Support subregions in setimage
- * 1996-04-19 fl   Allocate decoder buffer (where appropriate)
- * 1996-05-02 fl   Added jpeg decoder
- * 1996-05-12 fl   Compile cleanly as C++
- * 1996-05-16 fl   Added hex decoder
- * 1996-05-26 fl   Added jpeg configuration parameters
- * 1996-12-14 fl   Added zip decoder
- * 1996-12-30 fl   Plugged potential memory leak for tiled images
- * 1997-01-03 fl   Added fli and msp decoders
- * 1997-01-04 fl   Added sun_rle and tga_rle decoders
- * 1997-05-31 fl   Added bitfield decoder
- * 1998-09-11 fl   Added orientation and pixelsize fields to tga_rle decoder
- * 1998-12-29 fl   Added mode/rawmode argument to decoders
- * 1998-12-30 fl   Added mode argument to *all* decoders
- * 2002-06-09 fl   Added stride argument to pcx decoder
- *
- * Copyright (c) 1997-2002 by Secret Labs AB.
- * Copyright (c) 1995-2002 by Fredrik Lundh.
- *
- * See the README file for information on usage and redistribution.
- */
-
-/* FIXME: make these pluggable! */
-
-#include "Python.h"
-
-#if PY_VERSION_HEX < 0x01060000
-#define PyObject_New PyObject_NEW
-#define PyObject_Del PyMem_DEL
-#endif
-
-#include "Imaging.h"
-
-#include "Gif.h"
-#include "Lzw.h"
-#include "Raw.h"
-#include "Bit.h"
-
-
-/* -------------------------------------------------------------------- */
-/* Common								*/
-/* -------------------------------------------------------------------- */
-
-typedef struct {
-    PyObject_HEAD
-    int (*decode)(Imaging im, ImagingCodecState state,
-		  UINT8* buffer, int bytes);
-    struct ImagingCodecStateInstance state;
-    Imaging im;
-    PyObject* lock;
-} ImagingDecoderObject;
-
-staticforward PyTypeObject ImagingDecoderType;
-
-static ImagingDecoderObject*
-PyImaging_DecoderNew(int contextsize)
-{
-    ImagingDecoderObject *decoder;
-    void *context;
-
-    ImagingDecoderType.ob_type = &PyType_Type;
-
-    decoder = PyObject_New(ImagingDecoderObject, &ImagingDecoderType);
-    if (decoder == NULL)
-	return NULL;
-
-    /* Clear the decoder state */
-    memset(&decoder->state, 0, sizeof(decoder->state));
-
-    /* Allocate decoder context */
-    if (contextsize > 0) {
-	context = (void*) calloc(1, contextsize);
-	if (!context) {
-	    Py_DECREF(decoder);
-	    PyErr_NoMemory();
-	    return NULL;
-	}
-    } else
-	context = 0;
-
-    /* Initialize decoder context */
-    decoder->state.context = context;
-
-    /* Target image */
-    decoder->lock = NULL;
-    decoder->im = NULL;
-
-    return decoder;
-}
-
-static void
-_dealloc(ImagingDecoderObject* decoder)
-{
-    free(decoder->state.buffer);
-    free(decoder->state.context);
-    Py_XDECREF(decoder->lock);
-    PyObject_Del(decoder);
-}
-
-static PyObject* 
-_decode(ImagingDecoderObject* decoder, PyObject* args)
-{
-    UINT8* buffer;
-    int bufsize, status;
-
-    if (!PyArg_ParseTuple(args, "s#", &buffer, &bufsize))
-	return NULL;
-
-    status = decoder->decode(decoder->im, &decoder->state, buffer, bufsize);
-
-    return Py_BuildValue("ii", status, decoder->state.errcode);
-}
-
-extern Imaging PyImaging_AsImaging(PyObject *op);
-
-static PyObject*
-_setimage(ImagingDecoderObject* decoder, PyObject* args)
-{
-    PyObject* op;
-    Imaging im;
-    ImagingCodecState state;
-    int x0, y0, x1, y1;
-
-    x0 = y0 = x1 = y1 = 0;
-
-    /* FIXME: should publish the ImagingType descriptor */
-    if (!PyArg_ParseTuple(args, "O|(iiii)", &op, &x0, &y0, &x1, &y1))
-	return NULL;
-    im = PyImaging_AsImaging(op);
-    if (!im)
-	return NULL;
-
-    decoder->im = im;
-
-    state = &decoder->state;
-
-    /* Setup decoding tile extent */
-    if (x0 == 0 && x1 == 0) {
-	state->xsize = im->xsize;
-	state->ysize = im->ysize;
-    } else {
-	state->xoff = x0;
-	state->yoff = y0;
-	state->xsize = x1 - x0;
-	state->ysize = y1 - y0;
-    }
-
-    if (state->xsize <= 0 ||
-	state->xsize + state->xoff > (int) im->xsize ||
-	state->ysize <= 0 ||
-	state->ysize + state->yoff > (int) im->ysize) {
-	PyErr_SetString(PyExc_ValueError, "tile cannot extend outside image");
-	return NULL;
-    }
-
-    /* Allocate memory buffer (if bits field is set) */
-    if (state->bits > 0) {
-        if (!state->bytes)
-            state->bytes = (state->bits * state->xsize+7)/8;
-	state->buffer = (UINT8*) malloc(state->bytes);
-	if (!state->buffer) {
-	    PyErr_NoMemory();
-	    return NULL;
-	}
-    }
-
-    /* Keep a reference to the image object, to make sure it doesn't
-       go away before we do */
-    Py_INCREF(op);
-    Py_XDECREF(decoder->lock);
-    decoder->lock = op;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static struct PyMethodDef methods[] = {
-    {"decode", (PyCFunction)_decode, 1},
-    {"setimage", (PyCFunction)_setimage, 1},
-    {NULL, NULL} /* sentinel */
-};
-
-static PyObject*  
-_getattr(ImagingDecoderObject* self, char* name)
-{
-    return Py_FindMethod(methods, (PyObject*) self, name);
-}
-
-statichere PyTypeObject ImagingDecoderType = {
-	PyObject_HEAD_INIT(NULL)
-	0,				/*ob_size*/
-	"ImagingDecoder",		/*tp_name*/
-	sizeof(ImagingDecoderObject),	/*tp_size*/
-	0,				/*tp_itemsize*/
-	/* methods */
-	(destructor)_dealloc,		/*tp_dealloc*/
-	0,				/*tp_print*/
-	(getattrfunc)_getattr,		/*tp_getattr*/
-	0,				/*tp_setattr*/
-	0,				/*tp_compare*/
-	0,				/*tp_repr*/
-	0,                              /*tp_hash*/
-};
-
-/* -------------------------------------------------------------------- */
-
-int
-get_unpacker(ImagingDecoderObject* decoder, const char* mode,
-             const char* rawmode)
-{
-    int bits;
-    ImagingShuffler unpack;
-
-    unpack = ImagingFindUnpacker(mode, rawmode, &bits);
-    if (!unpack) {
-	Py_DECREF(decoder);
-	PyErr_SetString(PyExc_ValueError, "unknown raw mode");
-	return -1;
-    }
-
-    decoder->state.shuffle = unpack;
-    decoder->state.bits = bits;
-
-    return 0;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* BIT (packed fields)          					*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_BitDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    int bits  = 8;
-    int pad   = 8;
-    int fill  = 0;
-    int sign  = 0;
-    int ystep = 1;
-    if (!PyArg_ParseTuple(args, "s|iiiii", &mode, &bits, &pad, &fill,
-                          &sign, &ystep))
-	return NULL;
-
-    if (strcmp(mode, "F") != 0) {
-	PyErr_SetString(PyExc_ValueError, "bad image mode");
-        return NULL;
-    }
-
-    decoder = PyImaging_DecoderNew(sizeof(BITSTATE));
-    if (decoder == NULL)
-	return NULL;
-
-    decoder->decode = ImagingBitDecode;
-
-    decoder->state.ystep = ystep;
-
-    ((BITSTATE*)decoder->state.context)->bits = bits;
-    ((BITSTATE*)decoder->state.context)->pad  = pad;
-    ((BITSTATE*)decoder->state.context)->fill = fill;
-    ((BITSTATE*)decoder->state.context)->sign = sign;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* FLI									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_FliDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    decoder = PyImaging_DecoderNew(0);
-    if (decoder == NULL)
-	return NULL;
-
-    decoder->decode = ImagingFliDecode;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* GIF									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_GifDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    int bits = 8;
-    int interlace = 0;
-    if (!PyArg_ParseTuple(args, "s|ii", &mode, &bits, &interlace))
-	return NULL;
-
-    if (strcmp(mode, "L") != 0 && strcmp(mode, "P") != 0) {
-	PyErr_SetString(PyExc_ValueError, "bad image mode");
-        return NULL;
-    }
-
-    decoder = PyImaging_DecoderNew(sizeof(GIFDECODERSTATE));
-    if (decoder == NULL)
-	return NULL;
-
-    decoder->decode = ImagingGifDecode;
-
-    ((GIFDECODERSTATE*)decoder->state.context)->bits = bits;
-    ((GIFDECODERSTATE*)decoder->state.context)->interlace = interlace;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* HEX									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_HexDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    char* rawmode;
-    if (!PyArg_ParseTuple(args, "ss", &mode, &rawmode))
-	return NULL;
-
-    decoder = PyImaging_DecoderNew(0);
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, mode, rawmode) < 0)
-	return NULL;
-
-    decoder->decode = ImagingHexDecode;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* LZW									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_TiffLzwDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    char* rawmode;
-    int filter = 0;
-    if (!PyArg_ParseTuple(args, "ss|i", &mode, &rawmode, &filter))
-	return NULL;
-
-    decoder = PyImaging_DecoderNew(sizeof(LZWSTATE));
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, mode, rawmode) < 0)
-	return NULL;
-
-    decoder->decode = ImagingLzwDecode;
-
-    ((LZWSTATE*)decoder->state.context)->filter = filter;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* MSP									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_MspDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    decoder = PyImaging_DecoderNew(0);
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, "1", "1") < 0)
-	return NULL;
-
-    decoder->decode = ImagingMspDecode;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* PackBits								*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_PackbitsDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    char* rawmode;
-    if (!PyArg_ParseTuple(args, "ss", &mode, &rawmode))
-	return NULL;
-
-    decoder = PyImaging_DecoderNew(0);
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, mode, rawmode) < 0)
-	return NULL;
-
-    decoder->decode = ImagingPackbitsDecode;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* PCD									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_PcdDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    decoder = PyImaging_DecoderNew(0);
-    if (decoder == NULL)
-	return NULL;
-
-    /* Unpack from PhotoYCC to RGB */
-    if (get_unpacker(decoder, "RGB", "YCC;P") < 0)
-	return NULL;
-
-    decoder->decode = ImagingPcdDecode;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* PCX									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_PcxDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    char* rawmode;
-    int stride;
-    if (!PyArg_ParseTuple(args, "ssi", &mode, &rawmode, &stride))
-	return NULL;
-
-    decoder = PyImaging_DecoderNew(0);
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, mode, rawmode) < 0)
-	return NULL;
-
-    decoder->state.bytes = stride;
-
-    decoder->decode = ImagingPcxDecode;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* RAW									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_RawDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    char* rawmode;
-    int stride = 0;
-    int ystep  = 1;
-    if (!PyArg_ParseTuple(args, "ss|ii", &mode, &rawmode, &stride, &ystep))
-	return NULL;
-
-    decoder = PyImaging_DecoderNew(sizeof(RAWSTATE));
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, mode, rawmode) < 0)
-	return NULL;
-
-    decoder->decode = ImagingRawDecode;
-
-    decoder->state.ystep = ystep;
-
-    ((RAWSTATE*)decoder->state.context)->stride = stride;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* SUN RLE								*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_SunRleDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    char* rawmode;
-    if (!PyArg_ParseTuple(args, "ss", &mode, &rawmode))
-	return NULL;
-
-    decoder = PyImaging_DecoderNew(0);
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, mode, rawmode) < 0)
-	return NULL;
-
-    decoder->decode = ImagingSunRleDecode;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* TGA RLE								*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_TgaRleDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    char* rawmode;
-    int ystep = 1;
-    int depth = 8;
-    if (!PyArg_ParseTuple(args, "ss|ii", &mode, &rawmode, &ystep, &depth))
-	return NULL;
-
-    decoder = PyImaging_DecoderNew(0);
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, mode, rawmode) < 0)
-	return NULL;
-
-    decoder->decode = ImagingTgaRleDecode;
-
-    decoder->state.ystep = ystep;
-    decoder->state.count = depth / 8;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* XBM									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_XbmDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    decoder = PyImaging_DecoderNew(0);
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, "1", "1;R") < 0)
-	return NULL;
-
-    decoder->decode = ImagingXbmDecode;
-
-    return (PyObject*) decoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* ZIP									*/
-/* -------------------------------------------------------------------- */
-
-#ifdef HAVE_LIBZ
-
-#include "Zip.h"
-
-PyObject*
-PyImaging_ZipDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    char* rawmode;
-    if (!PyArg_ParseTuple(args, "ss", &mode, &rawmode))
-	return NULL;
-
-    decoder = PyImaging_DecoderNew(sizeof(ZIPSTATE));
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, mode, rawmode) < 0)
-	return NULL;
-
-    decoder->decode = ImagingZipDecode;
-
-    return (PyObject*) decoder;
-}
-#endif
-
-
-/* -------------------------------------------------------------------- */
-/* JPEG									*/
-/* -------------------------------------------------------------------- */
-
-#ifdef HAVE_LIBJPEG
-
-/* We better define this decoder last in this file, so the following
-   undef's won't mess things up for the Imaging library proper. */
-
-#undef	HAVE_PROTOTYPES
-#undef	HAVE_STDDEF_H
-#undef	HAVE_STDLIB_H
-#undef	UINT8
-#undef	UINT16
-#undef	UINT32
-#undef	INT8
-#undef	INT16
-#undef	INT32
-
-#include "Jpeg.h"
-
-PyObject*
-PyImaging_JpegDecoderNew(PyObject* self, PyObject* args)
-{
-    ImagingDecoderObject* decoder;
-
-    char* mode;
-    char* rawmode; /* what we wan't from the decoder */
-    char* jpegmode; /* what's in the file */
-    int scale = 1;
-    int draft = 0;
-    if (!PyArg_ParseTuple(args, "ssz|ii", &mode, &rawmode, &jpegmode,
-                          &scale, &draft))
-	return NULL;
-
-    if (!jpegmode)
-	jpegmode = "";
-
-    decoder = PyImaging_DecoderNew(sizeof(JPEGSTATE));
-    if (decoder == NULL)
-	return NULL;
-
-    if (get_unpacker(decoder, mode, rawmode) < 0)
-	return NULL;
-
-    decoder->decode = ImagingJpegDecode;
-
-    strncpy(((JPEGSTATE*)decoder->state.context)->rawmode, rawmode, 8);
-    strncpy(((JPEGSTATE*)decoder->state.context)->jpegmode, jpegmode, 8);
-
-    ((JPEGSTATE*)decoder->state.context)->scale = scale;
-    ((JPEGSTATE*)decoder->state.context)->draft = draft;
-
-    return (PyObject*) decoder;
-}
-#endif
diff --git a/pythonPackages/pil/display.c b/pythonPackages/pil/display.c
deleted file mode 100644
index 0c97acee27..0000000000
--- a/pythonPackages/pil/display.c
+++ /dev/null
@@ -1,731 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: display.c 2751 2006-06-18 19:50:45Z fredrik $
- *
- * display support
- *
- * History:
- * 1996-05-13 fl  Windows DIB support
- * 1996-05-21 fl  Added palette stuff
- * 1996-05-28 fl  Added display_mode stuff
- * 1997-09-21 fl  Added draw primitive
- * 2001-09-17 fl  Added ImagingGrabScreen (from _grabscreen.c)
- * 2002-05-12 fl  Added ImagingListWindows
- * 2002-11-19 fl  Added clipboard support
- * 2002-11-25 fl  Added GetDC/ReleaseDC helpers
- * 2003-05-21 fl  Added create window support (including window callback)
- * 2003-09-05 fl  Added fromstring/tostring methods
- *
- * Copyright (c) 1997-2003 by Secret Labs AB.
- * Copyright (c) 1996-1997 by Fredrik Lundh.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Python.h"
-
-#if PY_VERSION_HEX < 0x01060000
-#define PyObject_New PyObject_NEW
-#define PyObject_Del PyMem_DEL
-#endif
-
-#include "Imaging.h"
-
-/* -------------------------------------------------------------------- */
-/* Windows DIB support	*/
-
-#ifdef WIN32
-
-#include "ImDib.h"
-
-typedef struct {
-    PyObject_HEAD
-    ImagingDIB dib;
-} ImagingDisplayObject;
-
-staticforward PyTypeObject ImagingDisplayType;
-
-static ImagingDisplayObject*
-_new(const char* mode, int xsize, int ysize)
-{
-    ImagingDisplayObject *display;
-
-    display = PyObject_New(ImagingDisplayObject, &ImagingDisplayType);
-    if (display == NULL)
-	return NULL;
-
-    display->dib = ImagingNewDIB(mode, xsize, ysize);
-    if (!display->dib) {
-	Py_DECREF(display);
-	return NULL;
-    }
-
-    return display;
-}
-
-static void
-_delete(ImagingDisplayObject* display)
-{
-    if (display->dib)
-	ImagingDeleteDIB(display->dib);
-    PyObject_Del(display);
-}
-
-static PyObject* 
-_expose(ImagingDisplayObject* display, PyObject* args)
-{
-    int hdc;
-    if (!PyArg_ParseTuple(args, "i", &hdc))
-	return NULL;
-
-    ImagingExposeDIB(display->dib, hdc);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_draw(ImagingDisplayObject* display, PyObject* args)
-{
-    int hdc;
-    int dst[4];
-    int src[4];
-    if (!PyArg_ParseTuple(args, "i(iiii)(iiii)", &hdc,
-                          dst+0, dst+1, dst+2, dst+3,
-                          src+0, src+1, src+2, src+3))
-	return NULL;
-
-    ImagingDrawDIB(display->dib, hdc, dst, src);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-extern Imaging PyImaging_AsImaging(PyObject *op);
-
-static PyObject*
-_paste(ImagingDisplayObject* display, PyObject* args)
-{
-    Imaging im;
-
-    PyObject* op;
-    int xy[4];
-    xy[0] = xy[1] = xy[2] = xy[3] = 0;
-    if (!PyArg_ParseTuple(args, "O|(iiii)", &op, xy+0, xy+1, xy+2, xy+3))
-	return NULL;
-    im = PyImaging_AsImaging(op);
-    if (!im)
-	return NULL;
-
-    if (xy[2] <= xy[0])
-	xy[2] = xy[0] + im->xsize;
-    if (xy[3] <= xy[1])
-	xy[3] = xy[1] + im->ysize;
-
-    ImagingPasteDIB(display->dib, im, xy);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject* 
-_query_palette(ImagingDisplayObject* display, PyObject* args)
-{
-    int hdc;
-    int status;
-
-    if (!PyArg_ParseTuple(args, "i", &hdc))
-	return NULL;
-
-    status = ImagingQueryPaletteDIB(display->dib, hdc);
-
-    return Py_BuildValue("i", status);
-}
-
-static PyObject*
-_getdc(ImagingDisplayObject* display, PyObject* args)
-{
-    int window;
-    HDC dc;
-
-    if (!PyArg_ParseTuple(args, "i", &window))
-	return NULL;
-
-    dc = GetDC((HWND) window);
-    if (!dc) {
-        PyErr_SetString(PyExc_IOError, "cannot create dc");
-        return NULL;
-    }
-
-    return Py_BuildValue("i", (int) dc);
-}
-
-static PyObject*
-_releasedc(ImagingDisplayObject* display, PyObject* args)
-{
-    int window, dc;
-
-    if (!PyArg_ParseTuple(args, "ii", &window, &dc))
-	return NULL;
-
-    ReleaseDC((HWND) window, (HDC) dc);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-_fromstring(ImagingDisplayObject* display, PyObject* args)
-{
-    char* ptr;
-    int bytes;
-    if (!PyArg_ParseTuple(args, "s#:fromstring", &ptr, &bytes))
-	return NULL;
-
-    if (display->dib->ysize * display->dib->linesize != bytes) {
-        PyErr_SetString(PyExc_ValueError, "wrong size");
-        return NULL;
-    }
-
-    memcpy(display->dib->bits, ptr, bytes);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-_tostring(ImagingDisplayObject* display, PyObject* args)
-{
-    if (!PyArg_ParseTuple(args, ":tostring"))
-	return NULL;
-
-    return PyString_FromStringAndSize(
-        display->dib->bits, display->dib->ysize * display->dib->linesize
-        );
-}
-
-static struct PyMethodDef methods[] = {
-    {"draw", (PyCFunction)_draw, 1},
-    {"expose", (PyCFunction)_expose, 1},
-    {"paste", (PyCFunction)_paste, 1},
-    {"query_palette", (PyCFunction)_query_palette, 1},
-    {"getdc", (PyCFunction)_getdc, 1},
-    {"releasedc", (PyCFunction)_releasedc, 1},
-    {"fromstring", (PyCFunction)_fromstring, 1},
-    {"tostring", (PyCFunction)_tostring, 1},
-    {NULL, NULL} /* sentinel */
-};
-
-static PyObject*  
-_getattr(ImagingDisplayObject* self, char* name)
-{
-    PyObject* res;
-
-    res = Py_FindMethod(methods, (PyObject*) self, name);
-    if (res)
-	return res;
-    PyErr_Clear();
-    if (!strcmp(name, "mode"))
-	return Py_BuildValue("s", self->dib->mode);
-    if (!strcmp(name, "size"))
-	return Py_BuildValue("ii", self->dib->xsize, self->dib->ysize);
-    PyErr_SetString(PyExc_AttributeError, name);
-    return NULL;
-}
-
-statichere PyTypeObject ImagingDisplayType = {
-	PyObject_HEAD_INIT(NULL)
-	0,				/*ob_size*/
-	"ImagingDisplay",		/*tp_name*/
-	sizeof(ImagingDisplayObject),	/*tp_size*/
-	0,				/*tp_itemsize*/
-	/* methods */
-	(destructor)_delete,		/*tp_dealloc*/
-	0,				/*tp_print*/
-	(getattrfunc)_getattr,		/*tp_getattr*/
-	0,				/*tp_setattr*/
-	0,				/*tp_compare*/
-	0,				/*tp_repr*/
-	0,                              /*tp_hash*/
-};
-
-PyObject*
-PyImaging_DisplayWin32(PyObject* self, PyObject* args)
-{
-    ImagingDisplayObject* display;
-    char *mode;
-    int xsize, ysize;
-
-    if (!PyArg_ParseTuple(args, "s(ii)", &mode, &xsize, &ysize))
-	return NULL;
-
-    display = _new(mode, xsize, ysize);
-    if (display == NULL)
-	return NULL;
-
-    return (PyObject*) display;
-}
-
-PyObject*
-PyImaging_DisplayModeWin32(PyObject* self, PyObject* args)
-{
-    char *mode;
-    int size[2];
-
-    mode = ImagingGetModeDIB(size);
-
-    return Py_BuildValue("s(ii)", mode, size[0], size[1]);
-}
-
-/* -------------------------------------------------------------------- */
-/* Windows screen grabber */
-
-PyObject*
-PyImaging_GrabScreenWin32(PyObject* self, PyObject* args)
-{
-    int width, height;
-    HBITMAP bitmap;
-    BITMAPCOREHEADER core;
-    HDC screen, screen_copy;
-    PyObject* buffer;
-    
-    /* step 1: create a memory DC large enough to hold the
-       entire screen */
-
-    screen = CreateDC("DISPLAY", NULL, NULL, NULL); 
-    screen_copy = CreateCompatibleDC(screen); 
-
-    width = GetDeviceCaps(screen, HORZRES);
-    height = GetDeviceCaps(screen, VERTRES);
- 
-    bitmap = CreateCompatibleBitmap(screen, width, height);
-    if (!bitmap)
-        goto error;
-        
-    if (!SelectObject(screen_copy, bitmap))
-        goto error;
-
-    /* step 2: copy bits into memory DC bitmap */
-
-    if (!BitBlt(screen_copy, 0, 0, width, height, screen, 0, 0, SRCCOPY))
-        goto error;
-
-    /* step 3: extract bits from bitmap */
-
-    buffer = PyString_FromStringAndSize(NULL, height * ((width*3 + 3) & -4));
-    if (!buffer)
-        return NULL;
-
-    core.bcSize = sizeof(core);
-    core.bcWidth = width;
-    core.bcHeight = height;
-    core.bcPlanes = 1;
-    core.bcBitCount = 24;
-    if (!GetDIBits(screen_copy, bitmap, 0, height, PyString_AS_STRING(buffer),
-                   (BITMAPINFO*) &core, DIB_RGB_COLORS))
-        goto error;
-
-    DeleteObject(bitmap);
-    DeleteDC(screen_copy);
-    DeleteDC(screen);
-
-    return Py_BuildValue("(ii)N", width, height, buffer);
-
-error:
-    PyErr_SetString(PyExc_IOError, "screen grab failed");
-
-    DeleteDC(screen_copy);
-    DeleteDC(screen);
-
-    return NULL;
-}
-
-static BOOL CALLBACK list_windows_callback(HWND hwnd, LPARAM lParam)
-{
-    PyObject* window_list = (PyObject*) lParam;
-    PyObject* item;
-    PyObject* title;
-    RECT inner, outer;
-    int title_size;
-    int status;
-    
-    /* get window title */
-    title_size = GetWindowTextLength(hwnd);
-    if (title_size > 0) {
-        title = PyString_FromStringAndSize(NULL, title_size);
-        if (title)
-            GetWindowText(hwnd, PyString_AS_STRING(title), title_size+1);
-    } else
-        title = PyString_FromString("");
-    if (!title)
-        return 0;
-
-    /* get bounding boxes */
-    GetClientRect(hwnd, &inner);
-    GetWindowRect(hwnd, &outer);
-
-    item = Py_BuildValue(
-        "lN(iiii)(iiii)", (long) hwnd, title,
-        inner.left, inner.top, inner.right, inner.bottom,
-        outer.left, outer.top, outer.right, outer.bottom
-        );
-    if (!item)
-        return 0;
-
-    status = PyList_Append(window_list, item);
-
-    Py_DECREF(item);
-
-    if (status < 0)
-        return 0;
-    
-    return 1;
-}
-
-PyObject*
-PyImaging_ListWindowsWin32(PyObject* self, PyObject* args)
-{
-    PyObject* window_list;
-    
-    window_list = PyList_New(0);
-    if (!window_list)
-        return NULL;
-
-    EnumWindows(list_windows_callback, (LPARAM) window_list);
-
-    if (PyErr_Occurred()) {
-        Py_DECREF(window_list);
-        return NULL;
-    }
-
-    return window_list;
-}
-
-/* -------------------------------------------------------------------- */
-/* Windows clipboard grabber */
-
-PyObject*
-PyImaging_GrabClipboardWin32(PyObject* self, PyObject* args)
-{
-    int clip;
-    HANDLE handle;
-    int size;
-    void* data;
-    PyObject* result;
-    
-    int verbose = 0; /* debugging; will be removed in future versions */
-    if (!PyArg_ParseTuple(args, "|i", &verbose))
-	return NULL;
-
-
-    clip = OpenClipboard(NULL);
-    /* FIXME: check error status */
-    
-    if (verbose) {
-        UINT format = EnumClipboardFormats(0);
-        char buffer[200];
-        char* result;
-        while (format != 0) {
-            if (GetClipboardFormatName(format, buffer, sizeof buffer) > 0)
-                result = buffer;
-            else
-                switch (format) {
-                case CF_BITMAP:
-                    result = "CF_BITMAP";
-                    break;
-                case CF_DIB:
-                    result = "CF_DIB";
-                    break;
-                case CF_DIF:
-                    result = "CF_DIF";
-                    break;
-                case CF_ENHMETAFILE:
-                    result = "CF_ENHMETAFILE";
-                    break;
-                case CF_HDROP:
-                    result = "CF_HDROP";
-                    break;
-                case CF_LOCALE:
-                    result = "CF_LOCALE";
-                    break;
-                case CF_METAFILEPICT:
-                    result = "CF_METAFILEPICT";
-                    break;
-                case CF_OEMTEXT:
-                    result = "CF_OEMTEXT";
-                    break;
-                case CF_OWNERDISPLAY:
-                    result = "CF_OWNERDISPLAY";
-                    break;
-                case CF_PALETTE:
-                    result = "CF_PALETTE";
-                    break;
-                case CF_PENDATA:
-                    result = "CF_PENDATA";
-                    break;
-                case CF_RIFF:
-                    result = "CF_RIFF";
-                    break;
-                case CF_SYLK:
-                    result = "CF_SYLK";
-                    break;
-                case CF_TEXT:
-                    result = "CF_TEXT";
-                    break;
-                case CF_WAVE:
-                    result = "CF_WAVE";
-                    break;
-                case CF_TIFF:
-                    result = "CF_TIFF";
-                    break;
-                case CF_UNICODETEXT:
-                    result = "CF_UNICODETEXT";
-                    break;
-                default:
-                    sprintf(buffer, "[%d]", format);
-                    result = buffer;
-                    break;
-                }
-            printf("%s (%d)\n", result, format);
-            format = EnumClipboardFormats(format);
-        }
-    }
-
-    handle = GetClipboardData(CF_DIB);
-    if (!handle) {
-        /* FIXME: add CF_HDROP support to allow cut-and-paste from
-           the explorer */
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-
-    size = GlobalSize(handle);
-    data = GlobalLock(handle);
-
-#if 0
-    /* calculate proper size for string formats */
-    if (format == CF_TEXT || format == CF_OEMTEXT)
-        size = strlen(data);
-    else if (format == CF_UNICODETEXT)
-        size = wcslen(data) * 2;
-#endif
-
-    result = PyString_FromStringAndSize(data, size);
-
-    GlobalUnlock(handle);
-
-    CloseClipboard();
-
-    return result;
-}
-
-/* -------------------------------------------------------------------- */
-/* Windows class */
-
-#ifndef WM_MOUSEWHEEL
-#define WM_MOUSEWHEEL 522
-#endif
-
-static int mainloop = 0;
-
-static void
-callback_error(const char* handler)
-{
-    PyObject* sys_stderr;
-    
-    sys_stderr = PySys_GetObject("stderr");
-
-    if (sys_stderr) {
-        PyFile_WriteString("*** ImageWin: error in ", sys_stderr);
-        PyFile_WriteString((char*) handler, sys_stderr);
-        PyFile_WriteString(":\n", sys_stderr);
-    }
-
-    PyErr_Print();
-    PyErr_Clear();
-}
-
-static LRESULT CALLBACK
-windowCallback(HWND wnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    PAINTSTRUCT ps;
-    PyObject* callback = NULL;
-    PyObject* result;
-    PyThreadState* threadstate;
-    PyThreadState* current_threadstate;
-    HDC dc;
-    RECT rect;
-    LRESULT status = 0;
-
-    /* set up threadstate for messages that calls back into python */
-    switch (message) {
-    case WM_CREATE:
-        mainloop++;
-        break;
-    case WM_DESTROY:
-        mainloop--;
-        /* fall through... */
-    case WM_PAINT:
-    case WM_SIZE:
-        callback = (PyObject*) GetWindowLong(wnd, 0);
-        if (callback) {
-            threadstate = (PyThreadState*)
-                GetWindowLong(wnd, sizeof(PyObject*));
-            current_threadstate = PyThreadState_Swap(NULL);
-            PyEval_RestoreThread(threadstate);
-        } else
-            return DefWindowProc(wnd, message, wParam, lParam);
-    }
-
-    /* process message */
-    switch (message) {
-
-    case WM_PAINT:
-        /* redraw (part of) window.  this generates a WCK-style
-           damage/clear/repair cascade */
-        BeginPaint(wnd, &ps);
-        dc = GetDC(wnd);
-        GetWindowRect(wnd, &rect); /* in screen coordinates */
-
-        result = PyObject_CallFunction(
-            callback, "siiii", "damage",
-            ps.rcPaint.left, ps.rcPaint.top,
-            ps.rcPaint.right, ps.rcPaint.bottom
-            );
-        if (result)
-            Py_DECREF(result);
-        else
-            callback_error("window damage callback");
-
-        result = PyObject_CallFunction(
-            callback, "siiiii", "clear", (int) dc,
-            0, 0, rect.right-rect.left, rect.bottom-rect.top
-            );
-        if (result)
-            Py_DECREF(result);
-        else
-            callback_error("window clear callback");
-
-        result = PyObject_CallFunction(
-            callback, "siiiii", "repair", (int) dc,
-            0, 0, rect.right-rect.left, rect.bottom-rect.top
-            );
-        if (result)
-            Py_DECREF(result);
-        else
-            callback_error("window repair callback");
-
-        ReleaseDC(wnd, dc);
-        EndPaint(wnd, &ps);
-        break;
-
-    case WM_SIZE:
-        /* resize window */
-        result = PyObject_CallFunction(
-            callback, "sii", "resize", LOWORD(lParam), HIWORD(lParam)
-            );
-        if (result) {
-            InvalidateRect(wnd, NULL, 1);
-            Py_DECREF(result);
-        } else
-            callback_error("window resize callback");
-        break;
-
-    case WM_DESTROY:
-        /* destroy window */
-        result = PyObject_CallFunction(callback, "s", "destroy");
-        if (result)
-            Py_DECREF(result);
-        else
-            callback_error("window destroy callback");
-        Py_DECREF(callback);
-        break;
-
-    default:
-        status = DefWindowProc(wnd, message, wParam, lParam);
-    }
-
-    if (callback) {
-        /* restore thread state */
-        PyEval_SaveThread();
-        PyThreadState_Swap(threadstate);
-    }
-
-    return status;
-}
-
-PyObject*
-PyImaging_CreateWindowWin32(PyObject* self, PyObject* args)
-{
-    HWND wnd;
-    WNDCLASS windowClass;
-
-    char* title;
-    PyObject* callback;
-    int width = 0, height = 0;
-    if (!PyArg_ParseTuple(args, "sO|ii", &title, &callback, &width, &height))
-	return NULL;
-
-    if (width <= 0)
-        width = CW_USEDEFAULT;
-    if (height <= 0)
-        height = CW_USEDEFAULT;
-
-    /* register toplevel window class */
-    windowClass.style = CS_CLASSDC;
-    windowClass.cbClsExtra = 0;
-    windowClass.cbWndExtra = sizeof(PyObject*) + sizeof(PyThreadState*);
-    windowClass.hInstance = GetModuleHandle(NULL);
-    /* windowClass.hbrBackground = (HBRUSH) (COLOR_BTNFACE + 1); */
-    windowClass.hbrBackground = NULL;
-    windowClass.lpszMenuName = NULL;
-    windowClass.lpszClassName = "pilWindow";
-    windowClass.lpfnWndProc = windowCallback;
-    windowClass.hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(1));
-    windowClass.hCursor = LoadCursor(NULL, IDC_ARROW); /* CROSS? */
-
-    RegisterClass(&windowClass); /* FIXME: check return status */
-
-    wnd = CreateWindowEx(
-        0, windowClass.lpszClassName, title,
-        WS_OVERLAPPEDWINDOW,
-        CW_USEDEFAULT, CW_USEDEFAULT, width, height, 
-        HWND_DESKTOP, NULL, NULL, NULL
-        );
-
-    if (!wnd) {
-        PyErr_SetString(PyExc_IOError, "failed to create window");
-        return NULL;
-    }
-
-    /* register window callback */
-    Py_INCREF(callback);
-    SetWindowLong(wnd, 0, (LONG) callback);
-    SetWindowLong(wnd, sizeof(callback), (LONG) PyThreadState_Get());
-
-    Py_BEGIN_ALLOW_THREADS
-    ShowWindow(wnd, SW_SHOWNORMAL);
-    SetForegroundWindow(wnd); /* to make sure it's visible */
-    Py_END_ALLOW_THREADS
-
-    return Py_BuildValue("l", (long) wnd);
-}
-
-PyObject*
-PyImaging_EventLoopWin32(PyObject* self, PyObject* args)
-{
-    MSG msg;
-
-    Py_BEGIN_ALLOW_THREADS
-    while (mainloop && GetMessage(&msg, NULL, 0, 0)) {
-        TranslateMessage(&msg);
-        DispatchMessage(&msg);
-    }
-    Py_END_ALLOW_THREADS
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-#endif /* WIN32 */
diff --git a/pythonPackages/pil/doctest.py b/pythonPackages/pil/doctest.py
deleted file mode 100644
index e8140ecdfd..0000000000
--- a/pythonPackages/pil/doctest.py
+++ /dev/null
@@ -1,1111 +0,0 @@
-# Module doctest version 0.9.6
-# Released to the public domain 16-Jan-2001,
-# by Tim Peters (tim.one@home.com).
-
-# local modifications:
-# 2001-02-13 fl: minor tweaks to make it run under both 1.5.2 and 2.0
-
-# Provided as-is; use at your own risk; no warranty; no promises; enjoy!
-
-"""Module doctest -- a framework for running examples in docstrings.
-
-NORMAL USAGE
-
-In normal use, end each module M with:
-
-def _test():
-    import doctest, M           # replace M with your module's name
-    return doctest.testmod(M)   # ditto
-
-if __name__ == "__main__":
-    _test()
-
-Then running the module as a script will cause the examples in the
-docstrings to get executed and verified:
-
-python M.py
-
-This won't display anything unless an example fails, in which case the
-failing example(s) and the cause(s) of the failure(s) are printed to stdout
-(why not stderr? because stderr is a lame hack <0.2 wink>), and the final
-line of output is "Test failed.".
-
-Run it with the -v switch instead:
-
-python M.py -v
-
-and a detailed report of all examples tried is printed to stdout, along
-with assorted summaries at the end.
-
-You can force verbose mode by passing "verbose=1" to testmod, or prohibit
-it by passing "verbose=0".  In either of those cases, sys.argv is not
-examined by testmod.
-
-In any case, testmod returns a 2-tuple of ints (f, t), where f is the
-number of docstring examples that failed and t is the total number of
-docstring examples attempted.
-
-
-WHICH DOCSTRINGS ARE EXAMINED?
-
-+ M.__doc__.
-
-+ f.__doc__ for all functions f in M.__dict__.values(), except those
-  with private names.
-
-+ C.__doc__ for all classes C in M.__dict__.values(), except those with
-  private names.
-
-+ If M.__test__ exists and "is true", it must be a dict, and
-  each entry maps a (string) name to a function object, class object, or
-  string.  Function and class object docstrings found from M.__test__
-  are searched even if the name is private, and strings are searched
-  directly as if they were docstrings.  In output, a key K in M.__test__
-  appears with name
-      <name of M>.__test__.K
-
-Any classes found are recursively searched similarly, to test docstrings in
-their contained methods and nested classes.  Private names reached from M's
-globals are skipped, but all names reached from M.__test__ are searched.
-
-By default, a name is considered to be private if it begins with an
-underscore (like "_my_func") but doesn't both begin and end with (at least)
-two underscores (like "__init__").  You can change the default by passing
-your own "isprivate" function to testmod.
-
-If you want to test docstrings in objects with private names too, stuff
-them into an M.__test__ dict, or see ADVANCED USAGE below (e.g., pass your
-own isprivate function to Tester's constructor, or call the rundoc method
-of a Tester instance).
-
-Warning:  imports can cause trouble; e.g., if you do
-
-from XYZ import XYZclass
-
-then XYZclass is a name in M.__dict__ too, and doctest has no way to know
-that XYZclass wasn't *defined* in M.  So it may try to execute the examples
-in XYZclass's docstring, and those in turn may require a different set of
-globals to work correctly.  I prefer to do "import *"- friendly imports,
-a la
-
-import XYY
-_XYZclass = XYZ.XYZclass
-del XYZ
-
-or (Python 2.0)
-
-from XYZ import XYZclass as _XYZclass
-
-and then the leading underscore stops testmod from going nuts.  You may
-prefer the method in the next section.
-
-
-WHAT'S THE EXECUTION CONTEXT?
-
-By default, each time testmod finds a docstring to test, it uses a *copy*
-of M's globals (so that running tests on a module doesn't change the
-module's real globals, and so that one test in M can't leave behind crumbs
-that accidentally allow another test to work).  This means examples can
-freely use any names defined at top-level in M.  It also means that sloppy
-imports (see above) can cause examples in external docstrings to use
-globals inappropriate for them.
-
-You can force use of your own dict as the execution context by passing
-"globs=your_dict" to testmod instead.  Presumably this would be a copy of
-M.__dict__ merged with the globals from other imported modules.
-
-
-WHAT IF I WANT TO TEST A WHOLE PACKAGE?
-
-Piece o' cake, provided the modules do their testing from docstrings.
-Here's the test.py I use for the world's most elaborate Rational/
-floating-base-conversion pkg (which I'll distribute some day):
-
-from Rational import Cvt
-from Rational import Format
-from Rational import machprec
-from Rational import Rat
-from Rational import Round
-from Rational import utils
-
-modules = (Cvt,
-           Format,
-           machprec,
-           Rat,
-           Round,
-           utils)
-
-def _test():
-    import doctest
-    import sys
-    verbose = "-v" in sys.argv
-    for mod in modules:
-        doctest.testmod(mod, verbose=verbose, report=0)
-    doctest.master.summarize()
-
-if __name__ == "__main__":
-    _test()
-
-IOW, it just runs testmod on all the pkg modules.  testmod remembers the
-names and outcomes (# of failures, # of tries) for each item it's seen, and
-passing "report=0" prevents it from printing a summary in verbose mode.
-Instead, the summary is delayed until all modules have been tested, and
-then "doctest.master.summarize()" forces the summary at the end.
-
-So this is very nice in practice:  each module can be tested individually
-with almost no work beyond writing up docstring examples, and collections
-of modules can be tested too as a unit with no more work than the above.
-
-
-WHAT ABOUT EXCEPTIONS?
-
-No problem, as long as the only output generated by the example is the
-traceback itself.  For example:
-
-    >>> a = [None]
-    >>> a[1]
-    Traceback (innermost last):
-      File "<stdin>", line 1, in ?
-    IndexError: list index out of range
-    >>>
-
-Note that only the exception type and value are compared (specifically,
-only the last line in the traceback).
-
-
-ADVANCED USAGE
-
-doctest.testmod() captures the testing policy I find most useful most
-often.  You may want other policies.
-
-testmod() actually creates a local instance of class doctest.Tester, runs
-appropriate methods of that class, and merges the results into global
-Tester instance doctest.master.
-
-You can create your own instances of doctest.Tester, and so build your own
-policies, or even run methods of doctest.master directly.  See
-doctest.Tester.__doc__ for details.
-
-
-SO WHAT DOES A DOCSTRING EXAMPLE LOOK LIKE ALREADY!?
-
-Oh ya.  It's easy!  In most cases a copy-and-paste of an interactive
-console session works fine -- just make sure the leading whitespace is
-rigidly consistent (you can mix tabs and spaces if you're too lazy to do it
-right, but doctest is not in the business of guessing what you think a tab
-means).
-
-    >>> # comments are ignored
-    >>> x = 12
-    >>> x
-    12
-    >>> if x == 13:
-    ...     print "yes"
-    ... else:
-    ...     print "no"
-    ...     print "NO"
-    ...     print "NO!!!"
-    ...
-    no
-    NO
-    NO!!!
-    >>>
-
-Any expected output must immediately follow the final ">>>" or "..." line
-containing the code, and the expected output (if any) extends to the next
-">>>" or all-whitespace line.  That's it.
-
-Bummers:
-
-+ Expected output cannot contain an all-whitespace line, since such a line
-  is taken to signal the end of expected output.
-
-+ Output to stdout is captured, but not output to stderr (exception
-  tracebacks are captured via a different means).
-
-+ If you continue a line via backslashing in an interactive session, or for
-  any other reason use a backslash, you need to double the backslash in the
-  docstring version.  This is simply because you're in a string, and so the
-  backslash must be escaped for it to survive intact.  Like:
-
->>> if "yes" == \\
-...     "y" +   \\
-...     "es":   # in the source code you'll see the doubled backslashes
-...     print 'yes'
-yes
-
-The starting column doesn't matter:
-
->>> assert "Easy!"
-     >>> import math
-            >>> math.floor(1.9)
-            1.0
-
-and as many leading whitespace characters are stripped from the expected
-output as appeared in the initial ">>>" line that triggered it.
-
-If you execute this very file, the examples above will be found and
-executed, leading to this output in verbose mode:
-
-Running doctest.__doc__
-Trying: a = [None]
-Expecting: nothing
-ok
-Trying: a[1]
-Expecting:
-Traceback (innermost last):
-  File "<stdin>", line 1, in ?
-IndexError: list index out of range
-ok
-Trying: x = 12
-Expecting: nothing
-ok
-Trying: x
-Expecting: 12
-ok
-Trying:
-if x == 13:
-    print "yes"
-else:
-    print "no"
-    print "NO"
-    print "NO!!!"
-Expecting:
-no
-NO
-NO!!!
-ok
-... and a bunch more like that, with this summary at the end:
-
-5 items had no tests:
-    doctest.Tester.__init__
-    doctest.Tester.run__test__
-    doctest.Tester.summarize
-    doctest.run_docstring_examples
-    doctest.testmod
-12 items passed all tests:
-   9 tests in doctest
-   6 tests in doctest.Tester
-  10 tests in doctest.Tester.merge
-   7 tests in doctest.Tester.rundict
-   3 tests in doctest.Tester.rundoc
-   3 tests in doctest.Tester.runstring
-   2 tests in doctest.__test__._TestClass
-   2 tests in doctest.__test__._TestClass.__init__
-   2 tests in doctest.__test__._TestClass.get
-   1 tests in doctest.__test__._TestClass.square
-   2 tests in doctest.__test__.string
-   7 tests in doctest.is_private
-54 tests in 17 items.
-54 passed and 0 failed.
-Test passed.
-"""
-
-# 0,0,1    06-Mar-1999
-#    initial version posted
-# 0,0,2    06-Mar-1999
-#    loosened parsing:
-#        cater to stinkin' tabs
-#        don't insist on a blank after PS2 prefix
-#            so trailing "... " line from a compound stmt no longer
-#            breaks if the file gets whitespace-trimmed
-#    better error msgs for inconsistent leading whitespace
-# 0,9,1    08-Mar-1999
-#    exposed the Tester class and added client methods
-#        plus docstring examples of their use (eww - head-twisting!)
-#    fixed logic error in reporting total # of tests & failures
-#    added __test__ support to testmod (a pale reflection of Christian
-#        Tismer's vision ...)
-#    removed the "deep" argument; fiddle __test__ instead
-#    simplified endcase logic for extracting tests, and running them.
-#        before, if no output was expected but some was produced
-#        anyway via an eval'ed result, the discrepancy wasn't caught
-#    made TestClass private and used __test__ to get at it
-#    many doc updates
-#    speed _SpoofOut for long expected outputs
-# 0,9,2    09-Mar-1999
-#    throw out comments from examples, enabling use of the much simpler
-#        exec compile(... "single") ...
-#        for simulating the runtime; that barfs on comment-only lines
-#    used the traceback module to do a much better job of reporting
-#        exceptions
-#    run __doc__ values thru str(), "just in case"
-#    privateness of names now determined by an overridable "isprivate"
-#        function
-#    by default a name now considered to be private iff it begins with
-#        an underscore but doesn't both begin & end with two of 'em; so
-#        e.g. Class.__init__ etc are searched now -- as they always
-#        should have been
-# 0,9,3    18-Mar-1999
-#    added .flush stub to _SpoofOut (JPython buglet diagnosed by
-#        Hugh Emberson)
-#    repaired ridiculous docs about backslashes in examples
-#    minor internal changes
-#    changed source to Unix line-end conventions
-#    moved __test__ logic into new Tester.run__test__ method
-# 0,9,4    27-Mar-1999
-#    report item name and line # in failing examples
-# 0,9,5    29-Jun-1999
-#    allow straightforward exceptions in examples - thanks to Mark Hammond!
-# 0,9,6    16-Jan-2001
-#    fiddling for changes in Python 2.0:  some of the embedded docstring
-#        examples no longer worked *exactly* as advertised, due to minor
-#        language changes, and running doctest on itself pointed that out.
-#        Hard to think of a better example of why this is useful <wink>.
-
-__version__ = 0, 9, 6
-
-import types
-_FunctionType = types.FunctionType
-_ClassType    = types.ClassType
-_ModuleType   = types.ModuleType
-_StringType   = types.StringType
-del types
-
-import string
-_string_find = string.find
-_string_join = string.join
-_string_split = string.split
-_string_rindex = string.rindex
-del string
-
-import re
-PS1 = ">>>"
-PS2 = "..."
-_isPS1 = re.compile(r"(\s*)" + re.escape(PS1)).match
-_isPS2 = re.compile(r"(\s*)" + re.escape(PS2)).match
-_isEmpty = re.compile(r"\s*$").match
-_isComment = re.compile(r"\s*#").match
-del re
-
-__all__ = []
-
-# Extract interactive examples from a string.  Return a list of triples,
-# (source, outcome, lineno).  "source" is the source code, and ends
-# with a newline iff the source spans more than one line.  "outcome" is
-# the expected output if any, else an empty string.  When not empty,
-# outcome always ends with a newline.  "lineno" is the line number,
-# 0-based wrt the start of the string, of the first source line.
-
-def _extract_examples(s):
-    isPS1, isPS2 = _isPS1, _isPS2
-    isEmpty, isComment = _isEmpty, _isComment
-    examples = []
-    lines = _string_split(s, "\n")
-    i, n = 0, len(lines)
-    while i < n:
-        line = lines[i]
-        i = i + 1
-        m = isPS1(line)
-        if m is None:
-            continue
-        j = m.end(0)  # beyond the prompt
-        if isEmpty(line, j) or isComment(line, j):
-            # a bare prompt or comment -- not interesting
-            continue
-        lineno = i - 1
-        if line[j] != " ":
-            raise ValueError("line " + `lineno` + " of docstring lacks "
-                "blank after " + PS1 + ": " + line)
-        j = j + 1
-        blanks = m.group(1)
-        nblanks = len(blanks)
-        # suck up this and following PS2 lines
-        source = []
-        while 1:
-            source.append(line[j:])
-            line = lines[i]
-            m = isPS2(line)
-            if m:
-                if m.group(1) != blanks:
-                    raise ValueError("inconsistent leading whitespace "
-                        "in line " + `i` + " of docstring: " + line)
-                i = i + 1
-            else:
-                break
-        if len(source) == 1:
-            source = source[0]
-        else:
-            # get rid of useless null line from trailing empty "..."
-            if source[-1] == "":
-                del source[-1]
-            source = _string_join(source, "\n") + "\n"
-        # suck up response
-        if isPS1(line) or isEmpty(line):
-            expect = ""
-        else:
-            expect = []
-            while 1:
-                if line[:nblanks] != blanks:
-                    raise ValueError("inconsistent leading whitespace "
-                        "in line " + `i` + " of docstring: " + line)
-                expect.append(line[nblanks:])
-                i = i + 1
-                line = lines[i]
-                if isPS1(line) or isEmpty(line):
-                    break
-            expect = _string_join(expect, "\n") + "\n"
-        examples.append( (source, expect, lineno) )
-    return examples
-
-# Capture stdout when running examples.
-
-class _SpoofOut:
-    def __init__(self):
-        self.clear()
-    def write(self, s):
-        self.buf.append(s)
-    def get(self):
-        return _string_join(self.buf, "")
-    def clear(self):
-        self.buf = []
-    def flush(self):
-        # JPython calls flush
-        pass
-
-# Display some tag-and-msg pairs nicely, keeping the tag and its msg
-# on the same line when that makes sense.
-
-def _tag_out(printer, *tag_msg_pairs):
-    for tag, msg in tag_msg_pairs:
-        printer(tag + ":")
-        msg_has_nl = msg[-1:] == "\n"
-        msg_has_two_nl = msg_has_nl and \
-                        _string_find(msg, "\n") < len(msg) - 1
-        if len(tag) + len(msg) < 76 and not msg_has_two_nl:
-            printer(" ")
-        else:
-            printer("\n")
-        printer(msg)
-        if not msg_has_nl:
-            printer("\n")
-
-# Run list of examples, in context globs.  "out" can be used to display
-# stuff to "the real" stdout, and fakeout is an instance of _SpoofOut
-# that captures the examples' std output.  Return (#failures, #tries).
-
-def _run_examples_inner(out, fakeout, examples, globs, verbose, name):
-    import sys, traceback
-    OK, BOOM, FAIL = range(3)
-    NADA = "nothing"
-    stderr = _SpoofOut()
-    failures = 0
-    for source, want, lineno in examples:
-        if verbose:
-            _tag_out(out, ("Trying", source),
-                          ("Expecting", want or NADA))
-        fakeout.clear()
-        try:
-            exec compile(source, "<string>", "single") in globs
-            got = fakeout.get()
-            state = OK
-        except:
-            # See whether the exception was expected.
-            if _string_find(want, "Traceback (innermost last):\n") == 0 or\
-               _string_find(want, "Traceback (most recent call last):\n") == 0:
-                # Only compare exception type and value - the rest of
-                # the traceback isn't necessary.
-                want = _string_split(want, '\n')[-2] + '\n'
-                exc_type, exc_val, exc_tb = sys.exc_info()
-                got = traceback.format_exception_only(exc_type, exc_val)[0]
-                state = OK
-            else:
-                # unexpected exception
-                stderr.clear()
-                traceback.print_exc(file=stderr)
-                state = BOOM
-
-        if state == OK:
-            if got == want:
-                if verbose:
-                    out("ok\n")
-                continue
-            state = FAIL
-
-        assert state in (FAIL, BOOM)
-        failures = failures + 1
-        out("*" * 65 + "\n")
-        _tag_out(out, ("Failure in example", source))
-        out("from line #" + `lineno` + " of " + name + "\n")
-        if state == FAIL:
-            _tag_out(out, ("Expected", want or NADA), ("Got", got))
-        else:
-            assert state == BOOM
-            _tag_out(out, ("Exception raised", stderr.get()))
-
-    return failures, len(examples)
-
-# Run list of examples, in context globs.  Return (#failures, #tries).
-
-def _run_examples(examples, globs, verbose, name):
-    import sys
-    saveout = sys.stdout
-    try:
-        sys.stdout = fakeout = _SpoofOut()
-        x = _run_examples_inner(saveout.write, fakeout, examples,
-                                globs, verbose, name)
-    finally:
-        sys.stdout = saveout
-    return x
-
-def run_docstring_examples(f, globs, verbose=0, name="NoName"):
-    """f, globs, verbose=0, name="NoName" -> run examples from f.__doc__.
-
-    Use dict globs as the globals for execution.
-    Return (#failures, #tries).
-
-    If optional arg verbose is true, print stuff even if there are no
-    failures.
-    Use string name in failure msgs.
-    """
-
-    try:
-        doc = f.__doc__
-        if not doc:
-            # docstring empty or None
-            return 0, 0
-        # just in case CT invents a doc object that has to be forced
-        # to look like a string <0.9 wink>
-        doc = str(doc)
-    except:
-        return 0, 0
-
-    e = _extract_examples(doc)
-    if not e:
-        return 0, 0
-    return _run_examples(e, globs, verbose, name)
-
-def is_private(prefix, base):
-    """prefix, base -> true iff name prefix + "." + base is "private".
-
-    Prefix may be an empty string, and base does not contain a period.
-    Prefix is ignored (although functions you write conforming to this
-    protocol may make use of it).
-    Return true iff base begins with an (at least one) underscore, but
-    does not both begin and end with (at least) two underscores.
-
-    >>> is_private("a.b", "my_func")
-    0
-    >>> is_private("____", "_my_func")
-    1
-    >>> is_private("someclass", "__init__")
-    0
-    >>> is_private("sometypo", "__init_")
-    1
-    >>> is_private("x.y.z", "_")
-    1
-    >>> is_private("_x.y.z", "__")
-    0
-    >>> is_private("", "")  # senseless but consistent
-    0
-    """
-
-    return base[:1] == "_" and not base[:2] == "__" == base[-2:]
-
-class Tester:
-    """Class Tester -- runs docstring examples and accumulates stats.
-
-In normal use, function doctest.testmod() hides all this from you,
-so use that if you can.  Create your own instances of Tester to do
-fancier things.
-
-Methods:
-    runstring(s, name)
-        Search string s for examples to run; use name for logging.
-        Return (#failures, #tries).
-
-    rundoc(object, name=None)
-        Search object.__doc__ for examples to run; use name (or
-        object.__name__) for logging.  Return (#failures, #tries).
-
-    rundict(d, name)
-        Search for examples in docstrings in all of d.values(); use name
-        for logging.  Return (#failures, #tries).
-
-    run__test__(d, name)
-        Treat dict d like module.__test__.  Return (#failures, #tries).
-
-    summarize(verbose=None)
-        Display summary of testing results, to stdout.  Return
-        (#failures, #tries).
-
-    merge(other)
-        Merge in the test results from Tester instance "other".
-
->>> from doctest import Tester
->>> t = Tester(globs={'x': 42}, verbose=0)
->>> t.runstring(r'''
-...      >>> x = x * 2
-...      >>> print x
-...      42
-... ''', 'XYZ')
-*****************************************************************
-Failure in example: print x
-from line #2 of XYZ
-Expected: 42
-Got: 84
-(1, 2)
->>> t.runstring(">>> x = x * 2\\n>>> print x\\n84\\n", 'example2')
-(0, 2)
->>> t.summarize()
-1 items had failures:
-   1 of   2 in XYZ
-***Test Failed*** 1 failures.
-(1, 4)
->>> t.summarize(verbose=1)
-1 items passed all tests:
-   2 tests in example2
-1 items had failures:
-   1 of   2 in XYZ
-4 tests in 2 items.
-3 passed and 1 failed.
-***Test Failed*** 1 failures.
-(1, 4)
->>>
-"""
-
-    def __init__(self, mod=None, globs=None, verbose=None,
-                 isprivate=None):
-        """mod=None, globs=None, verbose=None, isprivate=None
-
-See doctest.__doc__ for an overview.
-
-Optional keyword arg "mod" is a module, whose globals are used for
-executing examples.  If not specified, globs must be specified.
-
-Optional keyword arg "globs" gives a dict to be used as the globals
-when executing examples; if not specified, use the globals from
-module mod.
-
-In either case, a copy of the dict is used for each docstring
-examined.
-
-Optional keyword arg "verbose" prints lots of stuff if true, only
-failures if false; by default, it's true iff "-v" is in sys.argv.
-
-Optional keyword arg "isprivate" specifies a function used to determine
-whether a name is private.  The default function is doctest.is_private;
-see its docs for details.
-"""
-
-        if mod is None and globs is None:
-            raise TypeError("Tester.__init__: must specify mod or globs")
-        if mod is not None and type(mod) is not _ModuleType:
-            raise TypeError("Tester.__init__: mod must be a module; " +
-                            `mod`)
-        if globs is None:
-            globs = mod.__dict__
-        self.globs = globs
-
-        if verbose is None:
-            import sys
-            verbose = "-v" in sys.argv
-        self.verbose = verbose
-
-        if isprivate is None:
-            isprivate = is_private
-        self.isprivate = isprivate
-
-        self.name2ft = {}   # map name to (#failures, #trials) pair
-
-    def runstring(self, s, name):
-        """
-        s, name -> search string s for examples to run, logging as name.
-
-        Use string name as the key for logging the outcome.
-        Return (#failures, #examples).
-
-        >>> t = Tester(globs={}, verbose=1)
-        >>> test = r'''
-        ...    # just an example
-        ...    >>> x = 1 + 2
-        ...    >>> x
-        ...    3
-        ... '''
-        >>> t.runstring(test, "Example")
-        Running string Example
-        Trying: x = 1 + 2
-        Expecting: nothing
-        ok
-        Trying: x
-        Expecting: 3
-        ok
-        0 of 2 examples failed in string Example
-        (0, 2)
-        """
-
-        if self.verbose:
-            print "Running string", name
-        f = t = 0
-        e = _extract_examples(s)
-        if e:
-            f, t = _run_examples(e, self.globs.copy(), self.verbose, name)
-        if self.verbose:
-            print f, "of", t, "examples failed in string", name
-        self.__record_outcome(name, f, t)
-        return f, t
-
-    def rundoc(self, object, name=None):
-        """
-        object, name=None -> search object.__doc__ for examples to run.
-
-        Use optional string name as the key for logging the outcome;
-        by default use object.__name__.
-        Return (#failures, #examples).
-        If object is a class object, search recursively for method
-        docstrings too.
-        object.__doc__ is examined regardless of name, but if object is
-        a class, whether private names reached from object are searched
-        depends on the constructor's "isprivate" argument.
-
-        >>> t = Tester(globs={}, verbose=0)
-        >>> def _f():
-        ...     '''Trivial docstring example.
-        ...     >>> assert 2 == 2
-        ...     '''
-        ...     return 32
-        ...
-        >>> t.rundoc(_f)  # expect 0 failures in 1 example
-        (0, 1)
-        """
-
-        if name is None:
-            try:
-                name = object.__name__
-            except AttributeError:
-                raise ValueError("Tester.rundoc: name must be given "
-                    "when object.__name__ doesn't exist; " + `object`)
-        if self.verbose:
-            print "Running", name + ".__doc__"
-        f, t = run_docstring_examples(object, self.globs.copy(),
-                                      self.verbose, name)
-        if self.verbose:
-            print f, "of", t, "examples failed in", name + ".__doc__"
-        self.__record_outcome(name, f, t)
-        if type(object) is _ClassType:
-            f2, t2 = self.rundict(object.__dict__, name)
-            f = f + f2
-            t = t + t2
-        return f, t
-
-    def rundict(self, d, name):
-        """
-        d. name -> search for docstring examples in all of d.values().
-
-        For k, v in d.items() such that v is a function or class,
-        do self.rundoc(v, name + "." + k).  Whether this includes
-        objects with private names depends on the constructor's
-        "isprivate" argument.
-        Return aggregate (#failures, #examples).
-
-        >>> def _f():
-        ...    '''>>> assert 1 == 1
-        ...    '''
-        >>> def g():
-        ...    '''>>> assert 2 != 1
-        ...    '''
-        >>> d = {"_f": _f, "g": g}
-        >>> t = Tester(globs={}, verbose=0)
-        >>> t.rundict(d, "rundict_test")  # _f is skipped
-        (0, 1)
-        >>> t = Tester(globs={}, verbose=0, isprivate=lambda x,y: 0)
-        >>> t.rundict(d, "rundict_test_pvt")  # both are searched
-        (0, 2)
-        """
-
-        if not hasattr(d, "items"):
-            raise TypeError("Tester.rundict: d must support .items(); " +
-                            `d`)
-        f = t = 0
-        for thisname, value in d.items():
-            if type(value) in (_FunctionType, _ClassType):
-                f2, t2 = self.__runone(value, name + "." + thisname)
-                f = f + f2
-                t = t + t2
-        return f, t
-
-    def run__test__(self, d, name):
-        """d, name -> Treat dict d like module.__test__.
-
-        Return (#failures, #tries).
-        See testmod.__doc__ for details.
-        """
-
-        failures = tries = 0
-        prefix = name + "."
-        savepvt = self.isprivate
-        try:
-            self.isprivate = lambda *args: 0
-            for k, v in d.items():
-                thisname = prefix + k
-                if type(v) is _StringType:
-                    f, t = self.runstring(v, thisname)
-                elif type(v) in (_FunctionType, _ClassType):
-                    f, t = self.rundoc(v, thisname)
-                else:
-                    raise TypeError("Tester.run__test__: values in "
-                            "dict must be strings, functions "
-                            "or classes; " + `v`)
-                failures = failures + f
-                tries = tries + t
-        finally:
-            self.isprivate = savepvt
-        return failures, tries
-
-    def summarize(self, verbose=None):
-        """
-        verbose=None -> summarize results, return (#failures, #tests).
-
-        Print summary of test results to stdout.
-        Optional arg 'verbose' controls how wordy this is.  By
-        default, use the verbose setting established by the
-        constructor.
-        """
-
-        if verbose is None:
-            verbose = self.verbose
-        notests = []
-        passed = []
-        failed = []
-        totalt = totalf = 0
-        for x in self.name2ft.items():
-            name, (f, t) = x
-            assert f <= t
-            totalt = totalt + t
-            totalf = totalf + f
-            if t == 0:
-                notests.append(name)
-            elif f == 0:
-                passed.append( (name, t) )
-            else:
-                failed.append(x)
-        if verbose:
-            if notests:
-                print len(notests), "items had no tests:"
-                notests.sort()
-                for thing in notests:
-                    print "   ", thing
-            if passed:
-                print len(passed), "items passed all tests:"
-                passed.sort()
-                for thing, count in passed:
-                    print " %3d tests in %s" % (count, thing)
-        if failed:
-            print len(failed), "items had failures:"
-            failed.sort()
-            for thing, (f, t) in failed:
-                print " %3d of %3d in %s" % (f, t, thing)
-        if verbose:
-            print totalt, "tests in", len(self.name2ft), "items."
-            print totalt - totalf, "passed and", totalf, "failed."
-        if totalf:
-            print "***Test Failed***", totalf, "failures."
-        elif verbose:
-            print "Test passed."
-        return totalf, totalt
-
-    def merge(self, other):
-        """
-        other -> merge in test results from the other Tester instance.
-
-        If self and other both have a test result for something
-        with the same name, the (#failures, #tests) results are
-        summed, and a warning is printed to stdout.
-
-        >>> from doctest import Tester
-        >>> t1 = Tester(globs={}, verbose=0)
-        >>> t1.runstring('''
-        ... >>> x = 12
-        ... >>> print x
-        ... 12
-        ... ''', "t1example")
-        (0, 2)
-        >>>
-        >>> t2 = Tester(globs={}, verbose=0)
-        >>> t2.runstring('''
-        ... >>> x = 13
-        ... >>> print x
-        ... 13
-        ... ''', "t2example")
-        (0, 2)
-        >>> common = ">>> assert 1 + 2 == 3\\n"
-        >>> t1.runstring(common, "common")
-        (0, 1)
-        >>> t2.runstring(common, "common")
-        (0, 1)
-        >>> t1.merge(t2)
-        *** Tester.merge: 'common' in both testers; summing outcomes.
-        >>> t1.summarize(1)
-        3 items passed all tests:
-           2 tests in common
-           2 tests in t1example
-           2 tests in t2example
-        6 tests in 3 items.
-        6 passed and 0 failed.
-        Test passed.
-        (0, 6)
-        >>>
-        """
-
-        d = self.name2ft
-        for name, (f, t) in other.name2ft.items():
-            if d.has_key(name):
-                print "*** Tester.merge: '" + name + "' in both" \
-                    " testers; summing outcomes."
-                f2, t2 = d[name]
-                f = f + f2
-                t = t + t2
-            d[name] = f, t
-
-    def __record_outcome(self, name, f, t):
-        if self.name2ft.has_key(name):
-            print "*** Warning: '" + name + "' was tested before;", \
-                "summing outcomes."
-            f2, t2 = self.name2ft[name]
-            f = f + f2
-            t = t + t2
-        self.name2ft[name] = f, t
-
-    def __runone(self, target, name):
-        if "." in name:
-            i = _string_rindex(name, ".")
-            prefix, base = name[:i], name[i+1:]
-        else:
-            prefix, base = "", base
-        if self.isprivate(prefix, base):
-            return 0, 0
-        return self.rundoc(target, name)
-
-master = None
-
-def testmod(m, name=None, globs=None, verbose=None, isprivate=None,
-               report=1):
-    """m, name=None, globs=None, verbose=None, isprivate=None, report=1
-
-    Test examples in docstrings in functions and classes reachable from
-    module m, starting with m.__doc__.  Private names are skipped.
-
-    Also test examples reachable from dict m.__test__ if it exists and is
-    not None.  m.__dict__ maps names to functions, classes and strings;
-    function and class docstrings are tested even if the name is private;
-    strings are tested directly, as if they were docstrings.
-
-    Return (#failures, #tests).
-
-    See doctest.__doc__ for an overview.
-
-    Optional keyword arg "name" gives the name of the module; by default
-    use m.__name__.
-
-    Optional keyword arg "globs" gives a dict to be used as the globals
-    when executing examples; by default, use m.__dict__.  A copy of this
-    dict is actually used for each docstring, so that each docstring's
-    examples start with a clean slate.
-
-    Optional keyword arg "verbose" prints lots of stuff if true, prints
-    only failures if false; by default, it's true iff "-v" is in sys.argv.
-
-    Optional keyword arg "isprivate" specifies a function used to
-    determine whether a name is private.  The default function is
-    doctest.is_private; see its docs for details.
-
-    Optional keyword arg "report" prints a summary at the end when true,
-    else prints nothing at the end.  In verbose mode, the summary is
-    detailed, else very brief (in fact, empty if all tests passed).
-
-    Advanced tomfoolery:  testmod runs methods of a local instance of
-    class doctest.Tester, then merges the results into (or creates)
-    global Tester instance doctest.master.  Methods of doctest.master
-    can be called directly too, if you want to do something unusual.
-    Passing report=0 to testmod is especially useful then, to delay
-    displaying a summary.  Invoke doctest.master.summarize(verbose)
-    when you're done fiddling.
-    """
-
-    global master
-
-    if type(m) is not _ModuleType:
-        raise TypeError("testmod: module required; " + `m`)
-    if name is None:
-        name = m.__name__
-    tester = Tester(m, globs=globs, verbose=verbose, isprivate=isprivate)
-    failures, tries = tester.rundoc(m, name)
-    f, t = tester.rundict(m.__dict__, name)
-    failures = failures + f
-    tries = tries + t
-    if hasattr(m, "__test__"):
-        testdict = m.__test__
-        if testdict:
-            if not hasattr(testdict, "items"):
-                raise TypeError("testmod: module.__test__ must support "
-                                ".items(); " + `testdict`)
-            f, t = tester.run__test__(testdict, name + ".__test__")
-            failures = failures + f
-            tries = tries + t
-    if report:
-        tester.summarize()
-    if master is None:
-        master = tester
-    else:
-        master.merge(tester)
-    return failures, tries
-
-class _TestClass:
-    """
-    A pointless class, for sanity-checking of docstring testing.
-
-    Methods:
-        square()
-        get()
-
-    >>> _TestClass(13).get() + _TestClass(-12).get()
-    1
-    >>> hex(_TestClass(13).square().get())
-    '0xa9'
-    """
-
-    def __init__(self, val):
-        """val -> _TestClass object with associated value val.
-
-        >>> t = _TestClass(123)
-        >>> print t.get()
-        123
-        """
-
-        self.val = val
-
-    def square(self):
-        """square() -> square TestClass's associated value
-
-        >>> _TestClass(13).square().get()
-        169
-        """
-
-        self.val = self.val ** 2
-        return self
-
-    def get(self):
-        """get() -> return TestClass's associated value.
-
-        >>> x = _TestClass(-42)
-        >>> print x.get()
-        -42
-        """
-
-        return self.val
-
-__test__ = {"_TestClass": _TestClass,
-            "string": r"""
-                      Example of a string object, searched as-is.
-                      >>> x = 1; y = 2
-                      >>> x + y, x * y
-                      (3, 2)
-                      """
-           }
-
-def _test():
-    import doctest
-    return doctest.testmod(doctest)
-
-if __name__ == "__main__":
-    _test()
diff --git a/pythonPackages/pil/encode.c b/pythonPackages/pil/encode.c
deleted file mode 100644
index 0a57e74cd2..0000000000
--- a/pythonPackages/pil/encode.c
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: encode.c 2751 2006-06-18 19:50:45Z fredrik $
- *
- * standard encoder interfaces for the Imaging library
- *
- * History:
- * 1996-04-19 fl   Based on decoders.c
- * 1996-05-12 fl   Compile cleanly as C++
- * 1996-12-30 fl   Plugged potential memory leak for tiled images
- * 1997-01-03 fl   Added GIF encoder
- * 1997-01-05 fl   Plugged encoder buffer leaks
- * 1997-01-11 fl   Added encode_to_file method
- * 1998-03-09 fl   Added mode/rawmode argument to encoders
- * 1998-07-09 fl   Added interlace argument to GIF encoder
- * 1999-02-07 fl   Added PCX encoder
- *
- * Copyright (c) 1997-2001 by Secret Labs AB
- * Copyright (c) 1996-1997 by Fredrik Lundh 
- *
- * See the README file for information on usage and redistribution.
- */
-
-/* FIXME: make these pluggable! */
-
-#include "Python.h"
-
-#if PY_VERSION_HEX < 0x01060000
-#define PyObject_New PyObject_NEW
-#define PyObject_Del PyMem_DEL
-#endif
-
-#include "Imaging.h"
-#include "Gif.h"
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h> /* write */
-#endif
-
-/* -------------------------------------------------------------------- */
-/* Common								*/
-/* -------------------------------------------------------------------- */
-
-typedef struct {
-    PyObject_HEAD
-    int (*encode)(Imaging im, ImagingCodecState state,
-		  UINT8* buffer, int bytes);
-    struct ImagingCodecStateInstance state;
-    Imaging im;
-    PyObject* lock;
-} ImagingEncoderObject;
-
-staticforward PyTypeObject ImagingEncoderType;
-
-static ImagingEncoderObject*
-PyImaging_EncoderNew(int contextsize)
-{
-    ImagingEncoderObject *encoder;
-    void *context;
-
-    ImagingEncoderType.ob_type = &PyType_Type;
-
-    encoder = PyObject_New(ImagingEncoderObject, &ImagingEncoderType);
-    if (encoder == NULL)
-	return NULL;
-
-    /* Clear the encoder state */
-    memset(&encoder->state, 0, sizeof(encoder->state));
-
-    /* Allocate encoder context */
-    if (contextsize > 0) {
-	context = (void*) calloc(1, contextsize);
-	if (!context) {
-	    Py_DECREF(encoder);
-	    PyErr_NoMemory();
-	    return NULL;
-	}
-    } else
-	context = 0;
-
-    /* Initialize encoder context */
-    encoder->state.context = context;
-
-    /* Target image */
-    encoder->lock = NULL;
-    encoder->im = NULL;
-
-    return encoder;
-}
-
-static void
-_dealloc(ImagingEncoderObject* encoder)
-{
-    free(encoder->state.buffer);
-    free(encoder->state.context);
-    Py_XDECREF(encoder->lock);
-    PyObject_Del(encoder);
-}
-
-static PyObject* 
-_encode(ImagingEncoderObject* encoder, PyObject* args)
-{
-    PyObject* buf;
-    PyObject* result;
-    int status;
-
-    /* Encode to a Python string (allocated by this method) */
-
-    int bufsize = 16384;
-
-    if (!PyArg_ParseTuple(args, "|i", &bufsize))
-	return NULL;
-
-    buf = PyString_FromStringAndSize(NULL, bufsize);
-    if (!buf)
-	return NULL;
-
-    status = encoder->encode(encoder->im, &encoder->state,
-			     (UINT8*) PyString_AsString(buf), bufsize);
-
-    /* adjust string length to avoid slicing in encoder */
-    if (_PyString_Resize(&buf, (status > 0) ? status : 0) < 0)
-        return NULL;
-
-    result = Py_BuildValue("iiO", status, encoder->state.errcode, buf);
-
-    Py_DECREF(buf); /* must release buffer!!! */
-
-    return result;
-}
-
-static PyObject* 
-_encode_to_file(ImagingEncoderObject* encoder, PyObject* args)
-{
-    UINT8* buf;
-    int status;
-    ImagingSectionCookie cookie;
-
-    /* Encode to a file handle */
-
-    int fh;
-    int bufsize = 16384;
-
-    if (!PyArg_ParseTuple(args, "i|i", &fh, &bufsize))
-	return NULL;
-
-    /* Allocate an encoder buffer */
-    buf = (UINT8*) malloc(bufsize);
-    if (!buf) {
-	PyErr_NoMemory();
-	return NULL;
-    }
-
-    ImagingSectionEnter(&cookie);
-
-    do {
-
-	/* This replaces the inner loop in the ImageFile _save
-	   function. */
-
-	status = encoder->encode(encoder->im, &encoder->state, buf, bufsize);
-
-	if (status > 0)
-	    if (write(fh, buf, status) < 0) {
-                ImagingSectionLeave(&cookie);
-		free(buf);
-		return PyErr_SetFromErrno(PyExc_IOError);
-	    }
-
-    } while (encoder->state.errcode == 0);
-
-    ImagingSectionLeave(&cookie);
-
-    free(buf);
-
-    return Py_BuildValue("i", encoder->state.errcode);
-}
-
-extern Imaging PyImaging_AsImaging(PyObject *op);
-
-static PyObject*
-_setimage(ImagingEncoderObject* encoder, PyObject* args)
-{
-    PyObject* op;
-    Imaging im;
-    ImagingCodecState state;
-    int x0, y0, x1, y1;
-
-    /* Define where image data should be stored */
-
-    x0 = y0 = x1 = y1 = 0;
-
-    /* FIXME: should publish the ImagingType descriptor */
-    if (!PyArg_ParseTuple(args, "O|(iiii)", &op, &x0, &y0, &x1, &y1))
-	return NULL;
-    im = PyImaging_AsImaging(op);
-    if (!im)
-	return NULL;
-
-    encoder->im = im;
-
-    state = &encoder->state;
-
-    if (x0 == 0 && x1 == 0) {
-	state->xsize = im->xsize;
-	state->ysize = im->ysize;
-    } else {
-	state->xoff = x0;
-	state->yoff = y0;
-	state->xsize = x1 - x0;
-	state->ysize = y1 - y0;
-    }
-
-    if (state->xsize <= 0 ||
-	state->xsize + state->xoff > im->xsize ||
-	state->ysize <= 0 ||
-	state->ysize + state->yoff > im->ysize) {
-	PyErr_SetString(PyExc_SystemError, "tile cannot extend outside image");
-	return NULL;
-    }
-
-    /* Allocate memory buffer (if bits field is set) */
-    if (state->bits > 0) {
-	state->bytes = (state->bits * state->xsize+7)/8;
-	state->buffer = (UINT8*) malloc(state->bytes);
-	if (!state->buffer) {
-	    PyErr_NoMemory();
-	    return NULL;
-	}
-    }
-
-    /* Keep a reference to the image object, to make sure it doesn't
-       go away before we do */
-    Py_INCREF(op);
-    Py_XDECREF(encoder->lock);
-    encoder->lock = op;
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static struct PyMethodDef methods[] = {
-    {"encode", (PyCFunction)_encode, 1},
-    {"encode_to_file", (PyCFunction)_encode_to_file, 1},
-    {"setimage", (PyCFunction)_setimage, 1},
-    {NULL, NULL} /* sentinel */
-};
-
-static PyObject*  
-_getattr(ImagingEncoderObject* self, char* name)
-{
-    return Py_FindMethod(methods, (PyObject*) self, name);
-}
-
-statichere PyTypeObject ImagingEncoderType = {
-	PyObject_HEAD_INIT(NULL)
-	0,				/*ob_size*/
-	"ImagingEncoder",		/*tp_name*/
-	sizeof(ImagingEncoderObject),	/*tp_size*/
-	0,				/*tp_itemsize*/
-	/* methods */
-	(destructor)_dealloc,		/*tp_dealloc*/
-	0,				/*tp_print*/
-	(getattrfunc)_getattr,		/*tp_getattr*/
-	0,				/*tp_setattr*/
-	0,				/*tp_compare*/
-	0,				/*tp_repr*/
-	0,                              /*tp_hash*/
-};
-
-/* -------------------------------------------------------------------- */
-
-int
-get_packer(ImagingEncoderObject* encoder, const char* mode,
-           const char* rawmode)
-{
-    int bits;
-    ImagingShuffler pack;
-
-    pack = ImagingFindPacker(mode, rawmode, &bits);
-    if (!pack) {
-	Py_DECREF(encoder);
-	PyErr_SetString(PyExc_SystemError, "unknown raw mode");
-	return -1;
-    }
-
-    encoder->state.shuffle = pack;
-    encoder->state.bits = bits;
-
-    return 0;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* EPS									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_EpsEncoderNew(PyObject* self, PyObject* args)
-{
-    ImagingEncoderObject* encoder;
-
-    encoder = PyImaging_EncoderNew(0);
-    if (encoder == NULL)
-	return NULL;
-
-    encoder->encode = ImagingEpsEncode;
-
-    return (PyObject*) encoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* GIF									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_GifEncoderNew(PyObject* self, PyObject* args)
-{
-    ImagingEncoderObject* encoder;
-
-    char *mode;
-    char *rawmode;
-    int bits = 8;
-    int interlace = 0;
-    if (!PyArg_ParseTuple(args, "ss|ii", &mode, &rawmode, &bits, &interlace))
-	return NULL;
-
-    encoder = PyImaging_EncoderNew(sizeof(GIFENCODERSTATE));
-    if (encoder == NULL)
-	return NULL;
-
-    if (get_packer(encoder, mode, rawmode) < 0)
-	return NULL;
-
-    encoder->encode = ImagingGifEncode;
-
-    ((GIFENCODERSTATE*)encoder->state.context)->bits = bits;
-    ((GIFENCODERSTATE*)encoder->state.context)->interlace = interlace;
-
-    return (PyObject*) encoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* PCX									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_PcxEncoderNew(PyObject* self, PyObject* args)
-{
-    ImagingEncoderObject* encoder;
-
-    char *mode;
-    char *rawmode;
-    int bits = 8;
-    if (!PyArg_ParseTuple(args, "ss|ii", &mode, &rawmode, &bits))
-	return NULL;
-
-    encoder = PyImaging_EncoderNew(0);
-    if (encoder == NULL)
-	return NULL;
-
-    if (get_packer(encoder, mode, rawmode) < 0)
-	return NULL;
-
-    encoder->encode = ImagingPcxEncode;
-
-    return (PyObject*) encoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* RAW									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_RawEncoderNew(PyObject* self, PyObject* args)
-{
-    ImagingEncoderObject* encoder;
-
-    char *mode;
-    char *rawmode;
-    int stride = 0;
-    int ystep = 1;
-
-    if (!PyArg_ParseTuple(args, "ss|ii", &mode, &rawmode, &stride, &ystep))
-	return NULL;
-
-    encoder = PyImaging_EncoderNew(0);
-    if (encoder == NULL)
-	return NULL;
-
-    if (get_packer(encoder, mode, rawmode) < 0)
-	return NULL;
-
-    encoder->encode = ImagingRawEncode;
-
-    encoder->state.ystep = ystep;
-    encoder->state.count = stride;
-
-    return (PyObject*) encoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* XBM									*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyImaging_XbmEncoderNew(PyObject* self, PyObject* args)
-{
-    ImagingEncoderObject* encoder;
-
-    encoder = PyImaging_EncoderNew(0);
-    if (encoder == NULL)
-	return NULL;
-
-    if (get_packer(encoder, "1", "1;R") < 0)
-	return NULL;
-
-    encoder->encode = ImagingXbmEncode;
-
-    return (PyObject*) encoder;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* ZIP									*/
-/* -------------------------------------------------------------------- */
-
-#ifdef HAVE_LIBZ
-
-#include "Zip.h"
-
-PyObject*
-PyImaging_ZipEncoderNew(PyObject* self, PyObject* args)
-{
-    ImagingEncoderObject* encoder;
-
-    char* mode;
-    char* rawmode;
-    int optimize = 0;
-    char* dictionary = NULL;
-    int dictionary_size = 0;
-    if (!PyArg_ParseTuple(args, "ss|is#", &mode, &rawmode, &optimize,
-			  &dictionary, &dictionary_size))
-	return NULL;
-
-    encoder = PyImaging_EncoderNew(sizeof(ZIPSTATE));
-    if (encoder == NULL)
-	return NULL;
-
-    if (get_packer(encoder, mode, rawmode) < 0)
-	return NULL;
-
-    encoder->encode = ImagingZipEncode;
-
-    if (rawmode[0] == 'P')
-	/* disable filtering */
-	((ZIPSTATE*)encoder->state.context)->mode = ZIP_PNG_PALETTE;
-
-    ((ZIPSTATE*)encoder->state.context)->optimize = optimize;
-    ((ZIPSTATE*)encoder->state.context)->dictionary = dictionary;
-    ((ZIPSTATE*)encoder->state.context)->dictionary_size = dictionary_size;
-
-    return (PyObject*) encoder;
-}
-#endif
-
-
-/* -------------------------------------------------------------------- */
-/* JPEG									*/
-/* -------------------------------------------------------------------- */
-
-#ifdef HAVE_LIBJPEG
-
-/* We better define this encoder last in this file, so the following
-   undef's won't mess things up for the Imaging library proper. */
-
-#undef	HAVE_PROTOTYPES
-#undef	HAVE_STDDEF_H
-#undef	HAVE_STDLIB_H
-#undef	UINT8
-#undef	UINT16
-#undef	UINT32
-#undef	INT8
-#undef	INT16
-#undef	INT32
-
-#include "Jpeg.h"
-
-PyObject*
-PyImaging_JpegEncoderNew(PyObject* self, PyObject* args)
-{
-    ImagingEncoderObject* encoder;
-
-    char *mode;
-    char *rawmode;
-    int quality = 0;
-    int progressive = 0;
-    int smooth = 0;
-    int optimize = 0;
-    int streamtype = 0; /* 0=interchange, 1=tables only, 2=image only */
-    int xdpi = 0, ydpi = 0;
-    if (!PyArg_ParseTuple(args, "ss|iiiiiii", &mode, &rawmode, &quality,
-			  &progressive, &smooth, &optimize, &streamtype,
-                          &xdpi, &ydpi))
-	return NULL;
-
-    encoder = PyImaging_EncoderNew(sizeof(JPEGENCODERSTATE));
-    if (encoder == NULL)
-	return NULL;
-
-    if (get_packer(encoder, mode, rawmode) < 0)
-	return NULL;
-
-    encoder->encode = ImagingJpegEncode;
-
-    ((JPEGENCODERSTATE*)encoder->state.context)->quality = quality;
-    ((JPEGENCODERSTATE*)encoder->state.context)->progressive = progressive;
-    ((JPEGENCODERSTATE*)encoder->state.context)->smooth = smooth;
-    ((JPEGENCODERSTATE*)encoder->state.context)->optimize = optimize;
-    ((JPEGENCODERSTATE*)encoder->state.context)->streamtype = streamtype;
-    ((JPEGENCODERSTATE*)encoder->state.context)->xdpi = xdpi;
-    ((JPEGENCODERSTATE*)encoder->state.context)->ydpi = ydpi;
-
-    return (PyObject*) encoder;
-}
-
-#endif
diff --git a/pythonPackages/pil/libImaging/Access.c b/pythonPackages/pil/libImaging/Access.c
deleted file mode 100644
index 6b2fcbd141..0000000000
--- a/pythonPackages/pil/libImaging/Access.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Access.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * imaging access objects
- *
- * an access object can convert image data on the fly
- *
- * history:
- * 98-12-29 fl	Created
- *
- * Copyright (c) Secret Labs AB 1998.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-static void
-access_destroy(ImagingAccess access)
-{
-    /* nop */
-}
-
-static int
-access_getline(ImagingAccess access, char* buffer, int y)
-{
-    memcpy(buffer, access->im->image[y], access->im->linesize);
-    return 1;
-}
-
-ImagingAccess
-ImagingAccessNew(Imaging im)
-{
-    /* Create a standard access object */
-
-    ImagingAccess access;
-
-    access = calloc(1, sizeof(struct ImagingAccessInstance));
-    if (!access)
-	return (ImagingAccess) ImagingError_MemoryError();
-
-    access->im = im;
-
-    access->getline = access_getline;
-    access->destroy = access_destroy;
-
-    return access;
-}
-
-void
-ImagingAccessDelete(ImagingAccess access)
-{
-    if (!access)
-	return;
-
-    if (access->destroy)
-	access->destroy(access);
-
-    free(access);
-}
diff --git a/pythonPackages/pil/libImaging/Antialias.c b/pythonPackages/pil/libImaging/Antialias.c
deleted file mode 100644
index 089056e7c5..0000000000
--- a/pythonPackages/pil/libImaging/Antialias.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Antialias.c 2408 2005-05-15 09:31:27Z Fredrik $
- *
- * pilopen antialiasing support 
- *
- * history:
- * 2002-03-09 fl  Created (for PIL 1.1.3)
- * 2002-03-10 fl  Added support for mode "F"
- *
- * Copyright (c) 1997-2002 by Secret Labs AB
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Imaging.h"
-
-#include <math.h>
-
-/* resampling filters (from antialias.py) */
-
-struct filter {
-    float (*filter)(float x);
-    float support;
-};
-
-static inline float sinc_filter(float x)
-{
-    if (x == 0.0)
-        return 1.0;
-    x = x * M_PI;
-    return sin(x) / x;
-}
-
-static inline float antialias_filter(float x)
-{
-    /* lanczos (truncated sinc) */
-    if (-3.0 <= x && x < 3.0)
-        return sinc_filter(x) * sinc_filter(x/3);
-    return 0.0;
-}
-
-static struct filter ANTIALIAS = { antialias_filter, 3.0 };
-
-static inline float nearest_filter(float x)
-{
-    if (-0.5 <= x && x < 0.5)
-        return 1.0;
-    return 0.0;
-}
-
-static struct filter NEAREST = { nearest_filter, 0.5 };
-
-static inline float bilinear_filter(float x)
-{
-    if (x < 0.0)
-        x = -x;
-    if (x < 1.0)
-        return 1.0-x;
-    return 0.0;
-}
-
-static struct filter BILINEAR = { bilinear_filter, 1.0 };
-
-static inline float bicubic_filter(float x)
-{
-    /* FIXME: double-check this algorithm */
-    /* FIXME: for best results, "a" should be -0.5 to -1.0, but we'll
-       set it to zero for now, to match the 1.1 magnifying filter */
-#define a 0.0
-    if (x < 0.0)
-        x = -x;
-    if (x < 1.0)
-        return (((a + 2.0) * x) - (a + 3.0)) * x*x + 1;
-    if (x < 2.0)
-        return (((a * x) - 5*a) * x + 8) * x - 4*a;
-    return 0.0;
-#undef a
-}
-
-static struct filter BICUBIC = { bicubic_filter, 2.0 };
-
-Imaging
-ImagingStretch(Imaging imOut, Imaging imIn, int filter)
-{
-    /* FIXME: this is a quick and straightforward translation from a
-       python prototype.  might need some further C-ification... */
-
-    ImagingSectionCookie cookie;
-    struct filter *filterp;
-    float support, scale, filterscale;
-    float center, ww, ss, ymin, ymax, xmin, xmax;
-    int xx, yy, x, y, b;
-    float *k;
-
-    /* check modes */
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
-	return (Imaging) ImagingError_ModeError();
-
-    /* check filter */
-    switch (filter) {
-    case IMAGING_TRANSFORM_NEAREST:
-        filterp = &NEAREST;
-        break;
-    case IMAGING_TRANSFORM_ANTIALIAS:
-        filterp = &ANTIALIAS;
-        break;
-    case IMAGING_TRANSFORM_BILINEAR:
-        filterp = &BILINEAR;
-        break;
-    case IMAGING_TRANSFORM_BICUBIC:
-        filterp = &BICUBIC;
-        break;
-    default:
-        return (Imaging) ImagingError_ValueError(
-            "unsupported resampling filter"
-            );
-    }
-
-    if (imIn->ysize == imOut->ysize) {
-        /* prepare for horizontal stretch */
-        filterscale = scale = (float) imIn->xsize / imOut->xsize;
-    } else if (imIn->xsize == imOut->xsize) {
-        /* prepare for vertical stretch */
-        filterscale = scale = (float) imIn->ysize / imOut->ysize;
-    } else
-	return (Imaging) ImagingError_Mismatch();
-
-    /* determine support size (length of resampling filter) */
-    support = filterp->support;
-
-    if (filterscale < 1.0) {
-        filterscale = 1.0;
-        support = 0.5;
-    }
-    
-    support = support * filterscale;
-
-    /* coefficient buffer (with rounding safety margin) */
-    k = malloc(((int) support * 2 + 10) * sizeof(float));
-    if (!k)
-        return (Imaging) ImagingError_MemoryError();
-
-    ImagingSectionEnter(&cookie);
-    if (imIn->xsize == imOut->xsize) {
-        /* vertical stretch */
-        for (yy = 0; yy < imOut->ysize; yy++) {
-            center = (yy + 0.5) * scale;
-            ww = 0.0;
-            ss = 1.0 / filterscale;
-            /* calculate filter weights */
-            ymin = floor(center - support);
-            if (ymin < 0.0)
-                ymin = 0.0;
-            ymax = ceil(center + support);
-            if (ymax > imIn->ysize)
-                ymax = imIn->ysize;
-            for (y = (int) ymin; y < (int) ymax; y++) {
-                float w = filterp->filter((y - center + 0.5) * ss) * ss;
-                k[y - (int) ymin] = w;
-                ww = ww + w;
-            }
-            if (ww == 0.0)
-                ww = 1.0;
-            else
-                ww = 1.0 / ww;
-            if (imIn->image8) {
-                /* 8-bit grayscale */
-                for (xx = 0; xx < imOut->xsize; xx++) {
-                    ss = 0.0;
-                    for (y = (int) ymin; y < (int) ymax; y++)
-                        ss = ss + imIn->image8[y][xx] * k[y - (int) ymin];
-                    ss = ss * ww + 0.5;
-                    if (ss < 0.5)
-                        imOut->image8[yy][xx] = 0;
-                    else if (ss >= 255.0)
-                        imOut->image8[yy][xx] = 255;
-                    else
-                        imOut->image8[yy][xx] = (UINT8) ss;
-                }
-            } else
-                switch(imIn->type) {
-                case IMAGING_TYPE_UINT8:
-                    /* n-bit grayscale */
-                    for (xx = 0; xx < imOut->xsize*4; xx++) {
-                        /* FIXME: skip over unused pixels */
-                        ss = 0.0;
-                        for (y = (int) ymin; y < (int) ymax; y++)
-                            ss = ss + (UINT8) imIn->image[y][xx] * k[y-(int) ymin];
-                        ss = ss * ww + 0.5;
-                        if (ss < 0.5)
-                            imOut->image[yy][xx] = (UINT8) 0;
-                        else if (ss >= 255.0)
-                            imOut->image[yy][xx] = (UINT8) 255;
-                        else
-                            imOut->image[yy][xx] = (UINT8) ss;
-                    }
-                    break;
-                case IMAGING_TYPE_INT32:
-                    /* 32-bit integer */
-                    for (xx = 0; xx < imOut->xsize; xx++) {
-                        ss = 0.0;
-                        for (y = (int) ymin; y < (int) ymax; y++)
-                            ss = ss + IMAGING_PIXEL_I(imIn, xx, y) * k[y - (int) ymin];
-                        IMAGING_PIXEL_I(imOut, xx, yy) = ss * ww;
-                    }
-                    break;
-                case IMAGING_TYPE_FLOAT32:
-                    /* 32-bit float */
-                    for (xx = 0; xx < imOut->xsize; xx++) {
-                        ss = 0.0;
-                        for (y = (int) ymin; y < (int) ymax; y++)
-                            ss = ss + IMAGING_PIXEL_F(imIn, xx, y) * k[y - (int) ymin];
-                        IMAGING_PIXEL_F(imOut, xx, yy) = ss * ww;
-                    }
-                    break;
-                default:
-                    ImagingSectionLeave(&cookie);
-                    return (Imaging) ImagingError_ModeError();
-                }
-        }
-    } else {
-        /* horizontal stretch */
-        for (xx = 0; xx < imOut->xsize; xx++) {
-            center = (xx + 0.5) * scale;
-            ww = 0.0;
-            ss = 1.0 / filterscale;
-            xmin = floor(center - support);
-            if (xmin < 0.0)
-                xmin = 0.0;
-            xmax = ceil(center + support);
-            if (xmax > imIn->xsize)
-                xmax = imIn->xsize;
-            for (x = (int) xmin; x < (int) xmax; x++) {
-                float w = filterp->filter((x - center + 0.5) * ss) * ss;
-                k[x - (int) xmin] = w;
-                ww = ww + w;
-            }
-            if (ww == 0.0)
-                ww = 1.0;
-            else
-                ww = 1.0 / ww;
-            if (imIn->image8) {
-                /* 8-bit grayscale */
-                for (yy = 0; yy < imOut->ysize; yy++) {
-                    ss = 0.0;
-                    for (x = (int) xmin; x < (int) xmax; x++)
-                        ss = ss + imIn->image8[yy][x] * k[x - (int) xmin];
-                    ss = ss * ww + 0.5;
-                    if (ss < 0.5)
-                        imOut->image8[yy][xx] = (UINT8) 0;
-                    else if (ss >= 255.0)
-                        imOut->image8[yy][xx] = (UINT8) 255;
-                    else
-                        imOut->image8[yy][xx] = (UINT8) ss;
-                }
-            } else
-                switch(imIn->type) {
-                case IMAGING_TYPE_UINT8:
-                    /* n-bit grayscale */
-                    for (yy = 0; yy < imOut->ysize; yy++) {
-                        for (b = 0; b < imIn->bands; b++) {
-                            if (imIn->bands == 2 && b)
-                                b = 3; /* hack to deal with LA images */
-                            ss = 0.0;
-                            for (x = (int) xmin; x < (int) xmax; x++)
-                                ss = ss + (UINT8) imIn->image[yy][x*4+b] * k[x - (int) xmin];
-                            ss = ss * ww + 0.5;
-                            if (ss < 0.5)
-                                imOut->image[yy][xx*4+b] = (UINT8) 0;
-                            else if (ss >= 255.0)
-                                imOut->image[yy][xx*4+b] = (UINT8) 255;
-                            else
-                                imOut->image[yy][xx*4+b] = (UINT8) ss;
-                        }
-                    }
-                    break;
-                case IMAGING_TYPE_INT32:
-                    /* 32-bit integer */
-                    for (yy = 0; yy < imOut->ysize; yy++) {
-                        ss = 0.0;
-                        for (x = (int) xmin; x < (int) xmax; x++)
-                            ss = ss + IMAGING_PIXEL_I(imIn, x, yy) * k[x - (int) xmin];
-                        IMAGING_PIXEL_I(imOut, xx, yy) = ss * ww;
-                    }
-                    break;
-                case IMAGING_TYPE_FLOAT32:
-                    /* 32-bit float */
-                    for (yy = 0; yy < imOut->ysize; yy++) {
-                        ss = 0.0;
-                        for (x = (int) xmin; x < (int) xmax; x++)
-                            ss = ss + IMAGING_PIXEL_F(imIn, x, yy) * k[x - (int) xmin];
-                        IMAGING_PIXEL_F(imOut, xx, yy) = ss * ww;
-                    }
-                    break;
-                default:
-                    ImagingSectionLeave(&cookie);
-                    return (Imaging) ImagingError_ModeError();
-                }
-        }
-    }
-    ImagingSectionLeave(&cookie);
-
-    free(k);
-
-    return imOut;
-}
diff --git a/pythonPackages/pil/libImaging/Bands.c b/pythonPackages/pil/libImaging/Bands.c
deleted file mode 100644
index 0952fb604e..0000000000
--- a/pythonPackages/pil/libImaging/Bands.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/* 
- * The Python Imaging Library
- * $Id: Bands.c 2134 2004-10-06 08:55:20Z fredrik $
- * 
- * stuff to extract and paste back individual bands
- *
- * history:
- * 1996-03-20 fl   Created
- * 1997-08-27 fl   Fixed putband for single band targets.
- * 2003-09-26 fl   Fixed getband/putband for 2-band images (LA, PA).
- *
- * Copyright (c) 1997-2003 by Secret Labs AB.
- * Copyright (c) 1996-1997 by Fredrik Lundh.
- *
- * See the README file for details on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-#define CLIP(x) ((x) <= 0 ? 0 : (x) < 256 ? (x) : 255)
-
-
-Imaging
-ImagingGetBand(Imaging imIn, int band)
-{
-    Imaging imOut;
-    int x, y;
-
-    /* Check arguments */
-    if (!imIn || imIn->type != IMAGING_TYPE_UINT8)
-	return (Imaging) ImagingError_ModeError();
-
-    if (band < 0 || band >= imIn->bands)
-	return (Imaging) ImagingError_ValueError("band index out of range");
-
-    /* Shortcuts */
-    if (imIn->bands == 1)
-	return ImagingCopy(imIn);
-
-    /* Special case for LXXA etc */
-    if (imIn->bands == 2 && band == 1)
-        band = 3;
-
-    imOut = ImagingNew("L", imIn->xsize, imIn->ysize);
-    if (!imOut)
-	return NULL;
-
-    /* Extract band from image */
-    for (y = 0; y < imIn->ysize; y++) {
-	UINT8* in = (UINT8*) imIn->image[y] + band;
-	UINT8* out = imOut->image8[y];
-	for (x = 0; x < imIn->xsize; x++) {
-	    out[x] = *in;
-	    in += 4;
-	}
-    }
-
-    return imOut;
-}
-
-Imaging
-ImagingPutBand(Imaging imOut, Imaging imIn, int band)
-{
-    int x, y;
-
-    /* Check arguments */
-    if (!imIn || imIn->bands != 1 || !imOut)
-	return (Imaging) ImagingError_ModeError();
-
-    if (band < 0 || band >= imOut->bands)
-	return (Imaging) ImagingError_ValueError("band index out of range");
-
-    if (imIn->type  != imOut->type  ||
-	imIn->xsize != imOut->xsize ||
-	imIn->ysize != imOut->ysize)
-	return (Imaging) ImagingError_Mismatch();
-
-    /* Shortcuts */
-    if (imOut->bands == 1)
-	return ImagingCopy2(imOut, imIn);
-
-    /* Special case for LXXA etc */
-    if (imOut->bands == 2 && band == 1)
-        band = 3;
-
-    /* Insert band into image */
-    for (y = 0; y < imIn->ysize; y++) {
-	UINT8* in = imIn->image8[y];
-	UINT8* out = (UINT8*) imOut->image[y] + band;
-	for (x = 0; x < imIn->xsize; x++) {
-	    *out = in[x];
-	    out += 4;
-	}
-    }
-
-    return imOut;
-}
-
-Imaging
-ImagingFillBand(Imaging imOut, int band, int color)
-{
-    int x, y;
-
-    /* Check arguments */
-    if (!imOut || imOut->type != IMAGING_TYPE_UINT8)
-	return (Imaging) ImagingError_ModeError();
-
-    if (band < 0 || band >= imOut->bands)
-	return (Imaging) ImagingError_ValueError("band index out of range");
-
-    /* Special case for LXXA etc */
-    if (imOut->bands == 2 && band == 1)
-        band = 3;
-
-    color = CLIP(color);
-
-    /* Insert color into image */
-    for (y = 0; y < imOut->ysize; y++) {
-	UINT8* out = (UINT8*) imOut->image[y] + band;
-	for (x = 0; x < imOut->xsize; x++) {
-	    *out = (UINT8) color;
-	    out += 4;
-	}
-    }
-
-    return imOut;
-}
diff --git a/pythonPackages/pil/libImaging/Bit.h b/pythonPackages/pil/libImaging/Bit.h
deleted file mode 100644
index 56e3a17d2e..0000000000
--- a/pythonPackages/pil/libImaging/Bit.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Bit.h */
-
-typedef struct {
-
-    /* CONFIGURATION */
-
-    /* Number of bits per pixel */
-    int bits;
-
-    /* Line padding (0 or 8) */
-    int pad;
-
-    /* Fill order */
-    /* 0=msb/msb, 1=msbfill/lsbshift, 2=lsbfill/msbshift, 3=lsb/lsb */
-    int fill;
-
-    /* Signed integers (0=unsigned, 1=signed) */
-    int sign;
-
-    /* Lookup table (not implemented) */
-    unsigned long lutsize;
-    FLOAT32* lut;
-
-    /* INTERNAL */
-    unsigned long mask;
-    unsigned long signmask;
-    unsigned long bitbuffer;
-    int bitcount;
-
-} BITSTATE;
diff --git a/pythonPackages/pil/libImaging/BitDecode.c b/pythonPackages/pil/libImaging/BitDecode.c
deleted file mode 100644
index fef719e245..0000000000
--- a/pythonPackages/pil/libImaging/BitDecode.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: BitDecode.c 2278 2005-02-07 20:27:33Z fredrik $
- *
- * decoder for packed bitfields (converts to floating point)
- *
- * history:
- *	97-05-31 fl	created (much more than originally intended)
- *
- * Copyright (c) Fredrik Lundh 1997.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#include "Bit.h"
-
-
-int
-ImagingBitDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    BITSTATE* bitstate = state->context;
-    UINT8* ptr;
-
-    if (state->state == 0) {
-
-	/* Initialize context variables */
-
-        /* this decoder only works for float32 image buffers */
-        if (im->type != IMAGING_TYPE_FLOAT32) {
-	    state->errcode = IMAGING_CODEC_CONFIG;
-	    return -1;
-        }
-
-        /* sanity check */
-        if (bitstate->bits < 1 || bitstate->bits >= 32) {
-	    state->errcode = IMAGING_CODEC_CONFIG;
-	    return -1;
-        }
-
-        bitstate->mask = (1<<bitstate->bits)-1;
-
-        if (bitstate->sign)
-            bitstate->signmask = (1<<(bitstate->bits-1));
-
-	/* check image orientation */
-	if (state->ystep < 0) {
-	    state->y = state->ysize-1;
-	    state->ystep = -1;
-	} else
-	    state->ystep = 1;
-
-	state->state = 1;
-
-    }
-
-    ptr = buf;
-
-    while (bytes > 0) {
-
-        UINT8 byte = *ptr;
-
-        ptr++;
-        bytes--;
-
-        /* get a byte from the input stream and insert in the bit buffer */
-        if (bitstate->fill&1)
-            /* fill MSB first */
-            bitstate->bitbuffer |= (unsigned long) byte << bitstate->bitcount;
-        else
-            /* fill LSB first */
-            bitstate->bitbuffer = (bitstate->bitbuffer << 8) | byte;
-
-        bitstate->bitcount += 8;
-        
-        while (bitstate->bitcount >= bitstate->bits) {
-
-            /* get a pixel from the bit buffer */
-            unsigned long data;
-            FLOAT32 pixel;
-
-            if (bitstate->fill&2) {
-                /* store LSB first */
-                data = bitstate->bitbuffer & bitstate->mask;
-                if (bitstate->bitcount > 32)
-                    /* bitbuffer overflow; restore it from last input byte */
-                    bitstate->bitbuffer = byte >> (8 - (bitstate->bitcount -
-                                                        bitstate->bits));
-                else
-                    bitstate->bitbuffer >>= bitstate->bits;
-            } else
-                /* store MSB first */
-                data = (bitstate->bitbuffer >> (bitstate->bitcount -
-                                                bitstate->bits))
-                       & bitstate->mask;
-
-            bitstate->bitcount -= bitstate->bits;
-
-            if (bitstate->lutsize > 0) {
-                /* map through lookup table */
-                if (data <= 0)
-                    pixel = bitstate->lut[0];
-                else if (data >= bitstate->lutsize)
-                    pixel = bitstate->lut[bitstate->lutsize-1];
-                else
-                    pixel = bitstate->lut[data];
-            } else {
-                /* convert */
-                if (data & bitstate->signmask)
-                    /* image memory contains signed data */
-                    pixel = (FLOAT32) (INT32) (data | ~bitstate->mask);
-                else
-                    pixel = (FLOAT32) data;
-            }
-
-            *(FLOAT32*)(&im->image32[state->y][state->x]) = pixel;
-
-            /* step forward */
-	    if (++state->x >= state->xsize) {
-                /* new line */
-                state->y += state->ystep;
-                if (state->y < 0 || state->y >= state->ysize) {
-                    /* end of file (errcode = 0) */
-                    return -1;
-                }
-                state->x = 0;
-                /* reset bit buffer */ 
-                if (bitstate->pad > 0)
-                    bitstate->bitcount = 0;
-            }
-        }
-    }
-
-    return ptr - buf;
-}
diff --git a/pythonPackages/pil/libImaging/Blend.c b/pythonPackages/pil/libImaging/Blend.c
deleted file mode 100644
index 4d8db66422..0000000000
--- a/pythonPackages/pil/libImaging/Blend.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* 
- * The Python Imaging Library
- * $Id: Blend.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * interpolate between two existing images
- *
- * history:
- * 96-03-20 fl	Created
- * 96-05-18 fl	Simplified blend expression
- * 96-10-05 fl	Fixed expression bug, special case for interpolation
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for details on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-Imaging
-ImagingBlend(Imaging imIn1, Imaging imIn2, float alpha)
-{
-    Imaging imOut;
-    int x, y;
-
-    /* Check arguments */
-    if (!imIn1 || !imIn2 || imIn1->type != IMAGING_TYPE_UINT8)
-	return ImagingError_ModeError();
-    if (imIn1->type  != imIn2->type  ||
-	imIn1->bands != imIn2->bands ||
-	imIn1->xsize != imIn2->xsize ||
-	imIn1->ysize != imIn2->ysize)
-	return ImagingError_Mismatch();
-
-    /* Shortcuts */
-    if (alpha == 0.0)
-	return ImagingCopy(imIn1);
-    else if (alpha == 1.0)
-	return ImagingCopy(imIn2);
-
-    imOut = ImagingNew(imIn1->mode, imIn1->xsize, imIn1->ysize);
-    if (!imOut)
-	return NULL;
-
-    ImagingCopyInfo(imOut, imIn1);
-
-    if (alpha >= 0 && alpha <= 1.0) {
-	/* Interpolate between bands */
-	for (y = 0; y < imIn1->ysize; y++) {
-	    UINT8* in1 = (UINT8*) imIn1->image[y];
-	    UINT8* in2 = (UINT8*) imIn2->image[y];
-	    UINT8* out = (UINT8*) imOut->image[y];
-	    for (x = 0; x < imIn1->linesize; x++)
-		out[x] = (UINT8)
-		    ((int) in1[x] + alpha * ((int) in2[x] - (int) in1[x]));
-	}
-    } else {
-	/* Extrapolation; must make sure to clip resulting values */
-	for (y = 0; y < imIn1->ysize; y++) {
-	    UINT8* in1 = (UINT8*) imIn1->image[y];
-	    UINT8* in2 = (UINT8*) imIn2->image[y];
-	    UINT8* out = (UINT8*) imOut->image[y];
-	    for (x = 0; x < imIn1->linesize; x++) {
-		float temp =
-		    ((int) in1[x] + alpha * ((int) in2[x] - (int) in1[x]));
-		if (temp <= 0.0)
-		    out[x] = 0;
-		else if (temp >= 255.0)
-		    out[x] = 255;
-		else
-		    out[x] = (UINT8) temp;
-	    }
-	}
-    }
-
-    return imOut;
-}
diff --git a/pythonPackages/pil/libImaging/Chops.c b/pythonPackages/pil/libImaging/Chops.c
deleted file mode 100644
index fdd13fdf35..0000000000
--- a/pythonPackages/pil/libImaging/Chops.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* 
- * The Python Imaging Library
- * $Id: Chops.c 2506 2005-09-10 14:52:13Z Fredrik $
- *
- * basic channel operations
- *
- * history:
- * 1996-03-28 fl   Created
- * 1996-08-13 fl   Added and/or/xor for "1" images
- * 1996-12-14 fl   Added add_modulo, sub_modulo
- * 2005-09-10 fl   Fixed output values from and/or/xor
- *
- * Copyright (c) 1996 by Fredrik Lundh.
- * Copyright (c) 1997 by Secret Labs AB.
- *
- * See the README file for details on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#define	CHOP(operation, mode)\
-    int x, y;\
-    Imaging imOut;\
-    imOut = create(imIn1, imIn2, mode);\
-    if (!imOut)\
-	return NULL;\
-    for (y = 0; y < imOut->ysize; y++) {\
-	UINT8* out = (UINT8*) imOut->image[y];\
-	UINT8* in1 = (UINT8*) imIn1->image[y];\
-	UINT8* in2 = (UINT8*) imIn2->image[y];\
-	for (x = 0; x < imOut->linesize; x++) {\
-	    int temp = operation;\
-	    if (temp <= 0)\
-		out[x] = 0;\
-	    else if (temp >= 255)\
-		out[x] = 255;\
-	    else\
-		out[x] = temp;\
-	}\
-    }\
-    return imOut;
-
-#define	CHOP2(operation, mode)\
-    int x, y;\
-    Imaging imOut;\
-    imOut = create(imIn1, imIn2, mode);\
-    if (!imOut)\
-	return NULL;\
-    for (y = 0; y < imOut->ysize; y++) {\
-	UINT8* out = (UINT8*) imOut->image[y];\
-	UINT8* in1 = (UINT8*) imIn1->image[y];\
-	UINT8* in2 = (UINT8*) imIn2->image[y];\
-	for (x = 0; x < imOut->linesize; x++) {\
-	    out[x] = operation;\
-	}\
-    }\
-    return imOut;
-
-static Imaging
-create(Imaging im1, Imaging im2, char* mode)
-{
-    int xsize, ysize;
-
-    if (!im1 || !im2 || im1->type != IMAGING_TYPE_UINT8 ||
-        (mode != NULL && (strcmp(im1->mode, "1") || strcmp(im2->mode, "1"))))
-	return (Imaging) ImagingError_ModeError();
-    if (im1->type  != im2->type  ||
-        im1->bands != im2->bands)
-	return (Imaging) ImagingError_Mismatch();
-
-    xsize = (im1->xsize < im2->xsize) ? im1->xsize : im2->xsize;
-    ysize = (im1->ysize < im2->ysize) ? im1->ysize : im2->ysize;
-
-    return ImagingNew(im1->mode, xsize, ysize);
-}
-
-Imaging
-ImagingChopLighter(Imaging imIn1, Imaging imIn2)
-{
-    CHOP((in1[x] > in2[x]) ? in1[x] : in2[x], NULL);
-}
-
-Imaging
-ImagingChopDarker(Imaging imIn1, Imaging imIn2)
-{
-    CHOP((in1[x] < in2[x]) ? in1[x] : in2[x], NULL);
-}
-
-Imaging
-ImagingChopDifference(Imaging imIn1, Imaging imIn2)
-{
-    CHOP(abs((int) in1[x] - (int) in2[x]), NULL);
-}
-
-Imaging
-ImagingChopMultiply(Imaging imIn1, Imaging imIn2)
-{
-    CHOP((int) in1[x] * (int) in2[x] / 255, NULL);
-}
-
-Imaging
-ImagingChopScreen(Imaging imIn1, Imaging imIn2)
-{
-    CHOP(255 - ((int) (255 - in1[x]) * (int) (255 - in2[x])) / 255, NULL);
-}
-
-Imaging
-ImagingChopAdd(Imaging imIn1, Imaging imIn2, float scale, int offset)
-{
-    CHOP(((int) in1[x] + (int) in2[x]) / scale + offset, NULL);
-}
-
-Imaging
-ImagingChopSubtract(Imaging imIn1, Imaging imIn2, float scale, int offset)
-{
-    CHOP(((int) in1[x] - (int) in2[x]) / scale + offset, NULL);
-}
-
-Imaging
-ImagingChopAnd(Imaging imIn1, Imaging imIn2)
-{
-    CHOP2((in1[x] && in2[x]) ? 255 : 0, "1");
-}
-
-Imaging
-ImagingChopOr(Imaging imIn1, Imaging imIn2)
-{
-    CHOP2((in1[x] || in2[x]) ? 255 : 0, "1");
-}
-
-Imaging
-ImagingChopXor(Imaging imIn1, Imaging imIn2)
-{
-    CHOP2(((in1[x] != 0) ^ (in2[x] != 0)) ? 255 : 0, "1");
-}
-
-Imaging
-ImagingChopAddModulo(Imaging imIn1, Imaging imIn2)
-{
-    CHOP2(in1[x] + in2[x], NULL);
-}
-
-Imaging
-ImagingChopSubtractModulo(Imaging imIn1, Imaging imIn2)
-{
-    CHOP2(in1[x] - in2[x], NULL);
-}
diff --git a/pythonPackages/pil/libImaging/Convert.c b/pythonPackages/pil/libImaging/Convert.c
deleted file mode 100644
index 26bd01c074..0000000000
--- a/pythonPackages/pil/libImaging/Convert.c
+++ /dev/null
@@ -1,1080 +0,0 @@
-/* 
- * The Python Imaging Library
- * $Id: Convert.c 2591 2005-12-08 21:25:29Z fredrik $
- * 
- * convert images
- *
- * history:
- * 1995-06-15 fl   created
- * 1995-11-28 fl   added some "RGBA" and "CMYK" conversions
- * 1996-04-22 fl   added "1" conversions (same as "L")
- * 1996-05-05 fl   added palette conversions (hack)
- * 1996-07-23 fl   fixed "1" conversions to zero/non-zero convention
- * 1996-11-01 fl   fixed "P" to "L" and "RGB" to "1" conversions
- * 1996-12-29 fl   set alpha byte in RGB converters
- * 1997-05-12 fl   added ImagingConvert2
- * 1997-05-30 fl   added floating point support
- * 1997-08-27 fl   added "P" to "1" and "P" to "F" conversions
- * 1998-01-11 fl   added integer support
- * 1998-07-01 fl   added "YCbCr" support
- * 1998-07-02 fl   added "RGBX" conversions (sort of)
- * 1998-07-04 fl   added floyd-steinberg dithering
- * 1998-07-12 fl   changed "YCrCb" to "YCbCr" (!)
- * 1998-12-29 fl   added basic "I;16" and "I;16B" conversions
- * 1999-02-03 fl   added "RGBa", and "BGR" conversions (experimental)
- * 2003-09-26 fl   added "LA" and "PA" conversions (experimental)
- * 2005-05-05 fl   fixed "P" to "1" threshold
- * 2005-12-08 fl   fixed palette memory leak in topalette
- *
- * Copyright (c) 1997-2005 by Secret Labs AB.
- * Copyright (c) 1995-1997 by Fredrik Lundh.
- *
- * See the README file for details on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#define CLIP(v) ((v) <= 0 ? 0 : (v) >= 255 ? 255 : (v))
-#define CLIP16(v) ((v) <= -32768 ? -32768 : (v) >= 32767 ? 32767 : (v))
-
-/* like (a * b + 127) / 255), but much faster on most platforms */
-#define	MULDIV255(a, b, tmp)\
-     	(tmp = (a) * (b) + 128, ((((tmp) >> 8) + (tmp)) >> 8))
-
-/* ITU-R Recommendation 601-2 (assuming nonlinear RGB) */
-#define L(rgb)\
-    ((INT32) (rgb)[0]*299 + (INT32) (rgb)[1]*587 + (INT32) (rgb)[2]*114)
-
-/* ------------------- */
-/* 1 (bit) conversions */
-/* ------------------- */
-
-static void
-bit2l(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++)
-	*out++ = (*in++ != 0) ? 255 : 0;
-}
-
-static void
-bit2rgb(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-        UINT8 v = (*in++ != 0) ? 255 : 0;
-	*out++ = v;
-	*out++ = v;
-	*out++ = v;
-	*out++ = 255;
-    }
-}
-
-static void
-bit2cmyk(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-	*out++ = 0;
-	*out++ = 0;
-	*out++ = 0;
-	*out++ = (*in++ != 0) ? 0 : 255;
-    }
-}
-
-static void
-bit2ycbcr(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-	*out++ = (*in++ != 0) ? 255 : 0;
-        *out++ = 128;
-        *out++ = 128;
-        *out++ = 255;
-    }
-}
-
-/* ----------------- */
-/* RGB/L conversions */
-/* ----------------- */
-
-static void
-l2bit(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++)
-	*out++ = (*in++ >= 128) ? 255 : 0;
-}
-
-static void
-l2la(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-        UINT8 v = *in++;
-	*out++ = v;
-	*out++ = v;
-	*out++ = v;
-	*out++ = 255;
-    }
-}
-
-static void
-l2rgb(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-        UINT8 v = *in++;
-	*out++ = v;
-	*out++ = v;
-	*out++ = v;
-	*out++ = 255;
-    }
-}
-
-static void
-la2l(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4)
-	*out++ = in[0];
-}
-
-static void
-la2rgb(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4) {
-        UINT8 v = in[0];
-	*out++ = v;
-	*out++ = v;
-	*out++ = v;
-	*out++ = in[3];
-    }
-}
-
-static void
-rgb2bit(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4)
-	/* ITU-R Recommendation 601-2 (assuming nonlinear RGB) */
-	*out++ = (L(in) >= 128000) ? 255 : 0;
-}
-
-static void
-rgb2l(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4)
-	/* ITU-R Recommendation 601-2 (assuming nonlinear RGB) */
-	*out++ = L(in) / 1000;
-}
-
-static void
-rgb2la(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4, out += 4) {
-	/* ITU-R Recommendation 601-2 (assuming nonlinear RGB) */
-	out[0] = out[1] = out[2] = L(in) / 1000;
-        out[3] = 255;
-    }
-}
-
-static void
-rgb2i(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    INT32* out = (INT32*) out_;
-    for (x = 0; x < xsize; x++, in += 4)
-	*out++ = L(in) / 1000;
-}
-
-static void
-rgb2f(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    FLOAT32* out = (FLOAT32*) out_;
-    for (x = 0; x < xsize; x++, in += 4)
-	*out++ = L(in) / 1000.0F;
-}
-
-static void
-rgb2bgr15(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    UINT16* out = (UINT16*) out_;
-    for (x = 0; x < xsize; x++, in += 4)
-	*out++ =
-            ((((UINT16)in[0])<<8)&0x7c00) +
-            ((((UINT16)in[1])<<2)&0x03e0) +
-            ((((UINT16)in[2])>>3)&0x001f);
-}
-
-static void
-rgb2bgr16(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    UINT16* out = (UINT16*) out_;
-    for (x = 0; x < xsize; x++, in += 4)
-	*out++ =
-            ((((UINT16)in[0])<<8)&0xf800) +
-            ((((UINT16)in[1])<<3)&0x07e0) +
-            ((((UINT16)in[2])>>3)&0x001f);
-}
-
-static void
-rgb2bgr24(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4) {
-	*out++ = in[2];
-	*out++ = in[1];
-	*out++ = in[0];
-    }
-}
-
-/* ---------------- */
-/* RGBA conversions */
-/* ---------------- */
-
-static void
-rgb2rgba(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-        *out++ = *in++;
-        *out++ = *in++;
-        *out++ = *in++;
-        *out++ = 255; in++;
-    }
-}
-
-static void
-rgba2la(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4, out += 4) {
-	/* ITU-R Recommendation 601-2 (assuming nonlinear RGB) */
-	out[0] = out[1] = out[2] = L(in) / 1000;
-        out[3] = in[3];
-    }
-}
-
-static void
-rgba2rgb(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-        *out++ = *in++;
-        *out++ = *in++;
-        *out++ = *in++;
-        *out++ = 255; in++;
-    }
-}
-
-static void
-rgba2rgba(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    unsigned int alpha, tmp;
-    for (x = 0; x < xsize; x++) {
-        alpha = in[3];
-        *out++ = MULDIV255(*in++, alpha, tmp);
-        *out++ = MULDIV255(*in++, alpha, tmp);
-        *out++ = MULDIV255(*in++, alpha, tmp);
-        *out++ = *in++;
-    }
-}
-
-/* ---------------- */
-/* CMYK conversions */
-/* ---------------- */
-
-static void
-l2cmyk(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-        *out++ = 0;
-        *out++ = 0;
-        *out++ = 0;
-        *out++ = ~(*in++);
-    }
-}
-
-static void
-rgb2cmyk(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-	/* Note: no undercolour removal */
-        *out++ = ~(*in++);
-        *out++ = ~(*in++);
-        *out++ = ~(*in++);
-        *out++ = 0; in++;
-    }
-}
-
-static void
-cmyk2rgb(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4) {
-        *out++ = CLIP(255 - (in[0] + in[3]));
-	*out++ = CLIP(255 - (in[1] + in[3]));
-	*out++ = CLIP(255 - (in[2] + in[3]));
-	*out++ = 255;
-    }
-}
-
-/* ------------- */
-/* I conversions */
-/* ------------- */
-
-static void
-bit2i(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    INT32* out = (INT32*) out_;
-    for (x = 0; x < xsize; x++)
-	*out++ = (*in++ != 0) ? 255 : 0;
-}
-
-static void
-l2i(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    INT32* out = (INT32*) out_;
-    for (x = 0; x < xsize; x++)
-	*out++ = (INT32) *in++;
-}
-
-static void
-i2l(UINT8* out, const UINT8* in_, int xsize)
-{
-    int x;
-    INT32* in = (INT32*) in_;
-    for (x = 0; x < xsize; x++, in++, out++) {
-        if (*in <= 0)
-            *out = 0;
-        else if (*in >= 255)
-            *out = 255;
-        else
-            *out = (UINT8) *in;
-    }
-}
-
-static void
-i2f(UINT8* out_, const UINT8* in_, int xsize)
-{
-    int x;
-    INT32* in = (INT32*) in_;
-    FLOAT32* out = (FLOAT32*) out_;
-    for (x = 0; x < xsize; x++)
-	*out++ = (FLOAT32) *in++;
-}
-
-/* ------------- */
-/* F conversions */
-/* ------------- */
-
-static void
-bit2f(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    FLOAT32* out = (FLOAT32*) out_;
-    for (x = 0; x < xsize; x++)
-	*out++ = (*in++ != 0) ? 255.0F : 0.0F;
-}
-
-static void
-l2f(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    FLOAT32* out = (FLOAT32*) out_;
-    for (x = 0; x < xsize; x++)
-	*out++ = (FLOAT32) *in++;
-}
-
-static void
-f2l(UINT8* out, const UINT8* in_, int xsize)
-{
-    int x;
-    FLOAT32* in = (FLOAT32*) in_;
-    for (x = 0; x < xsize; x++, in++, out++) {
-        if (*in <= 0.0)
-            *out = 0;
-        else if (*in >= 255.0)
-            *out = 255;
-        else
-            *out = (UINT8) *in;
-    }
-}
-
-static void
-f2i(UINT8* out_, const UINT8* in_, int xsize)
-{
-    int x;
-    FLOAT32* in = (FLOAT32*) in_;
-    INT32* out = (INT32*) out_;
-    for (x = 0; x < xsize; x++)
-	*out++ = (INT32) *in++;
-}
-
-/* ----------------- */
-/* YCbCr conversions */
-/* ----------------- */
-
-/* See ConvertYCbCr.c for RGB/YCbCr tables */
-
-static void
-l2ycbcr(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-	*out++ = *in++;
-	*out++ = 128;
-	*out++ = 128;
-	*out++ = 255;
-    }
-}
-
-static void
-ycbcr2l(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4)
-	*out++ = in[0];
-}
-
-/* ------------------------- */
-/* I;16 (16-bit) conversions */
-/* ------------------------- */
-
-static void
-i2i16(UINT8* out, const UINT8* in_, int xsize)
-{
-    int x, v;
-    INT32* in = (INT32*) in_;
-    for (x = 0; x < xsize; x++, in++) {
-        v = CLIP16(*in);
-	*out++ = (UINT8) v;
-        *out++ = (UINT8) (v >> 8);
-    }
-}
-
-static void
-l2i16(UINT8* out, const UINT8* in, int xsize)
-{
-  int x;
-    for (x = 0; x < xsize; x++, in++) {
-	*out++ = *in;
-	*out++ = 0;
-    }
-}
-
-static void
-i2i16b(UINT8* out, const UINT8* in_, int xsize)
-{
-    int x, v;
-    INT32* in = (INT32*) in_;
-    for (x = 0; x < xsize; x++, in++) {
-        v = CLIP16(*in);
-        *out++ = (UINT8) (v >> 8);
-	*out++ = (UINT8) v;
-    }
-}
-
-static void
-i162i(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    INT32* out = (INT32*) out_;
-    for (x = 0; x < xsize; x++, in += 2)
-	*out++ = in[0] + ((int) in[1] << 8);
-}
-
-static void
-i162l(UINT8* out, const UINT8* in, int xsize)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 2)
-      if (in[1] != 0)
-	*out++ = 255;
-      else
-	*out++ = in[0];
-}
-
-static void
-i16b2i(UINT8* out_, const UINT8* in, int xsize)
-{
-    int x;
-    INT32* out = (INT32*) out_;
-    for (x = 0; x < xsize; x++, in += 2)
-	*out++ = ((int) in[0] << 8) + in[1];
-}
-
-
-static struct {
-    const char* from;
-    const char* to;
-    ImagingShuffler convert;
-} converters[] = {
-
-    { "1", "L", bit2l },
-    { "1", "I", bit2i },
-    { "1", "F", bit2f },
-    { "1", "RGB", bit2rgb },
-    { "1", "RGBA", bit2rgb },
-    { "1", "RGBX", bit2rgb },
-    { "1", "CMYK", bit2cmyk },
-    { "1", "YCbCr", bit2ycbcr },
-
-    { "L", "1", l2bit },
-    { "L", "LA", l2la },
-    { "L", "I", l2i },
-    { "L", "F", l2f },
-    { "L", "RGB", l2rgb },
-    { "L", "RGBA", l2rgb },
-    { "L", "RGBX", l2rgb },
-    { "L", "CMYK", l2cmyk },
-    { "L", "YCbCr", l2ycbcr },
-
-    { "LA", "L", la2l },
-    { "LA", "RGB", la2rgb },
-    { "LA", "RGBX", la2rgb },
-    { "LA", "RGBA", la2rgb },
-
-    { "I",    "L",    i2l },
-    { "I",    "F",    i2f },
-
-    { "F",    "L",    f2l },
-    { "F",    "I",    f2i },
-
-    { "RGB", "1", rgb2bit },
-    { "RGB", "L", rgb2l },
-    { "RGB", "LA", rgb2la },
-    { "RGB", "I", rgb2i },
-    { "RGB", "F", rgb2f },
-    { "RGB", "BGR;15", rgb2bgr15 },
-    { "RGB", "BGR;16", rgb2bgr16 },
-    { "RGB", "BGR;24", rgb2bgr24 },
-    { "RGB", "RGBA", rgb2rgba },
-    { "RGB", "RGBX", rgb2rgba },
-    { "RGB", "CMYK", rgb2cmyk },
-    { "RGB", "YCbCr", ImagingConvertRGB2YCbCr },
-
-    { "RGBA", "1", rgb2bit },
-    { "RGBA", "L", rgb2l },
-    { "RGBA", "LA", rgba2la },
-    { "RGBA", "I", rgb2i },
-    { "RGBA", "F", rgb2f },
-    { "RGBA", "RGB", rgba2rgb },
-    { "RGBA", "RGBa", rgba2rgba },
-    { "RGBA", "RGBX", rgb2rgba },
-    { "RGBA", "CMYK", rgb2cmyk },
-    { "RGBA", "YCbCr", ImagingConvertRGB2YCbCr },
-
-    { "RGBX", "1", rgb2bit },
-    { "RGBX", "L", rgb2l },
-    { "RGBA", "I", rgb2i },
-    { "RGBA", "F", rgb2f },
-    { "RGBX", "RGB", rgba2rgb },
-    { "RGBX", "CMYK", rgb2cmyk },
-    { "RGBX", "YCbCr", ImagingConvertRGB2YCbCr },
-
-    { "CMYK", "RGB",  cmyk2rgb },
-    { "CMYK", "RGBA", cmyk2rgb },
-    { "CMYK", "RGBX", cmyk2rgb },
-
-    { "YCbCr", "L", ycbcr2l },
-    { "YCbCr", "RGB", ImagingConvertYCbCr2RGB },
-
-    { "I", "I;16", i2i16 },
-    { "I;16", "I", i162i },
-    { "I", "I;16B", i2i16b },
-    { "I;16B", "I", i16b2i },
-
-    { "L", "I;16", l2i16 },
-    { "I;16", "L", i162l },
-
-    { NULL }
-};
-
-/* FIXME: translate indexed versions to pointer versions below this line */
-
-/* ------------------- */
-/* Palette conversions */
-/* ------------------- */
-
-static void
-p2bit(UINT8* out, const UINT8* in, int xsize, const UINT8* palette)
-{
-    int x;
-    /* FIXME: precalculate greyscale palette? */
-    for (x = 0; x < xsize; x++)
-	*out++ = (L(&palette[in[x]*4]) >= 128000) ? 255 : 0;
-}
-
-static void
-p2l(UINT8* out, const UINT8* in, int xsize, const UINT8* palette)
-{
-    int x;
-    /* FIXME: precalculate greyscale palette? */
-    for (x = 0; x < xsize; x++)
-	*out++ = L(&palette[in[x]*4]) / 1000;
-}
-
-static void
-pa2la(UINT8* out, const UINT8* in, int xsize, const UINT8* palette)
-{
-    int x;
-    /* FIXME: precalculate greyscale palette? */
-    for (x = 0; x < xsize; x++, in += 2) {
-	*out++ = L(&palette[in[0]*4]) / 1000;
-        *out++ = in[1];
-    }
-}
-
-static void
-p2i(UINT8* out_, const UINT8* in, int xsize, const UINT8* palette)
-{
-    int x;
-    INT32* out = (INT32*) out_;
-    for (x = 0; x < xsize; x++)
-	*out++ = L(&palette[in[x]*4]) / 1000;
-}
-
-static void
-p2f(UINT8* out_, const UINT8* in, int xsize, const UINT8* palette)
-{
-    int x;
-    FLOAT32* out = (FLOAT32*) out_;
-    for (x = 0; x < xsize; x++)
-	*out++ = L(&palette[in[x]*4]) / 1000.0F;
-}
-
-static void
-p2rgb(UINT8* out, const UINT8* in, int xsize, const UINT8* palette)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-	const UINT8* rgb = &palette[*in++ * 4];
-	*out++ = rgb[0];
-	*out++ = rgb[1];
-	*out++ = rgb[2];
-	*out++ = 255;
-    }
-}
-
-static void
-p2rgba(UINT8* out, const UINT8* in, int xsize, const UINT8* palette)
-{
-    int x;
-    for (x = 0; x < xsize; x++) {
-	const UINT8* rgba = &palette[*in++ * 4];
-	*out++ = rgba[0];
-	*out++ = rgba[1];
-	*out++ = rgba[2];
-	*out++ = rgba[3];
-    }
-}
-
-static void
-pa2rgba(UINT8* out, const UINT8* in, int xsize, const UINT8* palette)
-{
-    int x;
-    for (x = 0; x < xsize; x++, in += 4) {
-	const UINT8* rgb = &palette[in[0] * 4];
-	*out++ = rgb[0];
-	*out++ = rgb[1];
-	*out++ = rgb[2];
-	*out++ = in[3];
-    }
-}
-
-static void
-p2cmyk(UINT8* out, const UINT8* in, int xsize, const UINT8* palette)
-{
-    p2rgb(out, in, xsize, palette);
-    rgb2cmyk(out, out, xsize);
-}
-
-static void
-p2ycbcr(UINT8* out, const UINT8* in, int xsize, const UINT8* palette)
-{
-    p2rgb(out, in, xsize, palette);
-    ImagingConvertRGB2YCbCr(out, out, xsize);
-}
-
-static Imaging
-frompalette(Imaging imOut, Imaging imIn, const char *mode)
-{
-    ImagingSectionCookie cookie;
-    int alpha;
-    int y;
-    void (*convert)(UINT8*, const UINT8*, int, const UINT8*);
-
-    /* Map palette image to L, RGB, RGBA, or CMYK */
-
-    if (!imIn->palette)
-	return (Imaging) ImagingError_ValueError("no palette");
-
-    alpha = !strcmp(imIn->mode, "PA");
-
-    if (strcmp(mode, "1") == 0)
-	convert = p2bit;
-    else if (strcmp(mode, "L") == 0)
-	convert = p2l;
-    else if (strcmp(mode, "LA") == 0)
-	convert = (alpha) ? pa2la : p2l;
-    else if (strcmp(mode, "I") == 0)
-	convert = p2i;
-    else if (strcmp(mode, "F") == 0)
-	convert = p2f;
-    else if (strcmp(mode, "RGB") == 0)
-	convert = p2rgb;
-    else if (strcmp(mode, "RGBA") == 0)
-	convert = (alpha) ? pa2rgba : p2rgba;
-    else if (strcmp(mode, "RGBX") == 0)
-	convert = p2rgba;
-    else if (strcmp(mode, "CMYK") == 0)
-	convert = p2cmyk;
-    else if (strcmp(mode, "YCbCr") == 0)
-	convert = p2ycbcr;
-    else
-	return (Imaging) ImagingError_ValueError("conversion not supported");
-
-    imOut = ImagingNew2(mode, imOut, imIn);
-    if (!imOut)
-        return NULL;
-
-    ImagingSectionEnter(&cookie);
-    for (y = 0; y < imIn->ysize; y++)
-	(*convert)((UINT8*) imOut->image[y], (UINT8*) imIn->image[y],
-		   imIn->xsize, imIn->palette->palette);
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-static Imaging
-topalette(Imaging imOut, Imaging imIn, ImagingPalette inpalette, int dither)
-{
-    ImagingSectionCookie cookie;
-    int x, y;
-    ImagingPalette palette = inpalette;;
-
-    /* Map L or RGB/RGBX/RGBA to palette image */
-    if (strcmp(imIn->mode, "L") != 0 && strncmp(imIn->mode, "RGB", 3) != 0)
-	return (Imaging) ImagingError_ValueError("conversion not supported");
-
-    if (palette == NULL) {
-      /* FIXME: make user configurable */
-      if (imIn->bands == 1)
-	palette = ImagingPaletteNew("RGB"); /* Initialised to grey ramp */
-      else
-	palette = ImagingPaletteNewBrowser(); /* Standard colour cube */
-    }
-
-    if (!palette)
-	return (Imaging) ImagingError_ValueError("no palette");
-
-    imOut = ImagingNew2("P", imOut, imIn);
-    if (!imOut) {
-      if (palette != inpalette)
-	ImagingPaletteDelete(palette);
-      return NULL;
-    }
-
-    ImagingPaletteDelete(imOut->palette);
-    imOut->palette = ImagingPaletteDuplicate(palette);
-
-    if (imIn->bands == 1) {
-	/* greyscale image */
-
-	/* Greyscale palette: copy data as is */
-        ImagingSectionEnter(&cookie);
-	for (y = 0; y < imIn->ysize; y++)
-	    memcpy(imOut->image[y], imIn->image[y], imIn->linesize);
-        ImagingSectionLeave(&cookie);
-
-    } else {
-	/* colour image */
-
-	/* Create mapping cache */
-	if (ImagingPaletteCachePrepare(palette) < 0) {
-	    ImagingDelete(imOut);
-	    if (palette != inpalette)
-	      ImagingPaletteDelete(palette);
-	    return NULL;
-	}
-
-        if (dither) {
-            /* floyd-steinberg dither */
-
-            int* errors;
-            errors = calloc(imIn->xsize + 1, sizeof(int) * 3);
-            if (!errors) {
-                ImagingDelete(imOut);
-                ImagingError_MemoryError();
-                return NULL;
-            }
-
-            /* Map each pixel to the nearest palette entry */
-            ImagingSectionEnter(&cookie);
-            for (y = 0; y < imIn->ysize; y++) {
-                int r, r0, r1, r2;
-                int g, g0, g1, g2;
-                int b, b0, b1, b2;
-                UINT8* in  = (UINT8*) imIn->image[y];
-                UINT8* out = imOut->image8[y];
-                int* e = errors;
-
-                r = r0 = r1 = 0;
-                g = g0 = g1 = 0;
-                b = b0 = b1 = b2 = 0;
-
-                for (x = 0; x < imIn->xsize; x++, in += 4) {
-                    int d2;
-                    INT16* cache;
-
-                    r = CLIP(in[0] + (r + e[3+0])/16);
-                    g = CLIP(in[1] + (g + e[3+1])/16);
-                    b = CLIP(in[2] + (b + e[3+2])/16);
-
-                    /* get closest colour */
-                    cache = &ImagingPaletteCache(palette, r, g, b);
-                    if (cache[0] == 0x100)
-                        ImagingPaletteCacheUpdate(palette, r, g, b);
-                    out[x] = (UINT8) cache[0];
-
-                    r -= (int) palette->palette[cache[0]*4];
-                    g -= (int) palette->palette[cache[0]*4+1];
-                    b -= (int) palette->palette[cache[0]*4+2];
-
-                    /* propagate errors (don't ask ;-) */
-                    r2 = r; d2 = r + r; r += d2; e[0] = r + r0;
-                    r += d2; r0 = r + r1; r1 = r2; r += d2;
-                    g2 = g; d2 = g + g; g += d2; e[1] = g + g0;
-                    g += d2; g0 = g + g1; g1 = g2; g += d2;
-                    b2 = b; d2 = b + b; b += d2; e[2] = b + b0;
-                    b += d2; b0 = b + b1; b1 = b2; b += d2;
-
-                    e += 3;
-
-                }
-
-                e[0] = b0;
-                e[1] = b1;
-                e[2] = b2;
-
-            }
-            ImagingSectionLeave(&cookie);
-            free(errors);
-
-        } else {
-
-            /* closest colour */
-            ImagingSectionEnter(&cookie);
-            for (y = 0; y < imIn->ysize; y++) {
-                int r, g, b;
-                UINT8* in  = (UINT8*) imIn->image[y];
-                UINT8* out = imOut->image8[y];
-
-                for (x = 0; x < imIn->xsize; x++, in += 4) {
-                    INT16* cache;
-
-                    r = in[0]; g = in[1]; b = in[2];
-
-                    /* get closest colour */
-                    cache = &ImagingPaletteCache(palette, r, g, b);
-                    if (cache[0] == 0x100)
-                        ImagingPaletteCacheUpdate(palette, r, g, b);
-                    out[x] = (UINT8) cache[0];
-
-                }
-            }
-            ImagingSectionLeave(&cookie);
-
-        }
-	if (inpalette != palette)
-	  ImagingPaletteCacheDelete(palette);
-    }
-
-    if (inpalette != palette)
-      ImagingPaletteDelete(palette);
-
-    return imOut;
-}
-
-static Imaging
-tobilevel(Imaging imOut, Imaging imIn, int dither)
-{
-    ImagingSectionCookie cookie;
-    int x, y;
-    int* errors;
-
-    /* Map L or RGB to dithered 1 image */
-    if (strcmp(imIn->mode, "L") != 0 && strcmp(imIn->mode, "RGB") != 0)
-	return (Imaging) ImagingError_ValueError("conversion not supported");
-
-    imOut = ImagingNew2("1", imOut, imIn);
-    if (!imOut)
-        return NULL;
-
-    errors = calloc(imIn->xsize + 1, sizeof(int));
-    if (!errors) {
-        ImagingDelete(imOut);
-        ImagingError_MemoryError();
-        return NULL;
-    }
-
-    if (imIn->bands == 1) {
-
-        /* map each pixel to black or white, using error diffusion */
-        ImagingSectionEnter(&cookie);
-        for (y = 0; y < imIn->ysize; y++) {
-            int l, l0, l1, l2, d2;
-            UINT8* in  = (UINT8*) imIn->image[y];
-            UINT8* out = imOut->image8[y];
-
-            l = l0 = l1 = 0;
-
-            for (x = 0; x < imIn->xsize; x++) {
-
-                /* pick closest colour */
-                l = CLIP(in[x] + (l + errors[x+1])/16);
-                out[x] = (l > 128) ? 255 : 0;
-
-                /* propagate errors */
-                l -= (int) out[x];
-                l2 = l; d2 = l + l; l += d2; errors[x] = l + l0;
-                l += d2; l0 = l + l1; l1 = l2; l += d2;
-            }
-
-            errors[x] = l0;
-
-        }
-        ImagingSectionLeave(&cookie);
-
-    } else {
-
-        /* map each pixel to black or white, using error diffusion */
-        ImagingSectionEnter(&cookie);
-        for (y = 0; y < imIn->ysize; y++) {
-            int l, l0, l1, l2, d2;
-            UINT8* in  = (UINT8*) imIn->image[y];
-            UINT8* out = imOut->image8[y];
-
-            l = l0 = l1 = 0;
-
-            for (x = 0; x < imIn->xsize; x++, in += 4) {
-
-                /* pick closest colour */
-                l = CLIP(L(in)/1000 + (l + errors[x+1])/16);
-                out[x] = (l > 128) ? 255 : 0;
-
-                /* propagate errors */
-                l -= (int) out[x];
-                l2 = l; d2 = l + l; l += d2; errors[x] = l + l0;
-                l += d2; l0 = l + l1; l1 = l2; l += d2;
-
-            }
-
-            errors[x] = l0;
-
-        }
-        ImagingSectionLeave(&cookie);
-    }
-
-    free(errors);
-
-    return imOut;
-}
-
-
-static Imaging
-convert(Imaging imOut, Imaging imIn, const char *mode,
-        ImagingPalette palette, int dither)
-{
-    ImagingSectionCookie cookie;
-    ImagingShuffler convert;
-    int y;
-
-    if (!imIn)
-	return (Imaging) ImagingError_ModeError();
-
-    if (!mode) {
-	/* Map palette image to full depth */
-	if (!imIn->palette)
-	    return (Imaging) ImagingError_ModeError();
-	mode = imIn->palette->mode;
-    } else
-	/* Same mode? */
-	if (!strcmp(imIn->mode, mode))
-	    return ImagingCopy2(imOut, imIn);
-
-
-    /* test for special conversions */
-
-    if (strcmp(imIn->mode, "P") == 0 || strcmp(imIn->mode, "PA") == 0)
-	return frompalette(imOut, imIn, mode);
-    
-    if (strcmp(mode, "P") == 0)
-	return topalette(imOut, imIn, palette, dither);
-
-    if (dither && strcmp(mode, "1") == 0)
-	return tobilevel(imOut, imIn, dither);
-
-
-    /* standard conversion machinery */
-
-    convert = NULL;
-
-    for (y = 0; converters[y].from; y++)
-	if (!strcmp(imIn->mode, converters[y].from) &&
-	    !strcmp(mode, converters[y].to)) {
-	    convert = converters[y].convert;
-	    break;
-	}
-
-    if (!convert)
-#ifdef notdef
-	return (Imaging) ImagingError_ValueError("conversion not supported");
-#else
-    {
-      static char buf[256];
-      sprintf(buf, "conversion from %s to %s not supported", imIn->mode, mode);
-      return (Imaging) ImagingError_ValueError(buf);
-    }
-#endif
-
-    imOut = ImagingNew2(mode, imOut, imIn);
-    if (!imOut)
-        return NULL;
-
-    ImagingSectionEnter(&cookie);
-    for (y = 0; y < imIn->ysize; y++)
-	(*convert)((UINT8*) imOut->image[y], (UINT8*) imIn->image[y],
-		   imIn->xsize);
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-Imaging
-ImagingConvert(Imaging imIn, const char *mode,
-               ImagingPalette palette, int dither)
-{
-    return convert(NULL, imIn, mode, palette, dither);
-}
-
-Imaging
-ImagingConvert2(Imaging imOut, Imaging imIn)
-{
-    return convert(imOut, imIn, imOut->mode, NULL, 0);
-}
diff --git a/pythonPackages/pil/libImaging/ConvertYCbCr.c b/pythonPackages/pil/libImaging/ConvertYCbCr.c
deleted file mode 100644
index 2d47807c84..0000000000
--- a/pythonPackages/pil/libImaging/ConvertYCbCr.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: ConvertYCbCr.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * code to convert YCbCr data
- *
- * history:
- * 98-07-01 hk	Created
- *
- * Copyright (c) Secret Labs AB 1998
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Imaging.h"
-
-/*  JPEG/JFIF YCbCr conversions
-
-    Y  = R *  0.29900 + G *  0.58700 + B *  0.11400
-    Cb = R * -0.16874 + G * -0.33126 + B *  0.50000 + 128
-    Cr = R *  0.50000 + G * -0.41869 + B * -0.08131 + 128
-
-    R  = Y +                       + (Cr - 128) *  1.40200
-    G  = Y + (Cb - 128) * -0.34414 + (Cr - 128) * -0.71414
-    B  = Y + (Cb - 128) *  1.77200
-
-*/
-
-#define SCALE 6 /* bits */
-
-static INT16 Y_R[] = { 0, 19, 38, 57, 77, 96, 115, 134, 153, 172, 191,
-210, 230, 249, 268, 287, 306, 325, 344, 364, 383, 402, 421, 440, 459,
-478, 498, 517, 536, 555, 574, 593, 612, 631, 651, 670, 689, 708, 727,
-746, 765, 785, 804, 823, 842, 861, 880, 899, 919, 938, 957, 976, 995,
-1014, 1033, 1052, 1072, 1091, 1110, 1129, 1148, 1167, 1186, 1206,
-1225, 1244, 1263, 1282, 1301, 1320, 1340, 1359, 1378, 1397, 1416,
-1435, 1454, 1473, 1493, 1512, 1531, 1550, 1569, 1588, 1607, 1627,
-1646, 1665, 1684, 1703, 1722, 1741, 1761, 1780, 1799, 1818, 1837,
-1856, 1875, 1894, 1914, 1933, 1952, 1971, 1990, 2009, 2028, 2048,
-2067, 2086, 2105, 2124, 2143, 2162, 2182, 2201, 2220, 2239, 2258,
-2277, 2296, 2315, 2335, 2354, 2373, 2392, 2411, 2430, 2449, 2469,
-2488, 2507, 2526, 2545, 2564, 2583, 2602, 2622, 2641, 2660, 2679,
-2698, 2717, 2736, 2756, 2775, 2794, 2813, 2832, 2851, 2870, 2890,
-2909, 2928, 2947, 2966, 2985, 3004, 3023, 3043, 3062, 3081, 3100,
-3119, 3138, 3157, 3177, 3196, 3215, 3234, 3253, 3272, 3291, 3311,
-3330, 3349, 3368, 3387, 3406, 3425, 3444, 3464, 3483, 3502, 3521,
-3540, 3559, 3578, 3598, 3617, 3636, 3655, 3674, 3693, 3712, 3732,
-3751, 3770, 3789, 3808, 3827, 3846, 3865, 3885, 3904, 3923, 3942,
-3961, 3980, 3999, 4019, 4038, 4057, 4076, 4095, 4114, 4133, 4153,
-4172, 4191, 4210, 4229, 4248, 4267, 4286, 4306, 4325, 4344, 4363,
-4382, 4401, 4420, 4440, 4459, 4478, 4497, 4516, 4535, 4554, 4574,
-4593, 4612, 4631, 4650, 4669, 4688, 4707, 4727, 4746, 4765, 4784,
-4803, 4822, 4841, 4861, 4880 };
-
-static INT16 Y_G[] = { 0, 38, 75, 113, 150, 188, 225, 263, 301, 338,
-376, 413, 451, 488, 526, 564, 601, 639, 676, 714, 751, 789, 826, 864,
-902, 939, 977, 1014, 1052, 1089, 1127, 1165, 1202, 1240, 1277, 1315,
-1352, 1390, 1428, 1465, 1503, 1540, 1578, 1615, 1653, 1691, 1728,
-1766, 1803, 1841, 1878, 1916, 1954, 1991, 2029, 2066, 2104, 2141,
-2179, 2217, 2254, 2292, 2329, 2367, 2404, 2442, 2479, 2517, 2555,
-2592, 2630, 2667, 2705, 2742, 2780, 2818, 2855, 2893, 2930, 2968,
-3005, 3043, 3081, 3118, 3156, 3193, 3231, 3268, 3306, 3344, 3381,
-3419, 3456, 3494, 3531, 3569, 3607, 3644, 3682, 3719, 3757, 3794,
-3832, 3870, 3907, 3945, 3982, 4020, 4057, 4095, 4132, 4170, 4208,
-4245, 4283, 4320, 4358, 4395, 4433, 4471, 4508, 4546, 4583, 4621,
-4658, 4696, 4734, 4771, 4809, 4846, 4884, 4921, 4959, 4997, 5034,
-5072, 5109, 5147, 5184, 5222, 5260, 5297, 5335, 5372, 5410, 5447,
-5485, 5522, 5560, 5598, 5635, 5673, 5710, 5748, 5785, 5823, 5861,
-5898, 5936, 5973, 6011, 6048, 6086, 6124, 6161, 6199, 6236, 6274,
-6311, 6349, 6387, 6424, 6462, 6499, 6537, 6574, 6612, 6650, 6687,
-6725, 6762, 6800, 6837, 6875, 6913, 6950, 6988, 7025, 7063, 7100,
-7138, 7175, 7213, 7251, 7288, 7326, 7363, 7401, 7438, 7476, 7514,
-7551, 7589, 7626, 7664, 7701, 7739, 7777, 7814, 7852, 7889, 7927,
-7964, 8002, 8040, 8077, 8115, 8152, 8190, 8227, 8265, 8303, 8340,
-8378, 8415, 8453, 8490, 8528, 8566, 8603, 8641, 8678, 8716, 8753,
-8791, 8828, 8866, 8904, 8941, 8979, 9016, 9054, 9091, 9129, 9167,
-9204, 9242, 9279, 9317, 9354, 9392, 9430, 9467, 9505, 9542, 9580 };
-
-static INT16 Y_B[] = { 0, 7, 15, 22, 29, 36, 44, 51, 58, 66, 73, 80,
-88, 95, 102, 109, 117, 124, 131, 139, 146, 153, 161, 168, 175, 182,
-190, 197, 204, 212, 219, 226, 233, 241, 248, 255, 263, 270, 277, 285,
-292, 299, 306, 314, 321, 328, 336, 343, 350, 358, 365, 372, 379, 387,
-394, 401, 409, 416, 423, 430, 438, 445, 452, 460, 467, 474, 482, 489,
-496, 503, 511, 518, 525, 533, 540, 547, 554, 562, 569, 576, 584, 591,
-598, 606, 613, 620, 627, 635, 642, 649, 657, 664, 671, 679, 686, 693,
-700, 708, 715, 722, 730, 737, 744, 751, 759, 766, 773, 781, 788, 795,
-803, 810, 817, 824, 832, 839, 846, 854, 861, 868, 876, 883, 890, 897,
-905, 912, 919, 927, 934, 941, 948, 956, 963, 970, 978, 985, 992, 1000,
-1007, 1014, 1021, 1029, 1036, 1043, 1051, 1058, 1065, 1073, 1080,
-1087, 1094, 1102, 1109, 1116, 1124, 1131, 1138, 1145, 1153, 1160,
-1167, 1175, 1182, 1189, 1197, 1204, 1211, 1218, 1226, 1233, 1240,
-1248, 1255, 1262, 1270, 1277, 1284, 1291, 1299, 1306, 1313, 1321,
-1328, 1335, 1342, 1350, 1357, 1364, 1372, 1379, 1386, 1394, 1401,
-1408, 1415, 1423, 1430, 1437, 1445, 1452, 1459, 1466, 1474, 1481,
-1488, 1496, 1503, 1510, 1518, 1525, 1532, 1539, 1547, 1554, 1561,
-1569, 1576, 1583, 1591, 1598, 1605, 1612, 1620, 1627, 1634, 1642,
-1649, 1656, 1663, 1671, 1678, 1685, 1693, 1700, 1707, 1715, 1722,
-1729, 1736, 1744, 1751, 1758, 1766, 1773, 1780, 1788, 1795, 1802,
-1809, 1817, 1824, 1831, 1839, 1846, 1853, 1860 };
-
-static INT16 Cb_R[] = { 0, -10, -21, -31, -42, -53, -64, -75, -85,
--96, -107, -118, -129, -139, -150, -161, -172, -183, -193, -204, -215,
--226, -237, -247, -258, -269, -280, -291, -301, -312, -323, -334,
--345, -355, -366, -377, -388, -399, -409, -420, -431, -442, -453,
--463, -474, -485, -496, -507, -517, -528, -539, -550, -561, -571,
--582, -593, -604, -615, -625, -636, -647, -658, -669, -679, -690,
--701, -712, -723, -733, -744, -755, -766, -777, -787, -798, -809,
--820, -831, -841, -852, -863, -874, -885, -895, -906, -917, -928,
--939, -949, -960, -971, -982, -993, -1003, -1014, -1025, -1036, -1047,
--1057, -1068, -1079, -1090, -1101, -1111, -1122, -1133, -1144, -1155,
--1165, -1176, -1187, -1198, -1209, -1219, -1230, -1241, -1252, -1263,
--1273, -1284, -1295, -1306, -1317, -1327, -1338, -1349, -1360, -1371,
--1381, -1392, -1403, -1414, -1425, -1435, -1446, -1457, -1468, -1479,
--1489, -1500, -1511, -1522, -1533, -1543, -1554, -1565, -1576, -1587,
--1597, -1608, -1619, -1630, -1641, -1651, -1662, -1673, -1684, -1694,
--1705, -1716, -1727, -1738, -1748, -1759, -1770, -1781, -1792, -1802,
--1813, -1824, -1835, -1846, -1856, -1867, -1878, -1889, -1900, -1910,
--1921, -1932, -1943, -1954, -1964, -1975, -1986, -1997, -2008, -2018,
--2029, -2040, -2051, -2062, -2072, -2083, -2094, -2105, -2116, -2126,
--2137, -2148, -2159, -2170, -2180, -2191, -2202, -2213, -2224, -2234,
--2245, -2256, -2267, -2278, -2288, -2299, -2310, -2321, -2332, -2342,
--2353, -2364, -2375, -2386, -2396, -2407, -2418, -2429, -2440, -2450,
--2461, -2472, -2483, -2494, -2504, -2515, -2526, -2537, -2548, -2558,
--2569, -2580, -2591, -2602, -2612, -2623, -2634, -2645, -2656, -2666,
--2677, -2688, -2699, -2710, -2720, -2731, -2742, -2753 };
-
-static INT16 Cb_G[] = { 0, -20, -41, -63, -84, -105, -126, -147, -169,
--190, -211, -232, -253, -275, -296, -317, -338, -359, -381, -402,
--423, -444, -465, -487, -508, -529, -550, -571, -593, -614, -635,
--656, -677, -699, -720, -741, -762, -783, -805, -826, -847, -868,
--889, -911, -932, -953, -974, -995, -1017, -1038, -1059, -1080, -1101,
--1123, -1144, -1165, -1186, -1207, -1229, -1250, -1271, -1292, -1313,
--1335, -1356, -1377, -1398, -1419, -1441, -1462, -1483, -1504, -1525,
--1547, -1568, -1589, -1610, -1631, -1653, -1674, -1695, -1716, -1737,
--1759, -1780, -1801, -1822, -1843, -1865, -1886, -1907, -1928, -1949,
--1971, -1992, -2013, -2034, -2055, -2077, -2098, -2119, -2140, -2161,
--2183, -2204, -2225, -2246, -2267, -2289, -2310, -2331, -2352, -2373,
--2395, -2416, -2437, -2458, -2479, -2501, -2522, -2543, -2564, -2585,
--2607, -2628, -2649, -2670, -2691, -2713, -2734, -2755, -2776, -2797,
--2819, -2840, -2861, -2882, -2903, -2925, -2946, -2967, -2988, -3009,
--3031, -3052, -3073, -3094, -3115, -3137, -3158, -3179, -3200, -3221,
--3243, -3264, -3285, -3306, -3328, -3349, -3370, -3391, -3412, -3434,
--3455, -3476, -3497, -3518, -3540, -3561, -3582, -3603, -3624, -3646,
--3667, -3688, -3709, -3730, -3752, -3773, -3794, -3815, -3836, -3858,
--3879, -3900, -3921, -3942, -3964, -3985, -4006, -4027, -4048, -4070,
--4091, -4112, -4133, -4154, -4176, -4197, -4218, -4239, -4260, -4282,
--4303, -4324, -4345, -4366, -4388, -4409, -4430, -4451, -4472, -4494,
--4515, -4536, -4557, -4578, -4600, -4621, -4642, -4663, -4684, -4706,
--4727, -4748, -4769, -4790, -4812, -4833, -4854, -4875, -4896, -4918,
--4939, -4960, -4981, -5002, -5024, -5045, -5066, -5087, -5108, -5130,
--5151, -5172, -5193, -5214, -5236, -5257, -5278, -5299, -5320, -5342,
--5363, -5384, -5405 };
-
-static INT16 Cb_B[] = { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288,
-320, 352, 384, 416, 448, 480, 512, 544, 576, 608, 640, 672, 704, 736,
-768, 800, 832, 864, 896, 928, 960, 992, 1024, 1056, 1088, 1120, 1152,
-1184, 1216, 1248, 1280, 1312, 1344, 1376, 1408, 1440, 1472, 1504,
-1536, 1568, 1600, 1632, 1664, 1696, 1728, 1760, 1792, 1824, 1856,
-1888, 1920, 1952, 1984, 2016, 2048, 2080, 2112, 2144, 2176, 2208,
-2240, 2272, 2304, 2336, 2368, 2400, 2432, 2464, 2496, 2528, 2560,
-2592, 2624, 2656, 2688, 2720, 2752, 2784, 2816, 2848, 2880, 2912,
-2944, 2976, 3008, 3040, 3072, 3104, 3136, 3168, 3200, 3232, 3264,
-3296, 3328, 3360, 3392, 3424, 3456, 3488, 3520, 3552, 3584, 3616,
-3648, 3680, 3712, 3744, 3776, 3808, 3840, 3872, 3904, 3936, 3968,
-4000, 4032, 4064, 4096, 4128, 4160, 4192, 4224, 4256, 4288, 4320,
-4352, 4384, 4416, 4448, 4480, 4512, 4544, 4576, 4608, 4640, 4672,
-4704, 4736, 4768, 4800, 4832, 4864, 4896, 4928, 4960, 4992, 5024,
-5056, 5088, 5120, 5152, 5184, 5216, 5248, 5280, 5312, 5344, 5376,
-5408, 5440, 5472, 5504, 5536, 5568, 5600, 5632, 5664, 5696, 5728,
-5760, 5792, 5824, 5856, 5888, 5920, 5952, 5984, 6016, 6048, 6080,
-6112, 6144, 6176, 6208, 6240, 6272, 6304, 6336, 6368, 6400, 6432,
-6464, 6496, 6528, 6560, 6592, 6624, 6656, 6688, 6720, 6752, 6784,
-6816, 6848, 6880, 6912, 6944, 6976, 7008, 7040, 7072, 7104, 7136,
-7168, 7200, 7232, 7264, 7296, 7328, 7360, 7392, 7424, 7456, 7488,
-7520, 7552, 7584, 7616, 7648, 7680, 7712, 7744, 7776, 7808, 7840,
-7872, 7904, 7936, 7968, 8000, 8032, 8064, 8096, 8128, 8160 };
-
-#define Cr_R Cb_B
-
-static INT16 Cr_G[] = { 0, -26, -53, -79, -106, -133, -160, -187,
--213, -240, -267, -294, -321, -347, -374, -401, -428, -455, -481,
--508, -535, -562, -589, -615, -642, -669, -696, -722, -749, -776,
--803, -830, -856, -883, -910, -937, -964, -990, -1017, -1044, -1071,
--1098, -1124, -1151, -1178, -1205, -1232, -1258, -1285, -1312, -1339,
--1366, -1392, -1419, -1446, -1473, -1500, -1526, -1553, -1580, -1607,
--1634, -1660, -1687, -1714, -1741, -1768, -1794, -1821, -1848, -1875,
--1902, -1928, -1955, -1982, -2009, -2036, -2062, -2089, -2116, -2143,
--2169, -2196, -2223, -2250, -2277, -2303, -2330, -2357, -2384, -2411,
--2437, -2464, -2491, -2518, -2545, -2571, -2598, -2625, -2652, -2679,
--2705, -2732, -2759, -2786, -2813, -2839, -2866, -2893, -2920, -2947,
--2973, -3000, -3027, -3054, -3081, -3107, -3134, -3161, -3188, -3215,
--3241, -3268, -3295, -3322, -3349, -3375, -3402, -3429, -3456, -3483,
--3509, -3536, -3563, -3590, -3616, -3643, -3670, -3697, -3724, -3750,
--3777, -3804, -3831, -3858, -3884, -3911, -3938, -3965, -3992, -4018,
--4045, -4072, -4099, -4126, -4152, -4179, -4206, -4233, -4260, -4286,
--4313, -4340, -4367, -4394, -4420, -4447, -4474, -4501, -4528, -4554,
--4581, -4608, -4635, -4662, -4688, -4715, -4742, -4769, -4796, -4822,
--4849, -4876, -4903, -4929, -4956, -4983, -5010, -5037, -5063, -5090,
--5117, -5144, -5171, -5197, -5224, -5251, -5278, -5305, -5331, -5358,
--5385, -5412, -5439, -5465, -5492, -5519, -5546, -5573, -5599, -5626,
--5653, -5680, -5707, -5733, -5760, -5787, -5814, -5841, -5867, -5894,
--5921, -5948, -5975, -6001, -6028, -6055, -6082, -6109, -6135, -6162,
--6189, -6216, -6243, -6269, -6296, -6323, -6350, -6376, -6403, -6430,
--6457, -6484, -6510, -6537, -6564, -6591, -6618, -6644, -6671, -6698,
--6725, -6752, -6778, -6805, -6832 };
-
-static INT16 Cr_B[] = { 0, -4, -9, -15, -20, -25, -30, -35, -41, -46,
--51, -56, -61, -67, -72, -77, -82, -87, -93, -98, -103, -108, -113,
--119, -124, -129, -134, -140, -145, -150, -155, -160, -166, -171,
--176, -181, -186, -192, -197, -202, -207, -212, -218, -223, -228,
--233, -238, -244, -249, -254, -259, -264, -270, -275, -280, -285,
--290, -296, -301, -306, -311, -316, -322, -327, -332, -337, -342,
--348, -353, -358, -363, -368, -374, -379, -384, -389, -394, -400,
--405, -410, -415, -421, -426, -431, -436, -441, -447, -452, -457,
--462, -467, -473, -478, -483, -488, -493, -499, -504, -509, -514,
--519, -525, -530, -535, -540, -545, -551, -556, -561, -566, -571,
--577, -582, -587, -592, -597, -603, -608, -613, -618, -623, -629,
--634, -639, -644, -649, -655, -660, -665, -670, -675, -681, -686,
--691, -696, -702, -707, -712, -717, -722, -728, -733, -738, -743,
--748, -754, -759, -764, -769, -774, -780, -785, -790, -795, -800,
--806, -811, -816, -821, -826, -832, -837, -842, -847, -852, -858,
--863, -868, -873, -878, -884, -889, -894, -899, -904, -910, -915,
--920, -925, -930, -936, -941, -946, -951, -957, -962, -967, -972,
--977, -983, -988, -993, -998, -1003, -1009, -1014, -1019, -1024,
--1029, -1035, -1040, -1045, -1050, -1055, -1061, -1066, -1071, -1076,
--1081, -1087, -1092, -1097, -1102, -1107, -1113, -1118, -1123, -1128,
--1133, -1139, -1144, -1149, -1154, -1159, -1165, -1170, -1175, -1180,
--1185, -1191, -1196, -1201, -1206, -1211, -1217, -1222, -1227, -1232,
--1238, -1243, -1248, -1253, -1258, -1264, -1269, -1274, -1279, -1284,
--1290, -1295, -1300, -1305, -1310, -1316, -1321, -1326 };
-
-static INT16 R_Cr[] = { -11484, -11394, -11305, -11215, -11125,
--11036, -10946, -10856, -10766, -10677, -10587, -10497, -10407,
--10318, -10228, -10138, -10049, -9959, -9869, -9779, -9690, -9600,
--9510, -9420, -9331, -9241, -9151, -9062, -8972, -8882, -8792, -8703,
--8613, -8523, -8433, -8344, -8254, -8164, -8075, -7985, -7895, -7805,
--7716, -7626, -7536, -7446, -7357, -7267, -7177, -7088, -6998, -6908,
--6818, -6729, -6639, -6549, -6459, -6370, -6280, -6190, -6101, -6011,
--5921, -5831, -5742, -5652, -5562, -5472, -5383, -5293, -5203, -5113,
--5024, -4934, -4844, -4755, -4665, -4575, -4485, -4396, -4306, -4216,
--4126, -4037, -3947, -3857, -3768, -3678, -3588, -3498, -3409, -3319,
--3229, -3139, -3050, -2960, -2870, -2781, -2691, -2601, -2511, -2422,
--2332, -2242, -2152, -2063, -1973, -1883, -1794, -1704, -1614, -1524,
--1435, -1345, -1255, -1165, -1076, -986, -896, -807, -717, -627, -537,
--448, -358, -268, -178, -89, 0, 90, 179, 269, 359, 449, 538, 628, 718,
-808, 897, 987, 1077, 1166, 1256, 1346, 1436, 1525, 1615, 1705, 1795,
-1884, 1974, 2064, 2153, 2243, 2333, 2423, 2512, 2602, 2692, 2782,
-2871, 2961, 3051, 3140, 3230, 3320, 3410, 3499, 3589, 3679, 3769,
-3858, 3948, 4038, 4127, 4217, 4307, 4397, 4486, 4576, 4666, 4756,
-4845, 4935, 5025, 5114, 5204, 5294, 5384, 5473, 5563, 5653, 5743,
-5832, 5922, 6012, 6102, 6191, 6281, 6371, 6460, 6550, 6640, 6730,
-6819, 6909, 6999, 7089, 7178, 7268, 7358, 7447, 7537, 7627, 7717,
-7806, 7896, 7986, 8076, 8165, 8255, 8345, 8434, 8524, 8614, 8704,
-8793, 8883, 8973, 9063, 9152, 9242, 9332, 9421, 9511, 9601, 9691,
-9780, 9870, 9960, 10050, 10139, 10229, 10319, 10408, 10498, 10588,
-10678, 10767, 10857, 10947, 11037, 11126, 11216, 11306, 11395 };
-
-static INT16 G_Cb[] = { 2819, 2797, 2775, 2753, 2731, 2709, 2687,
-2665, 2643, 2621, 2599, 2577, 2555, 2533, 2511, 2489, 2467, 2445,
-2423, 2401, 2379, 2357, 2335, 2313, 2291, 2269, 2247, 2225, 2202,
-2180, 2158, 2136, 2114, 2092, 2070, 2048, 2026, 2004, 1982, 1960,
-1938, 1916, 1894, 1872, 1850, 1828, 1806, 1784, 1762, 1740, 1718,
-1696, 1674, 1652, 1630, 1608, 1586, 1564, 1542, 1520, 1498, 1476,
-1454, 1432, 1410, 1388, 1366, 1344, 1321, 1299, 1277, 1255, 1233,
-1211, 1189, 1167, 1145, 1123, 1101, 1079, 1057, 1035, 1013, 991, 969,
-947, 925, 903, 881, 859, 837, 815, 793, 771, 749, 727, 705, 683, 661,
-639, 617, 595, 573, 551, 529, 507, 485, 463, 440, 418, 396, 374, 352,
-330, 308, 286, 264, 242, 220, 198, 176, 154, 132, 110, 88, 66, 44, 22,
-0, -21, -43, -65, -87, -109, -131, -153, -175, -197, -219, -241, -263,
--285, -307, -329, -351, -373, -395, -417, -439, -462, -484, -506,
--528, -550, -572, -594, -616, -638, -660, -682, -704, -726, -748,
--770, -792, -814, -836, -858, -880, -902, -924, -946, -968, -990,
--1012, -1034, -1056, -1078, -1100, -1122, -1144, -1166, -1188, -1210,
--1232, -1254, -1276, -1298, -1320, -1343, -1365, -1387, -1409, -1431,
--1453, -1475, -1497, -1519, -1541, -1563, -1585, -1607, -1629, -1651,
--1673, -1695, -1717, -1739, -1761, -1783, -1805, -1827, -1849, -1871,
--1893, -1915, -1937, -1959, -1981, -2003, -2025, -2047, -2069, -2091,
--2113, -2135, -2157, -2179, -2201, -2224, -2246, -2268, -2290, -2312,
--2334, -2356, -2378, -2400, -2422, -2444, -2466, -2488, -2510, -2532,
--2554, -2576, -2598, -2620, -2642, -2664, -2686, -2708, -2730, -2752,
--2774, -2796 };
-
-static INT16 G_Cr[] = { 5850, 5805, 5759, 5713, 5667, 5622, 5576,
-5530, 5485, 5439, 5393, 5347, 5302, 5256, 5210, 5165, 5119, 5073,
-5028, 4982, 4936, 4890, 4845, 4799, 4753, 4708, 4662, 4616, 4570,
-4525, 4479, 4433, 4388, 4342, 4296, 4251, 4205, 4159, 4113, 4068,
-4022, 3976, 3931, 3885, 3839, 3794, 3748, 3702, 3656, 3611, 3565,
-3519, 3474, 3428, 3382, 3336, 3291, 3245, 3199, 3154, 3108, 3062,
-3017, 2971, 2925, 2879, 2834, 2788, 2742, 2697, 2651, 2605, 2559,
-2514, 2468, 2422, 2377, 2331, 2285, 2240, 2194, 2148, 2102, 2057,
-2011, 1965, 1920, 1874, 1828, 1782, 1737, 1691, 1645, 1600, 1554,
-1508, 1463, 1417, 1371, 1325, 1280, 1234, 1188, 1143, 1097, 1051,
-1006, 960, 914, 868, 823, 777, 731, 686, 640, 594, 548, 503, 457, 411,
-366, 320, 274, 229, 183, 137, 91, 46, 0, -45, -90, -136, -182, -228,
--273, -319, -365, -410, -456, -502, -547, -593, -639, -685, -730,
--776, -822, -867, -913, -959, -1005, -1050, -1096, -1142, -1187,
--1233, -1279, -1324, -1370, -1416, -1462, -1507, -1553, -1599, -1644,
--1690, -1736, -1781, -1827, -1873, -1919, -1964, -2010, -2056, -2101,
--2147, -2193, -2239, -2284, -2330, -2376, -2421, -2467, -2513, -2558,
--2604, -2650, -2696, -2741, -2787, -2833, -2878, -2924, -2970, -3016,
--3061, -3107, -3153, -3198, -3244, -3290, -3335, -3381, -3427, -3473,
--3518, -3564, -3610, -3655, -3701, -3747, -3793, -3838, -3884, -3930,
--3975, -4021, -4067, -4112, -4158, -4204, -4250, -4295, -4341, -4387,
--4432, -4478, -4524, -4569, -4615, -4661, -4707, -4752, -4798, -4844,
--4889, -4935, -4981, -5027, -5072, -5118, -5164, -5209, -5255, -5301,
--5346, -5392, -5438, -5484, -5529, -5575, -5621, -5666, -5712, -5758,
--5804 };
-
-static INT16 B_Cb[] = { -14515, -14402, -14288, -14175, -14062,
--13948, -13835, -13721, -13608, -13495, -13381, -13268, -13154,
--13041, -12928, -12814, -12701, -12587, -12474, -12360, -12247,
--12134, -12020, -11907, -11793, -11680, -11567, -11453, -11340,
--11226, -11113, -11000, -10886, -10773, -10659, -10546, -10433,
--10319, -10206, -10092, -9979, -9865, -9752, -9639, -9525, -9412,
--9298, -9185, -9072, -8958, -8845, -8731, -8618, -8505, -8391, -8278,
--8164, -8051, -7938, -7824, -7711, -7597, -7484, -7371, -7257, -7144,
--7030, -6917, -6803, -6690, -6577, -6463, -6350, -6236, -6123, -6010,
--5896, -5783, -5669, -5556, -5443, -5329, -5216, -5102, -4989, -4876,
--4762, -4649, -4535, -4422, -4309, -4195, -4082, -3968, -3855, -3741,
--3628, -3515, -3401, -3288, -3174, -3061, -2948, -2834, -2721, -2607,
--2494, -2381, -2267, -2154, -2040, -1927, -1814, -1700, -1587, -1473,
--1360, -1246, -1133, -1020, -906, -793, -679, -566, -453, -339, -226,
--112, 0, 113, 227, 340, 454, 567, 680, 794, 907, 1021, 1134, 1247,
-1361, 1474, 1588, 1701, 1815, 1928, 2041, 2155, 2268, 2382, 2495,
-2608, 2722, 2835, 2949, 3062, 3175, 3289, 3402, 3516, 3629, 3742,
-3856, 3969, 4083, 4196, 4310, 4423, 4536, 4650, 4763, 4877, 4990,
-5103, 5217, 5330, 5444, 5557, 5670, 5784, 5897, 6011, 6124, 6237,
-6351, 6464, 6578, 6691, 6804, 6918, 7031, 7145, 7258, 7372, 7485,
-7598, 7712, 7825, 7939, 8052, 8165, 8279, 8392, 8506, 8619, 8732,
-8846, 8959, 9073, 9186, 9299, 9413, 9526, 9640, 9753, 9866, 9980,
-10093, 10207, 10320, 10434, 10547, 10660, 10774, 10887, 11001, 11114,
-11227, 11341, 11454, 11568, 11681, 11794, 11908, 12021, 12135, 12248,
-12361, 12475, 12588, 12702, 12815, 12929, 13042, 13155, 13269, 13382,
-13496, 13609, 13722, 13836, 13949, 14063, 14176, 14289, 14403 };
-
-
-void
-ImagingConvertRGB2YCbCr(UINT8* out, const UINT8* in, int pixels)
-{
-    int x;
-    UINT8 a;
-    int r, g, b;
-    int y, cr, cb;
-
-    for (x = 0; x < pixels; x++, in +=4, out += 4) {
-
-        r = in[0];
-        g = in[1];
-        b = in[2];
-        a = in[3];
-
-        y =  (Y_R[r]  +  Y_G[g] +  Y_B[b]) >> SCALE;
-        cb = ((Cb_R[r] + Cb_G[g] + Cb_B[b]) >> SCALE) + 128;
-        cr = ((Cr_R[r] + Cr_G[g] + Cr_B[b]) >> SCALE) + 128;
-        
-        out[0] = (UINT8) y;
-        out[1] = (UINT8) cb;
-        out[2] = (UINT8) cr;
-        out[3] = a;
-    }
-}
-
-void
-ImagingConvertYCbCr2RGB(UINT8* out, const UINT8* in, int pixels)
-{
-    int x;
-    UINT8 a;
-    int r, g, b;
-    int y, cr, cb;
-
-    for (x = 0; x < pixels; x++, in += 4, out += 4) {
-
-        y = in[0];
-        cb = in[1];
-        cr = in[2];
-        a = in[3];
-
-        r = y + ((           R_Cr[cr]) >> SCALE);
-        g = y + ((G_Cb[cb] + G_Cr[cr]) >> SCALE);
-        b = y + ((B_Cb[cb]           ) >> SCALE);
-
-        out[0] = (r <= 0) ? 0 : (r >= 255) ? 255 : r;
-        out[1] = (g <= 0) ? 0 : (g >= 255) ? 255 : g;
-        out[2] = (b <= 0) ? 0 : (b >= 255) ? 255 : b;
-        out[3] = a;
-    }
-}
diff --git a/pythonPackages/pil/libImaging/Copy.c b/pythonPackages/pil/libImaging/Copy.c
deleted file mode 100644
index 1d799b163f..0000000000
--- a/pythonPackages/pil/libImaging/Copy.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* 
- * The Python Imaging Library
- * $Id: Copy.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * copy image
- *
- * history:
- * 95-11-26 fl   Moved from Imaging.c
- * 97-05-12 fl   Added ImagingCopy2
- * 97-08-28 fl   Allow imOut == NULL in ImagingCopy2
- *
- * Copyright (c) Fredrik Lundh 1995-97.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for details on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-static Imaging
-_copy(Imaging imOut, Imaging imIn)
-{
-    ImagingSectionCookie cookie;
-    int y;
-
-    if (!imIn)
-	return (Imaging) ImagingError_ValueError(NULL);
-
-    imOut = ImagingNew2(imIn->mode, imOut, imIn);
-    if (!imOut)
-        return NULL;
-
-    ImagingCopyInfo(imOut, imIn);
-
-    ImagingSectionEnter(&cookie);
-    if (imIn->block != NULL && imOut->block != NULL)
-	memcpy(imOut->block, imIn->block, imIn->ysize * imIn->linesize);
-    else
-        for (y = 0; y < imIn->ysize; y++)
-            memcpy(imOut->image[y], imIn->image[y], imIn->linesize);
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-Imaging
-ImagingCopy(Imaging imIn)
-{
-    return _copy(NULL, imIn);
-}
-
-Imaging
-ImagingCopy2(Imaging imOut, Imaging imIn)
-{
-    return _copy(imOut, imIn);
-}
diff --git a/pythonPackages/pil/libImaging/Crc32.c b/pythonPackages/pil/libImaging/Crc32.c
deleted file mode 100644
index 8d7922e98c..0000000000
--- a/pythonPackages/pil/libImaging/Crc32.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Crc32.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * calculate ISO 3307 checksum
- *
- * history:
- *	96-12-10 fl:	Created (based on example in the PNG spec)
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-/* Precalculated CRC values (created by makecrctable.py) */
-
-static UINT32 crc32table[] = { 0x0, 0x77073096L, 0xEE0E612CL,
-0x990951BAL, 0x76DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L,
-0xEDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L, 0x9B64C2BL,
-0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L, 0x1DB71064L, 0x6AB020F2L,
-0xF3B97148L, 0x84BE41DEL, 0x1ADAD47DL, 0x6DDDE4EBL, 0xF4D4B551L,
-0x83D385C7L, 0x136C9856L, 0x646BA8C0L, 0xFD62F97AL, 0x8A65C9ECL,
-0x14015C4FL, 0x63066CD9L, 0xFA0F3D63L, 0x8D080DF5L, 0x3B6E20C8L,
-0x4C69105EL, 0xD56041E4L, 0xA2677172L, 0x3C03E4D1L, 0x4B04D447L,
-0xD20D85FDL, 0xA50AB56BL, 0x35B5A8FAL, 0x42B2986CL, 0xDBBBC9D6L,
-0xACBCF940L, 0x32D86CE3L, 0x45DF5C75L, 0xDCD60DCFL, 0xABD13D59L,
-0x26D930ACL, 0x51DE003AL, 0xC8D75180L, 0xBFD06116L, 0x21B4F4B5L,
-0x56B3C423L, 0xCFBA9599L, 0xB8BDA50FL, 0x2802B89EL, 0x5F058808L,
-0xC60CD9B2L, 0xB10BE924L, 0x2F6F7C87L, 0x58684C11L, 0xC1611DABL,
-0xB6662D3DL, 0x76DC4190L, 0x1DB7106L, 0x98D220BCL, 0xEFD5102AL,
-0x71B18589L, 0x6B6B51FL, 0x9FBFE4A5L, 0xE8B8D433L, 0x7807C9A2L,
-0xF00F934L, 0x9609A88EL, 0xE10E9818L, 0x7F6A0DBBL, 0x86D3D2DL,
-0x91646C97L, 0xE6635C01L, 0x6B6B51F4L, 0x1C6C6162L, 0x856530D8L,
-0xF262004EL, 0x6C0695EDL, 0x1B01A57BL, 0x8208F4C1L, 0xF50FC457L,
-0x65B0D9C6L, 0x12B7E950L, 0x8BBEB8EAL, 0xFCB9887CL, 0x62DD1DDFL,
-0x15DA2D49L, 0x8CD37CF3L, 0xFBD44C65L, 0x4DB26158L, 0x3AB551CEL,
-0xA3BC0074L, 0xD4BB30E2L, 0x4ADFA541L, 0x3DD895D7L, 0xA4D1C46DL,
-0xD3D6F4FBL, 0x4369E96AL, 0x346ED9FCL, 0xAD678846L, 0xDA60B8D0L,
-0x44042D73L, 0x33031DE5L, 0xAA0A4C5FL, 0xDD0D7CC9L, 0x5005713CL,
-0x270241AAL, 0xBE0B1010L, 0xC90C2086L, 0x5768B525L, 0x206F85B3L,
-0xB966D409L, 0xCE61E49FL, 0x5EDEF90EL, 0x29D9C998L, 0xB0D09822L,
-0xC7D7A8B4L, 0x59B33D17L, 0x2EB40D81L, 0xB7BD5C3BL, 0xC0BA6CADL,
-0xEDB88320L, 0x9ABFB3B6L, 0x3B6E20CL, 0x74B1D29AL, 0xEAD54739L,
-0x9DD277AFL, 0x4DB2615L, 0x73DC1683L, 0xE3630B12L, 0x94643B84L,
-0xD6D6A3EL, 0x7A6A5AA8L, 0xE40ECF0BL, 0x9309FF9DL, 0xA00AE27L,
-0x7D079EB1L, 0xF00F9344L, 0x8708A3D2L, 0x1E01F268L, 0x6906C2FEL,
-0xF762575DL, 0x806567CBL, 0x196C3671L, 0x6E6B06E7L, 0xFED41B76L,
-0x89D32BE0L, 0x10DA7A5AL, 0x67DD4ACCL, 0xF9B9DF6FL, 0x8EBEEFF9L,
-0x17B7BE43L, 0x60B08ED5L, 0xD6D6A3E8L, 0xA1D1937EL, 0x38D8C2C4L,
-0x4FDFF252L, 0xD1BB67F1L, 0xA6BC5767L, 0x3FB506DDL, 0x48B2364BL,
-0xD80D2BDAL, 0xAF0A1B4CL, 0x36034AF6L, 0x41047A60L, 0xDF60EFC3L,
-0xA867DF55L, 0x316E8EEFL, 0x4669BE79L, 0xCB61B38CL, 0xBC66831AL,
-0x256FD2A0L, 0x5268E236L, 0xCC0C7795L, 0xBB0B4703L, 0x220216B9L,
-0x5505262FL, 0xC5BA3BBEL, 0xB2BD0B28L, 0x2BB45A92L, 0x5CB36A04L,
-0xC2D7FFA7L, 0xB5D0CF31L, 0x2CD99E8BL, 0x5BDEAE1DL, 0x9B64C2B0L,
-0xEC63F226L, 0x756AA39CL, 0x26D930AL, 0x9C0906A9L, 0xEB0E363FL,
-0x72076785L, 0x5005713L, 0x95BF4A82L, 0xE2B87A14L, 0x7BB12BAEL,
-0xCB61B38L, 0x92D28E9BL, 0xE5D5BE0DL, 0x7CDCEFB7L, 0xBDBDF21L,
-0x86D3D2D4L, 0xF1D4E242L, 0x68DDB3F8L, 0x1FDA836EL, 0x81BE16CDL,
-0xF6B9265BL, 0x6FB077E1L, 0x18B74777L, 0x88085AE6L, 0xFF0F6A70L,
-0x66063BCAL, 0x11010B5CL, 0x8F659EFFL, 0xF862AE69L, 0x616BFFD3L,
-0x166CCF45L, 0xA00AE278L, 0xD70DD2EEL, 0x4E048354L, 0x3903B3C2L,
-0xA7672661L, 0xD06016F7L, 0x4969474DL, 0x3E6E77DBL, 0xAED16A4AL,
-0xD9D65ADCL, 0x40DF0B66L, 0x37D83BF0L, 0xA9BCAE53L, 0xDEBB9EC5L,
-0x47B2CF7FL, 0x30B5FFE9L, 0xBDBDF21CL, 0xCABAC28AL, 0x53B39330L,
-0x24B4A3A6L, 0xBAD03605L, 0xCDD70693L, 0x54DE5729L, 0x23D967BFL,
-0xB3667A2EL, 0xC4614AB8L, 0x5D681B02L, 0x2A6F2B94L, 0xB40BBE37L,
-0xC30C8EA1L, 0x5A05DF1BL, 0x2D02EF8DL };
-
-
-UINT32
-ImagingCRC32(UINT32 crc, UINT8* buffer, int bytes)
-{
-    int i;
-
-    crc ^= 0xFFFFFFFFL;
-
-    for (i = 0; i < bytes; i++)
-	crc = crc32table[(UINT8) crc ^ buffer[i]] ^ (crc >> 8);
-
-    return crc ^ 0xFFFFFFFFL;
-}
diff --git a/pythonPackages/pil/libImaging/Crop.c b/pythonPackages/pil/libImaging/Crop.c
deleted file mode 100644
index 8d3fd3b652..0000000000
--- a/pythonPackages/pil/libImaging/Crop.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Crop.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * cut region from image
- *
- * history:
- * 95-11-27 fl	Created
- * 98-07-10 fl	Fixed "null result" error
- * 99-02-05 fl	Rewritten to use Paste primitive
- *
- * Copyright (c) Secret Labs AB 1997-99.
- * Copyright (c) Fredrik Lundh 1995.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-Imaging
-ImagingCrop(Imaging imIn, int sx0, int sy0, int sx1, int sy1)
-{
-    Imaging imOut;
-    int xsize, ysize;
-    int dx0, dy0, dx1, dy1;
-    
-    if (!imIn)
-	return (Imaging) ImagingError_ModeError();
-
-    xsize = sx1 - sx0;
-    if (xsize < 0)
-        xsize = 0;
-    ysize = sy1 - sy0;
-    if (ysize < 0)
-        ysize = 0;
-
-    imOut = ImagingNew(imIn->mode, xsize, ysize);
-    if (!imOut)
-	return NULL;
-
-    ImagingCopyInfo(imOut, imIn);
-
-    dx0 = -sx0;
-    dy0 = -sy0;
-    dx1 = imIn->xsize - sx0;
-    dy1 = imIn->ysize - sy0;
-
-    /* paste the source image on top of the output image!!! */
-    if (ImagingPaste(imOut, imIn, NULL, dx0, dy0, dx1, dy1) < 0) {
-        ImagingDelete(imOut);
-        return NULL;
-    }
-
-    return imOut;
-}
diff --git a/pythonPackages/pil/libImaging/Dib.c b/pythonPackages/pil/libImaging/Dib.c
deleted file mode 100644
index 597f6eff22..0000000000
--- a/pythonPackages/pil/libImaging/Dib.c
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Dib.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * imaging display object for Windows
- *
- * history:
- * 1996-05-12 fl  Created
- * 1996-05-17 fl  Up and running
- * 1996-05-21 fl  Added palette stuff
- * 1996-05-26 fl  Added query palette and mode inquery
- * 1997-09-21 fl  Added draw primitive
- * 1998-01-20 fl  Use StretchDIBits instead of StretchBlt
- * 1998-12-30 fl  Plugged a resource leak in DeleteDIB (from Roger Burnham)
- *
- * Copyright (c) Secret Labs AB 1997-2001.
- * Copyright (c) Fredrik Lundh 1996.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#ifdef WIN32
-
-#include "ImDib.h"
-
-
-char*
-ImagingGetModeDIB(int size_out[2])
-{
-    /* Get device characteristics */
-
-    HDC dc;
-    char* mode;
-
-    dc = CreateCompatibleDC(NULL);
-
-    mode = "P";
-    if (!(GetDeviceCaps(dc, RASTERCAPS) & RC_PALETTE)) {
-	mode = "RGB";
-	if (GetDeviceCaps(dc, BITSPIXEL) == 1)
-	    mode = "1";
-    }
-
-    if (size_out) {
-	size_out[0] = GetDeviceCaps(dc, HORZRES);
-	size_out[1] = GetDeviceCaps(dc, VERTRES);
-    }
-
-    DeleteDC(dc);
-
-    return mode;
-}
-
-
-ImagingDIB
-ImagingNewDIB(const char *mode, int xsize, int ysize)
-{
-    /* Create a Windows bitmap */
-
-    ImagingDIB dib;
-    RGBQUAD *palette;
-    int i;
-
-    /* Check mode */
-    if (strcmp(mode, "1") != 0 && strcmp(mode, "L") != 0 &&
-	strcmp(mode, "RGB") != 0)
-	return (ImagingDIB) ImagingError_ModeError();
-
-    /* Create DIB context and info header */
-    dib = (ImagingDIB) malloc(sizeof(*dib));
-    if (!dib)
-	return (ImagingDIB) ImagingError_MemoryError();
-    dib->info = (BITMAPINFO*) malloc(sizeof(BITMAPINFOHEADER) +
-                                     256 * sizeof(RGBQUAD));
-    if (!dib->info) {
-        free(dib);
-	return (ImagingDIB) ImagingError_MemoryError();
-    }
-
-    memset(dib->info, 0, sizeof(BITMAPINFOHEADER));
-    dib->info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
-    dib->info->bmiHeader.biWidth = xsize;
-    dib->info->bmiHeader.biHeight = ysize;
-    dib->info->bmiHeader.biPlanes = 1;
-    dib->info->bmiHeader.biBitCount = strlen(mode)*8;
-    dib->info->bmiHeader.biCompression = BI_RGB;
-
-    /* Create DIB */
-    dib->dc = CreateCompatibleDC(NULL);
-    if (!dib->dc) {
-	free(dib->info);
-	free(dib);
-	return (ImagingDIB) ImagingError_MemoryError();
-    }
-
-    dib->bitmap = CreateDIBSection(dib->dc, dib->info, DIB_RGB_COLORS,
-                                   &dib->bits, NULL, 0);
-    if (!dib->bitmap) {
-        free(dib->info);
-	free(dib);
-	return (ImagingDIB) ImagingError_MemoryError();
-    }
-
-    strcpy(dib->mode, mode);
-    dib->xsize = xsize;
-    dib->ysize = ysize;
-
-    dib->pixelsize = strlen(mode);
-    dib->linesize = (xsize * dib->pixelsize + 3) & -4;
-
-    if (dib->pixelsize == 1)
-	dib->pack = dib->unpack = (ImagingShuffler) memcpy;
-    else {
-	dib->pack = ImagingPackBGR;
-	dib->unpack = ImagingPackBGR;
-    }
-
-    /* Bind the DIB to the device context */
-    dib->old_bitmap = SelectObject(dib->dc, dib->bitmap);
-
-    palette = dib->info->bmiColors;
-
-    /* Bind a palette to it as well (only required for 8-bit DIBs) */
-    if (dib->pixelsize == 1) {
-	for (i = 0; i < 256; i++) {
-	    palette[i].rgbRed = 
-	    palette[i].rgbGreen =
-	    palette[i].rgbBlue = i;
-	    palette[i].rgbReserved = 0;
-        }
-	SetDIBColorTable(dib->dc, 0, 256, palette);
-    }
-
-    /* Create an associated palette (for 8-bit displays only) */
-    if (strcmp(ImagingGetModeDIB(NULL), "P") == 0) {
-
-	char palbuf[sizeof(LOGPALETTE)+256*sizeof(PALETTEENTRY)];
-	LPLOGPALETTE pal = (LPLOGPALETTE) palbuf;
-	int i, r, g, b;
-
-	/* Load system palette */
-	pal->palVersion = 0x300;
-	pal->palNumEntries = 256;
-	GetSystemPaletteEntries(dib->dc, 0, 256, pal->palPalEntry);
-
-	if (strcmp(mode, "L") == 0) {
-
-	    /* Greyscale DIB.  Fill all 236 slots with a greyscale ramp
-	     * (this is usually overkill on Windows since VGA only offers
-	     * 6 bits greyscale resolution).  Ignore the slots already
-	     * allocated by Windows */
-
-	    i = 10;
-	    for (r = 0; r < 236; r++) {
-		pal->palPalEntry[i].peRed =
-		pal->palPalEntry[i].peGreen =
-	        pal->palPalEntry[i].peBlue = i;
-		i++;
-	    }
-
-	    dib->palette = CreatePalette(pal);
-
-	} else if (strcmp(mode, "RGB") == 0) {
-
-#ifdef CUBE216
-
-	    /* Colour DIB.  Create a 6x6x6 colour cube (216 entries) and
-	     * add 20 extra greylevels for best result with greyscale
-	     * images. */
-
-	    i = 10;
-	    for (r = 0; r < 256; r += 51)
-		for (g = 0; g < 256; g += 51)
-		    for (b = 0; b < 256; b += 51) {
-			pal->palPalEntry[i].peRed = r;
-			pal->palPalEntry[i].peGreen = g;
-			pal->palPalEntry[i].peBlue = b;
-			i++;
-		    }
-	    for (r = 1; r < 22-1; r++) {
-		/* Black and white are already provided by the cube. */ 
-		pal->palPalEntry[i].peRed =
-		pal->palPalEntry[i].peGreen =
-		pal->palPalEntry[i].peBlue = r * 255 / (22-1);
-		i++;
-	    }
-
-#else
-
-	    /* Colour DIB.  Alternate palette. */
-
-	    i = 10;
-	    for (r = 0; r < 256; r += 37)
-		for (g = 0; g < 256; g += 32)
-		    for (b = 0; b < 256; b += 64) {
-			pal->palPalEntry[i].peRed = r;
-			pal->palPalEntry[i].peGreen = g;
-			pal->palPalEntry[i].peBlue = b;
-			i++;
-		    }
-
-#endif
-
-#if 0
-	    {
-		/* DEBUG: dump palette to file */
-		FILE *err = fopen("dib.pal", "w");
-		for (i = 0; i < 256; i++)
-		    fprintf(err, "%d: %d/%d/%d\n", i,
-			    pal->palPalEntry[i].peRed,
-			    pal->palPalEntry[i].peGreen,
-			    pal->palPalEntry[i].peBlue);
-		fclose(err);
-	    }
-#endif
-
-	    dib->palette = CreatePalette(pal);
-
-	}
-
-    }
-
-    return dib;
-}
-
-void
-ImagingPasteDIB(ImagingDIB dib, Imaging im, int xy[4])
-{
-    /* Paste image data into a bitmap */
-
-    /* FIXME: check size! */
-
-    int y;
-    for (y = 0; y < im->ysize; y++)
-	dib->pack(dib->bits + dib->linesize*(dib->ysize-(xy[1]+y)-1) +
-		  xy[0]*dib->pixelsize, im->image[y], im->xsize);
-
-}
-
-void
-ImagingExposeDIB(ImagingDIB dib, int dc)
-{
-    /* Copy bitmap to display */
-
-    if (dib->palette != 0)
-	SelectPalette((HDC) dc, dib->palette, FALSE);
-    BitBlt((HDC) dc, 0, 0, dib->xsize, dib->ysize, dib->dc, 0, 0, SRCCOPY);
-}
-
-void
-ImagingDrawDIB(ImagingDIB dib, int dc, int dst[4], int src[4])
-{
-    /* Copy bitmap to printer/display */
-
-    if (GetDeviceCaps((HDC) dc, RASTERCAPS) & RC_STRETCHDIB) {
-        /* stretchdib (printers) */
-        StretchDIBits((HDC) dc, dst[0], dst[1], dst[2]-dst[0], dst[3]-dst[1],
-                      src[0], src[1], src[2]-src[0], src[3]-src[1], dib->bits,
-                      dib->info, DIB_RGB_COLORS, SRCCOPY);
-    } else {
-        /* stretchblt (displays) */
-        if (dib->palette != 0)
-            SelectPalette((HDC) dc, dib->palette, FALSE);
-        StretchBlt((HDC) dc, dst[0], dst[1], dst[2]-dst[0], dst[3]-dst[1],
-                   dib->dc, src[0], src[1], src[2]-src[0], src[3]-src[1],
-                   SRCCOPY);
-    }
-}
-
-int
-ImagingQueryPaletteDIB(ImagingDIB dib, int dc)
-{
-    /* Install bitmap palette */
-
-    int n;
-
-    if (dib->palette != 0) {
-
-	/* Realize associated palette */
-	HPALETTE now = SelectPalette((HDC) dc, dib->palette, FALSE);
-	n = RealizePalette((HDC) dc);
-
-	/* Restore palette */
-	SelectPalette((HDC) dc, now, FALSE);
-
-    } else
-	n = 0;
-
-    return n; /* number of colours that was changed */
-}
-
-void
-ImagingDeleteDIB(ImagingDIB dib)
-{
-    /* Clean up */
-
-    if (dib->palette)
-	DeleteObject(dib->palette);
-    if (dib->bitmap) {
-        SelectObject(dib->dc, dib->old_bitmap);
-	DeleteObject(dib->bitmap);
-    }
-    if (dib->dc)
-	DeleteDC(dib->dc);
-    free(dib->info);
-}
-
-#endif /* WIN32 */
diff --git a/pythonPackages/pil/libImaging/Draw.c b/pythonPackages/pil/libImaging/Draw.c
deleted file mode 100644
index 440978d8ba..0000000000
--- a/pythonPackages/pil/libImaging/Draw.c
+++ /dev/null
@@ -1,1167 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: Draw.c 2745 2006-06-18 17:27:41Z fredrik $
- *
- * a simple drawing package for the Imaging library
- *
- * history:
- * 1996-04-13 fl  Created.
- * 1996-04-30 fl  Added transforms and polygon support.
- * 1996-08-12 fl  Added filled polygons.
- * 1996-11-05 fl  Fixed float/int confusion in polygon filler
- * 1997-07-04 fl  Support 32-bit images (C++ would have been nice)
- * 1998-09-09 fl  Eliminated qsort casts; improved rectangle clipping
- * 1998-09-10 fl  Fixed fill rectangle to include lower edge (!)
- * 1998-12-29 fl  Added arc, chord, and pieslice primitives
- * 1999-01-10 fl  Added some level 2 ("arrow") stuff (experimental)
- * 1999-02-06 fl  Added bitmap primitive
- * 1999-07-26 fl  Eliminated a compiler warning
- * 1999-07-31 fl  Pass ink as void* instead of int
- * 2002-12-10 fl  Added experimental RGBA-on-RGB drawing
- * 2004-09-04 fl  Support simple wide lines (no joins)
- * 2005-05-25 fl  Fixed line width calculation
- *
- * Copyright (c) 1996-2006 by Fredrik Lundh
- * Copyright (c) 1997-2006 by Secret Labs AB.
- *
- * See the README file for information on usage and redistribution.
- */
-
-/* FIXME: support fill/outline attribute for all filled shapes */
-/* FIXME: support zero-winding fill */
-/* FIXME: add drawing context, support affine transforms */
-/* FIXME: support clip window (and mask?) */
-
-#include "Imaging.h"
-
-#include <math.h>
-
-#define CEIL(v)  (int) ceil(v)
-#define FLOOR(v) ((v) >= 0.0 ? (int) (v) : (int) floor(v))
-
-#define INK8(ink) (*(UINT8*)ink)
-#define INK32(ink) (*(INT32*)ink)
-
-/* like (a * b + 127) / 255), but much faster on most platforms */
-#define MULDIV255(a, b, tmp)\
-        (tmp = (a) * (b) + 128, ((((tmp) >> 8) + (tmp)) >> 8))
-
-#define BLEND(mask, in1, in2, tmp1, tmp2)\
-        (MULDIV255(in1, 255 - mask, tmp1) + MULDIV255(in2, mask, tmp2))
-
-/* -------------------------------------------------------------------- */
-/* Primitives                                                           */
-/* -------------------------------------------------------------------- */
-
-typedef struct {
-    /* edge descriptor for polygon engine */
-    int d;
-    int x0, y0;
-    int xmin, ymin, xmax, ymax;
-    float dx;
-} Edge;
-
-static inline void
-point8(Imaging im, int x, int y, int ink)
-{
-    if (x >= 0 && x < im->xsize && y >= 0 && y < im->ysize)
-        im->image8[y][x] = (UINT8) ink;
-}
-
-static inline void
-point32(Imaging im, int x, int y, int ink)
-{
-    if (x >= 0 && x < im->xsize && y >= 0 && y < im->ysize)
-        im->image32[y][x] = ink;
-}
-
-static inline void
-point32rgba(Imaging im, int x, int y, int ink)
-{
-    unsigned int tmp1, tmp2;
-
-    if (x >= 0 && x < im->xsize && y >= 0 && y < im->ysize) {
-        UINT8* out = (UINT8*) im->image[y]+x*4;
-        UINT8* in = (UINT8*) &ink;
-        out[0] = BLEND(in[3], out[0], in[0], tmp1, tmp2);
-        out[1] = BLEND(in[3], out[1], in[1], tmp1, tmp2);
-        out[2] = BLEND(in[3], out[2], in[2], tmp1, tmp2);
-    }
-}
-
-static inline void
-hline8(Imaging im, int x0, int y0, int x1, int ink)
-{
-    int tmp;
-
-    if (y0 >= 0 && y0 < im->ysize) {
-        if (x0 > x1)
-            tmp = x0, x0 = x1, x1 = tmp;
-        if (x0 < 0)
-            x0 = 0;
-        else if (x0 >= im->xsize)
-            return;
-        if (x1 < 0)
-            return;
-        else if (x1 >= im->xsize)
-            x1 = im->xsize-1;
-        if (x0 <= x1)
-            memset(im->image8[y0] + x0, (UINT8) ink, x1 - x0 + 1);
-    }
-}
-
-static inline void
-hline32(Imaging im, int x0, int y0, int x1, int ink)
-{
-    int tmp;
-    INT32* p;
-
-    if (y0 >= 0 && y0 < im->ysize) {
-        if (x0 > x1)
-            tmp = x0, x0 = x1, x1 = tmp;
-        if (x0 < 0)
-            x0 = 0;
-        else if (x0 >= im->xsize)
-            return;
-        if (x1 < 0)
-            return;
-        else if (x1 >= im->xsize)
-            x1 = im->xsize-1;
-        p = im->image32[y0];
-        while (x0 <= x1)
-            p[x0++] = ink;
-    }
-}
-
-static inline void
-hline32rgba(Imaging im, int x0, int y0, int x1, int ink)
-{
-    int tmp;
-    unsigned int tmp1, tmp2;
-
-    if (y0 >= 0 && y0 < im->ysize) {
-        if (x0 > x1)
-            tmp = x0, x0 = x1, x1 = tmp;
-        if (x0 < 0)
-            x0 = 0;
-        else if (x0 >= im->xsize)
-            return;
-        if (x1 < 0)
-            return;
-        else if (x1 >= im->xsize)
-            x1 = im->xsize-1;
-        if (x0 <= x1) {
-            UINT8* out = (UINT8*) im->image[y0]+x0*4;
-            UINT8* in = (UINT8*) &ink;
-            while (x0 <= x1) {
-                out[0] = BLEND(in[3], out[0], in[0], tmp1, tmp2);
-                out[1] = BLEND(in[3], out[1], in[1], tmp1, tmp2);
-                out[2] = BLEND(in[3], out[2], in[2], tmp1, tmp2);
-                x0++; out += 4;
-            }
-        }
-    }
-}
-
-static inline void
-line8(Imaging im, int x0, int y0, int x1, int y1, int ink)
-{
-    int i, n, e;
-    int dx, dy;
-    int xs, ys;
-
-    /* normalize coordinates */
-    dx = x1-x0;
-    if (dx < 0)
-        dx = -dx, xs = -1;
-    else
-        xs = 1;
-    dy = y1-y0;
-    if (dy < 0)
-        dy = -dy, ys = -1;
-    else
-        ys = 1;
-
-    n = (dx > dy) ? dx : dy;
-
-    if (dx == 0)
-
-        /* vertical */
-        for (i = 0; i < dy; i++) {
-            point8(im, x0, y0, ink);
-            y0 += ys;
-        }
-
-    else if (dy == 0)
-
-        /* horizontal */
-        for (i = 0; i < dx; i++) {
-            point8(im, x0, y0, ink);
-            x0 += xs;
-        }
-
-    else if (dx > dy) {
-
-        /* bresenham, horizontal slope */
-        n = dx;
-        dy += dy;
-        e = dy - dx;
-        dx += dx;
-
-        for (i = 0; i < n; i++) {
-            point8(im, x0, y0, ink);
-            if (e >= 0) {
-                y0 += ys;
-                e -= dx;
-            }
-            e += dy;
-            x0 += xs;
-        }
-
-    } else {
-
-        /* bresenham, vertical slope */
-        n = dy;
-        dx += dx;
-        e = dx - dy;
-        dy += dy;
-
-        for (i = 0; i < n; i++) {
-            point8(im, x0, y0, ink);
-            if (e >= 0) {
-                x0 += xs;
-                e -= dy;
-            }
-            e += dx;
-            y0 += ys;
-        }
-
-    }
-}
-
-static inline void
-line32(Imaging im, int x0, int y0, int x1, int y1, int ink)
-{
-    int i, n, e;
-    int dx, dy;
-    int xs, ys;
-
-    /* normalize coordinates */
-    dx = x1-x0;
-    if (dx < 0)
-        dx = -dx, xs = -1;
-    else
-        xs = 1;
-    dy = y1-y0;
-    if (dy < 0)
-        dy = -dy, ys = -1;
-    else
-        ys = 1;
-
-    n = (dx > dy) ? dx : dy;
-
-    if (dx == 0)
-
-        /* vertical */
-        for (i = 0; i < dy; i++) {
-            point32(im, x0, y0, ink);
-            y0 += ys;
-        }
-
-    else if (dy == 0)
-
-        /* horizontal */
-        for (i = 0; i < dx; i++) {
-            point32(im, x0, y0, ink);
-            x0 += xs;
-        }
-
-    else if (dx > dy) {
-
-        /* bresenham, horizontal slope */
-        n = dx;
-        dy += dy;
-        e = dy - dx;
-        dx += dx;
-
-        for (i = 0; i < n; i++) {
-            point32(im, x0, y0, ink);
-            if (e >= 0) {
-                y0 += ys;
-                e -= dx;
-            }
-            e += dy;
-            x0 += xs;
-        }
-
-    } else {
-
-        /* bresenham, vertical slope */
-        n = dy;
-        dx += dx;
-        e = dx - dy;
-        dy += dy;
-
-        for (i = 0; i < n; i++) {
-            point32(im, x0, y0, ink);
-            if (e >= 0) {
-                x0 += xs;
-                e -= dy;
-            }
-            e += dx;
-            y0 += ys;
-        }
-
-    }
-}
-
-static inline void
-line32rgba(Imaging im, int x0, int y0, int x1, int y1, int ink)
-{
-    int i, n, e;
-    int dx, dy;
-    int xs, ys;
-
-    /* normalize coordinates */
-    dx = x1-x0;
-    if (dx < 0)
-        dx = -dx, xs = -1;
-    else
-        xs = 1;
-    dy = y1-y0;
-    if (dy < 0)
-        dy = -dy, ys = -1;
-    else
-        ys = 1;
-
-    n = (dx > dy) ? dx : dy;
-
-    if (dx == 0)
-
-        /* vertical */
-        for (i = 0; i < dy; i++) {
-            point32rgba(im, x0, y0, ink);
-            y0 += ys;
-        }
-
-    else if (dy == 0)
-
-        /* horizontal */
-        for (i = 0; i < dx; i++) {
-            point32rgba(im, x0, y0, ink);
-            x0 += xs;
-        }
-
-    else if (dx > dy) {
-
-        /* bresenham, horizontal slope */
-        n = dx;
-        dy += dy;
-        e = dy - dx;
-        dx += dx;
-
-        for (i = 0; i < n; i++) {
-            point32rgba(im, x0, y0, ink);
-            if (e >= 0) {
-                y0 += ys;
-                e -= dx;
-            }
-            e += dy;
-            x0 += xs;
-        }
-
-    } else {
-
-        /* bresenham, vertical slope */
-        n = dy;
-        dx += dx;
-        e = dx - dy;
-        dy += dy;
-
-        for (i = 0; i < n; i++) {
-            point32rgba(im, x0, y0, ink);
-            if (e >= 0) {
-                x0 += xs;
-                e -= dy;
-            }
-            e += dx;
-            y0 += ys;
-        }
-
-    }
-}
-
-static int
-x_cmp(const void *x0, const void *x1)
-{
-    float diff = *((float*)x0) - *((float*)x1);
-    if (diff < 0)
-        return -1;
-    else if (diff > 0)
-        return 1;
-    else
-        return 0;
-}
-
-static inline int
-polygon8(Imaging im, int n, Edge *e, int ink, int eofill)
-{
-    int i, j;
-    float *xx;
-    int ymin, ymax;
-    float y;
-
-    if (n <= 0)
-        return 0;
-
-    /* Find upper and lower polygon boundary (within image) */
-
-    ymin = e[0].ymin;
-    ymax = e[0].ymax;
-    for (i = 1; i < n; i++) {
-        if (e[i].ymin < ymin) ymin = e[i].ymin;
-        if (e[i].ymax > ymax) ymax = e[i].ymax;
-    }
-
-    if (ymin < 0)
-        ymin = 0;
-    if (ymax >= im->ysize)
-        ymax = im->ysize-1;
-
-    /* Process polygon edges */
-
-    xx = malloc(n * sizeof(float));
-    if (!xx)
-        return -1;
-
-    for (;ymin <= ymax; ymin++) {
-        y = ymin+0.5F;
-        for (i = j = 0; i < n; i++) 
-            if (y >= e[i].ymin && y <= e[i].ymax) {
-                if (e[i].d == 0)
-                    hline8(im, e[i].xmin, ymin, e[i].xmax, ink);
-                else
-                    xx[j++] = (y-e[i].y0) * e[i].dx + e[i].x0;
-            }
-        if (j == 2) {
-            if (xx[0] < xx[1])
-                hline8(im, CEIL(xx[0]-0.5), ymin, FLOOR(xx[1]+0.5), ink);
-            else
-                hline8(im, CEIL(xx[1]-0.5), ymin, FLOOR(xx[0]+0.5), ink);
-        } else {
-            qsort(xx, j, sizeof(float), x_cmp);
-            for (i = 0; i < j-1 ; i += 2)
-                hline8(im, CEIL(xx[i]-0.5), ymin, FLOOR(xx[i+1]+0.5), ink);
-        }
-    }
-
-    free(xx);
-
-    return 0;
-}
-
-static inline int
-polygon32(Imaging im, int n, Edge *e, int ink, int eofill)
-{
-    int i, j;
-    float *xx;
-    int ymin, ymax;
-    float y;
-
-    if (n <= 0)
-        return 0;
-
-    /* Find upper and lower polygon boundary (within image) */
-
-    ymin = e[0].ymin;
-    ymax = e[0].ymax;
-    for (i = 1; i < n; i++) {
-        if (e[i].ymin < ymin) ymin = e[i].ymin;
-        if (e[i].ymax > ymax) ymax = e[i].ymax;
-    }
-
-    if (ymin < 0)
-        ymin = 0;
-    if (ymax >= im->ysize)
-        ymax = im->ysize-1;
-
-    /* Process polygon edges */
-
-    xx = malloc(n * sizeof(float));
-    if (!xx)
-        return -1;
-
-    for (;ymin <= ymax; ymin++) {
-        y = ymin+0.5F;
-        for (i = j = 0; i < n; i++) {
-            if (y >= e[i].ymin && y <= e[i].ymax) {
-                if (e[i].d == 0)
-                    hline32(im, e[i].xmin, ymin, e[i].xmax, ink);
-                else
-                    xx[j++] = (y-e[i].y0) * e[i].dx + e[i].x0;
-            }
-        }
-        if (j == 2) {
-            if (xx[0] < xx[1])
-                hline32(im, CEIL(xx[0]-0.5), ymin, FLOOR(xx[1]+0.5), ink);
-            else
-                hline32(im, CEIL(xx[1]-0.5), ymin, FLOOR(xx[0]+0.5), ink);
-        } else {
-            qsort(xx, j, sizeof(float), x_cmp);
-            for (i = 0; i < j-1 ; i += 2)
-                hline32(im, CEIL(xx[i]-0.5), ymin, FLOOR(xx[i+1]+0.5), ink);
-        }
-    }
-
-    free(xx);
-
-    return 0;
-}
-
-static inline int
-polygon32rgba(Imaging im, int n, Edge *e, int ink, int eofill)
-{
-    int i, j;
-    float *xx;
-    int ymin, ymax;
-    float y;
-
-    if (n <= 0)
-        return 0;
-
-    /* Find upper and lower polygon boundary (within image) */
-
-    ymin = e[0].ymin;
-    ymax = e[0].ymax;
-    for (i = 1; i < n; i++) {
-        if (e[i].ymin < ymin) ymin = e[i].ymin;
-        if (e[i].ymax > ymax) ymax = e[i].ymax;
-    }
-
-    if (ymin < 0)
-        ymin = 0;
-    if (ymax >= im->ysize)
-        ymax = im->ysize-1;
-
-    /* Process polygon edges */
-
-    xx = malloc(n * sizeof(float));
-    if (!xx)
-        return -1;
-
-    for (;ymin <= ymax; ymin++) {
-        y = ymin+0.5F;
-        for (i = j = 0; i < n; i++) {
-            if (y >= e[i].ymin && y <= e[i].ymax) {
-                if (e[i].d == 0)
-                    hline32rgba(im, e[i].xmin, ymin, e[i].xmax, ink);
-                else
-                    xx[j++] = (y-e[i].y0) * e[i].dx + e[i].x0;
-            }
-        }
-        if (j == 2) {
-            if (xx[0] < xx[1])
-                hline32rgba(im, CEIL(xx[0]-0.5), ymin, FLOOR(xx[1]+0.5), ink);
-            else
-                hline32rgba(im, CEIL(xx[1]-0.5), ymin, FLOOR(xx[0]+0.5), ink);
-        } else {
-            qsort(xx, j, sizeof(float), x_cmp);
-            for (i = 0; i < j-1 ; i += 2)
-                hline32rgba(im, CEIL(xx[i]-0.5), ymin, FLOOR(xx[i+1]+0.5), ink);
-        }
-    }
-
-    free(xx);
-
-    return 0;
-}
-
-static inline void
-add_edge(Edge *e, int x0, int y0, int x1, int y1)
-{
-    /* printf("edge %d %d %d %d\n", x0, y0, x1, y1); */
-
-    if (x0 <= x1)
-        e->xmin = x0, e->xmax = x1;
-    else
-        e->xmin = x1, e->xmax = x0;
-
-    if (y0 <= y1)
-        e->ymin = y0, e->ymax = y1;
-    else
-        e->ymin = y1, e->ymax = y0;
-    
-    if (y0 == y1) {
-        e->d = 0;
-        e->dx = 0.0;
-    } else {
-        e->dx = ((float)(x1-x0)) / (y1-y0);
-        if (y0 == e->ymin)
-            e->d = 1;
-        else
-            e->d = -1;
-    }
-
-    e->x0 = x0;
-    e->y0 = y0;
-}
-
-typedef struct {
-    void (*point)(Imaging im, int x, int y, int ink);
-    void (*hline)(Imaging im, int x0, int y0, int x1, int ink);
-    void (*line)(Imaging im, int x0, int y0, int x1, int y1, int ink);
-    int (*polygon)(Imaging im, int n, Edge *e, int ink, int eofill);
-} DRAW;
-
-DRAW draw8 = { point8,  hline8,  line8,  polygon8 };
-DRAW draw32 = { point32, hline32, line32, polygon32 };
-DRAW draw32rgba = { point32rgba, hline32rgba, line32rgba, polygon32rgba };
-
-/* -------------------------------------------------------------------- */
-/* Interface                                                            */
-/* -------------------------------------------------------------------- */
-
-#define DRAWINIT()\
-    if (im->image8) {\
-        draw = &draw8;\
-        ink = INK8(ink_);\
-    } else {\
-        draw = (op) ? &draw32rgba : &draw32;    \
-        ink = INK32(ink_);\
-    }
-
-int
-ImagingDrawPoint(Imaging im, int x0, int y0, const void* ink_, int op)
-{
-    DRAW* draw;
-    INT32 ink;
-
-    DRAWINIT();
-
-    draw->point(im, x0, y0, ink);
-
-    return 0;
-}
-
-int
-ImagingDrawLine(Imaging im, int x0, int y0, int x1, int y1, const void* ink_,
-                int op)
-{
-    DRAW* draw;
-    INT32 ink;
-
-    DRAWINIT();
-
-    draw->line(im, x0, y0, x1, y1, ink);
-
-    return 0;
-}
-
-int
-ImagingDrawWideLine(Imaging im, int x0, int y0, int x1, int y1,
-                    const void* ink_, int width, int op)
-{
-    DRAW* draw;
-    INT32 ink;
-
-    Edge e[4];
-
-    int dx, dy;
-    double d;
-
-    DRAWINIT();
-
-    if (width <= 1) {
-        draw->line(im, x0, y0, x1, y1, ink);
-        return 0;
-    }
-
-    dx = x1-x0;
-    dy = y1-y0;
-
-    if (dx == 0 && dy == 0) {
-        draw->point(im, x0, y0, ink);
-        return 0;
-    }
-
-    d = width / sqrt(dx*dx + dy*dy) / 2.0;
-
-    dx = (int) (d * (y1-y0) + 0.5);
-    dy = (int) (d * (x1-x0) + 0.5);
-
-    add_edge(e+0, x0 - dx,  y0 + dy, x1 - dx,  y1 + dy);
-    add_edge(e+1, x1 - dx,  y1 + dy, x1 + dx,  y1 - dy);
-    add_edge(e+2, x1 + dx,  y1 - dy, x0 + dx,  y0 - dy);
-    add_edge(e+3, x0 + dx,  y0 - dy, x0 - dx,  y0 + dy);
-
-    draw->polygon(im, 4, e, ink, 0);
-
-    return 0;
-}
-
-int
-ImagingDrawRectangle(Imaging im, int x0, int y0, int x1, int y1,
-                     const void* ink_, int fill, int op)
-{
-    int y;
-    int tmp;
-    DRAW* draw;
-    INT32 ink;
-
-    DRAWINIT();
-
-    if (y0 > y1)
-        tmp = y0, y0 = y1, y1 = tmp;
-
-    if (fill) {
-
-        if (y0 < 0)
-            y0 = 0;
-        else if (y0 >= im->ysize)
-            return 0;
-
-        if (y1 < 0)
-            return 0;
-        else if (y1 > im->ysize)
-            y1 = im->ysize;
-
-        for (y = y0; y <= y1; y++)
-            draw->hline(im, x0, y, x1, ink);
-
-    } else {
-
-        /* outline */
-        draw->line(im, x0, y0, x1, y0, ink);
-        draw->line(im, x1, y0, x1, y1, ink);
-        draw->line(im, x1, y1, x0, y1, ink);
-        draw->line(im, x0, y1, x0, y0, ink);
-
-    }
-
-    return 0;
-}
-
-int
-ImagingDrawPolygon(Imaging im, int count, int* xy, const void* ink_,
-                   int fill, int op)
-{
-    int i, n;
-    DRAW* draw;
-    INT32 ink;
-
-    if (count <= 0)
-        return 0;
-
-    DRAWINIT();
-
-    if (fill) {
-
-        /* Build edge list */
-        Edge* e = malloc(count * sizeof(Edge));
-        if (!e) {
-            ImagingError_MemoryError();
-            return -1;
-        }
-        for (i = n = 0; i < count-1; i++)
-            add_edge(&e[n++], xy[i+i], xy[i+i+1], xy[i+i+2], xy[i+i+3]);
-        if (xy[i+i] != xy[0] || xy[i+i+1] != xy[1])
-            add_edge(&e[n++], xy[i+i], xy[i+i+1], xy[0], xy[1]);
-        draw->polygon(im, n, e, ink, 0);
-        free(e);
-
-    } else {
-
-        /* Outline */
-        for (i = 0; i < count-1; i++)
-            draw->line(im, xy[i+i], xy[i+i+1], xy[i+i+2], xy[i+i+3], ink);
-        draw->line(im, xy[i+i], xy[i+i+1], xy[0], xy[1], ink);
-
-    }
-        
-    return 0;
-}
-
-int
-ImagingDrawBitmap(Imaging im, int x0, int y0, Imaging bitmap, const void* ink,
-                  int op)
-{
-    return ImagingFill2(
-        im, ink, bitmap,
-        x0, y0, x0 + bitmap->xsize, y0 + bitmap->ysize
-        );
-}
-
-/* -------------------------------------------------------------------- */
-/* standard shapes */
-
-#define ARC 0
-#define CHORD 1
-#define PIESLICE 2
-
-static int
-ellipse(Imaging im, int x0, int y0, int x1, int y1,
-        int start, int end, const void* ink_, int fill,
-        int mode, int op)
-{
-    int i, n;
-    int cx, cy;
-    int w, h;
-    int x = 0, y = 0;
-    int lx = 0, ly = 0;
-    int sx = 0, sy = 0;
-    DRAW* draw;
-    INT32 ink;
-
-    w = x1 - x0;
-    h = y1 - y0;
-    if (w < 0 || h < 0)
-        return 0;
-
-    DRAWINIT();
-
-    cx = (x0 + x1) / 2;
-    cy = (y0 + y1) / 2;
-
-    while (end < start)
-        end += 360;
-
-    if (mode != ARC && fill) {
-
-        /* Build edge list */
-        Edge* e = malloc((end - start + 3) * sizeof(Edge));
-        if (!e) {
-            ImagingError_MemoryError();
-            return -1;
-        }
-
-        n = 0;
-
-        for (i = start; i <= end; i++) {
-            x = FLOOR((cos(i*M_PI/180) * w/2) + cx + 0.5);
-            y = FLOOR((sin(i*M_PI/180) * h/2) + cy + 0.5);
-            if (i != start)
-                add_edge(&e[n++], lx, ly, x, y);
-            else
-                sx = x, sy = y;
-            lx = x, ly = y;
-        }
-
-        if (n > 0) {
-            /* close and draw polygon */
-            if (mode == PIESLICE) {
-                if (x != cx || y != cy) {
-                    add_edge(&e[n++], x, y, cx, cy);
-                    add_edge(&e[n++], cx, cy, sx, sy);
-                }
-            } else {
-                if (x != sx || y != sy)
-                    add_edge(&e[n++], x, y, sx, sy);
-            }
-            draw->polygon(im, n, e, ink, 0);
-        }
-
-        free(e);
-        
-    } else {
-
-        for (i = start; i <= end; i++) {
-            x = FLOOR((cos(i*M_PI/180) * w/2) + cx + 0.5);
-            y = FLOOR((sin(i*M_PI/180) * h/2) + cy + 0.5);
-            if (i != start)
-                draw->line(im, lx, ly, x, y, ink);
-            else
-                sx = x, sy = y;
-            lx = x, ly = y;
-        }
-
-        if (i != start) {
-            if (mode == PIESLICE) {
-                if (x != cx || y != cy) {
-                    draw->line(im, x, y, cx, cy, ink);
-                    draw->line(im, cx, cy, sx, sy, ink);
-                }
-            } else if (mode == CHORD) {
-                if (x != sx || y != sy)
-                    draw->line(im, x, y, sx, sy, ink);
-            }
-        }
-    }
-
-    return 0;
-}
-
-int
-ImagingDrawArc(Imaging im, int x0, int y0, int x1, int y1,
-               int start, int end, const void* ink, int op)
-{
-    return ellipse(im, x0, y0, x1, y1, start, end, ink, 0, ARC, op);
-}
-
-int
-ImagingDrawChord(Imaging im, int x0, int y0, int x1, int y1,
-               int start, int end, const void* ink, int fill, int op)
-{
-    return ellipse(im, x0, y0, x1, y1, start, end, ink, fill, CHORD, op);
-}
-
-int
-ImagingDrawEllipse(Imaging im, int x0, int y0, int x1, int y1,
-                   const void* ink, int fill, int op)
-{
-    return ellipse(im, x0, y0, x1, y1, 0, 360, ink, fill, CHORD, op);
-}
-
-int
-ImagingDrawPieslice(Imaging im, int x0, int y0, int x1, int y1,
-                    int start, int end, const void* ink, int fill, int op)
-{
-    return ellipse(im, x0, y0, x1, y1, start, end, ink, fill, PIESLICE, op);
-}
-
-/* -------------------------------------------------------------------- */
-
-/* experimental level 2 ("arrow") graphics stuff.  this implements
-   portions of the arrow api on top of the Edge structure.  the
-   semantics are ok, except that "curve" flattens the bezier curves by
-   itself */
-
-#if 1 /* ARROW_GRAPHICS */
-
-struct ImagingOutlineInstance {
-
-    float x0, y0;
-
-    float x, y;
-
-    int count;
-    Edge *edges;
-
-    int size;
-
-};
-
-
-ImagingOutline
-ImagingOutlineNew(void)
-{
-    ImagingOutline outline;
-
-    outline = calloc(1, sizeof(struct ImagingOutlineInstance));
-    if (!outline)
-        return (ImagingOutline) ImagingError_MemoryError();
-
-    outline->edges = NULL;
-    outline->count = outline->size = 0;
-
-    ImagingOutlineMove(outline, 0, 0);
-
-    return outline;
-}
-
-void
-ImagingOutlineDelete(ImagingOutline outline)
-{
-    if (!outline)
-        return;
-
-    if (outline->edges)
-        free(outline->edges);
-
-    free(outline);
-}
-
-
-static Edge*
-allocate(ImagingOutline outline, int extra)
-{
-    Edge* e;
-
-    if (outline->count + extra > outline->size) {
-        /* expand outline buffer */
-        outline->size += extra + 25;
-        if (!outline->edges)
-            e = malloc(outline->size * sizeof(Edge));
-        else
-            e = realloc(outline->edges, outline->size * sizeof(Edge));
-        if (!e)
-            return NULL;
-        outline->edges = e;
-    }
-
-    e = outline->edges + outline->count;
-
-    outline->count += extra;
-
-    return e;
-}
-
-int
-ImagingOutlineMove(ImagingOutline outline, float x0, float y0)
-{
-    outline->x = outline->x0 = x0;
-    outline->y = outline->y0 = y0;
-
-    return 0;
-}
-
-int
-ImagingOutlineLine(ImagingOutline outline, float x1, float y1)
-{
-    Edge* e;
-
-    e = allocate(outline, 1);
-    if (!e)
-        return -1; /* out of memory */
-
-    add_edge(e, (int) outline->x, (int) outline->y, (int) x1, (int) y1);
-
-    outline->x = x1;
-    outline->y = y1;
-    
-    return 0;
-}
-
-int
-ImagingOutlineCurve(ImagingOutline outline, float x1, float y1,
-                    float x2, float y2, float x3, float y3)
-{
-    Edge* e;
-    int i;
-    float xo, yo;
-
-#define STEPS 32
-
-    e = allocate(outline, STEPS);
-    if (!e)
-        return -1; /* out of memory */
-
-    xo = outline->x;
-    yo = outline->y;
-
-    /* flatten the bezier segment */
-
-    for (i = 1; i <= STEPS; i++) {
-
-        float t = ((float) i) / STEPS;
-        float t2 = t*t;
-        float t3 = t2*t;
-
-        float u = 1.0F - t;
-        float u2 = u*u;
-        float u3 = u2*u;
-
-        float x = outline->x*u3 + 3*(x1*t*u2 + x2*t2*u) + x3*t3 + 0.5;
-        float y = outline->y*u3 + 3*(y1*t*u2 + y2*t2*u) + y3*t3 + 0.5;
-
-        add_edge(e++, xo, yo, (int) x, (int) y);
-
-        xo = x, yo = y;
-
-    }
-
-    outline->x = xo;
-    outline->y = yo;
-    
-    return 0;
-}
-
-int
-ImagingOutlineCurve2(ImagingOutline outline, float cx, float cy,
-                     float x3, float y3) 
-{
-    /* add bezier curve based on three control points (as
-       in the Flash file format) */
-
-    return ImagingOutlineCurve(
-        outline,
-        (outline->x + cx + cx)/3, (outline->y + cy + cy)/3,
-        (cx + cx + x3)/3, (cy + cy + y3)/3,
-        x3, y3);
-}
-
-int
-ImagingOutlineClose(ImagingOutline outline)
-{
-    if (outline->x == outline->x0 && outline->y == outline->y0)
-        return 0;
-    return ImagingOutlineLine(outline, outline->x0, outline->y0);
-}
-
-int
-ImagingOutlineTransform(ImagingOutline outline, double a[6])
-{
-    Edge *eIn;
-    Edge *eOut;
-    int i, n;
-    int x0, y0, x1, y1;
-    int X0, Y0, X1, Y1;
-    
-    double a0 = a[0]; double a1 = a[1]; double a2 = a[2];
-    double a3 = a[3]; double a4 = a[4]; double a5 = a[5];
-
-    eIn = outline->edges;
-    n = outline->count;
-    
-    /* FIXME: ugly! */
-    outline->edges = NULL;
-    outline->count = outline->size = 0;
-
-    eOut = allocate(outline, n);
-    if (!eOut) {
-        outline->edges = eIn;
-        outline->count = outline->size = n;
-        ImagingError_MemoryError();
-        return -1;
-    }
-    
-    for (i = 0; i < n; i++) {
-        
-        x0 = eIn->x0;
-        y0 = eIn->y0;
-        
-        /* FIXME: ouch! */
-        if (eIn->x0 == eIn->xmin)
-            x1 = eIn->xmax;
-        else
-            x1 = eIn->xmin;
-        if (eIn->y0 == eIn->ymin)
-            y1 = eIn->ymax;
-        else
-            y1 = eIn->ymin;
-
-        /* full moon tonight!  if this doesn't work, you may need to
-           upgrade your compiler (make sure you have the right service
-           pack) */
-
-        X0 = (int) (a0*x0 + a1*y0 + a2);
-        Y0 = (int) (a3*x0 + a4*y0 + a5);
-        X1 = (int) (a0*x1 + a1*y1 + a2);
-        Y1 = (int) (a3*x1 + a4*y1 + a5);
-
-        add_edge(eOut, X0, Y0, X1, Y1);
-
-        eIn++;
-        eOut++;
-
-    }
-
-    free(eIn);
-
-    return 0;
-}
-
-int
-ImagingDrawOutline(Imaging im, ImagingOutline outline, const void* ink_,
-                   int fill, int op)
-{
-    DRAW* draw;
-    INT32 ink;
-
-    DRAWINIT();
-
-    draw->polygon(im, outline->count, outline->edges, ink, 0);
-
-    return 0;
-}
-
-#endif
diff --git a/pythonPackages/pil/libImaging/Effects.c b/pythonPackages/pil/libImaging/Effects.c
deleted file mode 100644
index 2ec08c7656..0000000000
--- a/pythonPackages/pil/libImaging/Effects.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/* 
- * The Python Imaging Library
- * $Id: Effects.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * various special effects and image generators
- *
- * history:
- * 1997-05-21 fl   Just for fun
- * 1997-06-05 fl   Added mandelbrot generator
- * 2003-05-24 fl   Added perlin_turbulence generator (in progress)
- *
- * Copyright (c) 1997-2003 by Fredrik Lundh.
- * Copyright (c) 1997 by Secret Labs AB.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#include <math.h>
-
-Imaging
-ImagingEffectMandelbrot(int xsize, int ysize, double extent[4], int quality)
-{
-    /* Generate a Mandelbrot set covering the given extent */
-
-    Imaging im;
-    int x, y, k;
-    double width, height;
-    double x1, y1, xi2, yi2, cr, ci, radius;
-    double dr, di;
-
-    /* Check arguments */
-    width  = extent[2] - extent[0];
-    height = extent[3] - extent[1];
-    if (width < 0.0 || height < 0.0 || quality < 2)
-        return (Imaging) ImagingError_ValueError(NULL);
-
-    im = ImagingNew("L", xsize, ysize);
-    if (!im)
-        return NULL;
-
-    dr = width/(xsize-1);
-    di = height/(ysize-1);
-
-    radius = 100.0;
-
-    for (y = 0; y < ysize; y++) {
-        UINT8* buf = im->image8[y];
-	for (x = 0; x < xsize; x++) {
-	    x1 = y1 = xi2 = yi2 = 0.0;
-	    cr = x*dr + extent[0];
-	    ci = y*di + extent[1];
-	    for (k = 1;; k++) {
-		y1 = 2*x1*y1 + ci;
-		x1 = xi2 - yi2 + cr;
-		xi2 = x1*x1;
-		yi2 = y1*y1;
-		if ((xi2 + yi2) > radius) {
-		    buf[x] = k*255/quality;
-		    break;
-		}
-		if (k > quality) {
-		    buf[x] = 0;
-		    break;
-		}
-	    }
-	}
-    }
-    return im;
-}
-
-Imaging
-ImagingEffectNoise(int xsize, int ysize, float sigma)
-{
-    /* Generate gaussian noise centered around 128 */
-
-    Imaging imOut;
-    int x, y;
-    int nextok;
-    double this, next;
-
-    imOut = ImagingNew("L", xsize, ysize);
-    if (!imOut)
-	return NULL;
-
-    next = 0.0;
-    nextok = 0;
-
-    for (y = 0; y < imOut->ysize; y++) {
-        UINT8* out = imOut->image8[y];
-	for (x = 0; x < imOut->xsize; x++) {
-            if (nextok) {
-                this = next;
-                nextok = 0;
-            } else {
-                /* after numerical recepies */
-                double v1, v2, radius, factor;
-                do {
-                    v1 = rand()*(2.0/32767.0) - 1.0;
-                    v2 = rand()*(2.0/32767.0) - 1.0;
-                    radius= v1*v1 + v2*v2;
-                } while (radius >= 1.0);
-                factor = sqrt(-2.0*log(radius)/radius);
-                this = factor * v1;
-                next = factor * v2;
-            }
-            out[x] = (unsigned char) (128 + sigma * this);
-        }
-    }
-
-    return imOut;
-}
-
-Imaging
-ImagingEffectPerlinTurbulence(int xsize, int ysize)
-{
-    /* Perlin turbulence (In progress) */
-
-    return NULL;
-}
-
-Imaging
-ImagingEffectSpread(Imaging imIn, int distance)
-{
-    /* Randomly spread pixels in an image */
-
-    Imaging imOut;
-    int x, y;
-
-    imOut = ImagingNew(imIn->mode, imIn->xsize, imIn->ysize);
-
-    if (!imOut)
-	return NULL;
-
-#define	SPREAD(type, image)\
-    for (y = 0; y < imIn->ysize; y++)\
-	for (x = 0; x < imIn->xsize; x++) {\
-            int xx = x + (rand() % distance) - distance/2;\
-            int yy = y + (rand() % distance) - distance/2;\
-            if (xx >= 0 && xx < imIn->xsize && yy >= 0 && yy < imIn->ysize) {\
-                imOut->image[yy][xx] = imIn->image[y][x];\
-                imOut->image[y][x]   = imIn->image[yy][xx];\
-            } else\
-                imOut->image[y][x]   = imIn->image[y][x];\
-        }
-
-    if (imIn->image8) {
-	SPREAD(UINT8, image8);
-    } else {
-	SPREAD(INT32, image32);
-    }
-
-    ImagingCopyInfo(imOut, imIn);
-
-    return imOut;
-}
-
-/* -------------------------------------------------------------------- */
-/* Taken from the "C" code in the W3C SVG specification.  Translated
-   to C89 by Fredrik Lundh */
-
-/* Produces results in the range [1, 2**31 - 2].
-Algorithm is: r = (a * r) mod m
-where a = 16807 and m = 2**31 - 1 = 2147483647
-See [Park & Miller], CACM vol. 31 no. 10 p. 1195, Oct. 1988
-To test: the algorithm should produce the result 1043618065
-as the 10,000th generated number if the original seed is 1.
-*/
-#define RAND_m 2147483647 /* 2**31 - 1 */
-#define RAND_a 16807 /* 7**5; primitive root of m */
-#define RAND_q 127773 /* m / a */
-#define RAND_r 2836 /* m % a */
-
-static long
-perlin_setup_seed(long lSeed)
-{
-  if (lSeed <= 0) lSeed = -(lSeed % (RAND_m - 1)) + 1;
-  if (lSeed > RAND_m - 1) lSeed = RAND_m - 1;
-  return lSeed;
-}
-
-static long
-perlin_random(long lSeed)
-{
-  long result;
-  result = RAND_a * (lSeed % RAND_q) - RAND_r * (lSeed / RAND_q);
-  if (result <= 0) result += RAND_m;
-  return result;
-}
-
-#define BSize 0x100
-#define BM 0xff
-#define PerlinN 0x1000
-#define NP 12 /* 2^PerlinN */
-#define NM 0xfff
-static int perlin_uLatticeSelector[BSize + BSize + 2];
-static double perlin_fGradient[4][BSize + BSize + 2][2];
-typedef struct
-{
-  int nWidth; /* How much to subtract to wrap for stitching. */
-  int nHeight;
-  int nWrapX; /* Minimum value to wrap. */
-  int nWrapY;
-} StitchInfo;
-
-static void
-perlin_init(long lSeed)
-{
-  double s;
-  int i, j, k;
-  lSeed = perlin_setup_seed(lSeed);
-  for(k = 0; k < 4; k++)
-  {
-    for(i = 0; i < BSize; i++)
-    {
-      perlin_uLatticeSelector[i] = i;
-      for (j = 0; j < 2; j++)
-        perlin_fGradient[k][i][j] = (double)(((lSeed = perlin_random(lSeed)) % (BSize + BSize)) - BSize) / BSize;
-      s = (double) (sqrt(perlin_fGradient[k][i][0] * perlin_fGradient[k][i][0] + perlin_fGradient[k][i][1] * perlin_fGradient[k][i][1]));
-      perlin_fGradient[k][i][0] /= s;
-      perlin_fGradient[k][i][1] /= s;
-    }
-  }
-  while(--i)
-  {
-    k = perlin_uLatticeSelector[i];
-    perlin_uLatticeSelector[i] = perlin_uLatticeSelector[j = (lSeed = perlin_random(lSeed)) % BSize];
-    perlin_uLatticeSelector[j] = k;
-  }
-  for(i = 0; i < BSize + 2; i++)
-  {
-    perlin_uLatticeSelector[BSize + i] = perlin_uLatticeSelector[i];
-    for(k = 0; k < 4; k++)
-      for(j = 0; j < 2; j++)
-        perlin_fGradient[k][BSize + i][j] = perlin_fGradient[k][i][j];
-  }
-}
-
-#define s_curve(t) ( t * t * (3. - 2. * t) )
-#define lerp(t, a, b) ( a + t * (b - a) )
-static double
-perlin_noise2(int nColorChannel, double vec[2], StitchInfo *pStitchInfo)
-{
-  int bx0, bx1, by0, by1, b00, b10, b01, b11;
-  double rx0, rx1, ry0, ry1, *q, sx, sy, a, b, t, u, v;
-  register int i, j;
-
-  t = vec[0] + (double) PerlinN;
-  bx0 = (int)t;
-  bx1 = bx0+1;
-  rx0 = t - (int)t;
-  rx1 = rx0 - 1.0f;
-  t = vec[1] + (double) PerlinN;
-  by0 = (int)t;
-  by1 = by0+1;
-  ry0 = t - (int)t;
-  ry1 = ry0 - 1.0f;
-
-  /* If stitching, adjust lattice points accordingly. */
-  if(pStitchInfo != NULL)
-  {
-    if(bx0 >= pStitchInfo->nWrapX)
-      bx0 -= pStitchInfo->nWidth;
-    if(bx1 >= pStitchInfo->nWrapX)
-      bx1 -= pStitchInfo->nWidth;
-    if(by0 >= pStitchInfo->nWrapY)
-      by0 -= pStitchInfo->nHeight;
-    if(by1 >= pStitchInfo->nWrapY)
-      by1 -= pStitchInfo->nHeight;
-  }
-
-  bx0 &= BM;
-  bx1 &= BM;
-  by0 &= BM;
-  by1 &= BM;
-
-  i = perlin_uLatticeSelector[bx0];
-  j = perlin_uLatticeSelector[bx1];
-  b00 = perlin_uLatticeSelector[i + by0];
-  b10 = perlin_uLatticeSelector[j + by0];
-  b01 = perlin_uLatticeSelector[i + by1];
-  b11 = perlin_uLatticeSelector[j + by1];
-  sx = (double) (s_curve(rx0));
-  sy = (double) (s_curve(ry0));
-  q = perlin_fGradient[nColorChannel][b00]; u = rx0 * q[0] + ry0 * q[1];
-  q = perlin_fGradient[nColorChannel][b10]; v = rx1 * q[0] + ry0 * q[1];
-  a = lerp(sx, u, v);
-  q = perlin_fGradient[nColorChannel][b01]; u = rx0 * q[0] + ry1 * q[1];
-  q = perlin_fGradient[nColorChannel][b11]; v = rx1 * q[0] + ry1 * q[1];
-  b = lerp(sx, u, v);
-  return lerp(sy, a, b);
-}
-
-double
-perlin_turbulence(
-    int nColorChannel, double *point, double fBaseFreqX, double fBaseFreqY,
-    int nNumOctaves, int bFractalSum, int bDoStitching,
-    double fTileX, double fTileY, double fTileWidth, double fTileHeight)
-{
-  StitchInfo stitch;
-  StitchInfo *pStitchInfo = NULL; /* Not stitching when NULL. */
-
-  double fSum = 0.0f;
-  double vec[2];
-  double ratio = 1;
-
-  int nOctave;
-
-  vec[0] = point[0] * fBaseFreqX;
-  vec[1] = point[1] * fBaseFreqY;
-
-  /* Adjust the base frequencies if necessary for stitching. */
-  if(bDoStitching)
-  {
-    /* When stitching tiled turbulence, the frequencies must be adjusted */
-    /* so that the tile borders will be continuous. */
-    if(fBaseFreqX != 0.0)
-    {
-      double fLoFreq = (double) (floor(fTileWidth * fBaseFreqX)) / fTileWidth;
-      double fHiFreq = (double) (ceil(fTileWidth * fBaseFreqX)) / fTileWidth;
-      if(fBaseFreqX / fLoFreq < fHiFreq / fBaseFreqX)
-        fBaseFreqX = fLoFreq;
-      else
-        fBaseFreqX = fHiFreq;
-    }
-
-    if(fBaseFreqY != 0.0)
-    {
-      double fLoFreq = (double) (floor(fTileHeight * fBaseFreqY)) / fTileHeight;
-      double fHiFreq = (double) (ceil(fTileHeight * fBaseFreqY)) / fTileHeight;
-      if(fBaseFreqY / fLoFreq < fHiFreq / fBaseFreqY)
-        fBaseFreqY = fLoFreq;
-      else
-        fBaseFreqY = fHiFreq;
-    }
-
-    /* Set up initial stitch values. */
-    pStitchInfo = &stitch;
-    stitch.nWidth = (int) (fTileWidth * fBaseFreqX + 0.5f);
-    stitch.nWrapX = (int) (fTileX * fBaseFreqX + PerlinN + stitch.nWidth);
-    stitch.nHeight = (int) (fTileHeight * fBaseFreqY + 0.5f);
-    stitch.nWrapY = (int) (fTileY * fBaseFreqY + PerlinN + stitch.nHeight);
-  }
-
-  for(nOctave = 0; nOctave < nNumOctaves; nOctave++)
-  {
-    if(bFractalSum)
-      fSum += (double) (perlin_noise2(nColorChannel, vec, pStitchInfo) / ratio);
-    else
-      fSum += (double) (fabs(perlin_noise2(nColorChannel, vec, pStitchInfo)) / ratio);
-
-    vec[0] *= 2;
-    vec[1] *= 2;
-    ratio *= 2;
-
-    if(pStitchInfo != NULL)
-    {
-        /* Update stitch values. Subtracting PerlinN before the multiplication and */
-        /* adding it afterward simplifies to subtracting it once. */
-      stitch.nWidth *= 2;
-      stitch.nWrapX = 2 * stitch.nWrapX - PerlinN;
-      stitch.nHeight *= 2;
-      stitch.nWrapY = 2 * stitch.nWrapY - PerlinN;
-    }
-  }
-  return fSum;
-}
-
diff --git a/pythonPackages/pil/libImaging/EpsEncode.c b/pythonPackages/pil/libImaging/EpsEncode.c
deleted file mode 100644
index 0e62c2db8a..0000000000
--- a/pythonPackages/pil/libImaging/EpsEncode.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* 
- * The Python Imaging Library.
- * $Id: EpsEncode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * encoder for EPS hex data
- *
- * history:
- *	96-04-19 fl	created
- *	96-06-27 fl	don't drop last block of encoded data
- *
- * notes:
- *	FIXME: rename to HexEncode.c ??
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-int
-ImagingEpsEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    enum { HEXBYTE=1, NEWLINE };
-    const char *hex = "0123456789abcdef";
-
-    UINT8* ptr = buf;
-    UINT8* in, i;
-
-    if (!state->state) {
-	state->state = HEXBYTE;
-	state->xsize *= im->pixelsize; /* Hack! */
-    }
-
-    in = (UINT8*) im->image[state->y];
-
-    for (;;) {
-
-	if (state->state == NEWLINE) {
-	    if (bytes < 1)
-		break;
-	    *ptr++ = '\n';
-	    bytes--;
-	    state->state = HEXBYTE;
-	}
-
-	if (bytes < 2)
-	    break;
-
-	i = in[state->x++];
-	*ptr++ = hex[(i>>4)&15];
-	*ptr++ = hex[i&15];
-	bytes -= 2;
-
-	/* Skip junk bytes */
-	if (im->bands == 3 && (state->x & 3) == 3)
-	    state->x++;
-
-	if (++state->count >= 79/2) {
-	    state->state = NEWLINE;
-	    state->count = 0;
-	}
-
-	if (state->x >= state->xsize) {
-	    state->x = 0;
-	    if (++state->y >= state->ysize) {
-		state->errcode = IMAGING_CODEC_END;
-		break;
-	    }
-	    in = (UINT8*) im->image[state->y];
-	}
-
-    }
-
-    return ptr - buf;
-    
-}
diff --git a/pythonPackages/pil/libImaging/Except.c b/pythonPackages/pil/libImaging/Except.c
deleted file mode 100644
index cab069921f..0000000000
--- a/pythonPackages/pil/libImaging/Except.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* 
- * The Python Imaging Library
- * $Id: Except.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * default exception handling
- *
- * This module is usually overridden by application code (e.g.
- * _imaging.c for PIL's standard Python bindings).  If you get
- * linking errors, remove this file from your project/library.
- *
- * history:
- * 1995-06-15 fl   Created
- * 1998-12-29 fl   Minor tweaks
- * 2003-09-13 fl   Added ImagingEnter/LeaveSection()
- *
- * Copyright (c) 1997-2003 by Secret Labs AB.
- * Copyright (c) 1995-2003 by Fredrik Lundh.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-/* exception state */
-
-void *
-ImagingError_IOError(void)
-{
-    fprintf(stderr, "*** exception: file access error\n");
-    return NULL;
-}
-
-void *
-ImagingError_MemoryError(void)
-{
-    fprintf(stderr, "*** exception: out of memory\n");
-    return NULL;
-}
-
-void *
-ImagingError_ModeError(void)
-{
-    return ImagingError_ValueError("bad image mode");
-    return NULL;
-}
-
-void *
-ImagingError_Mismatch(void)
-{
-    return ImagingError_ValueError("images don't match");
-    return NULL;
-}
-
-void *
-ImagingError_ValueError(const char *message)
-{
-    if (!message)
-	message = "exception: bad argument to function";
-    fprintf(stderr, "*** %s\n", message);
-    return NULL;
-}
-
-
-/* thread state */
-
-void
-ImagingSectionEnter(ImagingSectionCookie* cookie)
-{
-    /* pass */
-}
-
-void
-ImagingSectionLeave(ImagingSectionCookie* cookie)
-{
-    /* pass */
-}
diff --git a/pythonPackages/pil/libImaging/File.c b/pythonPackages/pil/libImaging/File.c
deleted file mode 100644
index 00f52d3363..0000000000
--- a/pythonPackages/pil/libImaging/File.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: File.c 2507 2005-09-10 14:53:47Z fredrik $
- *
- * built-in image file handling
- *
- * history:
- * 1995-11-26 fl  Created, supports PGM/PPM
- * 1996-08-07 fl  Write "1" images as PGM
- * 1999-02-21 fl  Don't write non-standard modes
- *
- * Copyright (c) 1997-99 by Secret Labs AB.
- * Copyright (c) 1995-96 by Fredrik Lundh.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#include <ctype.h>
-
-Imaging
-ImagingOpenPPM(const char* infile)
-{
-    FILE* fp;
-    int i, c, v;
-    char* mode;
-    int x, y, max;
-    Imaging im;
-
-    if (!infile)
-	return ImagingError_ValueError(NULL);
-
-    fp = fopen(infile, "rb");
-    if (!fp)
-	return ImagingError_IOError();
-
-    /* PPM magic */
-    if (fgetc(fp) != 'P')
-	goto syntax;
-    switch (fgetc(fp)) {
-    case '4': /* FIXME: 1-bit images are not yet supported */
-	goto syntax;
-    case '5':
-	mode = "L";
-	break;
-    case '6':
-	mode = "RGB";
-	break;
-    default:
-	goto syntax;
-    }
-
-    i = 0;
-    c = fgetc(fp);
-
-    x = y = max = 0;
-
-    while (i < 3) {	
-
-	/* Ignore optional comment fields */
-	while (c == '\n') {
-	    c = fgetc(fp);
-	    if (c == '#') {
-		do {
-		    c = fgetc(fp);
-		    if (c == EOF)
-			goto syntax;
-		} while (c != '\n');
-		c = fgetc(fp);
-	    }
-	}
-
-	/* Skip forward to next value */
-	while (isspace(c))
-	    c = fgetc(fp);
-
-	/* And parse it */
-	v = 0;
-	while (isdigit(c)) {
-	    v = v * 10 + (c - '0');
-	    c = fgetc(fp);
-	}
-
-	if (c == EOF)
-	    goto syntax;
-
-	switch (i++) {
-	case 0:
-	    x = v;
-	    break;
-	case 1:
-	    y = v;
-	    break;
-	case 2:
-	    max = v;
-	    break;
-	}
-    }
-
-    im = ImagingNew(mode, x, y);
-    if (!im)
-	return NULL;
-
-    /* if (max != 255) ... FIXME: does anyone ever use this feature? */
-
-    if (strcmp(im->mode, "L") == 0) {
-
-	/* PPM "L" */
-	for (y = 0; y < im->ysize; y++)
-	    fread(im->image[y], 1, im->xsize, fp);
-
-    } else {
-
-	/* PPM "RGB" or PyPPM mode */
-	for (y = 0; y < im->ysize; y++)
-	    for (x = i = 0; x < im->xsize; x++, i += im->pixelsize)
-		fread(im->image[y]+i, 1, im->bands, fp);
-
-    }
-
-    fclose(fp);
-
-    return im;
-
-syntax:
-    fclose(fp);
-    return ImagingError_IOError();
-}
-
-
-int
-ImagingSaveRaw(Imaging im, FILE* fp)
-{
-    int x, y, i;
-
-    if (strcmp(im->mode, "1") == 0 || strcmp(im->mode, "L") == 0) {
-
-        /* @PIL227: FIXME: for mode "1", map != 0 to 255 */
-
-	/* PGM "L" */
-	for (y = 0; y < im->ysize; y++)
-	    fwrite(im->image[y], 1, im->xsize, fp);
-
-    } else {
-
-	/* PPM "RGB" or other internal format */
-	for (y = 0; y < im->ysize; y++)
-	    for (x = i = 0; x < im->xsize; x++, i += im->pixelsize)
-		fwrite(im->image[y]+i, 1, im->bands, fp);
-
-    }
-
-    return 1;
-}
-
-
-int
-ImagingSavePPM(Imaging im, const char* outfile)
-{
-    FILE* fp;
-
-    if (!im) {
-	ImagingError_ValueError(NULL);
-	return 0;
-    }
-
-    fp = fopen(outfile, "wb");
-    if (!fp) {
-	ImagingError_IOError();
-	return 0;
-    }
-
-    if (strcmp(im->mode, "1") == 0 || strcmp(im->mode, "L") == 0) {
-
-	/* Write "PGM" */
-	fprintf(fp, "P5\n%d %d\n255\n", im->xsize, im->ysize);
-
-    } else if (strcmp(im->mode, "RGB") == 0) {
-
-        /* Write "PPM" */
-        fprintf(fp, "P6\n%d %d\n255\n", im->xsize, im->ysize);
-
-    } else {
-
-        ImagingError_ModeError();
-        return 0;
-
-    }
-
-    ImagingSaveRaw(im, fp);
-
-    fclose(fp);
-
-    return 1;
-}
-
diff --git a/pythonPackages/pil/libImaging/Fill.c b/pythonPackages/pil/libImaging/Fill.c
deleted file mode 100644
index f900a998d0..0000000000
--- a/pythonPackages/pil/libImaging/Fill.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Fill.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * fill image with constant pixel value
- *
- * history:
- * 95-11-26 fl	moved from Imaging.c
- * 96-05-17 fl	added radial fill, renamed wedge to linear
- * 98-06-23 fl	changed ImageFill signature
- *
- * Copyright (c) Secret Labs AB 1997-98.  All rights reserved.
- * Copyright (c) Fredrik Lundh 1995-96.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#include "math.h"
-
-
-Imaging
-ImagingFill(Imaging im, const void* colour)
-{
-    INT32 c;
-    int x, y;
-
-    c = 0L;
-    memcpy(&c, colour, im->pixelsize);
-
-    if (im->image32 && c != 0L) {
-	for (y = 0; y < im->ysize; y++)
-	    for (x = 0; x < im->xsize; x++)
-		im->image32[y][x] = c;
-    } else {
-        unsigned char cc = (unsigned char) *(UINT8*) colour;
-	for (y = 0; y < im->ysize; y++)
-           memset(im->image[y], cc, im->linesize);
-    }
-
-    return im;
-}
-
-Imaging
-ImagingFillLinearGradient(const char *mode)
-{
-    Imaging im;
-    int y;
-
-    if (strlen(mode) != 1)
-	return (Imaging) ImagingError_ModeError();
-
-    im = ImagingNew(mode, 256, 256);
-    if (!im)
-	return NULL;
-
-    for (y = 0; y < 256; y++)
-	memset(im->image8[y], (unsigned char) y, 256);
-
-    return im;
-}
-
-Imaging
-ImagingFillRadialGradient(const char *mode)
-{
-    Imaging im;
-    int x, y;
-    int d;
-
-    if (strlen(mode) != 1)
-	return (Imaging) ImagingError_ModeError();
-
-    im = ImagingNew(mode, 256, 256);
-    if (!im)
-	return NULL;
-
-    for (y = 0; y < 256; y++)
-	for (x = 0; x < 256; x++) {
-	    d = (int) sqrt((double) ((x-128)*(x-128) + (y-128)*(y-128)) * 2.0);
-	    if (d >= 255)
-		im->image8[y][x] = 255;
-	    else
-		im->image8[y][x] = d;
-	}
-
-    return im;
-}
diff --git a/pythonPackages/pil/libImaging/Filter.c b/pythonPackages/pil/libImaging/Filter.c
deleted file mode 100644
index b73ca9faaa..0000000000
--- a/pythonPackages/pil/libImaging/Filter.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Filter.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * apply convolution kernel to image
- *
- * history:
- * 1995-11-26 fl   Created, supports 3x3 kernels
- * 1995-11-27 fl   Added 5x5 kernels, copy border
- * 1999-07-26 fl   Eliminated a few compiler warnings
- * 2002-06-09 fl   Moved kernel definitions to Python
- * 2002-06-11 fl   Support floating point kernels
- * 2003-09-15 fl   Added ImagingExpand helper
- *
- * Copyright (c) Secret Labs AB 1997-2002.  All rights reserved.
- * Copyright (c) Fredrik Lundh 1995.
- *
- * See the README file for information on usage and redistribution.
- */
-
-/*
- * FIXME: Support RGB and RGBA/CMYK modes as well
- * FIXME: Expand image border (current version leaves border as is)
- * FIXME: Implement image processing gradient filters
- */
-
-#include "Imaging.h"
-
-Imaging
-ImagingExpand(Imaging imIn, int xmargin, int ymargin, int mode)
-{
-    Imaging imOut;
-    int x, y;
-    
-    if (xmargin < 0 && ymargin < 0)
-	return (Imaging) ImagingError_ValueError("bad kernel size");
-
-    imOut = ImagingNew(
-        imIn->mode, imIn->xsize+2*xmargin, imIn->ysize+2*ymargin
-        );
-    if (!imOut)
-	return NULL;
-
-#define EXPAND_LINE(type, image, yin, yout) {\
-    for (x = 0; x < xmargin; x++)\
-        imOut->image[yout][x] = imIn->image[yin][0];\
-    for (x = 0; x < imIn->xsize; x++)\
-        imOut->image[yout][x+xmargin] = imIn->image[yin][x];\
-    for (x = 0; x < xmargin; x++)\
-        imOut->image[yout][xmargin+imIn->xsize+x] =\
-            imIn->image[yin][imIn->xsize-1];\
-    }
-
-#define EXPAND(type, image) {\
-    for (y = 0; y < ymargin; y++)\
-        EXPAND_LINE(type, image, 0, y);\
-    for (y = 0; y < imIn->ysize; y++)\
-        EXPAND_LINE(type, image, y, y+ymargin);\
-    for (y = 0; y < ymargin; y++)\
-        EXPAND_LINE(type, image, imIn->ysize-1, ymargin+imIn->ysize+y);\
-    }
-
-    if (imIn->image8) {
-	EXPAND(UINT8, image8);
-    } else {
-	EXPAND(INT32, image32);
-    }
-
-    ImagingCopyInfo(imOut, imIn);
-
-    return imOut;
-}
-
-Imaging
-ImagingFilter(Imaging im, int xsize, int ysize, const FLOAT32* kernel,
-              FLOAT32 offset, FLOAT32 divisor)
-{
-    Imaging imOut;
-    int x, y;
-    FLOAT32 sum;
-
-    if (!im || strcmp(im->mode, "L") != 0)
-	return (Imaging) ImagingError_ModeError();
-
-    if ((xsize != 3 && xsize != 5) || xsize != ysize)
-	return (Imaging) ImagingError_ValueError("bad kernel size");
-
-    imOut = ImagingNew(im->mode, im->xsize, im->ysize);
-    if (!imOut)
-	return NULL;
-
-    /* brute force kernel implementations */
-#define	KERNEL3x3(image, kernel, d) ( \
-    (int) image[y+1][x-d] * kernel[0] + \
-    (int) image[y+1][x]   * kernel[1] + \
-    (int) image[y+1][x+d] * kernel[2] + \
-    (int) image[y][x-d]   * kernel[3] + \
-    (int) image[y][x]     * kernel[4] + \
-    (int) image[y][x+d]   * kernel[5] + \
-    (int) image[y-1][x-d] * kernel[6] + \
-    (int) image[y-1][x]   * kernel[7] + \
-    (int) image[y-1][x+d] * kernel[8])
-
-#define	KERNEL5x5(image, kernel, d) ( \
-    (int) image[y+2][x-d-d] * kernel[0] + \
-    (int) image[y+2][x-d]   * kernel[1] + \
-    (int) image[y+2][x]     * kernel[2] + \
-    (int) image[y+2][x+d]   * kernel[3] + \
-    (int) image[y+2][x+d+d] * kernel[4] + \
-    (int) image[y+1][x-d-d] * kernel[5] + \
-    (int) image[y+1][x-d]   * kernel[6] + \
-    (int) image[y+1][x]     * kernel[7] + \
-    (int) image[y+1][x+d]   * kernel[8] + \
-    (int) image[y+1][x+d+d] * kernel[9] + \
-    (int) image[y][x-d-d]   * kernel[10] + \
-    (int) image[y][x-d]     * kernel[11] + \
-    (int) image[y][x]       * kernel[12] + \
-    (int) image[y][x+d]     * kernel[13] + \
-    (int) image[y][x+d+d]   * kernel[14] + \
-    (int) image[y-1][x-d-d] * kernel[15] + \
-    (int) image[y-1][x-d]   * kernel[16] + \
-    (int) image[y-1][x]     * kernel[17] + \
-    (int) image[y-1][x+d]   * kernel[18] + \
-    (int) image[y-1][x+d+d] * kernel[19] + \
-    (int) image[y-2][x-d-d] * kernel[20] + \
-    (int) image[y-2][x-d]   * kernel[21] + \
-    (int) image[y-2][x]     * kernel[22] + \
-    (int) image[y-2][x+d]   * kernel[23] + \
-    (int) image[y-2][x+d+d] * kernel[24])
-
-    if (xsize == 3) {
-	/* 3x3 kernel. */
-	for (x = 0; x < im->xsize; x++)
-	    imOut->image[0][x] = im->image8[0][x];
-	for (y = 1; y < im->ysize-1; y++) {
-	    imOut->image[y][0] = im->image8[y][0];
-	    for (x = 1; x < im->xsize-1; x++) {
-		sum = KERNEL3x3(im->image8, kernel, 1) / divisor + offset;
-		if (sum <= 0)
-		    imOut->image8[y][x] = 0;
-		else if (sum >= 255)
-		    imOut->image8[y][x] = 255;
-		else
-		    imOut->image8[y][x] = (UINT8) sum;
-	     }
-	    imOut->image8[y][x] = im->image8[y][x];
-	}
-	for (x = 0; x < im->xsize; x++)
-	    imOut->image8[y][x] = im->image8[y][x];
-    } else {
-	/* 5x5 kernel. */
-	for (y = 0; y < 2; y++)
-	    for (x = 0; x < im->xsize; x++)
-		imOut->image8[y][x] = im->image8[y][x];
-	for (; y < im->ysize-2; y++) {
-	    for (x = 0; x < 2; x++)
-		imOut->image8[y][x] = im->image8[y][x];
-	    for (; x < im->xsize-2; x++) {
-		sum = KERNEL5x5(im->image8, kernel, 1) / divisor + offset;
-		if (sum <= 0)
-		    imOut->image8[y][x] = 0;
-		else if (sum >= 255)
-		    imOut->image8[y][x] = 255;
-		else
-		    imOut->image8[y][x] = (UINT8) sum;
-	    }
-	    for (; x < im->xsize; x++)
-		imOut->image8[y][x] = im->image8[y][x];
-	}
-	for (; y < im->ysize; y++)
-	    for (x = 0; x < im->xsize; x++)
-		imOut->image8[y][x] = im->image8[y][x];
-    }
-    return imOut;
-}
-
diff --git a/pythonPackages/pil/libImaging/FliDecode.c b/pythonPackages/pil/libImaging/FliDecode.c
deleted file mode 100644
index b71ede6e24..0000000000
--- a/pythonPackages/pil/libImaging/FliDecode.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: FliDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for Autodesk Animator FLI/FLC animations
- *
- * history:
- *	97-01-03 fl	Created
- *	97-01-17 fl	Added SS2 support (FLC)
- *
- * Copyright (c) Fredrik Lundh 1997.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-#define	I16(ptr)\
-    ((ptr)[0] + ((ptr)[1] << 8))
-
-#define	I32(ptr)\
-    ((ptr)[0] + ((ptr)[1] << 8) + ((ptr)[2] << 16) + ((ptr)[3] << 24))
-
-
-int
-ImagingFliDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    UINT8* ptr;
-    int framesize;
-    int c, chunks;
-    int l, lines;
-    int i, j, x = 0, y, ymax;
-
-    /* If not even the chunk size is present, we'd better leave */
-
-    if (bytes < 4)
-	return 0;
-
-    /* We don't decode anything unless we have a full chunk in the
-       input buffer (on the other hand, the Python part of the driver
-       makes sure this is always the case) */
-
-    ptr = buf;
-
-    framesize = I32(ptr);
-    if (framesize < I32(ptr))
-	return 0;
-
-    /* Make sure this is a frame chunk.  The Python driver takes
-       case of other chunk types. */
-
-    if (I16(ptr+4) != 0xF1FA) {
-	state->errcode = IMAGING_CODEC_UNKNOWN;
-	return -1;
-    }
-
-    chunks = I16(ptr+6);
-    ptr += 16;
-
-    /* Process subchunks */
-    for (c = 0; c < chunks; c++) {
-	UINT8 *data = ptr + 6;
-	switch (I16(ptr+4)) {
-	case 4: case 11:
-	    /* FLI COLOR chunk */
-	    break; /* ignored; handled by Python code */
-	case 7:
-	    /* FLI SS2 chunk (word delta) */
-	    lines = I16(data); data += 2;
-	    for (l = y = 0; l < lines && y < state->ysize; l++, y++) {
-		UINT8* buf = (UINT8*) im->image[y];
-		int p, packets;
-		packets = I16(data); data += 2;
-		while (packets & 0x8000) {
-		    /* flag word */
-		    if (packets & 0x4000) {
-			y += 65536 - packets; /* skip lines */
-			if (y >= state->ysize) {
-			    state->errcode = IMAGING_CODEC_OVERRUN;
-			    return -1;
-			}
-			buf = (UINT8*) im->image[y];
-		    } else {
-			/* store last byte (used if line width is odd) */
-			buf[state->xsize-1] = (UINT8) packets;
-		    }
-		    packets = I16(data); data += 2;
-		}
-		for (p = x = 0; p < packets; p++) {
-		    x += data[0]; /* pixel skip */
-		    if (data[1] >= 128) {
-			i = 256-data[1]; /* run */
-			if (x + i + i > state->xsize)
-			    break;
-			for (j = 0; j < i; j++) {
-			    buf[x++] = data[2];
-			    buf[x++] = data[3];
-			}
-			data += 2 + 2;
-		    } else {
-			i = 2 * (int) data[1]; /* chunk */
-			if (x + i > state->xsize)
-			    break;
-			memcpy(buf + x, data + 2, i);
-			data += 2 + i;
-			x += i;
-		    }
-		}
-		if (p < packets)
-		    break; /* didn't process all packets */
-	    }
-	    if (l < lines) {
-		/* didn't process all lines */
-		state->errcode = IMAGING_CODEC_OVERRUN;
-		return -1;
-	    }
-	    break;
-	case 12:
-	    /* FLI LC chunk (byte delta) */
-	    y = I16(data); ymax = y + I16(data+2); data += 4;
-	    for (; y < ymax && y < state->ysize; y++) {
-		UINT8* out = (UINT8*) im->image[y];
-		int p, packets = *data++;
-		for (p = x = 0; p < packets; p++, x += i) {
-		    x += data[0]; /* skip pixels */
-		    if (data[1] & 0x80) {
-			i = 256-data[1]; /* run */
-			if (x + i > state->xsize)
-			    break;
-			memset(out + x, data[2], i);
-			data += 3;
-		    } else {
-			i = data[1]; /* chunk */
-			if (x + i > state->xsize)
-			    break;
-			memcpy(out + x, data + 2, i);
-			data += i + 2;
-		    }
-		}
-		if (p < packets)
-		    break; /* didn't process all packets */
-	    }
-	    if (y < ymax) {
-		/* didn't process all lines */
-		state->errcode = IMAGING_CODEC_OVERRUN;
-		return -1;
-	    }
-	    break;
-	case 13:
-	    /* FLI BLACK chunk */
-	    for (y = 0; y < state->ysize; y++)
-		memset(im->image[y], 0, state->xsize);
-	    break;
-	case 15:
-	    /* FLI BRUN chunk */
-	    for (y = 0; y < state->ysize; y++) {
-		UINT8* out = (UINT8*) im->image[y];
-		data += 1; /* ignore packetcount byte */
-		for (x = 0; x < state->xsize; x += i) {
-		    if (data[0] & 0x80) {
-			i = 256 - data[0];
-			if (x + i > state->xsize)
-			    break; /* safety first */
-			memcpy(out + x, data + 1, i);
-			data += i + 1;
-		    } else {
-			i = data[0];
-			if (x + i > state->xsize)
-			    break; /* safety first */
-			memset(out + x, data[1], i);
-			data += 2;
-		    }
-		}
-		if (x != state->xsize) {
-		    /* didn't unpack whole line */
-		    state->errcode = IMAGING_CODEC_OVERRUN;
-		    return -1;
-		}
-	    }
-	    break;
-	case 16:
-	    /* COPY chunk */
-	    for (y = 0; y < state->ysize; y++) {
-		UINT8* buf = (UINT8*) im->image[y];
-		memcpy(buf+x, data, state->xsize);
-		data += state->xsize;
-	    }
-	    break;
-	case 18:
-	    /* PSTAMP chunk */
-	    break; /* ignored */
-	default:
-	    /* unknown chunk */
-	    /* printf("unknown FLI/FLC chunk: %d\n", I16(ptr+4)); */
-	    state->errcode = IMAGING_CODEC_UNKNOWN;
-	    return -1;
-	}
-	ptr += I32(ptr);
-    }
-
-    return -1; /* end of frame */
-}
diff --git a/pythonPackages/pil/libImaging/Geometry.c b/pythonPackages/pil/libImaging/Geometry.c
deleted file mode 100644
index 6b623df152..0000000000
--- a/pythonPackages/pil/libImaging/Geometry.c
+++ /dev/null
@@ -1,957 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Geometry.c 2308 2005-03-02 12:00:55Z fredrik $
- *
- * the imaging geometry methods
- *
- * history:
- * 1995-06-15 fl  Created
- * 1996-04-15 fl  Changed origin
- * 1996-05-18 fl  Fixed rotate90/270 for rectangular images
- * 1996-05-27 fl  Added general purpose transform
- * 1996-11-22 fl  Don't crash when resizing from outside source image
- * 1997-08-09 fl  Fixed rounding error in resize
- * 1998-09-21 fl  Incorporated transformation patches (from Zircon #2)
- * 1998-09-22 fl  Added bounding box to transform engines
- * 1999-02-03 fl  Fixed bicubic filtering for RGB images
- * 1999-02-16 fl  Added fixed-point version of affine transform
- * 2001-03-28 fl  Fixed transform(EXTENT) for xoffset < 0
- * 2003-03-10 fl  Compiler tweaks
- * 2004-09-19 fl  Fixed bilinear/bicubic filtering of LA images
- *
- * Copyright (c) 1997-2003 by Secret Labs AB
- * Copyright (c) 1995-1997 by Fredrik Lundh
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Imaging.h"
-
-/* Undef if you don't need resampling filters */
-#define WITH_FILTERS
-
-#define COORD(v) ((v) < 0.0 ? -1 : ((int)(v)))
-#define FLOOR(v) ((v) < 0.0 ? ((int)floor(v)) : ((int)(v)))
-
-/* -------------------------------------------------------------------- */
-/* Transpose operations							*/
-
-Imaging
-ImagingFlipLeftRight(Imaging imOut, Imaging imIn)
-{
-    ImagingSectionCookie cookie;
-    int x, y, xr;
-
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
-	return (Imaging) ImagingError_ModeError();
-    if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize)
-	return (Imaging) ImagingError_Mismatch();
-
-    ImagingCopyInfo(imOut, imIn);
-
-#define	FLIP_HORIZ(image)\
-    for (y = 0; y < imIn->ysize; y++) {\
-	xr = imIn->xsize-1;\
-	for (x = 0; x < imIn->xsize; x++, xr--)\
-	    imOut->image[y][x] = imIn->image[y][xr];\
-    }
-
-    ImagingSectionEnter(&cookie);
-
-    if (imIn->image8)
-	FLIP_HORIZ(image8)
-    else
-	FLIP_HORIZ(image32)
-
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-
-Imaging
-ImagingFlipTopBottom(Imaging imOut, Imaging imIn)
-{
-    ImagingSectionCookie cookie;
-    int y, yr;
-
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
-	return (Imaging) ImagingError_ModeError();
-    if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize)
-	return (Imaging) ImagingError_Mismatch();
-
-    ImagingCopyInfo(imOut, imIn);
-
-    ImagingSectionEnter(&cookie);
-
-    yr = imIn->ysize-1;
-    for (y = 0; y < imIn->ysize; y++, yr--)
-	memcpy(imOut->image[yr], imIn->image[y], imIn->linesize);
-
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-
-Imaging
-ImagingRotate90(Imaging imOut, Imaging imIn)
-{
-    ImagingSectionCookie cookie;
-    int x, y, xr;
-
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
-	return (Imaging) ImagingError_ModeError();
-    if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize)
-	return (Imaging) ImagingError_Mismatch();
-
-    ImagingCopyInfo(imOut, imIn);
-
-#define	ROTATE_90(image)\
-    for (y = 0; y < imIn->ysize; y++) {\
-	xr = imIn->xsize-1;\
-	for (x = 0; x < imIn->xsize; x++, xr--)\
-	    imOut->image[xr][y] = imIn->image[y][x];\
-    }
-
-    ImagingSectionEnter(&cookie);
-
-    if (imIn->image8)
-	ROTATE_90(image8)
-    else
-	ROTATE_90(image32)
-
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-
-Imaging
-ImagingRotate180(Imaging imOut, Imaging imIn)
-{
-    ImagingSectionCookie cookie;
-    int x, y, xr, yr;
-
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
-	return (Imaging) ImagingError_ModeError();
-    if (imIn->xsize != imOut->xsize || imIn->ysize != imOut->ysize)
-	return (Imaging) ImagingError_Mismatch();
-
-    ImagingCopyInfo(imOut, imIn);
-
-    yr = imIn->ysize-1;
-
-#define	ROTATE_180(image)\
-    for (y = 0; y < imIn->ysize; y++, yr--) {\
-	xr = imIn->xsize-1;\
-	for (x = 0; x < imIn->xsize; x++, xr--)\
-	    imOut->image[y][x] = imIn->image[yr][xr];\
-    }
-
-    ImagingSectionEnter(&cookie);
-
-    if (imIn->image8)
-	ROTATE_180(image8)
-    else
-	ROTATE_180(image32)
-
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-
-Imaging
-ImagingRotate270(Imaging imOut, Imaging imIn)
-{
-    ImagingSectionCookie cookie;
-    int x, y, yr;
-
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
-	return (Imaging) ImagingError_ModeError();
-    if (imIn->xsize != imOut->ysize || imIn->ysize != imOut->xsize)
-	return (Imaging) ImagingError_Mismatch();
-
-    ImagingCopyInfo(imOut, imIn);
-
-    yr = imIn->ysize - 1;
-
-#define	ROTATE_270(image)\
-    for (y = 0; y < imIn->ysize; y++, yr--)\
-	for (x = 0; x < imIn->xsize; x++)\
-	    imOut->image[x][y] = imIn->image[yr][x];
-
-    ImagingSectionEnter(&cookie);
-
-    if (imIn->image8)
-	ROTATE_270(image8)
-    else
-	ROTATE_270(image32)
-
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* Transforms								*/
-
-/* transform primitives (ImagingTransformMap) */
-
-static int
-affine_transform(double* xin, double* yin, int x, int y, void* data)
-{
-    /* full moon tonight.  your compiler will generate bogus code
-       for simple expressions, unless you reorganize the code, or
-       install Service Pack 3 */
-
-    double* a = (double*) data;
-    double a0 = a[0]; double a1 = a[1]; double a2 = a[2];
-    double a3 = a[3]; double a4 = a[4]; double a5 = a[5];
-
-    xin[0] = a0 + a1*x + a2*y;
-    yin[0] = a3 + a4*x + a5*y;
-
-    return 1;
-}
-
-static int
-perspective_transform(double* xin, double* yin, int x, int y, void* data)
-{
-    double* a = (double*) data;
-    double a0 = a[0]; double a1 = a[1]; double a2 = a[2];
-    double a3 = a[3]; double a4 = a[4]; double a5 = a[5];
-    double a6 = a[6]; double a7 = a[7];
-
-    xin[0] = (a0 + a1*x + a2*y) / (a6*x + a7*y + 1);
-    yin[0] = (a3 + a4*x + a5*y) / (a6*x + a7*y + 1);
-
-    return 1;
-}
-
-static int
-quadratic_transform(double* xin, double* yin, int x, int y, void* data)
-{
-    double* a = (double*) data;
-
-    double a0 = a[0]; double a1 = a[1]; double a2 = a[2]; double a3 = a[3];
-    double a4 = a[4]; double a5 = a[5]; double a6 = a[6]; double a7 = a[7];
-    double a8 = a[8]; double a9 = a[9]; double a10 = a[10]; double a11 = a[11];
-
-    xin[0] = a0 + a1*x + a2*y + a3*x*x + a4*x*y + a5*y*y;
-    yin[0] = a6 + a7*x + a8*y + a9*x*x + a10*x*y + a11*y*y;
-
-    return 1;
-}
-
-static int
-quad_transform(double* xin, double* yin, int x, int y, void* data)
-{
-    /* quad warp: map quadrilateral to rectangle */
-
-    double* a = (double*) data;
-    double a0 = a[0]; double a1 = a[1]; double a2 = a[2]; double a3 = a[3];
-    double a4 = a[4]; double a5 = a[5]; double a6 = a[6]; double a7 = a[7];
-
-    xin[0] = a0 + a1*x + a2*y + a3*x*y;
-    yin[0] = a4 + a5*x + a6*y + a7*x*y;
-
-    return 1;
-}
-
-/* transform filters (ImagingTransformFilter) */
-
-#ifdef WITH_FILTERS
-
-static int
-nearest_filter8(void* out, Imaging im, double xin, double yin, void* data)
-{
-    int x = COORD(xin);
-    int y = COORD(yin);
-    if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
-        return 0;
-    ((UINT8*)out)[0] = im->image8[y][x];
-    return 1;
-}
-
-static int
-nearest_filter16(void* out, Imaging im, double xin, double yin, void* data)
-{
-    int x = COORD(xin);
-    int y = COORD(yin);
-    if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
-        return 0;
-    ((INT16*)out)[0] = ((INT16*)(im->image8[y]))[x];
-    return 1;
-}
-
-static int
-nearest_filter32(void* out, Imaging im, double xin, double yin, void* data)
-{
-    int x = COORD(xin);
-    int y = COORD(yin);
-    if (x < 0 || x >= im->xsize || y < 0 || y >= im->ysize)
-        return 0;
-    ((INT32*)out)[0] = im->image32[y][x];
-    return 1;
-}
-
-#define XCLIP(im, x) ( ((x) < 0) ? 0 : ((x) < im->xsize) ? (x) : im->xsize-1 )
-#define YCLIP(im, y) ( ((y) < 0) ? 0 : ((y) < im->ysize) ? (y) : im->ysize-1 )
-
-#define BILINEAR(v, a, b, d)\
-    (v = (a) + ( (b) - (a) ) * (d))
-
-#define BILINEAR_HEAD(type)\
-    int x, y;\
-    int x0, x1;\
-    double v1, v2;\
-    double dx, dy;\
-    type* in;\
-    if (xin < 0.0 || xin >= im->xsize || yin < 0.0 || yin >= im->ysize)\
-        return 0;\
-    xin -= 0.5;\
-    yin -= 0.5;\
-    x = FLOOR(xin);\
-    y = FLOOR(yin);\
-    dx = xin - x;\
-    dy = yin - y;
-
-#define BILINEAR_BODY(type, image, step, offset) {\
-    in = (type*) ((image)[YCLIP(im, y)] + offset);\
-    x0 = XCLIP(im, x+0)*step;\
-    x1 = XCLIP(im, x+1)*step;\
-    BILINEAR(v1, in[x0], in[x1], dx);\
-    if (y+1 >= 0 && y+1 < im->ysize) {\
-        in = (type*) ((image)[y+1] + offset);\
-        BILINEAR(v2, in[x0], in[x1], dx);\
-    } else\
-        v2 = v1;\
-    BILINEAR(v1, v1, v2, dy);\
-}
-
-static int
-bilinear_filter8(void* out, Imaging im, double xin, double yin, void* data)
-{
-    BILINEAR_HEAD(UINT8);
-    BILINEAR_BODY(UINT8, im->image8, 1, 0);
-    ((UINT8*)out)[0] = (UINT8) v1;
-    return 1;
-}
-
-static int
-bilinear_filter32I(void* out, Imaging im, double xin, double yin, void* data)
-{
-    BILINEAR_HEAD(INT32);
-    BILINEAR_BODY(INT32, im->image32, 1, 0);
-    ((INT32*)out)[0] = (INT32) v1;
-    return 1;
-}
-
-static int
-bilinear_filter32F(void* out, Imaging im, double xin, double yin, void* data)
-{
-    BILINEAR_HEAD(FLOAT32);
-    BILINEAR_BODY(FLOAT32, im->image32, 1, 0);
-    ((FLOAT32*)out)[0] = (FLOAT32) v1;
-    return 1;
-}
-
-static int
-bilinear_filter32LA(void* out, Imaging im, double xin, double yin, void* data)
-{
-    BILINEAR_HEAD(UINT8);
-    BILINEAR_BODY(UINT8, im->image, 4, 0);
-    ((UINT8*)out)[0] = (UINT8) v1;
-    ((UINT8*)out)[1] = (UINT8) v1;
-    ((UINT8*)out)[2] = (UINT8) v1;
-    BILINEAR_BODY(UINT8, im->image, 4, 3);
-    ((UINT8*)out)[3] = (UINT8) v1;
-    return 1;
-}
-
-static int
-bilinear_filter32RGB(void* out, Imaging im, double xin, double yin, void* data)
-{
-    int b;
-    BILINEAR_HEAD(UINT8);
-    for (b = 0; b < im->bands; b++) {
-        BILINEAR_BODY(UINT8, im->image, 4, b);
-        ((UINT8*)out)[b] = (UINT8) v1;
-    }
-    return 1;
-}
-
-#define BICUBIC(v, v1, v2, v3, v4, d) {\
-    double p1 = v2;\
-    double p2 = -v1 + v3;\
-    double p3 = 2*(v1 - v2) + v3 - v4;\
-    double p4 = -v1 + v2 - v3 + v4;\
-    v = p1 + (d)*(p2 + (d)*(p3 + (d)*p4));\
-}
-
-#define BICUBIC_HEAD(type)\
-    int x = FLOOR(xin);\
-    int y = FLOOR(yin);\
-    int x0, x1, x2, x3;\
-    double v1, v2, v3, v4;\
-    double dx, dy;\
-    type* in;\
-    if (xin < 0.0 || xin >= im->xsize || yin < 0.0 || yin >= im->ysize)\
-        return 0;\
-    xin -= 0.5;\
-    yin -= 0.5;\
-    x = FLOOR(xin);\
-    y = FLOOR(yin);\
-    dx = xin - x;\
-    dy = yin - y;\
-    x--; y--;
-
-#define BICUBIC_BODY(type, image, step, offset) {\
-    in = (type*) ((image)[YCLIP(im, y)] + offset);\
-    x0 = XCLIP(im, x+0)*step;\
-    x1 = XCLIP(im, x+1)*step;\
-    x2 = XCLIP(im, x+2)*step;\
-    x3 = XCLIP(im, x+3)*step;\
-    BICUBIC(v1, in[x0], in[x1], in[x2], in[x3], dx);\
-    if (y+1 >= 0 && y+1 < im->ysize) {\
-        in = (type*) ((image)[y+1] + offset);\
-        BICUBIC(v2, in[x0], in[x1], in[x2], in[x3], dx);\
-    } else\
-        v2 = v1;\
-    if (y+2 >= 0 && y+2 < im->ysize) {\
-        in = (type*) ((image)[y+2] + offset);\
-        BICUBIC(v3, in[x0], in[x1], in[x2], in[x3], dx);\
-    } else\
-        v3 = v2;\
-    if (y+3 >= 0 && y+3 < im->ysize) {\
-        in = (type*) ((image)[y+3] + offset);\
-        BICUBIC(v4, in[x0], in[x1], in[x2], in[x3], dx);\
-    } else\
-        v4 = v3;\
-    BICUBIC(v1, v1, v2, v3, v4, dy);\
-}
-
-
-static int
-bicubic_filter8(void* out, Imaging im, double xin, double yin, void* data)
-{
-    BICUBIC_HEAD(UINT8);
-    BICUBIC_BODY(UINT8, im->image8, 1, 0);
-    if (v1 <= 0.0)
-        ((UINT8*)out)[0] = 0;
-    else if (v1 >= 255.0)
-        ((UINT8*)out)[0] = 255;
-    else
-        ((UINT8*)out)[0] = (UINT8) v1;
-    return 1;
-}
-
-static int
-bicubic_filter32I(void* out, Imaging im, double xin, double yin, void* data)
-{
-    BICUBIC_HEAD(INT32);
-    BICUBIC_BODY(INT32, im->image32, 1, 0);
-    ((INT32*)out)[0] = (INT32) v1;
-    return 1;
-}
-
-static int
-bicubic_filter32F(void* out, Imaging im, double xin, double yin, void* data)
-{
-    BICUBIC_HEAD(FLOAT32);
-    BICUBIC_BODY(FLOAT32, im->image32, 1, 0);
-    ((FLOAT32*)out)[0] = (FLOAT32) v1;
-    return 1;
-}
-
-static int
-bicubic_filter32LA(void* out, Imaging im, double xin, double yin, void* data)
-{
-    BICUBIC_HEAD(UINT8);
-    BICUBIC_BODY(UINT8, im->image, 4, 0);
-    if (v1 <= 0.0) {
-        ((UINT8*)out)[0] = 0;
-        ((UINT8*)out)[1] = 0;
-        ((UINT8*)out)[2] = 0;
-    } else if (v1 >= 255.0) {
-        ((UINT8*)out)[0] = 255;
-        ((UINT8*)out)[1] = 255;
-        ((UINT8*)out)[2] = 255;
-    } else {
-        ((UINT8*)out)[0] = (UINT8) v1;
-        ((UINT8*)out)[1] = (UINT8) v1;
-        ((UINT8*)out)[2] = (UINT8) v1;
-    }
-    BICUBIC_BODY(UINT8, im->image, 4, 3);
-    if (v1 <= 0.0)
-        ((UINT8*)out)[3] = 0;
-    else if (v1 >= 255.0)
-        ((UINT8*)out)[3] = 255;
-    else
-        ((UINT8*)out)[3] = (UINT8) v1;
-    return 1;
-}
-
-static int
-bicubic_filter32RGB(void* out, Imaging im, double xin, double yin, void* data)
-{
-    int b;
-    BICUBIC_HEAD(UINT8);
-    for (b = 0; b < im->bands; b++) {
-        BICUBIC_BODY(UINT8, im->image, 4, b);
-        if (v1 <= 0.0)
-            ((UINT8*)out)[b] = 0;
-        else if (v1 >= 255.0)
-            ((UINT8*)out)[b] = 255;
-        else
-            ((UINT8*)out)[b] = (UINT8) v1;
-    }
-    return 1;
-}
-
-static ImagingTransformFilter
-getfilter(Imaging im, int filterid)
-{
-    switch (filterid) {
-    case IMAGING_TRANSFORM_NEAREST:
-        if (im->image8)
-            switch (im->type) {
-            case IMAGING_TYPE_UINT8:
-                return (ImagingTransformFilter) nearest_filter8;
-            case IMAGING_TYPE_SPECIAL:
-                switch (im->pixelsize) {
-                case 1:
-                    return (ImagingTransformFilter) nearest_filter8;
-                case 2:
-                    return (ImagingTransformFilter) nearest_filter16;
-                case 4:
-                    return (ImagingTransformFilter) nearest_filter32;
-                }
-            }
-        else
-            return (ImagingTransformFilter) nearest_filter32;
-        break;
-    case IMAGING_TRANSFORM_BILINEAR:
-        if (im->image8)
-            return (ImagingTransformFilter) bilinear_filter8;
-        else if (im->image32) {
-            switch (im->type) {
-            case IMAGING_TYPE_UINT8:
-                if (im->bands == 2)
-                    return (ImagingTransformFilter) bilinear_filter32LA;
-                else
-                    return (ImagingTransformFilter) bilinear_filter32RGB;
-            case IMAGING_TYPE_INT32:
-                return (ImagingTransformFilter) bilinear_filter32I;
-            case IMAGING_TYPE_FLOAT32:
-                return (ImagingTransformFilter) bilinear_filter32F;
-            }
-        }
-        break;
-    case IMAGING_TRANSFORM_BICUBIC:
-        if (im->image8)
-            return (ImagingTransformFilter) bicubic_filter8;
-        else if (im->image32) {
-            switch (im->type) {
-            case IMAGING_TYPE_UINT8:
-                if (im->bands == 2)
-                    return (ImagingTransformFilter) bicubic_filter32LA;
-                else
-                    return (ImagingTransformFilter) bicubic_filter32RGB;
-            case IMAGING_TYPE_INT32:
-                return (ImagingTransformFilter) bicubic_filter32I;
-            case IMAGING_TYPE_FLOAT32:
-                return (ImagingTransformFilter) bicubic_filter32F;
-            }
-        }
-        break;
-    }
-    /* no such filter */
-    return NULL;
-}
-
-#else
-#define getfilter(im, id) NULL
-#endif
-
-/* transformation engines */
-
-Imaging
-ImagingTransform(
-    Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, 
-    ImagingTransformMap transform, void* transform_data,
-    ImagingTransformFilter filter, void* filter_data,
-    int fill)
-{
-    /* slow generic transformation.  use ImagingTransformAffine or
-       ImagingScaleAffine where possible. */
-
-    ImagingSectionCookie cookie;
-    int x, y;
-    char *out;
-    double xx, yy;
-
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
-	return (Imaging) ImagingError_ModeError();
-
-    ImagingCopyInfo(imOut, imIn);
-
-    ImagingSectionEnter(&cookie);
-
-    if (x0 < 0)
-        x0 = 0;
-    if (y0 < 0)
-        y0 = 0;
-    if (x1 > imOut->xsize)
-        x1 = imOut->xsize;
-    if (y1 > imOut->ysize)
-        y1 = imOut->ysize;
-
-    for (y = y0; y < y1; y++) {
-	out = imOut->image[y] + x0*imOut->pixelsize;
-	for (x = x0; x < x1; x++) {
-	    if (!transform(&xx, &yy, x-x0, y-y0, transform_data) ||
-                !filter(out, imIn, xx, yy, filter_data)) {
-                if (fill)
-                    memset(out, 0, imOut->pixelsize);
-            }
-            out += imOut->pixelsize;
-	}
-    }
-
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-static Imaging
-ImagingScaleAffine(Imaging imOut, Imaging imIn,
-                   int x0, int y0, int x1, int y1,
-                   double a[6], int fill)
-{
-    /* scale, nearest neighbour resampling */
-
-    ImagingSectionCookie cookie;
-    int x, y;
-    int xin;
-    double xo, yo;
-    int xmin, xmax;
-    int *xintab;
-
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
-	return (Imaging) ImagingError_ModeError();
-
-    ImagingCopyInfo(imOut, imIn);
-
-    if (x0 < 0)
-        x0 = 0;
-    if (y0 < 0)
-        y0 = 0;
-    if (x1 > imOut->xsize)
-        x1 = imOut->xsize;
-    if (y1 > imOut->ysize)
-        y1 = imOut->ysize;
-
-    xintab = (int*) malloc(imOut->xsize * sizeof(int));
-    if (!xintab) {
-	ImagingDelete(imOut);
-	return (Imaging) ImagingError_MemoryError();
-    }
-
-    xo = a[0];
-    yo = a[3];
-
-    xmin = x1;
-    xmax = x0;
-
-    /* Pretabulate horizontal pixel positions */
-    for (x = x0; x < x1; x++) {
-	xin = COORD(xo);
-	if (xin >= 0 && xin < (int) imIn->xsize) {
-	    xmax = x+1;
-	    if (x < xmin)
-		xmin = x;
-	    xintab[x] = xin;
-	}
-	xo += a[1];
-    }
-
-#define	AFFINE_SCALE(pixel, image)\
-    for (y = y0; y < y1; y++) {\
-	int yi = COORD(yo);\
-	pixel *in, *out;\
-	out = imOut->image[y];\
-        if (fill && x1 > x0)\
-            memset(out+x0, 0, (x1-x0)*sizeof(pixel));\
-	if (yi >= 0 && yi < imIn->ysize) {\
-	    in = imIn->image[yi];\
-	    for (x = xmin; x < xmax; x++)\
-		out[x] = in[xintab[x]];\
-	}\
-	yo += a[5];\
-    }
-
-    ImagingSectionEnter(&cookie);
-
-    if (imIn->image8) {
-        AFFINE_SCALE(UINT8, image8);
-    } else {
-        AFFINE_SCALE(INT32, image32);
-    }
-
-    ImagingSectionLeave(&cookie);
-
-    free(xintab);
-
-    return imOut;
-}
-
-static inline int
-check_fixed(double a[6], int x, int y)
-{
-    return (fabs(a[0] + x*a[1] + y*a[2]) < 32768.0 &&
-            fabs(a[3] + x*a[4] + y*a[5]) < 32768.0);
-}
-
-static inline Imaging
-affine_fixed(Imaging imOut, Imaging imIn,
-             int x0, int y0, int x1, int y1,
-             double a[6], int filterid, int fill)
-{
-    /* affine transform, nearest neighbour resampling, fixed point
-       arithmetics */
-
-    int x, y;
-    int xin, yin;
-    int xsize, ysize;
-    int xx, yy;
-    int a0, a1, a2, a3, a4, a5;
-
-    ImagingCopyInfo(imOut, imIn);
-
-    xsize = (int) imIn->xsize;
-    ysize = (int) imIn->ysize;
-
-/* use 16.16 fixed point arithmetics */
-#define FIX(v) FLOOR((v)*65536.0 + 0.5)
-
-    a0 = FIX(a[0]); a1 = FIX(a[1]); a2 = FIX(a[2]);
-    a3 = FIX(a[3]); a4 = FIX(a[4]); a5 = FIX(a[5]);
-
-#define	AFFINE_TRANSFORM_FIXED(pixel, image)\
-    for (y = y0; y < y1; y++) {\
-	pixel *out;\
-	xx = a0;\
-	yy = a3;\
-	out = imOut->image[y];\
-        if (fill && x1 > x0)\
-            memset(out+x0, 0, (x1-x0)*sizeof(pixel));\
-        for (x = x0; x < x1; x++, out++) {\
-	    xin = xx >> 16;\
-	    if (xin >= 0 && xin < xsize) {\
-	        yin = yy >> 16;\
-		if (yin >= 0 && yin < ysize)\
-                    *out = imIn->image[yin][xin];\
-            }\
-	    xx += a1;\
-	    yy += a4;\
-	}\
-	a0 += a2;\
-	a3 += a5;\
-    }
-
-    if (imIn->image8)
-	AFFINE_TRANSFORM_FIXED(UINT8, image8)
-    else
-	AFFINE_TRANSFORM_FIXED(INT32, image32)
-
-    return imOut;
-}
-
-Imaging
-ImagingTransformAffine(Imaging imOut, Imaging imIn,
-                       int x0, int y0, int x1, int y1,
-                       double a[6], int filterid, int fill)
-{
-    /* affine transform, nearest neighbour resampling, floating point
-       arithmetics*/
-
-    ImagingSectionCookie cookie;
-    int x, y;
-    int xin, yin;
-    int xsize, ysize;
-    double xx, yy;
-    double xo, yo;
-
-    if (filterid || imIn->type == IMAGING_TYPE_SPECIAL) {
-        /* Filtered transform */
-        ImagingTransformFilter filter = getfilter(imIn, filterid);
-        if (!filter)
-            return (Imaging) ImagingError_ValueError("unknown filter");
-        return ImagingTransform(
-            imOut, imIn,
-            x0, y0, x1, y1,
-            affine_transform, a,
-            filter, NULL, fill);
-    }
-
-    if (a[2] == 0 && a[4] == 0)
-	/* Scaling */
-	return ImagingScaleAffine(imOut, imIn, x0, y0, x1, y1, a, fill);
-
-    if (!imOut || !imIn || strcmp(imIn->mode, imOut->mode) != 0)
-	return (Imaging) ImagingError_ModeError();
-
-    if (x0 < 0)
-        x0 = 0;
-    if (y0 < 0)
-        y0 = 0;
-    if (x1 > imOut->xsize)
-        x1 = imOut->xsize;
-    if (y1 > imOut->ysize)
-        y1 = imOut->ysize;
-
-    ImagingCopyInfo(imOut, imIn);
-
-    /* translate all four corners to check if they are within the
-       range that can be represented by the fixed point arithmetics */
-
-    if (check_fixed(a, 0, 0) && check_fixed(a, x1-x0, y1-y0) &&
-        check_fixed(a, 0, y1-y0) && check_fixed(a, x1-x0, 0))
-        return affine_fixed(imOut, imIn, x0, y0, x1, y1, a, filterid, fill);
-
-    /* FIXME: cannot really think of any reasonable case when the
-       following code is used.  maybe we should fall back on the slow
-       generic transform engine in this case? */
-
-    xsize = (int) imIn->xsize;
-    ysize = (int) imIn->ysize;
-
-    xo = a[0];
-    yo = a[3];
-
-#define	AFFINE_TRANSFORM(pixel, image)\
-    for (y = y0; y < y1; y++) {\
-	pixel *out;\
-	xx = xo;\
-	yy = yo;\
-	out = imOut->image[y];\
-        if (fill && x1 > x0)\
-            memset(out+x0, 0, (x1-x0)*sizeof(pixel));\
-        for (x = x0; x < x1; x++, out++) {\
-	    xin = COORD(xx);\
-	    if (xin >= 0 && xin < xsize) {\
-	        yin = COORD(yy);\
-		if (yin >= 0 && yin < ysize)\
-                    *out = imIn->image[yin][xin];\
-            }\
-	    xx += a[1];\
-	    yy += a[4];\
-	}\
-	xo += a[2];\
-	yo += a[5];\
-    }
-
-    ImagingSectionEnter(&cookie);
-
-    if (imIn->image8)
-	AFFINE_TRANSFORM(UINT8, image8)
-    else
-	AFFINE_TRANSFORM(INT32, image32)
-
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-}
-
-Imaging
-ImagingTransformPerspective(Imaging imOut, Imaging imIn,
-                            int x0, int y0, int x1, int y1,
-                            double a[8], int filterid, int fill)
-{
-    ImagingTransformFilter filter = getfilter(imIn, filterid);
-    if (!filter)
-        return (Imaging) ImagingError_ValueError("bad filter number");
-
-    return ImagingTransform(
-        imOut, imIn,
-        x0, y0, x1, y1,
-        perspective_transform, a,
-        filter, NULL,
-        fill);
-}
-
-Imaging
-ImagingTransformQuad(Imaging imOut, Imaging imIn,
-                     int x0, int y0, int x1, int y1,
-                     double a[8], int filterid, int fill)
-{
-    ImagingTransformFilter filter = getfilter(imIn, filterid);
-    if (!filter)
-        return (Imaging) ImagingError_ValueError("bad filter number");
-
-    return ImagingTransform(
-        imOut, imIn,
-        x0, y0, x1, y1,
-        quad_transform, a,
-        filter, NULL,
-        fill);
-}
-
-/* -------------------------------------------------------------------- */
-/* Convenience functions */
-
-Imaging
-ImagingResize(Imaging imOut, Imaging imIn, int filterid)
-{
-    double a[6];
-
-    if (imOut->xsize == imIn->xsize && imOut->ysize == imIn->ysize)
-	return ImagingCopy2(imOut, imIn);
-
-    memset(a, 0, sizeof a);
-    a[1] = (double) imIn->xsize / imOut->xsize;
-    a[5] = (double) imIn->ysize / imOut->ysize;
-
-    if (!filterid && imIn->type != IMAGING_TYPE_SPECIAL)
-        return ImagingScaleAffine(
-            imOut, imIn,
-            0, 0, imOut->xsize, imOut->ysize,
-            a, 1);
-
-    return ImagingTransformAffine(
-        imOut, imIn,
-        0, 0, imOut->xsize, imOut->ysize,
-        a, filterid, 1);
-}
-
-Imaging
-ImagingRotate(Imaging imOut, Imaging imIn, double theta, int filterid)
-{
-    int xsize, ysize;
-    double sintheta, costheta;
-    double a[6];
-
-    /* Setup an affine transform to rotate around the image center */
-    theta = -theta * M_PI / 180.0;
-    sintheta = sin(theta);
-    costheta = cos(theta);
-
-    xsize = imOut->xsize;
-    ysize = imOut->ysize;
-
-    a[0] = -costheta * xsize/2 - sintheta * ysize/2 + xsize/2;
-    a[1] = costheta;
-    a[2] = sintheta;
-    a[3] = sintheta * xsize/2 - costheta * ysize/2 + ysize/2;
-    a[4] = -sintheta;
-    a[5] = costheta;
-
-    return ImagingTransformAffine(
-        imOut, imIn,
-        0, 0, imOut->xsize, imOut->ysize,
-        a, filterid, 1);
-}
diff --git a/pythonPackages/pil/libImaging/GetBBox.c b/pythonPackages/pil/libImaging/GetBBox.c
deleted file mode 100644
index c06d0eb052..0000000000
--- a/pythonPackages/pil/libImaging/GetBBox.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* 
- * The Python Imaging Library
- * $Id: GetBBox.c 2298 2005-02-17 21:17:29Z fredrik $
- *
- * helpers to bounding boxes, min/max values, number of colors, etc.
- *
- * history:
- * 1996-07-22 fl   Created
- * 1996-12-30 fl   Added projection stuff
- * 1998-07-12 fl   Added extrema stuff
- * 2004-09-17 fl   Added colors stuff
- *
- * Copyright (c) 1997-2004 by Secret Labs AB.
- * Copyright (c) 1996-2004 by Fredrik Lundh.
- *
- * See the README file for details on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-int
-ImagingGetBBox(Imaging im, int bbox[4])
-{
-    /* Get the bounding box for any non-zero data in the image.*/
-
-    int x, y;
-    int has_data;
-
-    /* Initialize bounding box to max values */
-    bbox[0] = im->xsize;
-    bbox[1] = -1;
-    bbox[2] = bbox[3] = 0;
-
-#define	GETBBOX(image, mask)\
-    for (y = 0; y < im->ysize; y++) {\
-	has_data = 0;\
-	for (x = 0; x < im->xsize; x++)\
-	    if (im->image[y][x] & mask) {\
-		has_data = 1;\
-		if (x < bbox[0])\
-		    bbox[0] = x;\
-		if (x >= bbox[2])\
-		    bbox[2] = x+1;\
-	    }\
-	if (has_data) {\
-	    if (bbox[1] < 0)\
-		bbox[1] = y;\
-	    bbox[3] = y+1;\
-	}\
-    }
-
-    if (im->image8) {
-	GETBBOX(image8, 0xff);
-    } else {
-	INT32 mask = 0xffffffff;
-	if (im->bands == 3)
-	    ((UINT8*) &mask)[3] = 0;
-	GETBBOX(image32, mask);
-    }
-
-    /* Check that we got a box */
-    if (bbox[1] < 0)
-	return 0; /* no data */
-
-    return 1; /* ok */
-}
-
-
-int
-ImagingGetProjection(Imaging im, UINT8* xproj, UINT8* yproj)
-{
-    /* Get projection arrays for non-zero data in the image.*/
-
-    int x, y;
-    int has_data;
-
-    /* Initialize projection arrays */
-    memset(xproj, 0, im->xsize);
-    memset(yproj, 0, im->ysize);
-
-#define	GETPROJ(image, mask)\
-    for (y = 0; y < im->ysize; y++) {\
-	has_data = 0;\
-	for (x = 0; x < im->xsize; x++)\
-	    if (im->image[y][x] & mask) {\
-		has_data = 1;\
-		xproj[x] = 1;\
-	    }\
-	if (has_data)\
-	    yproj[y] = 1;\
-    }
-
-    if (im->image8) {
-	GETPROJ(image8, 0xff);
-    } else {
-	INT32 mask = 0xffffffff;
-	if (im->bands == 3)
-	    ((UINT8*) &mask)[3] = 0;
-	GETPROJ(image32, mask);
-    }
-
-    return 1; /* ok */
-}
-
-
-int
-ImagingGetExtrema(Imaging im, void *extrema)
-{
-    int x, y;
-    INT32 imin, imax;
-    FLOAT32 fmin, fmax;
-
-    if (im->bands != 1) {
-        ImagingError_ModeError();
-        return -1; /* mismatch */
-    }
-
-    if (!im->xsize || !im->ysize)
-        return 0; /* zero size */
-
-    switch (im->type) {
-    case IMAGING_TYPE_UINT8:
-        imin = imax = im->image8[0][0];
-        for (y = 0; y < im->ysize; y++) {
-            UINT8* in = im->image8[y];
-            for (x = 0; x < im->xsize; x++) {
-                if (imin > in[x])
-                    imin = in[x];
-                else if (imax < in[x])
-                    imax = in[x];
-            }
-        }
-        ((UINT8*) extrema)[0] = (UINT8) imin;
-        ((UINT8*) extrema)[1] = (UINT8) imax;
-        break;
-    case IMAGING_TYPE_INT32:
-        imin = imax = im->image32[0][0];
-        for (y = 0; y < im->ysize; y++) {
-            INT32* in = im->image32[y];
-            for (x = 0; x < im->xsize; x++) {
-                if (imin > in[x])
-                    imin = in[x];
-                else if (imax < in[x])
-                    imax = in[x];
-            }
-        }
-        ((INT32*) extrema)[0] = imin;
-        ((INT32*) extrema)[1] = imax;
-        break;
-    case IMAGING_TYPE_FLOAT32:
-        fmin = fmax = ((FLOAT32*) im->image32[0])[0];
-        for (y = 0; y < im->ysize; y++) {
-            FLOAT32* in = (FLOAT32*) im->image32[y];
-            for (x = 0; x < im->xsize; x++) {
-                if (fmin > in[x])
-                    fmin = in[x];
-                else if (fmax < in[x])
-                    fmax = in[x];
-            }
-        }
-        ((FLOAT32*) extrema)[0] = fmin;
-        ((FLOAT32*) extrema)[1] = fmax;
-        break;
-    case IMAGING_TYPE_SPECIAL:
-      if (strcmp(im->mode, "I;16") == 0) {
-          imin = imax = ((UINT16*) im->image8[0])[0];
-          for (y = 0; y < im->ysize; y++) {
-              UINT16* in = (UINT16 *) im->image[y];
-              for (x = 0; x < im->xsize; x++) {
-                  if (imin > in[x])
-                      imin = in[x];
-                  else if (imax < in[x])
-                      imax = in[x];
-              }
-          }
-          ((UINT16*) extrema)[0] = (UINT16) imin;
-          ((UINT16*) extrema)[1] = (UINT16) imax;
-	  break;
-      }
-      /* FALL THROUGH */
-    default:
-        ImagingError_ModeError();
-        return -1;
-    }
-    return 1; /* ok */
-}
-
-
-/* static ImagingColorItem* getcolors8(Imaging im, int maxcolors, int* size);*/
-static ImagingColorItem* getcolors32(Imaging im, int maxcolors, int* size);
-
-ImagingColorItem*
-ImagingGetColors(Imaging im, int maxcolors, int* size)
-{
-    /* FIXME: add support for 8-bit images */
-    return getcolors32(im, maxcolors, size);
-}
-
-static ImagingColorItem*
-getcolors32(Imaging im, int maxcolors, int* size)
-{
-    unsigned int h;
-    unsigned int i, incr;
-    int colors;
-    INT32 pixel_mask;
-    int x, y;
-    ImagingColorItem* table;
-    ImagingColorItem* v;
-
-    unsigned int code_size;
-    unsigned int code_poly;
-    unsigned int code_mask;
-
-    /* note: the hash algorithm used here is based on the dictionary
-       code in Python 2.1.3; the exact implementation is borrowed from
-       Python's Unicode property database (written by yours truly) /F */
-
-    static int SIZES[] = {
-        4,3, 8,3, 16,3, 32,5, 64,3, 128,3, 256,29, 512,17, 1024,9, 2048,5,
-        4096,83, 8192,27, 16384,43, 32768,3, 65536,45, 131072,9, 262144,39,
-        524288,39, 1048576,9, 2097152,5, 4194304,3, 8388608,33, 16777216,27,
-        33554432,9, 67108864,71, 134217728,39, 268435456,9, 536870912,5,
-        1073741824,83, 0
-    };
-    
-    code_size = code_poly = code_mask = 0;
-
-    for (i = 0; SIZES[i]; i += 2) {
-        if (SIZES[i] > maxcolors) {
-            code_size = SIZES[i];
-            code_poly = SIZES[i+1];
-            code_mask = code_size - 1;
-            break;
-        }
-    }
-
-    /* printf("code_size=%d\n", code_size); */
-    /* printf("code_poly=%d\n", code_poly); */
-
-    if (!code_size) {
-	ImagingError_MemoryError(); /* just give up */
-        return NULL;
-    }
-
-    if (!im->image32) {
-        ImagingError_ModeError();
-        return NULL;
-    }
-
-    table = calloc(code_size + 1, sizeof(ImagingColorItem));
-    if (!table) {
-	ImagingError_MemoryError();
-        return NULL;
-    }
-
-    pixel_mask = 0xffffffff;
-    if (im->bands == 3)
-        ((UINT8*) &pixel_mask)[3] = 0;
-
-    colors = 0;
-
-    for (y = 0; y < im->ysize; y++) {
-        INT32* p = im->image32[y];
-        for (x = 0; x < im->xsize; x++) {
-            INT32 pixel = p[x] & pixel_mask;
-            h = (pixel); /* null hashing */
-            i = (~h) & code_mask;
-            v = &table[i];
-            if (!v->count) {
-                /* add to table */
-                if (colors++ == maxcolors)
-                    goto overflow;
-                v->x = x; v->y = y;
-                v->pixel = pixel;
-                v->count = 1;
-                continue;
-            } else if (v->pixel == pixel) {
-                v->count++;
-                continue;
-            }
-            incr = (h ^ (h >> 3)) & code_mask;
-            if (!incr)
-                incr = code_mask;
-            for (;;) {
-                i = (i + incr) & code_mask;
-                v = &table[i];
-                if (!v->count) {
-                    /* add to table */
-                    if (colors++ == maxcolors)
-                        goto overflow;
-                    v->x = x; v->y = y;
-                    v->pixel = pixel;
-                    v->count = 1;
-                    break;
-                } else if (v->pixel == pixel) {
-                    v->count++;
-                    break;
-                }
-                incr = incr << 1;
-                if (incr > code_mask)
-                    incr = incr ^ code_poly;
-            }
-        }
-    }
-
-overflow:
-
-    /* pack the table */
-    for (x = y = 0; x < (int) code_size; x++)
-        if (table[x].count) {
-            if (x != y)
-                table[y] = table[x];
-            y++;
-        }
-    table[y].count = 0; /* mark end of table */
-
-    *size = colors;
-
-    return table;
-}
diff --git a/pythonPackages/pil/libImaging/Gif.h b/pythonPackages/pil/libImaging/Gif.h
deleted file mode 100644
index 8957c39399..0000000000
--- a/pythonPackages/pil/libImaging/Gif.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: Gif.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * Declarations for a fast, suspendable GIF decoder.
- *
- * Copyright (c) Fredrik Lundh 1995-96.
- */
-
-
-/* Max size for a LZW code word. */
-
-#define	GIFBITS	    12
-
-#define	GIFTABLE    (1<<GIFBITS)
-#define	GIFBUFFER   (1<<GIFBITS)
-
-
-typedef struct {
-
-    /* CONFIGURATION */
-
-    /* Initial number of bits. The caller should clear all fields in
-       this structure and set this field before calling the decoder
-       the first time. */
-    int bits;
-
-    /* If set, this is an interlaced image.  Process it the following way:
-     * 1st pass: start at top line, lines are 8 pixels high, step 8 pixels
-     * 2nd pass: start at line 4, lines are 4 pixels high, step 8 pixels
-     * 3rd pass: start at line 2, lines are 2 pixels high, step 4 pixels
-     * 4th pass: start at line 1, lines are 1 pixels high, step 2 pixels
-     */
-    int interlace;
-
-    /* PRIVATE CONTEXT (set by decoder) */
-
-    /* Interlace parameters */
-    int step, repeat;
-
-    /* Input bit buffer */
-    INT32 bitbuffer;
-    int bitcount;
-    int blocksize;
-
-    /* Code buffer */
-    int codesize;
-    int codemask;
-
-    /* Constant symbol codes */
-    int clear, end;
-
-    /* Symbol history */
-    int lastcode;
-    unsigned char lastdata;
-
-    /* History buffer */
-    int bufferindex;
-    unsigned char buffer[GIFTABLE];
-
-    /* Symbol table */
-    unsigned INT16 link[GIFTABLE];
-    unsigned char data[GIFTABLE];
-    int next;
-
-} GIFDECODERSTATE;
-
-typedef struct GIFENCODERBLOCK_T
-{
-    struct GIFENCODERBLOCK_T *next;
-    int size;
-    UINT8 data[255];
-} GIFENCODERBLOCK;
-
-typedef struct {
-
-    /* CONFIGURATION */
-
-    /* Initial number of bits. The caller should clear all fields in
-       this structure and set this field before calling the encoder
-       the first time. */
-    int bits;
-
-    /* NOTE: the expanding encoder ignores this field */
-
-    /* If set, write an interlaced image (see above) */
-    int interlace;
-
-    /* PRIVATE CONTEXT (set by encoder) */
-
-    /* Interlace parameters */
-    int step, repeat;
-
-    /* Output bit buffer */
-    INT32 bitbuffer;
-    int bitcount;
-
-    /* Output buffer list (linked list) */
-    GIFENCODERBLOCK* block; /* current block */
-    GIFENCODERBLOCK* flush; /* output queue */
-    GIFENCODERBLOCK* free; /* if not null, use this */
-
-    /* Fields used for run-length encoding */
-    int first; /* true if we haven't read the first pixel */
-    int last; /* last byte value seen */
-    int count; /* how many bytes with that value we've seen */
-    int lastcode;
-
-} GIFENCODERSTATE;
diff --git a/pythonPackages/pil/libImaging/GifDecode.c b/pythonPackages/pil/libImaging/GifDecode.c
deleted file mode 100644
index d97c276745..0000000000
--- a/pythonPackages/pil/libImaging/GifDecode.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: GifDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * a fast, suspendable GIF decoder
- *
- * history:
- * 95-09-03 fl	Created
- * 95-09-05 fl	Fixed sign problem on 16-bit platforms
- * 95-09-13 fl	Added some storage shortcuts
- * 96-03-28 fl	Revised API, integrated with PIL
- * 96-12-10 fl	Added interlace support
- * 96-12-16 fl	Fixed premature termination bug introduced by last fix
- * 97-01-05 fl	Don't mess up on bogus configuration
- * 97-01-17 fl	Don't mess up on very small, interlaced files
- * 99-02-07 fl	Minor speedups
- *
- * Copyright (c) Secret Labs AB 1997-99.
- * Copyright (c) Fredrik Lundh 1995-97.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#include <stdio.h>
-#include <memory.h>	/* memcpy() */
-
-#include "Gif.h"
-
-
-#define NEWLINE(state, context) {\
-    state->x = 0;\
-    state->y += context->step;\
-    while (state->y >= state->ysize)\
-	switch (context->interlace) {\
-	case 1:\
-	    context->repeat = state->y = 4;\
-	    context->interlace = 2;\
-	    break;\
-	case 2:\
-	    context->step = 4;\
-	    context->repeat = state->y = 2;\
-	    context->interlace = 3;\
-	    break;\
-	case 3:\
-	    context->step = 2;\
-	    context->repeat = state->y = 1;\
-	    context->interlace = 0;\
-	    break;\
-	default:\
-	    return -1;\
-        }\
-    if (state->y < state->ysize)\
-        out = im->image8[state->y + state->yoff] + state->xoff;\
-}
-
-
-int
-ImagingGifDecode(Imaging im, ImagingCodecState state, UINT8* buffer, int bytes)
-{
-    UINT8* p;
-    UINT8* out;
-    int c, i;
-    int thiscode;
-    GIFDECODERSTATE *context = (GIFDECODERSTATE*) state->context;
-
-    UINT8 *ptr = buffer;
-
-    if (!state->state) {
-
-	/* Initialise state */
-	if (context->bits < 0 || context->bits > 8) {
-	    state->errcode = IMAGING_CODEC_CONFIG;
-	    return -1;
-	}
-					
-	/* Clear code */
-	context->clear = 1 << context->bits;
-
-	/* End code */
-	context->end = context->clear + 1;
-
-	/* Interlace */
-	if (context->interlace) {
-	    context->interlace = 1;
-	    context->step = context->repeat = 8;
-	} else
-	    context->step = 1;
-
-	state->state = 1;
-    }
-
-    out = im->image8[state->y + state->yoff] + state->xoff + state->x;
-
-    for (;;) {
-
-	if (state->state == 1) {
-
-	    /* First free entry in table */
-	    context->next = context->clear + 2;
-
-	    /* Initial code size */
-	    context->codesize = context->bits + 1;
-	    context->codemask = (1 << context->codesize) - 1;
-
-	    /* Buffer pointer.  We fill the buffer from right, which
-	       allows us to return all of it in one operation. */
-	    context->bufferindex = GIFBUFFER;
-
-	    state->state = 2;
-	}
-
-	if (context->bufferindex < GIFBUFFER) {
-
-	    /* Return whole buffer in one chunk */
-	    i = GIFBUFFER - context->bufferindex;
-	    p = &context->buffer[context->bufferindex];
-
-	    context->bufferindex = GIFBUFFER;
-
-	} else {
-
-	    /* Get current symbol */
-
-	    while (context->bitcount < context->codesize) {
-
-		if (context->blocksize > 0) {
-
-		    /* Read next byte */
-		    c = *ptr++; bytes--;
-
-		    context->blocksize--;
-
-		    /* New bits are shifted in from from the left. */
-		    context->bitbuffer |= (INT32) c << context->bitcount;
-		    context->bitcount += 8;
-
-		} else {
-
-		    /* New GIF block */
-
-		    /* We don't start decoding unless we have a full block */
-		    if (bytes < 1)
-			return ptr - buffer;
-		    c = *ptr;
-		    if (bytes < c+1)
-			return ptr - buffer;
-
-		    context->blocksize = c;
-
-		    ptr++; bytes--;
-
-		}
-	    }
-
-	    /* Extract current symbol from bit buffer. */
-	    c = (int) context->bitbuffer & context->codemask;
-
-	    /* Adjust buffer */
-	    context->bitbuffer >>= context->codesize;
-	    context->bitcount -= context->codesize;
-
-	    /* If c is less than "clear", it's a data byte.  Otherwise,
-	       it's either clear/end or a code symbol which should be
-	       expanded. */
-
-	    if (c == context->clear) {
-		if (state->state != 2)
-		    state->state = 1;
-		continue;
-	    }
-
-	    if (c == context->end)
-		break;
-
-	    i = 1;
-	    p = &context->lastdata;
-
-	    if (state->state == 2) {
-
-		/* First valid symbol after clear; use as is */
-		if (c > context->clear) {
-		    state->errcode = IMAGING_CODEC_BROKEN;
-		    return -1;
-		}
-
-		context->lastdata = context->lastcode = c;
-		state->state = 3;
-
-	    } else {
-
-		thiscode = c;
-
-		if (c > context->next) {
-		    state->errcode = IMAGING_CODEC_BROKEN;
-		    return -1;
-		}
-
-		if (c == context->next) {
-
-		    /* c == next is allowed. not sure why. */
-
-		    if (context->bufferindex <= 0) {
-			state->errcode = IMAGING_CODEC_BROKEN;
-			return -1;
-		    }
-
-		    context->buffer[--context->bufferindex] =
-			context->lastdata;
-
-		    c = context->lastcode;
-
-		}
-
-		while (c >= context->clear) {
-
-		    /* Copy data string to buffer (beginning from right) */
-
-		    if (context->bufferindex <= 0 || c >= GIFTABLE) {
-			state->errcode = IMAGING_CODEC_BROKEN;
-			return -1;
-		    }
-
-		    context->buffer[--context->bufferindex] =
-			context->data[c];
-
-		    c = context->link[c];
-		}
-
-		context->lastdata = c;
-
-		if (context->next < GIFTABLE) {
-
-		    /* We'll only add this symbol if we have room
-		       for it (take advise, Netscape!) */
-		    context->data[context->next] = c;
-		    context->link[context->next] = context->lastcode;
-
-		    if (context->next == context->codemask &&
-			context->codesize < GIFBITS) {
-
-			/* Expand code size */
-			context->codesize++;
-			context->codemask = (1 << context->codesize) - 1;
-		    }
-
-		    context->next++;
-
-		}
-
-		context->lastcode = thiscode;
-
-	    }
-	}
-
-	/* Copy the bytes into the image */
-	if (state->y >= state->ysize) {
-	    state->errcode = IMAGING_CODEC_OVERRUN;
-	    return -1;
-	}
-
-	/* To squeeze some extra pixels out of this loop, we test for
-	   some common cases and handle them separately. */
-
-	/* FIXME: should we handle the transparency index in here??? */
-
-	if (i == 1) {
-	    if (state->x < state->xsize-1) {
-		/* Single pixel, not at the end of the line. */
-		*out++ = p[0];
-		state->x++;
-		continue;
-	    }
-	} else if (state->x + i <= state->xsize) {
-	    /* This string fits into current line. */
-	    memcpy(out, p, i);
-            out += i;
-	    state->x += i;
-	    if (state->x == state->xsize) {
-		NEWLINE(state, context);
-	    }
-	    continue;
-	}
-
-	/* No shortcut, copy pixel by pixel */
-	for (c = 0; c < i; c++) {
-	    *out++ = p[c];
-	    if (++state->x >= state->xsize) {
-		NEWLINE(state, context);
-	    }
-	}
-    }
-
-    return ptr - buffer;
-}
diff --git a/pythonPackages/pil/libImaging/GifEncode.c b/pythonPackages/pil/libImaging/GifEncode.c
deleted file mode 100644
index fd696c1111..0000000000
--- a/pythonPackages/pil/libImaging/GifEncode.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: GifEncode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * encoder for uncompressed GIF data
- *
- * history:
- * 97-01-05 fl	created (writes uncompressed data)
- * 97-08-27 fl	fixed off-by-one error in buffer size test
- * 98-07-09 fl	added interlace write support
- * 99-02-07 fl	rewritten, now uses a run-length encoding strategy
- * 99-02-08 fl	improved run-length encoding for long runs
- *
- * Copyright (c) Secret Labs AB 1997-99.
- * Copyright (c) Fredrik Lundh 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Imaging.h"
-
-#include "Gif.h"
-
-/* codes from 0 to 255 are literals */
-#define CLEAR_CODE 256
-#define EOF_CODE 257
-#define FIRST_CODE 258
-#define LAST_CODE 511
-
-enum { INIT, ENCODE, ENCODE_EOF, FLUSH, EXIT };
-
-/* to make things a little less complicated, we use a simple output
-   queue to hold completed blocks.  the following inlined function
-   adds a byte to the current block.  it allocates a new block if
-   necessary. */
-
-static inline int
-emit(GIFENCODERSTATE *context, int byte)
-{
-    /* write a byte to the output buffer */
-
-    if (!context->block || context->block->size == 255) {
-        GIFENCODERBLOCK* block;
-
-        /* no room in the current block (or no current block);
-           allocate a new one */
-        
-        /* add current block to end of flush queue */
-        if (context->block) {
-            block = context->flush;
-            while (block && block->next)
-                block = block->next;
-            if (block)
-                block->next = context->block;
-            else
-                context->flush = context->block;
-        }
-
-        /* get a new block */
-        if (context->free) {
-            block = context->free;
-            context->free = NULL;
-        } else {
-            block = malloc(sizeof(GIFENCODERBLOCK));
-            if (!block)
-                return 0;
-        }
-
-        block->size = 0;
-        block->next = NULL;
-
-        context->block = block;
-
-    }
-
-    /* write new byte to block */
-    context->block->data[context->block->size++] = byte;
-
-    return 1;
-}
-
-/* write a code word to the current block.  this is a macro to make
-   sure it's inlined on all platforms */
-
-#define EMIT(code) {\
-    context->bitbuffer |= ((INT32) (code)) << context->bitcount;\
-    context->bitcount += 9;\
-    while (context->bitcount >= 8) {\
-        if (!emit(context, (UINT8) context->bitbuffer)) {\
-            state->errcode = IMAGING_CODEC_MEMORY;\
-            return 0;\
-        }\
-        context->bitbuffer >>= 8;\
-        context->bitcount -= 8;\
-    }\
-}
-
-/* write a run.  we use a combination of literals and combinations of
-   literals.  this can give quite decent compression for images with
-   long stretches of identical pixels.  but remember: if you want
-   really good compression, use another file format. */
-
-#define EMIT_RUN(label) {\
-label:\
-    while (context->count > 0) {\
-        int run = 2;\
-        EMIT(context->last);\
-        context->count--;\
-        if (state->count++ == LAST_CODE) {\
-            EMIT(CLEAR_CODE);\
-            state->count = FIRST_CODE;\
-            goto label;\
-        }\
-        while (context->count >= run) {\
-            EMIT(state->count - 1);\
-            context->count -= run;\
-            run++;\
-            if (state->count++ == LAST_CODE) {\
-                EMIT(CLEAR_CODE);\
-                state->count = FIRST_CODE;\
-                goto label;\
-            }\
-        }\
-        if (context->count > 1) {\
-            EMIT(state->count - 1 - (run - context->count));\
-            context->count = 0;\
-            if (state->count++ == LAST_CODE) {\
-                EMIT(CLEAR_CODE);\
-                state->count = FIRST_CODE;\
-            }\
-            break;\
-        }\
-    }\
-}
-
-int
-ImagingGifEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    UINT8* ptr;
-    int this;
-
-    GIFENCODERBLOCK* block;
-    GIFENCODERSTATE *context = (GIFENCODERSTATE*) state->context;
-
-    if (!state->state) {
-
-	/* place a clear code in the output buffer */
-	context->bitbuffer = CLEAR_CODE;
-	context->bitcount = 9;
-
-	state->count = FIRST_CODE;
-
-	if (context->interlace) {
-	    context->interlace = 1;
-	    context->step = 8;
-	} else
-	    context->step = 1;
-
-        context->last = -1;
-
-        /* sanity check */
-        if (state->xsize <= 0 || state->ysize <= 0)
-            state->state = ENCODE_EOF;
-
-    }
-
-    ptr = buf;
-
-    for (;;)
-
-	switch (state->state) {
-
-        case INIT:
-        case ENCODE:
-
-            /* identify and store a run of pixels */
-
-            if (state->x == 0 || state->x >= state->xsize) {
-
-                if (!context->interlace && state->y >= state->ysize) {
-                    state->state = ENCODE_EOF;
-                    break;
-                }
-
-                if (context->flush) {
-                    state->state = FLUSH;
-                    break;
-                }
-
-                /* get another line of data */
-                state->shuffle(
-                    state->buffer,
-                    (UINT8*) im->image[state->y + state->yoff] +
-                    state->xoff * im->pixelsize, state->xsize
-                    );
-
-                state->x = 0;
-
-                if (state->state == INIT) {
-                    /* preload the run-length buffer and get going */
-                    context->last = state->buffer[0];
-                    context->count = state->x = 1;
-                    state->state = ENCODE;
-                }
-
-                /* step forward, according to the interlace settings */
-                state->y += context->step;
-                while (context->interlace && state->y >= state->ysize)
-                    switch (context->interlace) {
-                    case 1:
-                        state->y = 4;
-                        context->interlace = 2;
-                        break;
-                    case 2:
-                        context->step = 4;
-                        state->y = 2;
-                        context->interlace = 3;
-                        break;
-                    case 3:
-                        context->step = 2;
-                        state->y = 1;
-                        context->interlace = 0;
-                        break;
-                    default:
-                        /* just make sure we don't loop forever */
-                        context->interlace = 0;
-                    }
-
-            }
-
-            this = state->buffer[state->x++];
-
-            if (this == context->last)
-                context->count++;
-            else {
-                EMIT_RUN(label1);
-                context->last = this;
-                context->count = 1;
-            }
-	    break;
-
-
-        case ENCODE_EOF:
-
-            /* write the final run */
-            EMIT_RUN(label2);
-
-            /* write an end of image marker */
-            EMIT(EOF_CODE);
-
-            /* empty the bit buffer */
-            while (context->bitcount > 0) {
-                if (!emit(context, (UINT8) context->bitbuffer)) {
-                    state->errcode = IMAGING_CODEC_MEMORY;
-                    return 0;
-                }
-                context->bitbuffer >>= 8;
-                context->bitcount -= 8;
-            }
-
-            /* flush the last block, and exit */
-            if (context->block) {
-                GIFENCODERBLOCK* block;
-                block = context->flush;
-                while (block && block->next)
-                    block = block->next;
-                if (block)
-                    block->next = context->block;
-                else
-                    context->flush = context->block;
-                context->block = NULL;
-            }
-
-            state->state = EXIT;
-
-            /* fall through... */
-
-	case EXIT:
-	case FLUSH:
-
-            while (context->flush) {
-
-                /* get a block from the flush queue */
-                block = context->flush;
-
-                if (block->size > 0) {
-
-                    /* make sure it fits into the output buffer */
-                    if (bytes < block->size+1)
-                        return ptr - buf;
-
-                    ptr[0] = block->size;
-                    memcpy(ptr+1, block->data, block->size);
-
-                    ptr += block->size+1;
-                    bytes -= block->size+1;
-
-                }
-
-                context->flush = block->next;
-
-                if (context->free)
-                    free(context->free);
-                context->free = block;
-
-            }
-
-            if (state->state == EXIT) {
-                /* this was the last block! */
-                if (context->free)
-                    free(context->free);
-                state->errcode = IMAGING_CODEC_END;
-                return ptr - buf;
-            }
-
-            state->state = ENCODE;
-	    break;
-        }
-}
diff --git a/pythonPackages/pil/libImaging/HexDecode.c b/pythonPackages/pil/libImaging/HexDecode.c
deleted file mode 100644
index dddbe0072c..0000000000
--- a/pythonPackages/pil/libImaging/HexDecode.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: HexDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for hex encoded image data
- *
- * history:
- *	96-05-16 fl	Created
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#define	HEX(v) ((v >= '0' && v <= '9') ? v - '0' :\
-		(v >= 'a' && v <= 'f') ? v - 'a' + 10 :\
-		(v >= 'A' && v <= 'F') ? v - 'A' + 10 : -1)
-
-int
-ImagingHexDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    UINT8* ptr;
-    int a, b;
-
-    ptr = buf;
-
-    for (;;) {
-
-	if (bytes < 2)
-	    return ptr - buf;
-
-	a = HEX(ptr[0]);
-	b = HEX(ptr[1]);
-
-	if (a < 0 || b < 0) {
-
-	    ptr++;
-	    bytes--;
-
-	} else {
-
-	    ptr += 2;
-	    bytes -= 2;
-
-	    state->buffer[state->x] = (a<<4) + b;
-
-	    if (++state->x >= state->bytes) {
-
-		/* Got a full line, unpack it */
-		state->shuffle((UINT8*) im->image[state->y], state->buffer,
-			       state->xsize);
-
-		state->x = 0;
-
-		if (++state->y >= state->ysize) {
-		    /* End of file (errcode = 0) */
-		    return -1;
-		}
-	    }
-
-	}
-    }
-}
diff --git a/pythonPackages/pil/libImaging/Histo.c b/pythonPackages/pil/libImaging/Histo.c
deleted file mode 100644
index b69b1dbcba..0000000000
--- a/pythonPackages/pil/libImaging/Histo.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Histo.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * histogram support
- *
- * history:
- * 1995-06-15 fl   Created.
- * 1996-04-05 fl   Fixed histogram for multiband images.
- * 1997-02-23 fl   Added mask support
- * 1998-07-01 fl   Added basic 32-bit float/integer support
- *
- * Copyright (c) 1997-2003 by Secret Labs AB.
- * Copyright (c) 1995-2003 by Fredrik Lundh.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-/* HISTOGRAM */
-/* --------------------------------------------------------------------
- * Take a histogram of an image. Returns a histogram object containing
- * 256 slots per band in the input image.
- */
-
-void
-ImagingHistogramDelete(ImagingHistogram h)
-{
-    if (h->histogram)
-	free(h->histogram);
-    free(h);
-}
-
-ImagingHistogram
-ImagingHistogramNew(Imaging im)
-{
-    ImagingHistogram h;
-
-    /* Create histogram descriptor */
-    h = calloc(1, sizeof(struct ImagingHistogramInstance));
-    strcpy(h->mode, im->mode);
-    h->bands = im->bands;
-    h->histogram = calloc(im->pixelsize, 256 * sizeof(long));
-
-    return h;
-}
-
-ImagingHistogram
-ImagingGetHistogram(Imaging im, Imaging imMask, void* minmax)
-{
-    ImagingSectionCookie cookie;
-    int x, y, i;
-    ImagingHistogram h;
-    INT32 imin, imax;
-    FLOAT32 fmin, fmax, scale;
-
-    if (!im)
-	return ImagingError_ModeError();
-
-    if (imMask) {
-	/* Validate mask */
-	if (im->xsize != imMask->xsize || im->ysize != imMask->ysize)
-	    return ImagingError_Mismatch();
-	if (strcmp(imMask->mode, "1") != 0 && strcmp(imMask->mode, "L") != 0)
-	    return ImagingError_ValueError("bad transparency mask");
-    }
-
-    h = ImagingHistogramNew(im);
-
-    if (imMask) {
-	/* mask */
-	if (im->image8) {
-            ImagingSectionEnter(&cookie);
-	    for (y = 0; y < im->ysize; y++)
-		for (x = 0; x < im->xsize; x++)
-		    if (imMask->image8[y][x] != 0)
-			h->histogram[im->image8[y][x]]++;
-            ImagingSectionLeave(&cookie);
-	} else { /* yes, we need the braces. C isn't Python! */
-            if (im->type != IMAGING_TYPE_UINT8)
-                return ImagingError_ModeError();
-            ImagingSectionEnter(&cookie);
-	    for (y = 0; y < im->ysize; y++) {
-		UINT8* in = (UINT8*) im->image32[y];
-		for (x = 0; x < im->xsize; x++)
-		    if (imMask->image8[y][x] != 0) {
-			h->histogram[(*in++)]++;
-			h->histogram[(*in++)+256]++;
-			h->histogram[(*in++)+512]++;
-			h->histogram[(*in++)+768]++;
-		    } else
-			in += 4;
-	    }
-            ImagingSectionLeave(&cookie);
-	}
-    } else {
-	/* mask not given; process pixels in image */
-	if (im->image8) {
-            ImagingSectionEnter(&cookie);
-	    for (y = 0; y < im->ysize; y++)
-		for (x = 0; x < im->xsize; x++)
-		    h->histogram[im->image8[y][x]]++;
-            ImagingSectionLeave(&cookie);
-	} else {
-            switch (im->type) {
-            case IMAGING_TYPE_UINT8:
-                ImagingSectionEnter(&cookie);
-                for (y = 0; y < im->ysize; y++) {
-                    UINT8* in = (UINT8*) im->image[y];
-                    for (x = 0; x < im->xsize; x++) {
-                        h->histogram[(*in++)]++;
-                        h->histogram[(*in++)+256]++;
-                        h->histogram[(*in++)+512]++;
-                        h->histogram[(*in++)+768]++;
-                    }
-                }
-                ImagingSectionLeave(&cookie);
-                break;
-            case IMAGING_TYPE_INT32:
-                if (!minmax)
-                    return ImagingError_ValueError("min/max not given");
-                if (!im->xsize || !im->ysize)
-                    break;
-                imin = ((INT32*) minmax)[0];
-                imax = ((INT32*) minmax)[1];
-                if (imin >= imax)
-                    break;
-                ImagingSectionEnter(&cookie);
-                scale = 255.0F / (imax - imin);
-                for (y = 0; y < im->ysize; y++) {
-                    INT32* in = im->image32[y];
-                    for (x = 0; x < im->xsize; x++) {
-                        i = (int) (((*in++)-imin)*scale);
-                        if (i >= 0 && i < 256)
-                            h->histogram[i]++;
-                    }
-                }
-                ImagingSectionLeave(&cookie);
-                break;
-            case IMAGING_TYPE_FLOAT32:
-                if (!minmax)
-                    return ImagingError_ValueError("min/max not given");
-                if (!im->xsize || !im->ysize)
-                    break;
-                fmin = ((FLOAT32*) minmax)[0];
-                fmax = ((FLOAT32*) minmax)[1];
-                if (fmin >= fmax)
-                    break;
-                ImagingSectionEnter(&cookie);
-                scale = 255.0F / (fmax - fmin);
-                for (y = 0; y < im->ysize; y++) {
-                    FLOAT32* in = (FLOAT32*) im->image32[y];
-                    for (x = 0; x < im->xsize; x++) {
-                        i = (int) (((*in++)-fmin)*scale);
-                        if (i >= 0 && i < 256)
-                            h->histogram[i]++;
-                    }
-                }
-                ImagingSectionLeave(&cookie);
-                break;
-            }
-        }
-    }
-
-    return h;
-}
diff --git a/pythonPackages/pil/libImaging/ImDib.h b/pythonPackages/pil/libImaging/ImDib.h
deleted file mode 100644
index 129cb22c98..0000000000
--- a/pythonPackages/pil/libImaging/ImDib.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: ImDib.h 2319 2005-03-11 16:41:26Z fredrik $
- *
- * Windows DIB specifics
- *
- * Copyright (c) Secret Labs AB 1997-98.
- * Copyright (c) Fredrik Lundh 1996.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#ifdef WIN32
-
-#if (defined(_MSC_VER) && _MSC_VER >= 1200) || (defined __GNUC__)
-/* already defined in basetsd.h */
-#undef INT32
-#undef INT64
-#undef UINT32
-#endif
-
-#include <windows.h>
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-struct ImagingDIBInstance {
-    /* Windows interface */
-    HDC dc;
-    HBITMAP bitmap;
-    HGDIOBJ old_bitmap;
-    BITMAPINFO *info;
-    UINT8 *bits;
-    HPALETTE palette;
-    /* Used by cut and paste */
-    char mode[4];
-    int xsize, ysize;
-    int pixelsize;
-    int linesize;
-    ImagingShuffler pack;
-    ImagingShuffler unpack;
-};
-
-typedef struct ImagingDIBInstance* ImagingDIB;
-
-extern char* ImagingGetModeDIB(int size_out[2]);
-
-extern ImagingDIB ImagingNewDIB(const char *mode, int xsize, int ysize);
-
-extern void ImagingDeleteDIB(ImagingDIB im);
-
-extern void ImagingDrawDIB(ImagingDIB dib, int dc, int dst[4], int src[4]);
-extern void ImagingExposeDIB(ImagingDIB dib, int dc);
-
-extern int ImagingQueryPaletteDIB(ImagingDIB dib, int dc);
-
-extern void ImagingPasteDIB(ImagingDIB dib, Imaging im, int xy[4]);
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif
diff --git a/pythonPackages/pil/libImaging/ImPlatform.h b/pythonPackages/pil/libImaging/ImPlatform.h
deleted file mode 100644
index c3132d9d8f..0000000000
--- a/pythonPackages/pil/libImaging/ImPlatform.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* 
- * The Python Imaging Library
- * $Id: ImPlatform.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * platform declarations for the imaging core library
- *
- * Copyright (c) Fredrik Lundh 1995-2003.
- */
-
-#include "Python.h"
-
-/* Check that we have an ANSI compliant compiler */
-#ifndef HAVE_PROTOTYPES
-#error Sorry, this library requires support for ANSI prototypes.
-#endif
-#ifndef STDC_HEADERS
-#error Sorry, this library requires ANSI header files.
-#endif
-
-#if defined(_MSC_VER)
-#ifndef WIN32
-#define WIN32
-#endif
-/* VC++ 4.0 is a bit annoying when it comes to precision issues (like
-   claiming that "float a = 0.0;" would lead to loss of precision).  I
-   don't like to see warnings from my code, but since I still want to
-   keep it readable, I simply switch off a few warnings instead of adding
-   the tons of casts that VC++ seem to require.  This code is compiled
-   with numerous other compilers as well, so any real errors are likely
-   to be catched anyway. */
-#pragma warning(disable: 4244) /* conversion from 'float' to 'int' */
-#endif
-
-#if defined(_MSC_VER)
-#define inline __inline
-#elif !defined(USE_INLINE)
-#define inline
-#endif
-
-#if SIZEOF_SHORT == 2
-#define	INT16 short
-#elif SIZEOF_INT == 2
-#define	INT16 int
-#else
-#define	INT16 short /* most things works just fine anyway... */
-#endif
-
-#if SIZEOF_SHORT == 4
-#define	INT32 short
-#elif SIZEOF_INT == 4
-#define	INT32 int
-#elif SIZEOF_LONG == 4
-#define	INT32 long
-#else
-#error Cannot find required 32-bit integer type
-#endif
-
-#if SIZEOF_LONG == 8
-#define	INT64 long
-#elif SIZEOF_LONG_LONG == 8
-#define	INT64 long
-#endif
-
-/* assume IEEE; tweak if necessary (patches are welcome) */
-#define	FLOAT32 float
-#define	FLOAT64 double
-
-#define	INT8  signed char
-#define	UINT8 unsigned char
-
-#define	UINT16 unsigned INT16
-#define	UINT32 unsigned INT32
diff --git a/pythonPackages/pil/libImaging/Imaging.h b/pythonPackages/pil/libImaging/Imaging.h
deleted file mode 100644
index 24b97eb3a3..0000000000
--- a/pythonPackages/pil/libImaging/Imaging.h
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Imaging.h 2542 2005-10-02 21:37:20Z Fredrik $
- * 
- * declarations for the imaging core library
- *
- * Copyright (c) 1997-2005 by Secret Labs AB
- * Copyright (c) 1995-2005 by Fredrik Lundh
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "ImPlatform.h"
-
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-
-#ifndef M_PI
-#define	M_PI	3.14159265359
-#endif
-
-
-/* -------------------------------------------------------------------- */
-
-/*
- * Image data organization:
- *
- * mode	    bytes	byte order
- * -------------------------------
- * 1	    1		1
- * L	    1		L
- * P	    1		P
- * I        4           I (32-bit integer, native byte order)
- * F        4           F (32-bit IEEE float, native byte order)
- * RGB	    4		R, G, B, -
- * RGBA	    4		R, G, B, A
- * CMYK	    4		C, M, Y, K
- * YCbCr    4		Y, Cb, Cr, -
- *
- * experimental modes (incomplete):
- * LA       4           L, -, -, A
- * PA       4           P, -, -, A
- * I;16     2           I (16-bit integer, native byte order)
- *
- * "P" is an 8-bit palette mode, which should be mapped through the
- * palette member to get an output image.  Check palette->mode to
- * find the corresponding "real" mode.
- *
- * For information on how to access Imaging objects from your own C
- * extensions, see http://www.effbot.org/zone/pil-extending.htm
- */
-
-/* Handles */
-
-typedef struct ImagingMemoryInstance* Imaging;
-typedef struct ImagingAccessInstance* ImagingAccess;
-typedef struct ImagingHistogramInstance* ImagingHistogram;
-typedef struct ImagingOutlineInstance* ImagingOutline;
-typedef struct ImagingPaletteInstance* ImagingPalette;
-
-/* handle magics (used with PyCObject). */
-#define IMAGING_MAGIC "PIL Imaging"
-#define IMAGING_ACCESS_MAGIC "PIL ImagingAccess"
-
-/* pixel types */
-#define IMAGING_TYPE_UINT8 0
-#define IMAGING_TYPE_INT32 1
-#define IMAGING_TYPE_FLOAT32 2
-#define IMAGING_TYPE_SPECIAL 3 /* check mode for details */
-
-struct ImagingMemoryInstance {
-
-    /* Format */
-    char mode[4+1];	/* Band names ("1", "L", "P", "RGB", "RGBA", "CMYK") */
-    int type;		/* Data type (IMAGING_TYPE_*) */
-    int depth;		/* Depth (ignored in this version) */
-    int bands;		/* Number of bands (1, 2, 3, or 4) */
-    int xsize;		/* Image dimension. */
-    int ysize;
-
-    /* Colour palette (for "P" images only) */
-    ImagingPalette palette;
-
-    /* Data pointers */
-    UINT8 **image8;	/* Set for 8-bit images (pixelsize=1). */
-    INT32 **image32;	/* Set for 32-bit images (pixelsize=4). */
-
-    /* Internals */
-    char **image;	/* Actual raster data. */
-    char *block;	/* Set if data is allocated in a single block. */
-
-    int pixelsize;	/* Size of a pixel, in bytes (1, 2 or 4) */
-    int linesize;	/* Size of a line, in bytes (xsize * pixelsize) */
-
-    /* Virtual methods */
-    void (*destroy)(Imaging im);
-
-};
-
-
-#define IMAGING_PIXEL_1(im,x,y) ((im)->image8[(y)][(x)])
-#define IMAGING_PIXEL_L(im,x,y) ((im)->image8[(y)][(x)])
-#define IMAGING_PIXEL_LA(im,x,y) ((im)->image[(y)][(x)*4])
-#define IMAGING_PIXEL_P(im,x,y) ((im)->image8[(y)][(x)])
-#define IMAGING_PIXEL_PA(im,x,y) ((im)->image[(y)][(x)*4])
-#define IMAGING_PIXEL_I(im,x,y) ((im)->image32[(y)][(x)])
-#define IMAGING_PIXEL_F(im,x,y) (((FLOAT32*)(im)->image32[y])[x])
-#define IMAGING_PIXEL_RGB(im,x,y) ((im)->image[(y)][(x)*4])
-#define IMAGING_PIXEL_RGBA(im,x,y) ((im)->image[(y)][(x)*4])
-#define IMAGING_PIXEL_CMYK(im,x,y) ((im)->image[(y)][(x)*4])
-#define IMAGING_PIXEL_YCbCr(im,x,y) ((im)->image[(y)][(x)*4])
-
-#define IMAGING_PIXEL_UINT8(im,x,y) ((im)->image8[(y)][(x)])
-#define IMAGING_PIXEL_INT32(im,x,y) ((im)->image32[(y)][(x)])
-#define IMAGING_PIXEL_FLOAT32(im,x,y) (((FLOAT32*)(im)->image32[y])[x])
-
-#define IMAGING_ACCESS_HEAD\
-    int (*getline)(ImagingAccess access, char *buffer, int y);\
-    void (*destroy)(ImagingAccess access)
-
-struct ImagingAccessInstance {
-    IMAGING_ACCESS_HEAD;
-
-    /* Data members */
-    Imaging im;
-
-};
-
-
-struct ImagingHistogramInstance {
-
-    /* Format */
-    char mode[4+1];	/* Band names (of corresponding source image) */
-    int bands;		/* Number of bands (1, 3, or 4) */
-
-    /* Data */
-    long *histogram;	/* Histogram (bands*256 longs) */
-
-};
-
-
-struct ImagingPaletteInstance {
-
-    /* Format */
-    char mode[4+1];	/* Band names */
-
-    /* Data */
-    UINT8 palette[1024];/* Palette data (same format as image data) */
-
-    INT16* cache;	/* Palette cache (used for predefined palettes) */
-    int keep_cache;	/* This palette will be reused; keep cache */
-
-};
-
-
-/* Objects */
-/* ------- */
-
-extern int ImagingNewCount;
-
-extern Imaging ImagingNew(const char* mode, int xsize, int ysize);
-extern Imaging ImagingNew2(const char* mode, Imaging imOut, Imaging imIn);
-extern void    ImagingDelete(Imaging im);
-
-extern Imaging ImagingNewBlock(const char* mode, int xsize, int ysize);
-extern Imaging ImagingNewArray(const char* mode, int xsize, int ysize);
-extern Imaging ImagingNewMap(const char* filename, int readonly,
-                             const char* mode, int xsize, int ysize);
-
-extern Imaging ImagingNewPrologue(const char *mode,
-                                  unsigned xsize, unsigned ysize);
-extern Imaging ImagingNewPrologueSubtype(const char *mode,
-                                  unsigned xsize, unsigned ysize,
-                                  int structure_size);
-extern Imaging ImagingNewEpilogue(Imaging im);
-
-extern void ImagingCopyInfo(Imaging destination, Imaging source);
-
-extern void ImagingHistogramDelete(ImagingHistogram histogram);
-
-extern ImagingAccess ImagingAccessNew(Imaging im);
-extern void          ImagingAccessDelete(ImagingAccess access);
-
-extern ImagingPalette ImagingPaletteNew(const char *mode);
-extern ImagingPalette ImagingPaletteNewBrowser(void);
-extern ImagingPalette ImagingPaletteDuplicate(ImagingPalette palette);
-extern void           ImagingPaletteDelete(ImagingPalette palette);
-
-extern int  ImagingPaletteCachePrepare(ImagingPalette palette);
-extern void ImagingPaletteCacheUpdate(ImagingPalette palette,
-				      int r, int g, int b);
-extern void ImagingPaletteCacheDelete(ImagingPalette palette);
-
-#define	ImagingPaletteCache(p, r, g, b)\
-    p->cache[(r>>2) + (g>>2)*64 + (b>>2)*64*64]
-
-extern Imaging ImagingQuantize(Imaging im, int colours, int mode, int kmeans);
-
-/* Threading */
-/* --------- */
-
-typedef void* ImagingSectionCookie;
-
-extern void ImagingSectionEnter(ImagingSectionCookie* cookie);
-extern void ImagingSectionLeave(ImagingSectionCookie* cookie);
-
-/* Exceptions */
-/* ---------- */
-
-extern void* ImagingError_IOError(void);
-extern void* ImagingError_MemoryError(void);
-extern void* ImagingError_ModeError(void); /* maps to ValueError by default */
-extern void* ImagingError_Mismatch(void); /* maps to ValueError by default */
-extern void* ImagingError_ValueError(const char* message);
-
-/* Transform callbacks */
-/* ------------------- */
-
-/* standard transforms */
-#define IMAGING_TRANSFORM_AFFINE 0
-#define IMAGING_TRANSFORM_PERSPECTIVE 2
-#define IMAGING_TRANSFORM_QUAD 3
-
-
-/* standard filters */
-#define IMAGING_TRANSFORM_NEAREST 0
-#define IMAGING_TRANSFORM_ANTIALIAS 1
-#define IMAGING_TRANSFORM_BILINEAR 2
-#define IMAGING_TRANSFORM_BICUBIC 3
-
-typedef int (*ImagingTransformMap)(double* X, double* Y,
-                                   int x, int y, void* data);
-typedef int (*ImagingTransformFilter)(void* out, Imaging im,
-                                      double x, double y,
-                                      void* data);
-
-/* Image Manipulation Methods */
-/* -------------------------- */
-
-extern Imaging ImagingBlend(Imaging imIn1, Imaging imIn2, float alpha);
-extern Imaging ImagingCopy(Imaging im);
-extern Imaging ImagingConvert(
-    Imaging im, const char* mode, ImagingPalette palette, int dither);
-extern Imaging ImagingConvertMatrix(Imaging im, const char *mode, float m[]);
-extern Imaging ImagingCrop(Imaging im, int x0, int y0, int x1, int y1);
-extern Imaging ImagingExpand(Imaging im, int x, int y, int mode);
-extern Imaging ImagingFill(Imaging im, const void* ink);
-extern int ImagingFill2(
-    Imaging into, const void* ink, Imaging mask,
-    int x0, int y0, int x1, int y1);
-extern Imaging ImagingFillBand(Imaging im, int band, int color);
-extern Imaging ImagingFillLinearGradient(const char* mode);
-extern Imaging ImagingFillRadialGradient(const char* mode);
-extern Imaging ImagingFilter(
-    Imaging im, int xsize, int ysize, const FLOAT32* kernel,
-    FLOAT32 offset, FLOAT32 divisor);
-extern Imaging ImagingFlipLeftRight(Imaging imOut, Imaging imIn);
-extern Imaging ImagingFlipTopBottom(Imaging imOut, Imaging imIn);
-extern Imaging ImagingGetBand(Imaging im, int band);
-extern int ImagingGetBBox(Imaging im, int bbox[4]);
-typedef struct { int x, y; INT32 count; INT32 pixel; } ImagingColorItem;
-extern ImagingColorItem* ImagingGetColors(Imaging im, int maxcolors,
-    int *colors);
-extern int ImagingGetExtrema(Imaging im, void *extrema);
-extern int ImagingGetProjection(Imaging im, UINT8* xproj, UINT8* yproj);
-extern ImagingHistogram ImagingGetHistogram(
-    Imaging im, Imaging mask, void *extrema);
-extern Imaging ImagingModeFilter(Imaging im, int size);
-extern Imaging ImagingNegative(Imaging im);
-extern Imaging ImagingOffset(Imaging im, int xoffset, int yoffset);
-extern int ImagingPaste(
-    Imaging into, Imaging im, Imaging mask,
-    int x0, int y0, int x1, int y1);
-extern Imaging ImagingPoint(
-    Imaging im, const char* tablemode, const void* table);
-extern Imaging ImagingPointTransform(
-    Imaging imIn, double scale, double offset);
-extern Imaging ImagingPutBand(Imaging im, Imaging imIn, int band);
-extern Imaging ImagingRankFilter(Imaging im, int size, int rank);
-extern Imaging ImagingResize(Imaging imOut, Imaging imIn, int filter);
-extern Imaging ImagingRotate(
-    Imaging imOut, Imaging imIn, double theta, int filter);
-extern Imaging ImagingRotate90(Imaging imOut, Imaging imIn);
-extern Imaging ImagingRotate180(Imaging imOut, Imaging imIn);
-extern Imaging ImagingRotate270(Imaging imOut, Imaging imIn);
-extern Imaging ImagingStretch(Imaging imOut, Imaging imIn, int filter);
-extern Imaging ImagingTransformPerspective(
-    Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, 
-    double a[8], int filter, int fill);
-extern Imaging ImagingTransformAffine(
-    Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, 
-    double a[6], int filter, int fill);
-extern Imaging ImagingTransformQuad(
-    Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, 
-    double a[8], int filter, int fill);
-extern Imaging ImagingTransform(
-    Imaging imOut, Imaging imIn, int x0, int y0, int x1, int y1, 
-    ImagingTransformMap transform, void* transform_data,
-    ImagingTransformFilter filter, void* filter_data,
-    int fill);
-extern Imaging ImagingCopy2(Imaging imOut, Imaging imIn);
-extern Imaging ImagingConvert2(Imaging imOut, Imaging imIn);
-
-/* Channel operations */
-/* any mode, except "F" */
-extern Imaging ImagingChopLighter(Imaging imIn1, Imaging imIn2);
-extern Imaging ImagingChopDarker(Imaging imIn1, Imaging imIn2);
-extern Imaging ImagingChopDifference(Imaging imIn1, Imaging imIn2);
-extern Imaging ImagingChopMultiply(Imaging imIn1, Imaging imIn2);
-extern Imaging ImagingChopScreen(Imaging imIn1, Imaging imIn2);
-extern Imaging ImagingChopAdd(
-    Imaging imIn1, Imaging imIn2, float scale, int offset);
-extern Imaging ImagingChopSubtract(
-    Imaging imIn1, Imaging imIn2, float scale, int offset);
-extern Imaging ImagingChopAddModulo(Imaging imIn1, Imaging imIn2);
-extern Imaging ImagingChopSubtractModulo(Imaging imIn1, Imaging imIn2);
-
-/* "1" images only */
-extern Imaging ImagingChopAnd(Imaging imIn1, Imaging imIn2);
-extern Imaging ImagingChopOr(Imaging imIn1, Imaging imIn2);
-extern Imaging ImagingChopXor(Imaging imIn1, Imaging imIn2);
-
-/* Image measurement */
-extern void ImagingCrack(Imaging im, int x0, int y0);
-
-/* Graphics */
-struct ImagingAffineMatrixInstance {
-    float a[9];
-};
-
-typedef struct ImagingAffineMatrixInstance *ImagingAffineMatrix;
-
-extern int ImagingDrawArc(Imaging im, int x0, int y0, int x1, int y1,
-                          int start, int end, const void* ink, int op);
-extern int ImagingDrawBitmap(Imaging im, int x0, int y0, Imaging bitmap,
-                             const void* ink, int op);
-extern int ImagingDrawChord(Imaging im, int x0, int y0, int x1, int y1,
-                            int start, int end, const void* ink, int fill,
-                            int op);
-extern int ImagingDrawEllipse(Imaging im, int x0, int y0, int x1, int y1,
-                              const void* ink, int fill, int op);
-extern int ImagingDrawLine(Imaging im, int x0, int y0, int x1, int y1,
-			   const void* ink, int op);
-extern int ImagingDrawWideLine(Imaging im, int x0, int y0, int x1, int y1,
-                               const void* ink, int width, int op);
-extern int ImagingDrawPieslice(Imaging im, int x0, int y0, int x1, int y1,
-                               int start, int end, const void* ink, int fill,
-                               int op);
-extern int ImagingDrawPoint(Imaging im, int x, int y, const void* ink, int op);
-extern int ImagingDrawPolygon(Imaging im, int points, int *xy,
-			      const void* ink, int fill, int op);
-extern int ImagingDrawRectangle(Imaging im, int x0, int y0, int x1, int y1,
-				const void* ink, int fill, int op);
-
-/* Level 2 graphics (WORK IN PROGRESS) */
-extern ImagingOutline ImagingOutlineNew(void);
-extern void ImagingOutlineDelete(ImagingOutline outline);
-
-extern int ImagingDrawOutline(Imaging im, ImagingOutline outline,
-                              const void* ink, int fill, int op);
-
-extern int ImagingOutlineMove(ImagingOutline outline, float x, float y);
-extern int ImagingOutlineLine(ImagingOutline outline, float x, float y);
-extern int ImagingOutlineCurve(ImagingOutline outline, float x1, float y1,
-                                float x2, float y2, float x3, float y3);
-extern int ImagingOutlineTransform(ImagingOutline outline, double a[6]);
-                                   
-extern int ImagingOutlineClose(ImagingOutline outline);
-
-/* Special effects */
-extern Imaging ImagingEffectSpread(Imaging imIn, int distance);
-extern Imaging ImagingEffectNoise(int xsize, int ysize, float sigma);
-extern Imaging ImagingEffectMandelbrot(int xsize, int ysize,
-                                       double extent[4], int quality);
-
-/* Obsolete */
-extern int ImagingToString(Imaging im, int orientation, char *buffer);
-extern int ImagingFromString(Imaging im, int orientation, char *buffer);
-
-
-/* File I/O */
-/* -------- */
-
-/* Built-in drivers */
-extern Imaging ImagingOpenPPM(const char* filename);
-extern int ImagingSavePPM(Imaging im, const char* filename);
-
-/* Utility functions */
-extern UINT32 ImagingCRC32(UINT32 crc, UINT8* buffer, int bytes);
-
-/* Codecs */
-typedef struct ImagingCodecStateInstance *ImagingCodecState;
-typedef int (*ImagingCodec)(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-
-extern int ImagingBitDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingEpsEncode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingFliDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingGifDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingGifEncode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingHexDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-#ifdef	HAVE_LIBJPEG
-extern int ImagingJpegDecode(Imaging im, ImagingCodecState state,
-			     UINT8* buffer, int bytes);
-extern int ImagingJpegEncode(Imaging im, ImagingCodecState state,
-			     UINT8* buffer, int bytes);
-#endif
-extern int ImagingLzwDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-#ifdef	HAVE_LIBMPEG
-extern int ImagingMpegDecode(Imaging im, ImagingCodecState state,
-			     UINT8* buffer, int bytes);
-#endif
-extern int ImagingMspDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingPackbitsDecode(Imaging im, ImagingCodecState state,
-				 UINT8* buffer, int bytes);
-extern int ImagingPcdDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingPcxDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingPcxEncode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingRawDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingRawEncode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingSunRleDecode(Imaging im, ImagingCodecState state,
-			       UINT8* buffer, int bytes);
-extern int ImagingTgaRleDecode(Imaging im, ImagingCodecState state,
-			       UINT8* buffer, int bytes);
-extern int ImagingXbmDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingXbmEncode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-#ifdef	HAVE_LIBZ
-extern int ImagingZipDecode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-extern int ImagingZipEncode(Imaging im, ImagingCodecState state,
-			    UINT8* buffer, int bytes);
-#endif
-
-typedef void (*ImagingShuffler)(UINT8* out, const UINT8* in, int pixels);
-
-/* Public shufflers */
-extern void ImagingPackRGB(UINT8* out, const UINT8* in, int pixels);
-extern void ImagingPackBGR(UINT8* out, const UINT8* in, int pixels);
-extern void ImagingUnpackRGB(UINT8* out, const UINT8* in, int pixels);
-extern void ImagingUnpackBGR(UINT8* out, const UINT8* in, int pixels);
-extern void ImagingUnpackYCC(UINT8* out, const UINT8* in, int pixels);
-extern void ImagingUnpackYCCA(UINT8* out, const UINT8* in, int pixels);
-extern void ImagingUnpackYCbCr(UINT8* out, const UINT8* in, int pixels);
-
-extern void ImagingConvertRGB2YCbCr(UINT8* out, const UINT8* in, int pixels);
-extern void ImagingConvertYCbCr2RGB(UINT8* out, const UINT8* in, int pixels);
-
-extern ImagingShuffler ImagingFindUnpacker(const char* mode,
-                                           const char* rawmode, int* bits_out);
-extern ImagingShuffler ImagingFindPacker(const char* mode,
-                                         const char* rawmode, int* bits_out);
-
-struct ImagingCodecStateInstance {
-    int count;
-    int state;
-    int errcode;
-    int x, y;
-    int ystep;
-    int xsize, ysize, xoff, yoff;
-    ImagingShuffler shuffle;
-    int bits, bytes;
-    UINT8 *buffer;
-    void *context;
-};
-
-/* Errcodes */
-#define	IMAGING_CODEC_END	 1
-#define	IMAGING_CODEC_OVERRUN	-1
-#define	IMAGING_CODEC_BROKEN	-2
-#define	IMAGING_CODEC_UNKNOWN	-3
-#define	IMAGING_CODEC_CONFIG	-8
-#define	IMAGING_CODEC_MEMORY	-9
-
-#if defined(__cplusplus)
-}
-#endif
diff --git a/pythonPackages/pil/libImaging/Jpeg.h b/pythonPackages/pil/libImaging/Jpeg.h
deleted file mode 100644
index 45e0aecdd3..0000000000
--- a/pythonPackages/pil/libImaging/Jpeg.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: Jpeg.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * declarations for the IJG JPEG codec interface.
- *
- * Copyright (c) 1995-2001 by Secret Labs AB
- * Copyright (c) 1995-1996 by Fredrik Lundh
- */
-
-#include "jpeglib.h"
-
-#include <setjmp.h>
-
-
-typedef struct {
-    struct jpeg_error_mgr pub;	/* "public" fields */
-    jmp_buf setjmp_buffer;	/* for return to caller */
-} JPEGERROR;
-
-
-/* -------------------------------------------------------------------- */
-/* Decoder								*/
-
-typedef struct {
-    struct jpeg_source_mgr pub;
-    int skip;
-} JPEGSOURCE;
-
-typedef struct {
-
-    /* CONFIGURATION */
-
-    /* Jpeg file mode (empty if not known) */
-    char jpegmode[8+1];
-
-    /* Converter output mode (input to the shuffler).  If empty,
-       convert conversions are disabled */
-    char rawmode[8+1];
-
-    /* If set, trade quality for speed */
-    int draft;
-
-    /* Scale factor (1, 2, 4, 8) */
-    int scale;
-
-    /* PRIVATE CONTEXT (set by decoder) */
-
-    struct jpeg_decompress_struct cinfo;
-
-    JPEGERROR error;
-
-    JPEGSOURCE source;
-
-} JPEGSTATE;
-
-
-/* -------------------------------------------------------------------- */
-/* Encoder								*/
-
-typedef struct {
-    struct jpeg_destination_mgr pub;
-    /* might add something some other day */
-} JPEGDESTINATION;
-
-typedef struct {
-
-    /* CONFIGURATION */
-
-    /* Quality (1-100, 0 means default) */
-    int quality;
-
-    /* Progressive mode */
-    int progressive;
-
-    /* Smoothing factor (1-100, 0 means none) */
-    int smooth;
-
-    /* Optimize Huffman tables (slow) */
-    int optimize;
-
-    /* Stream type (0=full, 1=tables only, 2=image only) */
-    int streamtype;
-
-    /* DPI setting (0=square pixels, otherwide DPI) */
-    int xdpi, ydpi;
-
-    /* PRIVATE CONTEXT (set by encoder) */
-
-    struct jpeg_compress_struct cinfo;
-
-    JPEGERROR error;
-
-    JPEGDESTINATION destination;
-
-} JPEGENCODERSTATE;
diff --git a/pythonPackages/pil/libImaging/JpegDecode.c b/pythonPackages/pil/libImaging/JpegDecode.c
deleted file mode 100644
index 0e61aef9e1..0000000000
--- a/pythonPackages/pil/libImaging/JpegDecode.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: JpegDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for JPEG image data.
- *
- * history:
- * 1996-05-02 fl   Created
- * 1996-05-05 fl   Handle small JPEG files correctly
- * 1996-05-28 fl   Added "draft mode" support
- * 1997-01-25 fl   Added colour conversion override
- * 1998-01-31 fl   Adapted to libjpeg 6a
- * 1998-07-12 fl   Extended YCbCr support
- * 1998-12-29 fl   Added new state to handle suspension in multipass modes
- * 2000-10-12 fl   Suppress warnings
- * 2000-12-04 fl   Suppress errors beyond end of image data
- *
- * Copyright (c) 1998-2000 Secret Labs AB 
- * Copyright (c) 1996-2000 Fredrik Lundh 
- *
- * See the README file for details on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#ifdef	HAVE_LIBJPEG
-
-#undef HAVE_PROTOTYPES 
-#undef HAVE_STDLIB_H 
-#undef HAVE_STDDEF_H 
-#undef UINT8
-#undef UINT16
-#undef UINT32
-#undef INT16
-#undef INT32
-
-#include "Jpeg.h"
-
-
-/* -------------------------------------------------------------------- */
-/* Suspending input handler						*/
-/* -------------------------------------------------------------------- */
-
-METHODDEF(void)
-stub(j_decompress_ptr cinfo)
-{
-    /* empty */
-}
-
-METHODDEF(boolean)
-fill_input_buffer(j_decompress_ptr cinfo)
-{
-    /* Suspension */
-    return FALSE;
-}
-
-METHODDEF(void)
-skip_input_data(j_decompress_ptr cinfo, long num_bytes)
-{
-    JPEGSOURCE* source = (JPEGSOURCE*) cinfo->src;
-
-    if (num_bytes > (long) source->pub.bytes_in_buffer) {
-	/* We need to skip more data than we have in the buffer.
-	   This will force the JPEG library to suspend decoding. */
-	source->skip = num_bytes - source->pub.bytes_in_buffer;
-	source->pub.next_input_byte += source->pub.bytes_in_buffer;
-	source->pub.bytes_in_buffer = 0;
-    } else {
-	/* Skip portion of the buffer */
-	source->pub.bytes_in_buffer -= num_bytes;
-	source->pub.next_input_byte += num_bytes;
-	source->skip = 0;
-    }
-}
-
-
-GLOBAL(void)
-jpeg_buffer_src(j_decompress_ptr cinfo, JPEGSOURCE* source)
-{
-  cinfo->src = (void*) source;
-
-  /* Prepare for suspending reader */
-  source->pub.init_source = stub;
-  source->pub.fill_input_buffer = fill_input_buffer;
-  source->pub.skip_input_data = skip_input_data;
-  source->pub.resync_to_restart = jpeg_resync_to_restart;
-  source->pub.term_source = stub;
-  source->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
-
-  source->skip = 0;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* Error handler							*/
-/* -------------------------------------------------------------------- */
-
-METHODDEF(void)
-error(j_common_ptr cinfo)
-{
-  JPEGERROR* error;
-  error = (JPEGERROR*) cinfo->err;
-  longjmp(error->setjmp_buffer, 1);
-}
-
-METHODDEF(void)
-output(j_common_ptr cinfo)
-{
-    /* nothing */
-}
-
-/* -------------------------------------------------------------------- */
-/* Decoder								*/
-/* -------------------------------------------------------------------- */
-
-int
-ImagingJpegDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    JPEGSTATE* context = (JPEGSTATE*) state->context;
-    int ok;
-
-    if (setjmp(context->error.setjmp_buffer)) {
-	/* JPEG error handler */
-	jpeg_destroy_decompress(&context->cinfo);
-	state->errcode = IMAGING_CODEC_BROKEN;
-	return -1;
-    }
-
-    if (!state->state) {
-
-	/* Setup decompression context */
-	context->cinfo.err = jpeg_std_error(&context->error.pub);
-	context->error.pub.error_exit = error;
-	context->error.pub.output_message = output;
-	jpeg_create_decompress(&context->cinfo);
-	jpeg_buffer_src(&context->cinfo, &context->source);
-
-	/* Ready to decode */
-	state->state = 1;
-
-    }
-
-    /* Load the source buffer */
-    context->source.pub.next_input_byte = buf;
-    context->source.pub.bytes_in_buffer = bytes;
-
-    if (context->source.skip > 0) {
-	skip_input_data(&context->cinfo, context->source.skip);
-	if (context->source.skip > 0)
-	    return context->source.pub.next_input_byte - buf; 
-    }
-
-    switch (state->state) {
-
-    case 1:
-
-	/* Read JPEG header, until we find an image body. */
-	do {
-	    
-	    /* Note that we cannot return unless we have decoded
-	       as much data as possible. */
-	    ok = jpeg_read_header(&context->cinfo, FALSE);
-
-	} while (ok == JPEG_HEADER_TABLES_ONLY);
-
-	if (ok == JPEG_SUSPENDED)
-	    break;
-
-	/* Decoder settings */
-
-	/* jpegmode indicates whats in the file; if not set, we'll
-	   trust the decoder */
-	if (strcmp(context->jpegmode, "L") == 0)
-	    context->cinfo.jpeg_color_space = JCS_GRAYSCALE;
-	else if (strcmp(context->jpegmode, "RGB") == 0)
-	    context->cinfo.jpeg_color_space = JCS_RGB;
-	else if (strcmp(context->jpegmode, "CMYK") == 0)
-	    context->cinfo.jpeg_color_space = JCS_CMYK;
-	else if (strcmp(context->jpegmode, "YCbCr") == 0)
-	    context->cinfo.jpeg_color_space = JCS_YCbCr;
-	else if (strcmp(context->jpegmode, "YCbCrK") == 0) {
-	    context->cinfo.jpeg_color_space = JCS_YCCK;
-	}
-
-	/* rawmode indicates what we want from the decoder.  if not
-	   set, conversions are disabled */
-	if (strcmp(context->rawmode, "L") == 0)
-	    context->cinfo.out_color_space = JCS_GRAYSCALE;
-	else if (strcmp(context->rawmode, "RGB") == 0)
-	    context->cinfo.out_color_space = JCS_RGB;
-	else if (strcmp(context->rawmode, "CMYK") == 0)
-	    context->cinfo.out_color_space = JCS_CMYK;
-	else if (strcmp(context->rawmode, "YCbCr") == 0)
-	    context->cinfo.out_color_space = JCS_YCbCr;
-	else if (strcmp(context->rawmode, "YCbCrK") == 0)
-	    context->cinfo.out_color_space = JCS_YCCK;
-	else {
-	    /* Disable decoder conversions */
-	    context->cinfo.jpeg_color_space = JCS_UNKNOWN;
-	    context->cinfo.out_color_space = JCS_UNKNOWN;
-	}
-
-	if (context->scale > 1) {
-	    context->cinfo.scale_num = 1;
-	    context->cinfo.scale_denom = context->scale;
-	}
-	if (context->draft) {
-	    context->cinfo.do_fancy_upsampling = FALSE;
-	    context->cinfo.dct_method = JDCT_FASTEST;
-	}
-
-        state->state++;
-	/* fall through */
-
-    case 2:
-
-        /* Set things up for decompression (this processes the entire
-           file if necessary to return data line by line) */
-	if (!jpeg_start_decompress(&context->cinfo))
-            break;
-        
-	state->state++;
-	/* fall through */
-
-    case 3:
-
-	/* Decompress a single line of data */
-	ok = 1;
-	while (state->y < state->ysize) {
-	    ok = jpeg_read_scanlines(&context->cinfo, &state->buffer, 1);
-	    if (ok != 1)
-		break;
-	    state->shuffle((UINT8*) im->image[state->y + state->yoff] +
-			   state->xoff * im->pixelsize, state->buffer,
-			   state->xsize);
-	    state->y++;
-	}
-	if (ok != 1)
-	    break;
-	state->state++;
-	/* fall through */
-
-    case 4:
-
-	/* Finish decompression */
-	if (!jpeg_finish_decompress(&context->cinfo)) {
-            /* FIXME: add strictness mode test */
-            if (state->y < state->ysize)
-                break;
-        }
-
-	/* Clean up */
-	jpeg_destroy_decompress(&context->cinfo);
-	/* if (jerr.pub.num_warnings) return BROKEN; */
-	return -1;
-
-    }
-
-    /* Return number of bytes consumed */
-    return context->source.pub.next_input_byte - buf; 
-
-}
-
-#endif
-
diff --git a/pythonPackages/pil/libImaging/JpegEncode.c b/pythonPackages/pil/libImaging/JpegEncode.c
deleted file mode 100644
index 6bedcd8037..0000000000
--- a/pythonPackages/pil/libImaging/JpegEncode.c
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: JpegEncode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * coder for JPEG data
- *
- * history:
- * 1996-05-06 fl   created
- * 1996-07-16 fl   don't drop last block of encoded data
- * 1996-12-30 fl   added quality and progressive settings
- * 1997-01-08 fl   added streamtype settings
- * 1998-01-31 fl   adapted to libjpeg 6a
- * 1998-07-12 fl   added YCbCr support
- * 2001-04-16 fl   added DPI write support
- *
- * Copyright (c) 1997-2001 by Secret Labs AB
- * Copyright (c) 1995-1997 by Fredrik Lundh
- *
- * See the README file for details on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#ifdef	HAVE_LIBJPEG
-
-#undef HAVE_PROTOTYPES 
-#undef HAVE_STDLIB_H 
-#undef HAVE_STDDEF_H 
-#undef UINT8
-#undef UINT16
-#undef UINT32
-#undef INT16
-#undef INT32
-
-#include "Jpeg.h"
-
-/* -------------------------------------------------------------------- */
-/* Suspending output handler						*/
-/* -------------------------------------------------------------------- */
-
-METHODDEF(void)
-stub(j_compress_ptr cinfo)
-{
-    /* empty */
-}
-
-METHODDEF(boolean)
-empty_output_buffer (j_compress_ptr cinfo)
-{
-    /* Suspension */
-    return FALSE;
-}
-
-GLOBAL(void)
-jpeg_buffer_dest(j_compress_ptr cinfo, JPEGDESTINATION* destination)
-{
-    cinfo->dest = (void*) destination;
-
-    destination->pub.init_destination = stub;
-    destination->pub.empty_output_buffer = empty_output_buffer;
-    destination->pub.term_destination = stub;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* Error handler							*/
-/* -------------------------------------------------------------------- */
-
-METHODDEF(void)
-error(j_common_ptr cinfo)
-{
-  JPEGERROR* error;
-  error = (JPEGERROR*) cinfo->err;
-  (*cinfo->err->output_message) (cinfo);
-  longjmp(error->setjmp_buffer, 1);
-}
-
-
-/* -------------------------------------------------------------------- */
-/* Encoder								*/
-/* -------------------------------------------------------------------- */
-
-int
-ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    JPEGENCODERSTATE* context = (JPEGENCODERSTATE*) state->context;
-    int ok;
-
-    if (setjmp(context->error.setjmp_buffer)) {
-	/* JPEG error handler */
-	jpeg_destroy_compress(&context->cinfo);
-	state->errcode = IMAGING_CODEC_BROKEN;
-	return -1;
-    }
-
-    if (!state->state) {
-
-	/* Setup compression context (very similar to the decoder) */
-	context->cinfo.err = jpeg_std_error(&context->error.pub);
-	context->error.pub.error_exit = error;
-	jpeg_create_compress(&context->cinfo);
-	jpeg_buffer_dest(&context->cinfo, &context->destination);
-
-	/* Ready to encode */
-	state->state = 1;
-
-    }
-
-    /* Load the destination buffer */
-    context->destination.pub.next_output_byte = buf;
-    context->destination.pub.free_in_buffer = bytes;
-
-    switch (state->state) {
-
-    case 1:
-
-	context->cinfo.image_width = state->xsize;
-	context->cinfo.image_height = state->ysize;
-
-	switch (state->bits) {
-        case 8:
-            context->cinfo.input_components = 1;
-            context->cinfo.in_color_space = JCS_GRAYSCALE;
-            break;
-        case 24:
-            context->cinfo.input_components = 3;
-            if (strcmp(im->mode, "YCbCr") == 0)
-                context->cinfo.in_color_space = JCS_YCbCr;
-            else
-                context->cinfo.in_color_space = JCS_RGB;
-            break;
-        case 32:
-            context->cinfo.input_components = 4;
-            context->cinfo.in_color_space = JCS_CMYK;
-            break;
-        default:
-            state->errcode = IMAGING_CODEC_CONFIG;
-            return -1;
-	}
-
-	/* Compressor configuration */
-	jpeg_set_defaults(&context->cinfo);
-	if (context->quality > 0)
-	    jpeg_set_quality(&context->cinfo, context->quality, 1);
-	if (context->progressive)
-	    jpeg_simple_progression(&context->cinfo);
-	context->cinfo.smoothing_factor = context->smooth;
-	context->cinfo.optimize_coding = (boolean) context->optimize;
-        if (context->xdpi > 0 && context->ydpi > 0) {
-            context->cinfo.density_unit = 1; /* dots per inch */
-            context->cinfo.X_density = context->xdpi;
-            context->cinfo.Y_density = context->ydpi;
-        }
-	switch (context->streamtype) {
-	case 1:
-	    /* tables only -- not yet implemented */
-	    state->errcode = IMAGING_CODEC_CONFIG;
-	    return -1;
-	case 2:
-	    /* image only */
-	    jpeg_suppress_tables(&context->cinfo, TRUE);
-	    jpeg_start_compress(&context->cinfo, FALSE);
-	    break;
-	default:
-	    /* interchange stream */
-	    jpeg_start_compress(&context->cinfo, TRUE);
-	    break;
-	}
-	state->state++;
-	/* fall through */
-
-    case 2:
-
-	ok = 1;
-	while (state->y < state->ysize) {
-	    state->shuffle(state->buffer,
-			   (UINT8*) im->image[state->y + state->yoff] +
-			   state->xoff * im->pixelsize, state->xsize);
-	    ok = jpeg_write_scanlines(&context->cinfo, &state->buffer, 1);
-	    if (ok != 1)
-		break;
-	    state->y++;
-	}
-
-	if (ok != 1)
-	    break;
-	state->state++;
-	/* fall through */
-
-    case 3:
-
-	/* Finish compression */
-	if (context->destination.pub.free_in_buffer < 100)
-	    break;
-	jpeg_finish_compress(&context->cinfo);
-
-	/* Clean up */
-	jpeg_destroy_compress(&context->cinfo);
-	/* if (jerr.pub.num_warnings) return BROKEN; */
-	state->errcode = IMAGING_CODEC_END;
-	break;
-
-    }
-
-    /* Return number of bytes in output buffer */
-    return context->destination.pub.next_output_byte - buf;
-
-}
-
-#endif
diff --git a/pythonPackages/pil/libImaging/Lzw.h b/pythonPackages/pil/libImaging/Lzw.h
deleted file mode 100644
index 3e6faa2e11..0000000000
--- a/pythonPackages/pil/libImaging/Lzw.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: Lzw.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * declarations for the TIFF LZW decoder.
- *
- * Copyright (c) Fredrik Lundh 1995-96.
- */
-
-
-/* Max size for LZW code words */
-
-#define	LZWBITS	    12
-
-#define	LZWTABLE    (1<<LZWBITS)
-#define	LZWBUFFER   (1<<LZWBITS)
-
-
-typedef struct {
-
-    /* CONFIGURATION */
-
-    /* Filter type */
-    int filter;
-
-    /* PRIVATE CONTEXT (set by decoder) */
-
-    /* Input bit buffer */
-    INT32 bitbuffer;
-    int bitcount;
-
-    /* Code buffer */
-    int codesize;
-    int codemask;
-
-    /* Constant symbol codes */
-    int clear, end;
-
-    /* Symbol history */
-    int lastcode;
-    unsigned char lastdata;
-
-    /* History buffer */
-    int bufferindex;
-    unsigned char buffer[LZWTABLE];
-
-    /* Symbol table */
-    unsigned INT16 link[LZWTABLE];
-    unsigned char data[LZWTABLE];
-    int next;
-
-} LZWSTATE;
diff --git a/pythonPackages/pil/libImaging/LzwDecode.c b/pythonPackages/pil/libImaging/LzwDecode.c
deleted file mode 100644
index adbaf46b04..0000000000
--- a/pythonPackages/pil/libImaging/LzwDecode.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: LzwDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * a fast, suspendable TIFF LZW decoder
- *
- * description:
- *	This code is based on the GIF decoder.  There are some
- *	subtle differences between GIF and TIFF LZW, though:
- *	- The fill order is different. In the TIFF file, you
- *	  must shift new bits in to the right, not to the left.
- *	- There is no blocking in the input data stream.
- *	- The code size is increased one step earlier than
- *	  for GIF
- *	- Image data are seen as a byte stream, not a pixel
- *	  stream. This means that the code size will always
- *	  start at 9 bits.
- *
- * history:
- *	95-09-13 fl	Created (derived from GifDecode.c)
- *	96-03-28 fl	Revised API, integrated with PIL
- *	97-01-05 fl	Added filter support, added extra consistency checks
- *
- * Copyright (c) Fredrik Lundh 1995-97.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#include <stdio.h>
-#include <stdlib.h>	/* memcpy() */
-
-#include "Lzw.h"
-
-
-int
-ImagingLzwDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    UINT8* p;
-    int c, i;
-    int thiscode;
-    LZWSTATE* context = (LZWSTATE*) state->context;
-
-    unsigned char *ptr = buf;
-
-    if (!state->state) {
-
-	/* Clear code */
-	context->clear = 1 << 8;
-
-	/* End code */
-	context->end = context->clear + 1;
-
-	state->state = 1;
-    }
-
-    for (;;) {
-
-	if (state->state == 1) {
-
-	    /* First free entry in table */
-	    context->next = context->clear + 2;
-
-	    /* Initial code size */
-	    context->codesize = 8 + 1;
-	    context->codemask = (1 << context->codesize) - 1;
-
-	    /* Buffer pointer.  We fill the buffer from right, which
-	       allows us to return all of it in one operation. */
-	    context->bufferindex = LZWBUFFER;
-
-	    state->state = 2;
-	}
-
-	if (context->bufferindex < LZWBUFFER) {
-
-	    /* Return whole buffer in one chunk */
-	    i = LZWBUFFER - context->bufferindex;
-	    p = &context->buffer[context->bufferindex];
-
-	    context->bufferindex = LZWBUFFER;
-
-	} else {
-
-	    /* Get current symbol */
-	    while (context->bitcount < context->codesize) {
-
-		if (bytes < 1)
-		    return ptr - buf;;
-
-		/* Read next byte */
-		c = *ptr++; bytes--;
-
-		/* New bits are shifted in from from the right. */
-		context->bitbuffer = (context->bitbuffer << 8) | c;
-		context->bitcount += 8;
-
-	    }
-
-	    /* Extract current symbol from bit buffer. */
-	    c = (context->bitbuffer >> (context->bitcount -
-					 context->codesize))
-		& context->codemask;
-
-	    /* Adjust buffer */
-	    context->bitcount -= context->codesize;
-
-	    /* If c is less than clear, it's a data byte.  Otherwise,
-	       it's either clear/end or a code symbol which should be
-	       expanded. */
-
-	    if (c == context->clear) {
-		if (state->state != 2)
-		    state->state = 1;
-		continue;
-	    }
-
-	    if (c == context->end)
-		break;
-
-	    i = 1;
-	    p = &context->lastdata;
-
-	    if (state->state == 2) {
-
-		/* First valid symbol after clear; use as is */
-		if (c > context->clear) {
-		    state->errcode = IMAGING_CODEC_BROKEN;
-		    return -1;
-		}
-
-		context->lastdata = context->lastcode = c;
-		state->state = 3;
-
-	    } else {
-
-		thiscode = c;
-
-		if (c > context->next) {
-		    state->errcode = IMAGING_CODEC_BROKEN;
-		    return -1;
-		}
-
-		if (c == context->next) {
-
-		    /* c == next is allowed, by some strange reason */
-		    if (context->bufferindex <= 0) {
-			state->errcode = IMAGING_CODEC_BROKEN;
-			return -1;
-		    }
-
-		    context->buffer[--context->bufferindex] = context->lastdata;
-		    c = context->lastcode;
-		}
-
-		while (c >= context->clear) {
-
-		    /* Copy data string to buffer (beginning from right) */
-
-		    if (context->bufferindex <= 0 || c >= LZWTABLE) {
-			state->errcode = IMAGING_CODEC_BROKEN;
-			return -1;
-		    }
-
-		    context->buffer[--context->bufferindex] =
-			context->data[c];
-		    c = context->link[c];
-		}
-
-		context->lastdata = c;
-
-		if (context->next < LZWTABLE) {
-
-		    /* While we still have room for it, add this
-		       symbol to the table. */
-		    context->data[context->next] = c;
-		    context->link[context->next] = context->lastcode;
-
-		    context->next++;
-
-		    if (context->next == context->codemask &&
-			context->codesize < LZWBITS) {
-
-			/* Expand code size */
-			context->codesize++;
-			context->codemask = (1 << context->codesize) - 1;
-
-		    }
-		}
-		context->lastcode = thiscode;
-	    }
-	}
-
-	/* Update the output image */
-	for (c = 0; c < i; c++) {
-
-	    state->buffer[state->x] = p[c];
-
-	    if (++state->x >= state->bytes) {
-
-		int x, bpp;
-
-		/* Apply filter */
-		switch (context->filter) {
-		case 2:
-		    /* Horizontal differing ("prior") */
-		    bpp = (state->bits + 7) / 8;
-		    for (x = bpp; x < state->bytes; x++)
-			state->buffer[x] += state->buffer[x-bpp];
-		}
-
-		/* Got a full line, unpack it */
-		state->shuffle((UINT8*) im->image[state->y + state->yoff] +
-			       state->xoff * im->pixelsize, state->buffer,
-			       state->xsize);
-
-		state->x = 0;
-
-		if (++state->y >= state->ysize)
-		    /* End of file (errcode = 0) */
-		    return -1;
-	    }
-	}
-    }
-
-    return ptr - buf;
-}
diff --git a/pythonPackages/pil/libImaging/Matrix.c b/pythonPackages/pil/libImaging/Matrix.c
deleted file mode 100644
index 08010a78a2..0000000000
--- a/pythonPackages/pil/libImaging/Matrix.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Matrix.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * colour and luminance matrix transforms
- *
- * history:
- * 1996-05-18 fl:   created (brute force implementation)
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-#define	CLIPF(v) ((v <= 0.0) ? 0 : (v >= 255.0F) ? 255 : (UINT8) v)
-
-
-Imaging
-ImagingConvertMatrix(Imaging im, const char *mode, float m[])
-{
-    Imaging imOut;
-    int x, y;
-
-    /* Assume there's enough data in the buffer */
-    if (!im)
-	return (Imaging) ImagingError_ModeError();
-
-    if (strcmp(mode, "L") == 0 && im->bands == 3) {
-
-	imOut = ImagingNew("L", im->xsize, im->ysize);
-	if (!imOut)
-	    return NULL;
-
-	for (y = 0; y < im->ysize; y++) {
-	    UINT8* in = (UINT8*) im->image[y];
-	    UINT8* out = (UINT8*) imOut->image[y];
-
-	    for (x = 0; x < im->xsize; x++) {
-		float v = m[0]*in[0] + m[1]*in[1] + m[2]*in[2] + m[3] + 0.5;
-		out[x] = CLIPF(v);
-		in += 4;
-	    }
-	}
-
-    } else if (strlen(mode) == 3 && im->bands == 3) {
-
-	imOut = ImagingNew(mode, im->xsize, im->ysize);
-	if (!imOut)
-	    return NULL;
-
-	for (y = 0; y < im->ysize; y++) {
-	    UINT8* in = (UINT8*) im->image[y];
-	    UINT8* out = (UINT8*) imOut->image[y];
-
-	    for (x = 0; x < im->xsize; x++) {
-		float v0 = m[0]*in[0] + m[1]*in[1] +  m[2]*in[2] +  m[3] + 0.5;
-		float v1 = m[4]*in[0] + m[5]*in[1] +  m[6]*in[2] +  m[7] + 0.5;
-		float v2 = m[8]*in[0] + m[9]*in[1] + m[10]*in[2] + m[11] + 0.5;
-		out[0] = CLIPF(v0);
-		out[1] = CLIPF(v1);
-		out[2] = CLIPF(v2);
-		in += 4; out += 4;
-	    }
-	}
-    } else
-	return (Imaging) ImagingError_ModeError();
-
-    return imOut;
-}
diff --git a/pythonPackages/pil/libImaging/ModeFilter.c b/pythonPackages/pil/libImaging/ModeFilter.c
deleted file mode 100644
index b3a9045130..0000000000
--- a/pythonPackages/pil/libImaging/ModeFilter.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: ModeFilter.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * mode filter
- *
- * history:
- * 2002-06-08 fl    Created (based on code from IFUNC95)
- * 2004-10-05 fl    Rewritten; use a simpler brute-force algorithm
- *
- * Copyright (c) Secret Labs AB 2002-2004.  All rights reserved.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Imaging.h"
-
-Imaging
-ImagingModeFilter(Imaging im, int size)
-{
-    Imaging imOut;
-    int x, y, i;
-    int xx, yy;
-    int maxcount;
-    UINT8 maxpixel;
-    int histogram[256];
-
-    if (!im || im->bands != 1 || im->type != IMAGING_TYPE_UINT8)
-	return (Imaging) ImagingError_ModeError();
-
-    imOut = ImagingNew(im->mode, im->xsize, im->ysize);
-    if (!imOut)
-	return NULL;
-
-    size = size / 2;
-
-    for (y = 0; y < imOut->ysize; y++) {
-        UINT8* out = &IMAGING_PIXEL_L(imOut, 0, y);
-        for (x = 0; x < imOut->xsize; x++) {
-
-            /* calculate histogram over current area */
-
-            /* FIXME: brute force! to improve, update the histogram
-               incrementally.  may also add a "frequent list", like in
-               the old implementation, but I'm not sure that's worth
-               the added complexity... */
-
-            memset(histogram, 0, sizeof(histogram));
-            for (yy = y - size; yy <= y + size; yy++)
-                if (yy >= 0 && yy < imOut->ysize) {
-                    UINT8* in = &IMAGING_PIXEL_L(im, 0, yy);
-                    for (xx = x - size; xx <= x + size; xx++)
-                        if (xx >= 0 && xx < imOut->xsize)
-                            histogram[in[xx]]++;
-                }
-
-            /* find most frequent pixel value in this region */
-            maxpixel = 0;
-            maxcount = histogram[maxpixel];
-            for (i = 1; i < 256; i++)
-                if (histogram[i] > maxcount) {
-                    maxcount = histogram[i];
-                    maxpixel = (UINT8) i;
-                }
-
-            if (maxcount > 2)
-                out[x] = maxpixel;
-            else
-                out[x] = IMAGING_PIXEL_L(im, x, y);
-
-        }
-        
-    }
-
-    ImagingCopyInfo(imOut, im);
-
-    return imOut;
-}
diff --git a/pythonPackages/pil/libImaging/MspDecode.c b/pythonPackages/pil/libImaging/MspDecode.c
deleted file mode 100644
index af2b842461..0000000000
--- a/pythonPackages/pil/libImaging/MspDecode.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: MspDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for MSP version 2 data.
- *
- * history:
- *	97-01-03 fl	Created
- *
- * Copyright (c) Fredrik Lundh 1997.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-int
-ImagingMspDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    int n;
-    UINT8* ptr;
-
-    ptr = buf;
-
-    for (;;) {
-
-	if (bytes < 1)
-	    return ptr - buf;
-
-	if (ptr[0] == 0) {
-
-	    /* Run (3 bytes block) */
-	    if (bytes < 3)
-		break;
-
-	    n = ptr[1];
-
-	    if (state->x + n > state->bytes) {
-		state->errcode = IMAGING_CODEC_OVERRUN;
-		return -1;
-	    }
-
-	    memset(state->buffer + state->x, ptr[2], n);
-
-	    ptr += 3;
-	    bytes -= 3;
-
-	} else {
-
-	    /* Literal (1+n bytes block) */
-	    n = ptr[0];
-
-	    if (bytes < 1 + n)
-		break;
-
-	    if (state->x + n > state->bytes) {
-		state->errcode = IMAGING_CODEC_OVERRUN;
-		return -1;
-	    }
-
-	    memcpy(state->buffer + state->x, ptr + 1, n);
-
-	    ptr += 1 + n;
-	    bytes -= 1 + n;
-
-	}
-
-	state->x += n;
-
-	if (state->x >= state->bytes) {
-
-	    /* Got a full line, unpack it */
-	    state->shuffle((UINT8*) im->image[state->y + state->yoff] +
-			   state->xoff * im->pixelsize, state->buffer,
-			   state->xsize);
-
-	    state->x = 0;
-
-	    if (++state->y >= state->ysize) {
-		/* End of file (errcode = 0) */
-		return -1;
-	    }
-	}
-
-    }
-
-    return ptr - buf;
-}
diff --git a/pythonPackages/pil/libImaging/Negative.c b/pythonPackages/pil/libImaging/Negative.c
deleted file mode 100644
index 1255525a39..0000000000
--- a/pythonPackages/pil/libImaging/Negative.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Negative.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * negate image
- *
- * to do:
- *      FIXME: Maybe this should be implemented using ImagingPoint()
- *
- * history:
- *	95-11-27 fl:	Created
- *
- * Copyright (c) Fredrik Lundh 1995.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-Imaging
-ImagingNegative(Imaging im)
-{
-    Imaging imOut;
-    int x, y;
-
-    if (!im)
-	return (Imaging) ImagingError_ModeError();
-
-    imOut = ImagingNew(im->mode, im->xsize, im->ysize);
-    if (!imOut)
-	return NULL;
-
-    for (y = 0; y < im->ysize; y++)
-	for (x = 0; x < im->linesize; x++)
-	     imOut->image[y][x] = ~im->image[y][x];
-
-    return imOut;
-}
-
diff --git a/pythonPackages/pil/libImaging/Offset.c b/pythonPackages/pil/libImaging/Offset.c
deleted file mode 100644
index 7e5ac1499a..0000000000
--- a/pythonPackages/pil/libImaging/Offset.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Offset.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * offset an image in x and y directions
- *
- * history:
- * 96-07-22 fl:	Created
- * 98-11-01 cgw@pgt.com: Fixed negative-array index bug
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-Imaging
-ImagingOffset(Imaging im, int xoffset, int yoffset)
-{
-    int x, y;
-    Imaging imOut;
-
-    if (!im)
-	return (Imaging) ImagingError_ModeError();
-
-    imOut = ImagingNew(im->mode, im->xsize, im->ysize);
-    if (!imOut)
-	return NULL;
-
-    ImagingCopyInfo(imOut, im);
-
-    /* make offsets positive to avoid negative coordinates */
-    xoffset %= im->xsize;
-    xoffset = im->xsize - xoffset;
-    if (xoffset < 0)
-	xoffset += im->xsize;
-
-    yoffset %= im->ysize;
-    yoffset = im->ysize - yoffset;
-    if (yoffset < 0)
-	yoffset += im->ysize;
-
-#define	OFFSET(image)\
-    for (y = 0; y < im->ysize; y++)\
-	for (x = 0; x < im->xsize; x++) {\
-	    int yi = (y + yoffset) % im->ysize;\
-	    int xi = (x + xoffset) % im->xsize;\
-	    imOut->image[y][x] = im->image[yi][xi];\
-	}
-
-    if (im->image8)
-	OFFSET(image8)
-    else
-	OFFSET(image32)
-
-    return imOut;
-}
diff --git a/pythonPackages/pil/libImaging/Pack.c b/pythonPackages/pil/libImaging/Pack.c
deleted file mode 100644
index 8e261f6218..0000000000
--- a/pythonPackages/pil/libImaging/Pack.c
+++ /dev/null
@@ -1,531 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: Pack.c 2763 2006-06-22 21:43:28Z fredrik $
- *
- * code to pack raw data
- *
- * history:
- * 1996-04-30 fl   Created
- * 1996-05-12 fl   Published a few RGB packers
- * 1996-11-01 fl   More RGB packers (Tk booster stuff)
- * 1996-12-30 fl   Added P;1, P;2 and P;4 packers
- * 1997-06-02 fl   Added F (F;32NF) packer
- * 1997-08-28 fl   Added 1 as L packer
- * 1998-02-08 fl   Added I packer
- * 1998-03-09 fl   Added mode field, RGBA/RGBX as RGB packers
- * 1998-07-01 fl   Added YCbCr support
- * 1998-07-12 fl   Added I 16 packer
- * 1999-02-03 fl   Added BGR packers
- * 2003-09-26 fl   Added LA/PA packers
- * 2006-06-22 fl   Added CMYK;I packer
- *
- * Copyright (c) 1997-2006 by Secret Labs AB.
- * Copyright (c) 1996-1997 by Fredrik Lundh.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#define	R 0
-#define	G 1
-#define	B 2
-#define	X 3
-#define	A 3
-
-#define	C 0
-#define	M 1
-#define	Y 2
-#define	K 3
-
-/* byte swapping macros */
-
-#define C16N\
-        (out[0]=tmp[0], out[1]=tmp[1]);
-#define C16S\
-        (out[1]=tmp[0], out[0]=tmp[1]);
-#define C32N\
-        (out[0]=tmp[0], out[1]=tmp[1], out[2]=tmp[2], out[3]=tmp[3]);
-#define C32S\
-        (out[3]=tmp[0], out[2]=tmp[1], out[1]=tmp[2], out[0]=tmp[3]);
-#define C64N\
-        (out[0]=tmp[0], out[1]=tmp[1], out[2]=tmp[2], out[3]=tmp[3],\
-         out[4]=tmp[4], out[5]=tmp[5], out[6]=tmp[6], out[7]=tmp[7]);
-#define C64S\
-        (out[7]=tmp[0], out[6]=tmp[1], out[5]=tmp[2], out[4]=tmp[3],\
-         out[3]=tmp[4], out[2]=tmp[5], out[1]=tmp[6], out[0]=tmp[7]);
-
-#ifdef WORDS_BIGENDIAN
-#define C16B C16N
-#define C16L C16S
-#define C32B C32N
-#define C32L C32S
-#define C64B C64N
-#define C64L C64S
-#else
-#define C16B C16S
-#define C16L C16N
-#define C32B C32S
-#define C32L C32N
-#define C64B C64S
-#define C64L C64N
-#endif
-
-static void
-pack1(UINT8* out, const UINT8* in, int pixels)
-{
-    int i, m, b;
-    /* bilevel (black is 0) */
-    b = 0; m = 128;
-    for (i = 0; i < pixels; i++) {
-	if (in[i] != 0)
-	    b |= m;
-	m >>= 1;
-	if (m == 0) {
-	    *out++ = b;
-	    b = 0; m = 128;
-	}
-    }
-    if (m != 128)
-	*out++ = b;
-}
-
-static void
-pack1I(UINT8* out, const UINT8* in, int pixels)
-{
-    int i, m, b;
-    /* bilevel (black is 1) */
-    b = 0; m = 128;
-    for (i = 0; i < pixels; i++) {
-	if (in[i] == 0)
-	    b |= m;
-	m >>= 1;
-	if (m == 0) {
-	    *out++ = b;
-	    b = 0; m = 128;
-	}
-    }
-    if (m != 128)
-	*out++ = b;
-}
-
-static void
-pack1R(UINT8* out, const UINT8* in, int pixels)
-{
-    int i, m, b;
-    /* bilevel, lsb first (black is 0) */
-    b = 0; m = 1;
-    for (i = 0; i < pixels; i++) {
-	if (in[i] != 0)
-	    b |= m;
-	m <<= 1;
-	if (m == 256){
-	    *out++ = b;
-	    b = 0; m = 1;
-	}
-    }
-    if (m != 1)
-	*out++ = b;
-}
-
-static void
-pack1IR(UINT8* out, const UINT8* in, int pixels)
-{
-    int i, m, b;
-    /* bilevel, lsb first (black is 1) */
-    b = 0; m = 1;
-    for (i = 0; i < pixels; i++) {
-	if (in[i] == 0)
-	    b |= m;
-	m <<= 1;
-	if (m == 256){
-	    *out++ = b;
-	    b = 0; m = 1;
-	}
-    }
-    if (m != 1)
-	*out++ = b;
-}
-
-static void
-pack1L(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* bilevel, stored as bytes */
-    for (i = 0; i < pixels; i++)
-	out[i] = (in[i] != 0) ? 255 : 0;
-}
-
-static void
-packP4(UINT8* out, const UINT8* in, int pixels)
-{
-    while (pixels >= 2) {
-	*out++ = (in[0] << 4) |
-		 (in[1] & 15);
-	in += 2; pixels -= 2;
-    }
-
-    if (pixels)
-	out[0] = (in[0] << 4);
-}
-
-static void
-packP2(UINT8* out, const UINT8* in, int pixels)
-{
-    while (pixels >= 4) {
-	*out++ = (in[0] << 6) |
-		 ((in[1] & 3) << 4) |
-		 ((in[2] & 3) << 2) |
-		 (in[3] & 3);
-	in += 4; pixels -= 4;
-    }
-
-    switch (pixels) {
-    case 3:
-	out[0] = (in[0] << 6) |
-		 ((in[1] & 3) << 4) |
-		 ((in[2] & 3) << 2);
-	break;
-    case 2:
-	out[0] = (in[0] << 6) |
-		 ((in[1] & 3) << 4);
-    case 1:
-	out[0] = (in[0] << 6);
-    }
-}
-
-static void
-packLA(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* LA, pixel interleaved */
-    for (i = 0; i < pixels; i++) {
-	out[0] = in[R];
-	out[1] = in[A];
-	out += 2; in += 4;
-    }
-}
-
-static void
-packLAL(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* LA, line interleaved */
-    for (i = 0; i < pixels; i++) {
-	out[i] = in[R];
-	out[i+pixels] = in[A];
-	in += 4;
-    }
-}
-
-void
-ImagingPackRGB(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB triplets */
-    for (i = 0; i < pixels; i++) {
-	out[0] = in[R];
-	out[1] = in[G];
-	out[2] = in[B];
-	out += 3; in += 4;
-    }
-}
-
-void
-ImagingPackXRGB(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* XRGB, triplets with left padding */
-    for (i = 0; i < pixels; i++) {
-	out[0] = 0;
-	out[1] = in[R];
-	out[2] = in[G];
-	out[3] = in[B];
-	out += 4; in += 4;
-    }
-}
-
-void
-ImagingPackBGR(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB, reversed bytes */
-    for (i = 0; i < pixels; i++) {
-	out[0] = in[B];
-	out[1] = in[G];
-	out[2] = in[R];
-	out += 3; in += 4;
-    }
-}
-
-void
-ImagingPackBGRX(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* BGRX, reversed bytes with right padding */
-    for (i = 0; i < pixels; i++) {
-	out[0] = in[B];
-	out[1] = in[G];
-	out[2] = in[R];
-	out[3] = 0;
-	out += 4; in += 4;
-    }
-}
-
-void
-ImagingPackXBGR(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* XBGR, reversed bytes with left padding */
-    for (i = 0; i < pixels; i++) {
-	out[0] = 0;
-	out[1] = in[B];
-	out[2] = in[G];
-	out[3] = in[R];
-	out += 4; in += 4;
-    }
-}
-
-static void
-packRGBL(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB, line interleaved */
-    for (i = 0; i < pixels; i++) {
-	out[i] = in[R];
-	out[i+pixels] = in[G];
-	out[i+pixels+pixels] = in[B];
-	in += 4;
-    }
-}
-
-static void
-packRGBXL(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGBX, line interleaved */
-    for (i = 0; i < pixels; i++) {
-	out[i] = in[R];
-	out[i+pixels] = in[G];
-	out[i+pixels+pixels] = in[B];
-	out[i+pixels+pixels+pixels] = in[X];
-	in += 4;
-    }
-}
-
-static void
-packI16B(UINT8* out, const UINT8* in_, int pixels)
-{
-    int i;
-    INT32* in = (INT32*) in_;
-    UINT16 tmp_;
-    UINT8* tmp = (UINT8*) &tmp_;
-    for (i = 0; i < pixels; i++) {
-        if (in[0] <= 0)
-            tmp_ = 0;
-        else if (in[0] > 65535)
-            tmp_ = 65535;
-        else
-            tmp_ = in[0];
-        C16B;
-	out += 2; in++;
-    }
-}
-
-static void
-packI32S(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    UINT8* tmp = (UINT8*) in;
-    for (i = 0; i < pixels; i++) {
-        C32L;
-	out += 4; tmp += 4;
-    }
-}
-
-static void
-copy1(UINT8* out, const UINT8* in, int pixels)
-{
-    /* L, P */
-    memcpy(out, in, pixels);
-}
-
-static void
-copy2(UINT8* out, const UINT8* in, int pixels)
-{
-    /* I;16, etc */
-    memcpy(out, in, pixels*2);
-}
-
-static void
-copy3(UINT8* out, const UINT8* in, int pixels)
-{
-    /* BGR;24, etc */
-    memcpy(out, in, pixels*3);
-}
-
-static void
-copy4(UINT8* out, const UINT8* in, int pixels)
-{
-    /* RGBA, CMYK quadruples */
-    memcpy(out, in, 4*pixels);
-}
-
-static void
-copy4I(UINT8* out, const UINT8* in, int pixels)
-{
-    /* RGBA, CMYK quadruples, inverted */
-    int i;
-    for (i = 0; i < pixels*4; i++)
-	out[i] = ~in[i];
-}
-
-static void
-band0(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    for (i = 0; i < pixels; i++, in += 4)
-	out[i] = in[0];
-}
-
-static void
-band1(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    for (i = 0; i < pixels; i++, in += 4)
-	out[i] = in[1];
-}
-
-static void
-band2(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    for (i = 0; i < pixels; i++, in += 4)
-	out[i] = in[2];
-}
-
-static void
-band3(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    for (i = 0; i < pixels; i++, in += 4)
-	out[i] = in[3];
-}
-
-static struct {
-    const char* mode;
-    const char* rawmode;
-    int bits;
-    ImagingShuffler pack;
-} packers[] = {
-
-    /* bilevel */
-    {"1",	"1",   		1,	pack1},
-    {"1",	"1;I",   	1,	pack1I},
-    {"1",	"1;R",   	1,	pack1R},
-    {"1",	"1;IR",   	1,	pack1IR},
-    {"1",	"L",		8,	pack1L},
-
-    /* greyscale */
-    {"L",	"L",   		8,	copy1},
-
-    /* greyscale w. alpha */
-    {"LA",	"LA",  		16,	packLA},
-    {"LA",	"LA;L",		16,	packLAL},
-
-    /* palette */
-    {"P",	"P;1",		1,	pack1},
-    {"P",	"P;2",		2,	packP2},
-    {"P",	"P;4",		4,	packP4},
-    {"P",	"P",		8,	copy1},
-
-    /* palette w. alpha */
-    {"PA",	"PA",  		16,	packLA},
-    {"PA",	"PA;L",		16,	packLAL},
-
-    /* true colour */
-    {"RGB",	"RGB",		24,	ImagingPackRGB},
-    {"RGB",	"RGBX",		32,	copy4},
-    {"RGB",	"XRGB",		32,	ImagingPackXRGB},
-    {"RGB",	"BGR",		24,	ImagingPackBGR},
-    {"RGB",	"BGRX",		32,	ImagingPackBGRX},
-    {"RGB",	"XBGR",		32,	ImagingPackXBGR},
-    {"RGB",	"RGB;L",	24,	packRGBL},
-    {"RGB",   	"R",            8,      band0},
-    {"RGB",   	"G",            8,      band1},
-    {"RGB",   	"B",            8,      band2},
-
-    /* true colour w. alpha */
-    {"RGBA",	"RGBA",		32,	copy4},
-    {"RGBA",	"RGBA;L",	32,	packRGBXL},
-    {"RGBA",	"RGB",		24,	ImagingPackRGB},
-    {"RGBA",   	"R",            8,      band0},
-    {"RGBA",   	"G",            8,      band1},
-    {"RGBA",   	"B",            8,      band2},
-    {"RGBA",   	"A",            8,      band3},
-
-    /* true colour w. padding */
-    {"RGBX",	"RGBX",		32,	copy4},
-    {"RGBX",	"RGBX;L",	32,	packRGBXL},
-    {"RGBX",	"RGB",		32,	ImagingPackRGB},
-    {"RGBX",   	"R",            8,      band0},
-    {"RGBX",   	"G",            8,      band1},
-    {"RGBX",   	"B",            8,      band2},
-    {"RGBX",   	"X",            8,      band3},
-
-    /* colour separation */
-    {"CMYK",	"CMYK",		32,	copy4},
-    {"CMYK",	"CMYK;I",	32,	copy4I},
-    {"CMYK",	"CMYK;L",	32,	packRGBXL},
-    {"CMYK",   	"C",            8,      band0},
-    {"CMYK",   	"M",            8,      band1},
-    {"CMYK",   	"Y",            8,      band2},
-    {"CMYK",   	"K",            8,      band3},
-
-    /* video (YCbCr) */
-    {"YCbCr",	"YCbCr",	24,	ImagingPackRGB},
-    {"YCbCr",	"YCbCr;L",	24,	packRGBL},
-    {"YCbCr",	"YCbCrX",	32,	copy4},
-    {"YCbCr",	"YCbCrK",	32,	copy4},
-    {"YCbCr",  	"Y",            8,      band0},
-    {"YCbCr",  	"Cb",           8,      band1},
-    {"YCbCr",  	"Cr",           8,      band2},
-
-    /* integer */
-    {"I", 	"I",		32,	copy4},
-    {"I", 	"I;16B",	16,	packI16B},
-    {"I", 	"I;32S",	32,	packI32S},
-    {"I", 	"I;32NS",	32,	copy4},
-
-    /* floating point */
-    {"F",	"F",		32,	copy4},
-    {"F", 	"F;32F",	32,	packI32S},
-    {"F",	"F;32NF",	32,	copy4},
-
-    /* storage modes */
-    {"I;16", 	"I;16",		16,	copy2},
-    {"I;16B", 	"I;16B",	16,	copy2},
-    {"BGR;15", 	"BGR;15",	16,	copy2},
-    {"BGR;16", 	"BGR;16",	16,	copy2},
-    {"BGR;24", 	"BGR;24",	24,	copy3},
-
-    {NULL} /* sentinel */
-};
-
-
-ImagingShuffler
-ImagingFindPacker(const char* mode, const char* rawmode, int* bits_out)
-{
-    int i;
-
-    /* find a suitable pixel packer */
-    for (i = 0; packers[i].rawmode; i++)
-	if (strcmp(packers[i].mode, mode) == 0 &&
-            strcmp(packers[i].rawmode, rawmode) == 0) {
-	    if (bits_out)
-		*bits_out = packers[i].bits;
-	    return packers[i].pack;
-	}
-    return NULL;
-}
diff --git a/pythonPackages/pil/libImaging/PackDecode.c b/pythonPackages/pil/libImaging/PackDecode.c
deleted file mode 100644
index 267aa85223..0000000000
--- a/pythonPackages/pil/libImaging/PackDecode.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: PackDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for PackBits image data.
- *
- * history:
- *	96-04-19 fl	Created
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-int
-ImagingPackbitsDecode(Imaging im, ImagingCodecState state,
-		      UINT8* buf, int bytes)
-{
-    UINT8 n;
-    UINT8* ptr;
-    int i;
-
-    ptr = buf;
-
-    for (;;) {
-
-	if (bytes < 1)
-	    return ptr - buf;
-
-	if (ptr[0] & 0x80) {
-
-	    if (ptr[0] == 0x80) {
-		/* Nop */
-		ptr++; bytes--;
-		continue;
-	    }
-
-	    /* Run */
-	    if (bytes < 2)
-		return ptr - buf;
-
-	    for (n = 257 - ptr[0]; n > 0; n--) {
-		if (state->x >= state->bytes) {
-		    /* state->errcode = IMAGING_CODEC_OVERRUN; */
-		    break;
-		}
-		state->buffer[state->x++] = ptr[1];
-	    }
-
-	    ptr += 2; bytes -= 2;
-
-	} else {
-
-	    /* Literal */
-	    n = ptr[0]+2;
-
-	    if (bytes < n)
-		return ptr - buf;
-
-	    for (i = 1; i < n; i++) {
-		if (state->x >= state->bytes) {
-		    /* state->errcode = IMAGING_CODEC_OVERRUN; */
-		    break;
-		}
-		state->buffer[state->x++] = ptr[i];
-	    }
-
-	    ptr += n; bytes -= n;
-
-	}
-
-	if (state->x >= state->bytes) {
-
-	    /* Got a full line, unpack it */
-	    state->shuffle((UINT8*) im->image[state->y + state->yoff] +
-			   state->xoff * im->pixelsize, state->buffer,
-			   state->xsize);
-
-	    state->x = 0;
-
-	    if (++state->y >= state->ysize) {
-		/* End of file (errcode = 0) */
-		return -1;
-	    }
-	}
-
-    }
-}
diff --git a/pythonPackages/pil/libImaging/Palette.c b/pythonPackages/pil/libImaging/Palette.c
deleted file mode 100644
index 02e9e4f257..0000000000
--- a/pythonPackages/pil/libImaging/Palette.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Palette.c 2591 2005-12-08 21:25:29Z fredrik $
- *
- * imaging palette object
- *
- * history:
- * 1996-05-05 fl   Added to library
- * 1996-05-27 fl   Added colour mapping stuff
- * 1997-05-12 fl   Support RGBA palettes
- * 2005-02-09 fl   Removed grayscale entries from web palette
- *
- * Copyright (c) Secret Labs AB 1997-2005.  All rights reserved.
- * Copyright (c) Fredrik Lundh 1995-1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#include <math.h>
-
-
-ImagingPalette
-ImagingPaletteNew(const char* mode)
-{
-    /* Create a palette object */
-
-    int i;
-    ImagingPalette palette;
-
-    if (strcmp(mode, "RGB") && strcmp(mode, "RGBA"))
-	return (ImagingPalette) ImagingError_ModeError();
-
-    palette = calloc(1, sizeof(struct ImagingPaletteInstance));
-    if (!palette)
-	return (ImagingPalette) ImagingError_MemoryError();
-
-    strcpy(palette->mode, mode);
-
-    /* Initialize to ramp */
-    for (i = 0; i < 256; i++) {
-	palette->palette[i*4+0] =
-	palette->palette[i*4+1] =
-	palette->palette[i*4+2] = (UINT8) i;
-	palette->palette[i*4+3] = 255; /* opaque */
-    }
-
-    return palette;
-}
-
-ImagingPalette
-ImagingPaletteNewBrowser(void)
-{
-    /* Create a standard "browser" palette object */
-
-    int i, r, g, b;
-    ImagingPalette palette;
-
-    palette = ImagingPaletteNew("RGB");
-    if (!palette)
-	return NULL;
-
-    /* Blank out unused entries */
-    /* FIXME: Add 10-level windows palette here? */
-
-    for (i = 0; i < 10; i++) {
-	palette->palette[i*4+0] =
-	palette->palette[i*4+1] =
-	palette->palette[i*4+2] = 0;
-    }
-
-    /* Simple 6x6x6 colour cube */
-
-    for (b = 0; b < 256; b += 51)
-	for (g = 0; g < 256; g += 51)
-	    for (r = 0; r < 256; r += 51) {
-		palette->palette[i*4+0] = r;
-		palette->palette[i*4+1] = g;
-		palette->palette[i*4+2] = b;
-		i++;
-	    }
-
-    /* Blank out unused entries */
-    /* FIXME: add 30-level greyscale wedge here? */
-
-    for (; i < 256; i++) {
-	palette->palette[i*4+0] =
-	palette->palette[i*4+1] =
-	palette->palette[i*4+2] = 0;
-    }
-
-    return palette;
-}
-
-ImagingPalette
-ImagingPaletteDuplicate(ImagingPalette palette)
-{
-    /* Duplicate palette descriptor */
-
-    ImagingPalette new_palette;
-
-    if (!palette)
-	return NULL;
-
-    new_palette = malloc(sizeof(struct ImagingPaletteInstance));
-    if (!new_palette)
-	return (ImagingPalette) ImagingError_MemoryError();
-
-    memcpy(new_palette, palette, sizeof(struct ImagingPaletteInstance));
-
-    /* Don't share the cache */
-    new_palette->cache = NULL;
-
-    return new_palette;
-}
-
-void
-ImagingPaletteDelete(ImagingPalette palette)
-{
-    /* Destroy palette object */
-
-    if (palette) {
-	if (palette->cache)
-	    free(palette->cache);
-	free(palette);
-    }
-}
-
-
-/* -------------------------------------------------------------------- */
-/* Colour mapping							*/
-/* -------------------------------------------------------------------- */
-
-/* This code is used to map RGB triplets to palette indices, using
-   a palette index cache. */
-
-/*
- * This implementation is loosely based on the corresponding code in
- * the IJG JPEG library by Thomas G. Lane.  Original algorithms by
- * Paul Heckbert and Spencer W. Thomas.
- *
- * The IJG JPEG library is copyright (C) 1991-1995, Thomas G. Lane.  */
-
-#define	DIST(a, b, s) (a - b) * (a - b) * s
-
-/* Colour weights (no scaling, for now) */
-#define	RSCALE	1
-#define	GSCALE	1
-#define	BSCALE	1
-
-/* Calculated scaled distances */
-#define	RDIST(a, b) DIST(a, b, RSCALE*RSCALE)
-#define	GDIST(a, b) DIST(a, b, GSCALE*GSCALE)
-#define	BDIST(a, b) DIST(a, b, BSCALE*BSCALE)
-
-/* Incremental steps */
-#define RSTEP	(4 * RSCALE)
-#define GSTEP	(4 * GSCALE)
-#define BSTEP	(4 * BSCALE)
-
-#define	BOX	8
-
-#define	BOXVOLUME BOX*BOX*BOX
-
-void
-ImagingPaletteCacheUpdate(ImagingPalette palette, int r, int g, int b)
-{
-    int i, j;
-    unsigned int dmin[256], dmax;
-    int r0, g0, b0;
-    int r1, g1, b1;
-    int rc, gc, bc;
-    unsigned int d[BOXVOLUME];
-    UINT8 c[BOXVOLUME];
-
-    /* Get box boundaries for the given (r,g,b)-triplet.  Each box
-       covers eight cache slots (32 colour values, that is). */
-
-    r0 = r & 0xe0; r1 = r0 + 0x1f; rc = (r0 + r1) / 2;
-    g0 = g & 0xe0; g1 = g0 + 0x1f; gc = (g0 + g1) / 2;
-    b0 = b & 0xe0; b1 = b0 + 0x1f; bc = (b0 + b1) / 2;
-
-    /* Step 1 -- Select relevant palette entries (after Heckbert) */
-
-    /* For each palette entry, calculate the min and max distances to
-     * any position in the box given by the colour we're looking for. */
-
-    dmax = (unsigned int) ~0;
-
-    for (i = 0; i < 256; i++) {
-
-	int r, g, b;
-	unsigned int tmin, tmax;
-
-	/* Find min and max distances to any point in the box */
-	r = palette->palette[i*4+0];
-	tmin = (r < r0) ? RDIST(r, r1) : (r > r1) ? RDIST(r, r0) : 0;
-	tmax = (r <= rc) ? RDIST(r, r1) : RDIST(r, r0);
-
-	g = palette->palette[i*4+1];
-	tmin += (g < g0) ? GDIST(g, g1) : (g > g1) ? GDIST(g, g0) : 0;
-	tmax += (g <= gc) ? GDIST(g, g1) : GDIST(g, g0);
-
-	b = palette->palette[i*4+2];
-	tmin += (b < b0) ? BDIST(b, b1) : (b > b1) ? BDIST(b, b0) : 0;
-	tmax += (b <= bc) ? BDIST(b, b1) : BDIST(b, b0);
-
-	dmin[i] = tmin;
-	if (tmax < dmax)
-	    dmax = tmax; /* keep the smallest max distance only */
-
-    }
-
-    /* Step 2 -- Incrementally update cache slot (after Thomas) */
-
-    /* Find the box containing the nearest palette entry, and update
-     * all slots in that box.  We only check boxes for which the min
-     * distance is less than or equal the smallest max distance */
-
-    for (i = 0; i < BOXVOLUME; i++)
-	d[i] = (unsigned int) ~0;
-
-    for (i = 0; i < 256; i++)
-
-	if (dmin[i] <= dmax) {
-
-	    int rd, gd, bd;
-	    int ri, gi, bi;
-	    int rx, gx, bx;
-
-	    ri = (r0 - palette->palette[i*4+0]) * RSCALE;
-	    gi = (g0 - palette->palette[i*4+1]) * GSCALE;
-	    bi = (b0 - palette->palette[i*4+2]) * BSCALE;
-
-	    rd = ri*ri + gi*gi + bi*bi;
-
-	    ri = ri * (2 * RSTEP) + RSTEP * RSTEP;
-	    gi = gi * (2 * GSTEP) + GSTEP * GSTEP;
-	    bi = bi * (2 * BSTEP) + BSTEP * BSTEP;
-
-	    rx = ri;
-	    for (r = j = 0; r < BOX; r++) {
-		gd = rd; gx = gi;
-		for (g = 0; g < BOX; g++) {
-		    bd = gd; bx = bi;
-		    for (b = 0; b < BOX; b++) {
-			if ((unsigned int) bd < d[j]) {
-			    d[j] = bd;
-			    c[j] = (UINT8) i;
-			}
-			bd += bx;
-			bx += 2 * BSTEP * BSTEP;
-			j++;
-		    }
-		    gd += gx;
-		    gx += 2 * GSTEP * GSTEP;
-		}
-		rd += rx;
-		rx += 2 * RSTEP * RSTEP;
-	    }
-	}
-
-    /* Step 3 -- Update cache */
-
-    /* The c array now contains the closest match for each
-     * cache slot in the box.  Update the cache. */
-
-    j = 0;
-    for (r = r0; r < r1; r+=4)
-	for (g = g0; g < g1; g+=4)
-	    for (b = b0; b < b1; b+=4)
-		ImagingPaletteCache(palette, r, g, b) = c[j++];
-}
-
-
-int
-ImagingPaletteCachePrepare(ImagingPalette palette)
-{
-    /* Add a colour cache to a palette */
-
-    int i;
-    int entries = 64*64*64;
-
-    if (palette->cache == NULL) {
-
-	/* The cache is 512k.  It might be a good idea to break it
-	   up into a pointer array (e.g. an 8-bit image?) */
-
-	palette->cache = (INT16*) malloc(entries * sizeof(INT16));
-	if (!palette->cache) {
-	    ImagingError_MemoryError();
-	    return -1;
-	}
-
-	/* Mark all entries as empty */
-	for (i = 0; i < entries; i++)
-	    palette->cache[i] = 0x100;
-
-    }
-
-    return 0;
-}
-
-
-void
-ImagingPaletteCacheDelete(ImagingPalette palette)
-{
-    /* Release the colour cache, if any */
-
-    if (palette && palette->cache) {
-	free(palette->cache);
-	palette->cache = NULL;
-    }
-}
diff --git a/pythonPackages/pil/libImaging/Paste.c b/pythonPackages/pil/libImaging/Paste.c
deleted file mode 100644
index 51a343b581..0000000000
--- a/pythonPackages/pil/libImaging/Paste.c
+++ /dev/null
@@ -1,555 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Paste.c 2409 2005-05-15 09:41:24Z Fredrik $
- *
- * paste image on another image
- *
- * history:
- * 96-03-27 fl	Created
- * 96-07-16 fl	Support "1", "L" and "RGBA" masks
- * 96-08-16 fl	Merged with opaque paste	
- * 97-01-17 fl	Faster blending, added support for RGBa images
- * 97-08-27 fl	Faster masking for 32-bit images
- * 98-02-02 fl	Fixed MULDIV255 macro for gcc
- * 99-02-02 fl	Added "RGBa" mask support
- * 99-02-06 fl	Rewritten.  Added support for masked fill operations.
- * 99-12-08 fl	Fixed matte fill.
- *
- * Copyright (c) Fredrik Lundh 1996-97.
- * Copyright (c) Secret Labs AB 1997-99.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Imaging.h"
-
-/* like (a * b + 127) / 255), but much faster on most platforms */
-#define	MULDIV255NEW(a, b, tmp)\
-     	(tmp = (a) * (b) + 128, ((((tmp) >> 8) + (tmp)) >> 8))
-
-#define	MULDIV255OLD(a, b, tmp)\
-        (((a) * (b) + 127) / 255)
-
-#define MULDIV255 MULDIV255NEW
-
-#define	BLEND(mask, in1, in2, tmp1, tmp2)\
-	(MULDIV255(in1, 255 - mask, tmp1) + MULDIV255(in2, mask, tmp2))
-
-#define	PREBLEND(mask, in1, in2, tmp1)\
-	(MULDIV255(in1, 255 - mask, tmp1) + in2)
-
-static inline void
-paste(Imaging imOut, Imaging imIn, int dx, int dy, int sx, int sy,
-      int xsize, int ysize, int pixelsize)
-{
-    /* paste opaque region */
-
-    int y;
-
-    dx *= pixelsize;
-    sx *= pixelsize;
-
-    xsize *= pixelsize;
-
-    for (y = 0; y < ysize; y++)
-        memcpy(imOut->image[y+dy]+dx, imIn->image[y+sy]+sx, xsize);
-}
-
-static inline void
-paste_mask_1(Imaging imOut, Imaging imIn, Imaging imMask,
-             int dx, int dy, int sx, int sy,
-             int xsize, int ysize, int pixelsize)
-{
-    /* paste with mode "1" mask */
-
-    int x, y;
-
-    if (imOut->image8) {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = imOut->image8[y+dy]+dx;
-            UINT8* in = imIn->image8[y+sy]+sx;
-            UINT8* mask = imMask->image8[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                if (*mask++)
-                    *out = *in;
-                out++, in++;
-            }
-        }
-
-    } else {
-
-        for (y = 0; y < ysize; y++) {
-            INT32* out = imOut->image32[y+dy]+dx;
-            INT32* in = imIn->image32[y+sy]+sx;
-            UINT8* mask = imMask->image8[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                if (*mask++)
-                    *out = *in;
-                out++, in++;
-            }
-        }
-    }
-}
-
-static inline void
-paste_mask_L(Imaging imOut, Imaging imIn, Imaging imMask,
-             int dx, int dy, int sx, int sy,
-             int xsize, int ysize, int pixelsize)
-{
-    /* paste with mode "L" matte */
-
-    int x, y, i;
-    unsigned int tmp1, tmp2;
-
-    if (imOut->image8) {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = imOut->image8[y+dy]+dx;
-            UINT8* in = imIn->image8[y+sy]+sx;
-            UINT8* mask = imMask->image8[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                *out = BLEND(*mask, *out, *in, tmp1, tmp2);
-                out++, in++, mask++;
-            }
-        }
-
-    } else {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = (UINT8*) imOut->image[y+dy]+dx*pixelsize;
-            UINT8* in = (UINT8*) imIn->image[y+sy]+sx*pixelsize;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                for (i = 0; i < pixelsize; i++) {
-                    *out = BLEND(*mask, *out, *in, tmp1, tmp2);
-                    out++, in++;
-                }
-                mask++;
-            }
-        }
-    }
-}
-
-static inline void
-paste_mask_RGBA(Imaging imOut, Imaging imIn, Imaging imMask,
-                int dx, int dy, int sx, int sy,
-                int xsize, int ysize, int pixelsize)
-{
-    /* paste with mode "RGBA" matte */
-
-    int x, y, i;
-    unsigned int tmp1, tmp2;
-
-    if (imOut->image8) {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = imOut->image8[y+dy]+dx;
-            UINT8* in = imIn->image8[y+sy]+sx;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx*4+3;
-            for (x = 0; x < xsize; x++) {
-                *out = BLEND(*mask, *out, *in, tmp1, tmp2);
-                out++, in++, mask += 4;
-            }
-        }
-
-    } else {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = (UINT8*) imOut->image[y+dy]+dx*pixelsize;
-            UINT8* in = (UINT8*) imIn->image[y+sy]+sx*pixelsize;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx*4+3;
-            for (x = 0; x < xsize; x++) {
-                for (i = 0; i < pixelsize; i++) {
-                    *out = BLEND(*mask, *out, *in, tmp1, tmp2);
-                    out++, in++;
-                }
-                mask += 4;
-            }
-        }
-    }
-}
-
-
-static inline void
-paste_mask_RGBa(Imaging imOut, Imaging imIn, Imaging imMask,
-                int dx, int dy, int sx, int sy,
-                int xsize, int ysize, int pixelsize)
-{
-    /* paste with mode "RGBa" matte */
-
-    int x, y, i;
-    unsigned int tmp1;
-
-    if (imOut->image8) {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = imOut->image8[y+dy]+dx;
-            UINT8* in = imIn->image8[y+sy]+sx;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx*4+3;
-            for (x = 0; x < xsize; x++) {
-                *out = PREBLEND(*mask, *out, *in, tmp1);
-                out++, in++, mask += 4;
-            }
-        }
-
-    } else {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = (UINT8*) imOut->image[y+dy]+dx*pixelsize;
-            UINT8* in = (UINT8*) imIn->image[y+sy]+sx*pixelsize;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx*4+3;
-            for (x = 0; x < xsize; x++) {
-                for (i = 0; i < pixelsize; i++) {
-                    *out = PREBLEND(*mask, *out, *in, tmp1);
-                    out++, in++;
-                }
-                mask += 4;
-            }
-        }
-    }
-}
-    
-int
-ImagingPaste(Imaging imOut, Imaging imIn, Imaging imMask,
-	     int dx0, int dy0, int dx1, int dy1)
-{
-    int xsize, ysize;
-    int pixelsize;
-    int sx0, sy0;
-    ImagingSectionCookie cookie;
-
-    if (!imOut || !imIn) {
-	ImagingError_ModeError();
-	return -1;
-    }
-
-    pixelsize = imOut->pixelsize;
-
-    xsize = dx1 - dx0;
-    ysize = dy1 - dy0;
-
-    if (xsize != imIn->xsize || ysize != imIn->ysize ||
-        pixelsize != imIn->pixelsize) {
-	ImagingError_Mismatch();
-	return -1;
-    }
-
-    if (imMask && (xsize != imMask->xsize || ysize != imMask->ysize)) {
-	ImagingError_Mismatch();
-	return -1;
-    }
-
-    /* Determine which region to copy */
-    sx0 = sy0 = 0;
-    if (dx0 < 0)
-	xsize += dx0, sx0 = -dx0, dx0 = 0;
-    if (dx0 + xsize > imOut->xsize)
-	xsize = imOut->xsize - dx0;
-    if (dy0 < 0)
-	ysize += dy0, sy0 = -dy0, dy0 = 0;
-    if (dy0 + ysize > imOut->ysize)
-	ysize = imOut->ysize - dy0;
-
-    if (xsize <= 0 || ysize <= 0)
-	return 0;
-
-    if (!imMask) {
-        ImagingSectionEnter(&cookie);
-        paste(imOut, imIn, dx0, dy0, sx0, sy0, xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else if (strcmp(imMask->mode, "1") == 0) {
-        ImagingSectionEnter(&cookie);
-        paste_mask_1(imOut, imIn, imMask, dx0, dy0, sx0, sy0,
-                     xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else if (strcmp(imMask->mode, "L") == 0) {
-        ImagingSectionEnter(&cookie);
-        paste_mask_L(imOut, imIn, imMask, dx0, dy0, sx0, sy0,
-                     xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else if (strcmp(imMask->mode, "RGBA") == 0) {
-        ImagingSectionEnter(&cookie);
-        paste_mask_RGBA(imOut, imIn, imMask, dx0, dy0, sx0, sy0,
-                        xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else if (strcmp(imMask->mode, "RGBa") == 0) {
-        ImagingSectionEnter(&cookie);
-        paste_mask_RGBa(imOut, imIn, imMask, dx0, dy0, sx0, sy0,
-                        xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else {
-	ImagingError_ValueError("bad transparency mask");
-	return -1;
-    }
-
-    return 0;
-}
-
-static inline void
-fill(Imaging imOut, const void* ink_, int dx, int dy,
-     int xsize, int ysize, int pixelsize)
-{
-    /* fill opaque region */
-
-    int x, y;
-    UINT8 ink8 = 0;
-    INT32 ink32 = 0L;
-
-    memcpy(&ink32, ink_, pixelsize);
-    memcpy(&ink8, ink_, sizeof(ink8));
-
-    if (imOut->image8 || ink32 == 0L) {
-
-        dx *= pixelsize;
-        xsize *= pixelsize;
-	for (y = 0; y < ysize; y++)
-	    memset(imOut->image[y+dy]+dx, ink8, xsize);
-        
-    } else {
-
-	for (y = 0; y < ysize; y++) {
-            INT32* out = imOut->image32[y+dy]+dx;
-	    for (x = 0; x < xsize; x++)
-		out[x] = ink32;
-        }
-
-    }
-}
-
-static inline void
-fill_mask_1(Imaging imOut, const void* ink_, Imaging imMask,
-            int dx, int dy, int sx, int sy,
-            int xsize, int ysize, int pixelsize)
-{
-    /* fill with mode "1" mask */
-
-    int x, y;
-    UINT8 ink8 = 0;
-    INT32 ink32 = 0L;
-
-    memcpy(&ink32, ink_, pixelsize);
-    memcpy(&ink8, ink_, sizeof(ink8));
-
-    if (imOut->image8) {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = imOut->image8[y+dy]+dx;
-            UINT8* mask = imMask->image8[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                if (*mask++)
-                    *out = ink8;
-                out++;
-            }
-        }
-
-    } else {
-
-        for (y = 0; y < ysize; y++) {
-            INT32* out = imOut->image32[y+dy]+dx;
-            UINT8* mask = imMask->image8[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                if (*mask++)
-                    *out = ink32;
-                out++;
-            }
-        }
-    }
-}
-
-static inline void
-fill_mask_L(Imaging imOut, const UINT8* ink, Imaging imMask,
-            int dx, int dy, int sx, int sy,
-            int xsize, int ysize, int pixelsize)
-{
-    /* fill with mode "L" matte */
-
-    int x, y, i;
-    unsigned int tmp1, tmp2;
-
-    if (imOut->image8) {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = imOut->image8[y+dy]+dx;
-            UINT8* mask = imMask->image8[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                *out = BLEND(*mask, *out, ink[0], tmp1, tmp2);
-                out++, mask++;
-            }
-        }
-
-    } else {
-
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = (UINT8*) imOut->image[y+dy]+dx*pixelsize;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                for (i = 0; i < pixelsize; i++) {
-                    *out = BLEND(*mask, *out, ink[i], tmp1, tmp2);
-                    out++;
-                }
-                mask++;
-            }
-        }
-    }
-}
-
-static inline void
-fill_mask_RGBA(Imaging imOut, const UINT8* ink, Imaging imMask,
-               int dx, int dy, int sx, int sy,
-               int xsize, int ysize, int pixelsize)
-{
-    /* fill with mode "RGBA" matte */
-
-    int x, y, i;
-    unsigned int tmp1, tmp2;
-
-    if (imOut->image8) {
-
-        sx = sx*4+3;
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = imOut->image8[y+dy]+dx;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                *out = BLEND(*mask, *out, ink[0], tmp1, tmp2);
-                out++, mask += 4;
-            }
-        }
-
-    } else {
-
-        dx *= pixelsize;
-        sx = sx*4 + 3;
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = (UINT8*) imOut->image[y+dy]+dx;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                for (i = 0; i < pixelsize; i++) {
-                    *out = BLEND(*mask, *out, ink[i], tmp1, tmp2);
-                    out++;
-                }
-                mask += 4;
-            }
-        }
-    }
-}
-
-static inline void
-fill_mask_RGBa(Imaging imOut, const UINT8* ink, Imaging imMask,
-               int dx, int dy, int sx, int sy,
-               int xsize, int ysize, int pixelsize)
-{
-    /* fill with mode "RGBa" matte */
-
-    int x, y, i;
-    unsigned int tmp1;
-
-    if (imOut->image8) {
-
-        sx = sx*4 + 3;
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = imOut->image8[y+dy]+dx;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                *out = PREBLEND(*mask, *out, ink[0], tmp1);
-                out++, mask += 4;
-            }
-        }
-
-    } else {
-
-        dx *= pixelsize;
-        sx = sx*4 + 3;
-        for (y = 0; y < ysize; y++) {
-            UINT8* out = (UINT8*) imOut->image[y+dy]+dx;
-            UINT8* mask = (UINT8*) imMask->image[y+sy]+sx;
-            for (x = 0; x < xsize; x++) {
-                for (i = 0; i < pixelsize; i++) {
-                    *out = PREBLEND(*mask, *out, ink[i], tmp1);
-                    out++;
-                }
-                mask += 4;
-            }
-        }
-    }
-}
-
-int
-ImagingFill2(Imaging imOut, const void* ink, Imaging imMask,
-             int dx0, int dy0, int dx1, int dy1)
-{
-    ImagingSectionCookie cookie;
-    int xsize, ysize;
-    int pixelsize;
-    int sx0, sy0;
-
-    if (!imOut || !ink) {
-	ImagingError_ModeError();
-	return -1;
-    }
-
-    pixelsize = imOut->pixelsize;
-
-    xsize = dx1 - dx0;
-    ysize = dy1 - dy0;
-
-    if (imMask && (xsize != imMask->xsize || ysize != imMask->ysize)) {
-	ImagingError_Mismatch();
-	return -1;
-    }
-
-    /* Determine which region to fill */
-    sx0 = sy0 = 0;
-    if (dx0 < 0)
-	xsize += dx0, sx0 = -dx0, dx0 = 0;
-    if (dx0 + xsize > imOut->xsize)
-	xsize = imOut->xsize - dx0;
-    if (dy0 < 0)
-	ysize += dy0, sy0 = -dy0, dy0 = 0;
-    if (dy0 + ysize > imOut->ysize)
-	ysize = imOut->ysize - dy0;
-
-    if (xsize <= 0 || ysize <= 0)
-	return 0;
-
-    if (!imMask) {
-        ImagingSectionEnter(&cookie);
-        fill(imOut, ink, dx0, dy0, xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else if (strcmp(imMask->mode, "1") == 0) {
-        ImagingSectionEnter(&cookie);
-        fill_mask_1(imOut, ink, imMask, dx0, dy0, sx0, sy0,
-                    xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else if (strcmp(imMask->mode, "L") == 0) {
-        ImagingSectionEnter(&cookie);
-        fill_mask_L(imOut, ink, imMask, dx0, dy0, sx0, sy0,
-                    xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else if (strcmp(imMask->mode, "RGBA") == 0) {
-        ImagingSectionEnter(&cookie);
-        fill_mask_RGBA(imOut, ink, imMask, dx0, dy0, sx0, sy0,
-                       xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else if (strcmp(imMask->mode, "RGBa") == 0) {
-        ImagingSectionEnter(&cookie);
-        fill_mask_RGBa(imOut, ink, imMask, dx0, dy0, sx0, sy0,
-                       xsize, ysize, pixelsize);
-        ImagingSectionLeave(&cookie);
-
-    } else {
-	ImagingError_ValueError("bad transparency mask");
-	return -1;
-    }
-
-    return 0;
-}
diff --git a/pythonPackages/pil/libImaging/PcdDecode.c b/pythonPackages/pil/libImaging/PcdDecode.c
deleted file mode 100644
index 6faab3bc8c..0000000000
--- a/pythonPackages/pil/libImaging/PcdDecode.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: PcdDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for uncompressed PCD image data.
- *
- * history:
- *	96-05-10 fl	Created
- *	96-05-18 fl	New tables
- *	97-01-25 fl	Use PhotoYCC unpacker
- *
- * notes:
- *	This driver supports uncompressed PCD modes only
- *	(resolutions up to 768x512).
- *
- * Copyright (c) Fredrik Lundh 1996-97.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-int
-ImagingPcdDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    int x;
-    int chunk;
-    UINT8* out;
-    UINT8* ptr;
-
-    ptr = buf;
-
-    chunk = 3 * state->xsize;
-
-    for (;;) {
-
-	/* We need data for two full lines before we can do anything */ 
-	if (bytes < chunk)
-	    return ptr - buf;
-
-	/* Unpack first line */
-	out = state->buffer;
-	for (x = 0; x < state->xsize; x++) {
-	    out[0] = ptr[x];
-	    out[1] = ptr[(x+4*state->xsize)/2];
-	    out[2] = ptr[(x+5*state->xsize)/2];
-	    out += 4;
-	}
-
-	state->shuffle((UINT8*) im->image[state->y],
-		       state->buffer, state->xsize);
-
-	if (++state->y >= state->ysize)
-	    return -1; /* This can hardly happen */
-
-	/* Unpack second line */
-	out = state->buffer;
-	for (x = 0; x < state->xsize; x++) {
-	    out[0] = ptr[x+state->xsize];
-	    out[1] = ptr[(x+4*state->xsize)/2];
-	    out[2] = ptr[(x+5*state->xsize)/2];
-	    out += 4;
-	}
-
-	state->shuffle((UINT8*) im->image[state->y],
-		       state->buffer, state->xsize);
-
-	if (++state->y >= state->ysize)
-	    return -1;
-
-	ptr += chunk;
-	bytes -= chunk;
-
-    }
-}
diff --git a/pythonPackages/pil/libImaging/PcxDecode.c b/pythonPackages/pil/libImaging/PcxDecode.c
deleted file mode 100644
index 7267f30152..0000000000
--- a/pythonPackages/pil/libImaging/PcxDecode.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: PcxDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for PCX image data.
- *
- * history:
- *	95-09-14 fl	Created
- *
- * Copyright (c) Fredrik Lundh 1995.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-int
-ImagingPcxDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    UINT8 n;
-    UINT8* ptr;
-
-    ptr = buf;
-
-    for (;;) {
-
-	if (bytes < 1)
-	    return ptr - buf;
-
-	if ((*ptr & 0xC0) == 0xC0) {
-
-	    /* Run */
-	    if (bytes < 2)
-		return ptr - buf;
-
-	    n = ptr[0] & 0x3F;
-	    
-	    while (n > 0) {
-		if (state->x >= state->bytes) {
-		    state->errcode = IMAGING_CODEC_OVERRUN;
-		    break;
-		}
-		state->buffer[state->x++] = ptr[1];
-		n--;
-	    }
-
-	    ptr += 2; bytes -= 2;
-
-	} else {
-
-	    /* Literal */
-	    state->buffer[state->x++] = ptr[0];
-	    ptr++; bytes--;
-
-	}
-
-	if (state->x >= state->bytes) {
-
-	    /* Got a full line, unpack it */
-	    state->shuffle((UINT8*) im->image[state->y + state->yoff] +
-			   state->xoff * im->pixelsize, state->buffer,
-			   state->xsize);
-
-	    state->x = 0;
-
-	    if (++state->y >= state->ysize) {
-		/* End of file (errcode = 0) */
-		return -1;
-	    }
-	}
-
-    }
-}
diff --git a/pythonPackages/pil/libImaging/PcxEncode.c b/pythonPackages/pil/libImaging/PcxEncode.c
deleted file mode 100644
index 2c9d250e36..0000000000
--- a/pythonPackages/pil/libImaging/PcxEncode.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: PcxEncode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * encoder for PCX data
- *
- * history:
- * 99-02-07 fl	created
- *
- * Copyright (c) Fredrik Lundh 1999.
- * Copyright (c) Secret Labs AB 1999.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-enum { INIT, FETCH, ENCODE };
-
-/* we're reusing "ystep" to store the last value */
-#define LAST ystep
-
-int
-ImagingPcxEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    UINT8* ptr;
-    int this;
-
-    ptr = buf;
-
-    if (!state->state) {
-
-        /* sanity check */
-        if (state->xsize <= 0 || state->ysize <= 0) {
-            state->errcode = IMAGING_CODEC_END;
-            return 0;
-        }
-
-	state->bytes = (state->xsize*state->bits + 7) / 8;
-        state->state = FETCH;
-
-    }
-
-    for (;;)
-
-        switch (state->state) {
-        case FETCH:
-
-            /* get a line of data */
-            if (state->y >= state->ysize) {
-                state->errcode = IMAGING_CODEC_END;
-                return ptr - buf;
-            }
-
-            state->shuffle(state->buffer,
-                           (UINT8*) im->image[state->y + state->yoff] +
-                           state->xoff * im->pixelsize, state->xsize);
-
-            state->y++;
-
-            state->count = 1;
-            state->LAST = state->buffer[0];
-
-            state->x = 1;
-
-            state->state = ENCODE;
-            /* fall through */
-
-        case ENCODE:
-
-            /* compress this line */
-
-            /* when we arrive here, "count" contains the number of
-               bytes having the value of "LAST" that we've already
-               seen */
-
-            while (state->x < state->bytes) {
-
-                if (state->count == 63) {
-
-                    /* this run is full; flush it */
-                    if (bytes < 2)
-                        return ptr - buf;
-                    *ptr++ = 0xff;
-                    *ptr++ = state->LAST;
-                    bytes -= 2;
-
-                    state->count = 0;
-
-                }
-
-                this = state->buffer[state->x];
-
-                if (this == state->LAST) {
-
-                    /* extend the current run */
-                    state->x++;
-                    state->count++;
-
-                } else {
-
-                    /* start a new run */
-                    if (state->count == 1 && (state->LAST < 0xc0)) {
-                        if (bytes < 1)
-                            return ptr - buf;
-                        *ptr++ = state->LAST;
-                        bytes--;
-                    } else {
-                        if (state->count > 0) {
-                            if (bytes < 2)
-                                return ptr - buf;
-                            *ptr++ = 0xc0 | state->count;
-                            *ptr++ = state->LAST;
-                            bytes -= 2;
-                        }
-                    }
-
-                    state->LAST = this;
-                    state->count = 1;
-
-                    state->x++;
-
-                }
-            }
-
-            /* end of line; flush the current run */
-            if (state->count == 1 && (state->LAST < 0xc0)) {
-                if (bytes < 1)
-                    return ptr - buf;
-                *ptr++ = state->LAST;
-                bytes--;
-            } else {
-                if (state->count > 0) {
-                    if (bytes < 2)
-                        return ptr - buf;
-                    *ptr++ = 0xc0 | state->count;
-                    *ptr++ = state->LAST;
-                    bytes -= 2;
-                }
-            }
-
-            /* read next line */
-            state->state = FETCH;
-            break;
-
-        }
-}
diff --git a/pythonPackages/pil/libImaging/Point.c b/pythonPackages/pil/libImaging/Point.c
deleted file mode 100644
index 45693f0dc8..0000000000
--- a/pythonPackages/pil/libImaging/Point.c
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Point.c 2207 2004-12-19 15:06:45Z fredrik $
- *
- * point (pixel) translation
- *
- * history:
- * 1995-11-27 fl   Created
- * 1996-03-31 fl   Fixed colour support
- * 1996-08-13 fl   Support 8-bit to "1" thresholding
- * 1997-05-31 fl   Added floating point transform
- * 1998-07-02 fl   Added integer point transform
- * 1998-07-17 fl   Support L to anything lookup
- * 2004-12-18 fl   Refactored; added I to L lookup
- *
- * Copyright (c) 1997-2004 by Secret Labs AB.
- * Copyright (c) 1995-2004 by Fredrik Lundh.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-typedef struct {
-    const void* table;
-} im_point_context;
-
-static void
-im_point_8_8(Imaging imOut, Imaging imIn, im_point_context* context)
-{
-    int x, y;
-    /* 8-bit source, 8-bit destination */
-    UINT8* table = (UINT8*) context->table;
-    for (y = 0; y < imIn->ysize; y++) {
-        UINT8* in = imIn->image8[y];
-        UINT8* out = imOut->image8[y];
-        for (x = 0; x < imIn->xsize; x++)
-            out[x] = table[in[x]];
-    }
-}
-
-static void
-im_point_2x8_2x8(Imaging imOut, Imaging imIn, im_point_context* context)
-{
-    int x, y;
-    /* 2x8-bit source, 2x8-bit destination */
-    UINT8* table = (UINT8*) context->table;
-    for (y = 0; y < imIn->ysize; y++) {
-        UINT8* in = (UINT8*) imIn->image[y];
-        UINT8* out = (UINT8*) imOut->image[y];
-        for (x = 0; x < imIn->xsize; x++) {
-            out[0] = table[in[0]];
-            out[3] = table[in[3]+256];
-            in += 4; out += 4;
-        }
-    }
-}
-
-static void
-im_point_3x8_3x8(Imaging imOut, Imaging imIn, im_point_context* context)
-{
-    int x, y;
-    /* 3x8-bit source, 3x8-bit destination */
-    UINT8* table = (UINT8*) context->table;
-    for (y = 0; y < imIn->ysize; y++) {
-        UINT8* in = (UINT8*) imIn->image[y];
-        UINT8* out = (UINT8*) imOut->image[y];
-        for (x = 0; x < imIn->xsize; x++) {
-            out[0] = table[in[0]];
-            out[1] = table[in[1]+256];
-            out[2] = table[in[2]+512];
-            in += 4; out += 4;
-        }
-    }
-}
-
-static void
-im_point_4x8_4x8(Imaging imOut, Imaging imIn, im_point_context* context)
-{
-    int x, y;
-    /* 4x8-bit source, 4x8-bit destination */
-    UINT8* table = (UINT8*) context->table;
-    for (y = 0; y < imIn->ysize; y++) {
-        UINT8* in = (UINT8*) imIn->image[y];
-        UINT8* out = (UINT8*) imOut->image[y];
-        for (x = 0; x < imIn->xsize; x++) {
-            out[0] = table[in[0]];
-            out[1] = table[in[1]+256];
-            out[2] = table[in[2]+512];
-            out[3] = table[in[3]+768];
-            in += 4; out += 4;
-        }
-    }
-}
-
-static void
-im_point_8_32(Imaging imOut, Imaging imIn, im_point_context* context)
-{
-    int x, y;
-    /* 8-bit source, 32-bit destination */
-    INT32* table = (INT32*) context->table;
-    for (y = 0; y < imIn->ysize; y++) {
-        UINT8* in = imIn->image8[y];
-        INT32* out = imOut->image32[y];
-        for (x = 0; x < imIn->xsize; x++)
-            out[x] = table[in[x]];
-    }
-}
-
-static void
-im_point_32_8(Imaging imOut, Imaging imIn, im_point_context* context)
-{
-    int x, y;
-    /* 32-bit source, 8-bit destination */
-    UINT8* table = (UINT8*) context->table;
-    for (y = 0; y < imIn->ysize; y++) {
-        INT32* in = imIn->image32[y];
-        UINT8* out = imOut->image8[y];
-        for (x = 0; x < imIn->xsize; x++) {
-            int v = in[x];
-            if (v < 0)
-                v = 0;
-            else if (v > 65535)
-                v = 65535;
-            out[x] = table[v];
-        }
-    }
-}
-
-Imaging
-ImagingPoint(Imaging imIn, const char* mode, const void* table)
-{
-    /* lookup table transform */
-
-    ImagingSectionCookie cookie;
-    Imaging imOut;
-    im_point_context context;
-    void (*point)(Imaging imIn, Imaging imOut, im_point_context* context);
-
-    if (!imIn)
-	return (Imaging) ImagingError_ModeError();
-
-    if (!mode)
-        mode = imIn->mode;
-
-    if (imIn->type != IMAGING_TYPE_UINT8) {
-        if (imIn->type != IMAGING_TYPE_INT32 || strcmp(mode, "L") != 0)
-            goto mode_mismatch;
-    } else if (!imIn->image8 && strcmp(imIn->mode, mode) != 0)
-        goto mode_mismatch;
-
-    imOut = ImagingNew(mode, imIn->xsize, imIn->ysize);
-    if (!imOut)
-	return NULL;
-
-    /* find appropriate handler */
-    if (imIn->type == IMAGING_TYPE_UINT8) {
-        if (imIn->bands == imOut->bands && imIn->type == imOut->type) {
-            switch (imIn->bands) {
-            case 1:
-                point = im_point_8_8;
-                break;
-            case 2:
-                point = im_point_2x8_2x8;
-                break;
-            case 3:
-                point = im_point_3x8_3x8;
-                break;
-            case 4:
-                point = im_point_4x8_4x8;
-                break;
-            default:
-                /* this cannot really happen */
-                point = im_point_8_8;
-                break;
-            }
-        } else
-            point = im_point_8_32;
-    } else
-        point = im_point_32_8;
-
-    ImagingCopyInfo(imOut, imIn);
-
-    ImagingSectionEnter(&cookie);
-
-    context.table = table;
-    point(imOut, imIn, &context);
-
-    ImagingSectionLeave(&cookie);
-
-    return imOut;
-
-  mode_mismatch:
-    return (Imaging) ImagingError_ValueError(
-        "point operation not supported for this mode"
-        );
-}
-
-
-Imaging
-ImagingPointTransform(Imaging imIn, double scale, double offset)
-{
-    /* scale/offset transform */
-
-    ImagingSectionCookie cookie;
-    Imaging imOut;
-    int x, y;
-
-    if (!imIn || (strcmp(imIn->mode, "I") != 0 && 
-                  strcmp(imIn->mode, "I;16") != 0 && 
-                  strcmp(imIn->mode, "F") != 0))
-	return (Imaging) ImagingError_ModeError();
-
-    imOut = ImagingNew(imIn->mode, imIn->xsize, imIn->ysize);
-    if (!imOut)
-	return NULL;
-
-    ImagingCopyInfo(imOut, imIn);
-
-    switch (imIn->type) {
-    case IMAGING_TYPE_INT32:
-        ImagingSectionEnter(&cookie);
-        for (y = 0; y < imIn->ysize; y++) {
-            INT32* in  = imIn->image32[y];
-            INT32* out = imOut->image32[y];
-            /* FIXME: add clipping? */
-            for (x = 0; x < imIn->xsize; x++)
-                out[x] = in[x] * scale + offset;
-        }
-        ImagingSectionLeave(&cookie);
-        break;
-    case IMAGING_TYPE_FLOAT32:
-        ImagingSectionEnter(&cookie);
-        for (y = 0; y < imIn->ysize; y++) {
-            FLOAT32* in  = (FLOAT32*) imIn->image32[y];
-            FLOAT32* out = (FLOAT32*) imOut->image32[y];
-            for (x = 0; x < imIn->xsize; x++)
-                out[x] = in[x] * scale + offset;
-        }
-        ImagingSectionLeave(&cookie);
-        break;
-    case IMAGING_TYPE_SPECIAL:
-        if (strcmp(imIn->mode,"I;16") == 0) {
-            ImagingSectionEnter(&cookie);
-            for (y = 0; y < imIn->ysize; y++) {
-                UINT16* in  = (UINT16 *)imIn->image[y];
-                UINT16* out = (UINT16 *)imOut->image[y];
-                /* FIXME: add clipping? */
-                for (x = 0; x < imIn->xsize; x++)
-                    out[x] = in[x] * scale + offset;
-            }
-            ImagingSectionLeave(&cookie);
-            break;
-	}
-        /* FALL THROUGH */
-    default:
-        ImagingDelete(imOut);
-        return (Imaging) ImagingError_ValueError("internal error");
-    }
-
-    return imOut;
-}
diff --git a/pythonPackages/pil/libImaging/Quant.c b/pythonPackages/pil/libImaging/Quant.c
deleted file mode 100644
index 66130f65eb..0000000000
--- a/pythonPackages/pil/libImaging/Quant.c
+++ /dev/null
@@ -1,1606 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Quant.c 2284 2005-02-07 20:58:58Z fredrik $
- *
- * image quantizer
- *
- * history:
- * 1998-09-10 tjs  Contributed
- * 1998-12-29 fl   Added to PIL 1.0b1
- * 2004-02-21 fl   Fixed bogus free() on quantization error
- * 2005-02-07 fl   Limit number of colors to 256
- *
- * Written by Toby J Sargeant <tjs@longford.cs.monash.edu.au>.
- * 
- * Copyright (c) 1998 by Toby J Sargeant
- * Copyright (c) 1998-2004 by Secret Labs AB.  All rights reserved.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Imaging.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <memory.h>
-#include <time.h>
-
-#include "Quant.h"
-
-#include "QuantDefines.h"
-#include "QuantHash.h"
-#include "QuantHeap.h"
-
-#define NO_OUTPUT
-
-typedef struct {
-    unsigned long scale;
-} PixelHashData;
-
-typedef struct _PixelList {
-    struct _PixelList *next[3],*prev[3];
-    Pixel p;
-    unsigned int flag:1;
-    int count;
-} PixelList;
-
-typedef struct _BoxNode {
-    struct _BoxNode *l,*r;
-    PixelList *head[3],*tail[3];
-    int axis;
-    int volume;
-    unsigned long pixelCount;
-} BoxNode;
-
-#define _SQR(x) ((x)*(x))
-#define _DISTSQR(p1,p2) \
-    _SQR((int)((p1)->c.r)-(int)((p2)->c.r))+ \
-    _SQR((int)((p1)->c.g)-(int)((p2)->c.g))+ \
-    _SQR((int)((p1)->c.b)-(int)((p2)->c.b))
-
-#define MAX_HASH_ENTRIES 65536
-
-#define PIXEL_HASH(r,g,b) \
-    (((unsigned int)(r)    )*463 ^ \
-     ((unsigned int)(g)<< 8)*10069 ^ \
-     ((unsigned int)(b)<<16)*64997)
-
-#define PIXEL_UNSCALE(p,q,s) \
-    ((q)->c.r=(p)->c.r<<(s)), \
-    ((q)->c.g=(p)->c.g<<(s)), \
-    ((q)->c.b=(p)->c.b<<(s))
-
-#define PIXEL_SCALE(p,q,s)\
-    ((q)->c.r=(p)->c.r>>(s)),              \
-    ((q)->c.g=(p)->c.g>>(s)),              \
-    ((q)->c.b=(p)->c.b>>(s))
-
-static unsigned long
-unshifted_pixel_hash(const HashTable h, const void *p)
-{
-   Pixel *pixel=(Pixel *)&p;
-   unsigned long hash=PIXEL_HASH(pixel->c.r,
-                                 pixel->c.g,
-                                 pixel->c.b);
-   return hash;
-}
-
-static int
-unshifted_pixel_cmp(const HashTable h, const void *a, const void *b)
-{
-    Pixel *pixel1=(Pixel *)&a;
-    Pixel *pixel2=(Pixel *)&b;
-    if (pixel1->c.r==pixel2->c.r) {
-        if (pixel1->c.g==pixel2->c.g) {
-            if (pixel1->c.b==pixel2->c.b) {
-                return 0;
-            } else {
-                return (int)(pixel1->c.b)-(int)(pixel2->c.b);
-            }
-        } else {
-            return (int)(pixel1->c.g)-(int)(pixel2->c.g);
-        }
-    } else {
-        return (int)(pixel1->c.r)-(int)(pixel2->c.r);
-    }
-}
-
-static unsigned long
-pixel_hash(const HashTable h,const void *p)
-{
-    PixelHashData *d=(PixelHashData *)hashtable_get_user_data(h);
-    Pixel *pixel=(Pixel *)&p;
-    unsigned long hash=PIXEL_HASH(pixel->c.r>>d->scale,
-                                  pixel->c.g>>d->scale,
-                                  pixel->c.b>>d->scale);
-    return hash;
-}
-
-static int
-pixel_cmp(const HashTable h,const void *a,const void *b)
-{
-    PixelHashData *d=(PixelHashData *)hashtable_get_user_data(h);
-    Pixel *pixel1=(Pixel *)&a;
-    Pixel *pixel2=(Pixel *)&b;
-    unsigned long A,B;
-    A=PIXEL_HASH(pixel1->c.r>>d->scale,
-                 pixel1->c.g>>d->scale,
-                 pixel1->c.b>>d->scale);
-    B=PIXEL_HASH(pixel2->c.r>>d->scale,
-                 pixel2->c.g>>d->scale,
-                 pixel2->c.b>>d->scale);
-    return (A==B)?0:((A<B)?-1:1);
-}
-
-static void
-exists_count_func(const HashTable h, const void *key, void **val)
-{
-    (*(int *)val)+=1;
-}
-
-static void
-new_count_func(const HashTable h, const void *key, void **val)
-{
-    (*(int *)val)=1;
-}
-
-static void
-rehash_collide(HashTable h,
-               void **keyp,
-               void **valp,
-               void *newkey,
-               void *newval)
-{
-   *valp=(void *)((*(int *)valp)+(*(int *)&newval));
-}
-
-/* %% */
-
-static HashTable
-create_pixel_hash(Pixel *pixelData,unsigned long nPixels)
-{
-   PixelHashData *d;
-   HashTable *hash;
-   unsigned long i;
-   unsigned long timer,timer2,timer3;
-
-   d=malloc(sizeof(PixelHashData));
-   if (!d) return NULL;
-   hash=hashtable_new(pixel_hash,pixel_cmp);
-   hashtable_set_user_data(hash,d);
-   d->scale=0;
-   timer=timer3=clock();
-   for (i=0;i<nPixels;i++) {
-      if (!hashtable_insert_or_update_computed(hash,
-                                              (void *)pixelData[i].v,
-                                              new_count_func,
-                                              exists_count_func)) {;
-      }
-      while (hashtable_get_count(hash)>MAX_HASH_ENTRIES) {
-         d->scale++;
-#ifndef NO_OUTPUT
-         printf ("rehashing - new scale: %d\n",(int)d->scale);
-#endif
-         timer2=clock();
-         hashtable_rehash_compute(hash,rehash_collide);
-         timer2=clock()-timer2;
-#ifndef NO_OUTPUT
-         printf ("rehash took %f sec\n",timer2/(double)CLOCKS_PER_SEC);
-#endif
-         timer+=timer2;
-      }
-   }
-#ifndef NO_OUTPUT
-   printf ("inserts took %f sec\n",(clock()-timer)/(double)CLOCKS_PER_SEC);
-#endif
-#ifndef NO_OUTPUT
-   printf ("total        %f sec\n",(clock()-timer3)/(double)CLOCKS_PER_SEC);
-#endif
-   return hash;
-}
-
-static void
-destroy_pixel_hash(HashTable hash)
-{
-   PixelHashData *d=(PixelHashData *)hashtable_get_user_data(hash);
-   if (d) free(d);
-   hashtable_free(hash);
-}
-
-
-/* 1. hash quantized pixels.                                                  */
-/* 2. create R,G,B lists of sorted quantized pixels.                          */
-/* 3. median cut.                                                             */
-/* 4. build hash table from median cut boxes.                                 */
-/* 5. for each pixel, compute entry in hash table, and hence median cut box.  */
-/* 6. compute median cut box pixel averages.                                  */
-/* 7. map each pixel to nearest average.                                      */
-
-static int
-compute_box_volume(BoxNode *b)
-{
-   unsigned char rl,rh,gl,gh,bl,bh;
-   if (b->volume>=0) return b->volume;
-   if (!b->head[0]) {
-      b->volume=0;
-   } else {
-      rh=b->head[0]->p.c.r;
-      rl=b->tail[0]->p.c.r;
-      gh=b->head[1]->p.c.g;
-      gl=b->tail[1]->p.c.g;
-      bh=b->head[2]->p.c.b;
-      bl=b->tail[2]->p.c.b;
-      b->volume=(rh-rl+1)*(gh-gl+1)*(bh-bl+1);
-   }
-   return b->volume;
-}
-
-static void
-hash_to_list(HashTable h, const void *key, const void *val, void *u)
-{
-   PixelHashData *d=(PixelHashData *)hashtable_get_user_data(h);
-   PixelList **pl=(PixelList **)u;
-   PixelList *p;
-   Pixel *pixel=(Pixel *)&key;
-   int i;
-   Pixel q;
-   int count=*(int *)&val;
-
-   PIXEL_SCALE(pixel,&q,d->scale);
-
-   p=malloc(sizeof(PixelList));
-   if (!p) return;
-   
-   p->flag=0;
-   p->p=q;
-   p->count=count;
-   for (i=0;i<3;i++) {
-      p->next[i]=pl[i];
-      p->prev[i]=NULL;
-      if (pl[i]) pl[i]->prev[i]=p;
-      pl[i]=p;
-   }
-}
-
-static PixelList *
-mergesort_pixels(PixelList *head, int i)
-{
-   PixelList *c,*t,*a,*b,*p;
-   if (!head||!head->next[i]) {
-      if (head) {
-         head->next[i]=NULL;
-         head->prev[i]=NULL;
-      }
-      return head;
-   }
-   for (c=t=head;c&&t;c=c->next[i],t=(t->next[i])?t->next[i]->next[i]:NULL);
-   if (c) {
-      if (c->prev[i]) c->prev[i]->next[i]=NULL;
-      c->prev[i]=NULL;
-   }
-   a=mergesort_pixels(head,i);
-   b=mergesort_pixels(c,i);
-   head=NULL;
-   p=NULL;
-   while (a&&b) {
-      if (a->p.a.v[i]>b->p.a.v[i]) {
-         c=a;
-         a=a->next[i];
-      } else {
-         c=b;
-         b=b->next[i];
-      }
-      c->prev[i]=p;
-      c->next[i]=NULL;
-      if (p) p->next[i]=c;
-      p=c;
-      if (!head) head=c;
-   }
-   if (a) {
-      c->next[i]=a;
-      a->prev[i]=c;
-   } else if (b) {
-      c->next[i]=b;
-      b->prev[i]=c;
-   }
-   return head;
-}
-
-static int
-test_sorted(PixelList *pl[3])
-{
-   int i,n,l;
-   PixelList *t;
-
-   for(i=0;i<3;i++) {
-      n=0;
-      l=256;
-      for (t=pl[i];t;t=t->next[i]) {
-         if (l<t->p.a.v[i]) return 0;
-         l=t->p.a.v[i];
-      }
-   }
-   return 1;
-}
-
-static int
-box_heap_cmp(const Heap h, const void *A, const void *B)
-{
-   BoxNode *a=(BoxNode *)A;
-   BoxNode *b=(BoxNode *)B;
-   return (int)a->pixelCount-(int)b->pixelCount;
-}
-
-#define LUMINANCE(p) (77*(p)->c.r+150*(p)->c.g+29*(p)->c.b)
-
-static int
-splitlists(PixelList *h[3],
-           PixelList *t[3],
-           PixelList *nh[2][3],
-           PixelList *nt[2][3],
-           unsigned long nCount[2],
-           int axis,
-           unsigned long pixelCount)
-{
-   unsigned long left;
-
-   PixelList *l,*r,*c,*n;
-   int i;
-   int nRight,nLeft;
-   int splitColourVal;
-
-#ifdef TEST_SPLIT
-   {
-      PixelList *_prevTest,*_nextTest;
-      int _i,_nextCount[3],_prevCount[3];
-      for (_i=0;_i<3;_i++) {
-         for (_nextCount[_i]=0,_nextTest=h[_i];_nextTest&&_nextTest->next[_i];_nextTest=_nextTest->next[_i],_nextCount[_i]++);
-         for (_prevCount[_i]=0,_prevTest=t[_i];_prevTest&&_prevTest->prev[_i];_prevTest=_prevTest->prev[_i],_prevCount[_i]++);
-         if (_nextTest!=t[_i]) {
-            printf ("next-list of axis %d does not end at tail\n",_i);
-            exit(1);
-         }
-         if (_prevTest!=h[_i]) {
-            printf ("prev-list of axis %d does not end at head\n",_i);
-            exit(1);
-         }
-         for (;_nextTest&&_nextTest->prev[_i];_nextTest=_nextTest->prev[_i]);
-         for (;_prevTest&&_prevTest->next[_i];_prevTest=_prevTest->next[_i]);
-         if (_nextTest!=h[_i]) {
-            printf ("next-list of axis %d does not loop back to head\n",_i);
-            exit(1);
-         }
-         if (_prevTest!=t[_i]) {
-            printf ("prev-list of axis %d does not loop back to tail\n",_i);
-            exit(1);
-         }
-      }
-      for (_i=1;_i<3;_i++) {
-         if (_prevCount[_i]!=_prevCount[_i-1] ||
-             _nextCount[_i]!=_nextCount[_i-1] ||
-             _prevCount[_i]!=_nextCount[_i]) {
-            printf ("{%d %d %d} {%d %d %d}\n",
-                    _prevCount[0],
-                    _prevCount[1],
-                    _prevCount[2],
-                    _nextCount[0],
-                    _nextCount[1],
-                    _nextCount[2]);
-            exit(1);
-         }
-      }
-    }
-#endif
-   nCount[0]=nCount[1]=0;
-   nLeft=nRight=0;
-   for (left=0,c=h[axis];c;) {
-      left=left+c->count;
-      nCount[0]+=c->count;
-      c->flag=0;
-      nLeft++;
-      c=c->next[axis];
-      if (left*2>pixelCount) {
-         break;
-      }
-   }
-   if (c) {
-      splitColourVal=c->prev[axis]->p.a.v[axis];
-      for (;c;c=c->next[axis]) {
-         if (splitColourVal!=c->p.a.v[axis]) {
-            break;
-         }
-         c->flag=0;
-         nLeft++;
-         nCount[0]+=c->count;
-      }
-   }
-   for (;c;c=c->next[axis]) {
-      c->flag=1;
-      nRight++;
-      nCount[1]+=c->count;
-   }
-   if (!nRight) {
-      for (c=t[axis],splitColourVal=t[axis]->p.a.v[axis];c;c=c->prev[axis]) {
-         if (splitColourVal!=c->p.a.v[axis]) {
-            break;
-         }
-         c->flag=1;
-         nRight++;
-         nLeft--;
-         nCount[0]-=c->count;
-         nCount[1]+=c->count;
-      }
-   }
-#ifndef NO_OUTPUT
-   if (!nLeft) {
-      for (c=h[axis];c;c=c->next[axis]) {
-         printf ("[%d %d %d]\n",c->p.c.r,c->p.c.g,c->p.c.b);
-      }
-      printf ("warning... trivial split\n");
-   }
-#endif
-
-   for (i=0;i<3;i++) {
-      l=r=NULL;
-      nh[0][i]=nt[0][i]=NULL;
-      nh[1][i]=nt[1][i]=NULL;
-      for (c=h[i];c;c=n) {
-         n=c->next[i];
-         if (c->flag) {    /* move pixel to right  list*/
-            if (r) r->next[i]=c; else nh[1][i]=c;
-            c->prev[i]=r;
-            r=c;
-         } else {          /* move pixel to left list */
-            if (l) l->next[i]=c; else nh[0][i]=c;
-            c->prev[i]=l;
-            l=c;
-         }
-      }
-      if (l) l->next[i]=NULL;
-      if (r) r->next[i]=NULL;
-      nt[0][i]=l;
-      nt[1][i]=r;
-   }
-   return 1;
-}
-
-static int
-split(BoxNode *node)
-{
-   unsigned char rl,rh,gl,gh,bl,bh;
-   int f[3];
-   int best,axis;
-   int i;
-   PixelList *heads[2][3];
-   PixelList *tails[2][3];
-   unsigned long newCounts[2];
-   BoxNode *left,*right;
-
-   rh=node->head[0]->p.c.r;
-   rl=node->tail[0]->p.c.r;
-   gh=node->head[1]->p.c.g;
-   gl=node->tail[1]->p.c.g;
-   bh=node->head[2]->p.c.b;
-   bl=node->tail[2]->p.c.b;
-#ifdef TEST_SPLIT
-   printf ("splitting node [%d %d %d] [%d %d %d] ",rl,gl,bl,rh,gh,bh);
-#endif
-   f[0]=(rh-rl)*77;
-   f[1]=(gh-gl)*150;
-   f[2]=(bh-bl)*29;
-
-   best=f[0];
-   axis=0;
-   for (i=1;i<3;i++) {
-      if (best<f[i]) { best=f[i]; axis=i; }
-   }
-#ifdef TEST_SPLIT
-   printf ("along axis %d\n",axis+1);
-#endif
-   
-#ifdef TEST_SPLIT
-   {
-      PixelList *_prevTest,*_nextTest;
-      int _i,_nextCount[3],_prevCount[3];
-      for (_i=0;_i<3;_i++) {
-         if (node->tail[_i]->next[_i]) {
-            printf ("tail is not tail\n");
-            printf ("node->tail[%d]->next[%d]=%p\n",_i,_i,node->tail[_i]->next[_i]);
-         }
-         if (node->head[_i]->prev[_i]) {
-            printf ("head is not head\n");
-            printf ("node->head[%d]->prev[%d]=%p\n",_i,_i,node->head[_i]->prev[_i]);
-         }
-      }
-
-      for (_i=0;_i<3;_i++) {
-         for (_nextCount[_i]=0,_nextTest=node->head[_i];_nextTest&&_nextTest->next[_i];_nextTest=_nextTest->next[_i],_nextCount[_i]++);
-         for (_prevCount[_i]=0,_prevTest=node->tail[_i];_prevTest&&_prevTest->prev[_i];_prevTest=_prevTest->prev[_i],_prevCount[_i]++);
-         if (_nextTest!=node->tail[_i]) {
-            printf ("next-list of axis %d does not end at tail\n",_i);
-         }
-         if (_prevTest!=node->head[_i]) {
-            printf ("prev-list of axis %d does not end at head\n",_i);
-         }
-         for (;_nextTest&&_nextTest->prev[_i];_nextTest=_nextTest->prev[_i]);
-         for (;_prevTest&&_prevTest->next[_i];_prevTest=_prevTest->next[_i]);
-         if (_nextTest!=node->head[_i]) {
-            printf ("next-list of axis %d does not loop back to head\n",_i);
-         }
-         if (_prevTest!=node->tail[_i]) {
-            printf ("prev-list of axis %d does not loop back to tail\n",_i);
-         }
-      }
-      for (_i=1;_i<3;_i++) {
-         if (_prevCount[_i]!=_prevCount[_i-1] ||
-             _nextCount[_i]!=_nextCount[_i-1] ||
-             _prevCount[_i]!=_nextCount[_i]) {
-            printf ("{%d %d %d} {%d %d %d}\n",
-                    _prevCount[0],
-                    _prevCount[1],
-                    _prevCount[2],
-                    _nextCount[0],
-                    _nextCount[1],
-                    _nextCount[2]);
-         }
-      }
-    }
-#endif
-   node->axis=axis;
-   if (!splitlists(node->head,
-                   node->tail,
-                   heads,
-                   tails,
-                   newCounts,
-                   axis,
-                   node->pixelCount)) {
-#ifndef NO_OUTPUT
-      printf ("list split failed.\n");
-#endif
-      return 0;
-   }
-#ifdef TEST_SPLIT
-   if (!test_sorted(heads[0])) {
-      printf ("bug in split");
-      exit(1);
-   }
-   if (!test_sorted(heads[1])) {
-      printf ("bug in split");
-      exit(1);
-   }
-#endif
-   left=malloc(sizeof(BoxNode));
-   right=malloc(sizeof(BoxNode));
-   if (!left||!right) {
-      return 0;
-   }
-   for(i=0;i<3;i++) {
-      left->head[i]=heads[0][i];
-      left->tail[i]=tails[0][i];
-      right->head[i]=heads[1][i];
-      right->tail[i]=tails[1][i];
-      node->head[i]=NULL;
-      node->tail[i]=NULL;
-   }
-#ifdef TEST_SPLIT
-   if (left->head[0]) {
-      rh=left->head[0]->p.c.r;
-      rl=left->tail[0]->p.c.r;
-      gh=left->head[1]->p.c.g;
-      gl=left->tail[1]->p.c.g;
-      bh=left->head[2]->p.c.b;
-      bl=left->tail[2]->p.c.b;
-      printf ("   left node  [%3d %3d %3d] [%3d %3d %3d]\n",rl,gl,bl,rh,gh,bh);
-   }
-   if (right->head[0]) {
-      rh=right->head[0]->p.c.r;
-      rl=right->tail[0]->p.c.r;
-      gh=right->head[1]->p.c.g;
-      gl=right->tail[1]->p.c.g;
-      bh=right->head[2]->p.c.b;
-      bl=right->tail[2]->p.c.b;
-      printf ("   right node [%3d %3d %3d] [%3d %3d %3d]\n",rl,gl,bl,rh,gh,bh);
-   }
-#endif
-   left->l=left->r=NULL;
-   right->l=right->r=NULL;
-   left->axis=right->axis=-1;
-   left->volume=right->volume=-1;
-   left->pixelCount=newCounts[0];
-   right->pixelCount=newCounts[1];
-   node->l=left;
-   node->r=right;
-   return 1;
-}
-
-static BoxNode *
-median_cut(PixelList *hl[3],
-           unsigned long imPixelCount,
-           int nPixels)
-{
-   PixelList *tl[3];
-   int i;
-   BoxNode *root;
-   Heap h;
-   BoxNode *thisNode;
-
-   h=ImagingQuantHeapNew(box_heap_cmp);
-   root=malloc(sizeof(BoxNode));
-   if (!root) { ImagingQuantHeapFree(h); return NULL; }
-   for(i=0;i<3;i++) {
-      for (tl[i]=hl[i];tl[i]&&tl[i]->next[i];tl[i]=tl[i]->next[i]);
-      root->head[i]=hl[i];
-      root->tail[i]=tl[i];
-   }
-   root->l=root->r=NULL;
-   root->axis=-1;
-   root->volume=-1;
-   root->pixelCount=imPixelCount;
-
-   ImagingQuantHeapAdd(h,(void *)root);
-   while (--nPixels) {
-      do {
-         if (!ImagingQuantHeapRemove(h,(void **)&thisNode)) {
-            goto done;
-         }
-      } while (compute_box_volume(thisNode)==1);
-      if (!split(thisNode)) {
-#ifndef NO_OUTPUT
-         printf ("Oops, split failed...\n");
-#endif
-         exit (1);
-      }
-      ImagingQuantHeapAdd(h,(void *)(thisNode->l));
-      ImagingQuantHeapAdd(h,(void *)(thisNode->r));
-   }
-   ImagingQuantHeapFree(h);
-done:
-   return root;
-}
-
-static void
-free_box_tree(BoxNode *n)
-{
-   PixelList *p,*pp;
-   if (n->l) free_box_tree(n->l);
-   if (n->r) free_box_tree(n->r);
-   for (p=n->head[0];p;p=pp) {
-      pp=p->next[0];
-      free(p);
-   }
-   free(n);
-}
-
-static int
-checkContained(BoxNode *n,Pixel *pp)
-{
-   if (n->l&&n->r) {
-      return checkContained(n->l,pp)+checkContained(n->r,pp);
-   }
-   if (n->l||n->r) {
-#ifndef NO_OUTPUT
-      printf ("box tree is dead\n");
-#endif
-      return 0;
-   }
-   if (
-       pp->c.r<=n->head[0]->p.c.r &&
-       pp->c.r>=n->tail[0]->p.c.r &&
-       pp->c.g<=n->head[1]->p.c.g &&
-       pp->c.g>=n->tail[1]->p.c.g &&
-       pp->c.b<=n->head[2]->p.c.b &&
-       pp->c.b>=n->tail[2]->p.c.b) {
-      return 1;
-   }
-   return 0;
-}
-
-static int
-annotate_hash_table(BoxNode *n,HashTable h,unsigned long *box)
-{
-   PixelList *p;
-   PixelHashData *d=(PixelHashData *)hashtable_get_user_data(h);
-   Pixel q;
-   if (n->l&&n->r) {
-      return annotate_hash_table(n->l,h,box) && annotate_hash_table(n->r,h,box);
-   }
-   if (n->l||n->r) {
-#ifndef NO_OUTPUT
-      printf ("box tree is dead\n");
-#endif
-      return 0;
-   }
-   for (p=n->head[0];p;p=p->next[0]) {
-      PIXEL_UNSCALE(&(p->p),&q,d->scale);
-      if (!hashtable_insert(h,(void *)q.v,(void *)*box)) {
-#ifndef NO_OUTPUT
-         printf ("hashtable insert failed\n");
-#endif
-         return 0;
-      }
-   }
-   if (n->head[0]) (*box)++;
-   return 1;
-}
-
-static int
-_sort_ulong_ptr_keys(const void *a, const void *b)
-{
-   unsigned long A=**(unsigned long **)a;
-   unsigned long B=**(unsigned long **)b;
-   return (A==B)?0:((A<B)?-1:+1);
-}
-
-static int
-resort_distance_tables(unsigned long *avgDist,
-                       unsigned long **avgDistSortKey,
-                       Pixel *p,
-                       unsigned long nEntries)
-{
-   unsigned long i,j,k;
-   unsigned long **skRow;
-   unsigned long *skElt;
-
-   for (i=0;i<nEntries;i++) {
-      avgDist[i*nEntries+i]=0;
-      for (j=0;j<i;j++) {
-         avgDist[j*nEntries+i]=
-         avgDist[i*nEntries+j]=_DISTSQR(p+i,p+j);
-      }
-   }
-   for (i=0;i<nEntries;i++) {
-      skRow=avgDistSortKey+i*nEntries;
-      for (j=1;j<nEntries;j++) {
-         skElt=skRow[j];
-         for (k=j;k&&(*(skRow[k-1])>*(skRow[k]));k--) {
-            skRow[k]=skRow[k-1];
-         }
-         if (k!=j) skRow[k]=skElt;
-      }
-   }
-   return 1;
-}
-
-static int
-build_distance_tables(unsigned long *avgDist,
-                      unsigned long **avgDistSortKey,
-                      Pixel *p,
-                      unsigned long nEntries)
-{
-   unsigned long i,j;
-
-   for (i=0;i<nEntries;i++) {
-      avgDist[i*nEntries+i]=0;
-      avgDistSortKey[i*nEntries+i]=&(avgDist[i*nEntries+i]);
-      for (j=0;j<i;j++) {
-         avgDist[j*nEntries+i]=
-         avgDist[i*nEntries+j]=_DISTSQR(p+i,p+j);
-         avgDistSortKey[j*nEntries+i]=&(avgDist[j*nEntries+i]);
-         avgDistSortKey[i*nEntries+j]=&(avgDist[i*nEntries+j]);
-      }
-   }
-   for (i=0;i<nEntries;i++) {
-      qsort(avgDistSortKey+i*nEntries,
-            nEntries,
-            sizeof(unsigned long *),
-            _sort_ulong_ptr_keys);
-   }
-   return 1;
-}
-
-static int
-map_image_pixels(Pixel *pixelData,
-                 unsigned long nPixels,
-                 Pixel *paletteData,
-                 unsigned long nPaletteEntries,
-                 unsigned long *avgDist,
-                 unsigned long **avgDistSortKey,
-                 unsigned long *pixelArray)
-{
-   unsigned long *aD,**aDSK;
-   unsigned long idx;
-   unsigned long i,j;
-   unsigned long bestdist,bestmatch,dist;
-   unsigned long initialdist;
-   HashTable h2;
-
-   h2=hashtable_new(unshifted_pixel_hash,unshifted_pixel_cmp);
-   for (i=0;i<nPixels;i++) {
-      if (!hashtable_lookup(h2,(void *)pixelData[i].v,(void **)&bestmatch)) {
-         bestmatch=0;
-         initialdist=_DISTSQR(paletteData+bestmatch,pixelData+i);
-         bestdist=initialdist;
-         initialdist<<=2;
-         aDSK=avgDistSortKey+bestmatch*nPaletteEntries;
-         aD=avgDist+bestmatch*nPaletteEntries;
-         for (j=0;j<nPaletteEntries;j++) {
-            idx=aDSK[j]-aD;
-            if (*(aDSK[j])<=initialdist)  {
-               dist=_DISTSQR(paletteData+idx,pixelData+i);
-               if (dist<bestdist) {
-                  bestdist=dist;
-                  bestmatch=idx;
-               }
-            } else {
-               break;
-            }
-         }
-         hashtable_insert(h2,(void *)pixelData[i].v,(void *)bestmatch);
-      }
-      pixelArray[i]=bestmatch;
-   }
-   hashtable_free(h2);
-   return 1;
-}
-
-static int
-map_image_pixels_from_quantized_pixels(
-    Pixel *pixelData,
-    unsigned long nPixels,
-    Pixel *paletteData,
-    unsigned long nPaletteEntries,
-    unsigned long *avgDist,
-    unsigned long **avgDistSortKey,
-    unsigned long *pixelArray,
-    unsigned long *avg[3],
-    unsigned long *count)
-{
-   unsigned long *aD,**aDSK;
-   unsigned long idx;
-   unsigned long i,j;
-   unsigned long bestdist,bestmatch,dist;
-   unsigned long initialdist;
-   HashTable h2;
-   int changes=0;
-
-   h2=hashtable_new(unshifted_pixel_hash,unshifted_pixel_cmp);
-   for (i=0;i<nPixels;i++) {
-      if (!hashtable_lookup(h2,(void *)pixelData[i].v,(void **)&bestmatch)) {
-         bestmatch=pixelArray[i];
-         initialdist=_DISTSQR(paletteData+bestmatch,pixelData+i);
-         bestdist=initialdist;
-         initialdist<<=2;
-         aDSK=avgDistSortKey+bestmatch*nPaletteEntries;
-         aD=avgDist+bestmatch*nPaletteEntries;
-         for (j=0;j<nPaletteEntries;j++) {
-            idx=aDSK[j]-aD;
-            if (*(aDSK[j])<=initialdist)  {
-               dist=_DISTSQR(paletteData+idx,pixelData+i);
-               if (dist<bestdist) {
-                  bestdist=dist;
-                  bestmatch=idx;
-               }
-            } else {
-               break;
-            }
-         }
-         hashtable_insert(h2,(void *)pixelData[i].v,(void *)bestmatch);
-      }
-      if (pixelArray[i]!=bestmatch) {
-         changes++;
-         avg[0][bestmatch]+=pixelData[i].c.r;
-         avg[1][bestmatch]+=pixelData[i].c.g;
-         avg[2][bestmatch]+=pixelData[i].c.b;
-         avg[0][pixelArray[i]]-=pixelData[i].c.r;
-         avg[1][pixelArray[i]]-=pixelData[i].c.g;
-         avg[2][pixelArray[i]]-=pixelData[i].c.b;
-         count[bestmatch]++;
-         count[pixelArray[i]]--;
-         pixelArray[i]=bestmatch;
-      }
-   }
-   hashtable_free(h2);
-   return changes;
-}
-
-static int
-map_image_pixels_from_median_box(
-    Pixel *pixelData,
-    unsigned long nPixels,
-    Pixel *paletteData,
-    unsigned long nPaletteEntries,
-    HashTable *medianBoxHash,
-    unsigned long *avgDist,
-    unsigned long **avgDistSortKey,
-    unsigned long *pixelArray)
-{
-   unsigned long *aD,**aDSK;
-   unsigned long idx;
-   unsigned long i,j;
-   unsigned long bestdist,bestmatch,dist;
-   unsigned long initialdist;
-   HashTable h2;
-   int pixelVal;
-
-   h2=hashtable_new(unshifted_pixel_hash,unshifted_pixel_cmp);
-   for (i=0;i<nPixels;i++) {
-      if (hashtable_lookup(h2,(void *)pixelData[i].v,(void **)&pixelVal)) {
-         pixelArray[i]=pixelVal;
-         continue;
-      }
-      if (!hashtable_lookup(medianBoxHash,(void *)pixelData[i].v,(void **)&pixelVal)) {
-#ifndef NO_OUTPUT
-         printf ("pixel lookup failed\n");
-#endif
-         return 0;
-      }
-      initialdist=_DISTSQR(paletteData+pixelVal,pixelData+i);
-      bestdist=initialdist;
-      bestmatch=pixelVal;
-      initialdist<<=2;
-      aDSK=avgDistSortKey+pixelVal*nPaletteEntries;
-      aD=avgDist+pixelVal*nPaletteEntries;
-      for (j=0;j<nPaletteEntries;j++) {
-         idx=aDSK[j]-aD;
-         if (*(aDSK[j])<=initialdist)  {
-            dist=_DISTSQR(paletteData+idx,pixelData+i);
-            if (dist<bestdist) {
-               bestdist=dist;
-               bestmatch=idx;
-            }
-         } else {
-            break;
-         }
-      }
-      pixelArray[i]=bestmatch;
-      hashtable_insert(h2,(void *)pixelData[i].v,(void *)bestmatch);
-   }
-   hashtable_free(h2);
-   return 1;
-}
-
-static int
-compute_palette_from_median_cut(
-    Pixel *pixelData,
-    unsigned long nPixels,
-    HashTable medianBoxHash,
-    Pixel **palette,
-    unsigned long nPaletteEntries)
-{
-   unsigned long i;
-   unsigned long paletteEntry;
-   Pixel *p;
-   unsigned long *avg[3];
-   unsigned long *count;
-   
-   *palette=NULL;
-   if (!(count=malloc(sizeof(unsigned long)*nPaletteEntries))) {
-      return 0;
-   }
-   memset(count,0,sizeof(unsigned long)*nPaletteEntries);
-   for(i=0;i<3;i++) {
-      avg[i]=NULL;
-   }
-   for(i=0;i<3;i++) {
-      if (!(avg[i]=malloc(sizeof(unsigned long)*nPaletteEntries))) {
-         for(i=0;i<3;i++) {
-            if (avg[i]) free (avg[i]);
-         }
-         free(count);
-         return 0;
-      }
-   }
-   for(i=0;i<3;i++) {
-      memset(avg[i],0,sizeof(unsigned long)*nPaletteEntries);
-   }
-   for (i=0;i<nPixels;i++) {
-#ifdef TEST_SPLIT_INTEGRITY
-      if (!(i%100)) { printf ("%05d\r",i); fflush(stdout); }
-      if (checkContained(root,pixelData+i)>1) {
-         printf ("pixel in two boxes\n");
-         for(i=0;i<3;i++) free (avg[i]);
-         free(count);
-         return 0;
-      }
-#endif
-      if (!hashtable_lookup(medianBoxHash,(void *)pixelData[i].v,(void **)&paletteEntry)) {
-#ifndef NO_OUTPUT
-         printf ("pixel lookup failed\n");
-#endif
-         for(i=0;i<3;i++) free (avg[i]);
-         free(count);
-         return 0;
-      }
-      if (paletteEntry>=nPaletteEntries) {
-#ifndef NO_OUTPUT
-         printf ("panic - paletteEntry>=nPaletteEntries (%d>=%d)\n",(int)paletteEntry,(int)nPaletteEntries);
-#endif
-         for(i=0;i<3;i++) free (avg[i]);
-         free(count);
-         return 0;
-      }
-      avg[0][paletteEntry]+=pixelData[i].c.r;
-      avg[1][paletteEntry]+=pixelData[i].c.g;
-      avg[2][paletteEntry]+=pixelData[i].c.b;
-      count[paletteEntry]++;
-   }
-   p=malloc(sizeof(Pixel)*nPaletteEntries);
-   if (!p) {
-      for(i=0;i<3;i++) free (avg[i]);
-      free(count);
-      return 0;
-   }
-   for (i=0;i<nPaletteEntries;i++) {
-      p[i].c.r=(int)(.5+(double)avg[0][i]/(double)count[i]);
-      p[i].c.g=(int)(.5+(double)avg[1][i]/(double)count[i]);
-      p[i].c.b=(int)(.5+(double)avg[2][i]/(double)count[i]);
-   }
-   *palette=p;
-   for(i=0;i<3;i++) free (avg[i]);
-   free(count);
-   return 1;
-}
-
-static int
-recompute_palette_from_averages(
-    Pixel *palette,
-    unsigned long nPaletteEntries,
-    unsigned long *avg[3],
-    unsigned long *count)
-{
-    unsigned long i;
-
-    for (i=0;i<nPaletteEntries;i++) {
-        palette[i].c.r=(int)(.5+(double)avg[0][i]/(double)count[i]);
-        palette[i].c.g=(int)(.5+(double)avg[1][i]/(double)count[i]);
-        palette[i].c.b=(int)(.5+(double)avg[2][i]/(double)count[i]);
-    }
-    return 1;
-}
-
-static int
-compute_palette_from_quantized_pixels(
-    Pixel *pixelData,
-    unsigned long nPixels,
-    Pixel *palette,
-    unsigned long nPaletteEntries,
-    unsigned long *avg[3],
-    unsigned long *count,
-    unsigned long *qp)
-{
-   unsigned long i;
-
-   memset(count,0,sizeof(unsigned long)*nPaletteEntries);
-   for(i=0;i<3;i++) {
-      memset(avg[i],0,sizeof(unsigned long)*nPaletteEntries);
-   }
-   for (i=0;i<nPixels;i++) {
-      if (qp[i]>=nPaletteEntries) {
-#ifndef NO_OUTPUT
-         printf ("scream\n");
-#endif
-         return 0;
-      }
-      avg[0][qp[i]]+=pixelData[i].c.r;
-      avg[1][qp[i]]+=pixelData[i].c.g;
-      avg[2][qp[i]]+=pixelData[i].c.b;
-      count[qp[i]]++;
-   }
-   for (i=0;i<nPaletteEntries;i++) {
-      palette[i].c.r=(int)(.5+(double)avg[0][i]/(double)count[i]);
-      palette[i].c.g=(int)(.5+(double)avg[1][i]/(double)count[i]);
-      palette[i].c.b=(int)(.5+(double)avg[2][i]/(double)count[i]);
-   }
-   return 1;
-}
-
-static int
-k_means(Pixel *pixelData,
-        unsigned long nPixels,
-        Pixel *paletteData,
-        unsigned long nPaletteEntries,
-        unsigned long *qp,
-        int threshold)
-{
-   unsigned long *avg[3];
-   unsigned long *count;
-   unsigned long i;
-   unsigned long *avgDist;
-   unsigned long **avgDistSortKey;
-   int changes;
-   int built=0;
-   
-   if (!(count=malloc(sizeof(unsigned long)*nPaletteEntries))) {
-      return 0;
-   }
-   for(i=0;i<3;i++) {
-      avg[i]=NULL;
-   }
-   for(i=0;i<3;i++) {
-      if (!(avg[i]=malloc(sizeof(unsigned long)*nPaletteEntries))) {
-         goto error_1;
-      }
-   }
-   avgDist=malloc(sizeof(unsigned long)*nPaletteEntries*nPaletteEntries);
-   if (!avgDist) { goto error_1; }
-
-   avgDistSortKey=malloc(sizeof(unsigned long *)*nPaletteEntries*nPaletteEntries);
-   if (!avgDistSortKey) { goto error_2; }
-
-#ifndef NO_OUTPUT
-   printf("[");fflush(stdout);
-#endif
-   while (1) {
-      if (!built) {
-         compute_palette_from_quantized_pixels(pixelData,nPixels,paletteData,nPaletteEntries,avg,count,qp);
-         build_distance_tables(avgDist,avgDistSortKey,paletteData,nPaletteEntries);
-         built=1;
-      } else {
-         recompute_palette_from_averages(paletteData,nPaletteEntries,avg,count);
-         resort_distance_tables(avgDist,avgDistSortKey,paletteData,nPaletteEntries);
-      }
-      changes=map_image_pixels_from_quantized_pixels(pixelData,
-                                                     nPixels,
-                                                     paletteData,
-                                                     nPaletteEntries,
-                                                     avgDist,
-                                                     avgDistSortKey,
-                                                     qp,
-                                                     avg,
-                                                     count);
-      if (changes<0) {
-         goto error_3;
-      }
-#ifndef NO_OUTPUT
-      printf (".(%d)",changes);fflush(stdout);
-#endif
-      if (changes<=threshold) break;
-   }
-#ifndef NO_OUTPUT
-   printf("]\n");
-#endif
-   if (avgDistSortKey) free(avgDistSortKey);
-   if (avgDist) free(avgDist);
-   for(i=0;i<3;i++) if (avg[i]) free (avg[i]);
-   if (count) free(count);
-   return 1;
-
-error_3:
-   if (avgDistSortKey) free(avgDistSortKey);
-error_2:
-   if (avgDist) free(avgDist);
-error_1:
-   for(i=0;i<3;i++) if (avg[i]) free (avg[i]);
-   if (count) free(count);
-   return 0;
-}
-
-int
-quantize(Pixel *pixelData,
-         unsigned long nPixels,
-         unsigned long nQuantPixels,
-         Pixel **palette,
-         unsigned long *paletteLength,
-         unsigned long **quantizedPixels,
-         int kmeans)
-{
-   PixelList *hl[3];
-   HashTable h;
-   BoxNode *root;
-   unsigned long i;
-   unsigned long *qp;
-   unsigned long nPaletteEntries;
-   
-   unsigned long *avgDist;
-   unsigned long **avgDistSortKey;
-   Pixel *p;
-   
-#ifndef NO_OUTPUT
-   unsigned long timer,timer2;
-#endif
-
-#ifndef NO_OUTPUT
-   timer2=clock();
-   printf ("create hash table..."); fflush(stdout); timer=clock();
-#endif
-   h=create_pixel_hash(pixelData,nPixels);
-#ifndef NO_OUTPUT
-   printf ("done (%f)\n",(clock()-timer)/(double)CLOCKS_PER_SEC);
-#endif
-   if (!h) {
-      goto error_0;
-   }
-
-#ifndef NO_OUTPUT
-   printf ("create lists from hash table..."); fflush(stdout); timer=clock();
-#endif
-   hl[0]=hl[1]=hl[2]=NULL;
-   hashtable_foreach(h,hash_to_list,hl);
-#ifndef NO_OUTPUT
-   printf ("done (%f)\n",(clock()-timer)/(double)CLOCKS_PER_SEC);
-#endif
-
-   if (!hl[0]) {
-      goto error_1;
-   }
-
-#ifndef NO_OUTPUT
-   printf ("mergesort lists..."); fflush(stdout); timer=clock();
-#endif
-   for(i=0;i<3;i++) {
-      hl[i]=mergesort_pixels(hl[i],i);
-   }
-#ifdef TEST_MERGESORT
-   if (!test_sorted(hl)) {
-      printf ("bug in mergesort\n");
-      goto error_1;
-   }
-#endif
-#ifndef NO_OUTPUT
-   printf ("done (%f)\n",(clock()-timer)/(double)CLOCKS_PER_SEC);
-#endif
-
-#ifndef NO_OUTPUT
-   printf ("median cut..."); fflush(stdout); timer=clock();
-#endif
-   root=median_cut(hl,nPixels,nQuantPixels);
-#ifndef NO_OUTPUT
-   printf ("done (%f)\n",(clock()-timer)/(double)CLOCKS_PER_SEC);
-#endif
-   if (!root) {
-      goto error_1;
-   }
-   nPaletteEntries=0;
-#ifndef NO_OUTPUT
-   printf ("median cut tree to hash table..."); fflush(stdout); timer=clock();
-#endif
-   annotate_hash_table(root,h,&nPaletteEntries);
-#ifndef NO_OUTPUT
-   printf ("done (%f)\n",(clock()-timer)/(double)CLOCKS_PER_SEC);
-#endif
-#ifndef NO_OUTPUT
-   printf ("compute palette...\n"); fflush(stdout); timer=clock();
-#endif
-   if (!compute_palette_from_median_cut(pixelData,nPixels,h,&p,nPaletteEntries)) {
-      goto error_3;
-   }
-#ifndef NO_OUTPUT
-   printf ("done (%f)\n",(clock()-timer)/(double)CLOCKS_PER_SEC);
-#endif
-
-   free_box_tree(root);
-   root=NULL;
-
-   qp=malloc(sizeof(unsigned long)*nPixels);
-   if (!qp) { goto error_4; }
-
-   avgDist=malloc(sizeof(unsigned long)*nPaletteEntries*nPaletteEntries);
-   if (!avgDist) { goto error_5; }
-
-   avgDistSortKey=malloc(sizeof(unsigned long *)*nPaletteEntries*nPaletteEntries);
-   if (!avgDistSortKey) { goto error_6; }
-
-   if (!build_distance_tables(avgDist,avgDistSortKey,p,nPaletteEntries)) {
-      goto error_7;
-   }
-
-   if (!map_image_pixels_from_median_box(pixelData,nPixels,p,nPaletteEntries,h,avgDist,avgDistSortKey,qp)) {
-      goto error_7;
-   }
-
-#ifdef TEST_NEAREST_NEIGHBOUR
-#include <math.h>
-   {
-      unsigned long bestmatch,bestdist,dist;
-      HashTable h2;
-      printf ("nearest neighbour search (full search)..."); fflush(stdout); timer=clock();
-      h2=hashtable_new(unshifted_pixel_hash,unshifted_pixel_cmp);
-      for (i=0;i<nPixels;i++) {
-         if (hashtable_lookup(h2,(void *)pixelData[i].v,(void **)&paletteEntry)) {
-            bestmatch=paletteEntry;
-         } else {
-            bestmatch=0;
-            bestdist=
-               _SQR(pixelData[i].c.r-p[0].c.r)+
-               _SQR(pixelData[i].c.g-p[0].c.g)+
-               _SQR(pixelData[i].c.b-p[0].c.b);
-            for (j=1;j<nPaletteEntries;j++) {
-               dist=
-                  _SQR(pixelData[i].c.r-p[j].c.r)+
-                  _SQR(pixelData[i].c.g-p[j].c.g)+
-                  _SQR(pixelData[i].c.b-p[j].c.b);
-               if (dist==bestdist && j==qp[i]) {
-                  bestmatch=j;
-               }
-               if (dist<bestdist) {
-                  bestdist=dist;
-                  bestmatch=j;
-               }
-            }
-            hashtable_insert(h2,(void *)pixelData[i].v,(void *)bestmatch);
-         }
-         if (qp[i]!=bestmatch ) {
-            printf ("discrepancy in matching algorithms pixel %d [%d %d] %f %f\n",
-                    i,qp[i],bestmatch,
-                    sqrt((double)(_SQR(pixelData[i].c.r-p[qp[i]].c.r)+
-                                  _SQR(pixelData[i].c.g-p[qp[i]].c.g)+
-                                  _SQR(pixelData[i].c.b-p[qp[i]].c.b))),
-                    sqrt((double)(_SQR(pixelData[i].c.r-p[bestmatch].c.r)+
-                                  _SQR(pixelData[i].c.g-p[bestmatch].c.g)+
-                                  _SQR(pixelData[i].c.b-p[bestmatch].c.b)))
-                   );
-         }
-      }
-      hashtable_free(h2);
-   }
-#endif
-#ifndef NO_OUTPUT
-   printf ("k means...\n"); fflush(stdout); timer=clock();
-#endif
-   if (kmeans) k_means(pixelData,nPixels,p,nPaletteEntries,qp,kmeans-1);
-#ifndef NO_OUTPUT
-   printf ("done (%f)\n",(clock()-timer)/(double)CLOCKS_PER_SEC);
-#endif
-
-   *quantizedPixels=qp;
-   *palette=p;
-   *paletteLength=nPaletteEntries;
-
-#ifndef NO_OUTPUT
-   printf ("cleanup..."); fflush(stdout); timer=clock();
-#endif
-   if (avgDist) free(avgDist);
-   if (avgDistSortKey) free(avgDistSortKey);
-   destroy_pixel_hash(h);
-#ifndef NO_OUTPUT
-   printf ("done (%f)\n",(clock()-timer)/(double)CLOCKS_PER_SEC);
-   printf ("-----\ntotal time %f\n",(clock()-timer2)/(double)CLOCKS_PER_SEC);
-#endif
-   return 1;
-
-error_7:
-   if (avgDistSortKey) free(avgDistSortKey);
-error_6:
-   if (avgDist) free(avgDist);
-error_5:
-   if (qp) free(qp);
-error_4:
-   if (p) free(p);
-error_3:
-   if (root) free_box_tree(root);
-error_1:
-   destroy_pixel_hash(h);
-error_0:
-   *quantizedPixels=NULL;
-   *paletteLength=0;
-   *palette=NULL;
-   return 0;
-}
-
-typedef struct {
-   Pixel new;
-   Pixel furthest;
-   unsigned long furthestDistance;
-   int secondPixel;
-} DistanceData;
-
-static void
-compute_distances(const HashTable h, const void *key, void **val, void *u)
-{
-   DistanceData *data=(DistanceData *)u;
-   Pixel *pixel=(Pixel *)&key;
-   unsigned long oldDist=*(unsigned long *)val;
-   unsigned long newDist;
-   newDist=_DISTSQR(&(data->new),pixel);
-   if (data->secondPixel || newDist<oldDist) {
-      *(unsigned long *)val=newDist;
-      oldDist=newDist;
-   }
-   if (oldDist>data->furthestDistance) {
-      data->furthestDistance=oldDist;
-      data->furthest.v=pixel->v;
-   }
-}
-
-int
-quantize2(Pixel *pixelData,
-          unsigned long nPixels,
-          unsigned long nQuantPixels,
-          Pixel **palette,
-          unsigned long *paletteLength,
-          unsigned long **quantizedPixels,
-          int kmeans)
-{
-   HashTable h;
-   unsigned long i;
-   unsigned long mean[3];
-   Pixel *p;
-   DistanceData data;
-
-   unsigned long *qp;
-   unsigned long *avgDist;
-   unsigned long **avgDistSortKey;
-
-   p=malloc(sizeof(Pixel)*nQuantPixels);
-   if (!p) return 0;
-   mean[0]=mean[1]=mean[2]=0;
-   h=hashtable_new(unshifted_pixel_hash,unshifted_pixel_cmp);
-   for (i=0;i<nPixels;i++) {
-      hashtable_insert(h,(void *)pixelData[i].v,(void *)0xffffffff);
-      mean[0]+=pixelData[i].c.r;
-      mean[1]+=pixelData[i].c.g;
-      mean[2]+=pixelData[i].c.b;
-   }
-   data.new.c.r=(int)(.5+(double)mean[0]/(double)nPixels);
-   data.new.c.g=(int)(.5+(double)mean[1]/(double)nPixels);
-   data.new.c.b=(int)(.5+(double)mean[2]/(double)nPixels);
-   for (i=0;i<nQuantPixels;i++) {
-      data.furthestDistance=0;
-      data.secondPixel=(i==1)?1:0;
-      hashtable_foreach_update(h,compute_distances,&data);
-      p[i].v=data.furthest.v;
-      data.new.v=data.furthest.v;
-   }
-   hashtable_free(h);
-
-   qp=malloc(sizeof(unsigned long)*nPixels);
-   if (!qp) { goto error_1; }
-
-   avgDist=malloc(sizeof(unsigned long)*nQuantPixels*nQuantPixels);
-   if (!avgDist) { goto error_2; }
-
-   avgDistSortKey=malloc(sizeof(unsigned long *)*nQuantPixels*nQuantPixels);
-   if (!avgDistSortKey) { goto error_3; }
-
-   if (!build_distance_tables(avgDist,avgDistSortKey,p,nQuantPixels)) {
-      goto error_4;
-   }
-
-   if (!map_image_pixels(pixelData,nPixels,p,nQuantPixels,avgDist,avgDistSortKey,qp)) {
-      goto error_4;
-   }
-   if (kmeans) k_means(pixelData,nPixels,p,nQuantPixels,qp,kmeans-1);
-
-   *paletteLength=nQuantPixels;
-   *palette=p;
-   *quantizedPixels=qp;
-   free(avgDistSortKey);
-   free(avgDist);
-   return 1;
-
-error_4:
-   free(avgDistSortKey);
-error_3:
-   free(avgDist);
-error_2:
-   free(qp);
-error_1:
-   free(p);
-   return 0;
-}
-
-Imaging
-ImagingQuantize(Imaging im, int colors, int mode, int kmeans)
-{
-    int i, j;
-    int x, y, v;
-    UINT8* pp;
-    Pixel* p;
-    Pixel* palette;
-    unsigned long paletteLength;
-    int result;
-    unsigned long* newData;
-    Imaging imOut;
-
-    if (!im)
-	return ImagingError_ModeError();
-    if (colors < 1 || colors > 256)
-        /* FIXME: for colors > 256, consider returning an RGB image
-           instead (see @PIL205) */
-        return (Imaging) ImagingError_ValueError("bad number of colors");
-
-    if (strcmp(im->mode, "L") != 0 && strcmp(im->mode, "P") != 0 &&
-        strcmp(im->mode, "RGB"))
-        return ImagingError_ModeError();
-
-    p = malloc(sizeof(Pixel) * im->xsize * im->ysize);
-    if (!p)
-        return ImagingError_MemoryError();
-
-    /* collect statistics */
-
-    /* FIXME: maybe we could load the hash tables directly from the
-       image data? */
-
-    if (!strcmp(im->mode, "L")) {
-        /* greyscale */
-
-        /* FIXME: converting a "L" image to "P" with 256 colors
-           should be done by a simple copy... */
-
-        for (i = y = 0; y < im->ysize; y++)
-            for (x = 0; x < im->xsize; x++, i++)
-                p[i].c.r = p[i].c.g = p[i].c.b = im->image8[y][x];
-
-    } else if (!strcmp(im->mode, "P")) {
-        /* palette */
-
-        pp = im->palette->palette;
-
-        for (i = y = 0; y < im->ysize; y++)
-            for (x = 0; x < im->xsize; x++, i++) {
-                v = im->image8[y][x];
-                p[i].c.r = pp[v*4+0];
-                p[i].c.g = pp[v*4+1];
-                p[i].c.b = pp[v*4+2];
-            }
-
-    } else if (!strcmp(im->mode, "RGB")) {
-        /* true colour */
-
-        for (i = y = 0; y < im->ysize; y++)
-            for (x = 0; x < im->xsize; x++, i++)
-                p[i].v = im->image32[y][x];
-
-    } else {
-        free(p);
-        return (Imaging) ImagingError_ValueError("internal error");
-    }
-
-    switch (mode) {
-    case 0:
-        /* median cut */
-        result = quantize(
-            p,
-            im->xsize*im->ysize,
-            colors,
-            &palette,
-            &paletteLength,
-            &newData,
-            kmeans
-            );
-        break;
-    case 1:
-        /* maximum coverage */
-        result = quantize2(
-            p,
-            im->xsize*im->ysize,
-            colors,
-            &palette,
-            &paletteLength,
-            &newData,
-            kmeans
-            );
-        break;
-    default:
-        result = 0;
-        break;
-    }
-
-    free(p);
-
-    if (result) {
-
-        imOut = ImagingNew("P", im->xsize, im->ysize);
-
-        for (i = y = 0; y < im->ysize; y++)
-            for (x=0; x < im->xsize; x++)
-                imOut->image8[y][x] = (unsigned char) newData[i++];
-
-        free(newData);
-
-        pp = imOut->palette->palette;
-
-        for (i = j = 0; i < (int) paletteLength; i++) {
-            *pp++ = palette[i].c.r;
-            *pp++ = palette[i].c.g;
-            *pp++ = palette[i].c.b;
-            *pp++ = 255;
-        }
-        for (; i < 256; i++) {
-            *pp++ = 0;
-            *pp++ = 0;
-            *pp++ = 0;
-            *pp++ = 255;
-        }
-
-        free(palette);
-
-        return imOut;
-
-    } else {
-
-        return (Imaging) ImagingError_ValueError("quantization error");
-
-    }
-}
diff --git a/pythonPackages/pil/libImaging/Quant.h b/pythonPackages/pil/libImaging/Quant.h
deleted file mode 100644
index 3626653aa5..0000000000
--- a/pythonPackages/pil/libImaging/Quant.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Quant.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * image quantizer
- *
- * Written by Toby J Sargeant <tjs@longford.cs.monash.edu.au>.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#ifndef __QUANT_H__
-#define __QUANT_H__
-
-typedef union {
-   struct {
-      unsigned char r,g,b,a;
-   } c;
-   struct {
-      unsigned char v[4];
-   } a;
-   unsigned long v;
-} Pixel;
-
-int quantize(Pixel *,
-             unsigned long,
-             unsigned long,
-             Pixel **,
-             unsigned long *,
-             unsigned long **,
-             int);
-
-int quantize2(Pixel *,
-             unsigned long,
-             unsigned long,
-             Pixel **,
-             unsigned long *,
-             unsigned long **,
-             int);
-#endif
diff --git a/pythonPackages/pil/libImaging/QuantDefines.h b/pythonPackages/pil/libImaging/QuantDefines.h
deleted file mode 100644
index cba430727e..0000000000
--- a/pythonPackages/pil/libImaging/QuantDefines.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: QuantDefines.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * image quantizer
- *
- * Written by Toby J Sargeant <tjs@longford.cs.monash.edu.au>.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#ifndef __DEFINES_H__
-#define __DEFINES_H__
-
-#if 0
-
-void *newMalloc(size_t,const char *,const char *,int);
-void newFree(void *,const char *,const char *,int);
-void print_malloc_stats();
-#define malloc(x) newMalloc(x,__FILE__,__FUNCTION__,__LINE__)
-#define free(x) newFree(x,__FILE__,__FUNCTION__,__LINE__)
-
-#endif
-
-#endif
diff --git a/pythonPackages/pil/libImaging/QuantHash.c b/pythonPackages/pil/libImaging/QuantHash.c
deleted file mode 100644
index 74ffca3506..0000000000
--- a/pythonPackages/pil/libImaging/QuantHash.c
+++ /dev/null
@@ -1,473 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: QuantHash.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * hash tables used by the image quantizer
- *
- * history:
- * 98-09-10 tjs  Contributed
- * 98-12-29 fl   Added to PIL 1.0b1
- *
- * Written by Toby J Sargeant <tjs@longford.cs.monash.edu.au>.
- *
- * Copyright (c) 1998 by Toby J Sargeant
- * Copyright (c) 1998 by Secret Labs AB
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "QuantHash.h"
-#include "QuantDefines.h"
-
-typedef struct _IntHashNode {
-   struct _IntHashNode *next;
-   void *key,*value;
-} IntHashNode;
-
-typedef struct _IntHashTable {
-   IntHashNode **table;
-   unsigned long length;
-   unsigned long count;
-   HashFunc hashFunc;
-   HashCmpFunc cmpFunc;
-   DestroyFunc keyDestroyFunc;
-   DestroyFunc valDestroyFunc;
-   void *userData;
-} IntHashTable;
-
-#define MIN_LENGTH 11
-#define RESIZE_FACTOR 3
-
-static int _hashtable_insert_node(IntHashTable *,IntHashNode *,int,int,CollisionFunc);
-static int _hashtable_test(IntHashTable *);
-
-HashTable hashtable_new(HashFunc hf,HashCmpFunc cf) {
-   IntHashTable *h;
-   h=malloc(sizeof(IntHashTable));
-   if (!h) { return NULL; }
-   h->hashFunc=hf;
-   h->cmpFunc=cf;
-   h->keyDestroyFunc=NULL;
-   h->valDestroyFunc=NULL;
-   h->length=MIN_LENGTH;
-   h->count=0;
-   h->userData=NULL;
-   h->table=malloc(sizeof(IntHashNode *)*h->length);
-   if (!h->table) { free(h); return NULL; }
-   memset (h->table,0,sizeof(IntHashNode *)*h->length);
-   return (HashTable)h;
-}
-
-static void _hashtable_destroy(HashTable H,const void *key,const void *val,void *u) {
-   IntHashTable *h=(IntHashTable *)H;
-   if (h->keyDestroyFunc&&key) {
-      h->keyDestroyFunc((HashTable)h,(void *)key);
-   }
-   if (h->valDestroyFunc&&val) {
-      h->valDestroyFunc((HashTable)h,(void *)val);
-   }
-}
-
-static unsigned long _findPrime(unsigned long start,int dir) {
-   static int unit[]={0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,0};
-   unsigned long t;
-   while (start>1) {
-      if (!unit[start&0x0f]) {
-         start+=dir;
-         continue;
-      }
-      for (t=2;t<sqrt((double)start);t++) {
-         if (!start%t) break;
-      }
-      if (t>=sqrt((double)start)) {
-         break;
-      }
-      start+=dir;
-   }
-   return start;
-}
-
-static void _hashtable_rehash(IntHashTable *h,
-                              CollisionFunc cf,
-                              unsigned long newSize) {
-   IntHashNode **oldTable=h->table;
-   unsigned long i;
-   IntHashNode *n,*nn;
-   unsigned long oldSize;
-   oldSize=h->length;
-   h->table=malloc(sizeof(IntHashNode *)*newSize);
-   if (!h->table) {
-      h->table=oldTable;
-      return;
-   }
-   h->length=newSize;
-   h->count=0;
-   memset (h->table,0,sizeof(IntHashNode *)*h->length);
-   for (i=0;i<oldSize;i++) {
-      for (n=oldTable[i];n;n=nn) {
-         nn=n->next;
-         _hashtable_insert_node(h,n,0,0,cf);
-      }
-   }
-   free(oldTable);
-}
-
-static void _hashtable_resize(IntHashTable *h) {
-   unsigned long newSize;
-   unsigned long oldSize;
-   oldSize=h->length;
-   newSize=oldSize;
-   if (h->count*RESIZE_FACTOR<h->length) {
-      newSize=_findPrime(h->length/2-1,-1);
-   } else  if (h->length*RESIZE_FACTOR<h->count) {
-      newSize=_findPrime(h->length*2+1,+1);
-   }
-   if (newSize<MIN_LENGTH) { newSize=oldSize; }
-   if (newSize!=oldSize) {
-      _hashtable_rehash(h,NULL,newSize);
-   }
-}
-
-static int _hashtable_test(IntHashTable *h) {
-   unsigned long i;
-   int j;
-   IntHashNode *n;
-   for (i=0;i<h->length;i++) {
-      for (n=h->table[i];n&&n->next;n=n->next) {
-         j=h->cmpFunc((HashTable)h,n->key,n->next->key);
-         printf ("%c",j?(j<0?'-':'+'):'=');
-      }
-      printf ("\n");
-   }
-   return 0;
-}
-
-static int _hashtable_insert_node(IntHashTable *h,IntHashNode *node,int resize,int update,CollisionFunc cf) {
-   unsigned long hash=h->hashFunc((HashTable)h,node->key)%h->length;
-   IntHashNode **n,*nv;
-   int i;
-
-   for (n=&(h->table[hash]);*n;n=&((*n)->next)) {
-      nv=*n;
-      i=h->cmpFunc((HashTable)h,nv->key,node->key);
-      if (!i) {
-         if (cf) {
-            nv->key=node->key;
-            cf((HashTable)h,&(nv->key),&(nv->value),node->key,node->value);
-            free(node);
-            return 1;
-         } else {
-            if (h->valDestroyFunc) {
-               h->valDestroyFunc((HashTable)h,nv->value);
-            }
-            if (h->keyDestroyFunc) {
-               h->keyDestroyFunc((HashTable)h,nv->key);
-            }
-            nv->key=node->key;
-            nv->value=node->value;
-            free(node);
-            return 1;
-         }
-      } else if (i>0) {
-         break;
-      }
-   }
-   if (!update) {
-      node->next=*n;
-      *n=node;
-      h->count++;
-      if (resize) _hashtable_resize(h);
-      return 1;
-   } else {
-      return 0;
-   }
-}
-
-static int _hashtable_insert(IntHashTable *h,void *key,void *val,int resize,int update) {
-   IntHashNode **n,*nv;
-   IntHashNode *t;
-   int i;
-   unsigned long hash=h->hashFunc((HashTable)h,key)%h->length;
-   
-   for (n=&(h->table[hash]);*n;n=&((*n)->next)) {
-      nv=*n;
-      i=h->cmpFunc((HashTable)h,nv->key,key);
-      if (!i) {
-         if (h->valDestroyFunc) { h->valDestroyFunc((HashTable)h,nv->value); }
-         nv->value=val;
-         return 1;
-      } else if (i>0) {
-         break;
-      }
-   }
-   if (!update) {
-      t=malloc(sizeof(IntHashNode));
-      if (!t) return 0;
-      t->next=*n;
-      *n=t;
-      t->key=key;
-      t->value=val;
-      h->count++;
-      if (resize) _hashtable_resize(h);
-      return 1;
-   } else {
-      return 0;
-   }
-}
-
-static int _hashtable_lookup_or_insert(IntHashTable *h,void *key,void **retVal,void *newVal,int resize) {
-   IntHashNode **n,*nv;
-   IntHashNode *t;
-   int i;
-   unsigned long hash=h->hashFunc((HashTable)h,key)%h->length;
-   
-   for (n=&(h->table[hash]);*n;n=&((*n)->next)) {
-      nv=*n;
-      i=h->cmpFunc((HashTable)h,nv->key,key);
-      if (!i) {
-         *retVal=nv->value;
-         return 1;
-      } else if (i>0) {
-         break;
-      }
-   }
-   t=malloc(sizeof(IntHashNode));
-   if (!t) return 0;
-   t->next=*n;
-   *n=t;
-   t->key=key;
-   t->value=newVal;
-   *retVal=newVal;
-   h->count++;
-   if (resize) _hashtable_resize(h);
-   return 1;
-}
-
-int hashtable_insert_or_update_computed(HashTable H,
-                                        void *key,
-                                        ComputeFunc newFunc,
-                                        ComputeFunc existsFunc) {
-   IntHashTable *h=(IntHashTable *)H;
-   IntHashNode **n,*nv;
-   IntHashNode *t;
-   int i;
-   unsigned long hash=h->hashFunc((HashTable)h,key)%h->length;
-   
-   for (n=&(h->table[hash]);*n;n=&((*n)->next)) {
-      nv=*n;
-      i=h->cmpFunc((HashTable)h,nv->key,key);
-      if (!i) {
-         void *old=nv->value;
-         if (existsFunc) {
-            existsFunc(H,nv->key,&(nv->value));
-            if (nv->value!=old) {
-               if (h->valDestroyFunc) {
-                  h->valDestroyFunc((HashTable)h,old);
-               }
-            }
-         } else {
-            return 0;
-         }
-         return 1;
-      } else if (i>0) {
-         break;
-      }
-   }
-   t=malloc(sizeof(IntHashNode));
-   if (!t) return 0;
-   t->key=key;
-   t->next=*n;
-   *n=t;
-   if (newFunc) {
-      newFunc(H,t->key,&(t->value));
-   } else {
-      free(t);
-      return 0;
-   }
-   h->count++;
-   _hashtable_resize(h);
-   return 1;
-}
-
-int hashtable_update(HashTable H,void *key,void *val) {
-   IntHashTable *h=(IntHashTable *)H;
-   return _hashtable_insert(h,key,val,1,0);
-}
-
-int hashtable_insert(HashTable H,void *key,void *val) {
-   IntHashTable *h=(IntHashTable *)H;
-   return _hashtable_insert(h,key,val,1,0);
-}
-
-void hashtable_foreach_update(HashTable H,IteratorUpdateFunc i,void *u) {
-   IntHashTable *h=(IntHashTable *)H;
-   IntHashNode *n;
-   unsigned long x;
-
-   if (h->table) {
-      for (x=0;x<h->length;x++) {
-         for (n=h->table[x];n;n=n->next) {
-            i((HashTable)h,n->key,(void **)&(n->value),u);
-         }
-      }
-   }
-}
-
-void hashtable_foreach(HashTable H,IteratorFunc i,void *u) {
-   IntHashTable *h=(IntHashTable *)H;
-   IntHashNode *n;
-   unsigned long x;
-
-   if (h->table) {
-      for (x=0;x<h->length;x++) {
-         for (n=h->table[x];n;n=n->next) {
-            i((HashTable)h,n->key,n->value,u);
-         }
-      }
-   }
-}
-
-void hashtable_free(HashTable H) {
-   IntHashTable *h=(IntHashTable *)H;
-   IntHashNode *n,*nn;
-   unsigned long i;
-
-   if (h->table) {
-      if (h->keyDestroyFunc || h->keyDestroyFunc) {
-         hashtable_foreach(H,_hashtable_destroy,NULL);
-      }
-      for (i=0;i<h->length;i++) {
-         for (n=h->table[i];n;n=nn) {
-            nn=n->next;
-            free(n);
-         }
-      }
-      free(h->table);
-   }
-   free(h);
-}
-
-DestroyFunc hashtable_set_value_destroy_func(HashTable H,DestroyFunc d) {
-   IntHashTable *h=(IntHashTable *)H;
-   DestroyFunc r=h->valDestroyFunc;
-   h->valDestroyFunc=d;
-   return r;
-}
-
-DestroyFunc hashtable_set_key_destroy_func(HashTable H,DestroyFunc d) {
-   IntHashTable *h=(IntHashTable *)H;
-   DestroyFunc r=h->keyDestroyFunc;
-   h->keyDestroyFunc=d;
-   return r;
-}
-
-static int _hashtable_remove(IntHashTable *h,
-                             const void *key,
-                             void **keyRet,
-                             void **valRet,
-                             int resize) {
-   unsigned long hash=h->hashFunc((HashTable)h,key)%h->length;
-   IntHashNode *n,*p;
-   int i;
-   
-   for (p=NULL,n=h->table[hash];n;p=n,n=n->next) {
-      i=h->cmpFunc((HashTable)h,n->key,key);
-      if (!i) {
-         if (p) p=n->next; else h->table[hash]=n->next;
-         *keyRet=n->key;
-         *valRet=n->value;
-         free(n);
-         h->count++;
-         return 1;
-      } else if (i>0) {
-         break;
-      }
-   }
-   return 0;
-}
-
-static int _hashtable_delete(IntHashTable *h,const void *key,int resize) {
-   unsigned long hash=h->hashFunc((HashTable)h,key)%h->length;
-   IntHashNode *n,*p;
-   int i;
-   
-   for (p=NULL,n=h->table[hash];n;p=n,n=n->next) {
-      i=h->cmpFunc((HashTable)h,n->key,key);
-      if (!i) {
-         if (p) p=n->next; else h->table[hash]=n->next;
-         if (h->valDestroyFunc) { h->valDestroyFunc((HashTable)h,n->value); }
-         if (h->keyDestroyFunc) { h->keyDestroyFunc((HashTable)h,n->key); }
-         free(n);
-         h->count++;
-         return 1;
-      } else if (i>0) {
-         break;
-      }
-   }
-   return 0;
-}
-
-int hashtable_remove(HashTable H,const void *key,void **keyRet,void **valRet) {
-   IntHashTable *h=(IntHashTable *)H;
-   return _hashtable_remove(h,key,keyRet,valRet,1);
-}
-
-int hashtable_delete(HashTable H,const void *key) {
-   IntHashTable *h=(IntHashTable *)H;
-   return _hashtable_delete(h,key,1);
-}
-
-void hashtable_rehash_compute(HashTable H,CollisionFunc cf) {
-   IntHashTable *h=(IntHashTable *)H;
-   _hashtable_rehash(h,cf,h->length);
-}
-
-void hashtable_rehash(HashTable H) {
-   IntHashTable *h=(IntHashTable *)H;
-   _hashtable_rehash(h,NULL,h->length);
-}
-
-int hashtable_lookup_or_insert(HashTable H,void *key,void **valp,void *val) {
-   IntHashTable *h=(IntHashTable *)H;
-   return _hashtable_lookup_or_insert(h,key,valp,val,1);
-}
-
-int hashtable_lookup(const HashTable H,const void *key,void **valp) {
-   IntHashTable *h=(IntHashTable *)H;
-   unsigned long hash=h->hashFunc((HashTable)h,key)%h->length;
-   IntHashNode *n;
-   int i;
-   
-   for (n=h->table[hash];n;n=n->next) {
-      i=h->cmpFunc((HashTable)h,n->key,key);
-      if (!i) {
-         *valp=n->value;
-         return 1;
-      } else if (i>0) {
-         break;
-      }
-   }
-   return 0;
-}
-
-unsigned long hashtable_get_count(const HashTable H) {
-   IntHashTable *h=(IntHashTable *)H;
-   return h->count;
-}
-
-void *hashtable_get_user_data(const HashTable H) {
-   IntHashTable *h=(IntHashTable *)H;
-   return h->userData;
-}
-
-void *hashtable_set_user_data(HashTable H,void *data) {
-   IntHashTable *h=(IntHashTable *)H;
-   void *r=h->userData;
-   h->userData=data;
-   return r;
-}
diff --git a/pythonPackages/pil/libImaging/QuantHash.h b/pythonPackages/pil/libImaging/QuantHash.h
deleted file mode 100644
index 89d4c31f2e..0000000000
--- a/pythonPackages/pil/libImaging/QuantHash.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: QuantHash.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * image quantizer
- *
- * Written by Toby J Sargeant <tjs@longford.cs.monash.edu.au>.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#ifndef __HASH_H__
-#define __HASH_H__
-
-#include "QuantTypes.h"
-
-HashTable hashtable_new(HashFunc,HashCmpFunc);
-void hashtable_free(HashTable);
-void hashtable_foreach(HashTable,IteratorFunc,void *);
-void hashtable_foreach_update(HashTable,IteratorUpdateFunc,void *);
-int hashtable_insert(HashTable,void *,void *);
-int hashtable_update(HashTable,void *,void *);
-int hashtable_lookup(const HashTable,const void *,void **);
-int hashtable_lookup_or_insert(HashTable,void *,void **,void *);
-int hashtable_insert_or_update_computed(HashTable,void *,ComputeFunc,ComputeFunc);
-int hashtable_delete(HashTable,const void *);
-int hashtable_remove(HashTable,const void *,void **,void **);
-void *hashtable_set_user_data(HashTable,void *);
-void *hashtable_get_user_data(const HashTable);
-DestroyFunc hashtable_set_key_destroy_func(HashTable,DestroyFunc);
-DestroyFunc hashtable_set_value_destroy_func(HashTable,DestroyFunc);
-unsigned long hashtable_get_count(const HashTable);
-void hashtable_rehash(HashTable);
-void hashtable_rehash_compute(HashTable,CollisionFunc);
-
-#endif
diff --git a/pythonPackages/pil/libImaging/QuantHeap.c b/pythonPackages/pil/libImaging/QuantHeap.c
deleted file mode 100644
index abe7f8a28f..0000000000
--- a/pythonPackages/pil/libImaging/QuantHeap.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: QuantHeap.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * heap data type used by the image quantizer
- *
- * history:
- * 98-09-10 tjs  Contributed
- * 98-12-29 fl   Added to PIL 1.0b1
- *
- * Written by Toby J Sargeant <tjs@longford.cs.monash.edu.au>.
- *
- * Copyright (c) 1998 by Toby J Sargeant
- * Copyright (c) 1998 by Secret Labs AB
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include "QuantHash.h"
-#include "QuantDefines.h"
-
-typedef struct {
-   void **heap;
-   int heapsize;
-   int heapcount;
-   HeapCmpFunc cf;
-} IntHeap;
-
-#define INITIAL_SIZE 256
-
-#define DEBUG
-
-#ifdef DEBUG
-static int _heap_test(Heap);
-#endif
-
-void ImagingQuantHeapFree(Heap H) {
-   IntHeap *h=(IntHeap *)H;
-   free(h->heap);
-   free(h);
-}
-
-static int _heap_grow(IntHeap *h,int newsize) {
-   void *newheap;
-   if (!newsize) newsize=h->heapsize<<1;
-   if (newsize<h->heapsize) return 0;
-   newheap=malloc(sizeof(void *)*newsize);
-   if (!newheap) return 0;
-   memcpy(newheap,h->heap,sizeof(void *)*h->heapsize);
-   free(h->heap);
-   h->heap=newheap;
-   h->heapsize=newsize;
-   return 1;
-}
-
-#ifdef DEBUG
-static int _heap_test(Heap H) {
-   IntHeap *h=(IntHeap *)H;
-   int k;
-   for (k=1;k*2<=h->heapcount;k++) {
-      if (h->cf(H,h->heap[k],h->heap[k*2])<0) {
-         printf ("heap is bad\n");
-         return 0;
-      }
-      if (k*2+1<=h->heapcount && h->cf(H,h->heap[k],h->heap[k*2+1])<0) {
-         printf ("heap is bad\n");
-         return 0;
-      }
-   }
-   return 1;
-}
-#endif
-
-int ImagingQuantHeapRemove(Heap H,void **r) {
-   IntHeap *h=(IntHeap *)H;
-   int k,l;
-   void *v;
-
-   if (!h->heapcount) {
-      return 0;
-   }
-   *r=h->heap[1];
-   v=h->heap[h->heapcount--];
-   for (k=1;k*2<=h->heapcount;k=l) {
-      l=k*2;
-      if (l<h->heapcount) {
-         if (h->cf(H,h->heap[l],h->heap[l+1])<0) {
-            l++;
-         }
-      }
-      if (h->cf(H,v,h->heap[l])>0) {
-         break;
-      }
-      h->heap[k]=h->heap[l];
-   }
-   h->heap[k]=v;
-#ifdef DEBUG
-   if (!_heap_test(H)) { printf ("oops - heap_remove messed up the heap\n"); exit(1); }
-#endif
-   return 1;
-}
-
-int ImagingQuantHeapAdd(Heap H,void *val) {
-   IntHeap *h=(IntHeap *)H;
-   int k;
-   if (h->heapcount==h->heapsize-1) {
-      _heap_grow(h,0);
-   }
-   k=++h->heapcount;
-   while (k!=1) {
-      if (h->cf(H,val,h->heap[k/2])<=0) {
-         break;
-      }
-      h->heap[k]=h->heap[k/2];
-      k>>=1;
-   }
-   h->heap[k]=val;
-#ifdef DEBUG
-   if (!_heap_test(H)) { printf ("oops - heap_add messed up the heap\n"); exit(1); }
-#endif
-   return 1;
-}
-
-int ImagingQuantHeapTop(Heap H,void **r) {
-   IntHeap *h=(IntHeap *)H;
-   if (!h->heapcount) {
-      return 0;
-   }
-   *r=h->heap[1];
-   return 1;
-}
-
-Heap *ImagingQuantHeapNew(HeapCmpFunc cf) {
-   IntHeap *h;
-   
-   h=malloc(sizeof(IntHeap));
-   if (!h) return NULL;
-   h->heapsize=INITIAL_SIZE;
-   h->heap=malloc(sizeof(void *)*h->heapsize);
-   if (!h->heap) { free(h); return NULL; }
-   h->heapcount=0;
-   h->cf=cf;
-   return (Heap)h;
-}
-
diff --git a/pythonPackages/pil/libImaging/QuantHeap.h b/pythonPackages/pil/libImaging/QuantHeap.h
deleted file mode 100644
index ddd0a22ffc..0000000000
--- a/pythonPackages/pil/libImaging/QuantHeap.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: QuantHeap.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * image quantizer
- *
- * Written by Toby J Sargeant <tjs@longford.cs.monash.edu.au>.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#ifndef __HEAP_H__
-#define __HEAP_H__
-
-#include "QuantTypes.h"
-
-void ImagingQuantHeapFree(Heap);
-int ImagingQuantHeapRemove(Heap,void **);
-int ImagingQuantHeapAdd(Heap,void *);
-int ImagingQuantHeapTop(Heap,void **);
-Heap *ImagingQuantHeapNew(HeapCmpFunc);
-
-#endif
diff --git a/pythonPackages/pil/libImaging/QuantTypes.h b/pythonPackages/pil/libImaging/QuantTypes.h
deleted file mode 100644
index 0d0cd40213..0000000000
--- a/pythonPackages/pil/libImaging/QuantTypes.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: QuantTypes.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * image quantizer
- *
- * Written by Toby J Sargeant <tjs@longford.cs.monash.edu.au>.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#ifndef __TYPES_H__
-#define __TYPES_H__
-
-typedef void *HashTable;
-typedef void *Heap;
-
-typedef unsigned long (*HashFunc)(const HashTable,const void *);
-typedef int (*HashCmpFunc)(const HashTable,const void *,const void *);
-typedef void (*IteratorFunc)(const HashTable,const void *,const void *,void *);
-typedef void (*IteratorUpdateFunc)(const HashTable,const void *,void **,void *);
-typedef void (*DestroyFunc)(const HashTable,void *);
-typedef void (*ComputeFunc)(const HashTable,const void *,void **);
-typedef void (*CollisionFunc)(const HashTable,void **,void **,void *,void *);
-
-typedef int (*HeapCmpFunc)(const Heap,const void *,const void *);
-
-#endif
diff --git a/pythonPackages/pil/libImaging/RankFilter.c b/pythonPackages/pil/libImaging/RankFilter.c
deleted file mode 100644
index a0f13cdf26..0000000000
--- a/pythonPackages/pil/libImaging/RankFilter.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: RankFilter.c 2929 2006-11-22 21:12:55Z fredrik $
- *
- * min, max, median filters
- *
- * history:
- * 2002-06-08 fl    Created
- *
- * Copyright (c) Secret Labs AB 2002.  All rights reserved.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Imaging.h"
-
-/* Fast rank algorithm (due to Wirth), based on public domain code
-   by Nicolas Devillard, available at http://ndevilla.free.fr */
-
-#define SWAP(type,a,b) { register type t=(a);(a)=(b);(b)=t; }
-
-#define MakeRankFunction(type)\
-static type Rank##type(type a[], int n, int k)\
-{\
-    register int i, j, l, m;\
-    register type x;\
-    l = 0; m = n-1;\
-    while (l < m) {\
-        x = a[k];\
-        i = l;\
-        j = m;\
-        do {\
-            while (a[i] < x) i++;\
-            while (x < a[j]) j--;\
-            if (i <= j) {\
-                SWAP(type, a[i], a[j]);\
-                i++; j--;\
-            }\
-        } while (i <= j);\
-        if (j < k) l = i;\
-        if (k < i) m = j;\
-    }\
-    return a[k];\
-}
-
-MakeRankFunction(UINT8)
-MakeRankFunction(INT32)
-MakeRankFunction(FLOAT32)
-
-Imaging
-ImagingRankFilter(Imaging im, int size, int rank)
-{
-    Imaging imOut = NULL;
-    int x, y;
-    int i, margin, size2;
-
-    if (!im || im->bands != 1 || im->type == IMAGING_TYPE_SPECIAL)
-	return (Imaging) ImagingError_ModeError();
-
-    if (!(size & 1))
-	return (Imaging) ImagingError_ValueError("bad filter size");
-
-    size2 = size * size;
-    margin = (size-1) / 2;
-
-    if (rank < 0 || rank >= size2)
-	return (Imaging) ImagingError_ValueError("bad rank value");
-
-    imOut = ImagingNew(im->mode, im->xsize - 2*margin, im->ysize - 2*margin);
-    if (!imOut)
-	return NULL;
-
-#define RANK_BODY(type) do {\
-    type* buf = malloc(size2 * sizeof(type));\
-    if (!buf)\
-        goto nomemory;\
-    for (y = 0; y < imOut->ysize; y++)\
-        for (x = 0; x < imOut->xsize; x++) {\
-            for (i = 0; i < size; i++)\
-                memcpy(buf + i*size, &IMAGING_PIXEL_##type(im, x, y+i),\
-                       size * sizeof(type));\
-            IMAGING_PIXEL_##type(imOut, x, y) = Rank##type(buf, size2, rank);\
-        }\
-} while (0)
-
-    if (im->image8)
-        RANK_BODY(UINT8);
-    else if (im->type == IMAGING_TYPE_INT32)
-        RANK_BODY(INT32);
-    else if (im->type == IMAGING_TYPE_FLOAT32)
-        RANK_BODY(FLOAT32);
-    else {
-        /* safety net (we shouldn't end up here) */
-        ImagingDelete(imOut);
-        return (Imaging) ImagingError_ModeError();
-    }
-    
-    ImagingCopyInfo(imOut, im);
-
-    return imOut;
-
-nomemory:
-    ImagingDelete(imOut);
-    return (Imaging) ImagingError_MemoryError();
-}
diff --git a/pythonPackages/pil/libImaging/Raw.h b/pythonPackages/pil/libImaging/Raw.h
deleted file mode 100644
index 4d28fa5466..0000000000
--- a/pythonPackages/pil/libImaging/Raw.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Raw.h */
-
-typedef struct {
-
-    /* CONFIGURATION */
-
-    /* Distance between lines (0=no padding) */
-    int stride;
-
-    /* PRIVATE (initialized by decoder) */
-
-    /* Padding between lines */
-    int skip;
-
-} RAWSTATE;
diff --git a/pythonPackages/pil/libImaging/RawDecode.c b/pythonPackages/pil/libImaging/RawDecode.c
deleted file mode 100644
index 281d8c230a..0000000000
--- a/pythonPackages/pil/libImaging/RawDecode.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: RawDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for raw (uncompressed) image data
- *
- * history:
- *	96-03-07 fl	rewritten
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#include "Raw.h"
-
-
-int
-ImagingRawDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    enum { LINE = 1, SKIP };
-    RAWSTATE* rawstate = state->context;
-
-    UINT8* ptr;
-
-    if (state->state == 0) {
-
-	/* Initialize context variables */
-
-	/* get size of image data and padding */
-	state->bytes = (state->xsize * state->bits + 7) / 8;
-	rawstate->skip = (rawstate->stride) ?
-	    rawstate->stride - state->bytes : 0;
-
-	/* check image orientation */
-	if (state->ystep < 0) {
-	    state->y = state->ysize-1;
-	    state->ystep = -1;
-	} else
-	    state->ystep = 1;
-
-	state->state = LINE;
-
-    }
-
-    ptr = buf;
-
-    for (;;) {
-
-	if (state->state == SKIP) {
-
-	    /* Skip padding between lines */
-
-	    if (bytes < rawstate->skip)
-		return ptr - buf;
-
-	    ptr += rawstate->skip;
-	    bytes -= rawstate->skip;
-
-	    state->state = LINE;
-
-	}
-
-	if (bytes < state->bytes)
-	    return ptr - buf;
-
-	/* Unpack data */
-	state->shuffle((UINT8*) im->image[state->y + state->yoff] + 
-		       state->xoff * im->pixelsize, ptr, state->xsize);
-
-	ptr += state->bytes;
-	bytes -= state->bytes;
-
-	state->y += state->ystep;
-
-	if (state->y < 0 || state->y >= state->ysize) {
-	    /* End of file (errcode = 0) */
-	    return -1;
-	}
-
-	state->state = SKIP;
-
-    }
-
-}
diff --git a/pythonPackages/pil/libImaging/RawEncode.c b/pythonPackages/pil/libImaging/RawEncode.c
deleted file mode 100644
index 945c666525..0000000000
--- a/pythonPackages/pil/libImaging/RawEncode.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: RawEncode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * coder for raw data
- *
- * FIXME: This encoder will fail if the buffer is not large enough to
- * hold one full line of data.  There's a workaround for this problem
- * in ImageFile.py, but it should be solved here instead.
- *
- * history:
- * 96-04-30 fl	created
- * 97-01-03 fl	fixed padding
- *
- * Copyright (c) Fredrik Lundh 1996-97.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.  */
-
-
-#include "Imaging.h"
-
-int
-ImagingRawEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    UINT8* ptr;
-
-    if (!state->state) {
-
-	/* The "count" field holds the stride, if specified.  Fix
-	   things up so "bytes" is the full size, and "count" the
-	   packed size */
-
-	if (state->count > 0) {
-	    int bytes = state->count;
-
-	    /* stride must not be less than real size */
-	    if (state->count < state->bytes) {
-		state->errcode = IMAGING_CODEC_CONFIG;
-		return -1;
-	    }
-	    state->count = state->bytes;
-	    state->bytes = bytes;
-	} else
-	    state->count = state->bytes;
-
-	/* The "ystep" field specifies the orientation */
-
-	if (state->ystep < 0) {
-	    state->y = state->ysize-1;
-	    state->ystep = -1;
-	} else
-	    state->ystep = 1;
-
-	state->state = 1;
-
-    }
-
-    if (bytes < state->bytes) {
-	state->errcode = IMAGING_CODEC_CONFIG;
-	return 0;
-    }
-
-    ptr = buf;
-
-    while (bytes >= state->bytes) {
-
-	state->shuffle(ptr, (UINT8*) im->image[state->y + state->yoff] +
-		       state->xoff * im->pixelsize, state->xsize);
-
-	if (state->bytes > state->count)
-	    /* zero-pad the buffer, if necessary */
-	    memset(ptr + state->count, 0, state->bytes - state->count);
-
-	ptr += state->bytes;
-	bytes -= state->bytes;
-
-	state->y += state->ystep;
-
-	if (state->y < 0 || state->y >= state->ysize) {
-	    state->errcode = IMAGING_CODEC_END;
-	    break;
-	}
-
-    }
-
-    return ptr - buf;
-
-}
diff --git a/pythonPackages/pil/libImaging/Storage.c b/pythonPackages/pil/libImaging/Storage.c
deleted file mode 100644
index 5f2ae905a9..0000000000
--- a/pythonPackages/pil/libImaging/Storage.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * The Python Imaging Library
- * $Id: Storage.c 2542 2005-10-02 21:37:20Z Fredrik $
- *
- * imaging storage object
- *
- * This baseline implementation is designed to efficiently handle
- * large images, provided they fit into the available memory.
- *
- * history:
- * 1995-06-15 fl   Created
- * 1995-09-12 fl   Updated API, compiles silently under ANSI C++
- * 1995-11-26 fl   Compiles silently under Borland 4.5 as well
- * 1996-05-05 fl   Correctly test status from Prologue
- * 1997-05-12 fl   Increased THRESHOLD (to speed up Tk interface)
- * 1997-05-30 fl   Added support for floating point images
- * 1997-11-17 fl   Added support for "RGBX" images
- * 1998-01-11 fl   Added support for integer images
- * 1998-03-05 fl   Exported Prologue/Epilogue functions
- * 1998-07-01 fl   Added basic "YCrCb" support
- * 1998-07-03 fl   Attach palette in prologue for "P" images
- * 1998-07-09 hk   Don't report MemoryError on zero-size images
- * 1998-07-12 fl   Change "YCrCb" to "YCbCr" (!)
- * 1998-10-26 fl   Added "I;16" and "I;16B" storage modes (experimental)
- * 1998-12-29 fl   Fixed allocation bug caused by previous fix
- * 1999-02-03 fl   Added "RGBa" and "BGR" modes (experimental)
- * 2001-04-22 fl   Fixed potential memory leak in ImagingCopyInfo
- * 2003-09-26 fl   Added "LA" and "PA" modes (experimental)
- * 2005-10-02 fl   Added image counter
- *
- * Copyright (c) 1998-2005 by Secret Labs AB 
- * Copyright (c) 1995-2005 by Fredrik Lundh
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-int ImagingNewCount = 0;
-
-/* --------------------------------------------------------------------
- * Standard image object.
- */
-
-Imaging
-ImagingNewPrologueSubtype(const char *mode, unsigned xsize, unsigned ysize,
-                          int size)
-{
-    Imaging im;
-    ImagingSectionCookie cookie;
-
-    im = (Imaging) calloc(1, size);
-    if (!im)
-	return (Imaging) ImagingError_MemoryError();
-
-    /* Setup image descriptor */
-    im->xsize = xsize;
-    im->ysize = ysize;
-
-    im->type = IMAGING_TYPE_UINT8;
-
-    if (strcmp(mode, "1") == 0) {
-        /* 1-bit images */
-        im->bands = im->pixelsize = 1;
-        im->linesize = xsize;
-
-    } else if (strcmp(mode, "P") == 0) {
-        /* 8-bit palette mapped images */
-        im->bands = im->pixelsize = 1;
-        im->linesize = xsize;
-        im->palette = ImagingPaletteNew("RGB");
-
-    } else if (strcmp(mode, "PA") == 0) {
-        /* 8-bit palette with alpha */
-        im->bands = 2;
-        im->pixelsize = 4; /* store in image32 memory */
-        im->linesize = xsize * 4;
-        im->palette = ImagingPaletteNew("RGB");
-
-    } else if (strcmp(mode, "L") == 0) {
-        /* 8-bit greyscale (luminance) images */
-        im->bands = im->pixelsize = 1;
-        im->linesize = xsize;
-
-    } else if (strcmp(mode, "LA") == 0) {
-        /* 8-bit greyscale (luminance) with alpha */
-        im->bands = 2;
-        im->pixelsize = 4; /* store in image32 memory */
-        im->linesize = xsize * 4;
-
-    } else if (strcmp(mode, "F") == 0) {
-        /* 32-bit floating point images */
-        im->bands = 1;
-        im->pixelsize = 4;
-        im->linesize = xsize * 4;
-        im->type = IMAGING_TYPE_FLOAT32;
-
-    } else if (strcmp(mode, "I") == 0) {
-        /* 32-bit integer images */
-        im->bands = 1;
-        im->pixelsize = 4;
-        im->linesize = xsize * 4;
-        im->type = IMAGING_TYPE_INT32;
-
-    } else if (strcmp(mode, "I;16") == 0 || strcmp(mode, "I;16B") == 0) {
-        /* EXPERIMENTAL */
-        /* 16-bit raw integer images */
-        im->bands = 1;
-        im->pixelsize = 2;
-        im->linesize = xsize * 2;
-        im->type = IMAGING_TYPE_SPECIAL;
-
-    } else if (strcmp(mode, "RGB") == 0) {
-        /* 24-bit true colour images */
-        im->bands = 3;
-        im->pixelsize = 4;
-        im->linesize = xsize * 4;
-
-    } else if (strcmp(mode, "BGR;15") == 0) {
-        /* EXPERIMENTAL */
-        /* 15-bit true colour */
-        im->bands = 1;
-        im->pixelsize = 2;
-        im->linesize = (xsize*2 + 3) & -4;
-        im->type = IMAGING_TYPE_SPECIAL;
-
-    } else if (strcmp(mode, "BGR;16") == 0) {
-        /* EXPERIMENTAL */
-        /* 16-bit reversed true colour */
-        im->bands = 1;
-        im->pixelsize = 2;
-        im->linesize = (xsize*2 + 3) & -4;
-        im->type = IMAGING_TYPE_SPECIAL;
-
-    } else if (strcmp(mode, "BGR;24") == 0) {
-        /* EXPERIMENTAL */
-        /* 24-bit reversed true colour */
-        im->bands = 1;
-        im->pixelsize = 3;
-        im->linesize = (xsize*3 + 3) & -4;
-        im->type = IMAGING_TYPE_SPECIAL;
-
-    } else if (strcmp(mode, "BGR;32") == 0) {
-        /* EXPERIMENTAL */
-        /* 32-bit reversed true colour */
-        im->bands = 1;
-        im->pixelsize = 4;
-        im->linesize = (xsize*4 + 3) & -4;
-        im->type = IMAGING_TYPE_SPECIAL;
-
-    } else if (strcmp(mode, "RGBX") == 0) {
-        /* 32-bit true colour images with padding */
-        im->bands = im->pixelsize = 4;
-        im->linesize = xsize * 4;
-
-    } else if (strcmp(mode, "RGBA") == 0) {
-        /* 32-bit true colour images with alpha */
-        im->bands = im->pixelsize = 4;
-        im->linesize = xsize * 4;
-
-    } else if (strcmp(mode, "RGBa") == 0) {
-        /* EXPERIMENTAL */
-        /* 32-bit true colour images with premultiplied alpha */
-        im->bands = im->pixelsize = 4;
-        im->linesize = xsize * 4;
-
-    } else if (strcmp(mode, "CMYK") == 0) {
-        /* 32-bit colour separation */
-        im->bands = im->pixelsize = 4;
-        im->linesize = xsize * 4;
-
-    } else if (strcmp(mode, "YCbCr") == 0) {
-        /* 24-bit video format */
-        im->bands = 3;
-        im->pixelsize = 4;
-        im->linesize = xsize * 4;
-
-    } else {
-        free(im);
-	return (Imaging) ImagingError_ValueError("unrecognized mode");
-    }
-
-    /* Setup image descriptor */
-    strcpy(im->mode, mode);
-
-    ImagingSectionEnter(&cookie);
-
-    /* Pointer array (allocate at least one line, to avoid MemoryError
-       exceptions on platforms where calloc(0, x) returns NULL) */
-    im->image = (char **) calloc((ysize > 0) ? ysize : 1, sizeof(void *));
-
-    ImagingSectionLeave(&cookie);
-
-    if (!im->image) {
-	free(im);
-	return (Imaging) ImagingError_MemoryError();
-    }
-
-    ImagingNewCount++;
-
-    return im;
-}
-
-Imaging
-ImagingNewPrologue(const char *mode, unsigned xsize, unsigned ysize)
-{
-    return ImagingNewPrologueSubtype(
-        mode, xsize, ysize, sizeof(struct ImagingMemoryInstance)
-        );
-}
-
-Imaging
-ImagingNewEpilogue(Imaging im)
-{
-    /* If the raster data allocator didn't setup a destructor,
-       assume that it couldn't allocate the required amount of
-       memory. */
-    if (!im->destroy)
-	return (Imaging) ImagingError_MemoryError();
-
-    /* Initialize alias pointers to pixel data. */
-    switch (im->pixelsize) {
-    case 1: case 2: case 3:
-	im->image8 = (UINT8 **) im->image;
-	break;
-    case 4:
-	im->image32 = (INT32 **) im->image;
-	break;
-    }
-
-    return im;
-}
-
-void
-ImagingDelete(Imaging im)
-{
-    if (!im)
-	return;
-
-    if (im->palette)
-	ImagingPaletteDelete(im->palette);
-
-    if (im->destroy)
-	im->destroy(im);
-
-    if (im->image)
-	free(im->image);
-
-    free(im);
-}
-
-
-/* Array Storage Type */
-/* ------------------ */
-/* Allocate image as an array of line buffers. */
-
-static void
-ImagingDestroyArray(Imaging im)
-{
-    int y;
-
-    if (im->image)
-	for (y = 0; y < im->ysize; y++)
-	    if (im->image[y])
-		free(im->image[y]);
-}
-
-Imaging
-ImagingNewArray(const char *mode, int xsize, int ysize)
-{
-    Imaging im;
-    ImagingSectionCookie cookie;
-
-    int y;
-    char* p;
-
-    im = ImagingNewPrologue(mode, xsize, ysize);
-    if (!im)
-	return NULL;
-
-    ImagingSectionEnter(&cookie);
-
-    /* Allocate image as an array of lines */
-    for (y = 0; y < im->ysize; y++) {
-	p = (char *) malloc(im->linesize);
-	if (!p) {
-	    ImagingDestroyArray(im);
-	    break;
-	}
-        im->image[y] = p;
-    }
-
-    ImagingSectionLeave(&cookie);
-
-    if (y == im->ysize)
-	im->destroy = ImagingDestroyArray;
-
-    return ImagingNewEpilogue(im);
-}
-
-
-/* Block Storage Type */
-/* ------------------ */
-/* Allocate image as a single block. */
-
-static void
-ImagingDestroyBlock(Imaging im)
-{
-    if (im->block)
-	free(im->block);
-}
-
-Imaging
-ImagingNewBlock(const char *mode, int xsize, int ysize)
-{
-    Imaging im;
-    int y, i;
-    int bytes;
-
-    im = ImagingNewPrologue(mode, xsize, ysize);
-    if (!im)
-	return NULL;
-
-    /* Use a single block */
-    bytes = im->ysize * im->linesize;
-    if (bytes <= 0)
-        /* some platforms return NULL for malloc(0); this fix
-           prevents MemoryError on zero-sized images on such
-           platforms */
-        bytes = 1;
-    im->block = (char *) malloc(bytes);
-
-    if (im->block) {
-
-	for (y = i = 0; y < im->ysize; y++) {
-	    im->image[y] = im->block + i;
-	    i += im->linesize;
-	}
-
-	im->destroy = ImagingDestroyBlock;
-
-    }
-
-    return ImagingNewEpilogue(im);
-}
-
-/* --------------------------------------------------------------------
- * Create a new, internally allocated, image.
- */
-#if defined(IMAGING_SMALL_MODEL)
-#define	THRESHOLD	16384L
-#else
-#define	THRESHOLD	1048576L
-#endif
-
-Imaging
-ImagingNew(const char* mode, int xsize, int ysize)
-{
-    /* FIXME: strlen(mode) is no longer accurate */
-    if ((long) xsize * ysize * strlen(mode) <= THRESHOLD)
-	return ImagingNewBlock(mode, xsize, ysize);
-    else
-	return ImagingNewArray(mode, xsize, ysize);
-}
-
-Imaging
-ImagingNew2(const char* mode, Imaging imOut, Imaging imIn)
-{
-    /* allocate or validate output image */
-
-    if (imOut) {
-        /* make sure images match */
-        if (strcmp(imOut->mode, mode) != 0
-            || imOut->xsize != imIn->xsize
-            || imOut->ysize != imIn->ysize) {
-            ImagingError_Mismatch();
-            return NULL;
-        }
-    } else {
-        /* create new image */
-        imOut = ImagingNew(mode, imIn->xsize, imIn->ysize);
-        if (!imOut)
-            return NULL;
-    }
-
-    return imOut;
-}
-
-void
-ImagingCopyInfo(Imaging destination, Imaging source)
-{
-    if (source->palette) {
-        if (destination->palette)
-            ImagingPaletteDelete(destination->palette);
-	destination->palette = ImagingPaletteDuplicate(source->palette);
-    }
-}
diff --git a/pythonPackages/pil/libImaging/SunRleDecode.c b/pythonPackages/pil/libImaging/SunRleDecode.c
deleted file mode 100644
index e5171c7f61..0000000000
--- a/pythonPackages/pil/libImaging/SunRleDecode.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * THIS IS WORK IN PROGRESS
- *
- * The Python Imaging Library.
- * $Id: SunRleDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for SUN RLE data.
- *
- * history:
- *	97-01-04 fl	Created
- *
- * Copyright (c) Fredrik Lundh 1997.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-int
-ImagingSunRleDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    int n;
-    UINT8* ptr;
-
-    ptr = buf;
-
-    for (;;) {
-
-	if (bytes < 1)
-	    return ptr - buf;
-
-	if (ptr[0] == 0x80) {
-
-	    if (bytes < 2)
-		break;
-
-	    n = ptr[1];
-
-	    if (n == 0) {
-
-		/* Literal 0x80 (2 bytes) */
-		n = 1;
-
-		state->buffer[state->x] = 0x80;
-
-		ptr += 2;
-		bytes -= 2;
-
-	    } else {
-
-		/* Run (3 bytes) */
-		if (bytes < 3)
-		    break;
-
-		if (state->x + n > state->bytes) {
-		    /* FIXME: is this correct? */
-		    state->errcode = IMAGING_CODEC_OVERRUN;
-		    return -1;
-		}
-
-		memset(state->buffer + state->x, ptr[2], n);
-		
-		ptr += 3;
-		bytes -= 3;
-
-	    }
-
-	} else {
-
-	    /* Literal (1+n bytes block) */
-	    n = ptr[0];
-
-	    if (bytes < 1 + n)
-		break;
-
-	    if (state->x + n > state->bytes) {
-		/* FIXME: is this correct? */
-		state->errcode = IMAGING_CODEC_OVERRUN;
-		return -1;
-	    }
-
-	    memcpy(state->buffer + state->x, ptr + 1, n);
-
-	    ptr += 1 + n;
-	    bytes -= 1 + n;
-
-	}
-
-	state->x += n;
-
-	if (state->x >= state->bytes) {
-
-	    /* Got a full line, unpack it */
-	    state->shuffle((UINT8*) im->image[state->y + state->yoff] +
-			   state->xoff * im->pixelsize, state->buffer,
-			   state->xsize);
-
-	    state->x = 0;
-
-	    if (++state->y >= state->ysize) {
-		/* End of file (errcode = 0) */
-		return -1;
-	    }
-	}
-
-    }
-
-    return ptr - buf;
-}
diff --git a/pythonPackages/pil/libImaging/TgaRleDecode.c b/pythonPackages/pil/libImaging/TgaRleDecode.c
deleted file mode 100644
index 1011f0dae8..0000000000
--- a/pythonPackages/pil/libImaging/TgaRleDecode.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: TgaRleDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for Targa RLE data.
- *
- * history:
- * 97-01-04 fl	created
- * 98-09-11 fl	don't one byte per pixel; take orientation into account
- *
- * Copyright (c) Fredrik Lundh 1997.
- * Copyright (c) Secret Labs AB 1997-98.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-int
-ImagingTgaRleDecode(Imaging im, ImagingCodecState state,
-		    UINT8* buf, int bytes)
-{
-    int n, depth;
-    UINT8* ptr;
-
-    ptr = buf;
-
-    if (state->state == 0) {
-
-	/* check image orientation */
-	if (state->ystep < 0) {
-	    state->y = state->ysize-1;
-	    state->ystep = -1;
-	} else
-	    state->ystep = 1;
-
-	state->state = 1;
-
-    }
-
-    depth = state->count;
-
-    for (;;) {
-
-	if (bytes < 1)
-	    return ptr - buf;
-
-	if (ptr[0] & 0x80) {
-
-	    /* Run (1 + pixelsize bytes) */
-
-	    if (bytes < 1 + depth)
-		break;
-
-	    n = depth * ((ptr[0] & 0x7f) + 1);
-
-	    if (state->x + n > state->bytes) {
-		state->errcode = IMAGING_CODEC_OVERRUN;
-		return -1;
-	    }
-
-            if (depth == 1)
-                memset(state->buffer + state->x, ptr[1], n);
-            else {
-                int i;
-                for (i = 0; i < n; i += depth)
-                    memcpy(state->buffer + state->x + i, ptr+1, depth);
-            }
-
-            ptr += 1 + depth;
-	    bytes -= 1 + depth;
-
-	} else {
-
-	    /* Literal (1+n+1 bytes block) */
-	    n = depth * (ptr[0] + 1);
-
-	    if (bytes < 1 + n)
-		break;
-
-	    if (state->x + n > state->bytes) {
-		state->errcode = IMAGING_CODEC_OVERRUN;
-		return -1;
-	    }
-
-	    memcpy(state->buffer + state->x, ptr + 1, n);
-
-	    ptr += 1 + n;
-	    bytes -= 1 + n;
-
-	}
-
-	state->x += n;
-
-	if (state->x >= state->bytes) {
-
-	    /* Got a full line, unpack it */
-	    state->shuffle((UINT8*) im->image[state->y + state->yoff] +
-			   state->xoff * im->pixelsize, state->buffer,
-			   state->xsize);
-
-	    state->x = 0;
-
-            state->y += state->ystep;
-
-            if (state->y < 0 || state->y >= state->ysize) {
-                /* End of file (errcode = 0) */
-                return -1;
-            }
-
-	}
-
-    }
-
-    return ptr - buf;
-}
diff --git a/pythonPackages/pil/libImaging/Unpack.c b/pythonPackages/pil/libImaging/Unpack.c
deleted file mode 100644
index 402a753042..0000000000
--- a/pythonPackages/pil/libImaging/Unpack.c
+++ /dev/null
@@ -1,1027 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: Unpack.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * code to unpack raw data from various file formats
- *
- * history:
- * 1996-03-07 fl   Created (from various decoders)
- * 1996-04-19 fl   Added band unpackers
- * 1996-05-12 fl   Published RGB unpackers
- * 1996-05-27 fl   Added nibble unpacker
- * 1996-12-10 fl   Added complete set of PNG unpackers
- * 1996-12-29 fl   Set alpha byte in RGB unpackers
- * 1997-01-05 fl   Added remaining TGA unpackers
- * 1997-01-18 fl   Added inverting band unpackers
- * 1997-01-25 fl   Added FlashPix unpackers
- * 1997-05-31 fl   Added floating point unpackers
- * 1998-02-08 fl   Added I unpacker
- * 1998-07-01 fl   Added YCbCr unpacker
- * 1998-07-02 fl   Added full set of integer unpackers
- * 1998-12-29 fl   Added mode field, I;16 unpackers
- * 1998-12-30 fl   Added RGBX modes
- * 1999-02-04 fl   Fixed I;16 unpackers
- * 2003-05-13 fl   Added L/RGB reversed unpackers
- * 2003-09-26 fl   Added LA/PA and RGBa->RGB unpackers
- *
- * Copyright (c) 1997-2003 by Secret Labs AB.
- * Copyright (c) 1996-1997 by Fredrik Lundh.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Imaging.h"
-
-
-#define	R 0
-#define	G 1
-#define	B 2
-#define	X 3
-
-#define	A 3
-
-#define	C 0
-#define	M 1
-#define	Y 2
-#define	K 3
-
-#define CLIP(x) ((x) <= 0 ? 0 : (x) < 256 ? (x) : 255)
-
-/* byte-swapping macros */
-
-#define C16N\
-        (tmp[0]=in[0], tmp[1]=in[1]);
-#define C16S\
-        (tmp[1]=in[0], tmp[0]=in[1]);
-#define C32N\
-        (tmp[0]=in[0], tmp[1]=in[1], tmp[2]=in[2], tmp[3]=in[3]);
-#define C32S\
-        (tmp[3]=in[0], tmp[2]=in[1], tmp[1]=in[2], tmp[0]=in[3]);
-#define C64N\
-        (tmp[0]=in[0], tmp[1]=in[1], tmp[2]=in[2], tmp[3]=in[3],\
-         tmp[4]=in[4], tmp[5]=in[5], tmp[6]=in[6], tmp[7]=in[7]);
-#define C64S\
-        (tmp[7]=in[0], tmp[6]=in[1], tmp[5]=in[2], tmp[4]=in[3],\
-         tmp[3]=in[4], tmp[2]=in[5], tmp[1]=in[6], tmp[0]=in[7]);
-
-#ifdef WORDS_BIGENDIAN
-#define C16B C16N
-#define C16L C16S
-#define C32B C32N
-#define C32L C32S
-#define C64B C64N
-#define C64L C64S
-#else
-#define C16B C16S
-#define C16L C16N
-#define C32B C32S
-#define C32L C32N
-#define C64B C64S
-#define C64L C64N
-#endif
-
-/* bit-swapping */
-
-static UINT8 BITFLIP[] = {
-    0, 128, 64, 192, 32, 160, 96, 224, 16, 144, 80, 208, 48, 176, 112,
-    240, 8, 136, 72, 200, 40, 168, 104, 232, 24, 152, 88, 216, 56, 184,
-    120, 248, 4, 132, 68, 196, 36, 164, 100, 228, 20, 148, 84, 212, 52,
-    180, 116, 244, 12, 140, 76, 204, 44, 172, 108, 236, 28, 156, 92, 220,
-    60, 188, 124, 252, 2, 130, 66, 194, 34, 162, 98, 226, 18, 146, 82,
-    210, 50, 178, 114, 242, 10, 138, 74, 202, 42, 170, 106, 234, 26, 154,
-    90, 218, 58, 186, 122, 250, 6, 134, 70, 198, 38, 166, 102, 230, 22,
-    150, 86, 214, 54, 182, 118, 246, 14, 142, 78, 206, 46, 174, 110, 238,
-    30, 158, 94, 222, 62, 190, 126, 254, 1, 129, 65, 193, 33, 161, 97,
-    225, 17, 145, 81, 209, 49, 177, 113, 241, 9, 137, 73, 201, 41, 169,
-    105, 233, 25, 153, 89, 217, 57, 185, 121, 249, 5, 133, 69, 197, 37,
-    165, 101, 229, 21, 149, 85, 213, 53, 181, 117, 245, 13, 141, 77, 205,
-    45, 173, 109, 237, 29, 157, 93, 221, 61, 189, 125, 253, 3, 131, 67,
-    195, 35, 163, 99, 227, 19, 147, 83, 211, 51, 179, 115, 243, 11, 139,
-    75, 203, 43, 171, 107, 235, 27, 155, 91, 219, 59, 187, 123, 251, 7,
-    135, 71, 199, 39, 167, 103, 231, 23, 151, 87, 215, 55, 183, 119, 247,
-    15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127,
-    255
-};
-
-/* Unpack to "1" image */
-
-static void
-unpack1(UINT8* out, const UINT8* in, int pixels)
-{
-    /* bits (msb first, white is non-zero) */
-    while (pixels > 0) {
-	UINT8 byte = *in++;
-	switch (pixels) {
-	default:    *out++ = (byte & 128) ? 255 : 0; byte <<= 1;
-	case 7:	    *out++ = (byte & 128) ? 255 : 0; byte <<= 1;
-	case 6:	    *out++ = (byte & 128) ? 255 : 0; byte <<= 1;
-	case 5:	    *out++ = (byte & 128) ? 255 : 0; byte <<= 1;
-	case 4:	    *out++ = (byte & 128) ? 255 : 0; byte <<= 1;
-	case 3:	    *out++ = (byte & 128) ? 255 : 0; byte <<= 1;
-	case 2:	    *out++ = (byte & 128) ? 255 : 0; byte <<= 1;
-	case 1:	    *out++ = (byte & 128) ? 255 : 0;
-	}
-	pixels -= 8;
-    }
-}
-
-static void
-unpack1I(UINT8* out, const UINT8* in, int pixels)
-{
-    /* bits (msb first, white is zero) */
-    while (pixels > 0) {
-	UINT8 byte = *in++;
-	switch (pixels) {
-	default:    *out++ = (byte & 128) ? 0 : 255; byte <<= 1;
-	case 7:	    *out++ = (byte & 128) ? 0 : 255; byte <<= 1;
-	case 6:	    *out++ = (byte & 128) ? 0 : 255; byte <<= 1;
-	case 5:	    *out++ = (byte & 128) ? 0 : 255; byte <<= 1;
-	case 4:	    *out++ = (byte & 128) ? 0 : 255; byte <<= 1;
-	case 3:	    *out++ = (byte & 128) ? 0 : 255; byte <<= 1;
-	case 2:	    *out++ = (byte & 128) ? 0 : 255; byte <<= 1;
-	case 1:	    *out++ = (byte & 128) ? 0 : 255;
-	}
-	pixels -= 8;
-    }
-}
-
-static void
-unpack1R(UINT8* out, const UINT8* in, int pixels)
-{
-    /* bits (lsb first, white is non-zero) */
-    while (pixels > 0) {
-	UINT8 byte = *in++;
-	switch (pixels) {
-	default:    *out++ = (byte & 1) ? 255 : 0; byte >>= 1;
-	case 7:	    *out++ = (byte & 1) ? 255 : 0; byte >>= 1;
-	case 6:	    *out++ = (byte & 1) ? 255 : 0; byte >>= 1;
-	case 5:	    *out++ = (byte & 1) ? 255 : 0; byte >>= 1;
-	case 4:	    *out++ = (byte & 1) ? 255 : 0; byte >>= 1;
-	case 3:	    *out++ = (byte & 1) ? 255 : 0; byte >>= 1;
-	case 2:	    *out++ = (byte & 1) ? 255 : 0; byte >>= 1;
-	case 1:	    *out++ = (byte & 1) ? 255 : 0;
-	}
-	pixels -= 8;
-    }
-}
-
-static void
-unpack1IR(UINT8* out, const UINT8* in, int pixels)
-{
-    /* bits (lsb first, white is zero) */
-    while (pixels > 0) {
-	UINT8 byte = *in++;
-	switch (pixels) {
-	default:    *out++ = (byte & 1) ? 0 : 255; byte >>= 1;
-	case 7:	    *out++ = (byte & 1) ? 0 : 255; byte >>= 1;
-	case 6:	    *out++ = (byte & 1) ? 0 : 255; byte >>= 1;
-	case 5:	    *out++ = (byte & 1) ? 0 : 255; byte >>= 1;
-	case 4:	    *out++ = (byte & 1) ? 0 : 255; byte >>= 1;
-	case 3:	    *out++ = (byte & 1) ? 0 : 255; byte >>= 1;
-	case 2:	    *out++ = (byte & 1) ? 0 : 255; byte >>= 1;
-	case 1:	    *out++ = (byte & 1) ? 0 : 255;
-	}
-	pixels -= 8;
-    }
-}
-
-
-/* Unpack to "L" image */
-
-static void
-unpackL2(UINT8* out, const UINT8* in, int pixels)
-{
-    /* nibbles */
-    while (pixels > 0) {
-	UINT8 byte = *in++;
-	switch (pixels) {
-	default:    *out++ = ((byte >> 6) & 3) * 255 / 3; byte <<= 2;
-	case 3:	    *out++ = ((byte >> 6) & 3) * 255 / 3; byte <<= 2;
-	case 2:	    *out++ = ((byte >> 6) & 3) * 255 / 3; byte <<= 2;
-	case 1:	    *out++ = ((byte >> 6) & 3) * 255 / 3;
-	}
-	pixels -= 4;
-    }
-}
-
-static void
-unpackL4(UINT8* out, const UINT8* in, int pixels)
-{
-    /* nibbles */
-    while (pixels > 0) {
-	UINT8 byte = *in++;
-	switch (pixels) {
-	default:    *out++ = ((byte >> 4) & 15) * 255 / 15; byte <<= 4;
-	case 1:	    *out++ = ((byte >> 4) & 15) * 255 / 15;
-	}
-	pixels -= 2;
-    }
-}
-
-static void
-unpackLA(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* LA, pixel interleaved */
-    for (i = 0; i < pixels; i++) {
-	out[R] = out[G] = out[B] = in[0];
-	out[A] = in[1];
-	in += 2; out += 4;
-    }
-}
-
-static void
-unpackLAL(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* LA, line interleaved */
-    for (i = 0; i < pixels; i++) {
-	out[R] = out[G] = out[B] = in[i];
-	out[A] = in[i+pixels];
-	out += 4;
-    }
-}
-
-static void
-unpackLI(UINT8* out, const UINT8* in, int pixels)
-{
-    /* negative */
-    int i;
-    for (i = 0; i < pixels; i++)
-	out[i] = ~in[i];
-}
-
-static void
-unpackLR(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB, bit reversed */
-    for (i = 0; i < pixels; i++) {
-	out[i] = BITFLIP[in[i]];
-    }
-}
-
-static void
-unpackL16(UINT8* out, const UINT8* in, int pixels)
-{
-    /* int16 (upper byte, little endian) */
-    int i;
-    for (i = 0; i < pixels; i++) {
-	out[i] = in[1];
-	in += 2;
-    }
-}
-
-static void
-unpackL16B(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* int16 (upper byte, big endian) */
-    for (i = 0; i < pixels; i++) {
-	out[i] = in[0];
-	in += 2;
-    }
-}
-
-
-/* Unpack to "P" image */
-
-static void
-unpackP1(UINT8* out, const UINT8* in, int pixels)
-{
-    /* bits */
-    while (pixels > 0) {
-	UINT8 byte = *in++;
-	switch (pixels) {
-	default:    *out++ = (byte >> 7) & 1; byte <<= 1;
-	case 7:	    *out++ = (byte >> 7) & 1; byte <<= 1;
-	case 6:	    *out++ = (byte >> 7) & 1; byte <<= 1;
-	case 5:	    *out++ = (byte >> 7) & 1; byte <<= 1;
-	case 4:	    *out++ = (byte >> 7) & 1; byte <<= 1;
-	case 3:	    *out++ = (byte >> 7) & 1; byte <<= 1;
-	case 2:	    *out++ = (byte >> 7) & 1; byte <<= 1;
-	case 1:	    *out++ = (byte >> 7) & 1;
-	}
-	pixels -= 8;
-    }
-}
-
-static void
-unpackP2(UINT8* out, const UINT8* in, int pixels)
-{
-    /* bit pairs */
-    while (pixels > 0) {
-	UINT8 byte = *in++;
-	switch (pixels) {
-	default:    *out++ = (byte >> 6) & 3; byte <<= 2;
-	case 3:	    *out++ = (byte >> 6) & 3; byte <<= 2;
-	case 2:	    *out++ = (byte >> 6) & 3; byte <<= 2;
-	case 1:	    *out++ = (byte >> 6) & 3;
-	}
-	pixels -= 4;
-    }
-}
-
-static void
-unpackP4(UINT8* out, const UINT8* in, int pixels)
-{
-    /* nibbles */
-    while (pixels > 0) {
-	UINT8 byte = *in++;
-	switch (pixels) {
-	default:    *out++ = (byte >> 4) & 15; byte <<= 4;
-	case 1:	    *out++ = (byte >> 4) & 15;
-	}
-	pixels -= 2;
-    }
-}
-
-static void
-unpackP2L(UINT8* out, const UINT8* in, int pixels)
-{
-    int i, j, m, s;
-    /* bit layers */
-    m = 128;
-    s = (pixels+7)/8;
-    for (i = j = 0; i < pixels; i++) {
-	out[i] = ((in[j] & m) ? 1 : 0) + ((in[j + s] & m) ? 2 : 0);
-	if ((m >>= 1) == 0) {
-	    m = 128;
-	    j++;
-	}
-    }
-}
-
-static void
-unpackP4L(UINT8* out, const UINT8* in, int pixels)
-{
-    int i, j, m, s;
-    /* bit layers (trust the optimizer ;-) */
-    m = 128;
-    s = (pixels+7)/8;
-    for (i = j = 0; i < pixels; i++) {
-	out[i] = ((in[j] & m) ? 1 : 0) + ((in[j + s] & m) ? 2 : 0) +
-		 ((in[j + 2*s] & m) ? 4 : 0) + ((in[j + 3*s] & m) ? 8 : 0);
-	if ((m >>= 1) == 0) {
-	    m = 128;
-	    j++;
-	}
-    }
-}
-
-/* Unpack to "RGB" image */
-
-void
-ImagingUnpackRGB(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB triplets */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[0];
-	out[G] = in[1];
-	out[B] = in[2];
-	out[A] = 255;
-	out += 4; in += 3;
-    }
-}
-
-void
-unpackRGB16B(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* 16-bit RGB triplets, big-endian order */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[0];
-	out[G] = in[2];
-	out[B] = in[4];
-	out[A] = 255;
-	out += 4; in += 6;
-    }
-}
-
-static void
-unpackRGBL(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB, line interleaved */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[i];
-	out[G] = in[i+pixels];
-	out[B] = in[i+pixels+pixels];
-	out[A] = 255;
-	out += 4;
-    }
-}
-
-static void
-unpackRGBR(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB, bit reversed */
-    for (i = 0; i < pixels; i++) {
-	out[R] = BITFLIP[in[0]];
-	out[G] = BITFLIP[in[1]];
-	out[B] = BITFLIP[in[2]];
-	out[A] = 255;
-	out += 4; in += 3;
-    }
-}
-
-void
-ImagingUnpackBGR(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB, reversed bytes */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[2];
-	out[G] = in[1];
-	out[B] = in[0];
-	out[A] = 255;
-	out += 4; in += 3;
-    }
-}
-
-void
-ImagingUnpackBGR15(UINT8* out, const UINT8* in, int pixels)
-{
-    int i, pixel;
-    /* RGB, reversed bytes, 5 bits per pixel */
-    for (i = 0; i < pixels; i++) {
-	pixel = in[0] + (in[1] << 8);
-	out[B] = (pixel & 31) * 255 / 31;
-	out[G] = ((pixel>>5) & 31) * 255 / 31;
-	out[R] = ((pixel>>10) & 31) * 255 / 31;
-	out[A] = 255;
-	out += 4; in += 2;
-    }
-}
-
-void
-ImagingUnpackBGR16(UINT8* out, const UINT8* in, int pixels)
-{
-    int i, pixel;
-    /* RGB, reversed bytes, 5/6/5 bits per pixel */
-    for (i = 0; i < pixels; i++) {
-	pixel = in[0] + (in[1] << 8);
-	out[B] = (pixel & 31) * 255 / 31;
-	out[G] = ((pixel>>5) & 63) * 255 / 63;
-	out[R] = ((pixel>>11) & 31) * 255 / 31;
-	out[A] = 255;
-	out += 4; in += 2;
-    }
-}
-
-static void
-ImagingUnpackBGRX(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB, reversed bytes with padding */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[2];
-	out[G] = in[1];
-	out[B] = in[0];
-	out[A] = 255;
-	out += 4; in += 4;
-    }
-}
-
-static void
-ImagingUnpackXRGB(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB, leading pad */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[1];
-	out[G] = in[2];
-	out[B] = in[3];
-	out[A] = 255;
-	out += 4; in += 4;
-    }
-}
-
-static void
-ImagingUnpackXBGR(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGB, reversed bytes, leading pad */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[3];
-	out[G] = in[2];
-	out[B] = in[1];
-	out[A] = 255;
-	out += 4; in += 4;
-    }
-}
-
-/* Unpack to "RGBA" image */
-
-static void
-unpackRGBALA(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* greyscale with alpha */
-    for (i = 0; i < pixels; i++) {
-	out[R] = out[G] = out[B] = in[0];
-	out[A] = in[1];
-	out += 4; in += 2;
-    }
-}
-
-static void
-unpackRGBALA16B(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* 16-bit greyscale with alpha, big-endian */
-    for (i = 0; i < pixels; i++) {
-	out[R] = out[G] = out[B] = in[0];
-	out[A] = in[2];
-	out += 4; in += 4;
-    }
-}
-
-static void
-unpackRGBa(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* premultiplied RGBA */
-    for (i = 0; i < pixels; i++) {
-	int a = in[3];
-        if (!a)
-            out[R] = out[G] = out[B] = out[A] = 0;
-        else {
-            out[R] = CLIP(in[0] * 255 / a);
-            out[G] = CLIP(in[1] * 255 / a);
-            out[B] = CLIP(in[2] * 255 / a);
-            out[A] = a;
-        }
-	out += 4; in += 4;
-    }
-}
-
-static void
-unpackRGBAI(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGBA, inverted RGB bytes (FlashPix) */
-    for (i = 0; i < pixels; i++) {
-	out[R] = ~in[0];
-	out[G] = ~in[1];
-	out[B] = ~in[2];
-	out[A] = in[3];
-	out += 4; in += 4;
-    }
-}
-
-static void
-unpackRGBAL(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-
-    /* RGBA, line interleaved */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[i];
-	out[G] = in[i+pixels];
-	out[B] = in[i+pixels+pixels];
-	out[A] = in[i+pixels+pixels+pixels];
-	out += 4;
-    }
-}
-
-void
-unpackRGBA16B(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* 16-bit RGBA, big-endian order */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[0];
-	out[G] = in[2];
-	out[B] = in[4];
-	out[A] = in[6];
-	out += 4; in += 8;
-    }
-}
-
-static void
-unpackARGB(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGBA, leading pad */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[1];
-	out[G] = in[2];
-	out[B] = in[3];
-	out[A] = in[0];
-	out += 4; in += 4;
-    }
-}
-
-static void
-unpackABGR(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGBA, reversed bytes */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[3];
-	out[G] = in[2];
-	out[B] = in[1];
-	out[A] = in[0];
-	out += 4; in += 4;
-    }
-}
-
-static void
-unpackBGRA(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* RGBA, reversed bytes */
-    for (i = 0; i < pixels; i++) {
-	out[R] = in[2];
-	out[G] = in[1];
-	out[B] = in[0];
-	out[A] = in[3];
-	out += 4; in += 4;
-    }
-}
-
-
-/* Unpack to "CMYK" image */
-
-static void
-unpackCMYKI(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* CMYK, inverted bytes (Photoshop 2.5) */
-    for (i = 0; i < pixels; i++) {
-	out[C] = ~in[0];
-	out[M] = ~in[1];
-	out[Y] = ~in[2];
-	out[K] = ~in[3];
-	out += 4; in += 4;
-    }
-}
-
-static void
-copy1(UINT8* out, const UINT8* in, int pixels)
-{
-    /* L, P */
-    memcpy(out, in, pixels);
-}
-
-static void
-copy2(UINT8* out, const UINT8* in, int pixels)
-{
-    /* I;16 */
-    memcpy(out, in, pixels*2);
-}
-
-static void
-copy4(UINT8* out, const UINT8* in, int pixels)
-{
-    /* RGBA, CMYK quadruples */
-    memcpy(out, in, 4 * pixels);
-}
-
-
-/* Unpack to "I" and "F" images */
-
-#define UNPACK_RAW(NAME, GET, INTYPE, OUTTYPE)\
-static void NAME(UINT8* out_, const UINT8* in, int pixels)\
-{\
-    int i;\
-    OUTTYPE* out = (OUTTYPE*) out_;\
-    for (i = 0; i < pixels; i++, in += sizeof(INTYPE))\
-        out[i] = (OUTTYPE) ((INTYPE) GET);\
-}
-
-#define UNPACK(NAME, COPY, INTYPE, OUTTYPE)\
-static void NAME(UINT8* out_, const UINT8* in, int pixels)\
-{\
-    int i;\
-    OUTTYPE* out = (OUTTYPE*) out_;\
-    INTYPE tmp_;\
-    UINT8* tmp = (UINT8*) &tmp_;\
-    for (i = 0; i < pixels; i++, in += sizeof(INTYPE)) {\
-        COPY;\
-        out[i] = (OUTTYPE) tmp_;\
-    }\
-}
-
-UNPACK_RAW(unpackI8, in[0], UINT8, INT32)
-UNPACK_RAW(unpackI8S, in[0], INT8, INT32)
-UNPACK(unpackI16, C16L, UINT16, INT32)
-UNPACK(unpackI16S, C16L, INT16, INT32)
-UNPACK(unpackI16B, C16B, UINT16, INT32)
-UNPACK(unpackI16BS, C16B, INT16, INT32)
-UNPACK(unpackI16N, C16N, UINT16, INT32)
-UNPACK(unpackI16NS, C16N, INT16, INT32)
-UNPACK(unpackI32, C32L, UINT32, INT32)
-UNPACK(unpackI32S, C32L, INT32, INT32)
-UNPACK(unpackI32B, C32B, UINT32, INT32)
-UNPACK(unpackI32BS, C32B, INT32, INT32)
-UNPACK(unpackI32N, C32N, UINT32, INT32)
-UNPACK(unpackI32NS, C32N, INT32, INT32)
-
-UNPACK_RAW(unpackF8, in[0], UINT8, FLOAT32)
-UNPACK_RAW(unpackF8S, in[0], INT8, FLOAT32)
-UNPACK(unpackF16, C16L, UINT16, FLOAT32)
-UNPACK(unpackF16S, C16L, INT16, FLOAT32)
-UNPACK(unpackF16B, C16B, UINT16, FLOAT32)
-UNPACK(unpackF16BS, C16B, INT16, FLOAT32)
-UNPACK(unpackF16N, C16N, UINT16, FLOAT32)
-UNPACK(unpackF16NS, C16N, INT16, FLOAT32)
-UNPACK(unpackF32, C32L, UINT32, FLOAT32)
-UNPACK(unpackF32S, C32L, INT32, FLOAT32)
-UNPACK(unpackF32B, C32B, UINT32, FLOAT32)
-UNPACK(unpackF32BS, C32B, INT32, FLOAT32)
-UNPACK(unpackF32N, C32N, UINT32, FLOAT32)
-UNPACK(unpackF32NS, C32N, INT32, FLOAT32)
-UNPACK(unpackF32F, C32L, FLOAT32, FLOAT32)
-UNPACK(unpackF32BF, C32B, FLOAT32, FLOAT32)
-UNPACK(unpackF32NF, C32N, FLOAT32, FLOAT32)
-#ifdef FLOAT64
-UNPACK(unpackF64F, C64L, FLOAT64, FLOAT32)
-UNPACK(unpackF64BF, C64B, FLOAT64, FLOAT32)
-UNPACK(unpackF64NF, C64N, FLOAT64, FLOAT32)
-#endif
-
-
-/* Misc. unpackers */
-
-static void
-band0(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* band 0 only */
-    for (i = 0; i < pixels; i++) {
-	out[0] = in[i];
-	out += 4;
-    }
-}
-
-static void
-band1(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* band 1 only */
-    for (i = 0; i < pixels; i++) {
-	out[1] = in[i];
-	out += 4;
-    }
-}
-
-static void
-band2(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* band 2 only */
-    for (i = 0; i < pixels; i++) {
-	out[2] = in[i];
-	out += 4;
-    }
-}
-
-static void
-band3(UINT8* out, const UINT8* in, int pixels)
-{
-    /* band 3 only */
-    int i;
-    for (i = 0; i < pixels; i++) {
-	out[3] = in[i];
-	out += 4;
-    }
-}
-
-static void
-band0I(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* band 0 only */
-    for (i = 0; i < pixels; i++) {
-	out[0] = ~in[i];
-	out += 4;
-    }
-}
-
-static void
-band1I(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* band 1 only */
-    for (i = 0; i < pixels; i++) {
-	out[1] = ~in[i];
-	out += 4;
-    }
-}
-
-static void
-band2I(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* band 2 only */
-    for (i = 0; i < pixels; i++) {
-	out[2] = ~in[i];
-	out += 4;
-    }
-}
-
-static void
-band3I(UINT8* out, const UINT8* in, int pixels)
-{
-    /* band 3 only */
-    int i;
-    for (i = 0; i < pixels; i++) {
-	out[3] = ~in[i];
-	out += 4;
-    }
-}
-
-static struct {
-    const char* mode;
-    const char* rawmode;
-    int bits;
-    ImagingShuffler unpack;
-} unpackers[] = {
-
-    /* raw mode syntax is "<mode>;<bits><flags>" where "bits" defaults
-       depending on mode (1 for "1", 8 for "P" and "L", etc), and
-       "flags" should be given in alphabetical order.  if both bits
-       and flags have their default values, the ; should be left out */
-
-    /* flags: "I" inverted data; "R" reversed bit order; "B" big
-       endian byte order (default is little endian); "L" line
-       interleave, "S" signed, "F" floating point */
-
-    /* bilevel */
-    {"1",	"1",		1,	unpack1},
-    {"1",	"1;I",		1,	unpack1I},
-    {"1",	"1;R",		1,	unpack1R},
-    {"1",	"1;IR",		1,	unpack1IR},
-
-    /* greyscale */
-    {"L",	"L;2",  	2,	unpackL2},
-    {"L",	"L;4",  	4,	unpackL4},
-    {"L",	"L",   		8,	copy1},
-    {"L",	"L;I",   	8,	unpackLI},
-    {"L",	"L;R",   	8,	unpackLR},
-    {"L",	"L;16",  	16,	unpackL16},
-    {"L",	"L;16B",  	16,	unpackL16B},
-
-    /* greyscale w. alpha */
-    {"LA",	"LA",   	16,	unpackLA},
-    {"LA",	"LA;L",   	16,	unpackLAL},
-
-    /* palette */
-    {"P",	"P;1",   	1,	unpackP1},
-    {"P",	"P;2",   	2,	unpackP2},
-    {"P",	"P;2L",   	2,	unpackP2L},
-    {"P",	"P;4",   	4,	unpackP4},
-    {"P",	"P;4L",   	4,	unpackP4L},
-    {"P",	"P",		8,	copy1},
-    {"P",	"P;R",   	8,	unpackLR},
-
-    /* palette w. alpha */
-    {"PA",	"PA",   	16,	unpackLA},
-    {"PA",	"PA;L",   	16,	unpackLAL},
-
-    /* true colour */
-    {"RGB",	"RGB",		24,	ImagingUnpackRGB},
-    {"RGB",	"RGB;L",	24,	unpackRGBL},
-    {"RGB",	"RGB;R",	24,	unpackRGBR},
-    {"RGB",	"RGB;16B",	48,	unpackRGB16B},
-    {"RGB",	"BGR",		24,	ImagingUnpackBGR},
-    {"RGB",	"BGR;15",	16,	ImagingUnpackBGR15},
-    {"RGB",	"BGR;16",	16,	ImagingUnpackBGR16},
-    {"RGB",	"BGR;5",	16,	ImagingUnpackBGR15}, /* compat */
-    {"RGB",	"RGBX",		32,	copy4},
-    {"RGB",	"RGBX;L",	32,	unpackRGBAL},
-    {"RGB",	"BGRX",		32,	ImagingUnpackBGRX},
-    {"RGB",	"XRGB",		24,	ImagingUnpackXRGB},
-    {"RGB",	"XBGR",		32,	ImagingUnpackXBGR},
-    {"RGB",	"YCC;P",	24,	ImagingUnpackYCC},
-    {"RGB",	"R",   		8,	band0},
-    {"RGB",	"G",   		8,	band1},
-    {"RGB",	"B",   		8,	band2},
-
-    /* true colour w. alpha */
-    {"RGBA",	"LA",		16,	unpackRGBALA},
-    {"RGBA",	"LA;16B",	32,	unpackRGBALA16B},
-    {"RGBA",	"RGBA",		32,	copy4},
-    {"RGBA",	"RGBa",		32,	unpackRGBa},
-    {"RGBA",	"RGBA;I",	32,	unpackRGBAI},
-    {"RGBA",	"RGBA;L",	32,	unpackRGBAL},
-    {"RGBA",	"RGBA;16B",	64,	unpackRGBA16B},
-    {"RGBA",	"BGRA",		32,	unpackBGRA},
-    {"RGBA",	"ARGB",		32,	unpackARGB},
-    {"RGBA",	"ABGR",		32,	unpackABGR},
-    {"RGBA",	"YCCA;P",	32,	ImagingUnpackYCCA},
-    {"RGBA",	"R",   		8,	band0},
-    {"RGBA",	"G",   		8,	band1},
-    {"RGBA",	"B",   		8,	band2},
-    {"RGBA",	"A",   		8,	band3},
-
-    /* true colour w. padding */
-    {"RGBX",	"RGB",		24,	ImagingUnpackRGB},
-    {"RGBX",	"RGB;L",	24,	unpackRGBL},
-    {"RGBX",	"RGB;16B",	48,	unpackRGB16B},
-    {"RGBX",	"BGR",		24,	ImagingUnpackBGR},
-    {"RGBX",	"BGR;15",	16,	ImagingUnpackBGR15},
-    {"RGB",	"BGR;16",	16,	ImagingUnpackBGR16},
-    {"RGBX",	"BGR;5",	16,	ImagingUnpackBGR15}, /* compat */
-    {"RGBX",	"RGBX",		32,	copy4},
-    {"RGBX",	"RGBX;L",	32,	unpackRGBAL},
-    {"RGBX",	"BGRX",		32,	ImagingUnpackBGRX},
-    {"RGBX",	"XRGB",		24,	ImagingUnpackXRGB},
-    {"RGBX",	"XBGR",		32,	ImagingUnpackXBGR},
-    {"RGBX",	"YCC;P",	24,	ImagingUnpackYCC},
-    {"RGBX",	"R",   		8,	band0},
-    {"RGBX",	"G",   		8,	band1},
-    {"RGBX",	"B",   		8,	band2},
-    {"RGBX",	"X",   		8,	band3},
-
-    /* colour separation */
-    {"CMYK",	"CMYK",		32,	copy4},
-    {"CMYK",	"CMYK;I",	32,	unpackCMYKI},
-    {"CMYK",	"CMYK;L",	32,	unpackRGBAL},
-    {"CMYK",	"C",   		8,	band0},
-    {"CMYK",	"M",   		8,	band1},
-    {"CMYK",	"Y",   		8,	band2},
-    {"CMYK",	"K",   		8,	band3},
-    {"CMYK",	"C;I",   	8,	band0I},
-    {"CMYK",	"M;I",   	8,	band1I},
-    {"CMYK",	"Y;I",   	8,	band2I},
-    {"CMYK",	"K;I",   	8,	band3I},
-
-    /* video (YCbCr) */
-    {"YCbCr",	"YCbCr",	24,	ImagingUnpackRGB},
-    {"YCbCr",	"YCbCr;L",	24,	unpackRGBL},
-    {"YCbCr",	"YCbCrX",	32,	copy4},
-    {"YCbCr",	"YCbCrK",	32,	copy4},
-
-    /* integer variations */
-    {"I",	"I",		32,	copy4},
-    {"I",	"I;8",		8,	unpackI8},
-    {"I",	"I;8S",		8,	unpackI8S},
-    {"I",	"I;16",		16,	unpackI16},
-    {"I",	"I;16S",	16,	unpackI16S},
-    {"I",	"I;16B",	16,	unpackI16B},
-    {"I",	"I;16BS",	16,	unpackI16BS},
-    {"I",	"I;16N",	16,	unpackI16N},
-    {"I",	"I;16NS",	16,	unpackI16NS},
-    {"I",	"I;32",		32,	unpackI32},
-    {"I",	"I;32S",	32,	unpackI32S},
-    {"I",	"I;32B",	32,	unpackI32B},
-    {"I",	"I;32BS",	32,	unpackI32BS},
-    {"I",	"I;32N",	32,	unpackI32N},
-    {"I",	"I;32NS",	32,	unpackI32NS},
-
-    /* floating point variations */
-    {"F",	"F",		32,	copy4},
-    {"F",	"F;8",		8,	unpackF8},
-    {"F",	"F;8S",		8,	unpackF8S},
-    {"F",	"F;16",		16,	unpackF16},
-    {"F",	"F;16S",	16,	unpackF16S},
-    {"F",	"F;16B",	16,	unpackF16B},
-    {"F",	"F;16BS",	16,	unpackF16BS},
-    {"F",	"F;16N",	16,	unpackF16N},
-    {"F",	"F;16NS",	16,	unpackF16NS},
-    {"F",	"F;32",		32,	unpackF32},
-    {"F",	"F;32S",	32,	unpackF32S},
-    {"F",	"F;32B",	32,	unpackF32B},
-    {"F",	"F;32BS",	32,	unpackF32BS},
-    {"F",	"F;32N",	32,	unpackF32N},
-    {"F",	"F;32NS",	32,	unpackF32NS},
-    {"F",	"F;32F",	32,	unpackF32F},
-    {"F",	"F;32BF",	32,	unpackF32BF},
-    {"F",	"F;32NF",	32,	unpackF32NF},
-#ifdef FLOAT64
-    {"F",	"F;64F",	64,	unpackF64F},
-    {"F",	"F;64BF",	64,	unpackF64BF},
-    {"F",	"F;64NF",	64,	unpackF64NF},
-#endif
-
-    /* storage modes */
-    {"I;16",	"I;16",		16,	copy2},
-    {"I;16B",	"I;16B",	16,	copy2},
-
-    {NULL} /* sentinel */
-};
-
-
-ImagingShuffler
-ImagingFindUnpacker(const char* mode, const char* rawmode, int* bits_out)
-{
-    int i;
-
-    /* find a suitable pixel unpacker */
-    for (i = 0; unpackers[i].rawmode; i++)
-	if (strcmp(unpackers[i].mode, mode) == 0 &&
-            strcmp(unpackers[i].rawmode, rawmode) == 0) {
-	    if (bits_out)
-		*bits_out = unpackers[i].bits;
-	    return unpackers[i].unpack;
-	}
-
-    /* FIXME: configure a general unpacker based on the type codes... */
-
-    return NULL;
-}
diff --git a/pythonPackages/pil/libImaging/UnpackYCC.c b/pythonPackages/pil/libImaging/UnpackYCC.c
deleted file mode 100644
index 421e901b5a..0000000000
--- a/pythonPackages/pil/libImaging/UnpackYCC.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: UnpackYCC.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * code to convert and unpack PhotoYCC data
- *
- * history:
- * 97-01-25 fl	Moved from PcdDecode.c
- *
- * Copyright (c) Fredrik Lundh 1996-97.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-/* Tables generated by pcdtables.py, based on transforms taken from
-   the "Colour Space Conversions FAQ" by Roberts/Ford. */
-
-static INT16 L[] = { 0, 1, 3, 4, 5, 7, 8, 10, 11, 12, 14, 15, 16, 18,
-19, 20, 22, 23, 24, 26, 27, 29, 30, 31, 33, 34, 35, 37, 38, 39, 41,
-42, 43, 45, 46, 48, 49, 50, 52, 53, 54, 56, 57, 58, 60, 61, 62, 64,
-65, 67, 68, 69, 71, 72, 73, 75, 76, 77, 79, 80, 82, 83, 84, 86, 87,
-88, 90, 91, 92, 94, 95, 96, 98, 99, 101, 102, 103, 105, 106, 107, 109,
-110, 111, 113, 114, 115, 117, 118, 120, 121, 122, 124, 125, 126, 128,
-129, 130, 132, 133, 134, 136, 137, 139, 140, 141, 143, 144, 145, 147,
-148, 149, 151, 152, 153, 155, 156, 158, 159, 160, 162, 163, 164, 166,
-167, 168, 170, 171, 173, 174, 175, 177, 178, 179, 181, 182, 183, 185,
-186, 187, 189, 190, 192, 193, 194, 196, 197, 198, 200, 201, 202, 204,
-205, 206, 208, 209, 211, 212, 213, 215, 216, 217, 219, 220, 221, 223,
-224, 225, 227, 228, 230, 231, 232, 234, 235, 236, 238, 239, 240, 242,
-243, 245, 246, 247, 249, 250, 251, 253, 254, 255, 257, 258, 259, 261,
-262, 264, 265, 266, 268, 269, 270, 272, 273, 274, 276, 277, 278, 280,
-281, 283, 284, 285, 287, 288, 289, 291, 292, 293, 295, 296, 297, 299,
-300, 302, 303, 304, 306, 307, 308, 310, 311, 312, 314, 315, 317, 318,
-319, 321, 322, 323, 325, 326, 327, 329, 330, 331, 333, 334, 336, 337,
-338, 340, 341, 342, 344, 345, 346 };
-
-static INT16 CB[] = { -345, -343, -341, -338, -336, -334, -332, -329,
--327, -325, -323, -321, -318, -316, -314, -312, -310, -307, -305,
--303, -301, -298, -296, -294, -292, -290, -287, -285, -283, -281,
--278, -276, -274, -272, -270, -267, -265, -263, -261, -258, -256,
--254, -252, -250, -247, -245, -243, -241, -239, -236, -234, -232,
--230, -227, -225, -223, -221, -219, -216, -214, -212, -210, -207,
--205, -203, -201, -199, -196, -194, -192, -190, -188, -185, -183,
--181, -179, -176, -174, -172, -170, -168, -165, -163, -161, -159,
--156, -154, -152, -150, -148, -145, -143, -141, -139, -137, -134,
--132, -130, -128, -125, -123, -121, -119, -117, -114, -112, -110,
--108, -105, -103, -101, -99, -97, -94, -92, -90, -88, -85, -83, -81,
--79, -77, -74, -72, -70, -68, -66, -63, -61, -59, -57, -54, -52, -50,
--48, -46, -43, -41, -39, -37, -34, -32, -30, -28, -26, -23, -21, -19,
--17, -15, -12, -10, -8, -6, -3, -1, 0, 2, 4, 7, 9, 11, 13, 16, 18, 20,
-22, 24, 27, 29, 31, 33, 35, 38, 40, 42, 44, 47, 49, 51, 53, 55, 58,
-60, 62, 64, 67, 69, 71, 73, 75, 78, 80, 82, 84, 86, 89, 91, 93, 95,
-98, 100, 102, 104, 106, 109, 111, 113, 115, 118, 120, 122, 124, 126,
-129, 131, 133, 135, 138, 140, 142, 144, 146, 149, 151, 153, 155, 157,
-160, 162, 164, 166, 169, 171, 173, 175, 177, 180, 182, 184, 186, 189,
-191, 193, 195, 197, 200, 202, 204, 206, 208, 211, 213, 215, 217, 220 };
-
-static INT16 GB[] = { 67, 67, 66, 66, 65, 65, 65, 64, 64, 63, 63, 62,
-62, 62, 61, 61, 60, 60, 59, 59, 59, 58, 58, 57, 57, 56, 56, 56, 55,
-55, 54, 54, 53, 53, 52, 52, 52, 51, 51, 50, 50, 49, 49, 49, 48, 48,
-47, 47, 46, 46, 46, 45, 45, 44, 44, 43, 43, 43, 42, 42, 41, 41, 40,
-40, 40, 39, 39, 38, 38, 37, 37, 37, 36, 36, 35, 35, 34, 34, 34, 33,
-33, 32, 32, 31, 31, 31, 30, 30, 29, 29, 28, 28, 28, 27, 27, 26, 26,
-25, 25, 25, 24, 24, 23, 23, 22, 22, 22, 21, 21, 20, 20, 19, 19, 19,
-18, 18, 17, 17, 16, 16, 15, 15, 15, 14, 14, 13, 13, 12, 12, 12, 11,
-11, 10, 10, 9, 9, 9, 8, 8, 7, 7, 6, 6, 6, 5, 5, 4, 4, 3, 3, 3, 2, 2,
-1, 1, 0, 0, 0, 0, 0, -1, -1, -2, -2, -2, -3, -3, -4, -4, -5, -5, -5,
--6, -6, -7, -7, -8, -8, -8, -9, -9, -10, -10, -11, -11, -11, -12, -12,
--13, -13, -14, -14, -14, -15, -15, -16, -16, -17, -17, -18, -18, -18,
--19, -19, -20, -20, -21, -21, -21, -22, -22, -23, -23, -24, -24, -24,
--25, -25, -26, -26, -27, -27, -27, -28, -28, -29, -29, -30, -30, -30,
--31, -31, -32, -32, -33, -33, -33, -34, -34, -35, -35, -36, -36, -36,
--37, -37, -38, -38, -39, -39, -39, -40, -40, -41, -41, -42 };
-
-static INT16 CR[] = { -249, -247, -245, -243, -241, -239, -238, -236,
--234, -232, -230, -229, -227, -225, -223, -221, -219, -218, -216,
--214, -212, -210, -208, -207, -205, -203, -201, -199, -198, -196,
--194, -192, -190, -188, -187, -185, -183, -181, -179, -178, -176,
--174, -172, -170, -168, -167, -165, -163, -161, -159, -157, -156,
--154, -152, -150, -148, -147, -145, -143, -141, -139, -137, -136,
--134, -132, -130, -128, -127, -125, -123, -121, -119, -117, -116,
--114, -112, -110, -108, -106, -105, -103, -101, -99, -97, -96, -94,
--92, -90, -88, -86, -85, -83, -81, -79, -77, -76, -74, -72, -70, -68,
--66, -65, -63, -61, -59, -57, -55, -54, -52, -50, -48, -46, -45, -43,
--41, -39, -37, -35, -34, -32, -30, -28, -26, -25, -23, -21, -19, -17,
--15, -14, -12, -10, -8, -6, -4, -3, -1, 0, 2, 4, 5, 7, 9, 11, 13, 15,
-16, 18, 20, 22, 24, 26, 27, 29, 31, 33, 35, 36, 38, 40, 42, 44, 46,
-47, 49, 51, 53, 55, 56, 58, 60, 62, 64, 66, 67, 69, 71, 73, 75, 77,
-78, 80, 82, 84, 86, 87, 89, 91, 93, 95, 97, 98, 100, 102, 104, 106,
-107, 109, 111, 113, 115, 117, 118, 120, 122, 124, 126, 128, 129, 131,
-133, 135, 137, 138, 140, 142, 144, 146, 148, 149, 151, 153, 155, 157,
-158, 160, 162, 164, 166, 168, 169, 171, 173, 175, 177, 179, 180, 182,
-184, 186, 188, 189, 191, 193, 195, 197, 199, 200, 202, 204, 206, 208,
-209, 211, 213, 215 };
-
-static INT16 GR[] = { 127, 126, 125, 124, 123, 122, 121, 121, 120, 119,
-118, 117, 116, 115, 114, 113, 112, 111, 110, 109, 108, 108, 107, 106,
-105, 104, 103, 102, 101, 100, 99, 98, 97, 96, 95, 95, 94, 93, 92, 91,
-90, 89, 88, 87, 86, 85, 84, 83, 83, 82, 81, 80, 79, 78, 77, 76, 75,
-74, 73, 72, 71, 70, 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59,
-58, 57, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 45, 44,
-43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 32, 31, 30, 29, 28,
-27, 26, 25, 24, 23, 22, 21, 20, 19, 19, 18, 17, 16, 15, 14, 13, 12,
-11, 10, 9, 8, 7, 6, 6, 5, 4, 3, 2, 1, 0, 0, -1, -2, -3, -4, -5, -5,
--6, -7, -8, -9, -10, -11, -12, -13, -14, -15, -16, -17, -18, -18, -19,
--20, -21, -22, -23, -24, -25, -26, -27, -28, -29, -30, -31, -31, -32,
--33, -34, -35, -36, -37, -38, -39, -40, -41, -42, -43, -44, -44, -45,
--46, -47, -48, -49, -50, -51, -52, -53, -54, -55, -56, -56, -57, -58,
--59, -60, -61, -62, -63, -64, -65, -66, -67, -68, -69, -69, -70, -71,
--72, -73, -74, -75, -76, -77, -78, -79, -80, -81, -82, -82, -83, -84,
--85, -86, -87, -88, -89, -90, -91, -92, -93, -94, -94, -95, -96, -97,
--98, -99, -100, -101, -102, -103, -104, -105, -106, -107, -107, -108 };
-
-#define	R 0
-#define	G 1
-#define	B 2
-#define	A 3
-
-#define	YCC2RGB(rgb, y, cb, cr) {\
-    int l = L[y];\
-    int r = l + CR[cr];\
-    int g = l + GR[cr] + GB[cb];\
-    int b = l + CB[cb];\
-    rgb[0] = (r <= 0) ? 0 : (r >= 255) ? 255 : r;\
-    rgb[1] = (g <= 0) ? 0 : (g >= 255) ? 255 : g;\
-    rgb[2] = (b <= 0) ? 0 : (b >= 255) ? 255 : b;\
-}
-
-void
-ImagingUnpackYCC(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* PhotoYCC triplets */
-    for (i = 0; i < pixels; i++) {
-	YCC2RGB(out, in[0], in[1], in[2]);
-	out[A] = 255;
-	out += 4; in += 3;
-    }
-}
-
-void
-ImagingUnpackYCCA(UINT8* out, const UINT8* in, int pixels)
-{
-    int i;
-    /* PhotoYCC triplets plus premultiplied alpha */
-    for (i = 0; i < pixels; i++) {
-	/* Divide by alpha */
-	UINT8 rgb[3];
-	rgb[0] = (in[3] == 0) ? 0 : (((int) in[0] * 255) / in[3]);
-	rgb[1] = (in[3] == 0) ? 0 : (((int) in[1] * 255) / in[3]);
-	rgb[2] = (in[3] == 0) ? 0 : (((int) in[2] * 255) / in[3]);
-	/* Convert non-multiplied data to RGB */
-	YCC2RGB(out, rgb[0], rgb[1], rgb[2]);
-	out[A] = in[3];
-	out += 4; in += 4;
-    }
-}
diff --git a/pythonPackages/pil/libImaging/XbmDecode.c b/pythonPackages/pil/libImaging/XbmDecode.c
deleted file mode 100644
index 4819889bcc..0000000000
--- a/pythonPackages/pil/libImaging/XbmDecode.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: XbmDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for XBM hex image data
- *
- * history:
- *	96-04-13 fl	Created
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#define	HEX(v) ((v >= '0' && v <= '9') ? v - '0' :\
-		(v >= 'a' && v <= 'f') ? v - 'a' + 10 :\
-		(v >= 'A' && v <= 'F') ? v - 'A' + 10 : 0)
-
-int
-ImagingXbmDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    enum { BYTE = 1, SKIP };
-
-    UINT8* ptr;
-
-    if (!state->state)
-	state->state = SKIP;
-
-    ptr = buf;
-
-    for (;;) {
-
-	if (state->state == SKIP) {
-
-	    /* Skip forward until next 'x' */
-
-	    while (bytes > 0) {
-		if (*ptr == 'x')
-		    break;
-		ptr++;
-		bytes--;
-	    }
-
-	    if (bytes == 0)
-		return ptr - buf;
-
-	    state->state = BYTE;
-
-	}
-
-	if (bytes < 3)
-	    return ptr - buf;
-
-	state->buffer[state->x] = (HEX(ptr[1])<<4) + HEX(ptr[2]);
-
-	if (++state->x >= state->bytes) {
-
-	    /* Got a full line, unpack it */
-	    state->shuffle((UINT8*) im->image[state->y], state->buffer,
-			   state->xsize);
-
-	    state->x = 0;
-
-	    if (++state->y >= state->ysize) {
-		/* End of file (errcode = 0) */
-		return -1;
-	    }
-	}
-
-	ptr += 3;
-	bytes -= 3;
-
-	state->state = SKIP;
-
-    }
-
-}
diff --git a/pythonPackages/pil/libImaging/XbmEncode.c b/pythonPackages/pil/libImaging/XbmEncode.c
deleted file mode 100644
index 8ca8ab1e47..0000000000
--- a/pythonPackages/pil/libImaging/XbmEncode.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: XbmEncode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * encoder for Xbm data
- *
- * history:
- *	96-11-01 fl	created
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-
-int
-ImagingXbmEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    const char *hex = "0123456789abcdef";
-
-    UINT8* ptr = buf;
-    int i, n;
-
-    if (!state->state) {
-
-	/* 8 pixels are stored in no more than 6 bytes */
-	state->bytes = 6*(state->xsize+7)/8;
-
-	state->state = 1;
-
-    }
-
-    if (bytes < state->bytes) {
-	state->errcode = IMAGING_CODEC_MEMORY;
-	return 0;
-    }
-
-    ptr = buf;
-
-    while (bytes >= state->bytes) {
-
-	state->shuffle(state->buffer,
-		       (UINT8*) im->image[state->y + state->yoff] +
-		       state->xoff * im->pixelsize, state->xsize);
-
-	if (state->y < state->ysize-1) {
-
-	    /* any line but the last */
-	    for (n = 0; n < state->xsize; n += 8) {
-
-		i = state->buffer[n/8];
-
-		*ptr++ = '0';
-		*ptr++ = 'x';
-		*ptr++ = hex[(i>>4)&15];
-		*ptr++ = hex[i&15];
-		*ptr++ = ',';
-		bytes -= 5;
-
-		if (++state->count >= 79/5) {
-		    *ptr++ = '\n';
-		    bytes--;
-		    state->count = 0;
-		}
-
-	    }
-
-	    state->y++;
-
-	} else {
-
-	    /* last line */
-	    for (n = 0; n < state->xsize; n += 8) {
-
-		i = state->buffer[n/8];
-
-		*ptr++ = '0';
-		*ptr++ = 'x';
-		*ptr++ = hex[(i>>4)&15];
-		*ptr++ = hex[i&15];
-
-		if (n < state->xsize-8) {
-		    *ptr++ = ',';
-		    if (++state->count >= 79/5) {
-			*ptr++ = '\n';
-			bytes--;
-			state->count = 0;
-		    }
-		} else
-		    *ptr++ = '\n';
-
-		bytes -= 5;
-
-	    }
-
-	    state->errcode = IMAGING_CODEC_END;
-	    break;
-	}
-    }
-
-    return ptr - buf;
-}
diff --git a/pythonPackages/pil/libImaging/Zip.h b/pythonPackages/pil/libImaging/Zip.h
deleted file mode 100644
index d306d7cb4f..0000000000
--- a/pythonPackages/pil/libImaging/Zip.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: Zip.h 2134 2004-10-06 08:55:20Z fredrik $
- *
- * declarations for the ZIP codecs
- *
- * Copyright (c) Fredrik Lundh 1996.
- */
-
-
-#include "zlib.h"
-
-
-/* modes */
-#define	ZIP_PNG	0		/* continuous, filtered image data */
-#define	ZIP_PNG_PALETTE	1	/* non-continuous data, disable filtering */
-#define	ZIP_TIFF_PREDICTOR 2	/* TIFF, with predictor */
-#define	ZIP_TIFF 3		/* TIFF, without predictor */
-
-
-typedef struct {
-
-    /* CONFIGURATION */
-
-    /* Codec mode */
-    int mode;
-
-    /* Optimize (max compression) SLOW!!! */
-    int optimize;
-
-    /* Predefined dictionary (experimental) */
-    char* dictionary;
-    int dictionary_size;
-
-    /* PRIVATE CONTEXT (set by decoder/encoder) */
-
-    z_stream z_stream;		/* (de)compression stream */
-
-    UINT8* previous;		/* previous line (allocated) */
-
-    int last_output;		/* # bytes last output by inflate */
-
-    /* Compressor specific stuff */
-    UINT8* prior;		/* filter storage (allocated) */
-    UINT8* up;
-    UINT8* average;
-    UINT8* paeth;
-
-    UINT8* output;		/* output data */
-
-    int prefix;			/* size of filter prefix (0 for TIFF data) */
-
-} ZIPSTATE;
diff --git a/pythonPackages/pil/libImaging/ZipDecode.c b/pythonPackages/pil/libImaging/ZipDecode.c
deleted file mode 100644
index 71e0a73ce2..0000000000
--- a/pythonPackages/pil/libImaging/ZipDecode.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: ZipDecode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * decoder for ZIP (deflated) image data.
- *
- * history:
- * 1996-12-14 fl   Created (for PNG)
- * 1997-01-15 fl   Prepared to read TIFF/ZIP
- * 2001-11-19 fl   PNG incomplete read patch (from Bernhard Herzog)
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997-2001.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#ifdef	HAVE_LIBZ
-
-#include "Zip.h"
-
-
-/* -------------------------------------------------------------------- */
-/* Decoder								*/
-/* -------------------------------------------------------------------- */
-
-int
-ImagingZipDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    ZIPSTATE* context = (ZIPSTATE*) state->context;
-    int err;
-    int n;
-    UINT8* ptr;
-    int i, bpp;
-
-    if (!state->state) {
-
-	/* Initialization */
-	if (context->mode == ZIP_PNG || context->mode == ZIP_PNG_PALETTE)
-	    context->prefix = 1; /* PNG */
-
-	/* Expand standard buffer to make room for the (optional) filter
-	   prefix, and allocate a buffer to hold the previous line */
-	free(state->buffer);
-	state->buffer = (UINT8*) malloc(state->bytes+1);
-	context->previous = (UINT8*) malloc(state->bytes+1);
-	if (!state->buffer || !context->previous) {
-	    state->errcode = IMAGING_CODEC_MEMORY;
-	    return -1;
-	}
-
-        context->last_output = 0;
-
-	/* Initialize to black */
-	memset(context->previous, 0, state->bytes+1);
-
-	/* Setup decompression context */
-	context->z_stream.zalloc = (alloc_func)0;
-	context->z_stream.zfree = (free_func)0;
-	context->z_stream.opaque = (voidpf)0;
-
-	err = inflateInit(&context->z_stream);
-	if (err < 0) {
-	    state->errcode = IMAGING_CODEC_CONFIG;
-	    return -1;
-	}
-
-	/* Ready to decode */
-	state->state = 1;
-
-    }
-
-    /* Setup the source buffer */
-    context->z_stream.next_in = buf;
-    context->z_stream.avail_in = bytes;
-
-    /* Decompress what we've got this far */
-    while (context->z_stream.avail_in > 0) {
-
-	context->z_stream.next_out = state->buffer + context->last_output;
-	context->z_stream.avail_out =
-            state->bytes + context->prefix - context->last_output;
-
-	err = inflate(&context->z_stream, Z_NO_FLUSH);
-
-	if (err < 0) {
-	    /* Something went wrong inside the compression library */
-	    if (err == Z_DATA_ERROR)
-		state->errcode = IMAGING_CODEC_BROKEN;
-	    else if (err == Z_MEM_ERROR)
-		state->errcode = IMAGING_CODEC_MEMORY;
-	    else
-		state->errcode = IMAGING_CODEC_CONFIG;
-	    free(context->previous);
-	    inflateEnd(&context->z_stream);
-	    return -1;
-	}
-
-	n = state->bytes + context->prefix - context->z_stream.avail_out;
-
-	if (n < state->bytes + context->prefix) {
-            context->last_output = n;
-	    break; /* need more input data */
-	}
-
-	/* Apply predictor */
-	switch (context->mode) {
-	case ZIP_PNG:
-	    switch (state->buffer[0]) {
-	    case 0:
-		break;
-	    case 1:
-		/* prior */
-		bpp = (state->bits + 7) / 8;
-		for (i = bpp+1; i <= state->bytes; i++)
-		    state->buffer[i] += state->buffer[i-bpp];
-		break;
-	    case 2:
-		/* up */
-		for (i = 1; i <= state->bytes; i++)
-		    state->buffer[i] += context->previous[i];
-		break;
-	    case 3:
-		/* average */
-		bpp = (state->bits + 7) / 8;
-		for (i = 1; i <= bpp; i++)
-		    state->buffer[i] += context->previous[i]/2;
-		for (; i <= state->bytes; i++)
-		    state->buffer[i] +=
-			(state->buffer[i-bpp] + context->previous[i])/2;
-		break;
-	    case 4:
-		/* paeth filtering */
-		bpp = (state->bits + 7) / 8;
-		for (i = 1; i <= bpp; i++)
-		    state->buffer[i] += context->previous[i];
-		for (; i <= state->bytes; i++) {
-		    int a, b, c;
-		    int pa, pb, pc;
-
-		    /* fetch pixels */
-		    a = state->buffer[i-bpp];
-		    b = context->previous[i];
-		    c = context->previous[i-bpp];
-
-		    /* distances to surrounding pixels */
-		    pa = abs(b - c);
-		    pb = abs(a - c);
-		    pc = abs(a + b - 2*c);
-
-		    /* pick predictor with the shortest distance */
-		    state->buffer[i] +=
-			(pa <= pb && pa <= pc) ? a : (pb <= pc) ? b : c;
-
-		}
-		break;
-	    default:
-		state->errcode = IMAGING_CODEC_UNKNOWN;
-		free(context->previous);
-		inflateEnd(&context->z_stream);
-		return -1;
-	    }
-	    break;
-	case ZIP_TIFF_PREDICTOR:
-	    bpp = (state->bits + 7) / 8;
-	    for (i = bpp+1; i <= state->bytes; i++)
-		state->buffer[i] += state->buffer[i-bpp];
-	    break;
-	}
-
-	/* Stuff data into the image */
-	state->shuffle((UINT8*) im->image[state->y + state->yoff] + 
-		       state->xoff * im->pixelsize,
-		       state->buffer + context->prefix,
-		       state->xsize);
-
-	state->y++;
-
-        /* all inflate output has been consumed */
-        context->last_output = 0;
-
-	if (state->y >= state->ysize || err == Z_STREAM_END) {
-
-	    /* The image and the data should end simultaneously */
-	    /* if (state->y < state->ysize || err != Z_STREAM_END)
-		state->errcode = IMAGING_CODEC_BROKEN; */
-
-	    free(context->previous);
-	    inflateEnd(&context->z_stream);
-	    return -1; /* end of file (errcode=0) */
-
-	}
-
-	/* Swap buffer pointers */
-	ptr = state->buffer;
-	state->buffer = context->previous;
-	context->previous = ptr;
-
-    }
-
-    return bytes; /* consumed all of it */
-
-}
-
-#endif
diff --git a/pythonPackages/pil/libImaging/ZipEncode.c b/pythonPackages/pil/libImaging/ZipEncode.c
deleted file mode 100644
index 11e000ca58..0000000000
--- a/pythonPackages/pil/libImaging/ZipEncode.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: ZipEncode.c 2134 2004-10-06 08:55:20Z fredrik $
- *
- * coder for ZIP (deflated) image data
- *
- * History:
- * 96-12-29 fl	created
- * 96-12-30 fl	adaptive filter selection, encoder tuning
- *
- * Copyright (c) Fredrik Lundh 1996.
- * Copyright (c) Secret Labs AB 1997.
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Imaging.h"
-
-#ifdef	HAVE_LIBZ
-
-#include "Zip.h"
-
-int
-ImagingZipEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
-{
-    ZIPSTATE* context = (ZIPSTATE*) state->context;
-    int err;
-    UINT8* ptr;
-    int i, bpp, s, sum;
-
-    if (!state->state) {
-
-	/* Initialization */
-
-	/* Valid modes are ZIP_PNG, ZIP_PNG_PALETTE, and ZIP_TIFF */
-
-	/* Expand standard buffer to make room for the filter selector,
-	   and allocate filter buffers */
-	free(state->buffer);
-	state->buffer = (UINT8*) malloc(state->bytes+1);
-	context->previous = (UINT8*) malloc(state->bytes+1);
-	context->prior = (UINT8*) malloc(state->bytes+1);
-	context->up = (UINT8*) malloc(state->bytes+1);
-	context->average = (UINT8*) malloc(state->bytes+1);
-	context->paeth = (UINT8*) malloc(state->bytes+1);
-	if (!state->buffer || !context->previous || !context->prior ||
-	    !context->up || !context->average || !context->paeth) {
-	    free(context->paeth);
-	    free(context->average);
-	    free(context->up);
-	    free(context->prior);
-	    free(context->previous);
-	    state->errcode = IMAGING_CODEC_MEMORY;
-	    return -1;
-	}
-
-	/* Initalise filter buffers */
-	state->buffer[0] = 0;
-	context->prior[0] = 1;
-	context->up[0] = 2;
-	context->average[0] = 3;
-	context->paeth[0] = 4;
-
-	/* Initialise previous buffer to black */
-	memset(context->previous, 0, state->bytes+1);
-
-	/* Setup compression context */
-	context->z_stream.zalloc = (alloc_func)0;
-	context->z_stream.zfree = (free_func)0;
-	context->z_stream.opaque = (voidpf)0;
-
-	err = deflateInit2(&context->z_stream,
-			   /* compression level */
-			   (context->optimize) ? Z_BEST_COMPRESSION
-					       : Z_DEFAULT_COMPRESSION,
-			   /* compression method */
-			   Z_DEFLATED,
-			   /* compression memory resources */
-			   15, 9,
-			   /* compression strategy (image data are filtered)*/
-			   (context->mode == ZIP_PNG) ? Z_FILTERED
-						      : Z_DEFAULT_STRATEGY);
-	if (err < 0) {
-	    state->errcode = IMAGING_CODEC_CONFIG;
-	    return -1;
-	}
-
-	if (context->dictionary && context->dictionary_size > 0) {
-	    err = deflateSetDictionary(&context->z_stream, (unsigned char *)context->dictionary,
-				       context->dictionary_size);
-	    if (err < 0) {
-		state->errcode = IMAGING_CODEC_CONFIG;
-		return -1;
-	    }
-	}
-
-	/* Ready to decode */
-	state->state = 1;
-
-    }
-
-    /* Setup the destination buffer */
-    context->z_stream.next_out = buf;
-    context->z_stream.avail_out = bytes;
-
-    for (;;) {
-
-	switch (state->state) {
-
-	case 1:
-
-	    /* Compress image data */
-	    while (context->z_stream.avail_out > 0) {
-
-		if (state->y >= state->ysize) {
-		    /* End of image; now flush compressor buffers */
-		    state->state = 2;
-		    break;
-
-		}
-
-		/* Stuff image data into the compressor */
-		state->shuffle(state->buffer+1,
-			       (UINT8*) im->image[state->y + state->yoff] + 
-			       state->xoff * im->pixelsize,
-			       state->xsize);
-
-		state->y++;
-
-		context->output = state->buffer;
-
-		if (context->mode == ZIP_PNG) {
-
-		    /* Filter the image data.  For each line, select
-		       the filter that gives the least total distance
-		       from zero for the filtered data (taken from
-		       LIBPNG) */
-
-		    bpp = (state->bits + 7) / 8;
-
-		    /* 0. No filter */
-		    for (i = 1, sum = 0; i <= state->bytes; i++) {
-			UINT8 v = state->buffer[i];
-			sum += (v < 128) ? v : 256 - v;
-		    }
-
-		    /* 2. Up.  We'll test this first to save time when
-		       an image line is identical to the one above. */
-		    if (sum > 0) {
-			for (i = 1, s = 0; i <= state->bytes; i++) {
-			    UINT8 v = state->buffer[i] - context->previous[i];
-			    context->up[i] = v;
-			    s += (v < 128) ? v : 256 - v;
-			}
-			if (s < sum) {
-			    context->output = context->up;
-			    sum = s; /* 0 if line was duplicated */
-			}
-		    }
-
-		    /* 1. Prior */
-		    if (sum > 0) {
-			for (i = 1, s = 0; i <= bpp; i++) {
-			    UINT8 v = state->buffer[i];
-			    context->prior[i] = v;
-			    s += (v < 128) ? v : 256 - v;
-			}
-			for (; i <= state->bytes; i++) {
-			    UINT8 v = state->buffer[i] - state->buffer[i-bpp];
-			    context->prior[i] = v;
-			    s += (v < 128) ? v : 256 - v;
-			}
-			if (s < sum) {
-			    context->output = context->prior;
-			    sum = s; /* 0 if line is solid */
-			}
-		    }
-
-		    /* 3. Average (not very common in real-life images,
-		       so its only used with the optimize option) */
-		    if (context->optimize && sum > 0) {
-			for (i = 1, s = 0; i <= bpp; i++) {
-			    UINT8 v = state->buffer[i] - context->previous[i]/2;
-			    context->average[i] = v;
-			    s += (v < 128) ? v : 256 - v;
-			}
-			for (; i <= state->bytes; i++) {
-			    UINT8 v = state->buffer[i] -
-				      (state->buffer[i-bpp] + context->previous[i])/2;
-			    context->average[i] = v;
-			    s += (v < 128) ? v : 256 - v;
-			}
-			if (s < sum) {
-			    context->output = context->average;
-			    sum = s;
-			}
-		    }
-
-		    /* 4. Paeth */
-		    if (sum > 0) {
-			for (i = 1, s = 0; i <= bpp; i++) {
-			    UINT8 v = state->buffer[i] - context->previous[i];
-			    context->paeth[i] = v;
-			    s += (v < 128) ? v : 256 - v;
-			}
-			for (; i <= state->bytes; i++) {
-			    UINT8 v;
-			    int a, b, c;
-			    int pa, pb, pc;
-
-			    /* fetch pixels */
-			    a = state->buffer[i-bpp];
-			    b = context->previous[i];
-			    c = context->previous[i-bpp];
-
-			    /* distances to surrounding pixels */
-			    pa = abs(b - c);
-			    pb = abs(a - c);
-			    pc = abs(a + b - 2*c);
-
-			    /* pick predictor with the shortest distance */
-			    v = state->buffer[i] -
-				((pa <= pb && pa <= pc) ? a :
-                                 (pb <= pc) ? b : c);
-			    context->paeth[i] = v;
-			    s += (v < 128) ? v : 256 - v;
-			}
-			if (s < sum) {
-			    context->output = context->paeth;
-			    sum = s;
-			}
-		    }
-		}
-
-		/* Compress this line */
-		context->z_stream.next_in = context->output;
-		context->z_stream.avail_in = state->bytes+1;
-
-		/* err = deflate(&context->z_stream, Z_NO_FLUSH); */
-
-                /* FIXME: temporary workaround for problem with recent
-                   versions of zlib -- 990709/fl */
-
-		err = deflate(&context->z_stream, Z_SYNC_FLUSH);
-
-		if (err < 0) {
-		    /* Something went wrong inside the compression library */
-		    if (err == Z_DATA_ERROR)
-			state->errcode = IMAGING_CODEC_BROKEN;
-		    else if (err == Z_MEM_ERROR)
-			state->errcode = IMAGING_CODEC_MEMORY;
-		    else
-			state->errcode = IMAGING_CODEC_CONFIG;
-		    free(context->paeth);
-		    free(context->average);
-		    free(context->up);
-		    free(context->prior);
-		    free(context->previous);
-		    deflateEnd(&context->z_stream);
-		    return -1;
-		}
-
-		/* Swap buffer pointers */
-		ptr = state->buffer;
-		state->buffer = context->previous;
-		context->previous = ptr;
-
-	    }
-
-	    if (context->z_stream.avail_out == 0)
-		break; /* Buffer full */
-
-	case 2:
-
-	    /* End of image data; flush compressor buffers */
-
-	    while (context->z_stream.avail_out > 0) {
-
-		err = deflate(&context->z_stream, Z_FINISH);
-
-		if (err == Z_STREAM_END) {
-
-		    free(context->paeth);
-		    free(context->average);
-		    free(context->up);
-		    free(context->prior);
-		    free(context->previous);
-
-		    deflateEnd(&context->z_stream);
-
-		    state->errcode = IMAGING_CODEC_END;
-
-		    break;
-		}
-
-		if (context->z_stream.avail_out == 0)
-		    break; /* Buffer full */
-
-	    }
-
-	}
-	
-	return bytes - context->z_stream.avail_out;
-
-    }
-
-    /* Should never ever arrive here... */
-
-    state->errcode = IMAGING_CODEC_CONFIG;
-    return -1;
-}
-
-#endif
diff --git a/pythonPackages/pil/map.c b/pythonPackages/pil/map.c
deleted file mode 100644
index 19f2b8a840..0000000000
--- a/pythonPackages/pil/map.c
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: map.c 2751 2006-06-18 19:50:45Z fredrik $
- *
- * standard memory mapping interface for the Imaging library
- *
- * history:
- * 1998-03-05 fl   added Win32 read mapping
- * 1999-02-06 fl   added "I;16" support
- * 2003-04-21 fl   added PyImaging_MapBuffer primitive
- *
- * Copyright (c) 1998-2003 by Secret Labs AB.
- * Copyright (c) 2003 by Fredrik Lundh.
- *
- * See the README file for information on usage and redistribution.
- */
-
-/*
- * FIXME: should move the memory mapping primitives into libImaging!
- */
-
-#include "Python.h"
-
-#if PY_VERSION_HEX < 0x01060000
-#define PyObject_New PyObject_NEW
-#define PyObject_Del PyMem_DEL
-#endif
-
-#include "Imaging.h"
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#ifdef __GNUC__
-#undef INT32
-#undef INT64
-#undef UINT32
-#endif
-#include "windows.h"
-#endif
-
-/* -------------------------------------------------------------------- */
-/* Standard mapper */
-
-typedef struct {
-    PyObject_HEAD
-    char* base;
-    int   size;
-    int   offset;
-#ifdef WIN32
-    HANDLE hFile;
-    HANDLE hMap;
-#endif
-} ImagingMapperObject;
-
-staticforward PyTypeObject ImagingMapperType;
-
-ImagingMapperObject*
-PyImaging_MapperNew(const char* filename, int readonly)
-{
-    ImagingMapperObject *mapper;
-
-    ImagingMapperType.ob_type = &PyType_Type;
-
-    mapper = PyObject_New(ImagingMapperObject, &ImagingMapperType);
-    if (mapper == NULL)
-	return NULL;
-
-    mapper->base = NULL;
-    mapper->size = mapper->offset = 0;
-
-#ifdef WIN32
-    mapper->hFile = (HANDLE)-1;
-    mapper->hMap  = (HANDLE)-1;
-
-    /* FIXME: currently supports readonly mappings only */
-    mapper->hFile = CreateFile(
-        filename,
-        GENERIC_READ,
-        FILE_SHARE_READ,
-        NULL, OPEN_EXISTING,
-        FILE_ATTRIBUTE_NORMAL,
-        NULL);
-    if (mapper->hFile == (HANDLE)-1) {
-        PyErr_SetString(PyExc_IOError, "cannot open file");
-        PyObject_Del(mapper);
-        return NULL;
-    }
-
-    mapper->hMap = CreateFileMapping(
-        mapper->hFile, NULL,
-        PAGE_READONLY,
-        0, 0, NULL);
-    if (mapper->hMap == (HANDLE)-1) {
-	CloseHandle(mapper->hFile);
-        PyErr_SetString(PyExc_IOError, "cannot map file");
-        PyObject_Del(mapper);
-        return NULL;
-    }
-
-    mapper->base = (char*) MapViewOfFile(
-        mapper->hMap,
-        FILE_MAP_READ,
-        0, 0, 0);
-
-    mapper->size = GetFileSize(mapper->hFile, 0);
-#endif
-
-    return mapper;
-}
-
-static void
-mapping_dealloc(ImagingMapperObject* mapper)
-{
-#ifdef WIN32
-    if (mapper->base != 0)
-	UnmapViewOfFile(mapper->base);
-    if (mapper->hMap != (HANDLE)-1)
-	CloseHandle(mapper->hMap);
-    if (mapper->hFile != (HANDLE)-1)
-	CloseHandle(mapper->hFile);
-    mapper->base = 0;
-    mapper->hMap = mapper->hFile = (HANDLE)-1;
-#endif
-    PyObject_Del(mapper);
-}
-
-/* -------------------------------------------------------------------- */
-/* standard file operations */
-
-static PyObject* 
-mapping_read(ImagingMapperObject* mapper, PyObject* args)
-{
-    PyObject* buf;
-
-    int size = -1;
-    if (!PyArg_ParseTuple(args, "|i", &size))
-	return NULL;
-
-    /* check size */
-    if (size < 0 || mapper->offset + size > mapper->size)
-        size = mapper->size - mapper->offset;
-    if (size < 0)
-        size = 0;
-
-    buf = PyString_FromStringAndSize(NULL, size);
-    if (!buf)
-	return NULL;
-
-    if (size > 0) {
-        memcpy(PyString_AsString(buf), mapper->base + mapper->offset, size);
-        mapper->offset += size;
-    }
-
-    return buf;
-}
-
-static PyObject* 
-mapping_seek(ImagingMapperObject* mapper, PyObject* args)
-{
-    int offset;
-    int whence = 0;
-    if (!PyArg_ParseTuple(args, "i|i", &offset, &whence))
-	return NULL;
-
-    switch (whence) {
-        case 0: /* SEEK_SET */
-            mapper->offset = offset;
-            break;
-        case 1: /* SEEK_CUR */
-            mapper->offset += offset;
-            break;
-        case 2: /* SEEK_END */
-            mapper->offset = mapper->size + offset;
-            break;
-        default:
-            /* FIXME: raise ValueError? */
-            break;
-    }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-/* -------------------------------------------------------------------- */
-/* map entire image */
-
-extern PyObject*PyImagingNew(Imaging im);
-
-static void
-ImagingDestroyMap(Imaging im)
-{
-    return; /* nothing to do! */
-}
-
-static PyObject* 
-mapping_readimage(ImagingMapperObject* mapper, PyObject* args)
-{
-    int y, size;
-    Imaging im;
-
-    char* mode;
-    int xsize;
-    int ysize;
-    int stride;
-    int orientation;
-    if (!PyArg_ParseTuple(args, "s(ii)ii", &mode, &xsize, &ysize,
-                          &stride, &orientation))
-	return NULL;
-
-    if (stride <= 0) {
-        /* FIXME: maybe we should call ImagingNewPrologue instead */
-        if (!strcmp(mode, "L") || !strcmp(mode, "P"))
-            stride = xsize;
-        else if (!strcmp(mode, "I;16") || !strcmp(mode, "I;16B"))
-            stride = xsize * 2;
-        else
-            stride = xsize * 4;
-    }
-
-    size = ysize * stride;
-
-    if (mapper->offset + size > mapper->size) {
-        PyErr_SetString(PyExc_IOError, "image file truncated");
-        return NULL;
-    }
-
-    im = ImagingNewPrologue(mode, xsize, ysize);
-    if (!im)
-        return NULL;
-
-    /* setup file pointers */
-    if (orientation > 0)
-        for (y = 0; y < ysize; y++)
-            im->image[y] = mapper->base + mapper->offset + y * stride;
-    else
-        for (y = 0; y < ysize; y++)
-            im->image[ysize-y-1] = mapper->base + mapper->offset + y * stride;
-
-    im->destroy = ImagingDestroyMap;
-
-    if (!ImagingNewEpilogue(im))
-        return NULL;
-
-    mapper->offset += size;         
-
-    return PyImagingNew(im);
-}
-
-static struct PyMethodDef methods[] = {
-    /* standard file interface */
-    {"read", (PyCFunction)mapping_read, 1},
-    {"seek", (PyCFunction)mapping_seek, 1},
-    /* extensions */
-    {"readimage", (PyCFunction)mapping_readimage, 1},
-    {NULL, NULL} /* sentinel */
-};
-
-static PyObject*  
-mapping_getattr(ImagingMapperObject* self, char* name)
-{
-    return Py_FindMethod(methods, (PyObject*) self, name);
-}
-
-statichere PyTypeObject ImagingMapperType = {
-	PyObject_HEAD_INIT(NULL)
-	0,				/*ob_size*/
-	"ImagingMapper",		/*tp_name*/
-	sizeof(ImagingMapperObject),	/*tp_size*/
-	0,				/*tp_itemsize*/
-	/* methods */
-	(destructor)mapping_dealloc,	/*tp_dealloc*/
-	0,				/*tp_print*/
-	(getattrfunc)mapping_getattr,	/*tp_getattr*/
-	0,				/*tp_setattr*/
-	0,				/*tp_compare*/
-	0,				/*tp_repr*/
-	0,                              /*tp_hash*/
-};
-
-PyObject* 
-PyImaging_Mapper(PyObject* self, PyObject* args)
-{
-    char* filename;
-    if (!PyArg_ParseTuple(args, "s", &filename))
-	return NULL;
-
-    return (PyObject*) PyImaging_MapperNew(filename, 1);
-}
-
-/* -------------------------------------------------------------------- */
-/* Buffer mapper */
-
-typedef struct ImagingBufferInstance {
-    struct ImagingMemoryInstance im;
-    PyObject* target;
-} ImagingBufferInstance;
-
-static void
-mapping_destroy_buffer(Imaging im)
-{
-    ImagingBufferInstance* buffer = (ImagingBufferInstance*) im;
-    
-    Py_XDECREF(buffer->target);
-}
-
-PyObject* 
-PyImaging_MapBuffer(PyObject* self, PyObject* args)
-{
-    int y, size;
-    Imaging im;
-    PyBufferProcs *buffer;
-    char* ptr;
-    int bytes;
-
-    PyObject* target;
-    char* mode;
-    char* codec;
-    PyObject* bbox;
-    int offset;
-    int xsize, ysize;
-    int stride;
-    int ystep;
-
-    if (!PyArg_ParseTuple(args, "O(ii)sOi(sii)", &target, &xsize, &ysize,
-                          &codec, &bbox, &offset, &mode, &stride, &ystep))
-	return NULL;
-
-    /* check target object */
-    buffer = target->ob_type->tp_as_buffer;
-    if (!buffer || !buffer->bf_getreadbuffer || !buffer->bf_getsegcount ||
-        buffer->bf_getsegcount(target, NULL) != 1) {
-        PyErr_SetString(PyExc_TypeError, "expected string or buffer");
-        return NULL;
-    }
-
-    if (stride <= 0) {
-        if (!strcmp(mode, "L") || !strcmp(mode, "P"))
-            stride = xsize;
-        else if (!strcmp(mode, "I;16") || !strcmp(mode, "I;16B"))
-            stride = xsize * 2;
-        else
-            stride = xsize * 4;
-    }
-
-    size = ysize * stride;
-
-    /* check buffer size */
-    bytes = buffer->bf_getreadbuffer(target, 0, (void**) &ptr);
-    if (bytes < 0) {
-        PyErr_SetString(PyExc_ValueError, "buffer has negative size");
-        return NULL;
-    }
-    if (offset + size > bytes) {
-        PyErr_SetString(PyExc_ValueError, "buffer is not large enough");
-        return NULL;
-    }
-
-    im = ImagingNewPrologueSubtype(
-        mode, xsize, ysize, sizeof(ImagingBufferInstance)
-        );
-    if (!im)
-        return NULL;
-
-    /* setup file pointers */
-    if (ystep > 0)
-        for (y = 0; y < ysize; y++)
-            im->image[y] = ptr + offset + y * stride;
-    else
-        for (y = 0; y < ysize; y++)
-            im->image[ysize-y-1] = ptr + offset + y * stride;
-
-    im->destroy = mapping_destroy_buffer;
-
-    Py_INCREF(target);
-    ((ImagingBufferInstance*) im)->target = target;
-
-    if (!ImagingNewEpilogue(im))
-        return NULL;
-
-    return PyImagingNew(im);
-}
-
diff --git a/pythonPackages/pil/outline.c b/pythonPackages/pil/outline.c
deleted file mode 100644
index 351e6e586a..0000000000
--- a/pythonPackages/pil/outline.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * THIS IS WORK IN PROGRESS.
- *
- * The Python Imaging Library.
- * $Id: outline.c 2751 2006-06-18 19:50:45Z fredrik $
- *
- * "arrow" outline stuff.  the contents of this module
- * will be merged with the path module and the rest of
- * the arrow graphics  package, but not before PIL 1.1.
- * use at your own risk.
- *
- * history:
- * 99-01-10 fl  Added to PIL (experimental)
- *
- * Copyright (c) Secret Labs AB 1999.
- * Copyright (c) Fredrik Lundh 1999.
- *
- * See the README file for information on usage and redistribution.
- */
-
-#include "Python.h"
-
-#if PY_VERSION_HEX < 0x01060000
-#define PyObject_New PyObject_NEW
-#define PyObject_Del PyMem_DEL
-#endif
-
-#include "Imaging.h"
-
-
-/* -------------------------------------------------------------------- */
-/* Class								*/
-
-typedef struct {
-    PyObject_HEAD
-    ImagingOutline outline;
-} OutlineObject;
-
-staticforward PyTypeObject OutlineType;
-
-#define PyOutline_Check(op) ((op)->ob_type == &OutlineType)
-
-static OutlineObject*
-_outline_new(void)
-{
-    OutlineObject *self;
-
-    self = PyObject_New(OutlineObject, &OutlineType);
-    if (self == NULL)
-	return NULL;
-
-    self->outline = ImagingOutlineNew();
-
-    return self;
-}
-
-static void
-_outline_dealloc(OutlineObject* self)
-{
-    ImagingOutlineDelete(self->outline);
-    PyObject_Del(self);
-}
-
-ImagingOutline
-PyOutline_AsOutline(PyObject* outline)
-{
-    if (PyOutline_Check(outline))
-        return ((OutlineObject*) outline)->outline;
-
-    return NULL;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* Factories								*/
-
-PyObject*
-PyOutline_Create(PyObject* self, PyObject* args)
-{
-    if (!PyArg_ParseTuple(args, ":outline"))
-        return NULL;
-
-    return (PyObject*) _outline_new();
-}
-
-
-/* -------------------------------------------------------------------- */
-/* Methods								*/
-
-static PyObject*
-_outline_move(OutlineObject* self, PyObject* args)
-{
-    float x0, y0;
-    if (!PyArg_ParseTuple(args, "ff", &x0, &y0))
-	return NULL;
-
-    ImagingOutlineMove(self->outline, x0, y0);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-_outline_line(OutlineObject* self, PyObject* args)
-{
-    float x1, y1;
-    if (!PyArg_ParseTuple(args, "ff", &x1, &y1))
-	return NULL;
-
-    ImagingOutlineLine(self->outline, x1, y1);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-_outline_curve(OutlineObject* self, PyObject* args)
-{
-    float x1, y1, x2, y2, x3, y3;
-    if (!PyArg_ParseTuple(args, "ffffff", &x1, &y1, &x2, &y2, &x3, &y3))
-	return NULL;
-
-    ImagingOutlineCurve(self->outline, x1, y1, x2, y2, x3, y3);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-_outline_close(OutlineObject* self, PyObject* args)
-{
-    if (!PyArg_ParseTuple(args, ":close"))
-        return NULL;
-
-    ImagingOutlineClose(self->outline);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject*
-_outline_transform(OutlineObject* self, PyObject* args)
-{
-    double a[6];
-    if (!PyArg_ParseTuple(args, "(dddddd)", a+0, a+1, a+2, a+3, a+4, a+5))
-        return NULL;
-
-    ImagingOutlineTransform(self->outline, a);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static struct PyMethodDef _outline_methods[] = {
-    {"line", (PyCFunction)_outline_line, 1},
-    {"curve", (PyCFunction)_outline_curve, 1},
-    {"move", (PyCFunction)_outline_move, 1},
-    {"close", (PyCFunction)_outline_close, 1},
-    {"transform", (PyCFunction)_outline_transform, 1},
-    {NULL, NULL} /* sentinel */
-};
-
-static PyObject*  
-_outline_getattr(OutlineObject* self, char* name)
-{
-    return Py_FindMethod(_outline_methods, (PyObject*) self, name);
-}
-
-statichere PyTypeObject OutlineType = {
-	PyObject_HEAD_INIT(NULL)
-	0,				/*ob_size*/
-	"Outline",			/*tp_name*/
-	sizeof(OutlineObject),		/*tp_size*/
-	0,				/*tp_itemsize*/
-	/* methods */
-	(destructor)_outline_dealloc,	/*tp_dealloc*/
-	0,				/*tp_print*/
-	(getattrfunc)_outline_getattr,	/*tp_getattr*/
-	0				/*tp_setattr*/
-};
diff --git a/pythonPackages/pil/path.c b/pythonPackages/pil/path.c
deleted file mode 100644
index 2810988b30..0000000000
--- a/pythonPackages/pil/path.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * The Python Imaging Library.
- * $Id: path.c 2935 2006-12-03 12:20:39Z fredrik $
- *
- * 2D path utilities
- *
- * history:
- * 1996-11-04 fl   Added to PIL (incomplete)
- * 1996-11-05 fl   Added sequence semantics
- * 1997-02-28 fl   Fixed getbbox
- * 1997-06-12 fl   Added id attribute
- * 1997-06-14 fl   Added slicing and setitem
- * 1998-12-29 fl   Improved sequence handling (from Richard Jones)
- * 1999-01-10 fl   Fixed IndexError test for 1.5 (from Fred Drake)
- * 2000-10-12 fl   Added special cases for tuples and lists
- * 2002-10-27 fl   Added clipping boilerplate
- * 2004-09-19 fl   Added tolist(flat) variant
- * 2005-05-06 fl   Added buffer interface support to path constructor
- *
- * notes:
- * FIXME: fill in remaining slots in the sequence api
- *
- * Copyright (c) 1997-2005 by Secret Labs AB
- * Copyright (c) 1997-2005 by Fredrik Lundh
- *
- * See the README file for information on usage and redistribution.
- */
-
-
-#include "Python.h"
-
-#include <math.h>
-
-#if PY_VERSION_HEX < 0x01060000
-#define PyObject_New PyObject_NEW
-#define PyObject_Del PyMem_DEL
-#endif
-
-#if PY_VERSION_HEX < 0x02050000
-#define ssizeargfunc intargfunc
-#define ssizessizeargfunc intintargfunc
-#define ssizeobjargproc intobjargproc
-#define ssizessizeobjargproc intintobjargproc
-#endif
-
-/* -------------------------------------------------------------------- */
-/* Class								*/
-/* -------------------------------------------------------------------- */
-
-typedef struct {
-    PyObject_HEAD
-    int count;
-    double *xy;
-    int index; /* temporary use, e.g. in decimate */
-} PyPathObject;
-
-staticforward PyTypeObject PyPathType;
-
-static double*
-alloc_array(int count)
-{
-    double* xy;
-    if (count < 0) {
-        PyErr_NoMemory();
-        return NULL;
-    }
-    xy = malloc(2 * count * sizeof(double) + 1);
-    if (!xy)
-        PyErr_NoMemory();
-    return xy;
-}
-
-static PyPathObject*
-path_new(int count, double* xy, int duplicate)
-{
-    PyPathObject *path;
-
-    if (duplicate) {
-        /* duplicate path */
-        double* p = alloc_array(count);
-        if (!p)
-            return NULL;
-        memcpy(p, xy, count * 2 * sizeof(double));
-        xy = p;
-    }
-
-    path = PyObject_New(PyPathObject, &PyPathType);
-    if (path == NULL)
-	return NULL;
-
-    path->count = count;
-    path->xy = xy;
-
-    return path;
-}
-
-static void
-path_dealloc(PyPathObject* path)
-{
-    free(path->xy);
-    PyObject_Del(path);
-}
-
-/* -------------------------------------------------------------------- */
-/* Helpers								*/
-/* -------------------------------------------------------------------- */
-
-#define PyPath_Check(op) ((op)->ob_type == &PyPathType)
-
-int
-PyPath_Flatten(PyObject* data, double **pxy)
-{
-    int i, j, n;
-    double *xy;
-    PyBufferProcs *buffer;
-
-    if (PyPath_Check(data)) {
-	/* This was another path object. */
-	PyPathObject *path = (PyPathObject*) data;
-        xy = alloc_array(path->count);
-	if (!xy)
-	    return -1;
-	memcpy(xy, path->xy, 2 * path->count * sizeof(double));
-	*pxy = xy;
-	return path->count;
-    }
-	
-    buffer = data->ob_type->tp_as_buffer;
-    if (buffer && buffer->bf_getreadbuffer && buffer->bf_getsegcount &&
-        buffer->bf_getsegcount(data, NULL) == 1) {
-        /* Assume the buffer contains floats */
-        float* ptr;
-        int n = buffer->bf_getreadbuffer(data, 0, (void**) &ptr);
-        n /= 2 * sizeof(float);
-        xy = alloc_array(n);
-        if (!xy)
-            return -1;
-        for (i = 0; i < n+n; i++)
-            xy[i] = ptr[i];
-        *pxy = xy;
-        return n;
-    }
-
-    if (!PySequence_Check(data)) {
-	PyErr_SetString(PyExc_TypeError, "argument must be sequence");
-	return -1;
-    }
-
-    j = 0;
-    n = PyObject_Length(data);
-    /* Just in case __len__ breaks (or doesn't exist) */
-    if (PyErr_Occurred())
-        return -1;
-
-    /* Allocate for worst case */
-    xy = alloc_array(n);
-    if (!xy)
-	return -1;
-
-    /* Copy table to path array */
-    if (PyList_Check(data)) {
-        for (i = 0; i < n; i++) {
-            double x, y;
-            PyObject *op = PyList_GET_ITEM(data, i);
-            if (PyFloat_Check(op))
-		xy[j++] = PyFloat_AS_DOUBLE(op);
-            else if (PyInt_Check(op))
-		xy[j++] = (float) PyInt_AS_LONG(op);
-            else if (PyNumber_Check(op))
-                xy[j++] = PyFloat_AsDouble(op);
-            else if (PyArg_ParseTuple(op, "dd", &x, &y)) {
-                xy[j++] = x;
-                xy[j++] = y;
-            } else {
-                free(xy);
-                return -1;
-            }
-        }
-    } else if (PyTuple_Check(data)) {
-        for (i = 0; i < n; i++) {
-            double x, y;
-            PyObject *op = PyTuple_GET_ITEM(data, i);
-            if (PyFloat_Check(op))
-		xy[j++] = PyFloat_AS_DOUBLE(op);
-            else if (PyInt_Check(op))
-		xy[j++] = (float) PyInt_AS_LONG(op);
-            else if (PyNumber_Check(op))
-                xy[j++] = PyFloat_AsDouble(op);
-            else if (PyArg_ParseTuple(op, "dd", &x, &y)) {
-                xy[j++] = x;
-                xy[j++] = y;
-            } else {
-                free(xy);
-                return -1;
-            }
-        }
-    } else {
-        for (i = 0; i < n; i++) {
-            double x, y;
-            PyObject *op = PySequence_GetItem(data, i);
-            if (!op) {
-                /* treat IndexError as end of sequence */
-                if (PyErr_Occurred() &&
-                    PyErr_ExceptionMatches(PyExc_IndexError)) {
-                    PyErr_Clear();
-                    break;
-                } else {
-                    free(xy);
-                    return -1;
-                }
-            }
-            if (PyFloat_Check(op))
-		xy[j++] = PyFloat_AS_DOUBLE(op);
-            else if (PyInt_Check(op))
-		xy[j++] = (float) PyInt_AS_LONG(op);
-            else if (PyNumber_Check(op))
-                xy[j++] = PyFloat_AsDouble(op);
-            else if (PyArg_ParseTuple(op, "dd", &x, &y)) {
-                xy[j++] = x;
-                xy[j++] = y;
-            } else {
-                Py_DECREF(op);
-                free(xy);
-                return -1;
-            }
-            Py_DECREF(op);
-        }
-    }
-
-    if (j & 1) {
-	PyErr_SetString(PyExc_ValueError, "wrong number of coordinates");
-	free(xy);
-	return -1;
-    }
-
-    *pxy = xy;
-    return j/2;
-}
-
-
-/* -------------------------------------------------------------------- */
-/* Factories								*/
-/* -------------------------------------------------------------------- */
-
-PyObject*
-PyPath_Create(PyObject* self, PyObject* args)
-{
-    PyObject* data;
-    int count;
-    double *xy;
-
-    if (PyArg_ParseTuple(args, "i:Path", &count)) {
-
-        /* number of vertices */
-        xy = alloc_array(count);
-        if (!xy)
-            return NULL;
-
-    } else {
-
-        /* sequence or other path */
-        PyErr_Clear();
-        if (!PyArg_ParseTuple(args, "O", &data))
-            return NULL;
-
-        count = PyPath_Flatten(data, &xy);
-        if (count < 0)
-            return NULL;
-    }
-
-    return (PyObject*) path_new(count, xy, 0);
-}
-
-
-/* -------------------------------------------------------------------- */
-/* Methods								*/
-/* -------------------------------------------------------------------- */
-
-static PyObject*
-path_compact(PyPathObject* self, PyObject* args)
-{
-    /* Simple-minded method to shorten path.  A point is removed if
-       the city block distance to the previous point is less than the
-       given distance */
-    int i, j;
-    double *xy;
-
-    double cityblock = 2.0;
-
-    if (!PyArg_ParseTuple(args, "|d:compact", &cityblock))
-	return NULL;
-
-    xy = self->xy;
-
-    /* remove bogus vertices */
-    for (i = j = 1; i < self->count; i++) {
-	if (fabs(xy[j+j-2]-xy[i+i]) + fabs(xy[j+j-1]-xy[i+i+1]) >= cityblock) {
-	    xy[j+j] = xy[i+i];
-	    xy[j+j+1] = xy[i+i+1];
-	    j++;
-	}
-    }
-
-    i = self->count - j;
-    self->count = j;
-
-    /* shrink coordinate array */
-    self->xy = realloc(self->xy, 2 * self->count * sizeof(double));
-
-    return Py_BuildValue("i", i); /* number of removed vertices */
-}
-
-static PyObject*
-path_clip_polygon(PyPathObject* self, PyObject* args)
-{
-    /* Clip path representing a single polygon */
-    PyErr_SetString(PyExc_RuntimeError, "not yet implemented");
-    return NULL;
-}
-
-static PyObject*
-path_clip_polyline(PyPathObject* self, PyObject* args)
-{
-    /* Clip path representing a single polyline (outline) */
-    PyErr_SetString(PyExc_RuntimeError, "not yet implemented");
-    return NULL;
-}
-
-static PyObject*
-path_getbbox(PyPathObject* self, PyObject* args)
-{
-    /* Find bounding box */
-    int i;
-    double *xy;
-    double x0, y0, x1, y1;
-
-    if (!PyArg_ParseTuple(args, ":getbbox"))
-	return NULL;
-
-    xy = self->xy;
-
-    x0 = x1 = xy[0];
-    y0 = y1 = xy[1];
-
-    for (i = 1; i < self->count; i++) {
-	if (xy[i+i] < x0)
-	    x0 = xy[i+i];
-	if (xy[i+i] > x1)
-	    x1 = xy[i+i];
-	if (xy[i+i+1] < y0)
-	    y0 = xy[i+i+1];
-	if (xy[i+i+1] > y1)
-	    y1 = xy[i+i+1];
-    }
-
-    return Py_BuildValue("dddd", x0, y0, x1, y1);
-}
-
-static PyObject*
-path_getitem(PyPathObject* self, int i)
-{
-    if (i < 0 || i >= self->count) {
-	PyErr_SetString(PyExc_IndexError, "path index out of range");
-	return NULL;
-    }
-
-    return Py_BuildValue("dd", self->xy[i+i], self->xy[i+i+1]);
-}
-
-static PyObject*
-path_getslice(PyPathObject* self, int ilow, int ihigh)
-{
-    /* adjust arguments */
-    if (ilow < 0)
-        ilow = 0;
-    else if (ilow >= self->count)
-        ilow = self->count;
-    if (ihigh < 0)
-        ihigh = 0;
-    if (ihigh < ilow)
-        ihigh = ilow;
-    else if (ihigh > self->count)
-        ihigh = self->count;
-    
-    return (PyObject*) path_new(ihigh - ilow, self->xy + ilow * 2, 1);
-}
-
-static int
-path_len(PyPathObject* self)
-{
-    return self->count;
-}
-
-static PyObject*
-path_map(PyPathObject* self, PyObject* args)
-{
-    /* Map coordinate set through function */
-    int i;
-    double *xy;
-    PyObject* function;
-
-    if (!PyArg_ParseTuple(args, "O:map", &function))
-	return NULL;
-
-    xy = self->xy;
-
-    /* apply function to coordinate set */
-    for (i = 0; i < self->count; i++) {
-	double x = xy[i+i];
-	double y = xy[i+i+1];
-	PyObject* item = PyObject_CallFunction(function, "dd", x, y);
-	if (!item || !PyArg_ParseTuple(item, "dd", &x, &y)) {
-	    Py_XDECREF(item);
-	    return NULL;
-	}
-	xy[i+i] = x;
-	xy[i+i+1] = y;
-	Py_DECREF(item);
-    }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static int
-path_setitem(PyPathObject* self, int i, PyObject* op)
-{
-    double* xy;
-
-    if (i < 0 || i >= self->count) {
-        PyErr_SetString(PyExc_IndexError,
-                        "path assignment index out of range");
-        return -1;
-    }
-
-    if (op == NULL) {
-        PyErr_SetString(PyExc_TypeError,
-                        "cannot delete from path");
-        return -1;
-    }
-
-    xy = &self->xy[i+i];
-
-    if (!PyArg_ParseTuple(op, "dd", &xy[0], &xy[1]))
-        return -1;
-
-    return 0;
-}
-
-static PyObject*
-path_tolist(PyPathObject* self, PyObject* args)
-{
-    PyObject *list;
-    int i;
-
-    int flat = 0;
-    if (!PyArg_ParseTuple(args, "|i:tolist", &flat))
-	return NULL;
-
-    if (flat) {
-        list = PyList_New(self->count*2);
-        for (i = 0; i < self->count*2; i++) {
-            PyObject* item;
-            item = PyFloat_FromDouble(self->xy[i]);
-            if (!item)
-                goto error;
-            PyList_SetItem(list, i, item);
-        }
-    } else {
-        list = PyList_New(self->count);
-        for (i = 0; i < self->count; i++) {
-            PyObject* item;
-            item = Py_BuildValue("dd", self->xy[i+i], self->xy[i+i+1]);
-            if (!item)
-                goto error;
-            PyList_SetItem(list, i, item);
-        }
-    }
-
-    return list;
-
-error:
-    Py_DECREF(list);
-    return NULL;
-}
-
-static PyObject*
-path_transform(PyPathObject* self, PyObject* args)
-{
-    /* Apply affine transform to coordinate set */
-    int i;
-    double *xy;
-    double a, b, c, d, e, f;
-
-    double wrap = 0.0;
-
-    if (!PyArg_ParseTuple(args, "(dddddd)|d:transform",
-			  &a, &b, &c, &d, &e, &f,
-			  &wrap))
-	return NULL;
-
-    xy = self->xy;
-
-    /* transform the coordinate set */
-    if (b == 0.0 && d == 0.0)
-	/* scaling */
-	for (i = 0; i < self->count; i++) {
-	    xy[i+i]   = a*xy[i+i]+c;
-	    xy[i+i+1] = e*xy[i+i+1]+f;
-	}
-    else
-	/* affine transform */
-	for (i = 0; i < self->count; i++) {
-	    double x = xy[i+i];
-	    double y = xy[i+i+1];
-	    xy[i+i]   = a*x+b*y+c;
-	    xy[i+i+1] = d*x+e*y+f;
-	}
-
-    /* special treatment of geographical map data */
-    if (wrap != 0.0)
-	for (i = 0; i < self->count; i++)
-	    xy[i+i] = fmod(xy[i+i], wrap);
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static struct PyMethodDef methods[] = {
-    {"getbbox", (PyCFunction)path_getbbox, 1},
-    {"tolist", (PyCFunction)path_tolist, 1},
-    {"clip_polygon", (PyCFunction)path_clip_polygon, 1},
-    {"clip_polyline", (PyCFunction)path_clip_polyline, 1},
-    {"compact", (PyCFunction)path_compact, 1},
-    {"map", (PyCFunction)path_map, 1},
-    {"transform", (PyCFunction)path_transform, 1},
-    {NULL, NULL} /* sentinel */
-};
-
-static PyObject*  
-path_getattr(PyPathObject* self, char* name)
-{
-    PyObject* res;
-
-    res = Py_FindMethod(methods, (PyObject*) self, name);
-    if (res)
-	return res;
-
-    PyErr_Clear();
-
-    if (strcmp(name, "id") == 0)
-	return Py_BuildValue("l", (long) self->xy);
-
-    PyErr_SetString(PyExc_AttributeError, name);
-    return NULL;
-}
-
-static PySequenceMethods path_as_sequence = {
-	(inquiry)path_len, /*sq_length*/
-	(binaryfunc)0, /*sq_concat*/
-	(ssizeargfunc)0, /*sq_repeat*/
-	(ssizeargfunc)path_getitem, /*sq_item*/
-	(ssizessizeargfunc)path_getslice, /*sq_slice*/
-	(ssizeobjargproc)path_setitem, /*sq_ass_item*/
-	(ssizessizeobjargproc)0, /*sq_ass_slice*/
-};
-
-statichere PyTypeObject PyPathType = {
-	PyObject_HEAD_INIT(NULL)
-	0,				/*ob_size*/
-	"Path",				/*tp_name*/
-	sizeof(PyPathObject),		/*tp_size*/
-	0,				/*tp_itemsize*/
-	/* methods */
-	(destructor)path_dealloc,	/*tp_dealloc*/
-	0,				/*tp_print*/
-	(getattrfunc)path_getattr,	/*tp_getattr*/
-	0,				/*tp_setattr*/
-	0,				/*tp_compare*/
-	0,				/*tp_repr*/
-	0,                              /*tp_as_number */
-	&path_as_sequence,              /*tp_as_sequence */
-	0,                              /*tp_as_mapping */
-	0,                              /*tp_hash*/
-};
diff --git a/pythonPackages/pil/selftest.py b/pythonPackages/pil/selftest.py
deleted file mode 100644
index 6242ba5f27..0000000000
--- a/pythonPackages/pil/selftest.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# $Id: selftest.py 2813 2006-10-07 10:11:35Z fredrik $
-# minimal sanity check
-
-import sys
-sys.path.insert(0, ".")
-sys.path.insert(1, "PIL")
-
-import Image
-import ImageDraw
-import ImageFilter
-import ImageMath
-
-try:
-    Image.core.ping
-except ImportError, v:
-    print "***", v
-    sys.exit()
-except AttributeError:
-    pass
-
-def _info(im):
-    im.load()
-    return im.format, im.mode, im.size
-
-def testimage():
-    """
-    PIL lets you create in-memory images with various pixel types:
-
-    >>> im = Image.new("1", (128, 128)) # monochrome
-    >>> _info(im)
-    (None, '1', (128, 128))
-    >>> _info(Image.new("L", (128, 128))) # grayscale (luminance)
-    (None, 'L', (128, 128))
-    >>> _info(Image.new("P", (128, 128))) # palette
-    (None, 'P', (128, 128))
-    >>> _info(Image.new("RGB", (128, 128))) # truecolor
-    (None, 'RGB', (128, 128))
-    >>> _info(Image.new("I", (128, 128))) # 32-bit integer
-    (None, 'I', (128, 128))
-    >>> _info(Image.new("F", (128, 128))) # 32-bit floating point
-    (None, 'F', (128, 128))
-
-    Or open existing files:
-
-    >>> im = Image.open("Images/lena.gif")
-    >>> _info(im)
-    ('GIF', 'P', (128, 128))
-    >>> _info(Image.open("Images/lena.ppm"))
-    ('PPM', 'RGB', (128, 128))
-    >>> _info(Image.open("Images/lena.jpg"))
-    ('JPEG', 'RGB', (128, 128))
-
-    PIL doesn't actually load the image data until it's needed,
-    or you call the "load" method:
-
-    >>> im = Image.open("Images/lena.ppm")
-    >>> print im.im # internal image attribute
-    None
-    >>> a = im.load()
-    >>> type(im.im)
-    <type 'ImagingCore'>
-
-    You can apply many different operations on images.  Most
-    operations return a new image:
-
-    >>> im = Image.open("Images/lena.ppm")
-    >>> _info(im.convert("L"))
-    (None, 'L', (128, 128))
-    >>> _info(im.copy())
-    (None, 'RGB', (128, 128))
-    >>> _info(im.crop((32, 32, 96, 96)))
-    (None, 'RGB', (64, 64))
-    >>> _info(im.filter(ImageFilter.BLUR))
-    (None, 'RGB', (128, 128))
-    >>> im.getbands()
-    ('R', 'G', 'B')
-    >>> im.getbbox()
-    (0, 0, 128, 128)
-    >>> len(im.getdata())
-    16384
-    >>> im.getextrema()
-    ((61, 255), (26, 234), (44, 223))
-    >>> im.getpixel((0, 0))
-    (223, 162, 133)
-    >>> len(im.getprojection())
-    2
-    >>> len(im.histogram())
-    768
-    >>> _info(im.point(range(256)*3))
-    (None, 'RGB', (128, 128))
-    >>> _info(im.resize((64, 64)))
-    (None, 'RGB', (64, 64))
-    >>> _info(im.rotate(45))
-    (None, 'RGB', (128, 128))
-    >>> map(_info, im.split())
-    [(None, 'L', (128, 128)), (None, 'L', (128, 128)), (None, 'L', (128, 128))]
-    >>> len(im.convert("1").tobitmap())
-    10456
-    >>> len(im.tostring())
-    49152
-    >>> _info(im.transform((512, 512), Image.AFFINE, (1,0,0,0,1,0)))
-    (None, 'RGB', (512, 512))
-    >>> _info(im.transform((512, 512), Image.EXTENT, (32,32,96,96)))
-    (None, 'RGB', (512, 512))
-
-    The ImageDraw module lets you draw stuff in raster images:
-
-    >>> im = Image.new("L", (128, 128), 64)
-    >>> d = ImageDraw.ImageDraw(im)
-    >>> d.line((0, 0, 128, 128), fill=128)
-    >>> d.line((0, 128, 128, 0), fill=128)
-    >>> im.getextrema()
-    (64, 128)
-
-    In 1.1.4, you can specify colors in a number of ways:
-
-    >>> xy = 0, 0, 128, 128
-    >>> im = Image.new("RGB", (128, 128), 0)
-    >>> d = ImageDraw.ImageDraw(im)
-    >>> d.rectangle(xy, "#f00")
-    >>> im.getpixel((0, 0))
-    (255, 0, 0)
-    >>> d.rectangle(xy, "#ff0000")
-    >>> im.getpixel((0, 0))
-    (255, 0, 0)
-    >>> d.rectangle(xy, "rgb(255,0,0)")
-    >>> im.getpixel((0, 0))
-    (255, 0, 0)
-    >>> d.rectangle(xy, "rgb(100%,0%,0%)")
-    >>> im.getpixel((0, 0))
-    (255, 0, 0)
-    >>> d.rectangle(xy, "hsl(0, 100%, 50%)")
-    >>> im.getpixel((0, 0))
-    (255, 0, 0)
-    >>> d.rectangle(xy, "red")
-    >>> im.getpixel((0, 0))
-    (255, 0, 0)
-
-    In 1.1.6, you can use the ImageMath module to do image
-    calculations.
-
-    >>> im = ImageMath.eval("float(im + 20)", im=im.convert("L"))
-    >>> im.mode, im.size
-    ('F', (128, 128))
-
-    PIL can do many other things, but I'll leave that for another
-    day.  If you're curious, check the handbook, available from:
-
-        http://www.pythonware.com
-
-    Cheers /F
-    """
-
-if __name__ == "__main__":
-    # use doctest to make sure the test program behaves as documented!
-    import doctest, selftest
-    status = doctest.testmod(selftest)
-    if status[0]:
-        print "*** %s tests of %d failed." % status
-    else:
-        print "%s tests passed." % status[1]
diff --git a/pythonPackages/pil/setup.py b/pythonPackages/pil/setup.py
deleted file mode 100644
index aee3d2d6d3..0000000000
--- a/pythonPackages/pil/setup.py
+++ /dev/null
@@ -1,457 +0,0 @@
-#!/usr/bin/env python
-#
-# Setup script for PIL 1.1.5 and later
-# $Id: setup.py 2582 2005-11-11 21:54:00Z fredrik $
-#
-# Usage: python setup.py install
-#
-
-import glob, os, re, struct, string, sys
-
-# make it possible to run the setup script from another directory
-try:
-    os.chdir(os.path.dirname(sys.argv[0]))
-except OSError:
-    pass
-
-def libinclude(root):
-    # map root to (root/lib, root/include)
-    return os.path.join(root, "lib"), os.path.join(root, "include")
-
-# --------------------------------------------------------------------
-# Library pointers.
-#
-# Use None to look for the libraries in well-known library locations.
-# Use a string to specify a single directory, for both the library and
-# the include files.  Use a tuple to specify separate directories:
-# (libpath, includepath).  Examples:
-#
-# JPEG_ROOT = "/home/libraries/jpeg-6b"
-# TIFF_ROOT = "/opt/tiff/lib", "/opt/tiff/include"
-#
-# If you have "lib" and "include" directories under a common parent,
-# you can use the "libinclude" helper:
-#
-# TIFF_ROOT = libinclude("/opt/tiff")
-
-FREETYPE_ROOT = None
-JPEG_ROOT = None
-TIFF_ROOT = None
-ZLIB_ROOT = None
-TCL_ROOT = None
-
-# FIXME: add mechanism to explicitly *disable* the use of a library
-
-# --------------------------------------------------------------------
-# Identification
-
-NAME = "PIL"
-DESCRIPTION = "Python Imaging Library"
-AUTHOR = "Secret Labs AB (PythonWare)", "info@pythonware.com"
-HOMEPAGE = "http://www.pythonware.com/products/pil"
-
-# --------------------------------------------------------------------
-# Core library
-
-IMAGING = [
-    "decode", "encode", "map", "display", "outline", "path",
-    ]
-
-LIBIMAGING = [
-    "Access", "Antialias", "Bands", "BitDecode", "Blend", "Chops",
-    "Convert", "ConvertYCbCr", "Copy", "Crc32", "Crop", "Dib", "Draw",
-    "Effects", "EpsEncode", "File", "Fill", "Filter", "FliDecode",
-    "Geometry", "GetBBox", "GifDecode", "GifEncode", "HexDecode",
-    "Histo", "JpegDecode", "JpegEncode", "LzwDecode", "Matrix",
-    "ModeFilter", "MspDecode", "Negative", "Offset", "Pack",
-    "PackDecode", "Palette", "Paste", "Quant", "QuantHash",
-    "QuantHeap", "PcdDecode", "PcxDecode", "PcxEncode", "Point",
-    "RankFilter", "RawDecode", "RawEncode", "Storage", "SunRleDecode",
-    "TgaRleDecode", "Unpack", "UnpackYCC", "XbmDecode", "XbmEncode",
-    "ZipDecode", "ZipEncode"
-    ]
-
-# --------------------------------------------------------------------
-# Override settings
-
-try:
-    from setup_site import *
-except ImportError:
-    pass
-
-# --------------------------------------------------------------------
-
-from distutils import sysconfig
-from distutils.core import Extension, setup
-from distutils.command.build_ext import build_ext
-
-try:
-    import _tkinter
-except ImportError:
-    _tkinter = None
-
-def add_directory(path, dir, where=None):
-    if dir and os.path.isdir(dir) and dir not in path:
-        if where is None:
-            path.append(dir)
-        else:
-            path.insert(where, dir)
-
-def find_library_file(self, library):
-    return self.compiler.find_library_file(self.compiler.library_dirs, library)
-
-def find_version(filename):
-    for line in open(filename).readlines():
-        m = re.search("VERSION\s*=\s*\"([^\"]+)\"", line)
-        if m:
-            return m.group(1)
-    return None
-
-VERSION = find_version("PIL/Image.py")
-
-class pil_build_ext(build_ext):
-
-    def build_extensions(self):
-
-        global TCL_ROOT
-
-        library_dirs = []
-        include_dirs = []
-
-        add_directory(include_dirs, "libImaging")
-
-        #
-        # add platform directories
-
-        if sys.platform == "cygwin":
-            # pythonX.Y.dll.a is in the /usr/lib/pythonX.Y/config directory
-            add_directory(library_dirs, os.path.join(
-                "/usr/lib", "python%s" % sys.version[:3], "config"
-                ))
-
-        elif sys.platform == "darwin":
-            # attempt to make sure we pick freetype2 over other versions
-            add_directory(include_dirs, "/sw/include/freetype2")
-            add_directory(include_dirs, "/sw/lib/freetype2/include")
-            # fink installation directories
-            add_directory(library_dirs, "/sw/lib")
-            add_directory(include_dirs, "/sw/include")
-            # darwin ports installation directories
-            add_directory(library_dirs, "/opt/local/lib")
-            add_directory(include_dirs, "/opt/local/include")
-
-        add_directory(library_dirs, "/usr/local/lib")
-        # FIXME: check /opt/stuff directories here?
-
-        prefix = sysconfig.get_config_var("prefix")
-        if prefix:
-            add_directory(library_dirs, os.path.join(prefix, "lib"))
-            add_directory(include_dirs, os.path.join(prefix, "include"))
-
-        #
-        # locate tkinter libraries
-
-        if _tkinter:
-            TCL_VERSION = _tkinter.TCL_VERSION[:3]
-
-        if _tkinter and not TCL_ROOT:
-            # we have Tkinter but the TCL_ROOT variable was not set;
-            # try to locate appropriate Tcl/Tk libraries
-            PYVERSION = sys.version[0] + sys.version[2]
-            TCLVERSION = TCL_VERSION[0] + TCL_VERSION[2]
-            roots = [
-                # common installation directories, mostly for Windows
-                # (for Unix-style platforms, we'll check in well-known
-                # locations later)
-                os.path.join("/py" + PYVERSION, "Tcl"),
-                os.path.join("/python" + PYVERSION, "Tcl"),
-                "/Tcl", "/Tcl" + TCLVERSION, "/Tcl" + TCL_VERSION,
-                os.path.join(os.environ.get("ProgramFiles", ""), "Tcl"),
-                ]
-            for TCL_ROOT in roots:
-                TCL_ROOT = os.path.abspath(TCL_ROOT)
-                if os.path.isfile(os.path.join(TCL_ROOT, "include", "tk.h")):
-                    # FIXME: use distutils logging (?)
-                    print "--- using Tcl/Tk libraries at", TCL_ROOT
-                    print "--- using Tcl/Tk version", TCL_VERSION
-                    TCL_ROOT = libinclude(TCL_ROOT)
-                    break
-            else:
-                TCL_ROOT = None
-
-        #
-        # add configured kits
-
-        for root in [FREETYPE_ROOT, JPEG_ROOT, TCL_ROOT, TIFF_ROOT, ZLIB_ROOT]:
-            if isinstance(root, type(())):
-                lib_root, include_root = root
-            else:
-                lib_root = include_root = root
-            add_directory(library_dirs, lib_root)
-            add_directory(include_dirs, include_root)
-
-        #
-        # add standard directories
-
-        add_directory(library_dirs, "/usr/local/lib")
-        add_directory(include_dirs, "/usr/local/include")
-
-        add_directory(library_dirs, "/usr/lib")
-        add_directory(include_dirs, "/usr/include")
-
-        #
-        # insert new dirs *before* default libs, to avoid conflicts
-        # between Python PYD stub libs and real libraries
-
-        self.compiler.library_dirs = library_dirs + self.compiler.library_dirs
-        self.compiler.include_dirs = include_dirs + self.compiler.include_dirs
-
-        #
-        # look for available libraries
-
-        class feature:
-            zlib = jpeg = tiff = freetype = tcl = tk = None
-        feature = feature()
-
-        if find_library_file(self, "z"):
-            feature.zlib = "z"
-        elif sys.platform == "win32" and find_library_file(self, "zlib"):
-            feature.zlib = "zlib" # alternative name
-
-        if find_library_file(self, "jpeg"):
-            feature.jpeg = "jpeg"
-        elif sys.platform == "win32" and find_library_file(self, "libjpeg"):
-            feature.jpeg = "libjpeg" # alternative name
-
-        if find_library_file(self, "tiff"):
-            feature.tiff = "tiff"
-
-        if find_library_file(self, "freetype"):
-            # look for freetype2 include files
-            freetype_version = 0
-            for dir in self.compiler.include_dirs:
-                if os.path.isfile(os.path.join(dir, "ft2build.h")):
-                    freetype_version = 21
-                    dir = os.path.join(dir, "freetype2")
-                    break
-                dir = os.path.join(dir, "freetype2")
-                if os.path.isfile(os.path.join(dir, "ft2build.h")):
-                    freetype_version = 21
-                    break
-                if os.path.isdir(os.path.join(dir, "freetype")):
-                    freetype_version = 20
-                    break
-            if freetype_version:
-                feature.freetype = "freetype"
-                feature.freetype_version = freetype_version
-                if dir:
-                    add_directory(self.compiler.include_dirs, dir, 0)
-
-        if _tkinter:
-            # the library names may vary somewhat (e.g. tcl84 or tcl8.4)
-            version = TCL_VERSION[0] + TCL_VERSION[2]
-            if find_library_file(self, "tcl" + version):
-                feature.tcl = "tcl" + version
-            elif find_library_file(self, "tcl" + TCL_VERSION):
-                feature.tcl = "tcl" + TCL_VERSION
-            if find_library_file(self, "tk" + version):
-                feature.tk = "tk" + version
-            elif find_library_file(self, "tk" + TCL_VERSION):
-                feature.tk = "tk" + TCL_VERSION
-
-        #
-        # core library
-
-        files = ["_imaging.c"]
-        for file in IMAGING:
-            files.append(file + ".c")
-        for file in LIBIMAGING:
-            files.append(os.path.join("libImaging", file + ".c"))
-
-        libs = []
-        defs = []
-        if feature.jpeg:
-            libs.append(feature.jpeg)
-            defs.append(("HAVE_LIBJPEG", None))
-        if feature.zlib:
-            libs.append(feature.zlib)
-            defs.append(("HAVE_LIBZ", None))
-        if sys.platform == "win32":
-            libs.extend(["kernel32", "user32", "gdi32"])
-        if struct.unpack("h", "\0\1")[0] == 1:
-            defs.append(("WORDS_BIGENDIAN", None))
-
-        exts = [(Extension(
-            "_imaging", files, libraries=libs, define_macros=defs
-            ))]
-
-        #
-        # additional libraries
-
-        if feature.freetype:
-            defs = []
-            if feature.freetype_version == 20:
-                defs.append(("USE_FREETYPE_2_0", None))
-            exts.append(Extension(
-                "_imagingft", ["_imagingft.c"], libraries=["freetype"],
-                define_macros=defs
-                ))
-
-        if os.path.isfile("_imagingtiff.c") and feature.tiff:
-            exts.append(Extension(
-                "_imagingtiff", ["_imagingtiff.c"], libraries=["tiff"]
-                ))
-
-        if sys.platform == "darwin":
-            # locate Tcl/Tk frameworks
-            frameworks = []
-            framework_roots = [
-                "/Library/Frameworks",
-                "/System/Library/Frameworks"
-                ]
-            for root in framework_roots:
-                if (os.path.exists(os.path.join(root, "Tcl.framework")) and
-                    os.path.exists(os.path.join(root, "Tk.framework"))):
-                    print "--- using frameworks at", root
-                    frameworks = ["-framework", "Tcl", "-framework", "Tk"]
-                    dir = os.path.join(root, "Tcl.framework", "Headers")
-                    add_directory(self.compiler.include_dirs, dir, 0)
-                    dir = os.path.join(root, "Tk.framework", "Headers")
-                    add_directory(self.compiler.include_dirs, dir, 1)
-                    break
-            if frameworks:
-                exts.append(Extension(
-                    "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-                    extra_compile_args=frameworks, extra_link_args=frameworks
-                    ))
-                feature.tcl = feature.tk = 1 # mark as present
-        elif feature.tcl and feature.tk:
-            exts.append(Extension(
-                "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
-                libraries=[feature.tcl, feature.tk]
-                ))
-
-        if os.path.isfile("_imagingmath.c"):
-            exts.append(Extension("_imagingmath", ["_imagingmath.c"]))
-
-        self.extensions[:] = exts
-
-        build_ext.build_extensions(self)
-
-        #
-        # sanity and security checks
-
-        unsafe_zlib = None
-
-        if feature.zlib:
-            unsafe_zlib = self.check_zlib_version(self.compiler.include_dirs)
-
-        self.summary_report(feature, unsafe_zlib)
-
-    def summary_report(self, feature, unsafe_zlib):
-
-        print "-" * 68
-        print "PIL", VERSION, "BUILD SUMMARY"
-        print "-" * 68
-        print "version      ", VERSION
-        v = string.split(sys.version, "[")
-        print "platform     ", sys.platform, string.strip(v[0])
-        for v in v[1:]:
-            print "             ", string.strip("[" + v)
-        print "-" * 68
-
-        options = [
-            (feature.tcl and feature.tk, "TKINTER"),
-            (feature.jpeg, "JPEG"),
-            (feature.zlib, "ZLIB (PNG/ZIP)"),
-            # (feature.tiff, "experimental TIFF G3/G4 read"),
-            (feature.freetype, "FREETYPE2"),
-            ]
-
-        all = 1
-        for option in options:
-            if option[0]:
-                print "---", option[1], "support ok"
-            else:
-                print "***", option[1], "support not available",
-                if option[1] == "TKINTER" and _tkinter:
-                    version = _tkinter.TCL_VERSION
-                    print "(Tcl/Tk %s libraries needed)" % version,
-                print
-                all = 0
-
-        if feature.zlib and unsafe_zlib:
-            print
-            print "*** Warning: zlib", unsafe_zlib,
-            print "may contain a security vulnerability."
-            print "*** Consider upgrading to zlib 1.2.3 or newer."
-            print "*** See: http://www.kb.cert.org/vuls/id/238678"
-            print "         http://www.kb.cert.org/vuls/id/680620"
-            print "         http://www.gzip.org/zlib/advisory-2002-03-11.txt"
-            print
-
-        print "-" * 68
-
-        if not all:
-            print "To add a missing option, make sure you have the required"
-            print "library, and set the corresponding ROOT variable in the"
-            print "setup.py script."
-            print
-
-        print "To check the build, run the selftest.py script."
-
-    def check_zlib_version(self, include_dirs):
-        # look for unsafe versions of zlib
-        for dir in include_dirs:
-            zlibfile = os.path.join(dir, "zlib.h")
-            if os.path.isfile(zlibfile):
-                break
-        else:
-            return
-        for line in open(zlibfile).readlines():
-            m = re.match('#define\s+ZLIB_VERSION\s+"([^"]*)"', line)
-            if not m:
-                continue
-            if m.group(1) < "1.2.3":
-                return m.group(1)
-
-#
-# build!
-
-if __name__ == "__main__":
-
-    try:
-        # add necessary to distutils (for backwards compatibility)
-        from distutils.dist import DistributionMetadata
-        DistributionMetadata.classifiers = None
-        DistributionMetadata.download_url = None
-        DistributionMetadata.platforms = None
-    except:
-        pass
-
-    setup(
-        author=AUTHOR[0], author_email=AUTHOR[1],
-        classifiers=[
-            "Development Status :: 6 - Mature",
-            "Topic :: Multimedia :: Graphics",
-            "Topic :: Multimedia :: Graphics :: Capture :: Digital Camera",
-            "Topic :: Multimedia :: Graphics :: Capture :: Scanners",
-            "Topic :: Multimedia :: Graphics :: Capture :: Screen Capture",
-            "Topic :: Multimedia :: Graphics :: Graphics Conversion",
-            "Topic :: Multimedia :: Graphics :: Viewers",
-            ],
-        cmdclass = {"build_ext": pil_build_ext},
-        description=DESCRIPTION,
-        download_url="http://effbot.org/zone/pil-changes-116.htm",
-        ext_modules = [Extension("_imaging", ["_imaging.c"])], # dummy
-        extra_path = "PIL",
-        license="Python (MIT style)",
-        long_description=DESCRIPTION,
-        name=NAME,
-        package_dir={"": "PIL"},
-        packages=[""],
-        platforms="Python 1.5.2 and later.",
-        scripts = glob.glob("Scripts/pil*.py"),
-        url=HOMEPAGE,
-        version=VERSION,
-        )
diff --git a/pythonPackages/pycairo/pycairo-1.2.2.tar.gz b/pythonPackages/pycairo/pycairo-1.2.2.tar.gz
deleted file mode 100644
index 460363c0de..0000000000
Binary files a/pythonPackages/pycairo/pycairo-1.2.2.tar.gz and /dev/null differ
diff --git a/pythonPackages/pygtk/pygtk-2.8.6.tar.gz b/pythonPackages/pygtk/pygtk-2.8.6.tar.gz
deleted file mode 100644
index 6f23f98229..0000000000
Binary files a/pythonPackages/pygtk/pygtk-2.8.6.tar.gz and /dev/null differ
diff --git a/pythonPackages/ufpy/test/dafTests/__init__.py b/pythonPackages/ufpy/test/dafTests/__init__.py
new file mode 100644
index 0000000000..dadaddac05
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/__init__.py
@@ -0,0 +1,36 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+
+#
+# __init__.py for ufpy.test.dafTests package
+# 
+# 
+#     SOFTWARE HISTORY
+# 
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    02/09/16        4795          mapeters       Initial creation.
+# 
+# 
+#
+
+__all__ = [
+           ]
diff --git a/pythonPackages/ufpy/test/dafTests/baseBufrMosTestCase.py b/pythonPackages/ufpy/test/dafTests/baseBufrMosTestCase.py
new file mode 100644
index 0000000000..cfad9a0e11
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/baseBufrMosTestCase.py
@@ -0,0 +1,51 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+
+class BufrMosTestCase(baseDafTestCase.DafTestCase):
+    """
+    Base class for testing that bufrmos data can be retrieved through the DAF.
+    """
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames("KOMA")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames("KOMA")
+        req.setParameters("temperature", "dewpoint")
+
+        self.runGeometryDataTest(req)
diff --git a/pythonPackages/ufpy/test/dafTests/baseDafTestCase.py b/pythonPackages/ufpy/test/dafTests/baseDafTestCase.py
new file mode 100644
index 0000000000..7446436cc0
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/baseDafTestCase.py
@@ -0,0 +1,174 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import unittest
+
+#
+# Base TestCase for DAF tests. Note that this class doesn't provide any test
+# methods that are automatically called when running this TestCase (methods
+# named test*()). Instead, it provides default implementations of various tests
+# that subclasses must explicity choose to call from their test*() methods.
+#
+# The tests primarily check that no unexpected exceptions are thrown when
+# retrieving data for DAF requests, instead of explicity asserting against
+# expected outcomes.
+#    
+#     SOFTWARE HISTORY
+#    
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    01/19/16        4795          mapeters       Initial Creation.
+#    
+# 
+#
+
+class DafTestCase(unittest.TestCase):
+
+    sampleDataLimit = 5
+    """
+    Maximum number of levels, locations, times, and geometry/grid data to
+    display
+    """
+
+    numTimesToLimit = 3
+    """
+    When limiting geometry/grid data requests with times, only retrieve data
+    for this many times
+    """
+
+    def runParametersTest(self, req):
+        print("Testing getAvailableParameters()")
+
+        params = DAL.getAvailableParameters(req)
+        self.assertIsNotNone(params)
+        print(params)
+
+        print("getAvailableParameters() complete\n")
+
+    def runIdentifiersTest(self, datatype):
+        print("Testing get*Identifiers()")
+
+        required = DAL.getRequiredIdentifiers(datatype)
+        self.assertIsNotNone(required)
+        print("Required identifiers:", required)
+
+        optional = DAL.getOptionalIdentifiers(datatype)
+        self.assertIsNotNone(optional)
+        print("Optional identifiers:", optional)
+
+        print("get*Identifiers() complete\n")
+
+    def runLevelsTest(self, req):
+        print("Testing getAvailableLevels()")
+
+        levels = DAL.getAvailableLevels(req)
+        self.assertIsNotNone(levels)
+        print("Number of levels: " + str(len(levels)))
+        strLevels = map(str, levels[:self.sampleDataLimit])
+        print("Sample levels:\n" + str(strLevels))
+
+        print("getAvailableLevels() complete\n")
+
+    def runLocationsTest(self, req):
+        print("Testing getAvailableLocationNames()")
+
+        locs = DAL.getAvailableLocationNames(req)
+        self.assertIsNotNone(locs)
+        print("Number of location names: " + str(len(locs)))
+        print("Sample location names:\n" + str(locs[:self.sampleDataLimit]))
+
+        print("getAvailableLocationNames() complete\n")
+
+    def runTimesTest(self, req):
+        print("Testing getAvailableTimes()")
+
+        times = DAL.getAvailableTimes(req)
+        self.assertIsNotNone(times)
+        print("Number of times: " + str(len(times)))
+        strTimes = map(str, times[:self.sampleDataLimit])
+        print("Sample times:\n" + str(strTimes))
+
+        print("getAvailableTimes() complete\n")
+
+    def runGeometryDataTest(self, req, limitTimes=False):
+        """
+        Test that we are able to successfully retrieve geometry data for the given
+        request.
+
+        Args:
+            limitTimes: whether or not to limit the request to the most recent times
+        """
+        print("Testing getGeometryData()")
+
+        times = []
+        if limitTimes:
+            times = DAL.getAvailableTimes(req)
+
+        geomData = DAL.getGeometryData(req, times[:self.numTimesToLimit])
+        self.assertIsNotNone(geomData)
+        print("Number of geometry records: " + str(len(geomData)))
+        print("Sample geometry data:")
+        for record in geomData[:self.sampleDataLimit]:
+            print("geometry=" + str(record.getGeometry()), end="")
+            for p in req.getParameters():
+                print(" " + p + "=" + record.getString(p), end="")
+            print()
+
+        print("getGeometryData() complete\n")
+
+    def runGridDataTest(self, req, limitTimes=False, testSameShape=True):
+        """
+        Test that we are able to successfully retrieve grid data for the given 
+        request. 
+        
+        Args:
+            limitTimes: whether or not to limit the request to the most recent times
+            testSameShape: whether or not to verify that all the retrieved data have
+                            the same shape (most data don't change shape)
+        """
+        print("Testing getGridData()")
+
+        times = []
+        if limitTimes:
+            times = DAL.getAvailableTimes(req)
+
+        gridData = DAL.getGridData(req, times[:self.numTimesToLimit])
+        self.assertIsNotNone(gridData)
+        print("Number of grid records: " + str(len(gridData)))
+        if len(gridData) > 0:
+            print("Sample grid data shape:\n" + str(gridData[0].getRawData().shape) + "\n")
+            print("Sample grid data:\n" + str(gridData[0].getRawData()) + "\n")
+            print("Sample lat-lon data:\n" + str(gridData[0].getLatLonCoords()) + "\n")
+
+            if testSameShape:
+                allGridsPopulated = True
+                correctGridShape = gridData[0].getLatLonCoords()[0].shape
+                for record in gridData:
+                    if record.getRawData() is None or record.getRawData().shape != correctGridShape:
+                        allGridsPopulated = False
+                        break
+
+                print("All grid data records have correct grid data: " + str(allGridsPopulated))
+                self.assertTrue(allGridsPopulated)
+
+        print("getGridData() complete\n")
diff --git a/pythonPackages/ufpy/test/dafTests/dafTestsArgsUtil.py b/pythonPackages/ufpy/test/dafTests/dafTestsArgsUtil.py
new file mode 100644
index 0000000000..62e9904c88
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/dafTestsArgsUtil.py
@@ -0,0 +1,66 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import argparse
+import os
+import sys
+
+#
+# Utility methods to be used by DAF tests for parsing arguments.
+#    
+#     SOFTWARE HISTORY
+#    
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    02/05/16        4795          mapeters       Initial Creation.
+#    
+# 
+#
+
+def getParser():
+    """
+    Return an ArgumentParser for parsing the standard arguments: the host to run
+    tests against and whether to display the data retrieved in the tests.
+    """
+    parser = argparse.ArgumentParser(conflict_handler="resolve")
+    parser.add_argument("-h", action="store", dest="host", default="localhost",
+                         help="EDEX server hostname",
+                         metavar="hostname")
+    parser.add_argument("-v", action="store_true", dest="verbose", default=False,
+                         help="Display data output")
+    return parser 
+
+def handleArgs(args):
+    """
+    Handle the arguments specified in getParser().
+    """
+    DAL.changeEDEXHost(args.host)
+    # Suppress stdout unless user-requested
+    if not args.verbose:
+        sys.stdout = open(os.devnull, "w")
+
+def parseAndHandleArgs():
+    """
+    Parses and handles the arguments specified in getParser(). Use this
+    method to handle arguments when no additional arguments need to be added.
+    """
+    handleArgs(getParser().parse_args())
diff --git a/pythonPackages/ufpy/test/dafTests/runDafTests.py b/pythonPackages/ufpy/test/dafTests/runDafTests.py
new file mode 100644
index 0000000000..b2e57db5dd
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/runDafTests.py
@@ -0,0 +1,45 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+import dafTestsArgsUtil
+import os
+import sys
+import unittest
+
+#
+# Framework for auto-detecting and running all DAF unit tests (test*.py) in 
+# the same directory as this file.
+#    
+#     SOFTWARE HISTORY
+#    
+#    Date            Ticket#       Engineer       Description
+#    ------------    ----------    -----------    --------------------------
+#    01/19/16        4795          mapeters       Initial Creation.
+#    
+# 
+#
+
+def load_tests(loader, tests, pattern):
+    testDir = os.path.dirname(os.path.realpath(__file__))
+    return loader.discover(start_dir=testDir)
+
+if __name__ == "__main__":
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testAcars.py b/pythonPackages/ufpy/test/dafTests/testAcars.py
new file mode 100644
index 0000000000..879a283a4d
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testAcars.py
@@ -0,0 +1,71 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class AcarsTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that acars data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "acars"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING ACARS TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setParameters("flightLevel", "tailNumber")
+
+        # Limit the times in the geometry data test to limit the amount of data
+        # returned.
+        self.runGeometryDataTest(req, limitTimes=True)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("ACARS TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testAirep.py b/pythonPackages/ufpy/test/dafTests/testAirep.py
new file mode 100644
index 0000000000..503ddb5317
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testAirep.py
@@ -0,0 +1,69 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class AirepTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that airep data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "airep"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING AIREP TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setParameters("flightLevel", "reportType")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("AIREP TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testBinLightning.py b/pythonPackages/ufpy/test/dafTests/testBinLightning.py
new file mode 100644
index 0000000000..acec3d8f3e
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testBinLightning.py
@@ -0,0 +1,79 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class BinLightningTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that binlightning data can be retrieved through the DAF, simply
+    ensuring that no unexpected exceptions are thrown while retrieving it and
+    that the returned data is not None.
+    """
+
+    datatype = "binlightning"
+
+    params = "intensity"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING BINLIGHTNING TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req) 
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("source", "NLDN")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("source", "NLDN")
+        req.setParameters(*self.params.split(','))
+
+        # Limit the times in the geometry data test to limit the amount of data
+        # returned.
+        self.runGeometryDataTest(req, limitTimes=True)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("BINLIGHTNING TESTS COMPLETE\n\n\n")
+
+def getArgs():
+    parser = dafTestsArgsUtil.getParser()
+    parser.add_argument("-p", action="store", dest="params", default=BinLightningTestCase.params,
+                         help="Lightning parameters comma separated",
+                         metavar="parameters")
+    return parser.parse_args()
+
+if __name__ == '__main__':
+    args = getArgs()
+    dafTestsArgsUtil.handleArgs(args)
+    BinLightningTestCase.params = args.params
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testBufrMosAvn.py b/pythonPackages/ufpy/test/dafTests/testBufrMosAvn.py
new file mode 100644
index 0000000000..79d7e606a7
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testBufrMosAvn.py
@@ -0,0 +1,49 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+
+import baseBufrMosTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class BufrMosAvnTestCase(baseBufrMosTestCase.BufrMosTestCase):
+    """
+    Tests that bufrmosAVN data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "bufrmosAVN"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING BUFRMOSAVN TESTS\n\n")
+
+    # All tests inherited from superclass
+    
+    @classmethod
+    def tearDownClass(cls):
+        print("BUFRMOSAVN TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testBufrMosEta.py b/pythonPackages/ufpy/test/dafTests/testBufrMosEta.py
new file mode 100644
index 0000000000..ce2e59977b
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testBufrMosEta.py
@@ -0,0 +1,49 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+
+import baseBufrMosTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class BufrMosEtaTestCase(baseBufrMosTestCase.BufrMosTestCase):
+    """
+    Tests that bufrmosETA data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "bufrmosETA"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING BUFRMOSETA TESTS\n\n")
+
+    # All tests inherited from superclass
+    
+    @classmethod
+    def tearDownClass(cls):
+        print("BUFRMOSETA TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testBufrMosGfs.py b/pythonPackages/ufpy/test/dafTests/testBufrMosGfs.py
new file mode 100644
index 0000000000..769b4c081b
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testBufrMosGfs.py
@@ -0,0 +1,49 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+
+import baseBufrMosTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class BufrMosGfsTestCase(baseBufrMosTestCase.BufrMosTestCase):
+    """
+    Tests that bufrmosGFS data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "bufrmosGFS"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING BUFRMOSGFS TESTS\n\n")
+
+    # All tests inherited from superclass
+    
+    @classmethod
+    def tearDownClass(cls):
+        print("BUFRMOSGFS TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testBufrMosHpc.py b/pythonPackages/ufpy/test/dafTests/testBufrMosHpc.py
new file mode 100644
index 0000000000..83d7403afe
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testBufrMosHpc.py
@@ -0,0 +1,57 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseBufrMosTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class BufrMosHpcTestCase(baseBufrMosTestCase.BufrMosTestCase):
+    """
+    Tests that bufrmosHPC data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "bufrmosHPC"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING BUFRMOSHPC TESTS\n\n")
+    
+    # Most tests inherited from superclass
+    
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames("KOMA")
+        req.setParameters("forecastHr", "maxTemp24Hour")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("BUFRMOSHPC TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testBufrMosLamp.py b/pythonPackages/ufpy/test/dafTests/testBufrMosLamp.py
new file mode 100644
index 0000000000..44df795341
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testBufrMosLamp.py
@@ -0,0 +1,49 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+
+import baseBufrMosTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class BufrMosLampTestCase(baseBufrMosTestCase.BufrMosTestCase):
+    """
+    Tests that bufrmosLAMP data can be retrieved through the DAF, simply
+    ensuring that no unexpected exceptions are thrown while retrieving it and
+    that the returned data is not None.
+    """
+
+    datatype = "bufrmosLAMP"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING BUFRMOSLAMP TESTS\n\n")
+
+    # All tests inherited from superclass
+    
+    @classmethod
+    def tearDownClass(cls):
+        print("BUFRMOSLAMP TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testBufrMosMrf.py b/pythonPackages/ufpy/test/dafTests/testBufrMosMrf.py
new file mode 100644
index 0000000000..ff39ea25a1
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testBufrMosMrf.py
@@ -0,0 +1,57 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseBufrMosTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class BufrMosMrfTestCase(baseBufrMosTestCase.BufrMosTestCase):
+    """
+    Tests that bufrmosMRF data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "bufrmosMRF"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING BUFRMOSMRF TESTS\n\n")
+
+    # Most tests inherited from superclass
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames("KOMA")
+        req.setParameters("forecastHr", "maxTempDay")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("BUFRMOSMRF TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testBufrUa.py b/pythonPackages/ufpy/test/dafTests/testBufrUa.py
new file mode 100644
index 0000000000..b184fc3c42
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testBufrUa.py
@@ -0,0 +1,106 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class BufrUaTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that bufrua data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "bufrua"
+
+    location = "72558"
+    """
+    stationid corresponding to KOAX
+    """
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING BUFRUA TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("reportType", "2020")
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames(self.location)
+        req.addIdentifier("reportType", "2020")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames(self.location)
+        req.addIdentifier("reportType", "2020")
+        req.setParameters("sfcPressure", "staName", "rptType", "tdMan")
+
+        print("Testing getGeometryData()")
+
+        geomData = DAL.getGeometryData(req)
+        self.assertIsNotNone(geomData)
+        print("Number of geometry records: " + str(len(geomData)))
+        print("Sample geometry data:")
+        for record in geomData[:self.sampleDataLimit]:
+            print("level=", record.getLevel(), end="")
+            # One dimensional parameters are reported on the 0.0UNKNOWN level.
+            # 2D parameters are reported on MB levels from pressure.
+            if record.getLevel() == "0.0UNKNOWN":
+                print(" sfcPressure=" + record.getString("sfcPressure") + record.getUnit("sfcPressure"), end="")
+                print(" staName=" + record.getString("staName"), end="")
+                print(" rptType=" + record.getString("rptType") + record.getUnit("rptType"), end="")
+            else:
+                print(" tdMan=" + str(record.getNumber("tdMan")) + record.getUnit("tdMan"), end="")
+            print(" geometry=", record.getGeometry())
+
+        print("getGeometryData() complete\n\n")
+
+    @classmethod
+    def tearDownClass(cls):
+        print("BUFRUA TESTS COMPLETE\n\n\n")
+
+def getArgs():
+    parser = dafTestsArgsUtil.getParser()
+    parser.add_argument("-l", action="store", dest="loc", default=BufrUaTestCase.location,
+                        help="bufrua location id",
+                        metavar="location")
+    return parser.parse_args()
+
+if __name__ == '__main__':
+    args = getArgs()
+    dafTestsArgsUtil.handleArgs(args)
+    BufrUaTestCase.location = args.loc
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testClimate.py b/pythonPackages/ufpy/test/dafTests/testClimate.py
new file mode 100644
index 0000000000..c67fe60eca
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testClimate.py
@@ -0,0 +1,77 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class ClimateTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that climate data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "climate"
+
+    table = "public.cli_asos_monthly"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING CLIMATE TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", self.table)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", self.table)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", self.table)
+        req.setParameters("maxtemp_mon", "min_sea_press")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", self.table)
+        req.setLocationNames("KFNB")
+        req.setParameters("maxtemp_mon", "min_sea_press")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("CLIMATE TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testCommonObsSpatial.py b/pythonPackages/ufpy/test/dafTests/testCommonObsSpatial.py
new file mode 100644
index 0000000000..0808a1ee0a
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testCommonObsSpatial.py
@@ -0,0 +1,98 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from shapely.geometry import box
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class CommonObsSpatialTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that common_obs_spatial data can be retrieved through the DAF, simply
+    ensuring that no unexpected exceptions are thrown while retrieving it and
+    that the returned data is not None.
+    """
+
+    datatype = "common_obs_spatial"
+
+    bbox = ["-96", "41", "-97", "42"]
+    """
+    Default request area (box around KOAX)
+    """
+
+    envelope = None
+
+    @classmethod
+    def getReqEnvelope(cls):
+        if not cls.envelope:
+            x1, y1, x2, y2 = map(float, cls.bbox)
+            minX = min(x1, x2)
+            maxX = max(x1, x2)
+            minY = min(y1, y2)
+            maxY = max(y1, y2)
+            cls.envelope = box(minX, minY, maxX, maxY)
+        return cls.envelope
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING COMMON_OBS_SPATIAL TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("country", ["US", "CN"])
+
+        self.runLocationsTest(req)
+
+    def testIdentifiers(self):
+        self.runIdentifiersTest(self.datatype)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setEnvelope(self.getReqEnvelope())
+        req.setParameters("name", "stationid")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("COMMON_OBS_SPATIAL TESTS COMPLETE\n\n\n")
+
+def getArgs(): 
+    parser = dafTestsArgsUtil.getParser()
+    parser.add_argument("-p", action="store", dest="bbox", nargs=4, default=CommonObsSpatialTestCase.bbox,
+                        help="Request area",
+                        metavar="point")
+    return parser.parse_args()
+
+if __name__ == '__main__':
+    args = getArgs()
+    dafTestsArgsUtil.handleArgs(args)
+    CommonObsSpatialTestCase.bbox = args.bbox
+    unittest.main(argv=sys.argv[:1])
+
diff --git a/pythonPackages/ufpy/test/dafTests/testFfmp.py b/pythonPackages/ufpy/test/dafTests/testFfmp.py
new file mode 100644
index 0000000000..c9f21c4529
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testFfmp.py
@@ -0,0 +1,79 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class FfmpTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that ffmp data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "ffmp"
+
+    @staticmethod
+    def addIdentifiers(req):
+        req.addIdentifier("wfo", "OAX")
+        req.addIdentifier("siteKey", "hpe")
+        req.addIdentifier("dataKey", "hpe")
+        req.addIdentifier("huc", "ALL")
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING FFMP TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        self.addIdentifiers(req)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        self.addIdentifiers(req)
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        self.addIdentifiers(req)
+        req.setParameters("DHR")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("FFMP TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testGfe.py b/pythonPackages/ufpy/test/dafTests/testGfe.py
new file mode 100644
index 0000000000..7254d36874
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testGfe.py
@@ -0,0 +1,75 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class GfeTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that gfe data can be retrieved through the DAF, primarily ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None. The only data validation that is performed is to
+    check that all retrieved grid data have the same shape.
+    """
+
+    datatype = "gfe"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING GFE TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("modelName", "Fcst")
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("modelName", "Fcst")
+        req.addIdentifier("siteId", "OAX")
+
+        self.runTimesTest(req) 
+
+    def testGridData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("modelName", "Fcst")
+        req.addIdentifier("siteId", "OAX")
+        req.setParameters("T")
+
+        self.runGridDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("GFE TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testGrid.py b/pythonPackages/ufpy/test/dafTests/testGrid.py
new file mode 100644
index 0000000000..3466e99220
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testGrid.py
@@ -0,0 +1,93 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class GridTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that grid data can be retrieved through the DAF, primarily ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None. The only data validation that is performed is to
+    check that all retrieved grid data have the same shape.
+    """
+
+    datatype = "grid"
+
+    model = "GFS160"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING GRID TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("info.datasetId", self.model)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("info.datasetId", self.model)
+
+        self.runLocationsTest(req)
+
+    def testLevels(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("info.datasetId", self.model)
+
+        self.runLevelsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("info.datasetId", self.model)
+        req.setLevels("2FHAG")
+
+        self.runTimesTest(req)
+
+    def testGridData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("info.datasetId", self.model)
+        req.setLevels("2FHAG")
+        req.setParameters("T")
+
+        self.runGridDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("GRID TESTS COMPLETE\n\n\n")
+
+def getArgs():
+    parser = dafTestsArgsUtil.getParser()
+    parser.add_argument("-m", action="store", dest="model", default=GridTestCase.model,
+                        help="model to retrieve data for",
+                        metavar="modelName")
+    return parser.parse_args()
+
+if __name__ == '__main__':
+    args = getArgs()
+    dafTestsArgsUtil.handleArgs(args)
+    GridTestCase.model = args.model
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testHydro.py b/pythonPackages/ufpy/test/dafTests/testHydro.py
new file mode 100644
index 0000000000..7c91315413
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testHydro.py
@@ -0,0 +1,78 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class HydroTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that hydro data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "hydro"
+
+    table = "public.height"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING HYDRO TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", self.table)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", self.table)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", self.table)
+        req.setParameters("lid", "quality_code")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", self.table)
+        req.setParameters("lid", "quality_code")
+
+        # Limit the times in the geometry data test to limit the amount of data
+        # returned.
+        self.runGeometryDataTest(req, limitTimes=True)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("HYDRO TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testLdadMesonet.py b/pythonPackages/ufpy/test/dafTests/testLdadMesonet.py
new file mode 100644
index 0000000000..ffce2f43fd
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testLdadMesonet.py
@@ -0,0 +1,85 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from shapely.geometry import Polygon
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class LdadMesonetTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that ldadmesonet data can be retrieved through the DAF, simply
+    ensuring that no unexpected exceptions are thrown while retrieving it and
+    that the returned data is not None.
+    """
+
+    datatype = "ldadmesonet"
+
+    envelope = None
+
+    @classmethod
+    def getReqEnvelope(cls):
+        # Restrict the output to only records with latitude and 
+        # longitude between -30 and 30.
+        if not cls.envelope:
+            vertices = [ (-30, -30), (-30, 30), (30, 30), (30, -30) ]
+            polygon = Polygon(vertices)
+            cls.envelope = polygon.envelope
+        return cls.envelope
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING LDADMESONET TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setEnvelope(self.getReqEnvelope())
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setEnvelope(self.getReqEnvelope())
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setParameters("highLevelCloud", "pressure")
+        req.setEnvelope(self.getReqEnvelope())
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("LDADMESONET TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testMaps.py b/pythonPackages/ufpy/test/dafTests/testMaps.py
new file mode 100644
index 0000000000..eb0201834f
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testMaps.py
@@ -0,0 +1,86 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class MapsTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that maps data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "maps"
+
+    site = "OAX"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING MAPS TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", "mapdata.county")
+        req.addIdentifier("geomField", "the_geom")
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", "mapdata.county")
+        req.addIdentifier("geomField", "the_geom")
+        req.addIdentifier("locationField", "cwa")
+
+        self.runLocationsTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("table", "mapdata.county")
+        req.addIdentifier("geomField", "the_geom")
+        req.addIdentifier("inLocation", "true")
+        req.addIdentifier("locationField", "cwa")
+        req.setLocationNames(self.site)
+        req.addIdentifier("cwa", self.site)
+        req.setParameters("countyname", "state", "fips")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("MAPS TESTS COMPLETE\n\n\n")
+
+def getArgs():
+    parser = dafTestsArgsUtil.getParser()
+    parser.add_argument("-s", action="store", dest="site", default=MapsTestCase.site,
+                        help="site to retrieve data for",
+                        metavar="siteID")
+    return parser.parse_args()
+
+if __name__ == '__main__':
+    args = getArgs()
+    dafTestsArgsUtil.handleArgs(args)
+    MapsTestCase.site = args.site
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testModelSounding.py b/pythonPackages/ufpy/test/dafTests/testModelSounding.py
new file mode 100644
index 0000000000..89807a3902
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testModelSounding.py
@@ -0,0 +1,94 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class ModelSoundingTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that modelsounding data can be retrieved through the DAF, simply
+    ensuring that no unexpected exceptions are thrown while retrieving it and
+    that the returned data is not None.
+    """
+
+    datatype = "modelsounding"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING MODELSOUNDING TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("reportType", "ETA")
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("reportType", "ETA")
+        req.setLocationNames("KOMA")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("reportType", "ETA")
+        req.setLocationNames("KOMA")
+        req.setParameters("temperature", "pressure", "specHum", "sfcPress", "temp2", "q2")
+
+        print("Testing getGeometryData()")
+
+        geomData = DAL.getGeometryData(req)
+        print("Number of geometry records: " + str(len(geomData)))
+        print("Sample geometry data:")
+        for record in geomData[:self.sampleDataLimit]:
+            print("level=" + record.getLevel(), end="")
+            # One dimensional parameters are reported on the 0.0UNKNOWN level.
+            # 2D parameters are reported on MB levels from pressure.
+            if record.getLevel() == "0.0UNKNOWN":
+                print(" sfcPress=" + record.getString("sfcPress") + record.getUnit("sfcPress"), end="")
+                print(" temp2=" + record.getString("temp2") + record.getUnit("temp2"), end="")
+                print(" q2=" + record.getString("q2") + record.getUnit("q2"), end="")
+
+            else:
+                print(" pressure=" + record.getString("pressure") + record.getUnit("pressure"), end="")
+                print(" temperature=" + record.getString("temperature") + record.getUnit("temperature"), end="")
+                print(" specHum=" + record.getString("specHum") + record.getUnit("specHum"), end="")
+            print(" geometry=" + str(record.getGeometry()))
+
+        print("getGeometryData() complete\n\n")
+
+    @classmethod
+    def tearDownClass(cls):
+        print("MODELSOUNDING TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testObs.py b/pythonPackages/ufpy/test/dafTests/testObs.py
new file mode 100644
index 0000000000..10d133546e
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testObs.py
@@ -0,0 +1,71 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class ObsTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that obs data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "obs"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING OBS TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames("KOMA")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames("KOMA")
+        req.setParameters("temperature", "seaLevelPress", "dewpoint")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("OBS TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testPirep.py b/pythonPackages/ufpy/test/dafTests/testPirep.py
new file mode 100644
index 0000000000..e74f21055f
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testPirep.py
@@ -0,0 +1,100 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class PirepTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that pirep data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "pirep"
+
+    station = "OMA"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING PIREP TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames(self.station)
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames(self.station)
+        req.setParameters("temperature", "windSpeed", "hazardType", "turbType")
+
+        print("Testing getGeometryData()")
+
+        geomData = DAL.getGeometryData(req)
+        self.assertIsNotNone(geomData)
+        print("Number of geometry records: " + str(len(geomData)))
+        print("Sample geometry data:")
+        for record in geomData[:self.sampleDataLimit]:
+            print("level=", record.getLevel(), end="")
+            # One dimensional parameters are reported on the 0.0UNKNOWN level.
+            # 2D parameters are reported on MB levels from pressure.
+            if record.getLevel() == "0.0UNKNOWN":
+                print(" temperature=" + record.getString("temperature") + record.getUnit("temperature"), end="")
+                print(" windSpeed=" + record.getString("windSpeed") + record.getUnit("windSpeed"), end="")
+            else:
+                print(" hazardType=" + record.getString("hazardType"), end="")
+                print(" turbType=" + record.getString("turbType"), end="")
+            print(" geometry=", record.getGeometry())
+
+        print("getGeometryData() complete\n")
+
+    @classmethod
+    def tearDownClass(cls):
+        print("PIREP TESTS COMPLETE\n\n\n")
+
+def getArgs():
+    parser = dafTestsArgsUtil.getParser()
+    parser.add_argument("-s", action="store", dest="station", default=PirepTestCase.station,
+                        help="stationId",
+                        metavar="station")
+    return parser.parse_args()
+
+if __name__ == '__main__':
+    args = getArgs()
+    dafTestsArgsUtil.handleArgs(args)
+    PirepTestCase.station = args.station
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testPracticeWarning.py b/pythonPackages/ufpy/test/dafTests/testPracticeWarning.py
new file mode 100644
index 0000000000..da1350ebc8
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testPracticeWarning.py
@@ -0,0 +1,70 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class PracticeWarningTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that practicewarning data can be retrieved through the DAF, simply
+    ensuring that no unexpected exceptions are thrown while retrieving it and
+    that the returned data is not None.
+    """
+
+    datatype = "practicewarning"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING PRACTICE WARNING TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setParameters("countyheader", "productclass")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setParameters("countyheader", "productclass")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("PRACTICE WARNING TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testProfiler.py b/pythonPackages/ufpy/test/dafTests/testProfiler.py
new file mode 100644
index 0000000000..50f02b57b3
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testProfiler.py
@@ -0,0 +1,87 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class ProfilerTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that profiler data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "profiler"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING PROFILER TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setParameters("temperature", "pressure", "uComponent", "vComponent")
+
+        print("Testing getGeometryData()")
+
+        geomData = DAL.getGeometryData(req)
+        self.assertIsNotNone(geomData)
+        print("Number of geometry records: " + str(len(geomData)))
+        print("Sample geometry data:")
+        for record in geomData[:self.sampleDataLimit]:
+            print("level:", record.getLevel(), end="")
+            # One dimensional parameters are reported on the 0.0UNKNOWN level.
+            # 2D parameters are reported on MB levels from pressure.
+            if record.getLevel() == "0.0UNKNOWN":
+                print(" temperature=" + record.getString("temperature") + record.getUnit("temperature"), end="")
+                print(" pressure=" + record.getString("pressure") + record.getUnit("pressure"), end="")
+            else:
+                print(" uComponent=" + record.getString("uComponent") + record.getUnit("uComponent"), end="")
+                print(" vComponent=" + record.getString("vComponent") + record.getUnit("vComponent"), end="")
+            print(" geometry:", record.getGeometry())
+
+        print("getGeometryData() complete\n\n")
+
+    @classmethod
+    def tearDownClass(cls):
+        print("PROFILER TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testRadar.py b/pythonPackages/ufpy/test/dafTests/testRadar.py
new file mode 100644
index 0000000000..2705fc3c9d
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testRadar.py
@@ -0,0 +1,98 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from shapely.geometry import box
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class RadarTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that radar data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "radar"
+
+    bbox = ["-96", "41", "-97", "42"]
+    """
+    Request area (box around KOAX)
+    """
+
+    envelope = None
+
+    @classmethod
+    def getReqEnvelope(cls):
+        if not cls.envelope:
+            x1, y1, x2, y2 = map(float, cls.bbox)
+            minX = min(x1, x2)
+            maxX = max(x1, x2)
+            minY = min(y1, y2)
+            maxY = max(y1, y2)
+            cls.envelope = box(minX, minY, maxX, maxY)
+        return cls.envelope
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING RADAR TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testLevels(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLevelsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setEnvelope(self.getReqEnvelope())
+
+        self.runTimesTest(req)
+
+    def testGridData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setEnvelope(self.getReqEnvelope())
+        req.setLocationNames("koax")
+        req.setParameters("94")
+
+        # Limit the times in the grid data test to limit the amount of data
+        # returned, don't test shapes since they may differ.
+        self.runGridDataTest(req, limitTimes=True, testSameShape=False)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("RADAR TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testRadarSpatial.py b/pythonPackages/ufpy/test/dafTests/testRadarSpatial.py
new file mode 100644
index 0000000000..60f0754489
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testRadarSpatial.py
@@ -0,0 +1,104 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from shapely.geometry import box
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class RadarSpatialTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that radar_spatial data can be retrieved through the DAF, simply
+    ensuring that no unexpected exceptions are thrown while retrieving it and
+    that the returned data is not None.
+    """
+
+    datatype = "radar_spatial"
+
+    bbox = ["-96", "41", "-97", "42"]
+    """
+    Default request area (box around KOAX)
+    """
+
+    locations = ["TORD", "TMDW"]
+
+    envelope = None
+
+    @classmethod
+    def getReqEnvelope(cls):
+        if not cls.envelope:
+            x1, y1, x2, y2 = map(float, cls.bbox)
+            minX = min(x1, x2)
+            maxX = max(x1, x2)
+            minY = min(y1, y2)
+            maxY = max(y1, y2)
+            cls.envelope = box(minX, minY, maxX, maxY)
+        return cls.envelope
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING RADAR_SPATIAL TESTS\n\n")
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setEnvelope(self.getReqEnvelope())
+
+        self.runLocationsTest(req)
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testIdentifiers(self):
+        self.runIdentifiersTest(self.datatype)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames(*self.locations)
+        req.setParameters("wfo_id", "name", "elevmeter")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("RADAR_SPATIAL TESTS COMPLETE\n\n\n")
+
+def getArgs():
+    parser = dafTestsArgsUtil.getParser()
+    parser.add_argument("-p", action="store", dest="bbox", nargs=4, default=RadarSpatialTestCase.bbox,
+                        help="Request area for location names query",
+                        metavar="point")
+    parser.add_argument("-r", dest="locations", nargs="+", default=RadarSpatialTestCase.locations,
+                        help="IDs of radar stations to retrieve geometry data for.",
+                        metavar="locations")
+    return parser.parse_args()
+
+
+if __name__ == '__main__':
+    args = getArgs()
+    dafTestsArgsUtil.handleArgs(args)
+    RadarSpatialTestCase.bbox = args.bbox
+    RadarSpatialTestCase.locations = args.locations
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testSatellite.py b/pythonPackages/ufpy/test/dafTests/testSatellite.py
new file mode 100644
index 0000000000..40bc4423b7
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testSatellite.py
@@ -0,0 +1,75 @@
+#!/usr/bin/env python
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class SatelliteTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that satellite data can be retrieved through the DAF, primarily
+    ensuring that no unexpected exceptions are thrown while retrieving it and
+    that the returned data is not None. The only data validation that is
+    performed is to check that all retrieved grid data have the same shape.
+    """
+
+    datatype = "satellite"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING SATELLITE TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames("West CONUS")
+
+        self.runTimesTest(req)
+
+    def testGridData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setParameters("Imager 11 micron IR")
+        req.setLocationNames("West CONUS")
+
+        # Limit the times in the grid data test to limit the amount of data
+        # returned.
+        self.runGridDataTest(req, limitTimes=True)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("SATELLITE TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testSfcObs.py b/pythonPackages/ufpy/test/dafTests/testSfcObs.py
new file mode 100644
index 0000000000..602d0423ab
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testSfcObs.py
@@ -0,0 +1,71 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class SfcObsTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that sfcobs data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "sfcobs"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING SFCOBS TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames("14547")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setLocationNames("14547")
+        req.setParameters("temperature", "seaLevelPress", "dewpoint")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("SFCOBS TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testTopo.py b/pythonPackages/ufpy/test/dafTests/testTopo.py
new file mode 100644
index 0000000000..0793a91ec1
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testTopo.py
@@ -0,0 +1,92 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+from ufpy.ThriftClient import ThriftRequestException
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import shapely.geometry
+import sys
+import unittest
+
+class TopoTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that topo data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None. Also tests that requests for too much data throw
+    an exception indicating that the request needs to be narrowed.
+    """
+
+    datatype = "topo"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING TOPO TESTS\n\n")
+
+    def testGridData(self):
+        print("Testing getGridData()")
+
+        print("defaultTopo")
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("group", "/")
+        req.addIdentifier("dataset","full")
+        poly = shapely.geometry.LinearRing(((-70, 40), (-71, 40), (-71, 42), (-70, 42)))
+        req.setEnvelope(poly)
+        gridData = DAL.getGridData(req)
+        self.assertIsNotNone(gridData)
+        print("Number of grid records: " + str(len(gridData)))
+        print("Sample grid data shape:\n" + str(gridData[0].getRawData().shape) + "\n")
+        print("Sample grid data:\n" + str(gridData[0].getRawData()) + "\n")
+
+        for topoFile in ["srtm30", "gmted2010", "gtopo30.h5"]:
+            print("\n" + topoFile)
+            req.addIdentifier("topoFile", topoFile)
+            gridData = DAL.getGridData(req)
+            self.assertIsNotNone(gridData)
+            print("Number of grid records: " + str(len(gridData)))
+            print("Sample grid data shape:\n" + str(gridData[0].getRawData().shape) + "\n")
+            print("Sample grid data:\n" + str(gridData[0].getRawData()) + "\n")
+
+        print("getGridData() complete\n")
+
+    def testTooMuchGridData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.addIdentifier("group", "/")
+        req.addIdentifier("dataset","full")
+        poly = shapely.geometry.LinearRing(((-180, 90), (180, 90), (180, -90), (-180, -90)))
+        req.setEnvelope(poly)
+
+        print("Testing request of too much grid data")
+
+        with self.assertRaises(ThriftRequestException) as cm:
+            DAL.getGridData(req)
+        print("Expected exception thrown:", cm.exception)
+
+        print("Too much grid data complete\n")
+
+    @classmethod
+    def tearDownClass(cls):
+        print("TOPO TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/pythonPackages/ufpy/test/dafTests/testWarning.py b/pythonPackages/ufpy/test/dafTests/testWarning.py
new file mode 100644
index 0000000000..3d9064cc51
--- /dev/null
+++ b/pythonPackages/ufpy/test/dafTests/testWarning.py
@@ -0,0 +1,70 @@
+##
+# This software was developed and / or modified by Raytheon Company,
+# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+# 
+# U.S. EXPORT CONTROLLED TECHNICAL DATA
+# This software product contains export-restricted data whose
+# export/transfer/disclosure is restricted by U.S. law. Dissemination
+# to non-U.S. persons whether in the United States or abroad requires
+# an export license or other authorization.
+# 
+# Contractor Name:        Raytheon Company
+# Contractor Address:     6825 Pine Street, Suite 340
+#                         Mail Stop B8
+#                         Omaha, NE 68106
+#                         402.291.0100
+# 
+# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+# further licensing information.
+##
+
+from __future__ import print_function
+from ufpy.dataaccess import DataAccessLayer as DAL
+
+import baseDafTestCase
+import dafTestsArgsUtil
+import sys
+import unittest
+
+class WarningTestCase(baseDafTestCase.DafTestCase):
+    """
+    Tests that warning data can be retrieved through the DAF, simply ensuring
+    that no unexpected exceptions are thrown while retrieving it and that the
+    returned data is not None.
+    """
+
+    datatype = "warning"
+
+    @classmethod
+    def setUpClass(cls):
+        print("STARTING WARNING TESTS\n\n")
+
+    def testParameters(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runParametersTest(req)
+
+    def testLocations(self):
+        req = DAL.newDataRequest(self.datatype)
+
+        self.runLocationsTest(req)
+
+    def testTimes(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setParameters("etn", "wmoid")
+
+        self.runTimesTest(req)
+
+    def testGeometryData(self):
+        req = DAL.newDataRequest(self.datatype)
+        req.setParameters("etn", "wmoid")
+
+        self.runGeometryDataTest(req)
+
+    @classmethod
+    def tearDownClass(cls):
+        print("WARNING TESTS COMPLETE\n\n\n")
+
+if __name__ == '__main__':
+    dafTestsArgsUtil.parseAndHandleArgs()
+    unittest.main(argv=sys.argv[:1])
diff --git a/rpms/awips2.ade/Installer.eclipse/component.spec b/rpms/awips2.ade/Installer.eclipse/component.spec
index fad38abf20..4a9c15050b 100644
--- a/rpms/awips2.ade/Installer.eclipse/component.spec
+++ b/rpms/awips2.ade/Installer.eclipse/component.spec
@@ -17,10 +17,14 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-eclipse
+Provides: awips2-eclipse
+Requires: awips2-ant
+Requires: awips2-java
+Requires: awips2-python
+
 
 %description
 AWIPS II Eclipse Distribution - Contains the AWIPS II Eclipse Distribution.
@@ -68,36 +72,8 @@ rm -f %{_build_root}/awips2/eclipse/basemaps
 rm -f %{_build_root}/awips2/eclipse/etc
 
 %pre
-JAVA_INSTALL="<Not Installed>"
-PYTHON_INSTALL="<Not Installed>"
-ANT_INSTALL="<Not Installed>"
-
-INSTALL_PATH="/awips2/java"
-if [ -d ${INSTALL_PATH} ]; then
-   JAVA_INSTALL=${INSTALL_PATH}
-fi
-
-INSTALL_PATH="/awips2/python"
-if [ -d ${INSTALL_PATH} ]; then
-   PYTHON_INSTALL=${INSTALL_PATH}
-fi
-
-INSTALL_PATH="/awips2/ant"
-if [ -d ${INSTALL_PATH} ]; then
-   ANT_INSTALL=${INSTALL_PATH}
-fi
-
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;34m\| Installing the AWIPS II Eclipse Distribution...\e[m"
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;34m   Java   Detected At: ${JAVA_INSTALL}\e[m"
-echo -e "\e[1;34m   Python Detected At: ${PYTHON_INSTALL}\e[m"
-echo -e "\e[1;34m   Ant    Detected At: ${ANT_INSTALL}\e[m"
 
 %post
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;34m\| Creating ADE Eclipse Desktop Shortcut...\e[m"
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
 ADE_ECLIPSE_SHORTCUT="ade-eclipse"
 SHORTCUT_OWNER="${USER}"
 CREATE_SHORTCUT="true"
@@ -150,10 +126,6 @@ if [ "${CREATE_SHORTCUT}" = "true" ]; then
    sudo -u ${SHORTCUT_OWNER} chmod 644 ${SHORTCUT}
 fi
 
-echo -e "\e[1;32m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;32m\| AWIPS II Eclipse Distribution Installation - COMPLETE\e[m"
-echo -e "\e[1;32m--------------------------------------------------------------------------------\e[m"
-
 %preun
 
 %postun
diff --git a/rpms/awips2.cave/Installer.alertviz/component.spec b/rpms/awips2.cave/Installer.alertviz/component.spec
index af89328c5c..21af499830 100644
--- a/rpms/awips2.cave/Installer.alertviz/component.spec
+++ b/rpms/awips2.cave/Installer.alertviz/component.spec
@@ -1,7 +1,6 @@
 %define __prelink_undo_cmd %{nil}
 # Turn off the brp-python-bytecompile script
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%define _build_arch %(uname -i)
 
 %define _swt_version 3.8.1.v3836b
 
@@ -14,17 +13,19 @@ Version: %{_component_version}
 Release: %{_component_release}
 Group: AWIPSII
 BuildRoot: %{_build_root}
-BuildArch: %{_build_arch}
 URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-alertviz
-requires: awips2-python
-requires: awips2-java
+Provides: awips2-alertviz
+Requires: awips2-python
+Requires: awips2-java
+
+BuildRequires: awips2-ant
+BuildRequires: awips2-java
 
 %description
 AWIPS II AlertViz Distribution - the AWIPS II AlertViz application.
@@ -42,11 +43,6 @@ if [ -d %{_build_root} ]; then
 fi
 
 %build
-build_arch=%{_build_arch}
-if [ "${build_arch}" = "i386" ]; then
-   build_arch="x86"
-fi
-
 pushd . > /dev/null
 # Build alertviz.
 cd %{_baseline_workspace}/build
@@ -56,7 +52,6 @@ fi
 
 /awips2/ant/bin/ant -f build.xml \
    -Declipse.dir=%{_uframe_eclipse} \
-   -Dbuild.arch=${build_arch} \
    alertviz
 if [ $? -ne 0 ]; then
    exit 1
@@ -77,11 +72,7 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-build_arch=%{_build_arch}
-if [ "${build_arch}" = "i386" ]; then
-   build_arch="x86"
-fi
-alertviz_zip="AlertViz-linux.gtk.${build_arch}.zip"
+alertviz_zip="AlertViz-linux.gtk.x86_64.zip"
 
 pushd . > /dev/null
 cd %{_baseline_workspace}/build/alertviz/tmp/I.AlertViz
diff --git a/rpms/awips2.cave/Installer.cave-feature/component.spec b/rpms/awips2.cave/Installer.cave-feature/component.spec
deleted file mode 100644
index 4f22ccedb5..0000000000
--- a/rpms/awips2.cave/Installer.cave-feature/component.spec
+++ /dev/null
@@ -1,249 +0,0 @@
-%define _component_zip_file_name  %{_component_feature}-repo-linux.%{_build_arch}.zip
-#
-# awips2-cave Spec File
-#
-%define __prelink_undo_cmd %{nil}
-# Turn off the brp-python-bytecompile script
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-java-repack-jars[[:space:]].*$!!g')
-
-Name: %{_component_name}
-Summary: %{_component_name} Installation
-Version: %{_component_version}
-Release: %{_component_release}
-Group: AWIPSII
-BuildRoot: /tmp
-URL: N/A
-License: N/A
-Distribution: N/A
-Vendor: Raytheon
-Packager: Bryan Kowal
-
-AutoReq: no
-provides: %{_component_name} = %{_component_version}
-requires: awips2-cave
-requires: %{_downstream_requires}
-requires: awips2
-
-%description
-%{_component_desc}
-
-%prep
-# Verify That The User Has Specified A BuildRoot.
-if [ "${RPM_BUILD_ROOT}" = "/tmp" ]
-then
-   echo "An Actual BuildRoot Must Be Specified. Use The --buildroot Parameter."
-   echo "Unable To Continue ... Terminating"
-   exit 1
-fi
-
-if [ -d ${RPM_BUILD_ROOT} ]; then
-   rm -rf ${RPM_BUILD_ROOT}
-fi
-
-%build
-
-%install
-CAVE_DIST_DIR="%{_baseline_workspace}/rpms/awips2.cave/setup/dist"
-
-if [ ! -f ${CAVE_DIST_DIR}/%{_component_zip_file_name} ]; then
-   echo "ERROR: Unable to find - ${CAVE_DIST_DIR}/%{_component_zip_file_name}."
-   exit 1
-fi
-
-mkdir -p ${RPM_BUILD_ROOT}/awips2/cave/.repository
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-cp ${CAVE_DIST_DIR}/%{_component_zip_file_name} \
-   ${RPM_BUILD_ROOT}/awips2/cave/.repository
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-%pre
-# Ensure that CAVE is available to backup and to use to
-# apply p2 updates.
-if [ ! -f /awips2/cave/cave ]; then
-   echo "ERROR: The cave executable was not found or is corrupt - /awips2/cave/cave;"
-   echo "       awips2-cave must be re-installed. This installation will be terminated."
-   exit 1
-fi
-
-%post
-function cleanupUnzip()
-{
-   if [ -f /awips2/cave/.repository/artifacts.xml ]; then
-      rm -f /awips2/cave/.repository/artifacts.xml
-   fi
-   
-   if [ -f /awips2/cave/.repository/content.xml ]; then
-      rm -f /awips2/cave/.repository/content.xml
-   fi
-   
-   if [ -d /awips2/cave/.repository/features ]; then
-      rm -rf /awips2/cave/.repository/features
-   fi
-   
-   if [ -d /awips2/cave/.repository/plugins ]; then
-      rm -rf /awips2/cave/.repository/plugins
-   fi
-}
-
-# Set all paths required by CAVE before installing.
-export LD_LIBRARY_PATH=/awips2/java/lib:/awips2/python/lib:$LD_LIBRARY_PATH
-export LD_PRELOAD=libpython.so
-if [ -d /awips2/cave/lib ]; then
-   export LD_LIBRARY_PATH=/awips2/cave/lib/lib_illusion:$LD_LIBRARY_PATH
-fi
-if [ -d /awips2/cave/lib64 ]; then
-   export LD_LIBRARY_PATH=/awips2/cave/lib64/lib_illusion:$LD_LIBRARY_PATH
-fi
-# Need to use awips2-java to do this.
-export PATH=/awips2/java/bin:/awips2/python/bin:${PATH}
-export JAVA_HOME="/awips2/java/jre"
-
-# Set the CAVE logfile location.
-export LOGFILE_CAVE=/dev/null
-
-# Use the eclipse p2 manager.
-CAVE_EXE="/awips2/cave/cave"
-NOSPLASH_ARG="-nosplash"
-DIRECTOR_APP="-application org.eclipse.equinox.p2.director"
-DESTINATION_ARG="-destination /awips2/cave"
-INSTALL_ARG="-i %{_component_feature}.feature.group"
-UNINSTALL_ARG="-u %{_component_feature}.feature.group"
-REPO="-repository file:/awips2/cave/.repository/"
-
-COMMON_CMD="${CAVE_EXE} ${NOSPLASH_ARG} ${DIRECTOR_APP} ${DESTINATION_ARG}"
-INSTALL_CMD="${COMMON_CMD} ${INSTALL_ARG} ${REPO}"
-UNINSTALL_CMD="${COMMON_CMD} ${UNINSTALL_ARG}"
-
-# Uninstall any existing components since the p2 director does not
-# support updating.
-# If the feature is not installed, this does not fail quietly.
-# Determine if the feature needs to be uninstalled.
-${UNINSTALL_CMD} -verifyOnly > /dev/null 2>&1
-RC=$?
-if [ ${RC} -eq 0 ]; then
-   LOG_TIMESTAMP=`date`
-   echo "uninstall previous STARTED: ${LOG_TIMESTAMP}"
-   ${UNINSTALL_CMD}
-   LOG_TIMESTAMP=`date`
-   echo "uninstall previous COMPLETE: ${LOG_TIMESTAMP}"
-fi
-
-# unzip the repository
-cd /awips2/cave/.repository
-cleanupUnzip
-unzip %{_component_zip_file_name} > /dev/null 2>&1
-RC=$?
-if [ ${RC} -ne 0 ]; then
-   echo "ERROR: Unzip of repository FAILED."
-   exit 1
-fi
-
-# Install the component.
-LOG_TIMESTAMP=`date`
-echo "installation STARTED: ${LOG_TIMESTAMP}"
-${INSTALL_CMD}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-LOG_TIMESTAMP=`date`
-echo "installation COMPLETE: ${LOG_TIMESTAMP}" 
-
-# Cleanup the unzip
-cleanupUnzip
-
-# move localization files in unpacked plugins to the
-# cave etc directory.
-if [ ! -d /awips2/cave/etc ]; then
-   mkdir -p /awips2/cave/etc
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-fi
-pushd . > /dev/null 2>&1
-cd /awips2/cave/plugins
-for localizationDirectory in `find . -maxdepth 2 -name localization -type d`;
-do
-   # copy the contents of the localization directory to the
-   # etc directory.
-   cp -r ${localizationDirectory}/* /awips2/cave/etc
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   
-   # remove the localization directory.
-   rm -rf ${localizationDirectory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-done
-popd > /dev/null 2>&1
-
-%preun
-# Do not use p2 to remove the feature if this is an upgrade.
-if [ "${1}" = "1" ]; then
-   exit 0
-fi
-
-# Ensure that CAVE is available.
-if [ ! -f /awips2/cave/cave ]; then
-   # Even though we are not correctly uninstalled, there is nothing
-   # we can do about that because of an rpm bug. If the user is
-   # uninstalling then they will need to remove what is left of
-   # /awips2 anyway.
-   exit 0
-fi
-
-# Ensure that awips2-java is available.
-if [ ! -f /awips2/java/bin/java ]; then
-   exit 0
-fi
-
-# Ensure that awips2-python is available.
-if [ ! -f /awips2/python/bin/python ]; then
-   exit 0
-fi
-
-# Set all paths required by CAVE before installing.
-export LD_LIBRARY_PATH=/awips2/java/lib:/awips2/python/lib:$LD_LIBRARY_PATH
-export LD_PRELOAD=libpython.so
-if [ -d /awips2/cave/lib ]; then
-   export LD_LIBRARY_PATH=/awips2/cave/lib/lib_illusion:$LD_LIBRARY_PATH
-fi
-if [ -d /awips2/cave/lib64 ]; then
-   export LD_LIBRARY_PATH=/awips2/cave/lib64/lib_illusion:$LD_LIBRARY_PATH
-fi
-# Need to use awips2-java to do this.
-export PATH=/awips2/java/bin:/awips2/python/bin:${PATH}
-export JAVA_HOME="/awips2/java/jre"
-
-# Set the CAVE logfile location.
-export LOGFILE_CAVE=/dev/null
-
-# Use the eclipse p2 manager.
-CAVE_EXE="/awips2/cave/cave"
-NOSPLASH_ARG="-nosplash"
-DIRECTOR_APP="-application org.eclipse.equinox.p2.director"
-DESTINATION_ARG="-destination /awips2/cave"
-UNINSTALL_ARG="-u %{_component_feature}.feature.group"
-
-COMMON_CMD="${CAVE_EXE} ${NOSPLASH_ARG} ${DIRECTOR_APP} ${DESTINATION_ARG}"
-UNINSTALL_CMD="${COMMON_CMD} ${UNINSTALL_ARG}"
-
-LOG_TIMESTAMP=`date`
-echo "uninstall STARTED: ${LOG_TIMESTAMP}"
-${UNINSTALL_CMD}
-LOG_TIMESTAMP=`date`
-echo "uninstall COMPLETE: ${LOG_TIMESTAMP}"
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(644,awips,fxalpha,755)
-%dir /awips2/cave/.repository
-/awips2/cave/.repository/*
diff --git a/rpms/awips2.cave/Installer.cave-wrapper/component.spec b/rpms/awips2.cave/Installer.cave-wrapper/component.spec
index 269ab907f7..0810a6e124 100644
--- a/rpms/awips2.cave/Installer.cave-wrapper/component.spec
+++ b/rpms/awips2.cave/Installer.cave-wrapper/component.spec
@@ -1,7 +1,7 @@
 # RPM Metadata
 %define _component_name           awips2-cave-wrapper
 %define _component_project_dir    awips2.cave/Installer.cave-wrapper
-%define _component_zip_file_name  CAVE-linux.gtk.%{_build_arch}.zip
+%define _component_zip_file_name  CAVE-linux.gtk.x86_64.zip
 #
 # awips2-cave-wrapper Spec File
 #
@@ -21,6 +21,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}
 
 AutoReq: no
 Provides: %{_component_name}
@@ -188,7 +189,7 @@ rm -rf ${RPM_BUILD_ROOT}
 /awips2/cave/*.sh
 /awips2/cave/VizUpdater.jar
 # not a noarch RPM due to the presence of the architecture-specific libraries.
-%dir /awips2/cave/lib%{_build_bits}
-/awips2/cave/lib%{_build_bits}/*
+%dir /awips2/cave/lib64
+/awips2/cave/lib64/*
 
 %attr(644,root,root) /etc/xdg/autostart/awips2-textws.desktop
diff --git a/rpms/awips2.cave/Installer.cave/component.spec b/rpms/awips2.cave/Installer.cave/component.spec
index 35993288c3..7072009b3f 100644
--- a/rpms/awips2.cave/Installer.cave/component.spec
+++ b/rpms/awips2.cave/Installer.cave/component.spec
@@ -29,6 +29,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}
 
 AutoReq: no
 provides: awips2-cave
diff --git a/rpms/awips2.cave/deploy.builder/build.sh b/rpms/awips2.cave/deploy.builder/build.sh
index b568d5b268..aec6a62ffc 100644
--- a/rpms/awips2.cave/deploy.builder/build.sh
+++ b/rpms/awips2.cave/deploy.builder/build.sh
@@ -3,33 +3,27 @@
 
 # Build Variables:
 # -----------------------------------------------------------------------------
-VAR_AWIPSII_TOP_DIR="/home/bkowal/rpmbuild"
-VAR_WORKSPACE="/common/bkowal/git/thunder/baseline"
 VAR_AWIPSII_BUILD_ROOT="/tmp/awips-component"
 VAR_AWIPSII_VERSION=""
 VAR_AWIPSII_RELEASE=""
 VAR_UFRAME_ECLIPSE="/opt/uframe-eclipse"
-VAR_AWIPSCM_SHARE="/awipscm"
 VAR_REPO_DEST="/tmp/repo"
 # -----------------------------------------------------------------------------
 
-if [ "${AWIPSII_TOP_DIR}" = "" ] &&
-   [ "${VAR_AWIPSII_TOP_DIR}" = "" ]; then
+if [ "${AWIPSII_TOP_DIR}" = "" ]; then
    echo "ERROR: You Must Set the AWIPSII_TOP_DIR Environment Variable."
    echo "Unable to Continue ... Terminating."
    exit 1
 fi
 
+if [ "${WORKSPACE}" = "" ]; then
+   echo "ERROR: You Must Set the WORKSPACE Environment Variable."
+   echo "Unable to Continue ... Terminating."
+   exit 1
+fi
+
 function prepareBuildEnvironment()
 {
-   if [ "${AWIPSII_TOP_DIR}" = "" ]; then
-      export AWIPSII_TOP_DIR="${VAR_AWIPSII_TOP_DIR}"
-   fi
-
-   if [ "${WORKSPACE}" = "" ]; then
-      export WORKSPACE="${VAR_WORKSPACE}"
-   fi
-
    if [ "${AWIPSII_BUILD_ROOT}" = "" ]; then
       export AWIPSII_BUILD_ROOT="${VAR_AWIPSII_BUILD_ROOT}"
    fi
@@ -54,70 +48,27 @@ function prepareBuildEnvironment()
       export UFRAME_ECLIPSE="${VAR_UFRAME_ECLIPSE}"
    fi
 
-   if [ "${AWIPSCM_SHARE}" = "" ]; then
-      export AWIPSCM_SHARE="${VAR_AWIPSCM_SHARE}"
-   fi
-
    if [ "${REPO_DEST}" = "" ]; then
       export REPO_DEST="${VAR_REPO_DEST}"
    fi
 }
 
-function setTargetArchitecture()
-{
-   # Set the target build architecture for the rpms based on the CAVE build
-   # architecture.
-   export TARGET_BUILD_ARCH="${CAVE_BUILD_ARCH}"
-   export CAVE_BUILD_BITS="64"
-   if [ "${CAVE_BUILD_ARCH}" = "x86" ]; then
-      export TARGET_BUILD_ARCH="i386"
-      export CAVE_BUILD_BITS=""
-   fi
-}
+# Build CAVE as 64 bit only.
+architecture=`uname -i`
+if [ ! "${architecture}" = "x86_64" ]; then
+   echo "ERROR: This build can only be performed on a 64-bit Operating System."
+   echo "Unable to Continue ... Terminating."
+   exit 1
+fi
 
-# Arguments
-#   ${1} == The Directory With The Specs File And Possibly Other Custom
-#               Scripts That May Need To Be Merged Into A Component.
-#   ${2} == The name of the CAVE RPM that will be built.
-function buildCAVERPM()
-{
-   local COMPONENT_DIR=${1}
-   local COMPONENT_SPECS=${COMPONENT_DIR}/component.spec
-   export RPM_NAME=${2}
-
-   if [ -d ${BUILDROOT_DIR} ]; then
-      rm -rf ${BUILDROOT_DIR}
-   fi
-
-   # Build The RPM.
-   rpmbuild -ba --target=${TARGET_BUILD_ARCH} \
-      --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
-      --define '_component_version %(echo ${AWIPSII_VERSION})' \
-      --define '_component_release %(echo ${AWIPSII_RELEASE})' \
-      --define '_baseline_workspace %(echo ${WORKSPACE})' \
-      --define '_build_arch %(echo ${CAVE_BUILD_ARCH})' \
-      --define '_build_bits %(echo ${CAVE_BUILD_BITS})' \
-      --define '_component_name %(echo ${RPM_NAME})' \
-      --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
-      --buildroot ${AWIPSII_BUILD_ROOT} ${COMPONENT_SPECS}
-   # If We Are Unable To Build An RPM, Fail The Build:
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-}
-
-export TARGET_BUILD_ARCH=
-# If the architecture has not been specified, default to 32-bit.
-if [ "${CAVE_BUILD_ARCH}" = "" ]; then
-   export CAVE_BUILD_ARCH="x86"
-   echo "The Build Architecture was not specified ... defaulting to x86."
-else
-   echo "Building for architecture ... ${CAVE_BUILD_ARCH}."
+source ${WORKSPACE}/rpms/build/x86_64/rpms.sh
+if [ $? -ne 0 ]; then
+   echo "ERROR: Unable to source the RPM functions."
+   exit 1
 fi
 
 # Prepare
 prepareBuildEnvironment
-setTargetArchitecture
 
 if [ ! -d ${WORKSPACE}/rpms/awips2.cave/setup/dist ]; then
    mkdir -p ${WORKSPACE}/rpms/awips2.cave/setup/dist
@@ -278,8 +229,8 @@ popd > /dev/null
 cp ${pde_build_dir}/I.CAVE/CAVE-linux.gtk.x86_64.zip ${WORKSPACE}/rpms/awips2.cave/setup/dist/
 
 cd ${WORKSPACE}/rpms/awips2.cave
-buildCAVERPM "Installer.cave" "awips2-cave"
-buildCAVERPM "Installer.cave-wrapper" ""
+buildRPMExec "Installer.cave" "awips2-cave"
+buildRPMExec "Installer.cave-wrapper" ""
 
 rm -rf ${pde_build_dir}
 mkdir -p ${pde_build_dir}
@@ -343,4 +294,4 @@ popd > /dev/null
 cp ${pde_build_dir}/I.CAVE/CAVE-linux.gtk.x86_64.zip ${WORKSPACE}/rpms/awips2.cave/setup/dist/
 
 cd ${WORKSPACE}/rpms/awips2.cave
-buildCAVERPM "Installer.cave" "awips2-cave-ncep"
\ No newline at end of file
+buildRPMExec "Installer.cave" "awips2-cave-ncep"
diff --git a/rpms/awips2.cave/setup/scripts/prepare_dist.sh b/rpms/awips2.cave/setup/scripts/prepare_dist.sh
index 532d8fd34d..4256273382 100644
--- a/rpms/awips2.cave/setup/scripts/prepare_dist.sh
+++ b/rpms/awips2.cave/setup/scripts/prepare_dist.sh
@@ -66,7 +66,7 @@ fi
 time /awips2/ant/bin/ant -f p2-build.xml \
    -Declipse.dir=${UFRAME_ECLIPSE} \
    -Dbuild.version=${AWIPSII_VERSION} \
-   -Dbuild.arch=${CAVE_BUILD_ARCH} \
+   -Dbuild.arch=x86_64 \
    -Declipse.dir=${UFRAME_ECLIPSE}
 RC=$?
 
diff --git a/rpms/awips2.core/Installer.adapt-native/component.spec b/rpms/awips2.core/Installer.adapt-native/component.spec
index ec39d711ba..97a6ca771a 100644
--- a/rpms/awips2.core/Installer.adapt-native/component.spec
+++ b/rpms/awips2.core/Installer.adapt-native/component.spec
@@ -12,11 +12,11 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-adapt-native
-requires: awips2-edex-base
+Provides: awips2-adapt-native
+Requires: awips2-edex-base
 
 # The two python native libraries are now included directly in the python
 # distribution that is built.
diff --git a/rpms/awips2.core/Installer.ant/component.spec b/rpms/awips2.core/Installer.ant/component.spec
deleted file mode 100644
index f203b39e7c..0000000000
--- a/rpms/awips2.core/Installer.ant/component.spec
+++ /dev/null
@@ -1,132 +0,0 @@
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-#
-# AWIPS II Ant Spec File
-#
-Name: awips2-ant
-Summary: AWIPS II Ant Distribution
-Version: 1.7.1
-Release: %{_component_version}.%{_component_release}
-Group: AWIPSII
-BuildRoot: %{_build_root}
-BuildArch: noarch
-Prefix: /awips2/ant
-URL: N/A
-License: N/A
-Distribution: N/A
-Vendor: Raytheon
-Packager: Bryan Kowal
-
-AutoReq: no
-provides: awips2-ant
-
-%description
-AWIPS II Ant Distribution - Contains Ant V1.7.1
-
-%prep
-# Verify That The User Has Specified A BuildRoot.
-if [ "%{_build_root}" = "" ]
-then
-   echo "A Build Root has not been specified."
-   echo "Unable To Continue ... Terminating"
-   exit 1
-fi
-
-rm -rf %{_build_root}
-mkdir -p %{_build_root}
-
-%build
-
-%install
-# Copies the standard Raytheon licenses into a license directory for the
-# current component.
-function copyLegal()
-{
-   # $1 == Component Build Root
-   
-   COMPONENT_BUILD_DIR=${1}
-   
-   mkdir -p %{_build_root}/${COMPONENT_BUILD_DIR}/licenses
-   
-   # Create a Tar file with our FOSS licenses.
-   tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
-      %{_baseline_workspace}/rpms/legal/FOSS_licenses/
-   
-   cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
-      %{_build_root}/${COMPONENT_BUILD_DIR}/licenses
-   cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
-      %{_build_root}/${COMPONENT_BUILD_DIR}/licenses
-      
-   rm -f %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar    
-}
-
-mkdir -p ${RPM_BUILD_ROOT}/awips2/ant
-mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
-
-_core_rpms="%{_baseline_workspace}/rpms/awips2.core"
-_installer_ant="${_core_rpms}/Installer.ant"
-ANT_TAR_FILE="apache-ant-1.7.1-bin.tar.gz"
-
-# Will Be Extracted Into apache-ant-1.7.1
-tar -xf ${_installer_ant}/src/${ANT_TAR_FILE} \
-   -C %{_build_root}/awips2
-# Move Files From 1.7.1 To The Generic Directory
-cp -r %{_build_root}/awips2/apache-ant-1.7.1/* \
-   %{_build_root}/awips2/ant 
-rm -rf %{_build_root}/awips2/apache-ant-1.7.1
-
-PROFILE_D_DIR="rpms/awips2.core/Installer.ant/scripts/profile.d"
-cp %{_baseline_workspace}/${PROFILE_D_DIR}/* %{_build_root}/etc/profile.d 
-
-copyLegal "awips2/ant"
-
-%pre
-if [ "${1}" = "2" ]; then
-   exit 0
-fi
-
-%post
-if [ "${1}" = "2" ]; then
-   exit 0
-fi
-
-%postun
-if [ "${1}" = "1" ]; then
-   exit 0
-fi
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-,awips,fxalpha,-)
-%attr(755,root,root) /etc/profile.d/awips2Ant.csh
-%attr(755,root,root) /etc/profile.d/awips2Ant.sh
-%dir /awips2/ant
-%dir /awips2/ant/bin
-%attr(755,awips,fxalpha) /awips2/ant/bin/ant
-%attr(644,awips,fxalpha) /awips2/ant/bin/ant.bat
-%attr(644,awips,fxalpha) /awips2/ant/bin/ant.cmd
-%attr(644,awips,fxalpha) /awips2/ant/bin/antenv.cmd
-%attr(755,awips,fxalpha) /awips2/ant/bin/antRun
-%attr(644,awips,fxalpha) /awips2/ant/bin/antRun.bat
-%attr(755,awips,fxalpha) /awips2/ant/bin/antRun.pl
-%attr(755,awips,fxalpha) /awips2/ant/bin/complete-ant-cmd.pl
-%attr(644,awips,fxalpha) /awips2/ant/bin/envset.cmd
-%attr(644,awips,fxalpha) /awips2/ant/bin/lcp.bat
-%attr(755,awips,fxalpha) /awips2/ant/bin/runant.pl
-%attr(755,awips,fxalpha) /awips2/ant/bin/runant.py
-%attr(644,awips,fxalpha) /awips2/ant/bin/runrc.cmd
-%docdir /awips2/ant/docs
-/awips2/ant/docs
-/awips2/ant/etc
-/awips2/ant/fetch.xml
-/awips2/ant/get-m2.xml
-%doc /awips2/ant/INSTALL
-%doc /awips2/ant/KEYS
-/awips2/ant/lib
-%doc /awips2/ant/LICENSE
-%docdir /awips2/ant/licenses
-/awips2/ant/licenses
-%doc /awips2/ant/NOTICE
-%doc /awips2/ant/README
-%doc /awips2/ant/WHATSNEW
diff --git a/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh b/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
deleted file mode 100644
index 3ee35cb6ae..0000000000
--- a/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.csh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/csh
-
-# Determine where ant has been installed.
-setenv ANT_INSTALL "/awips2/ant"
-
-if $?PATH then
-   setenv PATH ${ANT_INSTALL}/bin:$PATH
-else
-   setenv PATH ${ANT_INSTALL}
-endif
diff --git a/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh b/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
deleted file mode 100644
index 0c08a2707f..0000000000
--- a/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ -d /awips2/ant ]; then
-   # Determine Where Ant Has Been Installed.
-   ANT_INSTALL=/awips2/ant
-
-   # Update The Environment.
-   export ANT_HOME="${ANT_INSTALL}"
-   # Determine If Ant Is Already Part Of The Path.
-   CHECK_PATH=`echo ${PATH} | grep ${ANT_INSTALL}`
-   if [ ! "${CHECK_PATH}" = "" ]; then
-      return
-   fi
-   # Ant Is Not In The Path; Add It To The Path.
-   export PATH="${ANT_INSTALL}/bin:${PATH}"
-fi
diff --git a/rpms/awips2.core/Installer.ant/src/apache-ant-1.7.1-bin.tar.gz b/rpms/awips2.core/Installer.ant/src/apache-ant-1.7.1-bin.tar.gz
deleted file mode 100644
index 4ca02bd9c0..0000000000
Binary files a/rpms/awips2.core/Installer.ant/src/apache-ant-1.7.1-bin.tar.gz and /dev/null differ
diff --git a/rpms/awips2.core/Installer.aviation/component.spec b/rpms/awips2.core/Installer.aviation/component.spec
index 058d7030d2..4f121f09ab 100644
--- a/rpms/awips2.core/Installer.aviation/component.spec
+++ b/rpms/awips2.core/Installer.aviation/component.spec
@@ -12,11 +12,11 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-aviation-shared
-requires: awips2-edex-base
+Provides: awips2-aviation-shared
+Requires: awips2-edex-base
 
 %description
 AWIPS II Aviation Distribution - includes *-ish files required by AvnFPS.
diff --git a/rpms/awips2.core/Installer.cli/component.spec b/rpms/awips2.core/Installer.cli/component.spec
index c724304c9f..fb7391e0e1 100644
--- a/rpms/awips2.core/Installer.cli/component.spec
+++ b/rpms/awips2.core/Installer.cli/component.spec
@@ -16,11 +16,11 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-cli
-requires: awips2-python
+Provides: awips2-cli
+Requires: awips2-python
 
 %description
 AWIPS II CLI Installation - Contains The AWIPS II CLI Component.
@@ -83,39 +83,16 @@ cp %{_baseline_workspace}/${PROFILE_D_DIRECTORY}/* \
 if [ "${1}" = "2" ]; then
    exit 0
 fi
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;34m\| Installing AWIPS II CLI...\e[m"
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;34m   Installation Root = ${RPM_INSTALL_PREFIX}\e[m"
 
 %post
 if [ "${1}" = "2" ]; then
    exit 0
 fi
-PYTHON_INSTALL="/awips2/python"
-
-function printFailureMessage()
-{
-   echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
-   echo -e "\e[1;31m\| AWIPS II CLI Installation - FAILED\e[m"
-   echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
-}
-echo "--------------------------------------------------------------------------------"
-echo "\| Setting up AWIPS II CLI Runtime and Environment..."
-echo "--------------------------------------------------------------------------------"
-
-echo -e "\e[1;32m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;32m\| AWIPS II CLI Installation - COMPLETE\e[m"
-echo -e "\e[1;32m--------------------------------------------------------------------------------\e[m"
 
 %postun
 if [ "${1}" = "1" ]; then
    exit 0
 fi
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;34m\| The AWIPS II CLI Installation Has Been Successfully Removed\e[m"
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo ""
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
diff --git a/rpms/awips2.core/Installer.common-base/component.spec b/rpms/awips2.core/Installer.common-base/component.spec
index d0f6af99a2..ec2e3d34b8 100644
--- a/rpms/awips2.core/Installer.common-base/component.spec
+++ b/rpms/awips2.core/Installer.common-base/component.spec
@@ -18,13 +18,16 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-common-base
-requires: awips2-base
-requires: netcdf = 4.1.2
-requires: netcdf-devel = 4.1.2
+Provides: awips2-common-base
+Requires: awips2-base
+Requires: netcdf = 4.1.2
+Requires: netcdf-devel = 4.1.2
+
+BuildRequires: awips2-ant
+BuildRequires: awips2-java
 
 %description
 AWIPS II Common Base - Contains common plugins utilized by both EDEX and CAVE.
diff --git a/rpms/awips2.core/Installer.database-server-configuration/component.spec b/rpms/awips2.core/Installer.database-server-configuration/component.spec
index dcbdccd2b2..ea82f50c87 100644
--- a/rpms/awips2.core/Installer.database-server-configuration/component.spec
+++ b/rpms/awips2.core/Installer.database-server-configuration/component.spec
@@ -12,12 +12,12 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-postgresql
-provides: awips2-database-server-configuration
-provides: awips2-database-configuration
+Requires: awips2-postgresql
+Provides: awips2-database-server-configuration
+Provides: awips2-database-configuration
 
 %description
 AWIPS II Database Server Configuration - contains the AWIPS II server
diff --git a/rpms/awips2.core/Installer.database-standalone-configuration/component.spec b/rpms/awips2.core/Installer.database-standalone-configuration/component.spec
index 744e1edc83..a682ace13d 100644
--- a/rpms/awips2.core/Installer.database-standalone-configuration/component.spec
+++ b/rpms/awips2.core/Installer.database-standalone-configuration/component.spec
@@ -12,12 +12,12 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-postgresql
-provides: awips2-database-standalone-configuration
-provides: awips2-database-configuration
+Requires: awips2-postgresql
+Provides: awips2-database-standalone-configuration
+Provides: awips2-database-configuration
 
 %description
 AWIPS II Database Server Configuration - contains the AWIPS II server
diff --git a/rpms/awips2.core/Installer.database/component.spec b/rpms/awips2.core/Installer.database/component.spec
index 607bc10044..402a3eb5ff 100644
--- a/rpms/awips2.core/Installer.database/component.spec
+++ b/rpms/awips2.core/Installer.database/component.spec
@@ -17,16 +17,16 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-database
-provides: awips2-static-user
-requires: awips2-postgresql
-requires: awips2-psql
-requires: awips2-database-configuration
-requires: netcdf = 4.1.2
-requires: netcdf-devel = 4.1.2
+Provides: awips2-database
+Provides: awips2-static-user
+Requires: awips2-postgresql
+Requires: awips2-psql
+Requires: awips2-database-configuration
+Requires: netcdf = 4.1.2
+Requires: netcdf-devel = 4.1.2
 
 
 %description
diff --git a/rpms/awips2.core/Installer.edex-environment/edex/component.spec b/rpms/awips2.core/Installer.edex-environment/edex/component.spec
index e65f9fa4df..d83f7dc773 100644
--- a/rpms/awips2.core/Installer.edex-environment/edex/component.spec
+++ b/rpms/awips2.core/Installer.edex-environment/edex/component.spec
@@ -13,18 +13,21 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-edex-environment
-requires: awips2-edex-base
-requires: awips2-postgresql
-requires: awips2-qpid-java-broker
-requires: awips2-qpid-java-client
-requires: awips2-qpid-java-common
-requires: awips2-python
-requires: awips2-java
-requires: awips2-psql
+Provides: awips2-edex-environment
+Requires: awips2-edex-base
+Requires: awips2-postgresql
+Requires: awips2-qpid-java-broker
+Requires: awips2-qpid-java-client
+Requires: awips2-qpid-java-common
+Requires: awips2-python
+Requires: awips2-java
+Requires: awips2-psql
+
+BuildRequires: awips2-ant
+BuildRequires: awips2-java
 
 %description
 The edex environment version of awips2-edex consists of
@@ -49,17 +52,6 @@ if [ $? -ne 0 ]; then
 fi
 
 %build
-# build the edex-environment utilities
-pushd . > /dev/null 2>&1
-# Run the pde build.
-cd %{_baseline_workspace}/build.wes2bridge.utility
-/awips2/ant/bin/ant -f build.xml \
-   -Declipse.dir=%{_uframe_eclipse}
-if [ $? -ne 0 ]; then
-   echo "ERROR: The pde build of the wes2bridge utilities has failed."
-   exit 1
-fi
-popd > /dev/null 2>&1
 
 %install
 mkdir -p %{_build_root}%{_installation_directory}/edex-environment/scripts
@@ -86,11 +78,19 @@ mkdir -p %{_build_root}/usr/local/edex-environment
 #	%{_build_root}%{_installation_directory}/edex
 
 # "install" the wes2bridge utilities
+cd %{_baseline_workspace}/com.raytheon.wes2bridge.common
+/awips2/ant/bin/ant -f build.xml \
+   -Ddestination.directory=%{_build_root}%{_installation_directory}/edex-environment/macro/utilities \
+   -Declipse.directory=%{_uframe_eclipse} \
+   -Dbaseline.dir=%{_baseline_workspace}
+if [ $? -ne 0 ]; then
+   exit 1
+fi
 cd %{_baseline_workspace}/com.raytheon.wes2bridge.configuration
 /awips2/ant/bin/ant -f build.xml \
    -Ddestination.directory=%{_build_root}%{_installation_directory}/edex-environment/macro/utilities \
    -Declipse.directory=%{_uframe_eclipse} \
-   -Drpm.build=true
+   -Dbaseline.dir=%{_baseline_workspace}
 if [ $? -ne 0 ]; then
    exit 1
 fi
@@ -98,7 +98,7 @@ cd %{_baseline_workspace}/com.raytheon.wes2bridge.datalink
 /awips2/ant/bin/ant -f build.xml \
    -Ddestination.directory=%{_build_root}%{_installation_directory}/edex-environment/macro/utilities \
    -Declipse.directory=%{_uframe_eclipse} \
-   -Drpm.build=true
+   -Dbaseline.dir=%{_baseline_workspace}
 if [ $? -ne 0 ]; then
    exit 1
 fi
@@ -106,18 +106,16 @@ cd %{_baseline_workspace}/com.raytheon.wes2bridge.manager
 /awips2/ant/bin/ant -f build.xml \
    -Ddestination.directory=%{_build_root}%{_installation_directory}/edex-environment/macro/utilities \
    -Declipse.directory=%{_uframe_eclipse} \
-   -Drpm.build=true
+   -Dbaseline.dir=%{_baseline_workspace}
 if [ $? -ne 0 ]; then
    exit 1
 fi
 
-_QPID_VERSION="0.32"
-_POSTGRESQL_VERSION="9.3.9"
 RPM_PROJECT="%{_baseline_workspace}/rpms"
-POSTGRES_INITD="%{_baseline_workspace}/foss/postgresql-${_POSTGRESQL_VERSION}/scripts/init.d/edex_postgres"
-QPID_INITD="%{_baseline_workspace}/foss/qpid-java-broker-${_QPID_VERSION}/src/patch/qpid-java-broker-${_QPID_VERSION}/wrapper/qpidd"
+POSTGRES_INITD="%{_baseline_workspace}/installers/RPMs/postgresql/scripts/init.d/edex_postgres"
+QPID_INITD="%{_baseline_workspace}/installers/RPMs/qpid-java-broker/scripts/init.d/qpidd"
 EDEX_INITD="${RPM_PROJECT}/awips2.edex/Installer.edex/scripts/init.d/edex_camel"
-HTTPD_PYPIES_INITD="${RPM_PROJECT}/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies"
+HTTPD_PYPIES_INITD="%{_baseline_workspace}/installers/RPMs/httpd-pypies/configuration/etc/init.d/httpd-pypies"
 
 # Copy the startup scripts.
 cp ${POSTGRES_INITD} \
diff --git a/rpms/awips2.core/Installer.gfe/component.spec b/rpms/awips2.core/Installer.gfe/component.spec
index 287259c3bd..35addc8d1c 100644
--- a/rpms/awips2.core/Installer.gfe/component.spec
+++ b/rpms/awips2.core/Installer.gfe/component.spec
@@ -14,10 +14,10 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-data.gfe
+Provides: awips2-data.gfe
 
 %description
 AWIPS II gfe Distribution - Contains the AWIP II gfe netcdf files.
@@ -39,18 +39,10 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-# Determine which version of the gfe we should use.
-RPM_COMMON_DIR="%{_baseline_workspace}/rpms/common/static.versions"
-if [ ! -f ${RPM_COMMON_DIR}/LATEST.gfe ]; then
-   file ${RPM_COMMON_DIR}/LATEST.gfe
-   exit 1
-fi
-VERSION_DIR=`cat ${RPM_COMMON_DIR}/LATEST.gfe`
-
-GFE_SRC_DIR="${AWIPSCM_SHARE}/awips2-static/gfe/${VERSION_DIR}"
+GFE_SRC_DIR="%{_static_files}/gfe"
 gfe_tar="${GFE_SRC_DIR}/gfeData.tgz"
 if [ ! -f ${gfe_tar} ]; then
-   file ${gfe_tar}
+   echo "File ${gfe_tar} not found!"
    exit 1
 fi
 
diff --git a/rpms/awips2.core/Installer.gfesuite-client/component.spec b/rpms/awips2.core/Installer.gfesuite-client/component.spec
index bb85adc960..020803b09e 100644
--- a/rpms/awips2.core/Installer.gfesuite-client/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite-client/component.spec
@@ -12,12 +12,16 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-gfesuite-client
-requires: awips2-python
-requires: awips2-cave
+Provides: awips2-gfesuite-client
+Requires: awips2-python
+Requires: awips2-cave
+Requires: awips2-java
+
+BuildRequires: awips2-ant
+BuildRequires: awips2-java
 
 %description
 AWIPS II gfesuite-client Installation - Contains The AWIPS II gfesuite-client Component.
@@ -35,11 +39,6 @@ then
 fi
 
 %build
-# Verify that awips2-ant is installed.
-if [ ! -f /awips2/ant/bin/ant ]; then
-   echo "ERROR: Unable to find the awips2-ant executable."
-   exit 1
-fi
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite
diff --git a/rpms/awips2.core/Installer.gfesuite-server/component.spec b/rpms/awips2.core/Installer.gfesuite-server/component.spec
index 68c07535cc..6d7f08a76e 100644
--- a/rpms/awips2.core/Installer.gfesuite-server/component.spec
+++ b/rpms/awips2.core/Installer.gfesuite-server/component.spec
@@ -12,12 +12,16 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-gfesuite-server
-requires: awips2-python
-requires: awips2-edex-gfe
+Provides: awips2-gfesuite-server
+Requires: awips2-python
+Requires: awips2-edex-gfe
+Requires: awips2-java
+
+BuildRequires: awips2-ant
+BuildRequires: awips2-java
 
 %description
 AWIPS II gfesuite-client Installation - Contains The AWIPS II gfesuite-server Component.
@@ -35,11 +39,6 @@ then
 fi
 
 %build
-# Verify that awips2-ant is installed.
-if [ ! -f /awips2/ant/bin/ant ]; then
-   echo "ERROR: Unable to find the awips2-ant executable."
-   exit 1
-fi
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}/awips2/GFESuite
diff --git a/rpms/awips2.core/Installer.groovy/component.spec b/rpms/awips2.core/Installer.groovy/component.spec
index 2e43232098..6680633ca2 100644
--- a/rpms/awips2.core/Installer.groovy/component.spec
+++ b/rpms/awips2.core/Installer.groovy/component.spec
@@ -13,11 +13,11 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-groovy
-requires: awips2-java
+Provides: awips2-groovy
+Requires: awips2-java
 
 %description
 AWIPS II Groovy Distribution - Contains Groovy %{_groovy_version}.
diff --git a/rpms/awips2.core/Installer.httpd-pypies/SOURCES/httpd-pypies.init b/rpms/awips2.core/Installer.httpd-pypies/SOURCES/httpd-pypies.init
deleted file mode 100755
index 335b86f3ab..0000000000
--- a/rpms/awips2.core/Installer.httpd-pypies/SOURCES/httpd-pypies.init
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/bin/bash
-#
-# httpd        Startup script for the Apache HTTP Server used by Pypies
-#
-# chkconfig: - 85 15
-# description: Apache is a World Wide Web server.  It is used to serve \
-#	       HTML files and CGI.  Pypies uses it to serve connections.
-# processname: httpd
-# config: /etc/httpd/conf/httpd.conf
-# config: /etc/sysconfig/httpd
-# pidfile: /var/run/httpd.pid
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-if [ -f /etc/sysconfig/httpd ]; then
-        . /etc/sysconfig/httpd
-fi
-
-# Start httpd in the C locale by default.
-HTTPD_LANG=${HTTPD_LANG-"C"}
-
-# This will prevent initlog from swallowing up a pass-phrase prompt if
-# mod_ssl needs a pass-phrase from the user.
-INITLOG_ARGS=""
-
-# Set HTTPD=/usr/sbin/httpd.worker in /etc/sysconfig/httpd to use a server
-# with the thread-based "worker" MPM; BE WARNED that some modules may not
-# work correctly with a thread-based MPM; notably PHP will refuse to start.
-
-# Path to the apachectl script, server binary, and short-form for messages.
-apachectl=/awips2/httpd_pypies/usr/sbin/apachectl
-httpd=${HTTPD-/awips2/httpd_pypies/usr/sbin/httpd}
-prog=httpd
-pidfile=${PIDFILE-/awips2/httpd_pypies/var/run/httpd.pid}
-lockfile=${LOCKFILE-/awips2/httpd_pypies/var/lock/subsys/httpd}
-RETVAL=0
-
-# check for 1.3 configuration
-check13 () {
-	CONFFILE=/awips2/httpd_pypies/etc/httpd/conf/httpd.conf
-	GONE="(ServerType|BindAddress|Port|AddModule|ClearModuleList|"
-	GONE="${GONE}AgentLog|RefererLog|RefererIgnore|FancyIndexing|"
-	GONE="${GONE}AccessConfig|ResourceConfig)"
-	if LANG=C grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then
-		echo
-		echo 1>&2 " Apache 1.3 configuration directives found"
-		echo 1>&2 " please read @docdir@/migration.html"
-		failure "Apache 1.3 config directives test"
-		echo
-		exit 1
-	fi
-}
-
-# The semantics of these two functions differ from the way apachectl does
-# things -- attempting to start while running is a failure, and shutdown
-# when not running is also a failure.  So we just do it the way init scripts
-# are expected to behave here.
-start() {
-        echo -n $"Starting $prog: "
-        check13 || exit 1
-        LANG=$HTTPD_LANG daemon $httpd $OPTIONS
-        RETVAL=$?
-        echo
-        [ $RETVAL = 0 ] && touch ${lockfile}
-        return $RETVAL
-}
-
-# When stopping httpd a delay of >10 second is required before SIGKILLing the
-# httpd parent; this gives enough time for the httpd parent to SIGKILL any
-# errant children.
-stop() {
-	echo -n $"Stopping $prog: "
-	killproc -d 10 $httpd
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
-}
-reload() {
-    echo -n $"Reloading $prog: "
-    if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then
-        RETVAL=$?
-        echo $"not reloading due to configuration syntax error"
-        failure $"not reloading $httpd due to configuration syntax error"
-    else
-        killproc $httpd -HUP
-        RETVAL=$?
-    fi
-    echo
-}
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  status)
-        status $httpd
-	RETVAL=$?
-	;;
-  restart)
-	stop
-	start
-	;;
-  condrestart)
-	if [ -f ${pidfile} ] ; then
-		stop
-		start
-	fi
-	;;
-  reload)
-        reload
-	;;
-  graceful|help|configtest|fullstatus)
-	$apachectl $@
-	RETVAL=$?
-	;;
-  *)
-	echo $"Usage: $prog {start|stop|restart|condrestart|reload|status|fullstatus|graceful|help|configtest}"
-	exit 1
-esac
-
-exit $RETVAL
diff --git a/rpms/awips2.core/Installer.httpd-pypies/component.spec b/rpms/awips2.core/Installer.httpd-pypies/component.spec
deleted file mode 100644
index 70f670fe31..0000000000
--- a/rpms/awips2.core/Installer.httpd-pypies/component.spec
+++ /dev/null
@@ -1,1061 +0,0 @@
-%define contentdir /var/www
-%define suexec_caller apache
-%define mmn 20051115
-%define vstring Red Hat
-%define mpms worker event
-
-Summary: Pypies Apache HTTP Server
-Name: awips2-httpd-pypies
-Version: 2.2.15
-Release: 15.5.el6
-URL: http://httpd.apache.org/
-Source0: http://archive.apache.org/dist/httpd/httpd-%{version}.tar.gz
-Source1: index.html
-Source4: httpd-pypies.init
-Source5: httpd.sysconf
-Source10: httpd.conf
-Source11: ssl.conf
-Source12: welcome.conf
-Source13: manual.conf
-# Documentation
-Source33: README.confd
-# build/scripts patches
-Patch1: httpd-2.1.10-apctl.patch
-Patch2: httpd-2.1.10-apxs.patch
-Patch3: httpd-2.2.9-deplibs.patch
-Patch4: httpd-2.1.10-disablemods.patch
-Patch5: httpd-2.1.10-layout.patch
-# Features/functional changes
-Patch20: httpd-2.2.14-release.patch
-Patch21: httpd-2.2.11-xfsz.patch
-Patch22: httpd-2.1.10-pod.patch
-Patch23: httpd-2.0.45-export.patch
-Patch24: httpd-2.2.11-corelimit.patch
-Patch25: httpd-2.2.11-selinux.patch
-Patch26: httpd-2.2.15-sslfips.patch
-Patch27: httpd-2.2.15-modreqto2217.patch
-# Bug fixes
-Patch60: httpd-2.0.52-logresline.patch
-Patch61: httpd-2.2.3-defpidlog.patch
-Patch62: httpd-2.2.3-extfiltereos.patch
-Patch63: httpd-2.2.3-graceful-ebadf.patch
-Patch64: httpd-2.2.3-noxpad.patch
-Patch65: httpd-2.2.3-pngmagic.patch
-Patch67: httpd-2.2.14-ldapdyngrp.patch
-Patch68: httpd-2.2.15-proxyconn.patch
-Patch69: httpd-2.2.0-authnoprov.patch
-Patch70: httpd-2.2.15-ssloidval.patch
-Patch71: httpd-2.2.15-davputfail.patch
-Patch72: httpd-2.2.15-expectnoka.patch
-Patch73: httpd-2.2.15-pr49328.patch
-Patch74: httpd-2.2.15-aboverflow.patch
-Patch75: httpd-2.2.15-pr45444.patch
-Patch76: httpd-2.2.15-ssldupkeys.patch
-Patch77: httpd-2.2.15-ldapcache.patch
-Patch78: httpd-2.2.3-pr41743.patch
-Patch79: httpd-2.2.15-filterhdr.patch
-Patch80: httpd-2.2.15-oomabort.patch
-Patch81: httpd-2.2.15-sslpxycerts.patch
-Patch82: httpd-2.2.15-sslproxyio.patch
-Patch83: httpd-2.2.15-ajperror.patch
-Patch84: httpd-2.2.15-sslsninotreq.patch
-Patch85: httpd-2.2.15-sslbadcdev.patch
-Patch86: httpd-2.2.15-proxyepsv.patch
-Patch87: httpd-2.2.15-cachehardmax.patch
-# Security fixes
-Patch200: httpd-2.2.15-CVE-2010-1452.patch
-Patch201: httpd-2.2.15-CVE-2011-3192ver3.patch
-Patch202: httpd-2.2.15-CVE-2011-3368.patch
-Patch203: httpd-2.2.15-CVE-2011-3348.patch
-License: ASL 2.0
-Group: AWIPSII
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: autoconf, perl, pkgconfig, findutils
-BuildRequires: zlib-devel, libselinux-devel
-BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
-Requires: initscripts >= 8.36, /etc/mime.types, system-logos >= 7.92.1-1
-Requires: awips2-tools
-Obsoletes: httpd-suexec
-Requires(pre): /usr/sbin/useradd
-Requires(post): chkconfig
-Provides: webserver
-Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
-Provides: httpd-mmn = %{mmn}
-Obsoletes: apache, secureweb, mod_dav, mod_gzip, stronghold-apache
-Obsoletes: stronghold-htdocs, mod_put, mod_roaming
-Conflicts: pcre < 4.0
-Requires: apr-util-ldap
-requires: awips2-pypies
-
-%description
-The Apache HTTP Server is a powerful, efficient, and extensible
-web server.
-
-%package devel
-Group: AWIPSII
-Summary: Development interfaces for the Apache HTTP server
-Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
-Requires: apr-devel, apr-util-devel, pkgconfig
-Requires: httpd = %{version}-%{release}
-
-%description devel
-The httpd-devel package contains the APXS binary and other files
-that you need to build Dynamic Shared Objects (DSOs) for the
-Apache HTTP Server.
-
-If you are installing the Apache HTTP server and you want to be
-able to compile or develop additional modules for Apache, you need
-to install this package.
-
-%package manual
-Group: AWIPSII
-Summary: Documentation for the Apache HTTP server
-Requires: httpd = %{version}-%{release}
-Obsoletes: secureweb-manual, apache-manual
-BuildArch: noarch
-
-%description manual
-The httpd-manual package contains the complete manual and
-reference guide for the Apache HTTP server. The information can
-also be found at http://httpd.apache.org/docs/2.2/.
-
-%package -n mod_ssl
-Group: AWIPSII
-Summary: SSL/TLS module for the Apache HTTP Server
-Epoch: 1
-BuildRequires: openssl-devel
-Requires(post): openssl >= 0.9.7f-4, /bin/cat
-Requires(pre): httpd
-Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
-Obsoletes: stronghold-mod_ssl
-
-%description -n mod_ssl
-The mod_ssl module provides strong cryptography for the Apache Web
-server via the Secure Sockets Layer (SSL) and Transport Layer
-Security (TLS) protocols.
-
-%prep
-%setup -q -n httpd-2.2.15
-%patch1 -p1 -b .apctl
-%patch2 -p1 -b .apxs
-%patch3 -p1 -b .deplibs
-%patch4 -p1 -b .disablemods
-%patch5 -p1 -b .layout
-
-%patch21 -p1 -b .xfsz
-%patch22 -p1 -b .pod
-%patch23 -p1 -b .export
-%patch24 -p1 -b .corelimit
-%patch25 -p1 -b .selinux
-%patch26 -p1 -b .sslfips
-%patch27 -p1 -b .modreqto2217
-
-%patch60 -p1 -b .logresline
-%patch61 -p1 -b .defpidlog
-%patch62 -p1 -b .extfiltereos
-%patch63 -p1 -b .graceful-ebadf
-%patch64 -p1 -b .noxpad
-%patch65 -p1 -b .pngmagic
-%patch67 -p1 -b .ldapdyngrp
-%patch68 -p1 -b .proxyconn
-%patch69 -p1 -b .authnoprov
-%patch70 -p1 -b .ssloidval
-%patch71 -p1 -b .davputfail
-%patch72 -p1 -b .expectnoka
-%patch73 -p1 -b .pr49328
-%patch74 -p1 -b .aboverflow
-%patch75 -p1 -b .pr45444
-%patch76 -p1 -b .ssldupkeys
-%patch77 -p1 -b .ldapcache
-%patch78 -p1 -b .pr41743
-%patch79 -p1 -b .filterhdr
-%patch80 -p1 -b .oomabort
-%patch81 -p1 -b .sslpxycerts
-%patch82 -p1 -b .sslproxyio
-%patch83 -p1 -b .ajperror
-%patch84 -p1 -b .sslsninotreq
-%patch85 -p1 -b .sslbadcdev
-%patch86 -p1 -b .proxyepsv
-%patch87 -p1 -b .cachehardmax
-
-%patch200 -p1 -b .cve1452
-%patch201 -p1 -b .cve3192ver3
-%patch202 -p1 -b .cve3368
-%patch203 -p1 -b .cve3348
-
-# Patch in vendor/release string
-sed "s/@VENDOR@/%{vstring}/;s/@RELEASE@/%{release}/" < %{PATCH20} | patch -p1 -b -z .release
-
-# Safety check: prevent build if defined MMN does not equal upstream MMN.
-vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
-if test "x${vmmn}" != "x%{mmn}"; then
-   : Error: Upstream MMN is now ${vmmn}, packaged MMN is %{mmn}.
-   : Update the mmn macro and rebuild.
-   exit 1
-fi
-
-: Building with MMN %{mmn} and vendor string '%{vstring}'
-
-%build
-# forcibly prevent use of bundled apr, apr-util, pcre
-rm -rf srclib/{apr,apr-util,pcre}
-
-# regenerate configure scripts
-autoheader && autoconf || exit 1
-
-# Before configure; fix location of build dir in generated apxs
-%{__perl} -pi -e "s:\@exp_installbuilddir\@:%{_libdir}/httpd/build:g" \
-	support/apxs.in
-
-CFLAGS="$RPM_OPT_FLAGS -Wformat-security -fno-strict-aliasing"
-SH_LDFLAGS="-Wl,-z,relro"
-export CFLAGS SH_LDFLAGS
-
-# Forcibly disable use of rsync to install (#557049)
-export ac_cv_path_RSYNC=
-
-# Hard-code path to links to avoid unnecessary builddep
-export LYNX_PATH=/usr/bin/links
-
-function mpmbuild()
-{
-mpm=$1; shift
-mkdir $mpm; pushd $mpm
-../configure \
- 	--prefix=/awips2/httpd_pypies%{_sysconfdir}/httpd \
- 	--exec-prefix=/awips2/httpd_pypies%{_prefix} \
- 	--bindir=/awips2/httpd_pypies%{_bindir} \
- 	--sbindir=/awips2/httpd_pypies%{_sbindir} \
- 	--mandir=/awips2/httpd_pypies%{_mandir} \
-	--libdir=/awips2/httpd_pypies%{_libdir} \
-	--sysconfdir=/awips2/httpd_pypies%{_sysconfdir}/httpd/conf \
-	--includedir=/awips2/httpd_pypies%{_includedir}/httpd \
-	--libexecdir=/awips2/httpd_pypies%{_libdir}/httpd/modules \
-	--datadir=/awips2/httpd_pypies%{contentdir} \
-        --with-installbuilddir=/awips2/httpd_pypies%{_libdir}/httpd/build \
-	--with-mpm=$mpm \
-        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
-	--enable-suexec --with-suexec \
-	--with-suexec-caller=%{suexec_caller} \
-	--with-suexec-docroot=/awips2/httpd_pypies%{contentdir} \
-	--with-suexec-logfile=/awips2/httpd_pypies%{_localstatedir}/log/httpd/suexec.log \
-	--with-suexec-bin=/awips2/httpd_pypies%{_sbindir}/suexec \
-	--with-suexec-uidmin=500 --with-suexec-gidmin=100 \
-        --enable-pie \
-        --with-pcre \
-	$*
-
-make %{?_smp_mflags} EXTRA_CFLAGS="-Werror-implicit-function-declaration"
-popd
-}
-
-# Build everything and the kitchen sink with the prefork build
-mpmbuild prefork \
-        --enable-mods-shared=all \
-	--enable-ssl --with-ssl \
-	--enable-proxy \
-        --enable-cache \
-        --enable-disk-cache \
-        --enable-ldap --enable-authnz-ldap \
-        --enable-cgid \
-        --enable-authn-anon --enable-authn-alias \
-        --disable-imagemap
-
-# For the other MPMs, just build httpd and no optional modules
-for f in %{mpms}; do
-   mpmbuild $f --enable-modules=none
-done
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-# Classify ab and logresolve as section 1 commands, as they are in /usr/bin
-mv docs/man/ab.8 docs/man/ab.1
-mv docs/man/logresolve.8 docs/man/logresolve.1
-
-pushd prefork
-make DESTDIR=$RPM_BUILD_ROOT install
-popd
-
-# install alternative MPMs
-for f in %{mpms}; do
-  install -m 755 ${f}/httpd $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sbindir}/httpd.${f}
-done
-
-# install conf file/directory
-mkdir $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sysconfdir}/httpd/conf.d
-install -m 644 $RPM_SOURCE_DIR/README.confd \
-    $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sysconfdir}/httpd/conf.d/README
-for f in ssl.conf welcome.conf manual.conf; do
-  install -m 644 -p $RPM_SOURCE_DIR/$f \
-        $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sysconfdir}/httpd/conf.d/$f
-done
-
-rm $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sysconfdir}/httpd/conf/*.conf
-install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
-   $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sysconfdir}/httpd/conf/httpd.conf
-
-mkdir $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sysconfdir}/sysconfig
-install -m 644 -p $RPM_SOURCE_DIR/httpd.sysconf \
-   $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sysconfdir}/sysconfig/httpd
-
-# for holding mod_dav lock database
-mkdir -p $RPM_BUILD_ROOT/awips2/httpd_pypies%{_localstatedir}/lib/dav
-
-# create a prototype session cache
-mkdir -p $RPM_BUILD_ROOT/awips2/httpd_pypies%{_localstatedir}/cache/mod_ssl
-touch $RPM_BUILD_ROOT/awips2/httpd_pypies%{_localstatedir}/cache/mod_ssl/scache.{dir,pag,sem}
-
-# create cache root
-mkdir $RPM_BUILD_ROOT/awips2/httpd_pypies%{_localstatedir}/cache/mod_proxy
-
-# move utilities to /usr/bin
-mv $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sbindir}/{ab,htdbm,logresolve,htpasswd,htdigest} \
-   $RPM_BUILD_ROOT/awips2/httpd_pypies%{_bindir}
-
-# Make the MMN accessible to module packages
-echo %{mmn} > $RPM_BUILD_ROOT/awips2/httpd_pypies%{_includedir}/httpd/.mmn
-
-# docroot
-mkdir $RPM_BUILD_ROOT/awips2/httpd_pypies%{contentdir}/html
-install -m 644 -p $RPM_SOURCE_DIR/index.html \
-        $RPM_BUILD_ROOT/awips2/httpd_pypies%{contentdir}/error/noindex.html
-
-# remove manual sources
-find $RPM_BUILD_ROOT/awips2/httpd_pypies%{contentdir}/manual \( \
-    -name \*.xml -o -name \*.xml.* -o -name \*.ent -o -name \*.xsl -o -name \*.dtd \
-    \) -print0 | xargs -0 rm -f
-
-# Strip the manual down just to English and replace the typemaps with flat files:
-set +x
-for f in `find $RPM_BUILD_ROOT/awips2/httpd_pypies%{contentdir}/manual -name \*.html -type f`; do
-   if test -f ${f}.en; then
-      cp ${f}.en ${f}
-      rm ${f}.*
-   fi
-done
-set -x
-
-# Symlink for the powered-by-$DISTRO image:
-ln -s ../../..%{_datadir}/pixmaps/poweredby.png \
-        $RPM_BUILD_ROOT/awips2/httpd_pypies%{contentdir}/icons/poweredby.png
-
-# Set up /var directories
-rmdir $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sysconfdir}/httpd/logs
-mkdir -p $RPM_BUILD_ROOT/awips2/httpd_pypies%{_localstatedir}/log/httpd
-mkdir -p $RPM_BUILD_ROOT/awips2/httpd_pypies%{_localstatedir}/run/httpd
-mkdir -p $RPM_BUILD_ROOT/awips2/httpd_pypies%{_localstatedir}/lock/subsys
-
-pushd .
-cd $RPM_BUILD_ROOT/awips2/httpd_pypies/etc/httpd
-# symlinks for /etc/httpd
-ln -s ../..%{_localstatedir}/log/httpd $RPM_BUILD_ROOT/awips2/httpd_pypies/etc/httpd/logs
-ln -s ../..%{_localstatedir}/run/httpd $RPM_BUILD_ROOT/awips2/httpd_pypies/etc/httpd/run
-ln -s ../..%{_libdir}/httpd/modules $RPM_BUILD_ROOT/awips2/httpd_pypies/etc/httpd/modules
-popd
-
-# install service script
-mkdir -p ${RPM_BUILD_ROOT}/etc/init.d
-install -m755 %{_baseline_workspace}/rpms/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies \
-   ${RPM_BUILD_ROOT}/etc/init.d
-
-# install cron job
-mkdir -p ${RPM_BUILD_ROOT}/etc/cron.daily
-install -m755 %{_baseline_workspace}/rpms/awips2.core/Installer.httpd-pypies/configuration/etc/cron.daily/pypiesLogCleanup.sh \
-   ${RPM_BUILD_ROOT}/etc/cron.daily
-
-# fix man page paths
-sed -e "s|/usr/local/apache2/conf/httpd.conf|/etc/httpd/conf/httpd.conf|" \
-    -e "s|/usr/local/apache2/conf/mime.types|/etc/mime.types|" \
-    -e "s|/usr/local/apache2/conf/magic|/etc/httpd/conf/magic|" \
-    -e "s|/usr/local/apache2/logs/error_log|/var/log/httpd/error_log|" \
-    -e "s|/usr/local/apache2/logs/access_log|/var/log/httpd/access_log|" \
-    -e "s|/usr/local/apache2/logs/httpd.pid|/var/run/httpd/httpd.pid|" \
-    -e "s|/usr/local/apache2|/etc/httpd|" < docs/man/httpd.8 \
-  > $RPM_BUILD_ROOT/awips2/httpd_pypies%{_mandir}/man8/httpd.8
-
-# Make ap_config_layout.h libdir-agnostic
-sed -i '/.*DEFAULT_..._LIBEXECDIR/d;/DEFAULT_..._INSTALLBUILDDIR/d' \
-    $RPM_BUILD_ROOT/awips2/httpd_pypies%{_includedir}/httpd/ap_config_layout.h
-
-# Fix path to instdso in special.mk
-sed -i '/instdso/s,top_srcdir,top_builddir,' \
-    $RPM_BUILD_ROOT/awips2/httpd_pypies%{_libdir}/httpd/build/special.mk
-
-# Remove unpackaged files
-rm -f $RPM_BUILD_ROOT/awips2/httpd_pypies%{_libdir}/*.exp \
-      $RPM_BUILD_ROOT/awips2/httpd_pypies/etc/httpd/conf/mime.types \
-      $RPM_BUILD_ROOT/awips2/httpd_pypies%{_libdir}/httpd/modules/*.exp \
-      $RPM_BUILD_ROOT/awips2/httpd_pypies%{_libdir}/httpd/build/config.nice \
-      $RPM_BUILD_ROOT/awips2/httpd_pypies%{_bindir}/ap?-config \
-      $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sbindir}/{checkgid,dbmmanage,envvars*} \
-      $RPM_BUILD_ROOT/awips2/httpd_pypies%{contentdir}/htdocs/* \
-      $RPM_BUILD_ROOT/awips2/httpd_pypies%{_mandir}/man1/dbmmanage.* \
-      $RPM_BUILD_ROOT/awips2/httpd_pypies%{contentdir}/cgi-bin/*
-
-rm -rf $RPM_BUILD_ROOT/awips2/httpd_pypies/etc/httpd/conf/{original,extra}
-
-# Make suexec a+rw so it can be stripped.  %%files lists real permissions
-chmod 755 $RPM_BUILD_ROOT/awips2/httpd_pypies%{_sbindir}/suexec
-
-# build mod_wsgi.so
-_MOD_WSGI_VERSION=3.5
-/bin/cp %{_baseline_workspace}/foss/mod_wsgi-${_MOD_WSGI_VERSION}/packaged/mod_wsgi-${_MOD_WSGI_VERSION}.tar.gz \
-   %{_topdir}/BUILD
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-pushd . > /dev/null
-cd %{_topdir}/BUILD
-if [ -d mod_wsgi-${_MOD_WSGI_VERSION} ]; then
-   /bin/rm -rf mod_wsgi-${_MOD_WSGI_VERSION}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-fi
-/bin/tar -xvf mod_wsgi-${_MOD_WSGI_VERSION}.tar.gz
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-cd mod_wsgi-${_MOD_WSGI_VERSION}
-export CPPFLAGS="-I/awips2/python/include/python2.7"
-export LDFLAGS="-L/awips2/python/lib"
-./configure --with-python=/awips2/python/bin/python
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-make
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-# Install the module required by pypies.
-install -m755 .libs/mod_wsgi.so \
-    ${RPM_BUILD_ROOT}/awips2/httpd_pypies/etc/httpd/modules
-
-cd ../
-/bin/rm -f mod_wsgi-${_MOD_WSGI_VERSION}.tar.gz
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-/bin/rm -rf mod_wsgi-${_MOD_WSGI_VERSION}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-unset CPPFLAGS
-unset LDFLAGS
-popd > /dev/null
-
-# Install the pypies configuration.
-install -m644 %{_baseline_workspace}/rpms/awips2.core/Installer.httpd-pypies/configuration/apache/pypies.conf \
-    ${RPM_BUILD_ROOT}/awips2/httpd_pypies/etc/httpd/conf.d
-mkdir -p ${RPM_BUILD_ROOT}/awips2/httpd_pypies/var/www/wsgi
-install -m644 %{_baseline_workspace}/rpms/awips2.core/Installer.httpd-pypies/configuration/apache/pypies.wsgi \
-    ${RPM_BUILD_ROOT}/awips2/httpd_pypies/var/www/wsgi
-
-# Install & Override the httpd configuration.
-install -m644 %{_baseline_workspace}/rpms/awips2.core/Installer.httpd-pypies/configuration/conf/httpd.conf \
-    ${RPM_BUILD_ROOT}/awips2/httpd_pypies/etc/httpd/conf
-
-%pre
-# Add the "apache" user
-getent group apache >/dev/null || groupadd -g 48 -r apache
-getent passwd apache >/dev/null || \
-  useradd -r -u 48 -g apache -s /sbin/nologin \
-    -d %{contentdir} -c "Apache" apache
-exit 0
-
-%post
-# Register the httpd service
-/sbin/chkconfig --add httpd-pypies
-
-%preun
-# this is not compatible with our environment. attempting to shutdown
-# httpd-pypies causes 'yum groupremove' to abort and leaves us with
-# an incomplete version of httpd-pypies that cannot be un-installed.
-#if [ $1 = 0 ]; then
-#	/sbin/service httpd stop > /dev/null 2>&1
-#	/sbin/chkconfig --del httpd
-#fi
-
-%posttrans
-/sbin/service httpd condrestart >/dev/null 2>&1 || :
-
-%define sslcert /awips2/httpd_pypies%{_sysconfdir}/pki/tls/certs/localhost.crt
-%define sslkey /awips2/httpd_pypies%{_sysconfdir}/pki/tls/private/localhost.key
-
-%post -n mod_ssl
-umask 077
-
-if [ ! -f %{sslkey} ] ; then
-/awips2/httpd_pypies%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{sslkey} 2> /dev/null
-fi
-
-FQDN=`hostname`
-if [ "x${FQDN}" = "x" ]; then
-   FQDN=localhost.localdomain
-fi
-
-if [ ! -f %{sslcert} ] ; then
-cat << EOF | /awips2/httpd_pypies%{_bindir}/openssl req -new -key %{sslkey} \
-         -x509 -days 365 -set_serial $RANDOM \
-         -out %{sslcert} 2>/dev/null
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-${FQDN}
-root@${FQDN}
-EOF
-fi
-
-%check
-# Check the built modules are all PIC
-if readelf -d $RPM_BUILD_ROOT/awips2/httpd_pypies%{_libdir}/httpd/modules/*.so | grep TEXTREL; then
-   : modules contain non-relocatable code
-   exit 1
-fi
-
-# Verify that the same modules were built into the httpd binaries
-./prefork/httpd -l | grep -v prefork > prefork.mods
-for mpm in %{mpms}; do
-  ./${mpm}/httpd -l | grep -v ${mpm} > ${mpm}.mods
-  if ! diff -u prefork.mods ${mpm}.mods; then
-    : Different modules built into httpd binaries, will not proceed
-    exit 1
-  fi
-done
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,awips,fxalpha)
-
-%doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
-
-%dir /awips2/httpd_pypies
-%dir /awips2/httpd_pypies/etc
-%dir /awips2/httpd_pypies/etc/sysconfig
-%dir /awips2/httpd_pypies/usr
-%dir /awips2/httpd_pypies/usr/bin
-%dir /awips2/httpd_pypies/%{_libdir}
-%dir /awips2/httpd_pypies/usr/sbin
-/awips2/httpd_pypies/usr/share
-%dir /awips2/httpd_pypies/var
-%dir /awips2/httpd_pypies/var/cache
-%dir /awips2/httpd_pypies/var/lib
-%dir /awips2/httpd_pypies/var/log
-%dir /awips2/httpd_pypies%{_sysconfdir}/httpd
-%dir /awips2/httpd_pypies/var/run
-%dir /awips2/httpd_pypies/var/www/wsgi
-%config(noreplace) /awips2/httpd_pypies/var/www/wsgi/pypies.wsgi
-/awips2/httpd_pypies%{_sysconfdir}/httpd/modules
-/awips2/httpd_pypies%{_sysconfdir}/httpd/logs
-/awips2/httpd_pypies%{_sysconfdir}/httpd/run
-%dir /awips2/httpd_pypies%{_sysconfdir}/httpd/conf
-%config(noreplace) /awips2/httpd_pypies%{_sysconfdir}/httpd/conf/httpd.conf
-%config(noreplace) /awips2/httpd_pypies%{_sysconfdir}/httpd/conf.d/pypies.conf
-%config(noreplace) /awips2/httpd_pypies%{_sysconfdir}/httpd/conf.d/welcome.conf
-%config(noreplace) /awips2/httpd_pypies%{_sysconfdir}/httpd/conf/magic
-
-%{_sysconfdir}/cron.daily/pypiesLogCleanup.sh
-%config(noreplace) %{_sysconfdir}/init.d/httpd-pypies
-
-%dir /awips2/httpd_pypies%{_sysconfdir}/httpd/conf.d
-/awips2/httpd_pypies%{_sysconfdir}/httpd/conf.d/README
-
-%config(noreplace) /awips2/httpd_pypies%{_sysconfdir}/sysconfig/httpd
-
-/awips2/httpd_pypies%{_bindir}/*
-/awips2/httpd_pypies%{_sbindir}/ht*
-/awips2/httpd_pypies%{_sbindir}/apachectl
-/awips2/httpd_pypies%{_sbindir}/rotatelogs
-%attr(4510,awips,fxalpha) /awips2/httpd_pypies%{_sbindir}/suexec
-
-%dir /awips2/httpd_pypies%{_libdir}/httpd
-%dir /awips2/httpd_pypies%{_libdir}/httpd/modules
-/awips2/httpd_pypies%{_libdir}/httpd/modules/mod*.so
-%exclude /awips2/httpd_pypies%{_libdir}/httpd/modules/mod_ssl.so
-
-%dir /awips2/httpd_pypies%{contentdir}
-%dir /awips2/httpd_pypies%{contentdir}/cgi-bin
-%dir /awips2/httpd_pypies%{contentdir}/html
-%dir /awips2/httpd_pypies%{contentdir}/icons
-%dir /awips2/httpd_pypies%{contentdir}/error
-%dir /awips2/httpd_pypies%{contentdir}/error/include
-/awips2/httpd_pypies%{contentdir}/icons/*
-/awips2/httpd_pypies%{contentdir}/error/README
-/awips2/httpd_pypies%{contentdir}/error/noindex.html
-%config /awips2/httpd_pypies%{contentdir}/error/*.var
-%config /awips2/httpd_pypies%{contentdir}/error/include/*.html
-
-%attr(0700,awips,fxalpha) %dir /awips2/httpd_pypies%{_localstatedir}/lock/subsys
-%attr(0700,awips,fxalpha) %dir /awips2/httpd_pypies%{_localstatedir}/log/httpd
-%attr(0700,awips,fxalpha) %dir /awips2/httpd_pypies%{_localstatedir}/run/httpd
-%attr(0700,awips,fxalpha) %dir /awips2/httpd_pypies%{_localstatedir}/lib/dav
-%attr(0700,awips,fxalpha) %dir /awips2/httpd_pypies%{_localstatedir}/cache/mod_proxy
-
-/awips2/httpd_pypies/%{_mandir}/man1/*
-/awips2/httpd_pypies/%{_mandir}/man8/*
-
-%files manual
-%defattr(-,root,root)
-/awips2/httpd_pypies/%{contentdir}/manual
-%config /awips2/httpd_pypies/%{_sysconfdir}/httpd/conf.d/manual.conf
-
-%files -n mod_ssl
-%defattr(-,root,root)
-/awips2/httpd_pypies/%{_libdir}/httpd/modules/mod_ssl.so
-%config(noreplace) /awips2/httpd_pypies/%{_sysconfdir}/httpd/conf.d/ssl.conf
-%attr(0700,apache,root) %dir /awips2/httpd_pypies/%{_localstatedir}/cache/mod_ssl
-%attr(0600,apache,root) %ghost /awips2/httpd_pypies/%{_localstatedir}/cache/mod_ssl/scache.dir
-%attr(0600,apache,root) %ghost /awips2/httpd_pypies/%{_localstatedir}/cache/mod_ssl/scache.pag
-%attr(0600,apache,root) %ghost /awips2/httpd_pypies/%{_localstatedir}/cache/mod_ssl/scache.sem
-
-%files devel
-%defattr(-,root,root)
-/awips2/httpd_pypies/%{_includedir}/httpd
-/awips2/httpd_pypies/%{_sbindir}/apxs
-/awips2/httpd_pypies/%{_mandir}/man8/apxs.8*
-%dir /awips2/httpd_pypies%{_libdir}/httpd/build
-/awips2/httpd_pypies%{_libdir}/httpd/build/*.mk
-/awips2/httpd_pypies%{_libdir}/httpd/build/*.sh
-
-%changelog
-* Thu Oct  6 2011 Joe Orton <jorton@redhat.com> - 2.2.15-15
-- mod_proxy_ftp: fix handling of EPSV w/IPv6 localhost (#737960)
-- core: add security fix for CVE-2011-3368 (#743659)
-- mod_proxy_ajp: add security fix for CVE-2011-3348 (#738961)
-- mod_cache: forward-port CacheMaxExpire "hard" option (#740242)
-
-* Wed Sep 28 2011 Joe Orton <jorton@redhat.com> - 2.2.15-14
-- update to byterange patch (#736592)
-
-* Thu Sep  8 2011 Joe Orton <jorton@redhat.com> - 2.2.15-13
-- add security fix for CVE-2011-3192 (#733063, #736592)
-
-* Mon Aug  8 2011 Joe Orton <jorton@redhat.com> - 2.2.15-12
-- mod_ssl: ignore SNI hints unless required by config (#714704)
-- mod_ssl: fix segfault with bad SSLCryptoDevice argument (#729585)
-
-* Tue Jul 26 2011 Joe Orton <jorton@redhat.com> - 2.2.15-11
-- rebase mod_reqtimeout to 2.2.17 (#676634)
-- mod_proxy_ajp: honour ProxyErrorOverride (#694939)
-- mod_ssl: add fix for handling incomplete lines w/revproxy (#700074)
-- mod_filter: fix matching against non-std response headers (#700075)
-- core: abort() on malloc() failure (#700393)
-- mod_ssl: fix startup crash w/client cert shared across vhosts (#720980)
-
-* Tue Jun  7 2011 Joe Orton <jorton@redhat.com> - 2.2.15-10
-- mod_filter: fix test against non-standard response headers (#700075)
-
-* Fri Apr  8 2011 Joe Orton <jorton@redhat.com> - 2.2.15-9
-- mod_ssl: complete fix for overlapping memcpy (#652335)
-
-* Mon Mar 21 2011 Joe Orton <jorton@redhat.com> - 2.2.15-8
-- mod_ssl: fix compat with FIPS-enabled OpenSSL (#684144)
-
-* Thu Feb 24 2011 Joe Orton <jorton@redhat.com> - 2.2.15-7
-- mod_ldap: fix caching with per-vhost directive use (#676635)
-- mod_ssl: fix startup with duplicate SSL vhost configurations (#676831)
-- prefork: ensure early child exit during graceful restart (#679476)
-
-* Mon Jan 31 2011 Joe Orton <jorton@redhat.com> - 2.2.15-6
-- ab: fail gracefully for OOM allocating stats structures (#645846)
-- init script: use $STOP_DELAY as delay before SIGKILL of parent (#657480)
-- stop multiple invocations of filter init functions (#631849)
-- mod_ssl: avoid overlapping memcpy (#652335)
-- mark httpd.conf as noreplace
-
-* Fri Aug 13 2010 Joe Orton <jorton@redhat.com> - 2.2.15-5
-- add security fix for CVE-2010-1452 (#618193)
-
-* Wed Jun 23 2010 Joe Orton <jorton@redhat.com> - 2.2.15-4
-- use init script to rotate logs (#606955)
-- disable keepalive for 100-continue and error response (#606964)
-
-* Tue May 25 2010 Joe Orton <jorton@redhat.com> - 2.2.15-3
-- add "Satisfy All" for .htaccess in httpd.conf (#594981)
-- adjust user/group creation in %%pre (#594395)
-- mod_ssl: tweak OID() evaluation of unknown exts (#594980)
-
-* Thu May  6 2010 Joe Orton <jorton@redhat.com> - 2.2.15-2
-- init script fixes for LSB compliance (#546252)
- * exit code 2 for an unknown script argument
- * exit code 6 for a reload if config-test fails
- * exit code 7 for a reload on a stopped service
- * fixed help output to cover all options
-- mod_dav: handle PUT failure more cleanly (#572911)
-
-* Thu Mar 11 2010 Joe Orton <jorton@redhat.com> - 2.2.15-1
-- update to 2.2.15 (#570465, #570442)
-- fix version string (#572140)
-- mod_ssl: use ASN1_STRING_print() in SSLRequire's OID() (#552942)
-- prevent use of rsync during "make install" (#557049)
-- load mod_version by default in httpd.conf
-
-* Tue Feb  9 2010 Joe Orton <jorton@redhat.com> - 2.2.14-5
-- mod_ssl: fix CVE-2009-3555 backport (#563119)
-- mod_authnz_ldap: fix for dynamic group support
-- mod_ssl: add SSLInsecureRenegotiation directive (#561435)
-
-* Thu Jan 14 2010 Joe Orton <jorton@redhat.com> - 2.2.14-4
-- mod_ssl: add further mitigation for CVE-2009-3555
-- drop proxy_ajp.conf
-- update httpd.conf: decrease Timeout to 1m, update LoadModule
-  directives, bump worker to 4 proc/300clients
-- fix hard-coded default pidfile to match default config (#547629)
-- drop legacy X-Pad header from short responses (#526110)
-- disable keepalive for Expect: 100-continue and error response (#533407)
-- mod_ext_filter: fix spurious error log output (#479463)
-- mod_rewrite: don't serialize logfile access (#493023)
-- fix spurious error messages on graceful restart (#233955)
-- mod_ssl: fix potential hang in renegotiation (#510515)
-- mod_proxy_connect: support use SSL client connection (#523594)
-
-* Wed Dec  9 2009 Joe Orton <jorton@redhat.com> - 2.2.14-3
-- add 'ServerTokens Full-Release' config option (#477006)
-
-* Tue Dec  8 2009 Joe Orton <jorton@redhat.com> - 2.2.14-2
-- drop distcache support
-
-* Thu Dec  3 2009 Joe Orton <jorton@redhat.com> - 2.2.14-1
-- update to 2.2.14
-- relax permissions on /var/run/httpd (#495780)
-- Requires(pre): httpd in mod_ssl subpackage (#543275)
-- add partial security fix for CVE-2009-3555 (#533125)
-
-* Tue Sep  8 2009 Joe Orton <jorton@redhat.com> 2.2.13-2
-- restart service in posttrans (#491567)
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 2.2.13-2
-- rebuilt with new openssl
-
-* Tue Aug 18 2009 Joe Orton <jorton@redhat.com> 2.2.13-1
-- update to 2.2.13
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.11-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Tue Jun 16 2009 Joe Orton <jorton@redhat.com> 2.2.11-9
-- build -manual as noarch
-
-* Tue Mar 17 2009 Joe Orton <jorton@redhat.com> 2.2.11-8
-- fix pidfile in httpd.logrotate (thanks to Rainer Traut)
-- don't build mod_mem_cache or mod_file_cache
-
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.11-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jan 22 2009 Joe Orton <jorton@redhat.com> 2.2.11-6
-- Require: apr-util-ldap (#471898)
-- init script changes: pass pidfile to status(), use status() in
-  condrestart (#480602), support try-restart as alias for
-  condrestart
-- change /etc/httpd/run symlink to have destination /var/run/httpd,
-  and restore "run/httpd.conf" as default PidFile (#478688)
-
-* Fri Jan 16 2009 Tomas Mraz <tmraz@redhat.com> 2.2.11-5
-- rebuild with new openssl
-
-* Sat Dec 27 2008 Robert Scheck <robert@fedoraproject.org> 2.2.11-4
-- Made default configuration using /var/run/httpd for pid file
-
-* Thu Dec 18 2008 Joe Orton <jorton@redhat.com> 2.2.11-3
-- update to 2.2.11
-- package new /var/run/httpd directory, and move default pidfile
-  location inside there
-
-* Tue Oct 21 2008 Joe Orton <jorton@redhat.com> 2.2.10-2
-- update to 2.2.10
-
-* Tue Jul 15 2008 Joe Orton <jorton@redhat.com> 2.2.9-5
-- move AddTypes for SSL cert/CRL types from ssl.conf to httpd.conf (#449979)
-
-* Mon Jul 14 2008 Joe Orton <jorton@redhat.com> 2.2.9-4
-- use Charset=UTF-8 in default httpd.conf (#455123)
-- only enable suexec when appropriate (Jim Radford, #453697)
-
-* Thu Jul 10 2008 Tom "spot" Callaway <tcallawa@redhat.com>  2.2.9-3
-- rebuild against new db4 4.7
-
-* Tue Jul  8 2008 Joe Orton <jorton@redhat.com> 2.2.9-2
-- update to 2.2.9
-- build event MPM too
-
-* Wed Jun  4 2008 Joe Orton <jorton@redhat.com> 2.2.8-4
-- correct UserDir directive in default config (#449815)
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.2.8-3
-- Autorebuild for GCC 4.3
-
-* Tue Jan 22 2008 Joe Orton <jorton@redhat.com> 2.2.8-2
-- update to 2.2.8
-- drop mod_imagemap
-
-* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 2.2.6-4
- - Rebuild for openssl bump
-
-* Mon Sep 17 2007 Joe Orton <jorton@redhat.com> 2.2.6-3
-- add fix for SSL library string regression (PR 43334)
-- use powered-by logo from system-logos (#250676)
-- preserve timestamps for installed config files
-
-* Fri Sep  7 2007 Joe Orton <jorton@redhat.com> 2.2.6-2
-- update to 2.2.6 (#250757, #282761)
-
-* Sun Sep  2 2007 Joe Orton <jorton@redhat.com> 2.2.4-10
-- rebuild for fixed APR
-
-* Wed Aug 22 2007 Joe Orton <jorton@redhat.com> 2.2.4-9
-- rebuild for expat soname bump
-
-* Tue Aug 21 2007 Joe Orton <jorton@redhat.com> 2.2.4-8
-- fix License
-- require /etc/mime.types (#249223)
-
-* Thu Jul 26 2007 Joe Orton <jorton@redhat.com> 2.2.4-7
-- drop -tools dependency on httpd (thanks to Matthias Saou)
-
-* Wed Jul 25 2007 Joe Orton <jorton@redhat.com> 2.2.4-6
-- split out utilities into -tools subpackage, based on patch
-  by Jason Tibbs (#238257)
-
-* Tue Jul 24 2007 Joe Orton <jorton@redhat.com> 2.2.4-5
-- spec file cleanups: provide httpd-suexec, mod_dav; 
- don't obsolete mod_jk; drop trailing dots from Summaries
-- init script
- * add LSB info header, support force-reload (#246944)
- * update description
- * drop 1.3 config check
- * pass $pidfile to daemon and pidfile everywhere
-
-* Wed May  9 2007 Joe Orton <jorton@redhat.com> 2.2.4-4
-- update welcome page branding
-
-* Tue Apr  3 2007 Joe Orton <jorton@redhat.com> 2.2.4-3
-- drop old triggers, old Requires, xmlto BR
-- use Requires(...) correctly 
-- use standard BuildRoot 
-- don't mark init script as config file
-- trim CHANGES further
-
-* Mon Mar 12 2007 Joe Orton <jorton@redhat.com> 2.2.4-2
-- update to 2.2.4
-- drop the migration guide (#223605)
-
-* Thu Dec  7 2006 Joe Orton <jorton@redhat.com> 2.2.3-8
-- fix path to instdso.sh in special.mk (#217677)
-- fix detection of links in "apachectl fullstatus"
-
-* Tue Dec  5 2006 Joe Orton <jorton@redhat.com> 2.2.3-7
-- rebuild for libpq soname bump
-
-* Sat Nov 11 2006 Joe Orton <jorton@redhat.com> 2.2.3-6
-- rebuild for BDB soname bump
-
-* Mon Sep 11 2006 Joe Orton <jorton@redhat.com> 2.2.3-5
-- updated "powered by Fedora" logo (#205573, Diana Fong)
-- tweak welcome page wording slightly (#205880)
-
-* Fri Aug 18 2006 Jesse Keating <jkeating@redhat.com> - 2.2.3-4
-- rebuilt with latest binutils to pick up 64K -z commonpagesize on ppc*
-  (#203001)
-
-* Thu Aug  3 2006 Joe Orton <jorton@redhat.com> 2.2.3-3
-- init: use killproc() delay to avoid race killing parent
-
-* Fri Jul 28 2006 Joe Orton <jorton@redhat.com> 2.2.3-2
-- update to 2.2.3
-- trim %%changelog to >=2.0.52
-
-* Thu Jul 20 2006 Joe Orton <jorton@redhat.com> 2.2.2-8
-- fix segfault on dummy connection failure at graceful restart (#199429)
-
-* Wed Jul 19 2006 Joe Orton <jorton@redhat.com> 2.2.2-7
-- fix "apxs -g"-generated Makefile
-- fix buildconf with autoconf 2.60
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.2.2-5.1
-- rebuild
-
-* Wed Jun  7 2006 Joe Orton <jorton@redhat.com> 2.2.2-5
-- require pkgconfig for -devel (#194152)
-- fixes for installed support makefiles (special.mk et al)
-- BR autoconf
-
-* Fri Jun  2 2006 Joe Orton <jorton@redhat.com> 2.2.2-4
-- make -devel package multilib-safe (#192686)
-
-* Thu May 11 2006 Joe Orton <jorton@redhat.com> 2.2.2-3
-- build DSOs using -z relro linker flag
-
-* Wed May  3 2006 Joe Orton <jorton@redhat.com> 2.2.2-2
-- update to 2.2.2
-
-* Thu Apr  6 2006 Joe Orton <jorton@redhat.com> 2.2.0-6
-- rebuild to pick up apr-util LDAP interface fix (#188073)
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - (none):2.2.0-5.1.2
-- bump again for double-long bug on ppc(64)
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - (none):2.2.0-5.1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Mon Feb  6 2006 Joe Orton <jorton@redhat.com> 2.2.0-5.1
-- mod_auth_basic/mod_authn_file: if no provider is configured,
-  and AuthUserFile is not configured, decline to handle authn
-  silently rather than failing noisily.
-
-* Fri Feb  3 2006 Joe Orton <jorton@redhat.com> 2.2.0-5
-- mod_ssl: add security fix for CVE-2005-3357 (#177914)
-- mod_imagemap: add security fix for CVE-2005-3352 (#177913)
-- add fix for AP_INIT_* designated initializers with C++ compilers
-- httpd.conf: enable HTMLTable in default IndexOptions
-- httpd.conf: add more "redirect-carefully" matches for DAV clients
-
-* Thu Jan  5 2006 Joe Orton <jorton@redhat.com> 2.2.0-4
-- mod_proxy_ajp: fix Cookie handling (Mladen Turk, r358769)
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Wed Dec  7 2005 Joe Orton <jorton@redhat.com> 2.2.0-3
-- strip manual to just English content
-
-* Mon Dec  5 2005 Joe Orton <jorton@redhat.com> 2.2.0-2
-- don't strip C-L from HEAD responses (Greg Ames, #110552)
-- load mod_proxy_balancer by default
-- add proxy_ajp.conf to load/configure mod_proxy_ajp
-- Obsolete mod_jk
-- update docs URLs in httpd.conf/ssl.conf
-
-* Fri Dec  2 2005 Joe Orton <jorton@redhat.com> 2.2.0-1
-- update to 2.2.0
-
-* Wed Nov 30 2005 Joe Orton <jorton@redhat.com> 2.1.10-2
-- enable mod_authn_alias, mod_authn_anon
-- update default httpd.conf
-
-* Fri Nov 25 2005 Joe Orton <jorton@redhat.com> 2.1.10-1
-- update to 2.1.10
-- require apr >= 1.2.0, apr-util >= 1.2.0
-
-* Wed Nov  9 2005 Tomas Mraz <tmraz@redhat.com> 2.0.54-16
-- rebuilt against new openssl
-
-* Thu Nov  3 2005 Joe Orton <jorton@redhat.com> 2.0.54-15
-- log notice giving SELinux context at startup if enabled
-- drop SSLv2 and restrict default cipher suite in default
- SSL configuration
-
-* Thu Oct 20 2005 Joe Orton <jorton@redhat.com> 2.0.54-14
-- mod_ssl: add security fix for SSLVerifyClient (CVE-2005-2700)
-- add security fix for byterange filter DoS (CVE-2005-2728)
-- add security fix for C-L vs T-E handling (CVE-2005-2088)
-- mod_ssl: add security fix for CRL overflow (CVE-2005-1268)
-- mod_ldap/mod_auth_ldap: add fixes from 2.0.x branch (upstream #34209 etc)
-- add fix for dummy connection handling (#167425)
-- mod_auth_digest: fix hostinfo comparison in CONNECT requests
-- mod_include: fix variable corruption in nested includes (upstream #12655)
-- mod_ssl: add fix for handling non-blocking reads
-- mod_ssl: fix to enable output buffering (upstream #35279)
-- mod_ssl: buffer request bodies for per-location renegotiation (upstream #12355)
-
-* Sat Aug 13 2005 Joe Orton <jorton@redhat.com> 2.0.54-13
-- don't load by default: mod_cern_meta, mod_asis
-- do load by default: mod_ext_filter (#165893)
-
-* Thu Jul 28 2005 Joe Orton <jorton@redhat.com> 2.0.54-12
-- drop broken epoch deps
-
-* Thu Jun 30 2005 Joe Orton <jorton@redhat.com> 2.0.54-11
-- mod_dav_fs: fix uninitialized variable (#162144)
-- add epoch to dependencies as appropriate
-- mod_ssl: drop dependencies on dev, make
-- mod_ssl: mark post script dependencies as such
-
-* Mon May 23 2005 Joe Orton <jorton@redhat.com> 2.0.54-10
-- remove broken symlink (Robert Scheck, #158404)
-
-* Wed May 18 2005 Joe Orton <jorton@redhat.com> 2.0.54-9
-- add piped logger fixes (w/Jeff Trawick)
-
-* Mon May  9 2005 Joe Orton <jorton@redhat.com> 2.0.54-8
-- drop old "powered by Red Hat" logos
-
-* Wed May  4 2005 Joe Orton <jorton@redhat.com> 2.0.54-7
-- mod_userdir: fix memory allocation issue (upstream #34588)
-- mod_ldap: fix memory corruption issue (Brad Nicholes, upstream #34618)
-
-* Tue Apr 26 2005 Joe Orton <jorton@redhat.com> 2.0.54-6
-- fix key/cert locations in post script
-
-* Mon Apr 25 2005 Joe Orton <jorton@redhat.com> 2.0.54-5
-- create default dummy cert in /etc/pki/tls
-- use a pseudo-random serial number on the dummy cert
-- change default ssl.conf to point at /etc/pki/tls
-- merge back -suexec subpackage; SELinux policy can now be
-  used to persistently disable suexec (#155716)
-- drop /etc/httpd/conf/ssl.* directories and Makefiles
-- unconditionally enable PIE support
-- mod_ssl: fix for picking up -shutdown options (upstream #34452)
-
-* Mon Apr 18 2005 Joe Orton <jorton@redhat.com> 2.0.54-4
-- replace PreReq with Requires(pre) 
-
-* Mon Apr 18 2005 Joe Orton <jorton@redhat.com> 2.0.54-3
-- update to 2.0.54
-
-* Tue Mar 29 2005 Joe Orton <jorton@redhat.com> 2.0.53-6
-- update default httpd.conf:
- * clarify the comments on AddDefaultCharset usage (#135821)
- * remove all the AddCharset default extensions
- * don't load mod_imap by default
- * synch with upstream 2.0.53 httpd-std.conf
-- mod_ssl: set user from SSLUserName in access hook (upstream #31418)
-- htdigest: fix permissions of created files (upstream #33765)
-- remove htsslpass
-
-* Wed Mar  2 2005 Joe Orton <jorton@redhat.com> 2.0.53-5
-- apachectl: restore use of $OPTIONS again
-
-* Wed Feb  9 2005 Joe Orton <jorton@redhat.com> 2.0.53-4
-- update to 2.0.53
-- move prefork/worker modules comparison to %%check
-
-* Mon Feb  7 2005 Joe Orton <jorton@redhat.com> 2.0.52-7
-- fix cosmetic issues in "service httpd reload"
-- move User/Group higher in httpd.conf (#146793)
-- load mod_logio by default in httpd.conf
-- apachectl: update for correct libselinux tools locations
-
-* Tue Nov 16 2004 Joe Orton <jorton@redhat.com> 2.0.52-6
-- add security fix for CVE CAN-2004-0942 (memory consumption DoS)
-- SELinux: run httpd -t under runcon in configtest (Steven Smalley)
-- fix SSLSessionCache comment for distcache in ssl.conf
-- restart using SIGHUP not SIGUSR1 after logrotate
-- add ap_save_brigade fix (upstream #31247)
-- mod_ssl: fix possible segfault in auth hook (upstream #31848)
-- add htsslpass(1) and configure as default SSLPassPhraseDialog (#128677)
-- apachectl: restore use of $OPTIONS
-- apachectl, httpd.init: refuse to restart if $HTTPD -t fails
-- apachectl: run $HTTPD -t in user SELinux context for configtest
-- update for pcre-5.0 header locations
-
-* Sat Nov 13 2004 Jeff Johnson <jbj@redhat.com> 2.0.52-5
-- rebuild against db-4.3.21 aware apr-util.
-
-* Thu Nov 11 2004 Jeff Johnson <jbj@jbj.org> 2.0.52-4
-- rebuild against db-4.3-21.
-
-* Thu Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-3
-- add dummy connection address fixes from HEAD
-- mod_ssl: add security fix for CAN-2004-0885
-
-* Tue Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-2
-- update to 2.0.52
-
diff --git a/rpms/awips2.core/Installer.httpd-pypies/configuration/apache/pypies.conf b/rpms/awips2.core/Installer.httpd-pypies/configuration/apache/pypies.conf
deleted file mode 100644
index 3bb8be3664..0000000000
--- a/rpms/awips2.core/Installer.httpd-pypies/configuration/apache/pypies.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-LoadModule wsgi_module modules/mod_wsgi.so
-
-WSGIPythonHome /awips2/python
-
-<VirtualHost *>
-    ServerName localhost
-    #wsgi is setup in embedded mode, Daemon Process not doing anything
-    #WSGIDaemonProcess pypies user=awips group=fxalpha python-path=/awips2/python/lib/python2.7/site-packages processes=50 threads=1 umask=0000 display-name=pypies deadlock-timeout=30
-    WSGIScriptAlias / /awips2/httpd_pypies/var/www/wsgi/pypies.wsgi
-
-    <Directory /awips2/httpd_pypies/var/www/wsgi>
-        # uncomment for Daemon mode
-        #WSGIProcessGroup pypies
-        WSGIApplicationGroup %{GLOBAL}
-        Order deny,allow
-        Allow from all
-    </Directory>
-    
-</VirtualHost>
diff --git a/rpms/awips2.core/Installer.httpd-pypies/configuration/apache/pypies.wsgi b/rpms/awips2.core/Installer.httpd-pypies/configuration/apache/pypies.wsgi
deleted file mode 100644
index 2ed7d1430c..0000000000
--- a/rpms/awips2.core/Installer.httpd-pypies/configuration/apache/pypies.wsgi
+++ /dev/null
@@ -1,5 +0,0 @@
-import site
-site.addsitedir('/awips2/python/lib/python2.7/site-packages')
-
-import pypies.handlers
-application = pypies.handlers.pypies_response
\ No newline at end of file
diff --git a/rpms/awips2.core/Installer.httpd-pypies/configuration/conf/httpd.conf b/rpms/awips2.core/Installer.httpd-pypies/configuration/conf/httpd.conf
deleted file mode 100644
index 5d1e44d628..0000000000
--- a/rpms/awips2.core/Installer.httpd-pypies/configuration/conf/httpd.conf
+++ /dev/null
@@ -1,1008 +0,0 @@
-#
-# This is the main Apache server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.2/> for detailed information.
-# In particular, see
-# <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
-# for a discussion of each configuration directive.
-#
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.  
-#
-# The configuration directives are grouped into three basic sections:
-#  1. Directives that control the operation of the Apache server process as a
-#     whole (the 'global environment').
-#  2. Directives that define the parameters of the 'main' or 'default' server,
-#     which responds to requests that aren't handled by a virtual host.
-#     These directives also provide default values for the settings
-#     of all virtual hosts.
-#  3. Settings for virtual hosts, which allow Web requests to be sent to
-#     different IP addresses or hostnames and have them handled by the
-#     same Apache server process.
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so "logs/foo.log"
-# with ServerRoot set to "/etc/httpd" will be interpreted by the
-# server as "/etc/httpd/logs/foo.log".
-#
-
-### Section 1: Global Environment
-#
-# The directives in this section affect the overall operation of Apache,
-# such as the number of concurrent requests it can handle or where it
-# can find its configuration files.
-#
-
-#
-# Don't give away too much information about all the subcomponents
-# we are running.  Comment out this line if you don't mind remote sites
-# finding out what major optional modules you are running
-ServerTokens OS
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE!  If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the LockFile documentation
-# (available at <URL:http://httpd.apache.org/docs/2.2/mod/mpm_common.html#lockfile>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-ServerRoot "/awips2/httpd_pypies/etc/httpd"
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.  Note the PIDFILE variable in
-# /etc/sysconfig/httpd must be set appropriately if this location is
-# changed.
-#
-PidFile run/httpd.pid
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 120
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 50
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 15
-
-##
-## Server-Pool Size Regulation (MPM specific)
-## 
-
-# prefork MPM
-# StartServers: number of server processes to start
-# MinSpareServers: minimum number of server processes which are kept spare
-# MaxSpareServers: maximum number of server processes which are kept spare
-# ServerLimit: maximum value for MaxClients for the lifetime of the server
-# MaxClients: maximum number of server processes allowed to start
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule prefork.c>
-StartServers       8
-MinSpareServers    5
-MaxSpareServers   20
-ServerLimit      256
-MaxClients       256
-MaxRequestsPerChild  50
-</IfModule>
-
-# worker MPM
-# StartServers: initial number of server processes to start
-# MaxClients: maximum number of simultaneous client connections
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule worker.c>
-StartServers         2
-MaxClients         150
-MinSpareThreads     25
-MaxSpareThreads     75 
-ThreadsPerChild     25
-MaxRequestsPerChild  0
-</IfModule>
-
-#
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, in addition to the default. See also the <VirtualHost>
-# directive.
-#
-# Change this to Listen on specific IP addresses as shown below to 
-# prevent Apache from glomming onto all bound IP addresses (0.0.0.0)
-#
-#Listen 12.34.56.78:80
-Listen 9582
-
-#
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-LoadModule auth_basic_module modules/mod_auth_basic.so
-LoadModule auth_digest_module modules/mod_auth_digest.so
-LoadModule authn_file_module modules/mod_authn_file.so
-LoadModule authn_alias_module modules/mod_authn_alias.so
-LoadModule authn_anon_module modules/mod_authn_anon.so
-LoadModule authn_dbm_module modules/mod_authn_dbm.so
-LoadModule authn_default_module modules/mod_authn_default.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule authz_user_module modules/mod_authz_user.so
-LoadModule authz_owner_module modules/mod_authz_owner.so
-LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
-LoadModule authz_dbm_module modules/mod_authz_dbm.so
-LoadModule authz_default_module modules/mod_authz_default.so
-LoadModule ldap_module modules/mod_ldap.so
-LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
-LoadModule include_module modules/mod_include.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule logio_module modules/mod_logio.so
-LoadModule env_module modules/mod_env.so
-LoadModule ext_filter_module modules/mod_ext_filter.so
-LoadModule mime_magic_module modules/mod_mime_magic.so
-LoadModule expires_module modules/mod_expires.so
-LoadModule deflate_module modules/mod_deflate.so
-LoadModule headers_module modules/mod_headers.so
-LoadModule usertrack_module modules/mod_usertrack.so
-LoadModule setenvif_module modules/mod_setenvif.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule dav_module modules/mod_dav.so
-LoadModule status_module modules/mod_status.so
-LoadModule autoindex_module modules/mod_autoindex.so
-LoadModule info_module modules/mod_info.so
-LoadModule dav_fs_module modules/mod_dav_fs.so
-LoadModule vhost_alias_module modules/mod_vhost_alias.so
-LoadModule negotiation_module modules/mod_negotiation.so
-LoadModule dir_module modules/mod_dir.so
-LoadModule actions_module modules/mod_actions.so
-LoadModule speling_module modules/mod_speling.so
-LoadModule userdir_module modules/mod_userdir.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule substitute_module modules/mod_substitute.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadModule proxy_module modules/mod_proxy.so
-LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
-LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
-LoadModule proxy_http_module modules/mod_proxy_http.so
-LoadModule proxy_ajp_module modules/mod_proxy_ajp.so
-LoadModule proxy_connect_module modules/mod_proxy_connect.so
-LoadModule cache_module modules/mod_cache.so
-LoadModule suexec_module modules/mod_suexec.so
-LoadModule disk_cache_module modules/mod_disk_cache.so
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule version_module modules/mod_version.so
-
-#
-# The following modules are not loaded by default:
-#
-#LoadModule asis_module modules/mod_asis.so
-#LoadModule authn_dbd_module modules/mod_authn_dbd.so
-#LoadModule cern_meta_module modules/mod_cern_meta.so
-#LoadModule cgid_module modules/mod_cgid.so
-#LoadModule dbd_module modules/mod_dbd.so
-#LoadModule dumpio_module modules/mod_dumpio.so
-#LoadModule filter_module modules/mod_filter.so
-#LoadModule ident_module modules/mod_ident.so
-#LoadModule log_forensic_module modules/mod_log_forensic.so
-#LoadModule unique_id_module modules/mod_unique_id.so
-#
-
-#
-# Load config files from the config directory "/etc/httpd/conf.d".
-#
-Include conf.d/*.conf
-
-#
-# ExtendedStatus controls whether Apache will generate "full" status
-# information (ExtendedStatus On) or just basic information (ExtendedStatus
-# Off) when the "server-status" handler is called. The default is Off.
-#
-#ExtendedStatus On
-
-#
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.  
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-#  . On SCO (ODT 3) use "User nouser" and "Group nogroup".
-#  . On HPUX you may not be able to use shared memory as nobody, and the
-#    suggested workaround is to create a user www and use that user.
-#  NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET)
-#  when the value of (unsigned)Group is above 60000; 
-#  don't use Group #-1 on these systems!
-#
-User awips
-Group fxalpha
-
-### Section 2: 'Main' server configuration
-#
-# The directives in this section set up the values used by the 'main'
-# server, which responds to any requests that aren't handled by a
-# <VirtualHost> definition.  These values also provide defaults for
-# any <VirtualHost> containers you may define later in the file.
-#
-# All of these directives may appear inside <VirtualHost> containers,
-# in which case these default settings will be overridden for the
-# virtual host being defined.
-#
-
-#
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed.  This address appears on some server-generated pages, such
-# as error documents.  e.g. admin@your-domain.com
-#
-ServerAdmin root@localhost
-
-#
-# ServerName gives the name and port that the server uses to identify itself.
-# This can often be determined automatically, but we recommend you specify
-# it explicitly to prevent problems during startup.
-#
-# If this is not set to valid DNS name for your host, server-generated
-# redirections will not work.  See also the UseCanonicalName directive.
-#
-# If your host doesn't have a registered DNS name, enter its IP address here.
-# You will have to access it by its address anyway, and this will make 
-# redirections work in a sensible way.
-#
-#ServerName www.example.com:80
-
-#
-# UseCanonicalName: Determines how Apache constructs self-referencing 
-# URLs and the SERVER_NAME and SERVER_PORT variables.
-# When set "Off", Apache will use the Hostname and Port supplied
-# by the client.  When set "On", Apache will use the value of the
-# ServerName directive.
-#
-UseCanonicalName Off
-
-#
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-#
-DocumentRoot "/awips2/httpd_pypies/var/www/html"
-
-#
-# Each directory to which Apache has access can be configured with respect
-# to which services and features are allowed and/or disabled in that
-# directory (and its subdirectories). 
-#
-# First, we configure the "default" to be a very restrictive set of 
-# features.  
-#
-<Directory />
-    Options FollowSymLinks
-    AllowOverride None
-</Directory>
-
-#
-# Note that from this point forward you must specifically allow
-# particular features to be enabled - so if something's not working as
-# you might expect, make sure that you have specifically enabled it
-# below.
-#
-
-#
-# This should be changed to whatever you set DocumentRoot to.
-#
-<Directory "/awips2/httpd_pypies/var/www/html">
-
-#
-# Possible values for the Options directive are "None", "All",
-# or any combination of:
-#   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-#
-# Note that "MultiViews" must be named *explicitly* --- "Options All"
-# doesn't give it to you.
-#
-# The Options directive is both complicated and important.  Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#options
-# for more information.
-#
-    Options Indexes FollowSymLinks
-
-#
-# AllowOverride controls what directives may be placed in .htaccess files.
-# It can be "All", "None", or any combination of the keywords:
-#   Options FileInfo AuthConfig Limit
-#
-    AllowOverride None
-
-#
-# Controls who can get stuff from this server.
-#
-    Order allow,deny
-    Allow from all
-
-</Directory>
-
-#
-# UserDir: The name of the directory that is appended onto a user's home
-# directory if a ~user request is received.
-#
-# The path to the end user account 'public_html' directory must be
-# accessible to the webserver userid.  This usually means that ~userid
-# must have permissions of 711, ~userid/public_html must have permissions
-# of 755, and documents contained therein must be world-readable.
-# Otherwise, the client will only receive a "403 Forbidden" message.
-#
-# See also: http://httpd.apache.org/docs/misc/FAQ.html#forbidden
-#
-<IfModule mod_userdir.c>
-    #
-    # UserDir is disabled by default since it can confirm the presence
-    # of a username on the system (depending on home directory
-    # permissions).
-    #
-    UserDir disabled
-
-    #
-    # To enable requests to /~user/ to serve the user's public_html
-    # directory, remove the "UserDir disabled" line above, and uncomment
-    # the following line instead:
-    # 
-    #UserDir public_html
-
-</IfModule>
-
-#
-# Control access to UserDir directories.  The following is an example
-# for a site where these directories are restricted to read-only.
-#
-#<Directory /home/*/public_html>
-#    AllowOverride FileInfo AuthConfig Limit
-#    Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
-#    <Limit GET POST OPTIONS>
-#        Order allow,deny
-#        Allow from all
-#    </Limit>
-#    <LimitExcept GET POST OPTIONS>
-#        Order deny,allow
-#        Deny from all
-#    </LimitExcept>
-#</Directory>
-
-#
-# DirectoryIndex: sets the file that Apache will serve if a directory
-# is requested.
-#
-# The index.html.var file (a type-map) is used to deliver content-
-# negotiated documents.  The MultiViews Option can be used for the 
-# same purpose, but it is much slower.
-#
-DirectoryIndex index.html index.html.var
-
-#
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives.  See also the AllowOverride
-# directive.
-#
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being 
-# viewed by Web clients. 
-#
-<Files ~ "^\.ht">
-    Order allow,deny
-    Deny from all
-</Files>
-
-#
-# TypesConfig describes where the mime.types file (or equivalent) is
-# to be found.
-#
-TypesConfig /etc/mime.types
-
-#
-# DefaultType is the default MIME type the server will use for a document
-# if it cannot otherwise determine one, such as from filename extensions.
-# If your server contains mostly text or HTML documents, "text/plain" is
-# a good value.  If most of your content is binary, such as applications
-# or images, you may want to use "application/octet-stream" instead to
-# keep browsers from trying to display binary files as though they are
-# text.
-#
-DefaultType text/plain
-
-#
-# The mod_mime_magic module allows the server to use various hints from the
-# contents of the file itself to determine its type.  The MIMEMagicFile
-# directive tells the module where the hint definitions are located.
-#
-<IfModule mod_mime_magic.c>
-#   MIMEMagicFile /usr/share/magic.mime
-    MIMEMagicFile conf/magic
-</IfModule>
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-#
-# EnableMMAP: Control whether memory-mapping is used to deliver
-# files (assuming that the underlying OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted 
-# filesystems.  On some systems, turning it off (regardless of
-# filesystem) can improve performance; for details, please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablemmap
-#
-#EnableMMAP off
-
-#
-# EnableSendfile: Control whether the sendfile kernel support is 
-# used to deliver files (assuming that the OS supports it). 
-# The default is on; turn this off if you serve from NFS-mounted 
-# filesystems.  Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-#
-#EnableSendfile off
-
-#
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog "|/awips2/httpd_pypies/usr/sbin/rotatelogs /awips2/httpd_pypies/var/log/httpd/error_log.%Y.%m.%d 86400"
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel warn
-
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive (see below).
-#
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-# "combinedio" includes actual counts of actual bytes received (%I) and sent (%O); this
-# requires the mod_logio module to be loaded.
-#LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
-
-#
-# The location and format of the access logfile (Common Logfile Format).
-# If you do not define any access logfiles within a <VirtualHost>
-# container, they will be logged here.  Contrariwise, if you *do*
-# define per-<VirtualHost> access logfiles, transactions will be
-# logged therein and *not* in this file.
-#
-#CustomLog logs/access_log common
-
-#
-# If you would like to have separate agent and referer logfiles, uncomment
-# the following directives.
-#
-#CustomLog logs/referer_log referer
-#CustomLog logs/agent_log agent
-
-#
-# For a single logfile with access, agent, and referer information
-# (Combined Logfile Format), use the following directive:
-#
-CustomLog "|/awips2/httpd_pypies/usr/sbin/rotatelogs /awips2/httpd_pypies/var/log/httpd/access_log.%Y.%m.%d 86400" combined
-
-#
-# Optionally add a line containing the server version and virtual host
-# name to server-generated pages (internal error documents, FTP directory
-# listings, mod_status and mod_info output etc., but not CGI generated
-# documents or custom error documents).
-# Set to "EMail" to also include a mailto: link to the ServerAdmin.
-# Set to one of:  On | Off | EMail
-#
-ServerSignature On
-
-#
-# Aliases: Add here as many aliases as you need (with no limit). The format is 
-# Alias fakename realname
-#
-# Note that if you include a trailing / on fakename then the server will
-# require it to be present in the URL.  So "/icons" isn't aliased in this
-# example, only "/icons/".  If the fakename is slash-terminated, then the 
-# realname must also be slash terminated, and if the fakename omits the 
-# trailing slash, the realname must also omit it.
-#
-# We include the /icons/ alias for FancyIndexed directory listings.  If you
-# do not use FancyIndexing, you may comment this out.
-#
-Alias /icons/ "/awips2/httpd_pypies/var/www/icons/"
-
-<Directory "/awips2/httpd_pypies/var/www/icons">
-    Options Indexes MultiViews
-    AllowOverride None
-    Order allow,deny
-    Allow from all
-</Directory>
-
-#
-# WebDAV module configuration section.
-# 
-<IfModule mod_dav_fs.c>
-    # Location of the WebDAV lock database.
-    DAVLockDB /var/lib/dav/lockdb
-</IfModule>
-
-#
-# ScriptAlias: This controls which directories contain server scripts.
-# ScriptAliases are essentially the same as Aliases, except that
-# documents in the realname directory are treated as applications and
-# run by the server when requested rather than as documents sent to the client.
-# The same rules about trailing "/" apply to ScriptAlias directives as to
-# Alias.
-#
-ScriptAlias /cgi-bin/ "/awips2/httpd_pypies/var/www/cgi-bin/"
-
-#
-# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
-# CGI directory exists, if you have that configured.
-#
-<Directory "/awips2/httpd_pypies/var/www/cgi-bin">
-    AllowOverride None
-    Options None
-    Order allow,deny
-    Allow from all
-</Directory>
-
-#
-# Redirect allows you to tell clients about documents which used to exist in
-# your server's namespace, but do not anymore. This allows you to tell the
-# clients where to look for the relocated document.
-# Example:
-# Redirect permanent /foo http://www.example.com/bar
-
-#
-# Directives controlling the display of server-generated directory listings.
-#
-
-#
-# IndexOptions: Controls the appearance of server-generated directory
-# listings.
-#
-IndexOptions FancyIndexing VersionSort NameWidth=* HTMLTable Charset=UTF-8
-
-#
-# AddIcon* directives tell the server which icon to show for different
-# files or filename extensions.  These are only displayed for
-# FancyIndexed directories.
-#
-AddIconByEncoding (CMP,/icons/compressed.gif) x-compress x-gzip
-
-AddIconByType (TXT,/icons/text.gif) text/*
-AddIconByType (IMG,/icons/image2.gif) image/*
-AddIconByType (SND,/icons/sound2.gif) audio/*
-AddIconByType (VID,/icons/movie.gif) video/*
-
-AddIcon /icons/binary.gif .bin .exe
-AddIcon /icons/binhex.gif .hqx
-AddIcon /icons/tar.gif .tar
-AddIcon /icons/world2.gif .wrl .wrl.gz .vrml .vrm .iv
-AddIcon /icons/compressed.gif .Z .z .tgz .gz .zip
-AddIcon /icons/a.gif .ps .ai .eps
-AddIcon /icons/layout.gif .html .shtml .htm .pdf
-AddIcon /icons/text.gif .txt
-AddIcon /icons/c.gif .c
-AddIcon /icons/p.gif .pl .py
-AddIcon /icons/f.gif .for
-AddIcon /icons/dvi.gif .dvi
-AddIcon /icons/uuencoded.gif .uu
-AddIcon /icons/script.gif .conf .sh .shar .csh .ksh .tcl
-AddIcon /icons/tex.gif .tex
-AddIcon /icons/bomb.gif core
-
-AddIcon /icons/back.gif ..
-AddIcon /icons/hand.right.gif README
-AddIcon /icons/folder.gif ^^DIRECTORY^^
-AddIcon /icons/blank.gif ^^BLANKICON^^
-
-#
-# DefaultIcon is which icon to show for files which do not have an icon
-# explicitly set.
-#
-DefaultIcon /icons/unknown.gif
-
-#
-# AddDescription allows you to place a short description after a file in
-# server-generated indexes.  These are only displayed for FancyIndexed
-# directories.
-# Format: AddDescription "description" filename
-#
-#AddDescription "GZIP compressed document" .gz
-#AddDescription "tar archive" .tar
-#AddDescription "GZIP compressed tar archive" .tgz
-
-#
-# ReadmeName is the name of the README file the server will look for by
-# default, and append to directory listings.
-#
-# HeaderName is the name of a file which should be prepended to
-# directory indexes. 
-ReadmeName README.html
-HeaderName HEADER.html
-
-#
-# IndexIgnore is a set of filenames which directory indexing should ignore
-# and not include in the listing.  Shell-style wildcarding is permitted.
-#
-IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
-
-#
-# DefaultLanguage and AddLanguage allows you to specify the language of 
-# a document. You can then use content negotiation to give a browser a 
-# file in a language the user can understand.
-#
-# Specify a default language. This means that all data
-# going out without a specific language tag (see below) will 
-# be marked with this one. You probably do NOT want to set
-# this unless you are sure it is correct for all cases.
-#
-# * It is generally better to not mark a page as 
-# * being a certain language than marking it with the wrong
-# * language!
-#
-# DefaultLanguage nl
-#
-# Note 1: The suffix does not have to be the same as the language
-# keyword --- those with documents in Polish (whose net-standard
-# language code is pl) may wish to use "AddLanguage pl .po" to
-# avoid the ambiguity with the common suffix for perl scripts.
-#
-# Note 2: The example entries below illustrate that in some cases 
-# the two character 'Language' abbreviation is not identical to 
-# the two character 'Country' code for its country,
-# E.g. 'Danmark/dk' versus 'Danish/da'.
-#
-# Note 3: In the case of 'ltz' we violate the RFC by using a three char
-# specifier. There is 'work in progress' to fix this and get
-# the reference data for rfc1766 cleaned up.
-#
-# Catalan (ca) - Croatian (hr) - Czech (cs) - Danish (da) - Dutch (nl)
-# English (en) - Esperanto (eo) - Estonian (et) - French (fr) - German (de)
-# Greek-Modern (el) - Hebrew (he) - Italian (it) - Japanese (ja)
-# Korean (ko) - Luxembourgeois* (ltz) - Norwegian Nynorsk (nn)
-# Norwegian (no) - Polish (pl) - Portugese (pt)
-# Brazilian Portuguese (pt-BR) - Russian (ru) - Swedish (sv)
-# Simplified Chinese (zh-CN) - Spanish (es) - Traditional Chinese (zh-TW)
-#
-AddLanguage ca .ca
-AddLanguage cs .cz .cs
-AddLanguage da .dk
-AddLanguage de .de
-AddLanguage el .el
-AddLanguage en .en
-AddLanguage eo .eo
-AddLanguage es .es
-AddLanguage et .et
-AddLanguage fr .fr
-AddLanguage he .he
-AddLanguage hr .hr
-AddLanguage it .it
-AddLanguage ja .ja
-AddLanguage ko .ko
-AddLanguage ltz .ltz
-AddLanguage nl .nl
-AddLanguage nn .nn
-AddLanguage no .no
-AddLanguage pl .po
-AddLanguage pt .pt
-AddLanguage pt-BR .pt-br
-AddLanguage ru .ru
-AddLanguage sv .sv
-AddLanguage zh-CN .zh-cn
-AddLanguage zh-TW .zh-tw
-
-#
-# LanguagePriority allows you to give precedence to some languages
-# in case of a tie during content negotiation.
-#
-# Just list the languages in decreasing order of preference. We have
-# more or less alphabetized them here. You probably want to change this.
-#
-LanguagePriority en ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
-
-#
-# ForceLanguagePriority allows you to serve a result page rather than
-# MULTIPLE CHOICES (Prefer) [in case of a tie] or NOT ACCEPTABLE (Fallback)
-# [in case no accepted languages matched the available variants]
-#
-ForceLanguagePriority Prefer Fallback
-
-#
-# Specify a default charset for all content served; this enables
-# interpretation of all content as UTF-8 by default.  To use the 
-# default browser choice (ISO-8859-1), or to allow the META tags
-# in HTML content to override this choice, comment out this
-# directive:
-#
-AddDefaultCharset UTF-8
-
-#
-# AddType allows you to add to or override the MIME configuration
-# file mime.types for specific file types.
-#
-#AddType application/x-tar .tgz
-
-#
-# AddEncoding allows you to have certain browsers uncompress
-# information on the fly. Note: Not all browsers support this.
-# Despite the name similarity, the following Add* directives have nothing
-# to do with the FancyIndexing customization directives above.
-#
-#AddEncoding x-compress .Z
-#AddEncoding x-gzip .gz .tgz
-
-# If the AddEncoding directives above are commented-out, then you
-# probably should define those extensions to indicate media types:
-#
-AddType application/x-compress .Z
-AddType application/x-gzip .gz .tgz
-
-#
-#   MIME-types for downloading Certificates and CRLs
-#
-AddType application/x-x509-ca-cert .crt
-AddType application/x-pkcs7-crl    .crl
-
-#
-# AddHandler allows you to map certain file extensions to "handlers":
-# actions unrelated to filetype. These can be either built into the server
-# or added with the Action directive (see below)
-#
-# To use CGI scripts outside of ScriptAliased directories:
-# (You will also need to add "ExecCGI" to the "Options" directive.)
-#
-#AddHandler cgi-script .cgi
-
-#
-# For files that include their own HTTP headers:
-#
-#AddHandler send-as-is asis
-
-#
-# For type maps (negotiated resources):
-# (This is enabled by default to allow the Apache "It Worked" page
-#  to be distributed in multiple languages.)
-#
-AddHandler type-map var
-
-#
-# Filters allow you to process content before it is sent to the client.
-#
-# To parse .shtml files for server-side includes (SSI):
-# (You will also need to add "Includes" to the "Options" directive.)
-#
-AddType text/html .shtml
-AddOutputFilter INCLUDES .shtml
-
-#
-# Action lets you define media types that will execute a script whenever
-# a matching file is called. This eliminates the need for repeated URL
-# pathnames for oft-used CGI file processors.
-# Format: Action media/type /cgi-script/location
-# Format: Action handler-name /cgi-script/location
-#
-
-#
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# Putting this all together, we can internationalize error responses.
-#
-# We use Alias to redirect any /error/HTTP_<error>.html.var response to
-# our collection of by-error message multi-language collections.  We use 
-# includes to substitute the appropriate text.
-#
-# You can modify the messages' appearance without changing any of the
-# default HTTP_<error>.html.var files by adding the line:
-#
-#   Alias /error/include/ "/your/include/path/"
-#
-# which allows you to create your own set of files by starting with the
-# /var/www/error/include/ files and
-# copying them to /your/include/path/, even on a per-VirtualHost basis.
-#
-
-Alias /error/ "/awips2/httpd_pypies/var/www/error/"
-
-<IfModule mod_negotiation.c>
-<IfModule mod_include.c>
-    <Directory "/awips2/httpd_pypies/var/www/error">
-        AllowOverride None
-        Options IncludesNoExec
-        AddOutputFilter Includes html
-        AddHandler type-map var
-        Order allow,deny
-        Allow from all
-        LanguagePriority en es de fr
-        ForceLanguagePriority Prefer Fallback
-    </Directory>
-
-#    ErrorDocument 400 /error/HTTP_BAD_REQUEST.html.var
-#    ErrorDocument 401 /error/HTTP_UNAUTHORIZED.html.var
-#    ErrorDocument 403 /error/HTTP_FORBIDDEN.html.var
-#    ErrorDocument 404 /error/HTTP_NOT_FOUND.html.var
-#    ErrorDocument 405 /error/HTTP_METHOD_NOT_ALLOWED.html.var
-#    ErrorDocument 408 /error/HTTP_REQUEST_TIME_OUT.html.var
-#    ErrorDocument 410 /error/HTTP_GONE.html.var
-#    ErrorDocument 411 /error/HTTP_LENGTH_REQUIRED.html.var
-#    ErrorDocument 412 /error/HTTP_PRECONDITION_FAILED.html.var
-#    ErrorDocument 413 /error/HTTP_REQUEST_ENTITY_TOO_LARGE.html.var
-#    ErrorDocument 414 /error/HTTP_REQUEST_URI_TOO_LARGE.html.var
-#    ErrorDocument 415 /error/HTTP_UNSUPPORTED_MEDIA_TYPE.html.var
-#    ErrorDocument 500 /error/HTTP_INTERNAL_SERVER_ERROR.html.var
-#    ErrorDocument 501 /error/HTTP_NOT_IMPLEMENTED.html.var
-#    ErrorDocument 502 /error/HTTP_BAD_GATEWAY.html.var
-#    ErrorDocument 503 /error/HTTP_SERVICE_UNAVAILABLE.html.var
-#    ErrorDocument 506 /error/HTTP_VARIANT_ALSO_VARIES.html.var
-
-</IfModule>
-</IfModule>
-
-#
-# The following directives modify normal HTTP response behavior to
-# handle known problems with browser implementations.
-#
-BrowserMatch "Mozilla/2" nokeepalive
-BrowserMatch "MSIE 4\.0b2;" nokeepalive downgrade-1.0 force-response-1.0
-BrowserMatch "RealPlayer 4\.0" force-response-1.0
-BrowserMatch "Java/1\.0" force-response-1.0
-BrowserMatch "JDK/1\.0" force-response-1.0
-
-#
-# The following directive disables redirects on non-GET requests for
-# a directory that does not include the trailing slash.  This fixes a 
-# problem with Microsoft WebFolders which does not appropriately handle 
-# redirects for folders with DAV methods.
-# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.
-#
-BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully
-BrowserMatch "MS FrontPage" redirect-carefully
-BrowserMatch "^WebDrive" redirect-carefully
-BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully
-BrowserMatch "^gnome-vfs/1.0" redirect-carefully
-BrowserMatch "^XML Spy" redirect-carefully
-BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
-
-#
-# Allow server status reports generated by mod_status,
-# with the URL of http://servername/server-status
-# Change the ".example.com" to match your domain to enable.
-#
-#<Location /server-status>
-#    SetHandler server-status
-#    Order deny,allow
-#    Deny from all
-#    Allow from .example.com
-#</Location>
-
-#
-# Allow remote server configuration reports, with the URL of
-#  http://servername/server-info (requires that mod_info.c be loaded).
-# Change the ".example.com" to match your domain to enable.
-#
-#<Location /server-info>
-#    SetHandler server-info
-#    Order deny,allow
-#    Deny from all
-#    Allow from .example.com
-#</Location>
-
-#
-# Proxy Server directives. Uncomment the following lines to
-# enable the proxy server:
-#
-#<IfModule mod_proxy.c>
-#ProxyRequests On
-#
-#<Proxy *>
-#    Order deny,allow
-#    Deny from all
-#    Allow from .example.com
-#</Proxy>
-
-#
-# Enable/disable the handling of HTTP/1.1 "Via:" headers.
-# ("Full" adds the server version; "Block" removes all outgoing Via: headers)
-# Set to one of: Off | On | Full | Block
-#
-#ProxyVia On
-
-#
-# To enable a cache of proxied content, uncomment the following lines.
-# See http://httpd.apache.org/docs/2.2/mod/mod_cache.html for more details.
-#
-#<IfModule mod_disk_cache.c>
-#   CacheEnable disk /
-#   CacheRoot "/var/cache/mod_proxy"
-#</IfModule>
-#
-
-#</IfModule>
-# End of proxy directives.
-
-### Section 3: Virtual Hosts
-#
-# VirtualHost: If you want to maintain multiple domains/hostnames on your
-# machine you can setup VirtualHost containers for them. Most configurations
-# use only name-based virtual hosts so the server doesn't need to worry about
-# IP addresses. This is indicated by the asterisks in the directives below.
-#
-# Please see the documentation at 
-# <URL:http://httpd.apache.org/docs/2.2/vhosts/>
-# for further details before you try to setup virtual hosts.
-#
-# You may use the command line option '-S' to verify your virtual host
-# configuration.
-
-#
-# Use name-based virtual hosting.
-#
-#NameVirtualHost *:80
-#
-# NOTE: NameVirtualHost cannot be used without a port specifier 
-# (e.g. :80) if mod_ssl is being used, due to the nature of the
-# SSL protocol.
-#
-
-#
-# VirtualHost example:
-# Almost any Apache directive may go into a VirtualHost container.
-# The first VirtualHost section is used for requests without a known
-# server name.
-#
-#<VirtualHost *:80>
-#    ServerAdmin webmaster@dummy-host.example.com
-#    DocumentRoot /www/docs/dummy-host.example.com
-#    ServerName dummy-host.example.com
-#    ErrorLog logs/dummy-host.example.com-error_log
-#    CustomLog logs/dummy-host.example.com-access_log common
-#</VirtualHost>
diff --git a/rpms/awips2.core/Installer.httpd-pypies/configuration/etc/cron.daily/pypiesLogCleanup.sh b/rpms/awips2.core/Installer.httpd-pypies/configuration/etc/cron.daily/pypiesLogCleanup.sh
deleted file mode 100644
index 4008cb8d85..0000000000
--- a/rpms/awips2.core/Installer.httpd-pypies/configuration/etc/cron.daily/pypiesLogCleanup.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Remove any logs from a week ago, if they exist.
-
-_PYPIES_LOG_DIRECTORY="/awips2/httpd_pypies/var/log/httpd"
-
-_LOG_NAME_PREFIXES=( 'access_log' 'error_log' )
-_COUNT_DAYS=( 7 8 9 10 11 12 13 14 )
-
-for day in ${_COUNT_DAYS[*]}; do
-   _log_date=`date -d "-${day} day" +%Y.%m.%d`
-   
-   for logPrefix in ${_LOG_NAME_PREFIXES[*]}; do
-      _log_file="${logPrefix}.${_log_date}"
-
-      echo "${_PYPIES_LOG_DIRECTORY}/${_log_file}"
-      rm -f ${_PYPIES_LOG_DIRECTORY}/${_log_file}
-   done
-done
diff --git a/rpms/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies b/rpms/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies
deleted file mode 100644
index 42a4a5241f..0000000000
--- a/rpms/awips2.core/Installer.httpd-pypies/configuration/etc/init.d/httpd-pypies
+++ /dev/null
@@ -1,198 +0,0 @@
-#!/bin/bash
-#
-# httpd        Startup script for the Apache HTTP Server used by Pypies
-#
-# chkconfig: - 85 15
-# description: Apache is a World Wide Web server.  It is used to serve \
-#	       HTML files and CGI.  Pypies uses it to serve connections.
-# processname: httpd
-# config: /etc/httpd/conf/httpd.conf
-# config: /etc/sysconfig/httpd
-# pidfile: /var/run/httpd.pid
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-if [ -f /etc/sysconfig/httpd ]; then
-        . /etc/sysconfig/httpd
-fi
-
-# Start httpd in the C locale by default.
-HTTPD_LANG=${HTTPD_LANG-"C"}
-
-# This will prevent initlog from swallowing up a pass-phrase prompt if
-# mod_ssl needs a pass-phrase from the user.
-INITLOG_ARGS=""
-
-# Set HTTPD=/usr/sbin/httpd.worker in /etc/sysconfig/httpd to use a server
-# with the thread-based "worker" MPM; BE WARNED that some modules may not
-# work correctly with a thread-based MPM; notably PHP will refuse to start.
-
-# Find the httpd-pypies installation.
-HTTPD_PYPIES_INSTALL="/awips2/httpd_pypies"
-
-# Path to the apachectl script, server binary, and short-form for messages.
-apachectl=${HTTPD_PYPIES_INSTALL}/usr/sbin/apachectl
-httpd=${HTTPD-${HTTPD_PYPIES_INSTALL}/usr/sbin/httpd}
-prog=httpd
-pidfile=${PIDFILE-${HTTPD_PYPIES_INSTALL}/var/run/httpd.pid}
-lockfile=${LOCKFILE-${HTTPD_PYPIES_INSTALL}/var/lock/subsys/httpd}
-RETVAL=0
-PYTHON_INSTALL="/awips2/python"
-loggingCmd="${PYTHON_INSTALL}/bin/python -u ${PYTHON_INSTALL}/lib/python2.7/site-packages/pypies/logging/logProcess.py"
-
-# pypies configuration location
-export PYPIES_CFG=/awips2/pypies/conf/pypies.cfg
-
-# Add to LD_LIBRARY_PATH, if necessary.
-PYTHON_LIB_DIR="${PYTHON_INSTALL}/lib"
-
-# Determine if LD_LIBRARY_PATH needs to be updated.
-echo $LD_LIBRARY_PATH | grep "${PYTHON_LIB_DIR}" > /dev/null 2>&1
-RC="$?"
-if [ ! "${RC}" = "0" ]; then
-   export LD_LIBRARY_PATH=${PYTHON_LIB_DIR}:$LD_LIBRARY_PATH
-fi
-
-# check for 1.3 configuration
-check13 () {
-	CONFFILE=${HTTPD_PYPIES_INSTALL}/etc/httpd/conf/httpd.conf
-	GONE="(ServerType|BindAddress|Port|AddModule|ClearModuleList|"
-	GONE="${GONE}AgentLog|RefererLog|RefererIgnore|FancyIndexing|"
-	GONE="${GONE}AccessConfig|ResourceConfig)"
-	if LANG=C grep -Eiq "^[[:space:]]*($GONE)" $CONFFILE; then
-		echo
-		echo 1>&2 " Apache 1.3 configuration directives found"
-		echo 1>&2 " please read /usr/share/doc/awips2-httpd-pypies-2.2.3/migration.html"
-		failure "Apache 1.3 config directives test"
-		echo
-		exit 1
-	fi
-}
-
-# The semantics of these two functions differ from the way apachectl does
-# things -- attempting to start while running is a failure, and shutdown
-# when not running is also a failure.  So we just do it the way init scripts
-# are expected to behave here.
-start() {		
-        source /etc/profile.d/awips2HDF5Tools.sh
-        echo -n $"Starting logging service:"
-        nohup su awips -c "$loggingCmd > /tmp/pypiesLoggingService.log 2>&1" > /dev/null &
-        RC=$?
-        # TODO: need better checks to ensure that the logging service actually keeps
-        #       running after startup.
-        RC=$?
-        if [ ${RC} -ne 0 ]; then
-           failure
-        else
-           success
-        fi        
-        echo
-        echo -n $"Starting $prog: "
-        check13 || exit 1
-        LANG=$HTTPD_LANG daemon $httpd $OPTIONS -f \
-           ${HTTPD_PYPIES_INSTALL}/etc/httpd/conf/httpd.conf
-        RETVAL=$?
-        echo
-        [ $RETVAL = 0 ] && touch ${lockfile}
-        return $RETVAL
-}
-
-stop() {
-	echo -n $"Stopping $prog: "
-        ${HTTPD_PYPIES_INSTALL}/usr/sbin/apachectl -f \
-           ${HTTPD_PYPIES_INSTALL}/etc/httpd/conf/httpd.conf \
-           -k graceful-stop
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
-    echo -n $"Stopping logging service:"
-    # Stop the logging process
-    for pid in `ps aux | grep [l]ogProcess.py | awk '{print $2}'`;
-    do
-       kill -9 ${pid}
-       RC=$?
-       if [ ${RC} -ne 0 ]; then
-          failure
-          return
-       fi
-    done
-    success
-    echo
-}
-# When stopping httpd a delay of >10 second is required before SIGKILLing the
-# httpd parent; this gives enough time for the httpd parent to SIGKILL any
-# errant children.
-forcestop() {
-	echo -n $"Stopping $prog: "
-	killproc -d 10 $httpd
-	RETVAL=$?
-	echo
-	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
-    echo -n $"Stopping logging service:"
-    # Stop the logging process
-    for pid in `ps aux | grep [l]ogProcess.py | awk '{print $2}'`;
-    do
-       kill -9 ${pid}
-       RC=$?
-       if [ ${RC} -ne 0 ]; then
-          failure
-          return
-       fi
-    done
-    success
-    echo
-}
-reload() {
-    echo -n $"Reloading $prog: "
-    if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then
-        RETVAL=$?
-        echo $"not reloading due to configuration syntax error"
-        failure $"not reloading $httpd due to configuration syntax error"
-    else
-        ${HTTPD_PYPIES_INSTALL}/usr/sbin/apachectl -f \
-           ${HTTPD_PYPIES_INSTALL}/etc/httpd/conf/httpd.conf \
-           -k graceful
-        RETVAL=$?
-    fi
-    echo
-}
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  forcestop)
-  	forcestop
-  	;;
-  status)
-        status $httpd
-	RETVAL=$?
-	;;
-  restart)
-	stop
-	start
-	;;
-  condrestart)
-	if [ -f ${pidfile} ] ; then
-		stop
-		start
-	fi
-	;;
-  reload)
-        reload
-	;;
-  graceful|help|configtest|fullstatus)
-	$apachectl $@
-	RETVAL=$?
-	;;
-  *)
-	echo $"Usage: $prog {start|stop|forcestop|restart|condrestart|reload|status|fullstatus|graceful|help|configtest}"
-	exit 1
-esac
-
-exit $RETVAL
diff --git a/rpms/awips2.core/Installer.httpd-pypies/src/httpd-2.2.15-SOURCES.tar b/rpms/awips2.core/Installer.httpd-pypies/src/httpd-2.2.15-SOURCES.tar
deleted file mode 100644
index 2c5c324742..0000000000
Binary files a/rpms/awips2.core/Installer.httpd-pypies/src/httpd-2.2.15-SOURCES.tar and /dev/null differ
diff --git a/rpms/awips2.core/Installer.httpd-pypies/src/mod_wsgi-3.3.tar.gz b/rpms/awips2.core/Installer.httpd-pypies/src/mod_wsgi-3.3.tar.gz
deleted file mode 100644
index b821753b0f..0000000000
Binary files a/rpms/awips2.core/Installer.httpd-pypies/src/mod_wsgi-3.3.tar.gz and /dev/null differ
diff --git a/rpms/awips2.core/Installer.hydroapps/component.spec b/rpms/awips2.core/Installer.hydroapps/component.spec
index 880ab2612a..3c5a17d520 100644
--- a/rpms/awips2.core/Installer.hydroapps/component.spec
+++ b/rpms/awips2.core/Installer.hydroapps/component.spec
@@ -13,12 +13,12 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-hydroapps-shared
-obsoletes: awips2-hydroapps
-requires: awips2-edex-base
+Provides: awips2-hydroapps-shared
+Obsoletes: awips2-hydroapps
+Requires: awips2-edex-base
 
 %description
 AWIPS II Hydroapps Distribution - Includes applications, configurations, and
diff --git a/rpms/awips2.core/Installer.irt/component.spec b/rpms/awips2.core/Installer.irt/component.spec
index 345c6522a7..286997698f 100644
--- a/rpms/awips2.core/Installer.irt/component.spec
+++ b/rpms/awips2.core/Installer.irt/component.spec
@@ -12,11 +12,11 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-irt
-requires: awips2-python
+Provides: awips2-irt
+Requires: awips2-python
 
 %description
 AWIPS II IRT Installation - Contains The AWIPS II IRT Component.
@@ -91,38 +91,17 @@ done
 copyLegal "irt"
 
 %pre
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;34m\| Installing AWIPS II IRT...\e[m"
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;34m   Installation Root = ${RPM_INSTALL_PREFIX}\e[m"
 
 %post
-function printFailureMessage()
-{
-   echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
-   echo -e "\e[1;31m\| AWIPS II IRT Installation - FAILED\e[m"
-   echo -e "\e[1;31m--------------------------------------------------------------------------------\e[m"
-}
 echo ${RPM_INSTALL_PREFIX} | sed 's/\//\\\//g' > .awips2_escape.tmp
 IRT_INSTALL_ESCAPED=`cat .awips2_escape.tmp`
 rm -f .awips2_escape.tmp
 
-echo "--------------------------------------------------------------------------------"
-echo "\| Setting up AWIPS II IRT Runtime and Environment..."
-echo "--------------------------------------------------------------------------------"
 IRT_STARTUP_FILE="start_irt.sh"
 perl -p -i -e "s/%{INSTALL_PATH}%/${IRT_INSTALL_ESCAPED}/g" \
    ${RPM_INSTALL_PREFIX}/bin/${IRT_STARTUP_FILE}
 chmod a+x ${RPM_INSTALL_PREFIX}/bin/*
 
-echo -e "\e[1;32m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;32m\| AWIPS II IRT Installation - COMPLETE\e[m"
-echo -e "\e[1;32m--------------------------------------------------------------------------------\e[m"
-
 %postun
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo -e "\e[1;34m\| The AWIPS II IRT Installation Has Been Successfully Removed\e[m"
-echo -e "\e[1;34m--------------------------------------------------------------------------------\e[m"
-echo ""
 
 %files -f component-files.txt
diff --git a/rpms/awips2.core/Installer.ldm/component.spec b/rpms/awips2.core/Installer.ldm/component.spec
index 977665abba..46c34bb8bd 100644
--- a/rpms/awips2.core/Installer.ldm/component.spec
+++ b/rpms/awips2.core/Installer.ldm/component.spec
@@ -17,14 +17,13 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
 Requires: awips2-qpid-lib
-requires: awips2-python
-requires: awips2-python
-provides: awips2-ldm
-provides: awips2-base-component
+Requires: awips2-python
+Provides: awips2-ldm
+Provides: awips2-base-component
 
 %description
 AWIPS II LDM Distribution - Contains AWIPS II LDM.
diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
index 3800639f4d..84e2f0b164 100644
--- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
+++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
@@ -44,7 +44,8 @@
 #20150827            4687 skorolev    Add pattern for ECMWF station-based MOS text bulletins
 #20150930            4930 rferrel     Corrected patterns for intlsigmets.
 #20151008            4958 dgilling    Add pattern for NationalBlend
-#20151030        DR 17683 jwatson     Add pattern for Day 8-11 Alaska 3km gridded MOS    
+#20151030        DR 17683 jwatson     Add pattern for Day 8-11 Alaska 3km gridded MOS
+#20160128            5183 nabowle     Add pattern for PWPF.
 
 #***************************************************************
 # AWIPS 1 PATTERN GRAPHIC	^[PQ].*				/redbook/Raw
@@ -888,6 +889,8 @@ EXP	(.*ecmwf_mos_decrypted.*)
 	FILE	-overwrite -log -close -edex	\1
 
 
-
+# 2.5km CONUS PWPF
+NGRID	^(HIN[B-X][0-9][0-9]) (KWNH) (..)(..)(..)
+	FILE	-overwrite -log -close -edex	/data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/PWPF/GRID184/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H
 
 
diff --git a/rpms/awips2.core/Installer.localapps-environment/component.spec b/rpms/awips2.core/Installer.localapps-environment/component.spec
index 647a113059..35ad882662 100644
--- a/rpms/awips2.core/Installer.localapps-environment/component.spec
+++ b/rpms/awips2.core/Installer.localapps-environment/component.spec
@@ -12,9 +12,10 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
+Provides: awips2-localapps-environment
 
 %description
 AWIPS II localapps Environment Spec File - This rpm will install
diff --git a/rpms/awips2.core/Installer.localization/component.spec b/rpms/awips2.core/Installer.localization/component.spec
index 89138d2bdd..093940ca7c 100644
--- a/rpms/awips2.core/Installer.localization/component.spec
+++ b/rpms/awips2.core/Installer.localization/component.spec
@@ -12,10 +12,10 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: %{_component_name}
+Provides: %{_component_name}
 
 %description
 AWIPS II Site Localization.
diff --git a/rpms/awips2.core/Installer.maps-database/component.spec b/rpms/awips2.core/Installer.maps-database/component.spec
index 1364fdf4e8..bed004a36d 100644
--- a/rpms/awips2.core/Installer.maps-database/component.spec
+++ b/rpms/awips2.core/Installer.maps-database/component.spec
@@ -14,11 +14,11 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-maps-database
-requires: awips2-database
+Provides: awips2-maps-database
+Requires: awips2-database
 
 %description
 AWIPS II Maps Database - includes the
@@ -41,26 +41,15 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-# Determine which version of db we should use.
-RPM_COMMON_DIR="%{_baseline_workspace}/rpms/common/static.versions"
-
-if [ ! -f ${RPM_COMMON_DIR}/LATEST.maps ]; then
-   file ${RPM_COMMON_DIR}/LATEST.maps
-   exit 1
-fi
-VERSION_DIR=`cat ${RPM_COMMON_DIR}/LATEST.maps`
-
-STATIC_DATA_DIR="%{_awipscm_share}/awips2-static"
-
 # Copy the sql that is needed to create the maps database.
 PATH_TO_DDL="build.edex/opt/db/ddl"
 PATH_TO_MAPS_DDL="${PATH_TO_DDL}/maps"
 cp -r %{_baseline_workspace}/${PATH_TO_MAPS_DDL}/* \
    ${RPM_BUILD_ROOT}/awips2/database/sqlScripts/share/sql/maps
 
-PATH_TO_STATIC_DDL="${STATIC_DATA_DIR}/maps/${VERSION_DIR}/db"
+PATH_TO_STATIC_DDL="%{_static_files}/maps/db"
 if [ ! -d ${PATH_TO_STATIC_DDL} ]; then
-   file ${PATH_TO_STATIC_DDL}
+   echo "File ${PATH_TO_STATIC_DDL} not found!"
    exit 1
 fi
 cp ${PATH_TO_STATIC_DDL}/* \
diff --git a/rpms/awips2.core/Installer.ncep-database/component.spec b/rpms/awips2.core/Installer.ncep-database/component.spec
index 2c52b0258d..16693c76d1 100644
--- a/rpms/awips2.core/Installer.ncep-database/component.spec
+++ b/rpms/awips2.core/Installer.ncep-database/component.spec
@@ -15,13 +15,13 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: NCEP/NCO/SIB CWA
-Packager: J. Zeng / B. Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-ncep-database
-requires: awips2-database
-requires: awips2-postgresql
-requires: awips2-psql
+Provides: awips2-ncep-database
+Requires: awips2-database
+Requires: awips2-postgresql
+Requires: awips2-psql
 
 %description
 AWIPS II NCEP Database Installation - This rpm creates the ncep database and tables.
diff --git a/rpms/awips2.core/Installer.notification/component.spec b/rpms/awips2.core/Installer.notification/component.spec
index f8e4a456af..b59c0558b1 100644
--- a/rpms/awips2.core/Installer.notification/component.spec
+++ b/rpms/awips2.core/Installer.notification/component.spec
@@ -25,12 +25,16 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: boost >= 1.33.1
-requires: awips2-qpid-lib
-provides: awips2-notification
+Requires: boost >= 1.33.1
+Requires: awips2-qpid-lib
+Provides: awips2-notification
+
+BuildRequires: awips2-java
+BuildRequires: awips2-qpid-lib
+BuildRequires: libuuid-devel
 
 %description
 AWIPS II Notification Distribution - the AWIPS II Notification application.
diff --git a/rpms/awips2.core/Installer.pgadmin/component.spec b/rpms/awips2.core/Installer.pgadmin/component.spec
index b6d0355144..c51beeded6 100644
--- a/rpms/awips2.core/Installer.pgadmin/component.spec
+++ b/rpms/awips2.core/Installer.pgadmin/component.spec
@@ -17,23 +17,22 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-BuildRequires: awips2-postgresql = 9.2.3-1.el6
-BuildRequires: postgresql >= 8.4.13-1.el6_3
-BuildRequires: postgresql-devel >= 8.4.13-1.el6_3
-BuildRequires: postgresql-libs >= 8.4.13-1.el6_3
+BuildRequires: awips2-postgresql = 9.3.9
 BuildRequires: wxGTK >= 2.8.12-1
 BuildRequires: wxGTK-devel >= 2.8.12-1
+BuildRequires: libxml2
+BuildRequires: libxslt
 
-provides: awips2-pgadmin3
-requires: awips2-psql = 9.2.3-1
-requires: wxGTK >= 2.8.12-1
+Provides: awips2-pgadmin3
+Requires: awips2-psql >= 9.2.3
+Requires: wxGTK >= 2.8.12-1
 
 %description
 AWIPS II pgadmin3 Distribution - A custom compilation of the pgadmin3 client compatible with
-CentOS / Redhat 5.5.
+CentOS / Redhat 6.4.
 
 %prep
 # Ensure that a "buildroot" has been specified.
@@ -75,7 +74,7 @@ cd %{_pgadmin3_build_loc}/pgadmin3-%{_pgadmin3_version}
 export CPPFLAGS="-I/awips2/postgresql/include -I/awips2/postgresql/include/server"
 export LDFLAGS="-L/awips2/postgresql/lib"
 
-./configure --prefix=/awips2/pgadmin3
+./configure --prefix=/awips2/pgadmin3 --with-pgsql=/awips2/postgresql
 if [ $? -ne 0 ]; then
    exit 1
 fi
diff --git a/rpms/awips2.core/Installer.pypies/component.spec b/rpms/awips2.core/Installer.pypies/component.spec
index 58941d8d00..f1b6f1b72e 100644
--- a/rpms/awips2.core/Installer.pypies/component.spec
+++ b/rpms/awips2.core/Installer.pypies/component.spec
@@ -11,12 +11,12 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Nate Jensen
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-pypies
-requires: awips2-python >= 2.7-1
-requires: awips2-tools
+Provides: awips2-pypies
+Requires: awips2-python >= 2.7-1
+Requires: awips2-tools
 
 %description
 AWIPS II PyPIES Installation - Sets Up AWIPS II PyPIES.
diff --git a/rpms/awips2.core/Installer.rcm/component.spec b/rpms/awips2.core/Installer.rcm/component.spec
index 28e36273ef..878cd7f542 100644
--- a/rpms/awips2.core/Installer.rcm/component.spec
+++ b/rpms/awips2.core/Installer.rcm/component.spec
@@ -15,11 +15,14 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-rcm
-requires: awips2-java
+Provides: awips2-rcm
+Requires: awips2-java
+
+BuildRequires: awips2-ant
+BuildRequires: awips2-java
 
 %description
 AWIPS II Radar Server Installation - Sets Up AWIPS II Radar Server.
diff --git a/rpms/awips2.core/Installer.tools/component.spec b/rpms/awips2.core/Installer.tools/component.spec
index 664c7e9c06..0b36e46679 100644
--- a/rpms/awips2.core/Installer.tools/component.spec
+++ b/rpms/awips2.core/Installer.tools/component.spec
@@ -10,18 +10,19 @@ Summary: AWIPS II Tools Distribution
 Version: 1.8.5
 Release: %{_component_version}.%{_component_release}%{?dist}
 Group: AWIPSII
-BuildRequires: awips2-python-h5py
-BuildRoot: /tmp
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
 URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-tools
+Provides: awips2-tools
+
+BuildRequires: awips2-python
+BuildRequires: awips2-python-h5py
 
 %description
 AWIPS II Python Distribution - Contains the AWIPS II Tool-Set. Presently,
@@ -45,14 +46,6 @@ fi
 mkdir -p %{_tools_build_loc}
 
 %build
-# Ensure that awips2-python has been installed
-COMMAND=`rpm -q awips2-python`
-if [ $? -ne 0 ]; then
-   echo "ERROR: awips2-python Must Be Installed."
-   echo "Unable To Continue ... Terminating."
-   exit 1
-fi
-
 # Update LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=/awips2/python/lib:$LD_LIBRARY_PATH
 
diff --git a/rpms/awips2.core/Installer.topo/component.spec b/rpms/awips2.core/Installer.topo/component.spec
index 3ec49a4b52..bdeb85ecfc 100644
--- a/rpms/awips2.core/Installer.topo/component.spec
+++ b/rpms/awips2.core/Installer.topo/component.spec
@@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
 provides: awips2-data.hdf5-topo
@@ -38,47 +38,15 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-# Copies the standard Raytheon licenses into a license directory for the
-# current component.
-function copyLegal()
-{
-   # $1 == Component Build Root
-   
-   COMPONENT_BUILD_DIR=${1}
-   
-   mkdir -p ${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
-   
-   # Create a Tar file with our FOSS licenses.
-   tar -cjf %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
-      %{_baseline_workspace}/rpms/legal/FOSS_licenses/
-   
-   cp "%{_baseline_workspace}/rpms/legal/Master_Rights_File.pdf" \
-      ${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
-   cp %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar \
-      ${RPM_BUILD_ROOT}/${COMPONENT_BUILD_DIR}/licenses
-      
-   rm -f %{_baseline_workspace}/rpms/legal/FOSS_licenses.tar    
-}
-
-# Determine which version of the topo we should use.
-RPM_COMMON_DIR="%{_baseline_workspace}/rpms/common/static.versions"
-
-if [ ! -f ${RPM_COMMON_DIR}/LATEST.topo ]; then
-   file ${RPM_COMMON_DIR}/LATEST.topo
-   exit 1
-fi
-VERSION_DIR=`cat ${RPM_COMMON_DIR}/LATEST.topo`
-TOPO_SRC_DIR="awips2-static/topo/${VERSION_DIR}"
-if [ ! -d %{_awipscm_share}/${TOPO_SRC_DIR} ]; then
-   file %{_awipscm_share}/${TOPO_SRC_DIR}
+TOPO_DIR="%{_static_files}/topo/"
+if [ ! -d ${TOPO_DIR} ]; then
+   echo "Directory ${TOPO_DIR} not found!"
    exit 1
 fi
 
 TOPO_TO_COPY=\
 (\
    'gtopo30.h5'\
-   'srtm30.h5'\
-   'srtm30_plus.h5'\
    'defaultTopo.h5' \
    'akTopo.dat.gz' \
    'caribTopo.dat.gz' \
@@ -93,15 +61,13 @@ TOPO_TO_COPY=\
 
 for topoFile in ${TOPO_TO_COPY[*]};
 do
-   cp -Pp %{_awipscm_share}/${TOPO_SRC_DIR}/${topoFile} \
+   cp -Pp ${TOPO_DIR}/${topoFile} \
       ${RPM_BUILD_ROOT}/awips2/edex/data/hdf5/topo
    if [ $? -ne 0 ]; then
       exit 1
    fi
 done
 
-copyLegal "awips2/edex/data/hdf5/topo"
-
 %pre
 %post
 %preun
diff --git a/rpms/awips2.core/Installer.version/component.spec b/rpms/awips2.core/Installer.version/component.spec
index 1940a30543..40e810b014 100644
--- a/rpms/awips2.core/Installer.version/component.spec
+++ b/rpms/awips2.core/Installer.version/component.spec
@@ -24,6 +24,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}
 
 AutoReq: no
 provides: %{_component_name}
diff --git a/rpms/awips2.core/deploy.builder/build.sh b/rpms/awips2.core/deploy.builder/build.sh
index 1198e22294..66a437ae46 100644
--- a/rpms/awips2.core/deploy.builder/build.sh
+++ b/rpms/awips2.core/deploy.builder/build.sh
@@ -65,7 +65,7 @@ function buildRPM()
       echo "The AWIPSII Version is $AWIPSII_VERSION in the buildRPM function"
       echo "The AWIPSII Release is $AWIPSII_RELEASE in the buildRPM function"
 
-      rpmbuild -ba --target=i386 \
+      rpmbuild -bb --target=i386 \
          --define '_topdir %(echo ${RPM_TOP_DIR})' \
          --define '_component_version %(echo ${AWIPSII_VERSION})' \
          --define '_component_release %(echo ${AWIPSII_RELEASE})' \
@@ -73,6 +73,7 @@ function buildRPM()
          --define '_component_build_time %(echo ${AWIPSII_BUILD_TIME})' \
          --define '_component_build_system %(echo ${AWIPSII_BUILD_SYSTEM})' \
          --define '_svn_tag %(echo ${AWIPSII_BUILD_TAG})' \
+         --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
          --buildroot ${BUILDROOT_DIR} \
          ${COMPONENT_SPECS}
 
@@ -92,9 +93,10 @@ function buildRPM()
 
    export BUILDROOT_DIR="${BUILDROOT_DIR}"
    # Build The RPM.
-   rpmbuild -ba --target=i386 \
+   rpmbuild -bb --target=i386 \
       --define '_topdir %(echo ${RPM_TOP_DIR})' \
       --define '_build_root %(echo ${BUILDROOT_DIR})' \
+      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
       --define '_component_version %(echo ${AWIPSII_VERSION})' \
       --define '_component_release %(echo ${AWIPSII_RELEASE})' \
       --define '_baseline_workspace %(echo ${WORKSPACE_DIR})' \
@@ -142,7 +144,7 @@ function buildLocalizationRPMs()
 
       rm -rf ${BUILDROOT_DIR}
 
-      rpmbuild -ba \
+      rpmbuild -bb \
          --define '_topdir %(echo ${RPM_TOP_DIR})' \
          --define '_component_version %(echo ${AWIPSII_VERSION})' \
          --define '_component_release %(echo ${AWIPSII_RELEASE})' \
@@ -150,6 +152,7 @@ function buildLocalizationRPMs()
          --define '_baseline_workspace %(echo ${WORKSPACE_DIR})' \
          --define '_localization_site %(echo ${site})' \
          --define '_localization_directory %(echo ${LOCALIZATION_DIRECTORY})' \
+         --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
          --buildroot ${BUILDROOT_DIR} \
          ../Installer.localization/component.spec
       RC=$?
diff --git a/rpms/awips2.edex/Installer.edex-component/component.spec b/rpms/awips2.edex/Installer.edex-component/component.spec
index ddeec40f4e..1c626fabfe 100644
--- a/rpms/awips2.edex/Installer.edex-component/component.spec
+++ b/rpms/awips2.edex/Installer.edex-component/component.spec
@@ -16,7 +16,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 provides: awips2-%{_component_name}
 requires: awips2
diff --git a/rpms/awips2.edex/Installer.edex-configuration/component.spec b/rpms/awips2.edex/Installer.edex-configuration/component.spec
index 9642ae14d7..8be4948a1a 100644
--- a/rpms/awips2.edex/Installer.edex-configuration/component.spec
+++ b/rpms/awips2.edex/Installer.edex-configuration/component.spec
@@ -12,7 +12,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
 provides: awips2-edex-configuration
@@ -66,11 +66,6 @@ popd > /dev/null
 
 DEPLOY_SCRIPT="deploy.edex.awips2/deploy/deploy-esb.xml"
 
-BUILD_ARCH="%{_build_arch}"
-if [ "${BUILD_ARCH}" = "i386" ]; then
-   BUILD_ARCH="x86"
-fi
-
 # use deploy-install to deploy edex.
 pushd . > /dev/null
 cd %{_baseline_workspace}
@@ -79,9 +74,7 @@ cd %{_baseline_workspace}
    -Desb.overwrite=true \
    -Desb.directory=%{_baseline_workspace}/deploy.edex.awips2/esb \
    -Dedex.root.directory=${RPM_BUILD_ROOT}/awips2/edex \
-   -Dbasedir=%{_baseline_workspace}/deploy.edex.awips2 \
-   -Dbasedirectories=%{_baseline_workspace} \
-   -Darchitecture=${BUILD_ARCH}
+   -Dbasedir=%{_baseline_workspace}/deploy.edex.awips2
 if [ $? -ne 0 ]; then
    exit 1
 fi
diff --git a/rpms/awips2.edex/Installer.edex-datadelivery/component.spec b/rpms/awips2.edex/Installer.edex-datadelivery/component.spec
index 834e822372..d8d94dcca7 100644
--- a/rpms/awips2.edex/Installer.edex-datadelivery/component.spec
+++ b/rpms/awips2.edex/Installer.edex-datadelivery/component.spec
@@ -16,7 +16,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 provides: awips2-edex-datadelivery
 requires: awips2
diff --git a/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0 b/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
index 2311eec935..8b3a2c8152 100644
--- a/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
+++ b/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
@@ -1,5 +1,5 @@
-*** Installer.edex-component/component.spec	2015-08-25 15:19:06.962255321 -0500
---- Installer.edex-datadelivery/component.spec	2015-09-15 15:57:16.669506673 -0500
+*** Installer.edex-component/component.spec	2015-12-01 15:13:59.047022621 -0600
+--- Installer.edex-datadelivery/component.spec	2015-12-01 15:13:59.048022609 -0600
 ***************
 *** 6,13 ****
   %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@@ -22,7 +22,7 @@
 ***************
 *** 18,24 ****
   Vendor: Raytheon
-  Packager: Bryan Kowal
+  Packager: %{_build_site}
   
 ! provides: awips2-%{_component_name}
   requires: awips2
@@ -30,7 +30,7 @@
   requires: awips2-python
 --- 18,24 ----
   Vendor: Raytheon
-  Packager: Bryan Kowal
+  Packager: %{_build_site}
   
 ! provides: awips2-edex-datadelivery
   requires: awips2
diff --git a/rpms/awips2.edex/Installer.edex-hazards/component.spec b/rpms/awips2.edex/Installer.edex-hazards/component.spec
index c515de89de..7fc631c52a 100644
--- a/rpms/awips2.edex/Installer.edex-hazards/component.spec
+++ b/rpms/awips2.edex/Installer.edex-hazards/component.spec
@@ -16,6 +16,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
+Packager: %{_build_site}
 
 provides: awips2-%{_component_name}
 requires: awips2
diff --git a/rpms/awips2.edex/Installer.edex-hazards/hazards.patch0 b/rpms/awips2.edex/Installer.edex-hazards/hazards.patch0
index 7cfc0d0eaf..32744b6427 100644
--- a/rpms/awips2.edex/Installer.edex-hazards/hazards.patch0
+++ b/rpms/awips2.edex/Installer.edex-hazards/hazards.patch0
@@ -1,5 +1,5 @@
-*** Installer.edex-component/component.spec	2015-08-25 15:19:06.962255321 -0500
---- Installer.edex-hazards/component.spec	2015-09-17 14:08:29.271876049 -0500
+*** Installer.edex-component/component.spec	2015-12-01 15:13:59.047022621 -0600
+--- Installer.edex-hazards/component.spec	2015-12-01 15:13:59.054022541 -0600
 ***************
 *** 1,5 ****
   #
@@ -14,18 +14,8 @@
   %define __prelink_undo_cmd %{nil}
   # Turn off the brp-python-bytecompile script
 ***************
-*** 16,22 ****
-  License: N/A
-  Distribution: N/A
-  Vendor: Raytheon
-- Packager: Bryan Kowal
-  
-  provides: awips2-%{_component_name}
-  requires: awips2
---- 16,21 ----
-***************
 *** 55,60 ****
---- 54,107 ----
+--- 55,108 ----
      exit 1
   fi
   
@@ -82,7 +72,7 @@
   if [ -d %{_build_root}/$UTILITY ]; then
 ***************
 *** 87,90 ****
---- 134,140 ----
+--- 135,141 ----
   %defattr(644,awips,fxalpha,755)
   %dir /awips2
   %dir /awips2/edex
diff --git a/rpms/awips2.edex/Installer.edex-shapefiles/component.spec b/rpms/awips2.edex/Installer.edex-shapefiles/component.spec
index f3a34c1aeb..a17027dcde 100644
--- a/rpms/awips2.edex/Installer.edex-shapefiles/component.spec
+++ b/rpms/awips2.edex/Installer.edex-shapefiles/component.spec
@@ -12,12 +12,12 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-provides: awips2-edex-shapefiles
-requires: awips2
-requires: awips2-edex-base
+Provides: awips2-edex-shapefiles
+Requires: awips2
+Requires: awips2-edex-base
 
 # Turn off the brp-python-bytecompile script
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@@ -46,22 +46,9 @@ if [ $? -ne 0 ]; then
    exit 1 
 fi
 
-AWIPS2_STATIC=%{_awipscm_share}/awips2-static
-
-# Determine which version of the shapefiles we should use.
-COMMON=%{_baseline_workspace}/rpms/common
-if [ ! -f ${COMMON}/static.versions/LATEST.maps ]; then
-   file ${COMMON}/static.versions/LATEST.maps
-   exit 1
-fi
-
-LATEST=`cat ${COMMON}/static.versions/LATEST.maps`
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-SHAPEFILES=${AWIPS2_STATIC}/maps/${LATEST}/shapefiles
+SHAPEFILES=%{_static_files}/maps/shapefiles
 if [ ! -d ${SHAPEFILES} ]; then
-   file ${SHAPEFILES}
+   echo "File ${SHAPEFILES} not found!"
    exit 1
 fi
 
diff --git a/rpms/awips2.edex/Installer.edex/component.spec b/rpms/awips2.edex/Installer.edex/component.spec
index 219436573f..021485a96c 100644
--- a/rpms/awips2.edex/Installer.edex/component.spec
+++ b/rpms/awips2.edex/Installer.edex/component.spec
@@ -11,7 +11,7 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 provides: awips2-edex
 provides: awips2-base-component
@@ -56,11 +56,6 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-BUILD_ARCH="%{_build_arch}"
-if [ "${BUILD_ARCH}" = "i386" ]; then
-   BUILD_ARCH="x86"
-fi
-
 # remove any .gitignore files
 # currently, the ebxml webapp includes a .gitignore file
 /usr/bin/find ${RPM_BUILD_ROOT}/awips2/edex -name .gitignore -exec rm -f {} \;
@@ -115,11 +110,6 @@ if [ ! -f /etc/init.d/edexServiceList-datadelivery ]; then
       exit 1
    fi
 fi
-MACHINE_BIT=`uname -i`
-if [ "${MACHINE_BIT}" = "i386" ]
-then
-    rm -Rf /awips2/edex/lib/lib64
-fi
 
 # We need to create a link to the python shared library if it does not exist.
 pushd . > /dev/null 2>&1
diff --git a/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel b/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel
index 89d140dce3..ecdeb6205e 100644
--- a/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel
+++ b/rpms/awips2.edex/Installer.edex/scripts/init.d/edex_camel
@@ -100,6 +100,7 @@ startEDEX() {
    local LOG=${EDEX_INSTALL}/logs/start-edex-${1}-$TODAY.log
    local TIME=`/bin/date "+%F %T"`
    echo "$TIME: Service edex_camel Starting EDEX ${1}" >> $LOG
+   chmod a+r $LOG
 
    su - $EDEXUSER -c "$DAEMON &" >> $LOG 2>&1
    sleep 10
@@ -129,6 +130,7 @@ stopEDEX() {
    local LOG=${EDEX_INSTALL}/logs/start-edex-${1}-$TODAY.log
    local TIME=`/bin/date "+%F %T"`
    echo "$TIME: Service edex_camel Stopping EDEX ${1}" >> $LOG
+   chmod a+r $LOG
 
    if [ "$_wrapper_pid" != "" -a "$_wrapper_pid" != "1" ]; then
       kill $_wrapper_pid
diff --git a/rpms/awips2.edex/deploy.builder/build.sh b/rpms/awips2.edex/deploy.builder/build.sh
index ff168bc062..4487516e34 100644
--- a/rpms/awips2.edex/deploy.builder/build.sh
+++ b/rpms/awips2.edex/deploy.builder/build.sh
@@ -3,32 +3,26 @@
 
 # Build Variables:
 # -----------------------------------------------------------------------------
-VAR_AWIPSII_TOP_DIR="/home/bkowal/rpmbuild"
-VAR_WORKSPACE="/common/bkowal/git/thunder/baseline"
 VAR_AWIPSII_BUILD_ROOT="/tmp/awips-component"
 VAR_AWIPSII_VERSION=""
 VAR_AWIPSII_RELEASE=""
 VAR_UFRAME_ECLIPSE="/opt/uframe-eclipse"
-VAR_AWIPSCM_SHARE="/awipscm"
 # -----------------------------------------------------------------------------
 
-if [ "${AWIPSII_TOP_DIR}" = "" ] &&
-   [ "${VAR_AWIPSII_TOP_DIR}" = "" ]; then
+if [ "${AWIPSII_TOP_DIR}" = "" ]; then
    echo "ERROR: You Must Set the AWIPSII_TOP_DIR Environment Variable."
    echo "Unable to Continue ... Terminating."
    exit 1
 fi
 
+if [ "${WORKSPACE}" = "" ]; then
+   echo "ERROR: You Must Set the WORKSPACE Environment Variable."
+   echo "Unable to Continue ... Terminating."
+   exit 1
+fi
+
 function prepareBuildEnvironment()
 {
-   if [ "${AWIPSII_TOP_DIR}" = "" ]; then
-      export AWIPSII_TOP_DIR="${VAR_AWIPSII_TOP_DIR}"
-   fi
-
-   if [ "${WORKSPACE}" = "" ]; then
-      export WORKSPACE="${VAR_WORKSPACE}"
-   fi
-
    if [ "${AWIPSII_BUILD_ROOT}" = "" ]; then
       export AWIPSII_BUILD_ROOT="${VAR_AWIPSII_BUILD_ROOT}"
    fi
@@ -52,32 +46,14 @@ function prepareBuildEnvironment()
    if [ "${UFRAME_ECLIPSE}" = "" ]; then
       export UFRAME_ECLIPSE="${VAR_UFRAME_ECLIPSE}"
    fi
-
-   if [ "${AWIPSCM_SHARE}" = "" ]; then
-      export AWIPSCM_SHARE="${VAR_AWIPSCM_SHARE}"
-   fi
 }
 
-function setTargetArchitecture()
-{
-   # Set the target build architecture for the rpms based on the EDEX build
-   # architecture.
-   export TARGET_BUILD_ARCH="${EDEX_BUILD_ARCH}"
-   export EDEX_BUILD_BITS="64"
-   if [ "${EDEX_BUILD_ARCH}" = "x86" ]; then
-      export TARGET_BUILD_ARCH="i386"
-      export EDEX_BUILD_BITS="32"
-   fi
-}
-
-
-export TARGET_BUILD_ARCH=
-# If the architecture has not been specified, default to 32-bit.
-if [ "${EDEX_BUILD_ARCH}" = "" ]; then
-   export EDEX_BUILD_ARCH="x86"
-   echo "The Build Architecture was not specified ... defaulting to x86."
-else
-   echo "Building for architecture ... ${EDEX_BUILD_ARCH}."
+# Build EDEX as 64 bit only.
+architecture=`uname -i`
+if [ ! "${architecture}" = "x86_64" ]; then
+   echo "ERROR: This build can only be performed on a 64-bit Operating System."
+   echo "Unable to Continue ... Terminating."
+   exit 1
 fi
 
 function patchSpecification()
@@ -107,17 +83,15 @@ function buildRPM()
 
    if [ ! "${COMPONENT_NAME}" = "edex-binlightning" ] ||
       [ ${LIGHTNING} = true ]; then
-      rpmbuild -ba --target=${TARGET_BUILD_ARCH} \
+      /usr/bin/rpmbuild -bb \
          --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
          --define '_baseline_workspace %(echo ${WORKSPACE})' \
          --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
-         --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
          --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
+         --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
          --define '_component_version %(echo ${AWIPSII_VERSION})' \
          --define '_component_release %(echo ${AWIPSII_RELEASE})' \
          --define '_component_name %(echo ${COMPONENT_NAME})' \
-         --define '_build_arch %(echo ${EDEX_BUILD_ARCH})' \
-         --define '_build_bits %(echo ${EDEX_BUILD_BITS})' \
          --buildroot ${AWIPSII_BUILD_ROOT} \
          ${1}/component.spec
       RC=$?
@@ -148,7 +122,6 @@ if [ ${RC} -ne 0 ]; then
    exit 1
 fi
 popd
-setTargetArchitecture
 
 # Adjust Our Execution Position.
 cd ../
@@ -173,6 +146,7 @@ do
       [ ! "${edex_component}" = "edex-hazards" ]; then
       export COMPONENT_NAME="${edex_component}"
       buildRPM "Installer.edex-component"
+      unset COMPONENT_NAME
    fi
 done
 
@@ -182,5 +156,3 @@ patchSpecification
 buildRPM "Installer.edex-datadelivery"
 unset COMPONENT_NAME
 
-#build shapefiles RPM last
-buildRPM "Installer.edex-shapefiles"
diff --git a/rpms/build/common/lookupRPM.sh b/rpms/build/common/lookupRPM.sh
index 21b8df899d..3415070600 100644
--- a/rpms/build/common/lookupRPM.sh
+++ b/rpms/build/common/lookupRPM.sh
@@ -23,9 +23,8 @@ function lookupRPM()
 
    awips2_ade_dir="${rpms_dir}/awips2.ade"
    awips2_cave_dir="${rpms_dir}/awips2.cave"
-   awips2_core_dir="${rpms_dir}/awips2.core"
    awips2_edex_dir="${rpms_dir}/awips2.edex"
-   awips2_qpid_dir="${rpms_dir}/awips2.qpid"
+   awips2_core_dir="${rpms_dir}/awips2.core"
    python_site__dir="${rpms_dir}/python.site-packages"
 
    installer_dir="${rpms_dir}/../installers/RPMs"
@@ -34,11 +33,11 @@ function lookupRPM()
 
    # foss rpms -> python rpms.
    if [ "${1}" = "awips2-maven" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/maven-3.2.3/"
+      export RPM_SPECIFICATION="${installer_dir}/maven/"
       return 0
    fi
    if [ "${1}" = "awips2-python" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/python-2.7.10/"
+      export RPM_SPECIFICATION="${installer_dir}/python/"
       return 0
    fi
    if [ "${1}" = "awips2-python-cherrypy" ]; then
@@ -50,31 +49,31 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-python-h5py" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/h5py-1.3.0/"
+      export RPM_SPECIFICATION="${installer_dir}/h5py/"
       return 0
    fi
    if [ "${1}" = "awips2-python-setuptools" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/setuptools-18.0.1/"
+      export RPM_SPECIFICATION="${installer_dir}/setuptools/"
       return 0
    fi
    if [ "${1}" = "awips2-python-matplotlib" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/matplotlib-1.4.3/"
+      export RPM_SPECIFICATION="${installer_dir}/matplotlib/"
       return 0
    fi
    if [ "${1}" = "awips2-python-dateutil" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/python-dateutil-2.4.2/"
+      export RPM_SPECIFICATION="${installer_dir}/python-dateutil/"
       return 0
    fi
    if [ "${1}" = "awips2-python-pytz" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/pytz-2015.4/"
+      export RPM_SPECIFICATION="${installer_dir}/pytz/"
       return 0
    fi
    if [ "${1}" = "awips2-python-six" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/six-1.9.0/"
+      export RPM_SPECIFICATION="${installer_dir}/six/"
       return 0
    fi
    if [ "${1}" = "awips2-python-pyparsing" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/pyparsing-2.0.3/"
+      export RPM_SPECIFICATION="${installer_dir}/pyparsing/"
       return 0
    fi
    if [ "${1}" = "awips2-python-nose" ]; then
@@ -82,15 +81,11 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-python-numpy" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/numpy-1.9.2/"
+      export RPM_SPECIFICATION="${installer_dir}/numpy/"
       return 0
    fi
    if [ "${1}" = "awips2-python-jep" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/jep-3.4.1/"
-      return 0
-   fi
-   if [ "${1}" = "awips2-python-pil" ]; then
-      export RPM_SPECIFICATION="${python_site__dir}/Installer.pil"
+      export RPM_SPECIFICATION="${installer_dir}/jep/"
       return 0
    fi
    if [ "${1}" = "awips2-python-pmw" ]; then
@@ -102,19 +97,19 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-python-qpid" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/qpid-python-0.32"
+      export RPM_SPECIFICATION="${installer_dir}/qpid-python"
       return 0
    fi
    if [ "${1}" = "awips2-python-scientific" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/scientific-2.8"
+      export RPM_SPECIFICATION="${installer_dir}/scientific"
       return 0
    fi
    if [ "${1}" = "awips2-python-scipy" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/scipy-0.15.1/"
+      export RPM_SPECIFICATION="${installer_dir}/scipy/"
       return 0
    fi
    if [ "${1}" = "awips2-python-tables" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/tables-2.1.2/"
+      export RPM_SPECIFICATION="${installer_dir}/tables/"
       return 0
    fi
    if [ "${1}" = "awips2-python-thrift" ]; then
@@ -133,16 +128,8 @@ function lookupRPM()
       export RPM_SPECIFICATION="${python_site__dir}/Installer.werkzeug"
       return 0
    fi
-   if [ "${1}" = "awips2-python-pygtk" ]; then
-      export RPM_SPECIFICATION="${python_site__dir}/Installer.pygtk"
-      return 0
-   fi
-   if [ "${1}" = "awips2-python-pycairo" ]; then
-      export RPM_SPECIFICATION="${python_site__dir}/Installer.pycairo"
-      return 0
-   fi
    if [ "${1}" = "awips2-python-shapely" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/shapely-1.4.4/"
+      export RPM_SPECIFICATION="${installer_dir}/shapely/"
       return 0
    fi
 
@@ -228,19 +215,28 @@ function lookupRPM()
    fi
 
    # foss rpms.
-   if [ "${1}" = "-qpid" ]; then
+   if [ "${1}" = "awips2-qpid-java" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/qpid-java"
+      return 0
+   fi
+   if [ "${1}" = "awips2-qpid-lib" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/qpid-lib"
+      return 0
+   fi
+   if [ "${1}" = "awips2-qpid-java-broker" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/qpid-java-broker"
       return 0
    fi
    if [ "${1}" = "awips2-ant" ]; then
-      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.ant"
+      export RPM_SPECIFICATION="${installer_dir}/ant"
       return 0
    fi
    if [ "${1}" = "awips2-httpd-pypies" ]; then
-      export RPM_SPECIFICATION="${awips2_core_dir}/Installer.httpd-pypies"
+      export RPM_SPECIFICATION="${installer_dir}/httpd-pypies"
       return 0
    fi
    if [ "${1}" = "awips2-java" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/java-1.7"
+      export RPM_SPECIFICATION="${installer_dir}/java"
       return 0
    fi
    if [ "${1}" = "awips2-groovy" ]; then
@@ -251,8 +247,8 @@ function lookupRPM()
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.ldm"
       return 0
    fi
-   if [ "${1}" = "awips2-postgres" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/postgresql-9.3.9"
+   if [ "${1}" = "awips2-postgresql" ]; then
+      export RPM_SPECIFICATION="${installer_dir}/postgresql"
       return 0
    fi
    if [ "${1}" = "awips2-pgadmin3" ]; then
@@ -264,11 +260,11 @@ function lookupRPM()
       return 0
    fi
    if [ "${1}" = "awips2-eclipse" ]; then
-      export RPM_SPECIFICATION="${awips2_ade_dir}/Installer.eclipse"
+      export RPM_SPECIFICATION="${installer_dir}/eclipse"
       return 0
    fi
    if [ "${1}" = "awips2-yajsw" ]; then
-      export RPM_SPECIFICATION="${installer_dir}/yajsw-11.11"
+      export RPM_SPECIFICATION="${installer_dir}/yajsw"
       return 0
    fi
 
@@ -289,6 +285,10 @@ function lookupRPM()
       export RPM_SPECIFICATION="${awips2_core_dir}/Installer.edex-environment/edex"
       return 0
    fi
+   if [ "${1}" = "awips2-edex-shapefiles" ]; then
+      export RPM_SPECIFICATION="${awips2_edex_dir}/Installer.edex-shapefiles"
+      return 0
+   fi
 
    return 1
 }
diff --git a/rpms/build/common/rpms.sh b/rpms/build/common/rpms.sh
deleted file mode 100644
index 423f0399aa..0000000000
--- a/rpms/build/common/rpms.sh
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/bin/bash
-
-function buildJava()
-{
-   pushd . > /dev/null 2>&1
-
-   cd ${WORKSPACE}/installers/RPMs/java-1.7
-   /bin/bash build.sh
-   if [ $? -ne 0 ]; then
-      return 1
-   fi
-
-   popd > /dev/null 2>&1
-}
-
-function buildQPID()
-{
-   # Arguments:
-   #   ${1} == optionally -ade
-
-   pushd . > /dev/null 2>&1
-
-   # ensure that the destination rpm directories exist
-   if [ ! -d ${AWIPSII_TOP_DIR}/RPMS/noarch ]; then
-      mkdir -p ${AWIPSII_TOP_DIR}/RPMS/noarch
-      if [ $? -ne 0 ]; then
-         exit 1
-      fi
-   fi
-
-   # ensure that the destination rpm directories exist
-   if [ ! -d ${AWIPSII_TOP_DIR}/RPMS/x86_64 ]; then
-      mkdir -p ${AWIPSII_TOP_DIR}/RPMS/x86_64
-      if [ $? -ne 0 ]; then
-         exit 1
-      fi
-   fi
-   
-   cd ${WORKSPACE}/installers/RPMs/qpid-lib-0.32
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build the qpid rpms."
-      return 1
-   fi
-
-   /bin/bash build.sh
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build the qpid rpms."
-      return 1
-   fi
-
-   #build 0.32
-   export AWIPS_II_TOP_DIR
-   cd ${WORKSPACE}/installers/RPMs/qpid-java-broker-0.32
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build Qpid Broker v0.32."
-      return 1
-   fi
-   /bin/bash build.sh
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build Qpid Broker v0.32."
-      return 1
-   fi
-
-   popd > /dev/null 2>&1
-
-   return 0
-}
-
-function buildEDEX()
-{
-   cd ${WORKSPACE}/rpms/awips2.edex/deploy.builder
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build the edex rpms."
-      return 1
-   fi
-
-   # Determine the build architecture.
-   export EDEX_BUILD_ARCH=`uname -i`
-   if [ "${EDEX_BUILD_ARCH}" = "i386" ]; then
-      export EDEX_BUILD_ARCH="x86"
-   fi
-
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to determine the architecture."
-      return 1
-   fi
-   /bin/bash build.sh
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build the edex rpms."
-      return 1
-   fi
-
-   return 0
-}
-
-function buildCAVE()
-{
-   cd ${WORKSPACE}/rpms/awips2.cave/deploy.builder
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build the cave rpms."
-      return 1
-   fi
-
-   # Determine the build architecture.
-   export CAVE_BUILD_ARCH=`uname -i`
-   if [ "${CAVE_BUILD_ARCH}" = "i386" ]; then
-      export CAVE_BUILD_ARCH="x86"
-   fi
-
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to determine the architecture."
-      return 1
-   fi
-   /bin/bash build.sh
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build the cave rpms."
-      return 1
-   fi
-
-   return 0
-}
-
-function buildLocalizationRPMs()
-{
-   awips2_core_directory=${WORKSPACE}/rpms/awips2.core
-   extract_site_pl="${awips2_core_directory}/deploy.builder/extractSite.pl"
-   installer_localization_directory="${awips2_core_directory}/Installer.localization"
-   localization_SPECIFICATION="${installer_localization_directory}/component.spec"
-
-   # Find all of the localization.${site} directories, if there are any.
-   ls ${WORKSPACE}/localization.* > /dev/null 2>&1
-   RC=$?
-   if [ ${RC} -ne 0 ]; then
-      # There are not any localization projects.
-      echo "INFO: There are not any localization projects."
-      return 0
-   fi
-
-   for localization in `cd ${WORKSPACE}; ls -1d localization.*;`; do
-      site=`/usr/bin/perl ${extract_site_pl} ${localization}`
-      if [ $? -ne 0 ]; then
-         return 1
-      fi
-      export LOCALIZATION_DIRECTORY="${localization}"
-      export COMPONENT_NAME="awips2-localization-${site}"
-      export site=${site}
-
-      echo "Building localization rpm for site: ${site}."
-
-      rpmbuild -ba \
-         --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
-         --define '_component_version %(echo ${AWIPSII_VERSION})' \
-         --define '_component_release %(echo ${AWIPSII_RELEASE})' \
-         --define '_component_name %(echo ${COMPONENT_NAME})' \
-         --define '_baseline_workspace %(echo ${WORKSPACE})' \
-         --define '_localization_directory %(echo ${LOCALIZATION_DIRECTORY})' \
-         --define '_localization_site %(echo ${site})' \
-         --buildroot ${AWIPSII_BUILD_ROOT} \
-         ${localization_SPECIFICATION}
-      RC=$?
-      unset LOCALIZATION_DIRECTORY
-      unset COMPONENT_NAME
-      if [ ${RC} -ne 0 ]; then
-         return 1
-      fi
-   done
-
-   return 0
-}
-
-function unpackHttpdPypies()
-{
-   # This function will unpack the httpd-pypies SOURCES
-   # into the: ${AWIPSII_TOP_DIR}/SOURCES directory.
-   awips2_core_directory=${WORKSPACE}/rpms/awips2.core
-   httpd_pypies_directory=${awips2_core_directory}/Installer.httpd-pypies
-   httpd_SOURCES=${httpd_pypies_directory}/src/httpd-2.2.15-SOURCES.tar
-
-   /bin/tar -xvf ${httpd_SOURCES} -C ${AWIPSII_TOP_DIR}/SOURCES
-   if [ $? -ne 0 ]; then
-      return 1
-   fi
-   cp -vf ${httpd_pypies_directory}/SOURCES/* ${AWIPSII_TOP_DIR}/SOURCES
-   if [ $? -ne 0 ]; then
-      return 1
-   fi
-
-   return 0
-}
diff --git a/rpms/build/common/usage.sh b/rpms/build/common/usage.sh
deleted file mode 100644
index f25f91ec5f..0000000000
--- a/rpms/build/common/usage.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# This script will just display the usage information.
-function usage()
-{
-   echo "Usage: $0 OPTION [-nobinlightning]"
-   echo "   -delta    perform a build of only the rpms that are likely to change."
-   echo "   -full     perform a full build of all the rpms."
-   echo "   -ade      build all rpms that are packaged in the ade."
-   echo "   -viz      only build the Viz rpms (CAVE & AlertViz)."
-   echo "   -edex     only build the EDEX rpms."
-   echo "   -qpid     build only the QPID rpms."
-   echo "   -ldm      build the awips2-ldm rpm; requires root privileges."
-   echo "   -dev      call functions directly"
-   echo "   -package  create a yum repository tar file with the rpms that were just built."
-   echo "   --help    display this message and exit."
-
-   return 0
-}
diff --git a/rpms/build/i386/build.sh b/rpms/build/i386/build.sh
index 25ea08fbad..6ab42fe114 100644
--- a/rpms/build/i386/build.sh
+++ b/rpms/build/i386/build.sh
@@ -10,12 +10,13 @@ function buildRPM()
       exit 1
    fi
 
-   /usr/bin/rpmbuild -ba \
+   /usr/bin/rpmbuild -bb \
       --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
       --define '_baseline_workspace %(echo ${WORKSPACE})' \
       --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
-      --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
+      --define '_static_files %(echo ${AWIPSII_STATIC_FILES})' \
       --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
+      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
       --define '_component_version %(echo ${AWIPSII_VERSION})' \
       --define '_component_release %(echo ${AWIPSII_RELEASE})' \
       --define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
@@ -55,16 +56,6 @@ if [ $? -ne 0 ]; then
    echo "ERROR: Unable to source the common functions."
    exit 1
 fi
-source ${common_dir}/usage.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
-source ${common_dir}/rpms.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
 source ${common_dir}/systemInfo.sh
 if [ $? -ne 0 ]; then
    echo "ERROR: Unable to retrieve the system information."
@@ -78,54 +69,26 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
-export LIGHTNING=true
-# Determine if the optional '-nobinlightning' argument has been specified.
-if [ "${2}" = "-nobinlightning" ]; then
-   LIGHTNING=false
+if [ "${1}" = "-full" ]; then
+   buildRPM "awips2-qpid-lib"
+   buildRPM "awips2-qpid-java"
+   buildRPM "awips2-qpid-java-broker"
+   buildRPM "awips2-java"
+   buildRPM "awips2-notification"
+
+   exit 0
 fi
 
-if [ "${1}" = "-python-qpid" ]; then
-#   buildRPM "awips2"
-#   buildRPM "awips2-python-qpid"
-#   buildRPM "awips2-python"
-#   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-#   buildRPM "awips2-python-nose"
-#   buildRPM "awips2-python-numpy"
-#   buildRPM "awips2-python-h5py"
-#   buildRPM "awips2-python-jimporter"
-#   buildRPM "awips2-python-matplotlib"
-#   buildRPM "awips2-python-pil"
-#   buildRPM "awips2-python-pmw"
-#   buildRPM "awips2-python-pupynere"
-#   buildRPM "awips2-python-scientific"
-#   buildRPM "awips2-python-scipy"
-#   buildRPM "awips2-python-tables"
-#   buildRPM "awips2-python-thrift"
-#   buildRPM "awips2-python-tpg"
-#   buildRPM "awips2-python-ufpy"
-#   buildRPM "awips2-python-werkzeug"
-#   buildRPM "awips2-python-pygtk"
-#   buildRPM "awips2-python-pycairo"
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
+if [ "${1}" = "-qpid" ]; then
+   buildRPM "awips2-qpid-lib"
+   buildRPM "awips2-qpid-java"
+   buildRPM "awips2-qpid-java-broker"
 
-   buildQPID
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
+   exit 0
+fi
 
-   #buildRPM "awips2-ant"
-   #unpackHttpdPypies
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   #buildRPM "awips2-httpd-pypies"
-   #buildRPM "awips2-java"
-   #buildRPM "awips2-ldm"
-   #buildRPM "awips2-tools"
-   buildRPM "awips2-python-shapely"
+if [ "${1}" = "-java" ]; then
+   buildRPM "awips2-java"
 
    exit 0
 fi
@@ -136,311 +99,11 @@ if [ "${1}" = "-notification" ]; then
    exit 0
 fi
 
+echo "Usage: $0 OPTION"
+echo "   -full          perform a full build of all the rpms."
+echo "   -qpid          build only the QPID rpms."
+echo "   -java          build only the Java rpm."
+echo "   -notification  build only the notification rpm."
+echo "   --help         display this message and exit."
 
-if [ "${1}" = "-postgres" ]; then
-   buildRPM "awips2-postgres"
-   buildRPM "awips2-database-server-configuration"
-   buildRPM "awips2-database-standalone-configuration"
-   buildRPM "awips2-database"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-pgadmin3"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-notification"
-   buildRPM "awips2-tools"
-
-   exit 0
-fi
-
-if [ "${1}" = "-delta" ]; then
-   buildRPM "awips2"
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   buildRPM "awips2"
-   buildRPM "awips2-ncep-database"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-ufpy"
-
-   buildRPM "awips2-adapt-native"
-   buildRPM "awips2-aviation-shared"
-   buildRPM "awips2-cli"
-   buildRPM "awips2-database"
-   buildRPM "awips2-database-server-configuration"
-   buildRPM "awips2-database-standalone-configuration"
-   buildRPM "awips2-hydroapps-shared"
-   buildRPM "awips2-localapps-environment"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-notification"
-   buildRPM "awips2-pypies"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-data.gfe"
-   buildRPM "awips2-rcm"
-   buildRPM "awips2-edex-environment"
-   buildLocalizationRPMs
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-full" ]; then
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-jimporter"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-
-   buildRPM "awips2"
-   buildRPM "awips2-adapt-native"
-   buildRPM "awips2-aviation-shared"
-   buildRPM "awips2-cli"
-   buildRPM "awips2-database"
-   buildRPM "awips2-database-server-configuration"
-   buildRPM "awips2-database-standalone-configuration"
-   buildRPM "awips2-data.gfe"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-hydroapps-shared"
-   buildRPM "awips2-localapps-environment"
-   buildRPM "awips2-ncep-database"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-notification"
-   buildRPM "awips2-pypies"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-rcm"
-   buildLocalizationRPMs
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   buildQPID
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   buildRPM "awips2-ant"
-   unpackHttpdPypies
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-httpd-pypies"
-   buildJava
-   buildRPM "awips2-groovy"
-   buildRPM "awips2-ldm"
-   buildRPM "awips2-postgres"
-   buildRPM "awips2-pgadmin3"
-   buildRPM "awips2-tools"
-   buildRPM "awips2-edex-environment"
-   buildRPM "awips2-openfire"
-   buildRPM "awips2-collab-dataserver"
-   buildRPM "awips2-python-shapely"
-
-   exit 0
-fi
-
-if [ "${1}" = "-ade" ]; then
-   buildRPM "awips2-eclipse"
-   buildJava
-   buildRPM "awips2-ant"
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-jimporter"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-   buildRPM "awips2-python-shapely"
-   buildQPID -ade
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   # Package the ade.
-   # Create the containing directory.
-   ade_directory="awips2-ade-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
-   if [ -d ${WORKSPACE}/${ade_directory} ]; then
-      rm -rf ${WORKSPACE}/${ade_directory}
-      if [ $? -ne 0 ]; then
-         exit 1
-      fi
-   fi
-   mkdir -p ${WORKSPACE}/${ade_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   # Copy the rpms to the directory.
-   cp -v ${AWIPSII_TOP_DIR}/RPMS/i386/* \
-      ${AWIPSII_TOP_DIR}/RPMS/noarch/* \
-      ${WORKSPACE}/${ade_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   awips2_ade_directory="${WORKSPACE}/rpms/awips2.ade"
-   # Copy the install and uninstall script to the directory.
-   cp -v ${awips2_ade_directory}/tar.ade/scripts/*.sh \
-      ${WORKSPACE}/${ade_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-    # Build the source jar file
-    ade_work_dir="/home/dmsys/Dim12/build/AWIPS2/AWIPS2-ADE-OB13.5.1-CM"
-    cd $ade_work_dir
-    ./build_source_jar.sh
-    cp -v /tmp/awips-component/tmp/awips2-ade-baseline-SOURCES.jar ${WORKSPACE}/${ade_directory}
-
-   # Tar the directory.
-   pushd . > /dev/null 2>&1
-   cd ${WORKSPACE}
-   tar -cvf ${ade_directory}.tar ${ade_directory}
-   popd > /dev/null 2>&1
-   RC=$?
-   if [ ${RC} -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-viz" ]; then
-   buildRPM "awips2"
-   buildRPM "awips2-common-base"
-  # buildRPM "awips2-rcm"
-  # buildRPM "awips2-hydroapps-shared"
-  # buildRPM "awips2-notification"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-
-   exit 0
-fi
-
-if [ "${1}" = "-edex" ]; then
-   #buildRPM "awips2"
-   #buildRPM "awips2-common-base"
- #  buildRPM "awips2-adapt-native"
-   #buildRPM "awips2-python-qpid"
- # buildRPM "awips2-cli"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
- # buildRPM "awips2-ncep-database"
- # buildRPM "awips2-python-dynamicserialize"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-qpid" ]; then
-   buildQPID
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-ldm" ]; then
-   buildRPM "awips2-ldm"
-
-   exit 0
-fi
-
-if [ "${1}" = "-package" ]; then
-   repository_directory="awips2-repository-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
-   if [ -d ${WORKSPACE}/${repository_directory} ]; then
-      rm -rf ${WORKSPACE}/${repository_directory}
-      if [ $? -ne 0 ]; then
-         exit 1
-      fi
-   fi
-   mkdir -p ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   cp -r ${AWIPSII_TOP_DIR}/RPMS/* \
-      ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   rpms_directory="${WORKSPACE}/rpms"
-   comps_xml="${rpms_directory}/common/yum/arch.x86/comps.xml"
-   cp -v ${comps_xml} ${WORKSPACE}/${repository_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   pushd . > /dev/null
-   cd ${WORKSPACE}
-   tar -cvf ${repository_directory}.tar ${repository_directory}
-   RC=$?
-   popd > /dev/null
-   if [ ${RC} -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-
-usage
 exit 0
diff --git a/rpms/build/i386/buildEnvironment.sh b/rpms/build/i386/buildEnvironment.sh
index ada7c5f90c..53cf688341 100644
--- a/rpms/build/i386/buildEnvironment.sh
+++ b/rpms/build/i386/buildEnvironment.sh
@@ -4,8 +4,8 @@
 export AWIPSII_VERSION="11.9.0"
 export AWIPSII_RELEASE="20120223"
 
-export AWIPSII_TOP_DIR="/home/bkowal/rpmbuild"
-export WORKSPACE="/common/bkowal/git/thunder/baseline"
+export AWIPSII_TOP_DIR="/tmp/${USER}/rpmbuild"
+export WORKSPACE="/tmp/${USER}/baseline"
 export UFRAME_ECLIPSE="/opt/uframe-eclipse"
-export AWIPSCM_SHARE="/awipscm"
 export AWIPSII_BUILD_ROOT="/tmp/${USER}/awips-component"
+
diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh
index 367816af0f..ad65fab3c1 100644
--- a/rpms/build/x86_64/build.sh
+++ b/rpms/build/x86_64/build.sh
@@ -1,44 +1,17 @@
 #!/bin/bash
 
-function buildRPM()
+function usage()
 {
-   # Arguments:
-   #   ${1} == the name of the rpm.
-   lookupRPM "${1}"
-   if [ $? -ne 0 ]; then
-      echo "ERROR: '${1}' is not a recognized AWIPS II RPM."
-      exit 1
-   fi
-
-	buildRPMExec "${RPM_SPECIFICATION}"
+   echo "Usage: $0 OPTION [-nobinlightning]"
+   echo "   -buildRPM preform a build of an rpm."
+   echo "   -WA       perform a build of all work assignments."
+   echo "   -rh6      perform a full build of all the rpms."
+   echo "   -dev      call functions directly"
+   echo "   --help    display this message and exit."
 
    return 0
 }
 
-function buildRPMExec()
-{
-	# Arguments:
-	# 1) specs file location
-
-   /usr/bin/rpmbuild -ba \
-      --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
-      --define '_baseline_workspace %(echo ${WORKSPACE})' \
-      --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
-      --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
-      --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
-      --define '_component_version %(echo ${AWIPSII_VERSION})' \
-      --define '_component_release %(echo ${AWIPSII_RELEASE})' \
-      --define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
-      --define '_component_build_time %(echo ${COMPONENT_BUILD_TIME})' \
-      --define '_component_build_system %(echo ${COMPONENT_BUILD_SYSTEM})' \
-      --buildroot ${AWIPSII_BUILD_ROOT} \
-      ${1}/component.spec
-   if [ $? -ne 0 ]; then
-      echo "ERROR: Failed to build RPM ${1}."
-      exit 1
-   fi
-}
-
 # This script will build all of the 64-bit rpms.
 # Ensure that we are on a machine with the correct architecture.
 
@@ -63,16 +36,6 @@ if [ $? -ne 0 ]; then
    echo "ERROR: Unable to source the common functions."
    exit 1
 fi
-source ${common_dir}/usage.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
-source ${common_dir}/rpms.sh
-if [ $? -ne 0 ]; then
-   echo "ERROR: Unable to source the common functions."
-   exit 1
-fi
 source ${common_dir}/systemInfo.sh
 if [ $? -ne 0 ]; then
    echo "ERROR: Unable to retrieve the system information."
@@ -86,11 +49,32 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 
+source ${dir}/rpms.sh
+if [ $? -ne 0 ]; then
+   echo "ERROR: Unable to source the RPM functions."
+   exit 1
+fi
+
 source ${dir}/WA_rpm_build.sh
 if [ $? -ne 0 ]; then
 	echo "WARNING: Unable to find the WA-RPM Build Contributions."
 fi
 
+#Check if the build root directory has execute permissions.
+TMPFILE=${AWIPSII_BUILD_ROOT}/tmp.sh
+if [ ! -d ${AWIPSII_BUILD_ROOT} ]; then
+    mkdir -p ${AWIPSII_BUILD_ROOT}
+fi
+echo "#!/bin/bash" > ${TMPFILE}
+chmod a+x ${TMPFILE}
+${TMPFILE}
+RTN=$?
+rm -f ${TMPFILE}
+if [ $RTN -ne 0 ]; then
+   echo "Directory ${AWIPSII_BUILD_ROOT} does not have execute permissions!"
+   exit 1
+fi
+
 export LIGHTNING=true
 # Determine if the optional '-nobinlightning' argument has been specified.
 if [ "${2}" = "-nobinlightning" ]; then
@@ -99,7 +83,7 @@ fi
 
 if [ "${1}" = "-buildRPM" -a -n "${2}" ]; then
    echo "Building RPM: ${2}"
-   # also allow buildJava, buildRPM args
+   # also allow buildCAVE, buildEDEX, buildRPM args
    buildName=`echo ${2} | cut -c1-5`
    if [ ${#2} -gt 5 -a "$buildName" = "build" ]; then
       ${2}
@@ -113,61 +97,21 @@ if [ "${1}" = "-buildRPM" -a -n "${2}" ]; then
 fi
 
 if [ "${1}" = "-WA" ]; then
-	WA_rpm_build
-	exit 0
-fi
-
-if [ "${1}" = "-64bit" ]; then
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-   buildRPM "awips2-python-jep"
-   buildJava
-   buildRPM "awips2"
-   buildRPM "awips2-python-shapely"
-   buildRPM "awips2-notification"
-
+   WA_rpm_build
    exit 0
 fi
 
 if [ "${1}" = "-rh6" ]; then
+   buildCAVE
+   buildRPM "awips2-alertviz"
+   buildEDEX
    buildRPM "awips2-common-base"
    buildRPM "awips2-notification"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
    buildRPM "awips2-hydroapps-shared"
-   buildJava
+   buildRPM "awips2-java"
    buildRPM "awips2-python"
    buildRPM "awips2-python-cherrypy"
    buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-pil"
    buildRPM "awips2-python-qpid"
    buildRPM "awips2-python-thrift"
    buildRPM "awips2-python-werkzeug"
@@ -182,8 +126,6 @@ if [ "${1}" = "-rh6" ]; then
    buildRPM "awips2-python-tpg"
    buildRPM "awips2-python-ufpy"
    buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-pycairo"
-   buildRPM "awips2-python-pygtk"
    buildRPM "awips2-python-shapely"
    buildRPM "awips2-python-jep"
    buildRPM "awips2-python-dateutil"
@@ -194,23 +136,14 @@ if [ "${1}" = "-rh6" ]; then
    buildRPM "awips2-ant"
    buildRPM "awips2-maven"
    buildRPM "awips2-tools"
-   buildRPM "awips2-postgres"
+   buildRPM "awips2-eclipse"
+   buildRPM "awips2-postgresql"
    buildRPM "awips2-pgadmin3"
-   unpackHttpdPypies
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
    buildRPM "awips2-httpd-pypies"
-   buildQPID
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
+   buildRPM "awips2-qpid-lib"
+   buildRPM "awips2-qpid-java"
+   buildRPM "awips2-qpid-java-broker"
    buildRPM "awips2-ldm"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
    buildRPM "awips2-database-server-configuration"
    buildRPM "awips2-database-standalone-configuration"
    buildRPM "awips2-database"
@@ -220,6 +153,7 @@ if [ "${1}" = "-rh6" ]; then
    buildRPM "awips2-aviation-shared"
    buildRPM "awips2-cli"
    buildRPM "awips2-edex-environment"
+   buildRPM "awips2-edex-shapefiles"
    buildRPM "awips2-data.gfe"
    buildRPM "awips2-gfesuite-client"
    buildRPM "awips2-gfesuite-server"
@@ -237,324 +171,6 @@ if [ "${1}" = "-rh6" ]; then
    exit 0
 fi
 
-if [ "${1}" = "-postgres" ]; then
-   buildRPM "awips2-postgres"
-   buildRPM "awips2-database-server-configuration"
-   buildRPM "awips2-database-standalone-configuration"
-   buildRPM "awips2-database"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-ncep-database"
-   buildRPM "awips2-pgadmin3"
-
-   exit 0
-fi
-
-if [ "${1}" = "-delta" ]; then
-   buildRPM "awips2"
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   buildRPM "awips2-ncep-database"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-ufpy"
-
-   buildRPM "awips2-aviation-shared"
-   buildRPM "awips2-cli"
-   buildRPM "awips2-database"
-   buildRPM "awips2-database-server-configuration"
-   buildRPM "awips2-database-standalone-configuration"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-localapps-environment"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-notification"
-   buildRPM "awips2-pypies"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-data.gfe"
-   buildRPM "awips2-rcm"
-   buildLocalizationRPMs
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-full" ]; then
-   buildRPM "awips2-common-base"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-   buildRPM "awips2-python-jep"
-   buildRPM "awips2-cli"
-   buildRPM "awips2-gfesuite-client"
-   buildRPM "awips2-gfesuite-server"
-   buildRPM "awips2-localapps-environment"
-   buildRPM "awips2-data.hdf5-topo"
-   buildRPM "awips2-data.gfe"
-   buildRPM "awips2"
-   unpackHttpdPypies
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-httpd-pypies"
-   buildJava
-   buildRPM "awips2-groovy"
-   buildLocalizationRPMs
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-edex-environment"
-   buildRPM "awips2-notification"
-   buildRPM "awips2-python-shapely"
-   buildRPM "awips2-postgres"
-   buildRPM "awips2-database"
-   buildRPM "awips2-maps-database"
-   buildRPM "awips2-ncep-database"
-   buildRPM "awips2-pgadmin3"
-   buildRPM "awips2-ldm"
-   exit 0
-fi
-
-#if [ "${1}" = "-ade" ]; then
-#   echo "INFO: AWIPS II currently does not support a 64-bit version of the ADE."
-#   exit 0
-#   buildRPM "awips2-eclipse"
-#
-#   exit 0
-#fi
-
-if [ "${1}" = "-ade" ]; then
-   buildRPM "awips2-eclipse"
-   buildJava
-   buildRPM "awips2-ant"
-   buildRPM "awips2-python"
-   buildRPM "awips2-python-cherrypy"
-   buildRPM "awips2-python-dynamicserialize"
-   buildRPM "awips2-python-h5py"
-   buildRPM "awips2-python-matplotlib"
-   buildRPM "awips2-python-nose"
-   buildRPM "awips2-python-numpy"
-   buildRPM "awips2-python-pil"
-   buildRPM "awips2-python-pmw"
-   buildRPM "awips2-python-pupynere"
-   buildRPM "awips2-python-qpid"
-   buildRPM "awips2-python-scientific"
-   buildRPM "awips2-python-scipy"
-   buildRPM "awips2-python-tables"
-   buildRPM "awips2-python-thrift"
-   buildRPM "awips2-python-tpg"
-   buildRPM "awips2-python-ufpy"
-   buildRPM "awips2-python-werkzeug"
-   buildRPM "awips2-python-pygtk"
-   buildRPM "awips2-python-pycairo"
-   buildRPM "awips2-python-shapely"
-   buildRPM "awips2-python-jep"
-   buildQPID -ade
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   
-   # Package the ade.
-   # Create the containing directory.
-   ade_directory="awips2-ade-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
-   if [ -d ${WORKSPACE}/${ade_directory} ]; then
-      rm -rf ${WORKSPACE}/${ade_directory}
-      if [ $? -ne 0 ]; then
-         exit 1
-      fi
-   fi
-   mkdir -p ${WORKSPACE}/${ade_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   # Copy the rpms to the directory.
-   cp -v ${AWIPSII_TOP_DIR}/RPMS/x86_64/* \
-      ${AWIPSII_TOP_DIR}/RPMS/noarch/* \
-      ${WORKSPACE}/${ade_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   awips2_ade_directory="${WORKSPACE}/rpms/awips2.ade"
-   # Copy the install and uninstall script to the directory.
-   cp -v ${awips2_ade_directory}/tar.ade/scripts/*.sh \
-      ${WORKSPACE}/${ade_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-    # Build the source jar file
-    #ade_work_dir="/home/dmsys/Dim12/build/AWIPS2/AWIPS2-ADE-OB14.1.1-CM"
-    #cd $ade_work_dir
-    #./build_source_jar.sh
-    #cp -v /tmp/awips-component/tmp/awips2-ade-baseline-SOURCES.jar ${WORKSPACE}/${ade_directory}
-
-   # Tar the directory.
-   pushd . > /dev/null 2>&1
-   cd ${WORKSPACE}
-   tar -cvf ${ade_directory}.tar ${ade_directory}
-   popd > /dev/null 2>&1
-   RC=$?
-   if [ ${RC} -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-
-if [ "${1}" = "-viz" ]; then
-   buildRPM "awips2"
-   #buildRPM "awips2-python-numpy"
-   #buildRPM "awips2-ant"
-   #buildRPM "awips2-python-dynamicserialize"
-   #buildRPM "awips2-python"
-   #buildRPM "awips2-adapt-native"
-   #unpackHttpdPypies
-   #if [ $? -ne 0 ]; then
-   #   exit 1
-   #fi
-   #buildRPM "awips2-httpd-pypies"
-   #buildRPM "awips2-hydroapps-shared"
-   #buildRPM "awips2-rcm"
-   #buildRPM "awips2-gfesuite-client"
-   #buildRPM "awips2-gfesuite-server"
-   #buildRPM "awips2-tools"
-   #buildRPM "awips2-cli"
-   buildCAVE
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   buildRPM "awips2-alertviz"
-
-   exit 0
-fi
-
-if [ "${1}" = "-edex" ]; then
-   ##buildRPM "awips2-common-base"
-   #buildRPM "awips2"
-   buildEDEX
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-   #buildRPM "awips2-python-dynamicserialize"
-
-   exit 0
-fi
-
-if [ "${1}" = "-custom" ]; then
-   #buildQPID
-   #if [ $? -ne 0 ]; then
-   #   exit 1
-   #fi
-   #buildRPM "awips2-adapt-native"
-   #buildRPM "awips2-hydroapps-shared"
-   #buildRPM "awips2-common-base"
-   #buildRPM "awips2-gfesuite-client"
-   #buildRPM "awips2-gfesuite-server"
-   #buildRPM "awips2-python-dynamicserialize"
-   #buildRPM "awips2-alertviz"
-   buildRPM "awips2-python"
-   #buildRPM "awips2-alertviz"
-   #buildRPM "awips2-ant"
-   #buildRPM "awips2-eclipse"
-   #buildRPM "awips2-python"
-
-   exit 0
-fi
-
-if [ "${1}" = "-qpid" ]; then
-   buildRPM "awips2-python-qpid"
-   buildQPID
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
-if [ "${1}" = "-ldm" ]; then
-   buildRPM "awips2-ldm"
-
-   exit 0
-fi
-
-if [ "${1}" = "-package" ]; then
-   repository_directory="awips2-repository-${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
-   if [ -d ${WORKSPACE}/${repository_directory} ]; then
-      rm -rf ${WORKSPACE}/${repository_directory}
-      if [ $? -ne 0 ]; then
-         exit 1
-      fi
-   fi
-   mkdir -p ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   cp -r ${AWIPSII_TOP_DIR}/RPMS/* \
-      ${WORKSPACE}/${repository_directory}/${AWIPSII_VERSION}-${AWIPSII_RELEASE}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   rpms_directory="${WORKSPACE}/rpms"
-   comps_xml="${rpms_directory}/common/yum/arch.x86_64/comps.xml"
-   cp -v ${comps_xml} ${WORKSPACE}/${repository_directory}
-   if [ $? -ne 0 ]; then
-      exit 1
-   fi
-
-   pushd . > /dev/null
-   cd ${WORKSPACE}
-   tar -cvf ${repository_directory}.tar ${repository_directory}
-   RC=$?
-   popd > /dev/null
-   if [ ${RC} -ne 0 ]; then
-      exit 1
-   fi
-
-   exit 0
-fi
-
 if [ "${1}" = "-dev" ]; then
 
         if [ ! $#  -eq 2 ]; then
@@ -571,6 +187,5 @@ if [ "${1}" = "-dev" ]; then
         exit 0
 fi
 
-
 usage
 exit 0
diff --git a/rpms/build/x86_64/buildEnvironment.sh b/rpms/build/x86_64/buildEnvironment.sh
index 33a3f44dd0..b293ee015e 100644
--- a/rpms/build/x86_64/buildEnvironment.sh
+++ b/rpms/build/x86_64/buildEnvironment.sh
@@ -7,6 +7,5 @@ export AWIPSII_RELEASE="20120223"
 export AWIPSII_TOP_DIR="/tmp/${USER}/rpmbuild"
 export WORKSPACE="/tmp/${USER}/baseline"
 export UFRAME_ECLIPSE="/opt/uframe-eclipse"
-export AWIPSCM_SHARE="/awipscm"
 export AWIPSII_BUILD_ROOT="/tmp/${USER}/awips-component"
 export REPO_DEST="/tmp/${USER}/repo"
diff --git a/rpms/build/x86_64/rpms.sh b/rpms/build/x86_64/rpms.sh
new file mode 100644
index 0000000000..c0c3923893
--- /dev/null
+++ b/rpms/build/x86_64/rpms.sh
@@ -0,0 +1,131 @@
+#!/bin/bash
+
+function buildRPM()
+{
+   # Arguments:
+   #   ${1} == the name of the rpm.
+   lookupRPM "${1}"
+   if [ $? -ne 0 ]; then
+      echo "ERROR: '${1}' is not a recognized AWIPS II RPM."
+      exit 1
+   fi
+
+        buildRPMExec "${RPM_SPECIFICATION}"
+
+   return 0
+}
+
+# Arguments
+#   ${1} == The Directory With The Specs File And Possibly Other Custom
+#               Scripts That May Need To Be Merged Into A Component.
+#   ${2} == The name of the CAVE RPM that will be built.
+function buildRPMExec()
+{
+   local COMPONENT_DIR=${1}
+   local COMPONENT_SPECS=${COMPONENT_DIR}/component.spec
+   export RPM_NAME=${2}
+
+   /usr/bin/rpmbuild -bb \
+      --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
+      --define '_baseline_workspace %(echo ${WORKSPACE})' \
+      --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
+      --define '_static_files %(echo ${AWIPSII_STATIC_FILES})' \
+      --define '_build_root %(echo ${AWIPSII_BUILD_ROOT})' \
+      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
+      --define '_component_name %(echo ${RPM_NAME})' \
+      --define '_component_version %(echo ${AWIPSII_VERSION})' \
+      --define '_component_release %(echo ${AWIPSII_RELEASE})' \
+      --define '_component_build_date %(echo ${COMPONENT_BUILD_DATE})' \
+      --define '_component_build_time %(echo ${COMPONENT_BUILD_TIME})' \
+      --define '_component_build_system %(echo ${COMPONENT_BUILD_SYSTEM})' \
+      --buildroot ${AWIPSII_BUILD_ROOT} \
+      ${COMPONENT_SPECS}
+   if [ $? -ne 0 ]; then
+      echo "ERROR: Failed to build RPM ${1}."
+      exit 1
+   fi
+}
+
+function buildEDEX()
+{
+   cd ${WORKSPACE}/rpms/awips2.edex/deploy.builder
+   if [ $? -ne 0 ]; then
+      echo "ERROR: Failed to build the edex rpms."
+      exit 1
+   fi
+
+   /bin/bash build.sh
+   if [ $? -ne 0 ]; then
+      echo "ERROR: Failed to build the edex rpms."
+      exit 1
+   fi
+
+   return 0
+}
+
+function buildCAVE()
+{
+   cd ${WORKSPACE}/rpms/awips2.cave/deploy.builder
+   if [ $? -ne 0 ]; then
+      echo "ERROR: Failed to build the cave rpms."
+      exit 1
+   fi
+
+   /bin/bash build.sh
+   if [ $? -ne 0 ]; then
+      echo "ERROR: Failed to build the cave rpms."
+      exit 1
+   fi
+
+   return 0
+}
+
+function buildLocalizationRPMs()
+{
+   awips2_core_directory=${WORKSPACE}/rpms/awips2.core
+   extract_site_pl="${awips2_core_directory}/deploy.builder/extractSite.pl"
+   installer_localization_directory="${awips2_core_directory}/Installer.localization"
+   localization_SPECIFICATION="${installer_localization_directory}/component.spec"
+
+   # Find all of the localization.${site} directories, if there are any.
+   ls ${WORKSPACE}/localization.* > /dev/null 2>&1
+   RC=$?
+   if [ ${RC} -ne 0 ]; then
+      # There are not any localization projects.
+      echo "INFO: There are not any localization projects."
+      return 0
+   fi
+
+   for localization in `cd ${WORKSPACE}; ls -1d localization.*;`; do
+      site=`/usr/bin/perl ${extract_site_pl} ${localization}`
+      if [ $? -ne 0 ]; then
+         return 1
+      fi
+      export LOCALIZATION_DIRECTORY="${localization}"
+      export COMPONENT_NAME="awips2-localization-${site}"
+      export site=${site}
+
+      echo "Building localization rpm for site: ${site}."
+
+      rpmbuild -bb \
+         --define '_topdir %(echo ${AWIPSII_TOP_DIR})' \
+         --define '_component_version %(echo ${AWIPSII_VERSION})' \
+         --define '_component_release %(echo ${AWIPSII_RELEASE})' \
+         --define '_component_name %(echo ${COMPONENT_NAME})' \
+         --define '_baseline_workspace %(echo ${WORKSPACE})' \
+         --define '_localization_directory %(echo ${LOCALIZATION_DIRECTORY})' \
+         --define '_localization_site %(echo ${site})' \
+         --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
+         --buildroot ${AWIPSII_BUILD_ROOT} \
+         ${localization_SPECIFICATION}
+      RC=$?
+      unset LOCALIZATION_DIRECTORY
+      unset COMPONENT_NAME
+      if [ ${RC} -ne 0 ]; then
+         return 1
+      fi
+   done
+
+   return 0
+}
+
diff --git a/rpms/common/static.versions/LATEST.gfe b/rpms/common/static.versions/LATEST.gfe
deleted file mode 100644
index 685d25a36b..0000000000
--- a/rpms/common/static.versions/LATEST.gfe
+++ /dev/null
@@ -1 +0,0 @@
-20141027
diff --git a/rpms/common/static.versions/LATEST.maps b/rpms/common/static.versions/LATEST.maps
deleted file mode 100644
index 9a408df83c..0000000000
--- a/rpms/common/static.versions/LATEST.maps
+++ /dev/null
@@ -1 +0,0 @@
-20150608
diff --git a/rpms/common/static.versions/LATEST.ncep b/rpms/common/static.versions/LATEST.ncep
deleted file mode 100644
index d4b95540f5..0000000000
--- a/rpms/common/static.versions/LATEST.ncep
+++ /dev/null
@@ -1 +0,0 @@
-20110819
\ No newline at end of file
diff --git a/rpms/common/static.versions/LATEST.topo b/rpms/common/static.versions/LATEST.topo
deleted file mode 100644
index 7d26c0dfdc..0000000000
--- a/rpms/common/static.versions/LATEST.topo
+++ /dev/null
@@ -1 +0,0 @@
-20140805
diff --git a/rpms/python.site-packages/Installer.cherrypy/component.spec b/rpms/python.site-packages/Installer.cherrypy/component.spec
index e4f127c464..2e9352acec 100644
--- a/rpms/python.site-packages/Installer.cherrypy/component.spec
+++ b/rpms/python.site-packages/Installer.cherrypy/component.spec
@@ -1,6 +1,7 @@
 # Turn off the brp-python-bytecompile script
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %define _build_arch %(uname -i)
+%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi)
 
 #
 # AWIPS II Python cherrypy Site-Package Spec File
@@ -8,7 +9,7 @@
 Name: awips2-python-cherrypy
 Summary: AWIPS II Python cherrypy Site-Package
 Version: 3.1.2
-Release: %{_component_version}.%{_component_release}
+Release: 1%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
@@ -16,11 +17,13 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-python
-provides: awips2-python-cherrypy
+Requires: awips2-python = %{_installed_python}
+Provides: awips2-python-cherrypy = %{version}
+
+BuildRequires: awips2-python
 
 %description
 AWIPS II Python cherrypy Site-Package - Installs the AWIPS II Python
diff --git a/rpms/python.site-packages/Installer.dynamicserialize/component.spec b/rpms/python.site-packages/Installer.dynamicserialize/component.spec
index 6d0abd5fb9..8efcdf9e5e 100644
--- a/rpms/python.site-packages/Installer.dynamicserialize/component.spec
+++ b/rpms/python.site-packages/Installer.dynamicserialize/component.spec
@@ -1,6 +1,7 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 
 %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
+%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi)
 
 #
 # AWIPS II Python dynamicserialize Spec File
@@ -8,7 +9,7 @@
 Name: awips2-python-dynamicserialize
 Summary: AWIPS II Python dynamicserialize Distribution
 Version: %{_component_version}
-Release: %{_component_release}
+Release: %{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
@@ -16,12 +17,15 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-python
-requires: awips2-python-thrift
-provides: awips2-python-dynamicserialize
+Requires: awips2-python = %{_installed_python}
+Requires: awips2-python-thrift
+Provides: awips2-python-dynamicserialize = %{version}
+
+BuildRequires: awips2-python
+BuildRequires: awips2-python-thrift
 
 %description
 AWIPS II Python dynamicserialize Site-Package - 64-bit.
diff --git a/rpms/python.site-packages/Installer.nose/component.spec b/rpms/python.site-packages/Installer.nose/component.spec
index dfc54065b9..18f6879b79 100644
--- a/rpms/python.site-packages/Installer.nose/component.spec
+++ b/rpms/python.site-packages/Installer.nose/component.spec
@@ -2,6 +2,7 @@
 %define _build_arch %(uname -i)
 %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
 %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi)
 
 #
 # AWIPS II Python nose Spec File
@@ -9,7 +10,7 @@
 Name: awips2-python-nose
 Summary: AWIPS II Python nose Distribution
 Version: 0.11.1
-Release: %{_component_version}.%{_component_release}
+Release: 1%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
@@ -17,11 +18,13 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-python
-provides: awips2-python-nose
+Requires: awips2-python = %{_installed_python}
+Provides: awips2-python-nose = %{version}
+
+BuildRequires: awips2-python
 
 %description
 AWIPS II Python nose Site-Package.
diff --git a/rpms/python.site-packages/Installer.pil/component.spec b/rpms/python.site-packages/Installer.pil/component.spec
deleted file mode 100644
index a455fa1dfc..0000000000
--- a/rpms/python.site-packages/Installer.pil/component.spec
+++ /dev/null
@@ -1,92 +0,0 @@
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%define _build_arch %(uname -i)
-%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
-%define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#
-# AWIPS II Python pil Spec File
-#
-Name: awips2-python-pil
-Summary: AWIPS II Python pil Distribution
-Version: 1.1.6
-Release: %{_component_version}.%{_component_release}%{?dist}
-Group: AWIPSII
-BuildRoot: %{_build_root}
-BuildArch: %{_build_arch}
-URL: N/A
-License: N/A
-Distribution: N/A
-Vendor: Raytheon
-Packager: Bryan Kowal
-
-AutoReq: no
-requires: awips2-python
-provides: awips2-python-pil
-
-%description
-AWIPS II Python pil Site-Package.
-
-%prep
-# Verify That The User Has Specified A BuildRoot.
-if [ "%{_build_root}" = "" ]
-then
-   echo "A Build Root has not been specified."
-   echo "Unable To Continue ... Terminating"
-   exit 1
-fi
-
-rm -rf %{_build_root}
-mkdir -p %{_build_root}
-if [ -d %{_python_build_loc} ]; then
-   rm -rf %{_python_build_loc}
-fi
-mkdir -p %{_python_build_loc}
-
-%build
-PIL_SRC_DIR="%{_python_pkgs_dir}/pil"
-
-cp -rv ${PIL_SRC_DIR}/* \
-   %{_python_build_loc}
-
-pushd . > /dev/null
-cd %{_python_build_loc}
-export LD_LIBRARY_PATH=/awips2/python/lib
-/awips2/python/bin/python setup.py build
-RC=$?
-if [ ${RC} -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
-%install
-pushd . > /dev/null
-cd %{_python_build_loc}
-export LD_LIBRARY_PATH=/awips2/python/lib
-/awips2/python/bin/python setup.py install \
-   --root=%{_build_root} \
-   --prefix=/awips2/python
-RC=$?
-if [ ${RC} -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
-%pre
-
-%post
-
-%preun
-
-%postun
-
-%clean
-rm -rf %{_build_root}
-rm -rf %{_python_build_loc}
-
-%files
-%defattr(644,awips,fxalpha,755)
-%dir /awips2/python/lib/python2.7/site-packages
-/awips2/python/lib/python2.7/site-packages/*
-%defattr(755,awips,fxalpha,755)
-%dir /awips2/python/bin
-/awips2/python/bin/*
diff --git a/rpms/python.site-packages/Installer.pmw/component.spec b/rpms/python.site-packages/Installer.pmw/component.spec
index bc5ef2c303..aa28ebdeef 100644
--- a/rpms/python.site-packages/Installer.pmw/component.spec
+++ b/rpms/python.site-packages/Installer.pmw/component.spec
@@ -2,6 +2,7 @@
 %define _build_arch %(uname -i)
 %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
 %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi)
 
 #
 # AWIPS II Python pmw Spec File
@@ -9,7 +10,7 @@
 Name: awips2-python-pmw
 Summary: AWIPS II Python pmw Distribution
 Version: 1.3.2
-Release: %{_component_version}.%{_component_release}
+Release: 1%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: %{_build_arch}
@@ -17,11 +18,13 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-python
-provides: awips2-python-pmw
+Requires: awips2-python = %{_installed_python}
+Provides: awips2-python-pmw = %{version}
+
+BuildRequires: awips2-python
 
 %description
 AWIPS II Python pmw Site-Package
diff --git a/rpms/python.site-packages/Installer.pupynere/component.spec b/rpms/python.site-packages/Installer.pupynere/component.spec
index c841302981..d441ce04c8 100644
--- a/rpms/python.site-packages/Installer.pupynere/component.spec
+++ b/rpms/python.site-packages/Installer.pupynere/component.spec
@@ -2,6 +2,8 @@
 %define _build_arch %(uname -i)
 %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
 %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi)
+%define _installed_python_numpy %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c "import numpy; print numpy.__version__"; else echo 0; fi)
 
 #
 # AWIPS II Python pupynere Spec File
@@ -9,7 +11,7 @@
 Name: awips2-python-pupynere
 Summary: AWIPS II Python pupynere Distribution
 Version: 1.0.13
-Release: %{_component_version}.%{_component_release}
+Release: 1%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
@@ -17,12 +19,16 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-python
-requires: awips2-python-numpy
-provides: awips2-python-pupynere
+Requires: awips2-python = %{_installed_python}
+Requires: awips2-python-numpy = %{_installed_python_numpy}
+Provides: awips2-python-pupynere = %{version}
+
+BuildRequires: awips2-python
+BuildRequires: awips2-python-numpy
+BuildRequires: awips2-python-setuptools
 
 %description
 AWIPS II Python pupynere Site-Package
diff --git a/rpms/python.site-packages/Installer.pycairo/component.spec b/rpms/python.site-packages/Installer.pycairo/component.spec
deleted file mode 100644
index 958722c783..0000000000
--- a/rpms/python.site-packages/Installer.pycairo/component.spec
+++ /dev/null
@@ -1,91 +0,0 @@
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%define _build_arch %(uname -i)
-%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
-%define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#
-# AWIPS II Python pycairo Spec File
-#
-Name: awips2-python-pycairo
-Summary: AWIPS II Python pycairo Distribution
-Version: 1.2.2
-Release: %{_component_version}.%{_component_release}
-Group: AWIPSII
-BuildRoot: %{_build_root}
-BuildArch: %{_build_arch}
-URL: N/A
-License: N/A
-Distribution: N/A
-Vendor: Raytheon
-Packager: Bryan Kowal
-
-AutoReq: no
-requires: awips2-python
-provides: awips2-python-pycairo
-
-%description
-AWIPS II Python pycairo Site-Package.
-
-%prep
-# Verify That The User Has Specified A BuildRoot.
-if [ "%{_build_root}" = "" ]
-then
-   echo "A Build Root has not been specified."
-   echo "Unable To Continue ... Terminating"
-   exit 1
-fi
-
-rm -rf %{_build_root}
-mkdir -p %{_build_root}
-if [ -d %{_python_build_loc} ]; then
-   rm -rf %{_python_build_loc}
-fi
-mkdir -p %{_python_build_loc}
-
-%build
-PYCAIRO_SRC_DIR="%{_python_pkgs_dir}/pycairo"
-PYCAIRO_TAR="pycairo-1.2.2.tar.gz"
-
-cp -v ${PYCAIRO_SRC_DIR}/${PYCAIRO_TAR} \
-   %{_python_build_loc}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-pushd . > /dev/null
-cd %{_python_build_loc}
-tar -xvf ${PYCAIRO_TAR}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-cd pycairo-1.2.2
-./configure --prefix=/awips2/python
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-make
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
-%install
-pushd . > /dev/null
-cd %{_python_build_loc}/pycairo-1.2.2
-make install prefix=%{_build_root}/awips2/python
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
-%clean
-rm -rf %{_python_build_loc}
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(644,awips,fxalpha,755)
-%dir /awips2/python/lib
-/awips2/python/lib/*
-%dir /awips2/python/include
-/awips2/python/include/*
diff --git a/rpms/python.site-packages/Installer.pygtk/component.spec b/rpms/python.site-packages/Installer.pygtk/component.spec
deleted file mode 100644
index 13fc8e0484..0000000000
--- a/rpms/python.site-packages/Installer.pygtk/component.spec
+++ /dev/null
@@ -1,97 +0,0 @@
-%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%define _build_arch %(uname -i)
-%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
-%define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-#
-# AWIPS II Python pygtk Spec File
-#
-Name: awips2-python-pygtk
-Summary: AWIPS II Python pygtk Distribution
-Version: 2.8.6
-Release: %{_component_version}.%{_component_release}
-Group: AWIPSII
-BuildRoot: %{_build_root}
-BuildArch: %{_build_arch}
-URL: N/A
-License: N/A
-Distribution: N/A
-Vendor: Raytheon
-Packager: Bryan Kowal
-
-AutoReq: no
-requires: awips2-python
-requires: awips2-python-pycairo
-provides: awips2-python-pygtk
-
-%description
-AWIPS II Python pygtk Site-Package.
-
-%prep
-# Verify That The User Has Specified A BuildRoot.
-if [ "%{_build_root}" = "" ]
-then
-   echo "A Build Root has not been specified."
-   echo "Unable To Continue ... Terminating"
-   exit 1
-fi
-
-rm -rf %{_build_root}
-mkdir -p %{_build_root}
-if [ -d %{_python_build_loc} ]; then
-   rm -rf %{_python_build_loc}
-fi
-mkdir -p %{_python_build_loc}
-
-%build
-PYGTK_SRC_DIR="%{_python_pkgs_dir}/pygtk"
-PYGTK_TAR="pygtk-2.8.6.tar.gz"
-
-cp -v ${PYGTK_SRC_DIR}/${PYGTK_TAR} \
-   %{_python_build_loc}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-pushd . > /dev/null
-cd %{_python_build_loc}
-tar -xvf ${PYGTK_TAR}
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-
-cd pygtk-2.8.6
-./configure --prefix=/awips2/python
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-make
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
-%install
-pushd . > /dev/null
-cd %{_python_build_loc}/pygtk-2.8.6
-make install prefix=%{_build_root}/awips2/python
-if [ $? -ne 0 ]; then
-   exit 1
-fi
-popd > /dev/null
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-rm -rf %{_python_build_loc}
-
-%files
-%defattr(644,awips,fxalpha,755)
-%dir /awips2/python/lib
-/awips2/python/lib/*
-%dir /awips2/python/include
-/awips2/python/include/*
-%dir /awips2/python/share
-/awips2/python/share/*
-%defattr(755,awips,fxalpha,755)
-%dir /awips2/python/bin
-/awips2/python/bin/*
diff --git a/rpms/python.site-packages/Installer.thrift/component.spec b/rpms/python.site-packages/Installer.thrift/component.spec
index ac90cc7f6f..4f3ed78870 100644
--- a/rpms/python.site-packages/Installer.thrift/component.spec
+++ b/rpms/python.site-packages/Installer.thrift/component.spec
@@ -1,6 +1,7 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 %define _build_arch %(uname -i)
 %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
+%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi)
 
 #
 # AWIPS II Python thrift Spec File
@@ -8,7 +9,7 @@
 Name: awips2-python-thrift
 Summary: AWIPS II Python thrift Distribution
 Version: 20080411p1
-Release: %{_component_version}.%{_component_release}
+Release: 1%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
@@ -16,11 +17,13 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-python
-provides: awips2-python-thrift
+requires: awips2-python = %{_installed_python}
+provides: awips2-python-thrift = %{version}
+
+BuildRequires: awips2-python
 
 %description
 AWIPS II Python thrift Site-Package
diff --git a/rpms/python.site-packages/Installer.tpg/component.spec b/rpms/python.site-packages/Installer.tpg/component.spec
index 229149b4ef..3f7de41aa6 100644
--- a/rpms/python.site-packages/Installer.tpg/component.spec
+++ b/rpms/python.site-packages/Installer.tpg/component.spec
@@ -2,6 +2,7 @@
 %define _build_arch %(uname -i)
 %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
 %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi)
 
 #
 # AWIPS II Python tpg Spec File
@@ -9,7 +10,7 @@
 Name: awips2-python-tpg
 Summary: AWIPS II Python tpg Distribution
 Version: 3.1.2
-Release: %{_component_version}.%{_component_release}
+Release: 1%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
@@ -17,11 +18,13 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-python
-provides: awips2-python-tpg
+requires: awips2-python = %{_installed_python}
+provides: awips2-python-tpg = %{version}
+
+BuildRequires: awips2-python
 
 %description
 AWIPS II Python tpg Site-Package
diff --git a/rpms/python.site-packages/Installer.ufpy/component.spec b/rpms/python.site-packages/Installer.ufpy/component.spec
index eb0dec9f74..96594dc2c1 100644
--- a/rpms/python.site-packages/Installer.ufpy/component.spec
+++ b/rpms/python.site-packages/Installer.ufpy/component.spec
@@ -1,6 +1,7 @@
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
 
 %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
+%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi)
 
 #
 # AWIPS II Python ufpy Spec File
@@ -8,7 +9,7 @@
 Name: awips2-python-ufpy
 Summary: AWIPS II Python ufpy Distribution
 Version: %{_component_version}
-Release: %{_component_release}
+Release: %{_component_release}%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
@@ -16,11 +17,13 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-python
-provides: awips2-python-ufpy
+Requires: awips2-python = %{_installed_python}
+Provides: awips2-python-ufpy = %{version}
+
+BuildRequires: awips2-python
 
 %description
 AWIPS II Python ufpy Site-Package - 64-bit.
diff --git a/rpms/python.site-packages/Installer.werkzeug/component.spec b/rpms/python.site-packages/Installer.werkzeug/component.spec
index af5dbd6782..e33a1e371b 100644
--- a/rpms/python.site-packages/Installer.werkzeug/component.spec
+++ b/rpms/python.site-packages/Installer.werkzeug/component.spec
@@ -2,14 +2,15 @@
 %define _build_arch %(uname -i)
 %define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages"
 %define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%define _installed_python %(if [ -f /awips2/python/bin/python ]; then /awips2/python/bin/python -c 'import sys; print(".".join(map(str, sys.version_info[:3])))'; else echo 0; fi)
 
 #
 # AWIPS II Python werkzeug Spec File
 #
 Name: awips2-python-werkzeug
 Summary: AWIPS II Python werkzeug Distribution
-Version: 3.1.2
-Release: %{_component_version}.%{_component_release}
+Version: 0.6.2
+Release: 1%{?dist}
 Group: AWIPSII
 BuildRoot: %{_build_root}
 BuildArch: noarch
@@ -17,11 +18,13 @@ URL: N/A
 License: N/A
 Distribution: N/A
 Vendor: Raytheon
-Packager: Bryan Kowal
+Packager: %{_build_site}
 
 AutoReq: no
-requires: awips2-python
-provides: awips2-python-werkzeug
+Requires: awips2-python = %{_installed_python}
+Provides: awips2-python-werkzeug = %{version}
+
+BuildRequires: awips2-python
 
 %description
 AWIPS II Python werkzeug Site-Package
diff --git a/rpms/python.site-packages/deploy.builder/build.sh b/rpms/python.site-packages/deploy.builder/build.sh
index ffbf95feb0..240ba2d25b 100644
--- a/rpms/python.site-packages/deploy.builder/build.sh
+++ b/rpms/python.site-packages/deploy.builder/build.sh
@@ -61,6 +61,7 @@ function buildRPM()
       --define '_uframe_eclipse %(echo ${UFRAME_ECLIPSE})' \
       --define '_awipscm_share %(echo ${AWIPSCM_SHARE})' \
       --define '_build_root %(echo ${BUILDROOT_DIR})' \
+      --define '_build_site %(echo ${AWIPSII_BUILD_SITE})' \
       --define '_component_version %(echo ${AWIPSII_VERSION})' \
       --define '_component_release %(echo ${AWIPSII_RELEASE})' \
       --buildroot ${BUILDROOT_DIR} ${COMPONENT_SPECS}
diff --git a/tests/.classpath b/tests/.classpath
index a33ec782c4..ce3d686468 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -134,15 +134,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.wxmath"/>
 	<classpathentry kind="lib" path="lib/org.eclipse.jface_3.8.0.v20120912-135020.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.apache.commons.configuration"/>
-	<classpathentry kind="lib" path="lib/javax.servlet.source_2.5.0.v200910301333.jar"/>
-	<classpathentry kind="lib" path="lib/javax.servlet.jsp-2.1.0.v201105211820.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-http-7.6.14.v20131031.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-server-7.6.14.v20131031.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-servlet-7.6.14.v20131031.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-servlets-7.6.14.v20131031.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-util-7.6.14.v20131031.jar"/>
-	<classpathentry kind="lib" path="lib/servlet-api-2.5.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-security-7.6.14.v20131031.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.common.dataplugin.redbook"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/com.raytheon.uf.edex.plugin.hpe"/>
 	<classpathentry kind="src" path="/com.raytheon.uf.common.plugin.hpe"/>
diff --git a/tests/build.properties b/tests/build.properties
index e7046f1c3c..1ae8314606 100644
--- a/tests/build.properties
+++ b/tests/build.properties
@@ -23,3 +23,4 @@ TEST.REPORTS.DIR=${WORKING.DIR}/test-reports
 ANT.CONTRIB.JAR=${BUILD.EDEX.DIR}/lib/ant/ant-contrib-1.0b3.jar
 
 BUILD.EDEX.PROPERTIES=${BUILD.EDEX.DIR}/edex/build.properties
+bin.includes=utility/
diff --git a/tests/lib/javax.servlet.jsp-2.1.0.v201105211820.jar b/tests/lib/javax.servlet.jsp-2.1.0.v201105211820.jar
deleted file mode 100644
index ff39b580f6..0000000000
Binary files a/tests/lib/javax.servlet.jsp-2.1.0.v201105211820.jar and /dev/null differ
diff --git a/tests/lib/jetty-http-7.6.14.v20131031.jar b/tests/lib/jetty-http-7.6.14.v20131031.jar
deleted file mode 100644
index 510149bc78..0000000000
Binary files a/tests/lib/jetty-http-7.6.14.v20131031.jar and /dev/null differ
diff --git a/tests/lib/jetty-security-7.6.14.v20131031.jar b/tests/lib/jetty-security-7.6.14.v20131031.jar
deleted file mode 100644
index aef1141931..0000000000
Binary files a/tests/lib/jetty-security-7.6.14.v20131031.jar and /dev/null differ
diff --git a/tests/lib/jetty-server-7.6.14.v20131031.jar b/tests/lib/jetty-server-7.6.14.v20131031.jar
deleted file mode 100644
index abceaf73b1..0000000000
Binary files a/tests/lib/jetty-server-7.6.14.v20131031.jar and /dev/null differ
diff --git a/tests/lib/jetty-servlet-7.6.14.v20131031.jar b/tests/lib/jetty-servlet-7.6.14.v20131031.jar
deleted file mode 100644
index 4f8bdba793..0000000000
Binary files a/tests/lib/jetty-servlet-7.6.14.v20131031.jar and /dev/null differ
diff --git a/tests/lib/jetty-servlets-7.6.14.v20131031.jar b/tests/lib/jetty-servlets-7.6.14.v20131031.jar
deleted file mode 100644
index a366efbb27..0000000000
Binary files a/tests/lib/jetty-servlets-7.6.14.v20131031.jar and /dev/null differ
diff --git a/tests/lib/jetty-util-7.6.14.v20131031.jar b/tests/lib/jetty-util-7.6.14.v20131031.jar
deleted file mode 100644
index 4b91a1dd57..0000000000
Binary files a/tests/lib/jetty-util-7.6.14.v20131031.jar and /dev/null differ
diff --git a/tests/lib/servlet-api-2.5.jar b/tests/lib/servlet-api-2.5.jar
deleted file mode 100644
index 681a06870b..0000000000
Binary files a/tests/lib/servlet-api-2.5.jar and /dev/null differ